Merge branch 'master' into detached5

hotstreams · Jun 12, 2024 · 6914749 · 6914749
2 parents 8ce1e7a + 72056e6
commit 6914749
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/include/limitless/instances/decal_instance.hpp b/include/limitless/instances/decal_instance.hpp
@@ -17,6 +17,8 @@ namespace Limitless {
         void updateBoundingBox() noexcept override;
         std::unique_ptr<Instance> clone() noexcept override;
 
+        void setMaterial(std::shared_ptr<ms::Material> new_material);
+
         void draw(Context& ctx, const Assets& assets, ShaderType shader_type, ms::Blending blending, const UniformSetter& uniform_set) override;
     };
 }
diff --git a/shaders/terrain/terrain.glsl b/shaders/terrain/terrain.glsl
@@ -81,14 +81,14 @@ void calculateTerrain(inout MaterialContext mctx) {
     vec2 uv = getVertexUV();
 
     float vectors[8] = {
-        smoothstep(0.0, 1.0, length(uv)),
-        smoothstep(0.0, 1.0, uv.y),
-        smoothstep(0.0, 1.0, length(vec2(1.0 - uv.x, uv.y))),
-        smoothstep(0.0, 1.0, uv.x),
-        smoothstep(0.0, 1.0, 1.0 - uv.x),
-        smoothstep(0.0, 1.0, length(vec2(uv.x, 1.0 - uv.y))),
-        smoothstep(0.0, 1.0, 1.0 - uv.y),
-        smoothstep(0.0, 1.0, length(vec2(1.0 - uv.x, 1.0 - uv.y)))
+    smoothstep(0.0, 1.0, length(uv)),
+    smoothstep(0.0, 1.0, uv.y),
+    smoothstep(0.0, 1.0, length(vec2(1.0 - uv.x, uv.y))),
+    smoothstep(0.0, 1.0, uv.x),
+    smoothstep(0.0, 1.0, 1.0 - uv.x),
+    smoothstep(0.0, 1.0, length(vec2(uv.x, 1.0 - uv.y))),
+    smoothstep(0.0, 1.0, 1.0 - uv.y),
+    smoothstep(0.0, 1.0, length(vec2(1.0 - uv.x, 1.0 - uv.y)))
     };
 
     uint mask[8];

diff --git a/src/limitless/instances/decal_instance.cpp b/src/limitless/instances/decal_instance.cpp
@@ -39,6 +39,10 @@ void DecalInstance::draw(Context &ctx, const Assets &assets, ShaderType shader_t
     model->getMeshes()[0]->draw();
 }
 
+void DecalInstance::setMaterial(std::shared_ptr<ms::Material> new_material) {
+    material = std::make_shared<ms::Material>(*new_material);
+}
+
 void DecalInstance::updateBoundingBox() noexcept {
 
 }