peter
/
gb
1
0
Fork 0
Code Projects Releases Wiki Activity

Huge overhaul!

This commit is contained in:
gingerBill 2016-05-03 23:25:52 +01:00
parent 09ca605931
commit 1e62616e4e
3 changed files with 541 additions and 575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -4,9 +4,9 @@ gb single-file public domain libraries for C & C++
library | latest version | category | languages | description library | latest version | category | languages | description
----------------|----------------|----------|-----------|------------- ----------------|----------------|----------|-----------|-------------
**gb.h** | 0.07a | misc | C, C++ | A C helper library for C & C++ **gb.h** | 0.08 | misc | C, C++ | A C helper library for C & C++
**gb_math.h** | 0.06b | math | C, C++ | A C/C++ vector math library geared towards game development **gb_math.h** | 0.06b | math | C, C++ | A C/C++ vector math library geared towards game development
**gb_gl.h** | 0.04a | graphics | C, C++ | A C/C++ OpenGL Helper Library **gb_gl.h** | 0.04b | graphics | C, C++ | A C/C++ OpenGL Helper Library
**gb_string.h** | 0.95 | strings | C, C++ | A better string library for C & C++ (this is built into gb.h too with custom allocator support!) **gb_string.h** | 0.95 | strings | C, C++ | A better string library for C & C++ (this is built into gb.h too with custom allocator support!)
**gb_ini.h** | 0.93 | misc | C, C++ | A simple ini file loader library for C & C++ **gb_ini.h** | 0.93 | misc | C, C++ | A simple ini file loader library for C & C++

1087
gb.h
View File

File diff suppressed because it is too large Load Diff

25
gb_gl.h
View File

