instanced fix

effect emitters fix
hotstreams · Jul 2, 2023 · f858540 · f858540
1 parent 469234f
commit f858540
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/demo/effects_demoscene.cpp b/demo/effects_demoscene.cpp
@@ -27,15 +27,15 @@ void EffectsScene::addInstances(Limitless::Assets& assets) {
     add<EffectInstance>(assets.effects.at("lightning"), glm::vec3{29.0f, 1.0f, 16.0f});
 
     auto& bob = add<SkeletalInstance>(assets.models.at("bob"), glm::vec3(29.0f, 1.0f, 19.0f))
+            .play("")
             .setScale(glm::vec3(0.025f))
-            .setRotation(glm::vec3{0.0f, -M_PI_2, M_PI})
-            .play("");
+            .setRotation(glm::vec3{0.0f, -M_PI_2, M_PI});
 
     const auto& module = add<EffectInstance>(assets.effects.at("modeldrop"), glm::vec3{0.0f})
         .get<fx::SpriteEmitter>("sparks")
         .getModule(fx::ModuleType::InitialMeshLocation);
         dynamic_cast<fx::InitialMeshLocation<fx::SpriteParticle>&>(*module)
-        .attachModelInstance(&bob);
+        .attachModelInstance(dynamic_cast<SkeletalInstance*>(&bob));
 
     add<EffectInstance>(assets.effects.at("skeleton"), glm::vec3{23.0f, 1.0f, 1.0f});
     add<EffectInstance>(assets.effects.at("aura"), glm::vec3{23.0f, 1.0f, 4.0f});

diff --git a/demo/models_demoscene.cpp b/demo/models_demoscene.cpp
@@ -54,9 +54,9 @@ void ModelsScene::addInstances(Limitless::Assets& assets) {
             .setRotation(glm::vec3{-M_PI_2, -M_PI_2, 0.0f});
 
     add<SkeletalInstance>(assets.models.at("bob"), glm::vec3(25.0f, 1.0f, 16.0f))
+            .play("")
             .setScale(glm::vec3(0.03f))
-            .setRotation(glm::vec3{M_PI, -M_PI_2, 0.0f})
-            .play("");
+            .setRotation(glm::vec3{M_PI, -M_PI_2, 0.0f});
 
     add<ModelInstance>(assets.models.at("backpack"), glm::vec3(25.0f, 1.5f, 19.0f))
             .setScale(glm::vec3(0.5f))

diff --git a/include/limitless/instances/effect_instance.hpp b/include/limitless/instances/effect_instance.hpp
@@ -6,6 +6,7 @@
 #include <limitless/instances/abstract_instance.hpp>
 #include <unordered_map>
 #include <stdexcept>
+#include <iostream>
 
 namespace Limitless {
     namespace fx {
@@ -89,7 +90,7 @@ namespace Limitless {
         template<typename EmitterType>
         const EmitterType& get(const std::string& emitter_name) const {
             try {
-                return static_cast<EmitterType&>(*emitters.at(name));
+                return static_cast<EmitterType&>(*emitters.at(emitter_name));
             } catch (...) {
                 throw no_such_emitter("with name " + emitter_name);
             }
@@ -101,7 +102,7 @@ namespace Limitless {
         template<typename EmitterType>
         EmitterType& get(const std::string& emitter_name) {
             try {
-                return static_cast<EmitterType&>(*emitters.at(name));
+                return static_cast<EmitterType&>(*emitters.at(emitter_name));
             } catch (...) {
                 throw no_such_emitter("with name " + emitter_name);
             }

diff --git a/include/limitless/instances/instanced_instance.hpp b/include/limitless/instances/instanced_instance.hpp
@@ -75,13 +75,13 @@ namespace Limitless {
             : AbstractInstance(rhs.shader_type, rhs.position) {
             initializeBuffer(rhs.instances.size());
             for (const auto& instance : rhs.instances) {
-                instances.emplace_back(instance->clone());
+                instances.emplace_back((ModelInstance*)instance->clone().release());
             }
         }
         InstancedInstance(InstancedInstance&&) noexcept = default;
 
-        InstancedInstance* clone() noexcept override {
-            return new InstancedInstance<ModelInstance>(*this);
+        std::unique_ptr<AbstractInstance> clone() noexcept override {
+            return std::make_unique<InstancedInstance>(*this);
         }
 
         void addInstance(std::unique_ptr<ModelInstance> instance) {