Merge remote-tracking branch 'origin/master' into feature/terrain-system

Author: hotstreams

include/limitless/renderer/composite_pass.hpp

@@ -18,6 +18,7 @@ namespace Limitless {
         Framebuffer framebuffer;
     public:
         float tone_mapping_exposure = 1.0f;
+        float gamma = 2.2f;
 
         explicit CompositePass(Renderer& renderer);
 

shaders/pipeline/composite.frag

@@ -12,6 +12,7 @@ uniform sampler2D bloom;
 uniform sampler2D outline;
 uniform float bloom_strength;
 uniform float tone_mapping_exposure;
+uniform float gamma;
 
 void main() {
     vec3 bloom_color = texture(bloom, uv).rgb * bloom_strength;
@@ -21,7 +22,6 @@ void main() {
     color = toneMapping(color, tone_mapping_exposure);
 
     // apply gamma correction
-    float gamma = 2.2;
     color = pow(color, vec3(1.0 / gamma));
 
     // add objects outlining

src/limitless/core/context.cpp

@@ -6,12 +6,12 @@ using namespace Limitless;
 
 Context::Context(
     const std::string& title,
-    glm::uvec2 size,
+    glm::uvec2 _size,
     const Context* shared,
     const WindowHints& hints
 ) : ContextInitializer()
   , ContextState()
-  , size {size} {
+  , size {_size} {
     // sets window hints for creation
     for (const auto& [hint, value] : hints) {
         glfwWindowHint(static_cast<int>(hint), value);
@@ -23,6 +23,13 @@ Context::Context(
         throw context_error {"Failed to create window"};
     }
 
+    // The created window, framebuffer and context may differ from what you requested.
+    int framebuffer_width = 0;
+    int framebuffer_height = 0;
+    glfwGetFramebufferSize(window, &framebuffer_width, &framebuffer_height);
+
+    size = glm::uvec2(framebuffer_width, framebuffer_height);
+
     if (!glew_inited) {
         makeCurrent();
         initializeGLEW();
@@ -134,7 +141,7 @@ void Context::setFullscreen(bool value) noexcept {
 
         const auto* mode = glfwGetVideoMode(monitor.value());
         monitor = std::nullopt;
-        glfwSetWindowMonitor(window, monitor.value(), 0, 0, mode->width, mode->height, mode->refreshRate);
+        glfwSetWindowMonitor(window, nullptr, 0, 0, mode->width, mode->height, mode->refreshRate);
     }
 }
 

src/limitless/renderer/color_picker.cpp

@@ -59,6 +59,7 @@ void ColorPicker::render(InstanceRenderer& renderer, [[maybe_unused]] Scene &sce
     framebuffer.clear();
 
     renderer.renderScene({ctx, assets, ShaderType::ColorPicker, ms::Blending::Opaque, setter});
+    renderer.renderScene({ctx, assets, ShaderType::ColorPicker, ms::Blending::Translucent, setter});
 
     for (auto& pick: data) {
         if (!pick.sync.isAlreadyPlaced()) {

src/limitless/renderer/composite_pass.cpp

@@ -46,7 +46,8 @@ void CompositePass::render(
             shader.setUniform("bloom", bloom_pass.getResult())
                   .setUniform("outline", renderer.getPass<OutlinePass>().getResult())
                   .setUniform("bloom_strength", bloom_strength)
-                  .setUniform("tone_mapping_exposure", tone_mapping_exposure);
+                  .setUniform("tone_mapping_exposure", tone_mapping_exposure)
+                  .setUniform("gamma", gamma);
         }
 
         shader.use();