Compare commits
No commits in common. "24bc80482eb041749afdd7a5dd687671cadf2cd0" and "c7d6d843f6bd576f8b91ddc735186cc822ab13f3" have entirely different histories.
24bc80482e
...
c7d6d843f6
2
Makefile
2
Makefile
|
|
@ -44,7 +44,7 @@ clean:
|
||||||
# Run executable
|
# Run executable
|
||||||
.PHONY: run
|
.PHONY: run
|
||||||
run: all
|
run: all
|
||||||
$(Q)cd $(BUILD_DIR) && ./$(notdir $(SOURCE_OUTPUT))
|
$(Q)./$(SOURCE_OUTPUT)
|
||||||
|
|
||||||
.PHONY: print-%
|
.PHONY: print-%
|
||||||
print-% :
|
print-% :
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 7778fb4aa5f1ffd8622b73c1edf22cb9c1096325
|
Subproject commit a0b32165649edb9f2003546ac48057764b12f128
|
||||||
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
| Description | Length |
|
| Description | Length |
|
||||||
| :---------------- | :---------------------------------- |
|
| :---------------- | :---------------------------------- |
|
||||||
| Assets number | size_t (64 bits) |
|
| Assets number | int (32 bits) |
|
||||||
| ... | |
|
| ... | |
|
||||||
| Asset name | const char * (variable length) |
|
| Asset name | const char * (variable length) |
|
||||||
| Asset start index | size_t (64 bits) |
|
| Asset start index | int (32 bits) |
|
||||||
| Asset end index | size_t (64 bits) |
|
| Asset end index | int (32 bits) |
|
||||||
| ... | |
|
| ... | |
|
||||||
| Asset data | depend on assets content and number |
|
| Asset data | depend on assets content and number |
|
||||||
|
|
||||||
|
|
@ -14,11 +14,3 @@
|
||||||
|
|
||||||
Convert RGBA to RGB with #FF00FF as the transparent color.
|
Convert RGBA to RGB with #FF00FF as the transparent color.
|
||||||
If alpha null then the color of the pixel will be replaced with this.
|
If alpha null then the color of the pixel will be replaced with this.
|
||||||
|
|
||||||
### Image asset data structure
|
|
||||||
|
|
||||||
| Description | Length |
|
|
||||||
| :---------------- | :---------------------------------- |
|
|
||||||
| Image width | size_t (64 bits) |
|
|
||||||
| Image height | size_t (64 bits) |
|
|
||||||
| Image data | depend on image content |
|
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="left-up" width="32" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="12">
|
<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="left-up" width="32" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="12">
|
||||||
<editorsettings>
|
<editorsettings>
|
||||||
<export target="dungeon_entry.json" format="custom"/>
|
<export target="dungeon_entry_test.json" format="custom"/>
|
||||||
</editorsettings>
|
</editorsettings>
|
||||||
<tileset firstgid="1" source="../tileset/tileset.tsx"/>
|
<tileset firstgid="1" source="../tileset/tileset.tsx"/>
|
||||||
<tileset firstgid="2647" source="hiitboxes.tsx"/>
|
<tileset firstgid="2647" source="hiitboxes.tsx"/>
|
||||||
|
|
@ -26,17 +26,8 @@
|
||||||
</data>
|
</data>
|
||||||
</layer>
|
</layer>
|
||||||
<layer id="12" name="HitBoxes" width="32" height="24">
|
<layer id="12" name="HitBoxes" width="32" height="24">
|
||||||
<properties>
|
|
||||||
<property name="2" type="list">
|
|
||||||
<item value="room_1"/>
|
|
||||||
<item type="list">
|
|
||||||
<item type="int" value="15"/>
|
|
||||||
<item type="int" value="22"/>
|
|
||||||
</item>
|
|
||||||
</property>
|
|
||||||
</properties>
|
|
||||||
<data encoding="base64" compression="zlib">
|
<data encoding="base64" compression="zlib">
|
||||||
eJwL52JgCB/Fo3gUj+IhhiOhmB52RWDBxMhRy25S5anpBnL9Rg03kGsGLfw/EHaTmg5oZTeutECrND+KR/Eopj0GAGrPIzU=
|
eJwL52JgCB/Fo3gUj+JRjBNHYMHEyFHLblLlqekGcv1GDTeQawYt/D8QdpOaDmhlN660QKs0P4pH8SimPQYATccjMQ==
|
||||||
</data>
|
</data>
|
||||||
</layer>
|
</layer>
|
||||||
</map>
|
</map>
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 519 B After Width: | Height: | Size: 155 B |
|
|
@ -33,7 +33,10 @@ var customMapFormat = {
|
||||||
file.writeLine("");
|
file.writeLine("");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(i < map.layerCount - 1)
|
||||||
file.writeLine(" ],");
|
file.writeLine(" ],");
|
||||||
|
else
|
||||||
|
file.writeLine(" ]");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue