diff --git a/lib/windows/libekg.a b/lib/windows/libekg.a index ca6e1212..791e8e83 100644 Binary files a/lib/windows/libekg.a and b/lib/windows/libekg.a differ diff --git a/src/ekg.cpp b/src/ekg.cpp index bae10035..45e82e31 100644 --- a/src/ekg.cpp +++ b/src/ekg.cpp @@ -68,6 +68,7 @@ void ekg::init( ekg::log() << "Initialising EKG"; ekg::core = p_ekg_runtime; + ekg::core->f_renderer_small.font_path = p_ekg_runtime_property->p_font_path; ekg::core->f_renderer_normal.font_path = p_ekg_runtime_property->p_font_path; ekg::core->f_renderer_big.font_path = p_ekg_runtime_property->p_font_path; ekg::core->init(); diff --git a/src/os/ekg_opengl.cpp b/src/os/ekg_opengl.cpp index 8603a8ea..93824c80 100644 --- a/src/os/ekg_opengl.cpp +++ b/src/os/ekg_opengl.cpp @@ -112,8 +112,9 @@ void ekg::os::opengl::init() { " }\n" " if (uActiveTexture && !shouldDiscard) {" + " vec4 color = vFragColor;\n" " vFragColor = texture(uTextureSampler, vTexCoord);\n" - " vFragColor = vec4(vFragColor.xyz - ((1.0f - uColor.xyz) - 1.0f), vFragColor.w - (1.0f - uColor.w));\n" + " vFragColor = vec4(vFragColor.xyz - ((1.0f - color.xyz) - 1.0f), vFragColor.w - (1.0f - color.w));\n" " }\n" "}" }; @@ -168,7 +169,7 @@ void ekg::os::opengl::init() { this->uniform_viewport_height = glGetUniformLocation(this->pipeline_program, "uViewportHeight"); this->uniform_projection = glGetUniformLocation(this->pipeline_program, "uProjection"); - ekg::log() << "GPU allocator initialised"; + ekg::log() << "GPU shaders, pipeline program, and uniforms done"; } void ekg::os::opengl::quit() { diff --git a/test/build/windows/ekg-gui-showcase-test.exe b/test/build/windows/ekg-gui-showcase-test.exe index 4bdc579d..88a2ffaa 100644 Binary files a/test/build/windows/ekg-gui-showcase-test.exe and b/test/build/windows/ekg-gui-showcase-test.exe differ