add outline uniform setter

hotstreams · Jun 18, 2024 · 4026338 · 4026338
1 parent f4c860e
commit 4026338
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/samples/materials/scene.cpp b/samples/materials/scene.cpp
@@ -115,12 +115,15 @@ void LimitlessMaterials::Scene::setUpModels() {
                       .build()
     );
 
-    scene.add(Instance::builder()
-                      .model(assets.models.at("sphere"))
-                      .material(assets.materials.at("basic8"))
-                      .position({24.0f, 1.0f, 19.0f })
-                      .build()
-    );
+
+
+    auto sphere = Instance::builder()
+            .model(assets.models.at("sphere"))
+            .material(assets.materials.at("basic8"))
+            .position({24.0f, 1.0f, 19.0f })
+            .build();
+    sphere->makeOutlined();
+    scene.add(sphere);
 
     auto floor = std::make_shared<InstancedInstance>();
     floor->makeOutlined();

diff --git a/shaders/pipeline/gbuffer.frag b/shaders/pipeline/gbuffer.frag
@@ -26,7 +26,7 @@ void main() {
 
     info.r = float(mctx.shading_model) / 255.0;
 //    info.g = object type ?;
-    info.b = 1.0;
+    info.b = outline;
 
     emissive = computeMaterialEmissiveColor(mctx);
 }
diff --git a/src/limitless/instances/model_instance.cpp b/src/limitless/instances/model_instance.cpp
@@ -2,6 +2,7 @@
 
 #include <limitless/models/model.hpp>
 #include <limitless/models/elementary_model.hpp>
+#include <limitless/core/shader/shader_program.hpp>
 #include <stdexcept>
 #include <utility>
 
@@ -44,6 +45,10 @@ void ModelInstance::draw(Context& ctx, const Assets& assets, ShaderType pass, ms
         return;
     }
 
+    const_cast<UniformSetter&>(uniform_setter).add([&] (ShaderProgram& shader) {
+       shader.setUniform("outline", outlined ? 1.0f : 0.0f);
+    });
+
     for (auto& [name, mesh] : meshes) {
         mesh.draw(ctx, assets, pass, shader_type, final_matrix, blending, uniform_setter);
     }