zoriya/Gamacon
1
0
Fork 0
mirror of https://github.com/zoriya/Gamacon.git synced 2026-06-03 20:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:AnonymusRaccoon/Gamacon

Browse Source
This commit is contained in:
Anonymus Raccoon
2020-04-30 15:47:24 +02:00
parent 3d38d89d55 ebfdd0b4e9
commit c9e77951c8
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/map_utils.h
+3
View File
@@ -10,6 +10,7 @@
#include "engine.h"
#include <stdbool.h>
#include "components/vertex_component.h"
#include "systems/sfml_renderer_system.h"
#define ANGLE_X 25
#define ANGLE_Y 35
@@ -18,4 +19,6 @@
struct tile *get_tile_from_pos(struct vertex_component *map, gc_vector2 pos);
struct tile *get_tile_at(struct vertex_component *v, gc_vector2i p);
gc_vector2 gc_vector2_from_coords(float x, float y, float z);
struct tile*get_selected_tile(struct sfml_renderer_system *this, \
struct vertex_component *info, gc_vector2 pos);
bool is_pos_in_tile(gc_vector2 pos, struct tile *tile);
src/isometry/map_utils.c
+11
View File
@@ -10,6 +10,7 @@
#include <math.h>
#include "components/vertex_component.h"
#include "stdint.h"
#include "systems/sfml_renderer_system.h"
gc_vector2 gc_vector2_from_coords(float x, float y, float z)
{
@@ -64,4 +65,14 @@ sel->corners[i]->y, sel->corners[i]->z);
}
}
return (i_stock);
}
struct tile*get_selected_tile(struct sfml_renderer_system *this, \
struct vertex_component *info, gc_vector2 pos)
{
sfVector2i v = sfMouse_getPosition((const sfWindow *) this->window);
sfVector2f w = sfRenderWindow_mapPixelToCoords(this->window, v, this->view);
w.y *= -1;
return (get_tile_from_pos(info, gc_vector2_add(pos, *(gc_vector2 *)&w)));
}
src/sfml_renderer/sfml_vertex.c
+15 -11
View File
@@ -85,19 +85,23 @@ struct vertex_component *info, float dt)
{
struct sfml_renderer_system *this = GETSYS(engine, sfml_renderer_system);
struct transform_component *tra = GETCMP(entity, transform_component);
sfVector2i v = sfMouse_getPosition((const sfWindow *) this->window);
sfVector2f w = sfRenderWindow_mapPixelToCoords(this->window, v, this->view);
gc_vector2 pos = tra->position;
int i;
struct tile *tl;
int width = 0;
int length = 0;
int end_diagonal = 0;
w.y *= -1;
if (!info || !info->map)
return;
tl = get_tile_from_pos(info, gc_vector2_add(pos, *(gc_vector2 *)&w));
for (i = 0; info->map[i].corners[0]; i++);
for (i--; i >= 0; i--) {
sfmlrenderer_manage_hovered_tile(this, &info->map[i] == tl);
sfmlrenderer_draw_tile(engine, pos, &info->map[i], dt);
}
tl = get_selected_tile(this, info, tra->position);
for (width = 0; info->vertices[0][width].z != INT32_MIN; width++);
for (length = 0; info->map[length].corners[0]; length++);
width--;
end_diagonal = length + width - 1;
for (int i = length - 1; i >= 0; i -= (i > length - width) ? 1 : width) {
end_diagonal -= (end_diagonal <= width) ? 1 : width;
for (int j = i; j >= end_diagonal; j -= width - 1) {
sfmlrenderer_manage_hovered_tile(this, &info->map[j] == tl);
sfmlrenderer_draw_tile(engine, tra->position, &info->map[j], dt);
}
}
}