zoriya/Gamacon
1
0
Fork 0
mirror of https://github.com/zoriya/Gamacon.git synced 2026-05-27 17:11:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up and making the makefile compile

Browse Source
This commit is contained in:
AnonymusRaccoon
2020-03-12 19:44:41 +01:00
parent 7f8048fe73
commit 2d9e7acac2
13 changed files with 80 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+71 -60
View File
@@ -6,57 +6,68 @@
##
SRC = src/engine/engine.c \
src/engine/engine_internal.c \
src/engine/discard_player.c \
src/engine/engine_dataloader.c \
src/entity/entity.c \
src/entity/entity_factory.c \
src/component.c \
src/components/movable_component.c \
src/components/collision_component.c \
src/components/transform_component.c \
src/components/renderer.c \
src/components/camera_follow.c \
src/components/fixed_to_cam.c \
src/components/parallax_component.c \
src/components/vertex_component.c \
src/components/controllable_component.c \
src/components/friction_component.c \
src/components/friction_giver.c \
src/components/controllers/keyboard_controller.c \
src/components/renderers/sprite_renderer.c \
src/components/renderers/anim_renderer.c \
src/components/renderers/text_renderer.c \
src/components/renderers/map_renderer.c \
src/scene/scene.c \
src/scene/scene_loader.c \
src/scene/scene_destroy.c \
src/utility/arraylen.c \
src/utility/list.c \
src/utility/tupple.c \
src/deserializer/deserialize_entity.c \
src/deserializer/prefab.c \
src/system.c \
src/systems/sfml_renderer_system.c \
src/systems/movable_system.c \
src/systems/camera_follow_system.c \
src/systems/collision_system.c \
src/systems/parallax_system.c \
src/systems/controllers/keyboard_controller_system.c \
src/systems/friction_system.c \
src/systems/fixed_to_cam_pseudosystem.c \
src/engine/engine_system_builder.c \
src/engine/engine_component_builder.c \
src/utility/vector2.c \
src/utility/my_realloc.c \
src/sfml_renderer/sfml_dataloaders.c \
src/sfml_renderer/sfml_music_player.c \
src/sfml_renderer/texture_utility.c \
src/sfml_renderer/sfml_drawer.c \
src/sfml_renderer/sfml_functions.c \
src/sfml_renderer/sfml_vertex.c \
src/ui/setup_ui.c \
src/ui/button.c
src/engine/engine_internal.c \
src/engine/discard_player.c \
src/engine/engine_dataloader.c \
src/entity/entity.c \
src/entity/entity_factory.c \
src/component.c \
src/components/movable_component.c \
src/components/collision_component.c \
src/components/transform_component.c \
src/components/renderer.c \
src/components/camera_follow.c \
src/components/fixed_to_cam.c \
src/components/parallax_component.c \
src/components/controllable_component.c \
src/components/friction_component.c \
src/components/friction_giver.c \
src/components/input_component.c \
src/components/tooltip_component.c \
src/components/controllers/keyboard_controller.c \
src/components/renderers/sprite_renderer.c \
src/components/renderers/anim_renderer.c \
src/components/renderers/text_renderer.c \
src/components/renderers/map_renderer.c \
src/scene/scene.c \
src/scene/scene_loader.c \
src/scene/scene_destroy.c \
src/utility/arraylen.c \
src/utility/list.c \
src/utility/tupple.c \
src/deserializer/deserialize_entity.c \
src/deserializer/prefab.c \
src/system.c \
src/systems/sfml_renderer_system.c \
src/systems/movable_system.c \
src/systems/camera_follow_system.c \
src/systems/collision_system.c \
src/systems/parallax_system.c \
src/systems/controllers/keyboard_controller_system.c \
src/systems/friction_system.c \
src/systems/tooltip_system.c \
src/systems/clickable_system.c \
src/systems/fixed_to_cam_pseudosystem.c \
src/engine/engine_system_builder.c \
src/engine/engine_component_builder.c \
src/engine/event_manager.c \
src/utility/vector2.c \
src/utility/my_realloc.c \
src/sfml_renderer/sfml_dataloaders.c \
src/sfml_renderer/sfml_music_player.c \
src/sfml_renderer/texture_utility.c \
src/sfml_renderer/sfml_drawer.c \
src/sfml_renderer/sfml_functions.c \
src/sfml_renderer/sfml_vertex.c \
src/sfml_renderer/sfml_events.c \
src/sfml_renderer/sfml_init.c \
src/ui/setup_ui.c \
src/ui/button.c \
src/ui/tooltip.c \
src/isometry/isometry.c \
src/isometry/map_utils.c \
src/components/vertex_component.c \
src/isometry/vertex_data_loader.c
OBJ = $(SRC:%.c=%.o)
@@ -65,7 +76,7 @@ GCDA = *.gcda
GCNO = *.gcno
TESTS = tests/deserializations.c \
tests/game_loop.c
tests/game_loop.c
INCLUDE = -I ./include
@@ -87,20 +98,20 @@ AR = ar rc
all: $(NAME)
$(NAME): $(OBJ)
$(AR) $(NAME) $(OBJ)
$(AR) $(NAME) $(OBJ)
tests_run:
$(CC) -o $(UT) $(SRC) $(TESTS) $(COVERAGE) $(CFLAGS) $(LDFLAGS)
$(UT)
$(CC) -o $(UT) $(SRC) $(TESTS) $(COVERAGE) $(CFLAGS) $(LDFLAGS)
$(UT)
clean:
$(RM) $(OBJ)
$(RM) $(GCDA)
$(RM) $(GCNO)
$(RM) $(OBJ)
$(RM) $(GCDA)
$(RM) $(GCNO)
fclean: clean
$(RM) $(NAME)
$(RM) $(UT)
$(RM) $(NAME)
$(RM) $(UT)
re: fclean all
include/create_map_functions.h → include/isometry.h
+1 -1
View File
@@ -9,7 +9,7 @@
#define MY3D_CREATE_MAP_FUNCTIONS_H
#include <stdbool.h>
#include "vertex_component.h"
#include "components/vertex_component.h"
bool get_vertices(struct vertex_component *this, node *n);
char *get_texture_for_coords(gc_vector2i coords, node *n);
include/map_managment.h → include/map_utils.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include "engine.h"
#include <stdbool.h>
#include "vertex_component.h"
#include "components/vertex_component.h"
#define ANGLE_X 45
#define ANGLE_Y 35
include/tile_collision_manager.h
+1 -1
View File
@@ -9,7 +9,7 @@
#define MY3D_TILE_COLLISION_MANAGER_H
#include <stdbool.h>
#include "vertex_component.h"
#include "components/vertex_component.h"
//! @brief Checks if a point q is on the segment pr
bool is_on_segment(gc_vector2 p, gc_vector2 q, gc_vector2 r);
src/components/tile_collision_manager.c
-80
View File
@@ -1,80 +0,0 @@
/*
** EPITECH PROJECT, 2020
** Gamacon
** File description:
** tile collision_managment
*/
#include "tile_collision_manager.h"
#include "map_managment.h"
#include <math.h>
#define INF 10000
bool is_on_segment(gc_vector2 p, gc_vector2 q, gc_vector2 r)
{
if (q.x <= fmaxf(p.x, r.x) && q.x >= fminf(p.x, r.x) && \
q.y <= fmaxf(p.y, r.y) && q.y >= fminf(p.y, r.y))
return (true);
return (false);
}
int orientation(gc_vector2 p, gc_vector2 q, gc_vector2 r)
{
int tmp = (q.y - p.y) * (r.x - q.x) - (q.x - p.x) * (r.y - q.y);
if (tmp == 0)
return (0);
return ((tmp > 0) ? 1 : 2);
}
bool gc_vector2_do_intersect(gc_vector2 p1, gc_vector2 q1, gc_vector2 p2, gc_vector2 q2)
{
int o1 = orientation(p1, q1, p2);
int o2 = orientation(p1, q1, q2);
int o3 = orientation(p2, q2, p1);
int o4 = orientation(p2, q2, q1);
if (o1 != o2 && o3 != o4)
return (true);
if (o1 == 0 && is_on_segment(p1, p2, q1))
return (true);
if (o2 == 0 && is_on_segment(p1, q2, q1))
return (true);
if (o3 == 0 && is_on_segment(p2, p1, q2))
return (true);
if (o4 == 0 && is_on_segment(p2, q1, q2))
return (true);
return (false);
}
bool is_point_in_polygon(gc_vector2 *polygon, int n, gc_vector2 p)
{
gc_vector2 segment = {-INF, p.y};
int count = 0;
int next = 0;
int i = 0;
if (n < 3)
return (false);
do {
next = (i + 1) % n;
if (gc_vector2_do_intersect(polygon[i], polygon[next], p, segment)) {
if (orientation(polygon[i], p, polygon[next]) == 0)
return (is_on_segment(polygon[i], p, polygon[next]));
count++;
}
i = next;
} while (i != 0);
return (count & 1);
}
bool is_pos_in_tile(gc_vector2 pos, struct tile *tile)
{
struct vertex **c = tile->corners;
gc_vector2 corners[4];
for (int i = 0; i < 4; i++)
corners[i] = get_tile_coords_to_pixels(c[i]->x, c[i]->y, c[i]->z);
return (is_point_in_polygon(corners, 4, pos));
}
src/components/isometry/vertex_component.c → src/components/vertex_component.c
+1 -1
View File
@@ -8,7 +8,7 @@
#include "xml.h"
#include "component.h"
#include "components/vertex_component.h"
#include "create_map_functions.h"
#include "isometry.h"
#include "utility.h"
#include <stddef.h>
src/engine/engine_component_builder.c
+1 -3
View File
@@ -18,8 +18,7 @@
#include "components/friction_giver.h"
#include "components/collision_component.h"
#include "components/vertex_component.h"
#include <components/tooltip_component.h>
#include <components/isometry/map_manager_component.h>
#include "components/tooltip_component.h"
#include "components/clickable_component.h"
#include "components/tag_component.h"
#include "components/input_component.h"
@@ -50,5 +49,4 @@ void engine_add_buildin_components(gc_engine *engine)
engine->add_component(engine, &input_component);
engine->add_component(engine, &tag_component);
engine->add_component(engine, &tooltip_component);
engine->add_component(engine, &map_manager_component);
}
src/engine/engine_system_builder.c
+1 -1
View File
@@ -16,7 +16,7 @@
#include "systems/camerafollow_system.h"
#include "systems/tooltip_system.h"
#include "sfml_renderer.h"
#include "clickable_component.h"
#include "components/clickable_component.h"
void engine_add_system(gc_engine *engine, const void *system)
{
src/components/isometry/create_map_functions.c → src/isometry/isometry.c
+1 -1
View File
@@ -8,7 +8,7 @@
#include "xml.h"
#include <malloc.h>
#include <stdint.h>
#include "create_map_functions.h"
#include "isometry.h"
bool get_vertices(struct vertex_component *this, node *n)
{
src/components/isometry/map_managment.c → src/isometry/map_utils.c
+2 -2
View File
@@ -6,9 +6,9 @@
*/
#include "engine.h"
#include "map_managment.h"
#include "map_utils.h"
#include <math.h>
#include "vertex_component.h"
#include "components/vertex_component.h"
#include "stdint.h"
gc_vector2 get_tile_coords_to_pixels(float x, float y, float z)
src/components/isometry/vertex_data_loader.c → src/isometry/vertex_data_loader.c
View File
src/sfml_renderer/sfml_vertex.c
-1
View File
@@ -12,7 +12,6 @@
#include "components/transform_component.h"
#include "systems/sfml_renderer_system.h"
#include "components/vertex_component.h"
#include "map_managment.h"
#include <math.h>
#include <stdint.h>
#include <SFML/Graphics.h>
src/systems/clickable_manager.c → src/systems/clickable_system.c
-1
View File
@@ -9,7 +9,6 @@
#include "engine.h"
#include "components/clickable_component.h"
#include "components/transform_component.h"
#include "map_interactions.h"
#include <stddef.h>
#include <keybindings.h>