zoriya/My3D
1
0
Fork 0
mirror of https://github.com/zoriya/My3D.git synced 2025-12-06 06:26:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

functions for creating vertex array now respects norm and xml can store the texture for each tile of the map

Browse Source
This commit is contained in:
Clément Le Bihan
2020-03-12 15:29:40 +01:00
parent 1ec9846a7d
commit e8b8b3b121
6 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -252,7 +252,12 @@ add_executable(My3D
src/components/isometry/map_manager_component.c
include/components/isometry/map_manager_component.h
lib/gamacon/src/components/isometry/vertex_data_loader.c
lib/gamacon/include/vertex_data_loader.h src/toolbar.c lib/gamacon/include/callbacks.h src/selectors.c src/framerate.c)
lib/gamacon/include/vertex_data_loader.h src/toolbar.c
lib/gamacon/include/callbacks.h src/selectors.c
src/framerate.c
lib/gamacon/src/components/isometry/create_map_functions.c
lib/gamacon/include/create_map_functions.h
)
add_compile_options(-W -Wall -Wextra -Wshadow)

BIN
assets/sprites/grass.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 165 B

BIN
assets/sprites/grass_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
assets/sprites/grass_top.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

4
prefabs/game.gcprefab
View File

@@ -19,12 +19,14 @@
<sprite name="command_block" src="assets/sprites/command_block.png" />
<sprite name="black_background" src="assets/ui/black_background.png" />
<sprite name="crafting_table" src="assets/sprites/crafting_table_top.png" />
<sprite name="grass_top" src="assets/sprites/grass_top.png" />
<sprite name="grass_side" src="assets/sprites/grass_side.png" />
<music src="assets/musics/music.ogg"/>
<font src="assets/fonts/roboto.ttf" />
<tiles>
<tile name="grass_top" />
<tile name="cobblestone" />
<tile name="command_block" />
<tile name="comparator_on" />
<tile name="crafting_table" />
<tile name="mossy_cobblestone" />

104
prefabs/tilemap.gcmap
View File

@@ -13,8 +13,6 @@
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
@@ -29,22 +27,6 @@
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
@@ -58,18 +40,6 @@
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
@@ -80,14 +50,6 @@
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
@@ -106,6 +68,7 @@
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
@@ -119,6 +82,49 @@
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
@@ -149,24 +155,12 @@
<row height="0" />
<row height="0" />
</line>
<line>
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
<row height="0" />
</line>
</vertex_data>
<tiles_data>
<texture x="0" y="0" name="cobblestone">
<texture x="4" y="4" name="cobblestone">
<texture x="4" y="5" name="comparator_on">
<texture x="0" y="0" name="cobblestone" />
<texture x="4" y="4" name="cobblestone" />
<texture x="4" y="5" name="comparator_on" />
<texture x="1" y="1" name="grass_top" />
<texture x="0" y="1" name="grass_side" />
</tiles_data>
</gc_map>