particles fixup

Author: Try

game/graphics/effect.cpp

@@ -20,8 +20,8 @@ Effect::Effect(const VisualFx& vfx, World& owner, const Npc& src, SpellFxKey key
   }
 
 Effect::Effect(const VisualFx& v, World& owner, const Vec3& inPos, SpellFxKey k) {
-  root     = &v;
-  nodeSlot = root->emTrjOriginNode;
+  root      = &v;
+  nodeSlot  = root->emTrjOriginNode;
   pos.identity();
   pos.translate(inPos);
   setKey(owner,k);
@@ -97,12 +97,19 @@ bool Effect::is(const VisualFx& vfx) const {
   }
 
 void Effect::tick(uint64_t dt) {
+  if(next!=nullptr)
+    next->tick(dt);
+
   if(root==nullptr)
     return;
+
   Vec3 vel = root->emSelfRotVel;
   if(key!=nullptr)
     vel = key->emSelfRotVel.value_or(vel);
 
+  selfRotation += (vel*float(dt)/1000.f);
+  if(vel!=Vec3())
+    syncAttachesSingle(pos);
   }
 
 void Effect::setActive(bool e) {
@@ -175,9 +182,12 @@ void Effect::syncAttachesSingle(const Matrix4x4& inPos) {
       p.mul(pose->bone(boneId));
     }
 
-  if(emSelfRotVel!=Vec3()) {
-    //Matrix4x4 m;
-    //m.rotateOX(emSelfRotVel.x*);
+  if(selfRotation!=Vec3()) {
+    Matrix4x4 m;
+    m.rotateOX(selfRotation.x);
+    m.rotateOY(selfRotation.y);
+    m.rotateOZ(selfRotation.z);
+    p.mul(m);
     }
 
   p.set(3,1, p.at(3,1)+emTrjEaseVel);

game/graphics/effect.h

@@ -80,8 +80,8 @@ class Effect final {
     const MeshObjects::Mesh* meshEmitter = nullptr;
 
     Tempest::Matrix4x4    pos;
+    Tempest::Vec3         selfRotation;
 
-    uint64_t              timeStart = 0;
     bool                  active = false;
     bool                  looped = false;
 

game/graphics/pfx/particlefx.cpp

@@ -39,7 +39,7 @@ ParticleFx::ParticleFx(const Daedalus::GEngineClasses::C_ParticleFX &src, std::s
   ppsScaleKeys        = loadArr(src.ppsScaleKeys_S);
   ppsIsLooping        = src.ppsIsLooping!=0;
   ppsIsSmooth         = src.ppsIsSmooth!=0;
-  ppsFPS              = src.ppsFPS;
+  ppsFPS              = src.ppsFPS>0 ? src.ppsFPS : 1.f;
   ppsCreateEm         = Gothic::inst().loadParticleFx(src.ppsCreateEm_S.c_str());
   ppsCreateEmDelay    = uint64_t(src.ppsCreateEmDelay);
 

game/graphics/pfx/pfxbucket.cpp

@@ -316,7 +316,7 @@ void PfxBucket::init(PfxBucket::Block& block, ImplEmitter& emitter, size_t parti
       break;
       }
     case ParticleFx::Dir::Target:
-      Vec3 targetPos = p.pos;
+      Vec3 targetPos = emitter.pos;
       switch(decl.dirModeTargetFOR) {
         case ParticleFx::Frame::World:
           targetPos = decl.dirModeTargetPos;
@@ -327,6 +327,9 @@ void PfxBucket::init(PfxBucket::Block& block, ImplEmitter& emitter, size_t parti
             // MFX_WINDFIST_CAST
             auto mt = emitter.targetNpc->transform();
             mt.project(targetPos);
+            } else {
+            // IRRLICHT_DIE
+            targetPos = emitter.pos;
             }
           break;
           }

game/world/triggers/pfxcontroller.cpp

@@ -8,9 +8,9 @@
 PfxController::PfxController(Vob* parent, World& world, ZenLoad::zCVobData&& d, bool startup)
   :AbstractTrigger(parent,world,std::move(d),startup) {
   auto& name = data.zCPFXControler.pfxName;
-  const ParticleFx* view = Gothic::inst().loadParticleFx(name.c_str());
+  const ParticleFx* view = Gothic::inst().loadParticleFx(name);
   if(view==nullptr)
-    view = Gothic::inst().loadParticleFx(data.visual.c_str());
+    view = Gothic::inst().loadParticleFx(data.visual);
   if(view==nullptr)
     return;
   lifeTime = view->maxLifetime();