@ -1,4 +1,4 @@
/* gb.h - v0.04a - OpenGL Helper Library - public domain /* gb.h - v0.04b - OpenGL Helper Library - public domain
- no warranty implied; use at your own risk - no warranty implied; use at your own risk
This is a single header file with a bunch of useful stuff This is a single header file with a bunch of useful stuff
@ -55,6 +55,7 @@ Conventions used:
Version History: Version History:
0.04b - Work with the new gb.h
0.04a - Better Documentation 0.04a - Better Documentation
0.04 - Remove gb_math.h dependency 0.04 - Remove gb_math.h dependency
0.03a - Better Rounded Rect 0.03a - Better Rounded Rect
@ -907,7 +908,7 @@ gbgl__load_single_shader_from_file(gbglShader *shader, gbglShaderType type, char
{ {
gbglShaderError err = GBGL_SHADER_ERROR_NONE; gbglShaderError err = GBGL_SHADER_ERROR_NONE;
if (!gb_open_file(&shader->files[type], "%s%s", name, GBGL_SHADER_FILE_EXTENSIONS[type])) { if (!gb_file_open(&shader->files[type], "%s%s", name, GBGL_SHADER_FILE_EXTENSIONS[type])) {
err = GBGL_SHADER_ERROR_UNABLE_TO_READ_FILE; err = GBGL_SHADER_ERROR_UNABLE_TO_READ_FILE;
} else { } else {
gb_local_persist char info_log[4096]; gb_local_persist char info_log[4096];
@ -935,7 +936,7 @@ gbgl__load_single_shader_from_file(gbglShader *shader, gbglShaderType type, char
gbgl_free(file_source); gbgl_free(file_source);
} }
gb_close_file(&shader->files[type]); gb_file_close(&shader->files[type]);
} }
return err; return err;
@ -1070,7 +1071,7 @@ gbgl_destroy_shader(gbglShader *shader)
i32 i; i32 i;
for (i = 0; i < GBGL_SHADER_TYPE_COUNT; i++) { for (i = 0; i < GBGL_SHADER_TYPE_COUNT; i++) {
if (shader->type_flags & GB_BIT(i)) { if (shader->type_flags & GB_BIT(i)) {
gb_close_file(&shader->files[i]); gb_file_close(&shader->files[i]);
glDeleteShader(shader->shaders[i]); glDeleteShader(shader->shaders[i]);
} }
} }
@ -1089,7 +1090,7 @@ gbgl_has_shader_changed(gbglShader *shader)
i32 i; i32 i;
for (i = 0; i < GBGL_SHADER_TYPE_COUNT; i++) { for (i = 0; i < GBGL_SHADER_TYPE_COUNT; i++) {
if (shader->type_flags & GB_BIT(i)) { if (shader->type_flags & GB_BIT(i)) {
if (gb_has_file_changed(&shader->files[i])) { if (gb_file_has_changed(&shader->files[i])) {
return true; return true;
} }
} }
@ -1147,7 +1148,7 @@ gbgl_get_uniform(gbglShader *s, char const *name)
"Uniform array for shader is full"); "Uniform array for shader is full");
loc = glGetUniformLocation(s->program, name); loc = glGetUniformLocation(s->program, name);
s->uniform_names[s->uniform_count] = gb_alloc_cstring(gb_heap_allocator(), name); s->uniform_names[s->uniform_count] = gb_alloc_str(gb_heap_allocator(), name);
s->uniform_locs[s->uniform_count] = loc; s->uniform_locs[s->uniform_count] = loc;
s->uniform_count++; s->uniform_count++;
@ -1429,7 +1430,7 @@ gbgl_get_packed_font_dim(gbglFontCache *cache, gbglFontCachedTTF *ttf, i32 *widt
gb_zero_array(cache->rect_cache, cache->codepoint_count); gb_zero_array(cache->rect_cache, cache->codepoint_count);
rp_ctx = cast(stbrp_context *)spc.pack_info; rp_ctx = cast(stbrp_context *)spc.pack_info;
stbtt_PackFontRangesGatherRects(&spc, &ttf->finfo, cache->ranges, cache->codepoint_count, cache->rect_cache); stbtt_PackFontRangesGatherRects(&spc, &ttf->finfo, cache->ranges, cache->codepoint_count, cache->rect_cache);
gb_qsort(cache->rect_cache, cache->codepoint_count, gb_size_of(cache->rect_cache[0]), rect_height_compare); gb_qsort_array(cache->rect_cache, cache->codepoint_count, rect_height_compare);
for (i = 0; i < cache->codepoint_count; i++) { for (i = 0; i < cache->codepoint_count; i++) {
stbrp__findresult fr = stbrp__skyline_pack_rectangle(rp_ctx, cache->rect_cache[i].w, cache->rect_cache[i].h); stbrp__findresult fr = stbrp__skyline_pack_rectangle(rp_ctx, cache->rect_cache[i].w, cache->rect_cache[i].h);
@ -1632,14 +1633,14 @@ gbgl_cache_font(gbglFontCache *fc, char const *ttf_filename, f32 font_size)
gb_strncpy((*ttf_cache)->name, ttf_filename, name_len); gb_strncpy((*ttf_cache)->name, ttf_filename, name_len);
(*ttf_cache)->name[name_len] = '\0'; (*ttf_cache)->name[name_len] = '\0';
if (gb_open_file(&file, ttf_filename)) { if (gb_file_open(&file, ttf_filename)) {
i64 len = gb_file_size(&file); i64 len = gb_file_size(&file);
(*ttf_cache)->ttf = cast(u8 *)gbgl_malloc(len); (*ttf_cache)->ttf = cast(u8 *)gbgl_malloc(len);
GB_ASSERT_NOT_NULL((*ttf_cache)->ttf); GB_ASSERT_NOT_NULL((*ttf_cache)->ttf);
gb_file_read_at(&file, (*ttf_cache)->ttf, len, 0); gb_file_read_at(&file, (*ttf_cache)->ttf, len, 0);
gb_close_file(&file); gb_file_close(&file);
} else { } else {
GB_PANIC("Could not open ttf file"); GB_PANIC("Could not open ttf file");
} }
@ -1714,7 +1715,7 @@ gbgl_cache_font(gbglFontCache *fc, char const *ttf_filename, f32 font_size)
f->glyph_map[i].index = i; f->glyph_map[i].index = i;
} }
gb_qsort(f->glyph_map, f->glyph_count, gb_size_of(*f->glyph_map), gbgl__glyph_map_compare); gb_qsort_array(f->glyph_map, f->glyph_count, gbgl__glyph_map_compare);
{ // Kerning Table { // Kerning Table
isize kps_count = 0; isize kps_count = 0;
@ -1740,7 +1741,7 @@ gbgl_cache_font(gbglFontCache *fc, char const *ttf_filename, f32 font_size)
} }
} }
} }
gb_qsort(f->kern_table, f->kern_pair_count, gb_size_of(f->kern_table[0]), gbgl__kern_pair_compare); gb_qsort_array(f->kern_table, f->kern_pair_count, gbgl__kern_pair_compare);
} }
} }
} }
@ -2015,7 +2016,7 @@ gbgl_bs_init(gbglBasicState *bs, i32 window_width, i32 window_height)
"#version 410 core\n" "#version 410 core\n"
"in vec2 v_tex_coord;\n" "in vec2 v_tex_coord;\n"
"uniform vec4 u_colour;\n" "uniform vec4 u_colour;\n"
"layout (binding = 0) uniform sampler2D _utex;\n" "layout (binding = 0) uniform sampler2D u_tex;\n"
"out vec4 o_colour;\n" "out vec4 o_colour;\n"
"void main(void) {\n" "void main(void) {\n"
" o_colour = u_colour * texture2D(u_tex, v_tex_coord).r;\n" " o_colour = u_colour * texture2D(u_tex, v_tex_coord).r;\n"