aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUneven Prankster <unevenprankster@protonmail.com>2023-07-25 10:02:38 -0300
committerUneven Prankster <unevenprankster@protonmail.com>2023-07-25 10:02:38 -0300
commitf1a9fd8025c2ad284b7efb6783bf629d183c8045 (patch)
tree8d7dcefdeb0bf02057901e892ebd879832208f15
parent8ad5232c5f08c1646cb791021a5b6178035fcd1e (diff)
Small organization
-rw-r--r--assets/src/gunner.h31
-rw-r--r--src/shader_sys.c4
-rw-r--r--src/utils.h18
3 files changed, 25 insertions, 28 deletions
diff --git a/assets/src/gunner.h b/assets/src/gunner.h
index cbcbe87..51ebc1a 100644
--- a/assets/src/gunner.h
+++ b/assets/src/gunner.h
@@ -1,6 +1,6 @@
#pragma once
-// Defines
+// Defines //
typedef struct{
unsigned char r;
@@ -9,38 +9,47 @@ typedef struct{
unsigned char a;
}Color;
+#define WHITE (Color){255, 255, 255, 255}
#define BLACK (Color){0, 0, 0, 255}
-// Texture
+typedef int i32;
+typedef long long i64;
-void init_tex_sys(void);
+typedef unsigned int u32;
+typedef unsigned long long u64;
+
+typedef float f32;
+typedef double f64;
+
+// 24.8 format
+typedef i32 fx32;
+#define FIXED_POINT_BITS 8
+#define FIXED_POINT_ONE (1 << FIXED_POINT_BITS)
+#define TO_FIXED(x) ((fx32)(x) << FIXED_POINT_BITS)
+#define FROM_FIXED(x) ((x) >> FIXED_POINT_BITS)
+
+// Texture //
int load_new_tex(const char* path);
void draw_texture(int idx, int x, int y);
-void update_textures(void);
-
void unload_tex(int idx);
void unload_active_textures(void);
-// Shader
-
-void init_shader_sys(void);
+// Shader //
int load_new_shader(const char* path);
void set_active_shader(int idx);
-void update_shaders(void);
-
void reset_active_shader(void);
void unload_shader(int idx);
void unload_active_shaders(void);
-// Text
+// Text //
void draw_text(const char* txt, int x, int y, int size, Color col); \ No newline at end of file
diff --git a/src/shader_sys.c b/src/shader_sys.c
index 0fcc6ce..28f6d84 100644
--- a/src/shader_sys.c
+++ b/src/shader_sys.c
@@ -4,6 +4,8 @@
#define MAX_SHADER_SIZE 8
+// Internal Functions //
+
// TODO: Compute?
// Would probably require a different path altogther
// due to how those shaders are compiled tho
@@ -80,6 +82,8 @@ vertex_err:
return something;
}
+// Exposed Functions //
+
static Shader shader_slots[MAX_SHADER_SIZE] = {0};
static i32 shader_modtimes[MAX_SHADER_SIZE] = {0};
static const char* shader_paths[MAX_SHADER_SIZE] = {0};
diff --git a/src/utils.h b/src/utils.h
index 079445a..2d367d0 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -5,20 +5,4 @@
#define BLANK_DEFAULT -1
#define NULL_TERM '\0'
-#define NULL_TERM_SZ 1
-
-typedef int i32;
-typedef long long i64;
-
-typedef unsigned int u32;
-typedef unsigned long long u64;
-
-typedef float f32;
-typedef double f64;
-
-// 24.8 format
-typedef i32 fx32;
-#define FIXED_POINT_BITS 8
-#define FIXED_POINT_ONE (1 << FIXED_POINT_BITS)
-#define TO_FIXED(x) ((fx32)(x) << FIXED_POINT_BITS)
-#define FROM_FIXED(x) ((x) >> FIXED_POINT_BITS) \ No newline at end of file
+#define NULL_TERM_SZ 1 \ No newline at end of file