diff --git a/CMakeLists.txt b/CMakeLists.txt index 82cb160..78d3eea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,7 +211,6 @@ add_executable(my_rpg lib/my/my/my_str_replace.c lib/gamacon/src/sfml_renderer/sfml_init.c lib/gamacon/src/sfml_renderer/sfml_events.c - lib/gamacon/src/isometry/map_utils.c lib/gamacon/include/map_utils.h lib/xmlparser/src/otherget.c src/options.c @@ -221,48 +220,35 @@ add_executable(my_rpg src/options.c lib/gamacon/src/components/input_component.c lib/gamacon/include/components/input_component.h - src/systems/teams_system.c - include/systems/teams_system.h - include/components/teams_component.h - src/components/teams_component.c lib/gamacon/src/components/tag_component.c lib/gamacon/include/components/tag_component.h src/components/game_manager.c include/components/game_manager.h - include/dpr_errors.h - include/components/game_display.h - src/components/game_display.c - src/systems/game_display_system.c - src/isometry/tile_collision_manager.c + include/errors_str.h lib/gamacon/include/tile_collision_manager.h lib/gamacon/src/engine/event_manager.c lib/gamacon/include/event_manager.h - src/teams/absent.c - src/teams/forgot.c include/teams.h src/systems/game_manager_system.c include/systems/game_manager_system.h lib/gamacon/include/keybindings.h - src/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 - src/components/map_manager_component.c - include/components/isometry/map_manager_component.h lib/gamacon/src/isometry/vertex_data_loader.c + lib/gamacon/src/isometry/map_utils.c + lib/gamacon/src/isometry/tile_collisions.c lib/gamacon/include/vertex_data_loader.h - src/toolbar.c - lib/gamacon/include/callbacks.h src/selectors.c + lib/gamacon/include/callbacks.h src/framerate.c lib/gamacon/src/isometry/isometry.c lib/gamacon/include/isometry.h -) + lib/gamacon/src/components/renderers/anim_utils.c) add_compile_options(-W -Wall -Wextra -Wshadow) -target_link_libraries(My3D +target_link_libraries(my_rpg csfml-system csfml-graphics csfml-audio diff --git a/Makefile b/Makefile index 921ed54..51c7c9d 100644 --- a/Makefile +++ b/Makefile @@ -10,19 +10,8 @@ SRC = src/main.c \ src/framerate.c \ src/main_menu.c \ src/options.c \ - src/selectors.c \ - src/toolbar.c \ - src/teams/absent.c \ - src/teams/forgot.c \ - src/systems/game_display_system.c \ src/systems/game_manager_system.c \ - src/systems/teams_system.c \ - src/isometry/map_interactions.c \ - src/isometry/tile_collision_manager.c \ - src/components/map_manager_component.c \ - src/components/game_display.c \ - src/components/game_manager.c \ - src/components/teams_component.c + src/components/game_manager.c OBJ = $(SRC:%.c=%.o) @@ -30,8 +19,8 @@ INCLUDE = -I ./include -I lib/gamacon/include -I lib/gamacon/lib/xmlparser/inclu CFLAGS = $(INCLUDE) -Wall -Wshadow -Wextra -Wno-unused-parameter -LDFLAGS = -L lib/gamacon -L lib/my -L lib/xmlparser -L lib/quadtree\ --lgamacon -lxmlparser -lquadtree -lmy -lcsfml-system -lcsfml-graphics -lcsfml-audio -lcsfml-window -lm +LDFLAGS = -L lib/gamacon -L lib/my -L lib/xmlparser -L lib/quadtree \ + -lgamacon -lxmlparser -lquadtree -lmy -lcsfml-system -lcsfml-graphics -lcsfml-audio -lcsfml-window -lm NAME = my_rpg @@ -72,4 +61,4 @@ dbg: clean $(OBJ) $(MAKE) -C lib/quadtree dbg $(CC) -o $(NAME) $(OBJ) $(LDFLAGS) -.PHONY: all build clean fclean ffclean +.PHONY: all build clean fclean ffclean dbg re diff --git a/assets/sprites/bck_layer1.png b/assets/sprites/bck_layer1.png deleted file mode 100644 index ba94118..0000000 Binary files a/assets/sprites/bck_layer1.png and /dev/null differ diff --git a/assets/sprites/bck_layer2.png b/assets/sprites/bck_layer2.png deleted file mode 100644 index 795d9b0..0000000 Binary files a/assets/sprites/bck_layer2.png and /dev/null differ diff --git a/assets/sprites/bck_layer3.png b/assets/sprites/bck_layer3.png deleted file mode 100644 index f014539..0000000 Binary files a/assets/sprites/bck_layer3.png and /dev/null differ diff --git a/assets/sprites/bck_layer4.png b/assets/sprites/bck_layer4.png deleted file mode 100644 index 9eed2cf..0000000 Binary files a/assets/sprites/bck_layer4.png and /dev/null differ diff --git a/assets/sprites/player_sheet.png b/assets/sprites/player_sheet.png deleted file mode 100644 index 31fe388..0000000 Binary files a/assets/sprites/player_sheet.png and /dev/null differ diff --git a/assets/ui/clown.png b/assets/ui/clown.png deleted file mode 100644 index d4670e7..0000000 Binary files a/assets/ui/clown.png and /dev/null differ diff --git a/assets/ui/happiness.png b/assets/ui/happiness.png deleted file mode 100644 index 35fece0..0000000 Binary files a/assets/ui/happiness.png and /dev/null differ diff --git a/assets/ui/martine_a_epi_marseille.png b/assets/ui/martine_a_epi_marseille.png deleted file mode 100644 index d5ca492..0000000 Binary files a/assets/ui/martine_a_epi_marseille.png and /dev/null differ diff --git a/assets/ui/reset.png b/assets/ui/reset.png deleted file mode 100644 index a3086d2..0000000 Binary files a/assets/ui/reset.png and /dev/null differ diff --git a/assets/ui/rotate.png b/assets/ui/rotate.png deleted file mode 100644 index 03f5c9c..0000000 Binary files a/assets/ui/rotate.png and /dev/null differ diff --git a/assets/ui/texture.png b/assets/ui/texture.png deleted file mode 100644 index fcde006..0000000 Binary files a/assets/ui/texture.png and /dev/null differ diff --git a/assets/ui/tile_select.png b/assets/ui/tile_select.png deleted file mode 100644 index 937f6f4..0000000 Binary files a/assets/ui/tile_select.png and /dev/null differ diff --git a/assets/ui/up_down.png b/assets/ui/up_down.png deleted file mode 100644 index c56e6a2..0000000 Binary files a/assets/ui/up_down.png and /dev/null differ diff --git a/assets/ui/vertex_select.png b/assets/ui/vertex_select.png deleted file mode 100644 index f15e04b..0000000 Binary files a/assets/ui/vertex_select.png and /dev/null differ diff --git a/include/components/game_display.h b/include/components/game_display.h deleted file mode 100644 index 6629f85..0000000 --- a/include/components/game_display.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// Created by anonymus-raccoon on 3/3/20. -// - -#ifndef _TEAMS_COMPONENT_C_ -#define _TEAMS_COMPONENT_H_ - -#include "component.h" - -typedef enum display_type -{ - HAPPINESS_DISPLAY, - STUPIDITY_DISPLAY, - SELECT_TILE_DISPLAY -} display_type_enum; - -struct game_display -{ - gc_component base; - display_type_enum type; -}; - -const struct game_display game_display; -const struct gc_system game_display_system; - -#endif //_TEAMS_COMPONENT_C_ diff --git a/include/components/game_manager.h b/include/components/game_manager.h index 61f35be..c940389 100644 --- a/include/components/game_manager.h +++ b/include/components/game_manager.h @@ -10,8 +10,6 @@ struct game_manager { gc_component base; - int happiness; - int stupidity; }; const struct game_manager game_manager; diff --git a/include/components/isometry/map_manager_component.h b/include/components/isometry/map_manager_component.h deleted file mode 100644 index aa18548..0000000 --- a/include/components/isometry/map_manager_component.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// 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/components/teams_component.h b/include/components/teams_component.h deleted file mode 100644 index c2224ca..0000000 --- a/include/components/teams_component.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// Created by anonymus-raccoon on 3/3/20. -// - -#ifndef _TEAMS_COMPONENT_C_ -#define _TEAMS_COMPONENT_H_ - -#include "component.h" - -struct teams_component -{ - gc_component base; - float next_teams; - float delay; - char **prefabs; - int *prefabs_size; - int prefab_count; -}; - -const struct teams_component teams_component; - -bool teams_move_up(gc_scene *scene, float amount, float y_level); -void pm_clicked(gc_engine *engine, gc_entity *entity); - -#endif //_TEAMS_COMPONENT_C_ diff --git a/include/dpr_errors.h b/include/errors_str.h similarity index 100% rename from include/dpr_errors.h rename to include/errors_str.h diff --git a/include/map_interactions.h b/include/map_interactions.h deleted file mode 100644 index b607a06..0000000 --- a/include/map_interactions.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -** EPITECH PROJECT, 2020 -** Gamacon -** File description: -** map_interactions -*/ - - -#ifndef MY3D_MAP_INTERACTIONS_H -#define MY3D_MAP_INTERACTIONS_H - -#include "engine.h" -#include "components/vertex_component.h" -#include "keybindings.h" - -enum modes_on_tile { - VERTEX_0 = 2, - VERTEX_1 = 4, - VERTEX_2 = 8, - VERTEX_3 = 16, - ALL_VERTICES = 30, - INVERT_ADD_VALUE = 1 -}; - -bool map_onclick(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 de33326..6b8f139 100644 --- a/include/setup.h +++ b/include/setup.h @@ -27,12 +27,4 @@ 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 _); bool framerate_up(gc_engine *engine, gc_entity *entity, gc_vector2 _); -bool framerate_down(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 reset(gc_engine *engine, gc_entity *entity, gc_vector2 _); -bool rotate(gc_engine *engine, gc_entity *entity, gc_vector2 _); -bool texture(gc_engine *engine, gc_entity *entity, gc_vector2 _); -bool switch_texture(gc_engine *engine, gc_entity *entity, gc_vector2 _); \ No newline at end of file +bool framerate_down(gc_engine *engine, gc_entity *entity, gc_vector2 _); \ No newline at end of file diff --git a/include/systems/teams_system.h b/include/systems/teams_system.h deleted file mode 100644 index ee190c3..0000000 --- a/include/systems/teams_system.h +++ /dev/null @@ -1,12 +0,0 @@ -// -// Created by anonymus-raccoon on 3/3/20. -// - -#ifndef _TEAMS_SYSTEM_H_ -#define _TEAMS_SYSTEM_H_ - -#include "system.h" - -const gc_system teams_system; - -#endif //_TEAMS_SYSTEM_H_ diff --git a/include/teams.h b/include/teams.h deleted file mode 100644 index 79ea9da..0000000 --- a/include/teams.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// Created by anonymus-raccoon on 3/9/20. -// - -#ifndef _TEAMS_H_ -#define _TEAMS_H_ - -#include -#include "engine.h" - -bool absent_check(gc_engine *engine, int entity_id, gc_vector2 _); -bool absent_cross(gc_engine *engine, int entity_id, gc_vector2 _); - -bool forgot_lmfao(gc_engine *engine, int entity_id, gc_vector2 _); -bool forgot_ok(gc_engine *engine, int entity_id, gc_vector2 _); - -#endif //_TEAMS_H_ diff --git a/lib/gamacon b/lib/gamacon index d66d6e7..a1b4008 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit d66d6e792409d80d51c051f7df936b4ec9bd4e54 +Subproject commit a1b400860f60ea3957522688b96c54e5d4e7dafe diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab index b2b031b..80a17a6 100644 --- a/prefabs/game.gcprefab +++ b/prefabs/game.gcprefab @@ -5,14 +5,6 @@ - - - - - - - - @@ -35,8 +27,6 @@ - - @@ -49,36 +39,6 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/prefabs/mainmenu.gcprefab b/prefabs/mainmenu.gcprefab index 8c7cab7..72af2e4 100644 --- a/prefabs/mainmenu.gcprefab +++ b/prefabs/mainmenu.gcprefab @@ -7,7 +7,7 @@ - +