From 6d4de94e2267039f7b479ddb4e8bfc8012bf9db8 Mon Sep 17 00:00:00 2001 From: AnonymusRaccoon Date: Wed, 11 Mar 2020 11:33:00 +0100 Subject: [PATCH] Finishing the toolbar --- CMakeLists.txt | 2 +- include/setup.h | 7 ++++- lib/gamacon | 2 +- prefabs/game.gcprefab | 8 +++--- src/game_loader.c | 40 +++++++++++++++++++---------- src/toolbar.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 98 insertions(+), 21 deletions(-) create mode 100644 src/toolbar.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a6c3a5..029cc7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ add_executable(My3D lib/gamacon/src/components/isometry/map_manager_component.c lib/gamacon/include/components/isometry/map_manager_component.h lib/gamacon/src/components/isometry/vertex_data_loader.c - lib/gamacon/include/vertex_data_loader.h) + lib/gamacon/include/vertex_data_loader.h src/toolbar.c lib/gamacon/include/callbacks.h) add_compile_options(-W -Wall -Wextra -Wshadow) diff --git a/include/setup.h b/include/setup.h index 51baf9b..7883dad 100644 --- a/include/setup.h +++ b/include/setup.h @@ -24,4 +24,9 @@ void resolution_set_text(gc_entity *entity, gc_engine *engine); bool fullscreen(gc_engine *engine, gc_entity *entity, gc_vector2 _); bool resolution_down(gc_engine *engine, gc_entity *entity, gc_vector2 _); -bool resolution_up(gc_engine *engine, gc_entity *entity, gc_vector2 _); \ No newline at end of file +bool resolution_up(gc_engine *engine, gc_entity *entity, gc_vector2 _); + +bool tile_select(gc_engine *engine, gc_entity *entity, gc_vector2 _); +bool vertex_select(gc_engine *engine, gc_entity *entity, gc_vector2 _); +bool up_down(gc_engine *engine, gc_entity *entity, gc_vector2 _); +bool rotate(gc_engine *engine, gc_entity *entity, gc_vector2 _); \ No newline at end of file diff --git a/lib/gamacon b/lib/gamacon index 2cc17be..6091223 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit 2cc17bef752f94f4fedd6db77e78afa9cce495a4 +Subproject commit 609122329b97306ebd59995f82452b32d0e5e8db diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab index ab4eebf..8ced595 100644 --- a/prefabs/game.gcprefab +++ b/prefabs/game.gcprefab @@ -49,10 +49,10 @@ -