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 9aea4fc..0000000 Binary files a/assets/sprites/grass.png and /dev/null differ diff --git a/assets/sprites/grass_side.png b/assets/sprites/grass_side.png new file mode 100644 index 0000000..5118c1f Binary files /dev/null and b/assets/sprites/grass_side.png differ diff --git a/assets/sprites/grass_top.png b/assets/sprites/grass_top.png new file mode 100644 index 0000000..193aa56 Binary files /dev/null and b/assets/sprites/grass_top.png differ 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