summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/rodeo.h37
-rw-r--r--include/rodeo_types.h70
-rw-r--r--src/rodeo.c246
-rw-r--r--src/rodeo_internal_types.h12
-rw-r--r--src/rodeo_math.c29
-rw-r--r--src/shaders/simple.fragment.sc22
-rw-r--r--src/shaders/varying.def.sc4
7 files changed, 336 insertions, 84 deletions
diff --git a/include/rodeo.h b/include/rodeo.h
index 8b38826..f54792b 100644
--- a/include/rodeo.h
+++ b/include/rodeo.h
@@ -32,11 +32,15 @@ mrodeo_vargs_do(final_arg) \
/// --- Math ---
-uint32_t
-rodeo_rgba_to_uint32(const rodeo_rgba_t color);
+rodeo_RGBA8_t
+rodeo_RGBAFloat_to_RGBA8(const rodeo_RGBAFloat_t color);
+rodeo_BGRA8_t
+rodeo_RGBA8_to_BGRA8(const rodeo_RGBA8_t color);
/// --- Core ---
+extern rodeo_texture_2d_t rodeo_texture_2d_default;
+
#define \
mrodeo_window_do( \
screen_height, \
@@ -79,7 +83,7 @@ rodeo_frame_end(void);
void
rodeo_mainloop_run(
- rodeo_mainloop_function main_loop_func
+ rodeo_mainLoop_function main_loop_func
);
bool
@@ -100,25 +104,22 @@ rodeo_renderer_flush(void);
void
rodeo_rectangle_draw(
rodeo_rectangle_t rectangle,
- rodeo_rgba_t color
+ rodeo_RGBAFloat_t color
);
-//rodeo_texture_2d_t*
-//rodeo_texture2D_create(
-// uint32_t width,
-// uint32_t height,
-// char *memory
-//);
-
-//rodeo_texture_2d_p
-//rodeo_texture_2d_create_default(void);
+rodeo_texture_2d_t
+rodeo_texture_2d_create_from_RGBA8(
+ const uint32_t width,
+ const uint32_t height,
+ const uint8_t memory[]
+);
void
-rodeo_texture2D_draw(
- rodeo_rectangle_t source,
- rodeo_rectangle_t destination,
- rodeo_rgba_t color,
- rodeo_texture_2d_p texture
+rodeo_texture_2d_draw(
+ const rodeo_rectangle_t source,
+ const rodeo_rectangle_t destination,
+ const rodeo_RGBAFloat_t color,
+ const rodeo_texture_2d_t *texture
);
/// --- String ---
diff --git a/include/rodeo_types.h b/include/rodeo_types.h
index a0d3d4e..5f9925e 100644
--- a/include/rodeo_types.h
+++ b/include/rodeo_types.h
@@ -5,29 +5,64 @@
#include <stdint.h>
#include <stddef.h>
-typedef struct
+typedef struct irodeo_texture_internal_t irodeo_texture_internal_t;
+typedef irodeo_texture_internal_t *rodeo_texture_internal_p;
+
+typedef union
{
- float red;
- float green;
- float blue;
- float alpha;
+ struct {
+ float red;
+ float green;
+ float blue;
+ float alpha;
+ };
+ float array[4];
}
-rodeo_rgba_t;
+rodeo_RGBAFloat_t;
+
+typedef union
+{
+ struct
+ {
+ uint8_t red;
+ uint8_t green;
+ uint8_t blue;
+ uint8_t alpha;
+ };
+ uint32_t rgba;
+ uint8_t array[4];
+}
+rodeo_RGBA8_t;
+
+typedef union
+{
+ struct
+ {
+ uint8_t blue;
+ uint8_t green;
+ uint8_t red;
+ uint8_t alpha;
+ };
+ uint32_t bgra;
+ uint8_t array[4];
+}
+rodeo_BGRA8_t;
typedef struct
{
float x;
float y;
float z;
- uint32_t abgr;
- float tex_x;
- float tex_y;
+ uint32_t bgra;
+ float texture_x;
+ float texture_y;
+ float texture_id;
}
rodeo_vertex_t;
typedef
void
-(*rodeo_mainloop_function)(void);
+(*rodeo_mainLoop_function)(void);
typedef struct
{
@@ -40,10 +75,21 @@ rodeo_rectangle_t;
typedef struct
{
- uint8_t fill_this_out;
+ rodeo_texture_internal_p internal_texture;
+ uint32_t width;
+ uint32_t height;
}
rodeo_texture_2d_t;
+/*
+typedef struct
+{
+ rodeo_texture_2d_t texture;
+ rodeo_frameBuffer_internal_p internal_frame_buffer;
+}
+rodeo_frameBuffer_2d_t;
+*/
+
/// --- String ---
// taken from STC library
@@ -70,4 +116,4 @@ typedef
void
(*rodeo_log_function)(rodeo_string_t text);
-typedef rodeo_texture_2d_t* rodeo_texture_2d_p;
+
diff --git a/src/rodeo.c b/src/rodeo.c
index 3720e10..bf59ec4 100644
--- a/src/rodeo.c
+++ b/src/rodeo.c
@@ -21,16 +21,8 @@
// -- system --
#include <time.h>
-bgfx_texture_handle_t
-rodeo_texture_2d_create_default(void);
-static const unsigned char defaultTxData[] =
-{
- 0xff, 0xff, 0xff, 0xff // 1x1 WHITE dot
-};
-
-static bgfx_texture_handle_t texture;
-static bgfx_uniform_handle_t sampler;
+rodeo_texture_2d_t rodeo_texture_2d_default;
static irodeo_state_t state = {0};
@@ -159,8 +151,8 @@ rodeo_window_init(
mrodeo_bgfx_vertex_layout_do(&state.vertex_layout)
{
bgfx_vertex_layout_add(&state.vertex_layout, BGFX_ATTRIB_POSITION, 3, BGFX_ATTRIB_TYPE_FLOAT, false, false);
- bgfx_vertex_layout_add(&state.vertex_layout, BGFX_ATTRIB_COLOR0, 4, BGFX_ATTRIB_TYPE_UINT8, true, false);
- bgfx_vertex_layout_add(&state.vertex_layout, BGFX_ATTRIB_TEXCOORD0, 2, BGFX_ATTRIB_TYPE_FLOAT, true, false);
+ bgfx_vertex_layout_add(&state.vertex_layout, BGFX_ATTRIB_COLOR0, 4, BGFX_ATTRIB_TYPE_UINT8, true, true);
+ bgfx_vertex_layout_add(&state.vertex_layout, BGFX_ATTRIB_TEXCOORD0, 3, BGFX_ATTRIB_TYPE_FLOAT, false, false);
}
state.vertex_buffer_handle = bgfx_create_dynamic_vertex_buffer(mrodeo_vertex_size_max, &state.vertex_layout, BGFX_BUFFER_NONE);
@@ -219,11 +211,42 @@ rodeo_window_init(
"Default render pipeline finished setup"
);
- //bgfx_texture_handle_t default_texture = rodeo_texture_2d_create_default();
+ //bgfx_texture_handle_t default_bgfx_texture = rodeo_texture_2d_create_default();
+
+ rodeo_texture_2d_default.internal_texture = malloc(sizeof(irodeo_texture_internal_t));
- sampler = bgfx_create_uniform("s_texColor", BGFX_UNIFORM_TYPE_SAMPLER, 1);
+ // used for binding textures to shader uniforms
+ state.texture_uniforms[0] = bgfx_create_uniform("default_texture", BGFX_UNIFORM_TYPE_SAMPLER, 1);
+ state.texture_uniforms[1] = bgfx_create_uniform("texture_0", BGFX_UNIFORM_TYPE_SAMPLER, 1);
+
+ {
+ // represents 1 pixel sized white texture
+ //const rodeo_RGBA8_t default_texture_data =
+ //{
+ // .red = 0xff,
+ // .green = 0xff,
+ // .blue = 0xff,
+ // .alpha = 0xff,
+ //};
+ const uint8_t default_texture_data[] = {
+ 0xff, 0x00, 0xff, 0xff,
+ 0xff, 0xff, 0x00, 0xff,
+ 0x00, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff,
+ //0xff, 0xff, 0xff, 0xff,
+ };
- rodeo_texture_2d_create_default();
+ rodeo_texture_2d_default.internal_texture->texture_bgfx =
+ bgfx_create_texture_2d(
+ 2,
+ 2,
+ false,
+ 0,
+ BGFX_TEXTURE_FORMAT_RGBA8,
+ BGFX_SAMPLER_UVW_CLAMP | BGFX_SAMPLER_MAG_POINT,
+ bgfx_copy(&default_texture_data, sizeof(default_texture_data))
+ );
+ }
state.end_frame = SDL_GetPerformanceCounter();
}
@@ -231,6 +254,7 @@ rodeo_window_init(
void
rodeo_window_deinit(void)
{
+ free(rodeo_texture_2d_default.internal_texture);
bgfx_destroy_dynamic_index_buffer(state.index_buffer_handle);
bgfx_destroy_dynamic_vertex_buffer(state.vertex_buffer_handle);
bgfx_destroy_program(state.program_shader);
@@ -295,7 +319,7 @@ rodeo_frame_end(void)
void
rodeo_mainloop_run(
- rodeo_mainloop_function mainloop_func
+ rodeo_mainLoop_function mainloop_func
)
{
#if __EMSCRIPTEN__
@@ -338,7 +362,34 @@ rodeo_renderer_name_get(void)
void
rodeo_renderer_flush(void)
{
- bgfx_set_texture(0, sampler, texture, UINT32_MAX);
+ // set default texture
+ bgfx_set_texture(
+ 0,
+ state.texture_uniforms[0],
+ rodeo_texture_2d_default.internal_texture->texture_bgfx,
+ UINT32_MAX
+ );
+ if(state.active_texture_p != NULL)
+ {
+ // set dynamic texture
+ bgfx_set_texture(
+ 1,
+ state.texture_uniforms[1],
+ *state.active_texture_p,
+ UINT32_MAX
+ );
+ }
+ else
+ {
+ // set to default if none exists
+ bgfx_set_texture(
+ 1,
+ state.texture_uniforms[1],
+ rodeo_texture_2d_default.internal_texture->texture_bgfx,
+ UINT32_MAX
+ );
+ }
+
if(state.vertex_size > 0)
{
// upload remaining batched vertices
@@ -369,15 +420,27 @@ rodeo_renderer_flush(void)
state.index_size = 0;
state.index_count = 0;
}
+ state.active_texture_p = NULL;
}
void
rodeo_rectangle_draw(
rodeo_rectangle_t rectangle,
- rodeo_rgba_t color
+ rodeo_RGBAFloat_t color
)
{
- const uint32_t abgr = rodeo_rgba_to_uint32(color);
+ rodeo_texture_2d_draw(
+ (rodeo_rectangle_t){ 0, 0, 1, 1 },
+ rectangle,
+ color,
+ NULL
+ );
+ /*
+ const rodeo_BGRA8_t bgra = rodeo_RGBA8_to_BGRA8(
+ rodeo_RGBAFloat_to_RGBA8(color)
+ );
+
+
if(state.vertex_size < mrodeo_vertex_size_max)
{
state.batched_vertices[state.vertex_size] =
@@ -386,7 +449,7 @@ rodeo_rectangle_draw(
.x = rectangle.width + rectangle.x,
.y = rectangle.height + rectangle.y,
//.z = 0.0f,
- .abgr = abgr
+ .bgra = bgra.bgra,
};
state.vertex_size += 1;
state.batched_vertices[state.vertex_size] =
@@ -395,7 +458,7 @@ rodeo_rectangle_draw(
.x = rectangle.width + rectangle.x,
.y = rectangle.y,
//.z = 0.0f,
- .abgr = abgr
+ .bgra = bgra.bgra,
};
state.vertex_size += 1;
state.batched_vertices[state.vertex_size] =
@@ -404,7 +467,7 @@ rodeo_rectangle_draw(
.x = rectangle.x,
.y = rectangle.y,
//.z = 0.0f,
- .abgr = abgr
+ .bgra = bgra.bgra,
};
state.vertex_size += 1;
state.batched_vertices[state.vertex_size] =
@@ -413,7 +476,7 @@ rodeo_rectangle_draw(
.x = rectangle.x,
.y = rectangle.height + rectangle.y,
//.z = 0.0f,
- .abgr = abgr
+ .bgra = bgra.bgra,
};
state.vertex_size += 1;
@@ -443,41 +506,142 @@ rodeo_rectangle_draw(
{
rodeo_renderer_flush();
}
+ */
}
-bgfx_texture_handle_t
-rodeo_texture_2d_create_default(
- void
- //uint32_t width,
- //uint32_t height,
- //char *memory
+
+rodeo_texture_2d_t
+rodeo_texture_2d_create_from_RGBA8(
+ const uint32_t width,
+ const uint32_t height,
+ const uint8_t memory[]
)
{
- //uint32_t one_pixel = UINT32_MAX;//0xFFFFFFFF;
- const bgfx_memory_t* txMem = bgfx_make_ref(defaultTxData, 4);
- texture = bgfx_create_texture_2d(
- 1,
- 1,
+ rodeo_texture_2d_t texture;
+ texture.internal_texture = malloc(sizeof(irodeo_texture_internal_t));
+ texture.internal_texture->texture_bgfx = bgfx_create_texture_2d(
+ width,
+ height,
false,
- 0,
+ 1,
BGFX_TEXTURE_FORMAT_RGBA8,
- 0,
- txMem
+ BGFX_TEXTURE_NONE,
+ bgfx_copy(&memory, width * height * 4)
);
+
return texture;
}
void
rodeo_texture_2d_draw(
- //rodeo_rectangle_t source,
- //rodeo_rectangle_t destination,
- //rodeo_rgba_t color,
- //rodeo_texture_2d_p texture
- void
+ const rodeo_rectangle_t source,
+ const rodeo_rectangle_t destination,
+ const rodeo_RGBAFloat_t color,
+ const rodeo_texture_2d_t *texture
)
{
// gonna need to change the shader pipeline
// to also accept textures
+ const rodeo_BGRA8_t bgra = rodeo_RGBA8_to_BGRA8(
+ rodeo_RGBAFloat_to_RGBA8(color)
+ );
+ float texture_uniform_slot = 0.0;
+
+ // if not using texture: use default instead
+ // otherwise check what current texture is active
+ // if none or the same: set it
+ // if different: flush and then set it
+ if(texture != NULL)
+ {
+ if(state.active_texture_p != NULL)
+ {
+ if(&texture->internal_texture->texture_bgfx != state.active_texture_p)
+ {
+ rodeo_renderer_flush();
+ }
+ }
+ texture_uniform_slot = 1.0;
+ state.active_texture_p = &texture->internal_texture->texture_bgfx;
+ }
+
+
+ if(state.vertex_size < mrodeo_vertex_size_max)
+ {
+ state.batched_vertices[state.vertex_size] =
+ (rodeo_vertex_t)
+ {
+ .x = destination.width + destination.x,
+ .y = destination.height + destination.y,
+ //.z = 0.0f,
+ .bgra = bgra.bgra,
+ .texture_id = texture_uniform_slot,
+ .texture_x = 1,//source.width + source.x,
+ .texture_y = 1,//source.height + source.y,
+ };
+ state.vertex_size += 1;
+ state.batched_vertices[state.vertex_size] =
+ (rodeo_vertex_t)
+ {
+ .x = destination.width + destination.x,
+ .y = destination.y,
+ //.z = 0.0f,
+ .bgra = bgra.bgra,
+ .texture_id = texture_uniform_slot,
+ .texture_x = 1,//source.width + source.x,
+ .texture_y = 0,//source.y,
+ };
+ state.vertex_size += 1;
+ state.batched_vertices[state.vertex_size] =
+ (rodeo_vertex_t)
+ {
+ .x = destination.x,
+ .y = destination.y,
+ //.z = 0.0f,
+ .bgra = bgra.bgra,
+ .texture_id = texture_uniform_slot,
+ .texture_x = 0,//source.x,
+ .texture_y = 0,//source.y,
+ };
+ state.vertex_size += 1;
+ state.batched_vertices[state.vertex_size] =
+ (rodeo_vertex_t)
+ {
+ .x = destination.x,
+ .y = destination.height + destination.y,
+ //.z = 0.0f,
+ .bgra = bgra.bgra,
+ .texture_id = texture_uniform_slot,
+ .texture_x = 0,//source.x,
+ .texture_y = 1,//source.height + source.y,
+ };
+ state.vertex_size += 1;
+
+ int indices[] =
+ {
+ 0, 1, 3,
+ 1, 2, 3
+ //2, 1, 0,
+ //2, 3, 1
+ };
+ state.batched_indices[state.index_size] = state.index_count + indices[0];
+ state.index_size += 1;
+ state.batched_indices[state.index_size] = state.index_count + indices[1];
+ state.index_size += 1;
+ state.batched_indices[state.index_size] = state.index_count + indices[2];
+ state.index_size += 1;
+ state.batched_indices[state.index_size] = state.index_count + indices[3];
+ state.index_size += 1;
+ state.batched_indices[state.index_size] = state.index_count + indices[4];
+ state.index_size += 1;
+ state.batched_indices[state.index_size] = state.index_count + indices[5];
+ state.index_size += 1;
+ state.index_count += 4;
+ }
+
+ if(state.vertex_size >= mrodeo_vertex_size_max)
+ {
+ rodeo_renderer_flush();
+ }
}
diff --git a/src/rodeo_internal_types.h b/src/rodeo_internal_types.h
index 174f6b1..bbe77ef 100644
--- a/src/rodeo_internal_types.h
+++ b/src/rodeo_internal_types.h
@@ -26,15 +26,16 @@ typedef struct
bgfx_vertex_layout_t vertex_layout;
bgfx_dynamic_vertex_buffer_handle_t vertex_buffer_handle;
bgfx_dynamic_index_buffer_handle_t index_buffer_handle;
- uint16_t vertex_size;
rodeo_vertex_t batched_vertices[mrodeo_vertex_size_max];
+ uint16_t vertex_size;
uint16_t index_count;
uint16_t index_size;
uint16_t batched_indices[(mrodeo_vertex_size_max / 4) * 6];
- uint16_t active_texture_id;
+ bgfx_texture_handle_t *active_texture_p;
bgfx_shader_handle_t vertex_shader;
bgfx_shader_handle_t fragment_shader;
bgfx_program_handle_t program_shader;
+ bgfx_uniform_handle_t texture_uniforms[2];
uint64_t frame_count;
uint64_t start_frame;
@@ -43,3 +44,10 @@ typedef struct
uint32_t frame_limit;
}
irodeo_state_t;
+
+struct
+irodeo_texture_internal_t
+{
+ bgfx_texture_handle_t texture_bgfx;
+ //bgfx_uniform_handle_t sampler_bgfx;
+};
diff --git a/src/rodeo_math.c b/src/rodeo_math.c
index 4985cd1..6406f6a 100644
--- a/src/rodeo_math.c
+++ b/src/rodeo_math.c
@@ -5,12 +5,27 @@
// system
#include <stdint.h>
-uint32_t
-rodeo_rgba_to_uint32(const rodeo_rgba_t color)
+// when casting from float to int(example):
+// 20.50-21.00 rounds up to 21
+// 20.00-20.49 rounds down to 20
+rodeo_RGBA8_t
+rodeo_RGBAFloat_to_RGBA8(const rodeo_RGBAFloat_t color)
{
- return
- ((uint32_t)(uint8_t)(color.red * 255))
- | ((uint32_t)(uint8_t)(color.green * 255)) << (8 * 1)
- | ((uint32_t)(uint8_t)(color.blue * 255)) << (8 * 2)
- | ((uint32_t)(uint8_t)(color.alpha * 255)) << (8 * 3);
+ return (rodeo_RGBA8_t){
+ .red = (uint8_t)((color.red * (float)UINT8_MAX) + 0.5),
+ .green = (uint8_t)((color.green * (float)UINT8_MAX) + 0.5),
+ .blue = (uint8_t)((color.blue * (float)UINT8_MAX) + 0.5),
+ .alpha = (uint8_t)((color.alpha * (float)UINT8_MAX) + 0.5),
+ };
+}
+
+rodeo_BGRA8_t
+rodeo_RGBA8_to_BGRA8(const rodeo_RGBA8_t color)
+{
+ return (rodeo_BGRA8_t){
+ .alpha = color.alpha,
+ .blue = color.blue,
+ .green = color.green,
+ .red = color.red,
+ };
}
diff --git a/src/shaders/simple.fragment.sc b/src/shaders/simple.fragment.sc
index 72973ee..4ae2f48 100644
--- a/src/shaders/simple.fragment.sc
+++ b/src/shaders/simple.fragment.sc
@@ -2,9 +2,27 @@ $input v_color0, v_texcoord0
#include <bgfx_shader.sh>
-SAMPLER2D(s_texColor, 0);
+SAMPLER2D(default_texture, 0);
+SAMPLER2D(texture_0, 1);
+
+//vec3 toLinear(vec3 _rgb)
+//{
+// return pow(abs(_rgb), vec3_splat(2.2) );
+//}
+//
+//vec4 toLinear(vec4 _rgba)
+//{
+// return vec4(toLinear(_rgba.xyz), _rgba.w);
+//}
void main()
{
- gl_FragColor = v_color0 * texture2D(s_texColor, v_texcoord0);
+ //if(v_texcoord0.y < 0.0)
+ //{
+ gl_FragColor = v_color0 * texture2D(default_texture, v_texcoord0.xy);
+ //}
+ //else
+ //{
+ //gl_FragColor = v_color0 * texture2D(texture_0, v_texcoord0.xy);
+ //}
}
diff --git a/src/shaders/varying.def.sc b/src/shaders/varying.def.sc
index fccdc90..5f7be4e 100644
--- a/src/shaders/varying.def.sc
+++ b/src/shaders/varying.def.sc
@@ -1,8 +1,8 @@
// outputs;
vec4 v_color0 : COLOR0;
-vec2 v_texcoord0 : TEXCOORD0;
+vec3 v_texcoord0 : TEXCOORD0;
// inputs;
vec3 a_position : POSITION;
vec4 a_color0 : COLOR0;
-vec2 a_texcoord0 : TEXCOORD0;
+vec3 a_texcoord0 : TEXCOORD0;
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-14 16:52:30 +0000