From e8b8b3b121aaa3079cace95b05f04a951cefac43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Thu, 12 Mar 2020 15:29:40 +0100 Subject: [PATCH] functions for creating vertex array now respects norm and xml can store the texture for each tile of the map --- CMakeLists.txt | 7 ++- assets/sprites/grass.png | Bin 165 -> 0 bytes assets/sprites/grass_side.png | Bin 0 -> 7141 bytes assets/sprites/grass_top.png | Bin 0 -> 3543 bytes prefabs/game.gcprefab | 4 +- prefabs/tilemap.gcmap | 104 ++++++++++++++++------------------ 6 files changed, 58 insertions(+), 57 deletions(-) delete mode 100644 assets/sprites/grass.png create mode 100644 assets/sprites/grass_side.png create mode 100644 assets/sprites/grass_top.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a4b40e..6a0e6f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/assets/sprites/grass.png b/assets/sprites/grass.png deleted file mode 100644 index 9aea4fc63faae4e68edc1d962a2c7b693763f171..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=3?wxlRx|@C$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GJOMr-t{(mh5;c|#lUx%lgjssabb#Xeo-U3d6}OTSlq3y$ zvLwx-W^gjPm87<8O=t+zT^!}M6)1SsXjN*+>4XbR0tpO8iqZi~il!Id_ diff --git a/assets/sprites/grass_side.png b/assets/sprites/grass_side.png new file mode 100644 index 0000000000000000000000000000000000000000..5118c1f7344c723c9e54103a6d096169ee46c5f3 GIT binary patch literal 7141 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 z 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 RE>Zvh002ovPDHLkV1l+%kUIbX literal 0 HcmV?d00001 diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab index 5e788dd..9354579 100644 --- a/prefabs/game.gcprefab +++ b/prefabs/game.gcprefab @@ -19,12 +19,14 @@ + + + - diff --git a/prefabs/tilemap.gcmap b/prefabs/tilemap.gcmap index 744ad93..d963954 100644 --- a/prefabs/tilemap.gcmap +++ b/prefabs/tilemap.gcmap @@ -13,8 +13,6 @@ - - @@ -29,22 +27,6 @@ - - - - - - - - - - - - - - - - @@ -58,18 +40,6 @@ - - - - - - - - - - - - @@ -80,14 +50,6 @@ - - - - - - - - @@ -106,6 +68,7 @@ + @@ -119,6 +82,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -149,24 +155,12 @@ - - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file