Szopen_Interactif/wschod
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to gboolean

Browse Source
This commit is contained in:
emil
2025-06-08 12:08:20 +02:00
parent 1af73284f6
commit 8faf85af0b
17 changed files with 60 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/camera.h
-2
View File
@@ -2,8 +2,6 @@
#include <cglm/cglm.h>
#include "util.h"
void camera_get_direction (vec3 dest);
void camera_get_right (vec3 dest);
void camera_get_view (mat4 dest);
game/src/chunk/chunkman.c
+1 -1
View File
@@ -7,7 +7,7 @@ int n_frame_chunks;
static GHashTable *chunks;
static GHashTable *chunk_meshes;
static bool bound = false;
static gboolean bound = false;
guint
chunkman_ivec2_hash (gconstpointer key)
game/src/chunk/chunkmesh.c
+1 -1
View File
@@ -114,7 +114,7 @@ ChunkMesh_bind (ChunkMesh *mesh)
}
void
ChunkMesh_render (ChunkMesh *mesh, bool wireframe)
ChunkMesh_render (ChunkMesh *mesh, gboolean wireframe)
{
glBindBuffer (GL_ARRAY_BUFFER, mesh->hbo);
game/src/chunk/chunkmesh.h
+1 -1
View File
@@ -21,4 +21,4 @@ typedef struct ChunkMesh
ChunkMesh *ChunkMesh_build (Chunk *chunk, Chunk *nr, Chunk *nd, Chunk *nc);
void ChunkMesh_bind (ChunkMesh *mesh);
void ChunkMesh_render (ChunkMesh *mesh, bool wireframe);
void ChunkMesh_render (ChunkMesh *mesh, gboolean wireframe);
game/src/entity/entity.h
+4 -6
View File
@@ -8,24 +8,22 @@
#include <glib-2.0/glib.h>
#include <cglm/cglm.h>
#include <stdbool.h>
typedef struct Entity
{
enum { MESH_QUAD1, MESH_QUAD2, MESH_QUAD_X } mesh_type;
enum { ORIGIN_CENTER, ORIGIN_BOTTOM } origin;
enum { RENDER_NORMAL, RENDER_BILLBOARD_Y, RENDER_BILLBOARD } render_type;
bool visible;
bool dont_cull;
gboolean visible;
gboolean dont_cull;
/* 100 means as far as the terrain goes, less than 100, for example
50, means half as far as the terrain goes. */
unsigned int cull_distance;
bool wavy;
gboolean wavy;
void *userdata;
void (*on_tick) (struct Entity *self);
bool tick_me_i_dont_care; /* Tick this entity regardless of the
gboolean tick_me_i_dont_care; /* Tick this entity regardless of the
distance and other
predicates. Useful for NPCs. */
game/src/event/evtman.c
+13 -13
View File
@@ -4,21 +4,21 @@ extern vec3 camera_rotation;
static GList *handlers = NULL;
bool
gboolean
evt_pred_key (SDL_Event *event, void *data)
{
unsigned int expected_key = GPOINTER_TO_INT (data);
return event->key.key == expected_key;
}
bool
gboolean
evt_pred_mouse (SDL_Event *event, void *data)
{
unsigned int expected_button = GPOINTER_TO_INT (data);
return event->button.button == expected_button;
}
bool
gboolean
evt_pred_flag (SDL_Event *event, void *data)
{
UNUSED (event);
@@ -26,14 +26,14 @@ evt_pred_flag (SDL_Event *event, void *data)
return flags_get (flag);
}
bool
gboolean
evt_cpred_and (SDL_Event *event, void *data)
{
CompositePredicate *cp = data;
return cp->a (event, cp->a_data) && cp->b (event, cp->b_data);
}
bool
gboolean
evt_cpred_or (SDL_Event *event, void *data)
{
CompositePredicate *cp = data;
@@ -41,8 +41,8 @@ evt_cpred_or (SDL_Event *event, void *data)
}
CompositePredicate *
evt_pred_compose (bool (*a) (SDL_Event *sdl_event, void *userdata), void *a_data,
bool (*b) (SDL_Event *sdl_event, void *userdata), void *b_data)
evt_pred_compose (gboolean (*a) (SDL_Event *sdl_event, void *userdata), void *a_data,
gboolean (*b) (SDL_Event *sdl_event, void *userdata), void *b_data)
{
CompositePredicate *out = g_new (CompositePredicate, 1);
out->a = a;
@@ -52,7 +52,7 @@ evt_pred_compose (bool (*a) (SDL_Event *sdl_event, void *userdata), void *a_data
return out;
}
bool
gboolean
evt_cb_rotate_camera (SDL_Event *event, void *userdata)
{
UNUSED (userdata);
@@ -63,7 +63,7 @@ evt_cb_rotate_camera (SDL_Event *event, void *userdata)
return true;
}
bool
gboolean
evt_cb_flag_off (SDL_Event *event, void *data)
{
UNUSED (event);
@@ -72,7 +72,7 @@ evt_cb_flag_off (SDL_Event *event, void *data)
return true;
}
bool
gboolean
evt_cb_flag_on (SDL_Event *event, void *data)
{
UNUSED (event);
@@ -81,7 +81,7 @@ evt_cb_flag_on (SDL_Event *event, void *data)
return true;
}
bool
gboolean
evt_cb_flag_switch (SDL_Event *event, void *data)
{
UNUSED (event);
@@ -127,9 +127,9 @@ evtman_init ()
void
evtman_add_handler (int priority, unsigned int filter,
bool (*predicate) (SDL_Event *sdl_event, void *userdata),
gboolean (*predicate) (SDL_Event *sdl_event, void *userdata),
void *predicate_data,
bool (*callback) (SDL_Event *sdl_event, void *userdata),
gboolean (*callback) (SDL_Event *sdl_event, void *userdata),
void *callback_data)
{
EventHandler *h = g_new (EventHandler, 1);
game/src/event/evtman.h
+4 -4
View File
@@ -11,17 +11,17 @@
typedef struct CompositePredicate
{
bool (*a) (SDL_Event *sdl_event, void *userdata);
gboolean (*a) (SDL_Event *sdl_event, void *userdata);
void *a_data;
bool (*b) (SDL_Event *sdl_event, void *userdata);
gboolean (*b) (SDL_Event *sdl_event, void *userdata);
void *b_data;
} CompositePredicate;
void evtman_init ();
void evtman_add_handler (int priority, unsigned int filter,
bool (*predicate) (SDL_Event *sdl_event, void *userdata),
gboolean (*predicate) (SDL_Event *sdl_event, void *userdata),
void *predicate_data,
bool (*callback) (SDL_Event *sdl_event, void *userdata),
gboolean (*callback) (SDL_Event *sdl_event, void *userdata),
void *callback_data);
void evtman_handle_SDL_Event (SDL_Event *event);
game/src/event/handler.h
+3 -4
View File
@@ -1,13 +1,12 @@
#pragma once
#include <SDL3/SDL.h>
#include <stdbool.h>
#include <glib-2.0/glib.h>
typedef struct {
unsigned int filter;
int priority;
void *predicate_data, *callback_data;
bool (*predicate) (SDL_Event *sdl_event, void *userdata);
bool (*callback) (SDL_Event *sdl_event, void *userdata);
gboolean (*predicate) (SDL_Event *sdl_event, void *userdata);
gboolean (*callback) (SDL_Event *sdl_event, void *userdata);
} EventHandler;
game/src/flags.c
+2 -2
View File
@@ -15,12 +15,12 @@ flags_switch (char *flag)
}
void
flags_set (char *flag, bool value)
flags_set (char *flag, gboolean value)
{
g_hash_table_replace (flags, flag, GINT_TO_POINTER (value));
}
bool
gboolean
flags_get (char *flag)
{
return GPOINTER_TO_INT (g_hash_table_lookup (flags, flag));
game/src/flags.h
+7 -4
View File
@@ -1,7 +1,5 @@
#pragma once
#include <stdbool.h>
#include <glib-2.0/glib.h>
/*
@@ -15,11 +13,16 @@
moving_left
moving_right
flight_enabled
flying_up
flying_down
flying_fast
ui_has_focus
*/
void flags_init ();
void flags_switch (char *flag);
void flags_set (char *flag, bool value);
bool flags_get (char *flag);
void flags_set (char *flag, gboolean value);
gboolean flags_get (char *flag);
game/src/gl/mesh.c
+1 -1
View File
@@ -23,7 +23,7 @@ SimpleMesh_bind (SimpleMesh *mesh)
}
void
SimpleMesh_render (SimpleMesh *mesh, bool wireframe)
SimpleMesh_render (SimpleMesh *mesh, gboolean wireframe)
{
glDrawElements (wireframe ? GL_LINES : GL_TRIANGLES, mesh->indices_len, GL_UNSIGNED_INT, 0);
}
game/src/gl/mesh.h
+1 -1
View File
@@ -14,7 +14,7 @@ typedef struct SimpleMesh
} SimpleMesh;
void SimpleMesh_bind (SimpleMesh *mesh);
void SimpleMesh_render (SimpleMesh *mesh, bool wireframe);
void SimpleMesh_render (SimpleMesh *mesh, gboolean wireframe);
SimpleMesh SimpleMesh_make_quad1 ();
SimpleMesh SimpleMesh_make_quad2 ();
game/src/main.c
-2
View File
@@ -1,8 +1,6 @@
#define SDL_MAIN_USE_CALLBACKS 1
#include <SDL3/SDL_main.h>
#include <stdio.h>
#include "event/evtman.h"
#include "chunk/chunkman.h"
#include "entity/templates.h"
game/src/ui/uielement.c
+2 -2
View File
@@ -32,7 +32,7 @@ UIElement_root_new ()
}
UIElement *
UIElement_container_new (bool horizontal)
UIElement_container_new (gboolean horizontal)
{
UIElement *e = ui_el_new_internal (UI_KIND_CONTAINER);
e->container.horizontal = horizontal;
@@ -212,7 +212,7 @@ UIElement_render_with_model (UIElement *element, mat3 parent_model)
}
}
static bool
static gboolean
UIElement_hit_test (UIElement *element, mat3 parent_model, vec2 point)
{
mat3 model;
game/src/ui/uielement.h
+4 -8
View File
@@ -1,9 +1,5 @@
#pragma once
/* TODO: Seperate userdata for each callback. */
#include <stdbool.h>
#include <glib-2.0/glib.h>
#include <cglm/cglm.h>
@@ -22,7 +18,7 @@ typedef enum UIKind
typedef struct UIContainer
{
bool horizontal;
gboolean horizontal;
} UIContainer;
typedef struct UILabel
@@ -42,8 +38,8 @@ typedef struct UIElement
vec2 scale;
vec4 background_color, hover_background_color;
unsigned int texture;
bool visible;
bool hovered;
gboolean visible;
gboolean hovered;
void (*on_left_click) (struct UIElement *, void *);
void *left_click_data;
@@ -61,7 +57,7 @@ typedef struct UIElement
void ui_element_mesh_init ();
UIElement *UIElement_root_new ();
UIElement *UIElement_container_new (bool horizontal);
UIElement *UIElement_container_new (gboolean horizontal);
UIElement *UIElement_label_new (const char *text);
void UIElement_add_child (UIElement *parent, UIElement *child);
game/src/ui/uiman.c
+8 -8
View File
@@ -88,7 +88,7 @@ screen_to_ui_coords (int mouse_x, int mouse_y, int screen_w, int screen_h, vec2
out_coords[1] = 1.0 - (float) mouse_y / (float) screen_h * 2.0;
}
bool
gboolean
uiman_cb_switch_focus (SDL_Event *event, void *data)
{
UNUSED (event, data);
@@ -97,21 +97,21 @@ uiman_cb_switch_focus (SDL_Event *event, void *data)
return true;
}
bool
gboolean
uiman_cb_key_down (SDL_Event *event, void *data)
{
UNUSED (event, data);
return false;
}
bool
gboolean
uiman_cb_key_up (SDL_Event *event, void *data)
{
UNUSED (event, data);
return false;
}
bool
gboolean
uiman_cb_mouse_motion (SDL_Event *event, void *data)
{
/* What even is in data at this point? No fucking idea. */
@@ -144,7 +144,7 @@ uiman_cb_mouse_motion (SDL_Event *event, void *data)
return true;
}
bool
gboolean
uiman_cb_button_down (SDL_Event *event, void *data)
{
UNUSED (data);
@@ -175,21 +175,21 @@ uiman_cb_button_down (SDL_Event *event, void *data)
return false;
}
bool
gboolean
uiman_cb_button_up (SDL_Event *event, void *data)
{
UNUSED (event, data);
return false;
}
bool
gboolean
uiman_cb_mouse_wheel (SDL_Event *event, void *data)
{
UNUSED (event, data);
return false;
}
bool
gboolean
uiman_cb_text_input (SDL_Event *event, void *data)
{
UNUSED (event, data);
game/src/ui/uiman.h
+8 -8
View File
@@ -9,12 +9,12 @@ void uiman_init ();
void uiman_tick ();
void uiman_render ();
bool uiman_cb_switch_focus (SDL_Event *event, void *data);
gboolean uiman_cb_switch_focus (SDL_Event *event, void *data);
bool uiman_cb_key_down (SDL_Event *event, void *data);
bool uiman_cb_key_up (SDL_Event *event, void *data);
bool uiman_cb_mouse_motion (SDL_Event *event, void *data);
bool uiman_cb_button_down (SDL_Event *event, void *data);
bool uiman_cb_button_up (SDL_Event *event, void *data);
bool uiman_cb_mouse_wheel (SDL_Event *event, void *data);
bool uiman_cb_text_input (SDL_Event *event, void *data);
gboolean uiman_cb_key_down (SDL_Event *event, void *data);
gboolean uiman_cb_key_up (SDL_Event *event, void *data);
gboolean uiman_cb_mouse_motion (SDL_Event *event, void *data);
gboolean uiman_cb_button_down (SDL_Event *event, void *data);
gboolean uiman_cb_button_up (SDL_Event *event, void *data);
gboolean uiman_cb_mouse_wheel (SDL_Event *event, void *data);
gboolean uiman_cb_text_input (SDL_Event *event, void *data);