|
|
|
|
@ -16,8 +16,6 @@
|
|
|
|
|
#include "default_shaders.cpp" |
|
|
|
|
|
|
|
|
|
#define MAX_LIGHTS 10 // NOTE: needs to match the fragment shader source
|
|
|
|
|
#define DEFAULT_PALETTE_DIR "../data" |
|
|
|
|
#define DEFAULT_PALETTE_FILE "palette.png" |
|
|
|
|
#define CLEAR_COL_R 55.f / 255.f |
|
|
|
|
#define CLEAR_COL_G 55.f / 255.f |
|
|
|
|
#define CLEAR_COL_B 55.f / 255.f |
|
|
|
|
@ -33,7 +31,6 @@ void openglDebugCallback(GLenum source, GLenum type, GLuint id, GLenum severity,
|
|
|
|
|
bool initSDL(SDL_Handles& handles, v2i& viewport_dims); |
|
|
|
|
bool initContext(SDL_Handles& handles); |
|
|
|
|
bool initGL(); |
|
|
|
|
bool initPalette(uint palette_id, util_image& image); |
|
|
|
|
bool initDebugRenderGroup(render_state* rs); |
|
|
|
|
void setDefaults(render_state* rs); |
|
|
|
|
|
|
|
|
|
@ -50,7 +47,6 @@ renInit()
|
|
|
|
|
initContext(rs->handles) && |
|
|
|
|
initGL() && |
|
|
|
|
rgInitShaderProgram(rs->default_shader, DEFAULT_VERTEX_SHADER, DEFAULT_FRAGMENT_SHADER) && |
|
|
|
|
initPalette(rs->palette_id, rs->palette_image) && |
|
|
|
|
initDebugRenderGroup(rs) ) |
|
|
|
|
{ |
|
|
|
|
return rs; |
|
|
|
|
@ -64,7 +60,6 @@ void
|
|
|
|
|
renFreeBuffers(render_state* rs) |
|
|
|
|
{ |
|
|
|
|
utilSafeFree(rs->lights); |
|
|
|
|
utilFreeImage(rs->palette_image); |
|
|
|
|
glDeleteTextures(1, &rs->palette_id); |
|
|
|
|
rgFree(rs->filled_hex_render_group); |
|
|
|
|
rgFree(rs->hex_line_render_group); |
|
|
|
|
@ -209,19 +204,6 @@ initGL()
|
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
bool |
|
|
|
|
initPalette(uint palette_id, util_image& image) |
|
|
|
|
{ |
|
|
|
|
image = utilLoadImage(DEFAULT_PALETTE_DIR, DEFAULT_PALETTE_FILE); |
|
|
|
|
|
|
|
|
|
if (!rgInitGLTexture(palette_id, image)) { |
|
|
|
|
LOG(Error) << "Error creating texture\n"; |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
bool |
|
|
|
|
initDebugRenderGroup(render_state* rs) |
|
|
|
|
{ |
|
|
|
|
|