diff --git a/CMakeLists.txt b/CMakeLists.txt index 029cc7d..49ba380 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,7 @@ add_executable(My3D lib/gamacon/src/sfml_renderer/sfml_init.c lib/gamacon/src/sfml_renderer/sfml_events.c lib/gamacon/src/components/isometry/map_managment.c - lib/gamacon/include/components/map_managment.h + lib/gamacon/include/map_managment.h lib/xmlparser/src/otherget.c src/options.c lib/gamacon/src/components/input_component.c @@ -242,17 +242,17 @@ add_executable(My3D src/systems/game_manager_system.c include/systems/game_manager_system.h lib/gamacon/include/keybindings.h - lib/gamacon/src/components/isometry/map_interactions.c - lib/gamacon/include/map_interactions.h + src/components/isometry/map_interactions.c + include/map_interactions.h lib/gamacon/include/keybindings.h lib/gamacon/src/ui/tooltip.c lib/gamacon/src/components/tooltip_component.c lib/gamacon/include/components/tooltip_component.h lib/gamacon/src/systems/tooltip_system.c - lib/gamacon/src/components/isometry/map_manager_component.c - lib/gamacon/include/components/isometry/map_manager_component.h + 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) + lib/gamacon/include/vertex_data_loader.h src/toolbar.c lib/gamacon/include/callbacks.h src/selectors.c) add_compile_options(-W -Wall -Wextra -Wshadow) diff --git a/assets/ui/texture.png b/assets/ui/texture.png new file mode 100644 index 0000000..fcde006 Binary files /dev/null and b/assets/ui/texture.png differ diff --git a/include/components/isometry/map_manager_component.h b/include/components/isometry/map_manager_component.h new file mode 100644 index 0000000..c6ffec0 --- /dev/null +++ b/include/components/isometry/map_manager_component.h @@ -0,0 +1,28 @@ +// +// Created by anonymus-raccoon on 3/10/20. +// + +#ifndef _MAP_MANAGER_COMPONENT_H_ +#define _MAP_MANAGER_COMPONENT_H_ + +#include "component.h" + +enum brush +{ + MOVE, + RESET, + ROTATE, + TEXTURE +}; + +struct map_manager_component +{ + gc_component base; + bool tile_mode; + enum brush brush; + void *selected_texture; +}; + +const struct map_manager_component map_manager_component; + +#endif //_MAP_MANAGER_COMPONENT_H_ diff --git a/include/map_interactions.h b/include/map_interactions.h new file mode 100644 index 0000000..e49d459 --- /dev/null +++ b/include/map_interactions.h @@ -0,0 +1,19 @@ +/* +** EPITECH PROJECT, 2020 +** Gamacon +** File description: +** map_interactions +*/ + + +#ifndef MY3D_MAP_INTERACTIONS_H +#define MY3D_MAP_INTERACTIONS_H + +#include "engine.h" +#include "vertex_component.h" +#include "keybindings.h" + +bool tile_interact(gc_engine *engine, gc_entity *entity, gc_vector2 pos, \ +enum gc_mousekeys key); + +#endif //MY3D_MAP_INTERACTIONS_H diff --git a/include/setup.h b/include/setup.h index bed6d75..dc82ffb 100644 --- a/include/setup.h +++ b/include/setup.h @@ -30,4 +30,5 @@ 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 reset(gc_engine *engine, gc_entity *entity, gc_vector2 _); -bool rotate(gc_engine *engine, gc_entity *entity, gc_vector2 _); \ No newline at end of file +bool rotate(gc_engine *engine, gc_entity *entity, gc_vector2 _); +bool texture(gc_engine *engine, gc_entity *entity, gc_vector2 _); \ No newline at end of file diff --git a/lib/gamacon b/lib/gamacon index 6091223..02861ba 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit 609122329b97306ebd59995f82452b32d0e5e8db +Subproject commit 02861bab238ff37ecde010902300e81907ebade7 diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab index 89ec06e..ad52eb0 100644 --- a/prefabs/game.gcprefab +++ b/prefabs/game.gcprefab @@ -12,6 +12,7 @@ + @@ -49,12 +50,13 @@ - +