add decal mask

renderer update

CMakeLists.txt

@@ -158,39 +158,31 @@ set(ENGINE_FX
     src/limitless/fx/effect_shader_define_replacer.cpp
 )
 
-set(ENGINE_PIPELINE
-    src/limitless/pipeline/pipeline.cpp
-    src/limitless/pipeline/pipeline_pass.cpp
-    src/limitless/pipeline/forward/color_pass.cpp
-    src/limitless/pipeline/forward/particle_pass.cpp
-    src/limitless/pipeline/forward/framebuffer_pass.cpp
-    src/limitless/pipeline/common/shadow_pass.cpp
-    src/limitless/pipeline/common/sceneupdate_pass.cpp
-    src/limitless/pipeline/common/skybox_pass.cpp
-    src/limitless/pipeline/forward/postprocessing_pass.cpp
-    src/limitless/pipeline/forward/forward.cpp
-    src/limitless/pipeline/forward/postprocessing.cpp
+set(ENGINE_RENDERER
+    src/limitless/renderer/renderer_pass.cpp
+    src/limitless/renderer/shadow_pass.cpp
+    src/limitless/renderer/sceneupdate_pass.cpp
+    src/limitless/renderer/skybox_pass.cpp
     src/limitless/renderer/renderer.cpp
     src/limitless/renderer/instance_renderer.cpp
     src/limitless/renderer/render_settings_shader_definer.cpp
     src/limitless/renderer/renderer_settings.cpp
-    src/limitless/pipeline/common/scene_data.cpp
-    src/limitless/pipeline/deferred/deferred_framebuffer_pass.cpp
-    src/limitless/pipeline/deferred/gbuffer_pass.cpp
-    src/limitless/pipeline/deferred/deferred_lighting_pass.cpp
-    src/limitless/pipeline/deferred/deferred.cpp
-    src/limitless/pipeline/deferred/depth_pass.cpp
-    src/limitless/pipeline/deferred/translucent_pass.cpp
-    src/limitless/pipeline/common/bloom_pass.cpp
-    src/limitless/pipeline/deferred/composite_pass.cpp
-    src/limitless/pipeline/common/ssao_pass.cpp
-    src/limitless/pipeline/common/fxaa_pass.cpp
-    src/limitless/pipeline/common/quad_pass.cpp
-    src/limitless/pipeline/common/render_debug_pass.cpp
-    src/limitless/pipeline/common/dof_pass.cpp
-    src/limitless/pipeline/common/outline_pass.cpp
-    src/limitless/pipeline/common/ssr_pass.cpp
-    src/limitless/pipeline/deferred/decal_pass.cpp
+    src/limitless/renderer/scene_data.cpp
+    src/limitless/renderer/deferred_framebuffer_pass.cpp
+    src/limitless/renderer/gbuffer_pass.cpp
+    src/limitless/renderer/deferred_lighting_pass.cpp
+    src/limitless/renderer/depth_pass.cpp
+    src/limitless/renderer/translucent_pass.cpp
+    src/limitless/renderer/bloom_pass.cpp
+    src/limitless/renderer/composite_pass.cpp
+#    src/limitless/pipeline/common/ssao_pass.cpp
+#    src/limitless/pipeline/common/fxaa_pass.cpp
+    src/limitless/renderer/screen_pass.cpp
+#    src/limitless/pipeline/common/render_debug_pass.cpp
+#    src/limitless/pipeline/common/dof_pass.cpp
+    src/limitless/renderer/outline_pass.cpp
+#    src/limitless/pipeline/common/ssr_pass.cpp
+    src/limitless/renderer/decal_pass.cpp
     src/limitless/postprocessing/blur.cpp
     src/limitless/postprocessing/bloom.cpp
     src/limitless/postprocessing/ssao.cpp
@@ -208,7 +200,7 @@ set(ENGINE_SRC
     ${ENGINE_MODELS}
     ${ENGINE_UTIL}
     ${ENGINE_TEXT}
-    ${ENGINE_PIPELINE}
+    ${ENGINE_RENDERER}
 
     src/limitless/camera.cpp
     src/limitless/shader_storage.cpp

include/limitless/fx/emitters/abstract_emitter.hpp

@@ -47,7 +47,7 @@ namespace Limitless::fx {
         virtual void ressurect() noexcept = 0;
 
         [[nodiscard]] virtual AbstractEmitter* clone() const = 0;
-        virtual void update(Context& ctx, const Camera& camera) = 0;
+        virtual void update(const Camera &camera) = 0;
         virtual void accept(EmitterVisitor& visitor) noexcept = 0;
 
         virtual bool& getLocalSpace() noexcept = 0;

include/limitless/fx/emitters/emitter.hpp

@@ -79,7 +79,7 @@ namespace Limitless::fx {
         [[nodiscard]] UniqueEmitterRenderer getUniqueRendererType() const noexcept override { return { type, std::nullopt, nullptr }; }
 
         [[nodiscard]] Emitter* clone() const override;
-        void update(Context& ctx, const Camera& camera) override;
+        void update(const Camera &camera) override;
         void accept(EmitterVisitor& visitor) noexcept override;
 
         bool& getLocalSpace() noexcept override;

include/limitless/fx/emitters/mesh_emitter.hpp

@@ -39,7 +39,7 @@ namespace Limitless::fx {
 
         [[nodiscard]] MeshEmitter* clone() const override;
 
-        void update(Context& context, const Camera& camera) override;
+        void update(const Camera &camera) override;
         void accept(EmitterVisitor& visitor) noexcept override;
     };
 }

include/limitless/fx/emitters/unique_emitter.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 #include <set>
-#include <limitless/pipeline/shader_type.hpp>
+#include <limitless/renderer/shader_type.hpp>
 #include <optional>
 
 namespace Limitless::ms {

include/limitless/fx/modules/beam_builder.hpp

@@ -13,9 +13,10 @@ namespace Limitless::fx {
     private:
         std::vector<BeamParticleMapping> beam_particles;
 
-        void generate(BeamParticle& particle, Context& ctx, const Camera& camera) {
+        void generate(BeamParticle& particle, const Camera& camera) {
             constexpr auto DOT_PRODUCT_RANGE = glm::vec2(0.2f, 0.8f);
-            const auto resolution = glm::vec2(ctx.getSize().x, ctx.getSize().y);
+            auto size = Context::getCurrentContext()->getSize();
+            const auto resolution = glm::vec2(size.x, size.y);
             const auto& line = particle.derivative_line;
 
             for (uint32_t i = 0; i < 6 * (line.size() - 2 - 1); ++i) {
@@ -143,7 +144,7 @@ namespace Limitless::fx {
             return beam_particles;
         }
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<Particle>& particles, [[maybe_unused]] float dt, Context& ctx, const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<Particle> &particles, [[maybe_unused]] float dt, const Camera &camera) noexcept override {
             beam_particles.clear();
 
             for (auto& particle : particles) {
@@ -169,7 +170,7 @@ namespace Limitless::fx {
                     particle.last_rebuild = current;
                 }
 
-                generate(particle, ctx, camera);
+                generate(particle, camera);
             }
         }
 

include/limitless/fx/modules/beam_speed.hpp

@@ -30,7 +30,7 @@ namespace Limitless::fx {
             return new BeamSpeed(*this);
         }
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<Particle>& particles, [[maybe_unused]] float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<Particle> &particles, [[maybe_unused]] float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             using namespace std::chrono;
             for (auto& particle : particles) {
                 const auto current_time = steady_clock::now();

include/limitless/fx/modules/color_by_life.hpp

@@ -18,7 +18,7 @@ namespace Limitless::fx {
             : Module<Particle>(module.type)
             , distribution {module.distribution->clone()} {}
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<Particle>& particles, float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<Particle> &particles, float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             for (auto& particle : particles) {
                 const auto tick = particle.lifetime / dt;
                 const auto tick_color = (distribution->get() - particle.color) / tick;

include/limitless/fx/modules/custom_material_by_life.hpp

@@ -29,7 +29,7 @@ namespace Limitless::fx {
         auto& getProperties() noexcept { return properties; }
         const auto& getProperties() const noexcept { return properties; }
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<Particle>& particles, float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<Particle> &particles, float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             for (auto& particle : particles) {
                 for (size_t i = 0; i < properties.size(); ++i) {
                     if (properties[i]) {

include/limitless/fx/modules/lifetime.hpp

@@ -22,7 +22,7 @@ namespace Limitless::fx {
             particle.lifetime = distribution->get();
         }
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<Particle>& particles, float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<Particle> &particles, float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             for (auto& particle : particles) {
                 particle.lifetime -= dt;
             }

include/limitless/fx/modules/mesh_location_attachment.hpp

@@ -57,7 +57,7 @@ namespace Limitless::fx {
             return new MeshLocationAttachment<Particle>(*this);
         }
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<Particle>& particles, [[maybe_unused]] float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<Particle> &particles, [[maybe_unused]] float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             for (size_t i = 0; i < particles.size(); ++i) {
                 auto& [selected_mesh, vertex_index, triangle, last_position] = cache[i];
                 const auto mesh_position = this->getPositionOnMesh(selected_mesh, vertex_index, triangle.first, triangle.second);

include/limitless/fx/modules/module.hpp

@@ -60,10 +60,6 @@ namespace Limitless::fx {
 
         virtual void deinitialize([[maybe_unused]] const std::vector<size_t>& indices) {}
 
-        virtual void update([[maybe_unused]] AbstractEmitter& emitter,
-                            [[maybe_unused]] std::vector<Particle>& particles,
-                            [[maybe_unused]] float dt,
-                            [[maybe_unused]] Context& ctx,
-                            [[maybe_unused]] const Camera& camera) noexcept {}
+        virtual void update([[maybe_unused]] AbstractEmitter &emitter, [[maybe_unused]] std::vector<Particle> &particles, [[maybe_unused]] float dt, [[maybe_unused]] const Camera &camera) noexcept {}
     };
 }

include/limitless/fx/modules/rotation_rate.hpp

@@ -18,7 +18,7 @@ namespace Limitless::fx {
             : Module<Particle>(module.type)
             , distribution {module.distribution->clone()} {}
 
-        void update(AbstractEmitter& emitter, std::vector<Particle>& particles, float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update(AbstractEmitter &emitter, std::vector<Particle> &particles, float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             const auto rot = emitter.getRotation() * emitter.getLocalRotation();
             for (auto& particle : particles) {
                 particle.rotation += (distribution->get() * rot) * dt;

include/limitless/fx/modules/size_by_life.hpp

@@ -18,7 +18,7 @@ namespace Limitless::fx {
             : Module<Particle>(module.type)
             , distribution {module.distribution->clone()} {}
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<Particle>& particles, float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<Particle> &particles, float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             for (auto& particle : particles) {
                 const auto tick = particle.lifetime / dt;
                 const auto tick_size = (distribution->get() - particle.size) / tick;
@@ -49,7 +49,7 @@ namespace Limitless::fx {
             : Module<MeshParticle>(module.type)
             , distribution {module.distribution->clone()} {}
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<MeshParticle>& particles, float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<MeshParticle> &particles, float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             for (auto& particle : particles) {
                 const auto tick = particle.lifetime / dt;
                 const auto tick_size = (distribution->get() - particle.size) / tick;

include/limitless/fx/modules/subuv.hpp

@@ -59,7 +59,7 @@ namespace Limitless::fx {
             particle.subUV.w = frames[0].y;
         }
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<Particle>& particles, [[maybe_unused]] float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<Particle> &particles, [[maybe_unused]] float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             if (first_update) {
                 last_time = std::chrono::steady_clock::now();
                 first_update = false;

include/limitless/fx/modules/time.hpp

@@ -17,7 +17,7 @@ namespace Limitless::fx {
             particle.time = 0.0f;
         }
 
-        void update([[maybe_unused]] AbstractEmitter& emitter, std::vector<Particle>& particles, float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update([[maybe_unused]] AbstractEmitter &emitter, std::vector<Particle> &particles, float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             for (auto& particle : particles) {
                 particle.time += dt;
             }

include/limitless/fx/modules/velocity_by_life.hpp

@@ -18,7 +18,7 @@ namespace Limitless::fx {
             : Module<Particle>(module.type)
             , distribution {module.distribution->clone()} {}
 
-        void update(AbstractEmitter& emitter, std::vector<Particle>& particles, float dt, [[maybe_unused]] Context& ctx, [[maybe_unused]] const Camera& camera) noexcept override {
+        void update(AbstractEmitter &emitter, std::vector<Particle> &particles, float dt, [[maybe_unused]] const Camera &camera) noexcept override {
             const auto rot = emitter.getRotation() * emitter.getLocalRotation();
             for (auto& particle : particles) {
                 const auto tick = particle.lifetime / dt;

include/limitless/instances/decal_instance.hpp

@@ -9,6 +9,7 @@ namespace Limitless {
     private:
         std::shared_ptr<AbstractModel> model;
         std::shared_ptr<ms::Material> material;
+        uint8_t projection_mask {0xFF};
     public:
         DecalInstance(std::shared_ptr<AbstractModel> model, const std::shared_ptr<ms::Material>& material, const glm::vec3& position);
 
@@ -18,7 +19,9 @@ namespace Limitless {
         std::unique_ptr<Instance> clone() noexcept override;
 
         void setMaterial(const std::shared_ptr<ms::Material>& new_material);
+
         auto& getMaterial() noexcept { return material; }
         auto& getModel() noexcept { return model; }
+        auto& getProjectionMask() noexcept { return projection_mask; }
     };
 }

include/limitless/instances/effect_instance.hpp

@@ -44,8 +44,7 @@ namespace Limitless {
          */
         bool isDone() const noexcept;
 
-        void updateBoundingBox() noexcept override;
-        void updateEmitters(Context& context, const Camera& camera) const noexcept;
+        void updateEmitters(const Camera& camera) const noexcept;
 
         friend class fx::EffectBuilder;
         friend class EffectSerializer;
@@ -71,7 +70,7 @@ namespace Limitless {
         /**
          * Updates instance and then emitters
          */
-        void update(Context& context, const Camera& camera) override;
+        void update(const Camera &camera) override;
 
         const auto& getEmitters() const noexcept { return emitters; }
         auto& getEmitters() noexcept { return emitters; }

include/limitless/instances/instance.hpp

@@ -4,6 +4,7 @@
 #include <limitless/instances/instance_attachment.hpp>
 #include <limitless/util/matrix_stack.hpp>
 #include <limitless/util/frustum.hpp>
+#include <optional>
 
 namespace Limitless {
     enum class ShaderType;
@@ -77,8 +78,21 @@ namespace Limitless {
          */
 		glm::vec3 scale {1.0f};
 
+        /**
+         * Final bounding box
+         */
 		Box bounding_box {};
 
+        /**
+         * User-set bounding box
+         */
+        std::optional<Box> custom_bounding_box {};
+
+        /**
+         * Instance decal mask
+         */
+        uint8_t decal_mask {0x00};
+
         /**
          * Does instance cast shadow
          */
@@ -99,7 +113,11 @@ namespace Limitless {
          */
         bool done {};
 
-		virtual void updateBoundingBox() noexcept = 0;
+        /**
+         * Default implementation of bounding box updates sets custom user box if present
+         */
+		virtual void updateBoundingBox() noexcept;
+
 		void updateModelMatrix() noexcept;
 		void updateFinalMatrix() noexcept;
 
@@ -127,6 +145,8 @@ namespace Limitless {
         [[nodiscard]] const auto& getFinalMatrix() const noexcept { return final_matrix; }
         [[nodiscard]] const auto& getModelMatrix() const noexcept { return model_matrix; }
 
+        [[nodiscard]] const auto& getDecalMask() const noexcept { return decal_mask; }
+
         /**
          * Instance outlined
          */
@@ -199,10 +219,20 @@ namespace Limitless {
          */
         virtual Instance& setParent(const glm::mat4& parent) noexcept;
 
+        /**
+         * Sets custom bounding box
+         */
+        virtual Instance& setBoundingBox(const Box& box) noexcept;
+
+        /**
+         * Sets decal mask
+         */
+        virtual Instance& setDecalMask(uint8_t mask) noexcept;
+
         /**
          * Updates instance data
          */
-		virtual void update(Context& context, const Camera& camera);
+		virtual void update(const Camera &camera);
 
         /**
          *  Instance builder

include/limitless/instances/instance_attachment.hpp

@@ -54,7 +54,7 @@ namespace Limitless {
         /**
          * Updates attached instances
          */
-        void updateAttachments(Context& context, const Camera& camera);
+        void updateAttachments(const Camera& camera);
 	public:
 		InstanceAttachment() = default;
 		virtual ~InstanceAttachment() = default;