Immortal emitter is now mortal as it should be.

Change-Id: I6709952446a8cb5ccdf6c6e1691600e42bff7e7a

Immortal emitter is now mortal as it should be.
Change-Id: I6709952446a8cb5ccdf6c6e1691600e42bff7e7a
Adam Bialogonski
1 parent bff9106e
Showing 13 changed files with 56 additions and 20 deletions
examples/particle-system/effects/fire-ring-effect-modifier.cpp
examples/particle-system/effects/fire-ring-effect-modifier.h
examples/particle-system/effects/fire-ring-effect-source.cpp
examples/particle-system/effects/fire-ring-effect-source.h
examples/particle-system/effects/image-effect-modifier.cpp
examples/particle-system/effects/image-effect-modifier.h
examples/particle-system/effects/image-effect-source.cpp
examples/particle-system/effects/image-effect-source.h
examples/particle-system/effects/particle-effect.h
examples/particle-system/effects/sparkles-effect-modifier.cpp
examples/particle-system/effects/sparkles-effect-modifier.h
examples/particle-system/effects/sparkles-effect-source.cpp
examples/particle-system/effects/sparkles-effect-source.h
@@ -55,7 +55,12 @@ void FireModifier::Update(ParticleList&amp; particleList, uint32_t first, uint32_t c
   // Retrieve the Source and get the stream
   if(!mStreamBasePos)
   {
-    mStreamBasePos = static_cast<FireSource*>(&mEmitter.GetSource().GetSourceCallback())->mStreamBasePos;
+    auto handle = mEmitter.GetHandle();
+    if(!handle)
+    {
+      return;
+    }
+    mStreamBasePos = static_cast<FireSource*>(&handle.GetSource().GetSourceCallback())->mStreamBasePos;
   }
   // Missing stream, return!
@@ -25,6 +25,7 @@
 #include <dali-toolkit/public-api/particle-system/particle-list.h>
 #include <dali-toolkit/public-api/particle-system/particle.h>
 #include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/object/weak-handle.h>
 #include <ctime>
 namespace Dali::ParticleEffect
@@ -76,7 +77,7 @@ public:
   void Update(ParticleList& particleList, uint32_t first, uint32_t count) override;
   ColorGradient mFireGradient;
-  ParticleEmitter mEmitter;
+  Dali::WeakHandle<ParticleEmitter> mEmitter;
   uint32_t mStreamBasePos{0u};
   uint32_t mAngle{0u};
 };
@@ -40,7 +40,11 @@ mEmitter(emitter)
 void FireSource::Init()
 {
-  mStreamBasePos = mEmitter.GetParticleList().AddLocalStream<Vector3>(Vector3::ZERO);
+  auto handle = mEmitter.GetHandle();
+  if(handle)
+  {
+    mStreamBasePos = handle.GetParticleList().AddLocalStream<Vector3>(Vector3::ZERO);
+  }
 }
 uint32_t FireSource::Update(ParticleList& particleList, uint32_t count)
@@ -23,6 +23,7 @@
 #include <dali-toolkit/public-api/particle-system/particle-modifier.h>
 #include <dali-toolkit/public-api/particle-system/particle-list.h>
 #include <dali-toolkit/public-api/particle-system/particle.h>
+#include <dali/public-api/object/weak-handle.h>
 #include <ctime>
 namespace Dali::ParticleEffect
@@ -43,7 +44,7 @@ public:
   void UpdateParticle(Vector3& position, Vector3& basePosition, Vector4& color, Vector3& velocity, Vector3& scale);
-  ParticleEmitter mEmitter;
+  Dali::WeakHandle<ParticleEmitter> mEmitter;
   Dali::Vector2 mRadius;
@@ -44,7 +44,12 @@ void ImageExplodeEffectModifier::Update(ParticleList&amp; particleList, uint32_t fir
   // Retrieve the Source and get the stream
   if(!mStreamBasePos)
   {
-    mStreamBasePos = static_cast<ImageExplodeEffectSource*>(&mEmitter.GetSource().GetSourceCallback())->mStreamBasePos;
+    auto handle = mEmitter.GetHandle();
+    if(!handle)
+    {
+      return;
+    }
+    mStreamBasePos = static_cast<ImageExplodeEffectSource*>(&handle.GetSource().GetSourceCallback())->mStreamBasePos;
   }
   // Missing stream, return!
@@ -24,6 +24,7 @@
 #include <dali-toolkit/public-api/particle-system/particle-modifier.h>
 #include <dali-toolkit/public-api/particle-system/particle-list.h>
 #include <dali-toolkit/public-api/particle-system/particle.h>
+#include <dali/public-api/object/weak-handle.h>
 #include <ctime>
 namespace Dali::ParticleEffect
@@ -40,7 +41,7 @@ public:
   void Update(ParticleList& particleList, uint32_t first, uint32_t count) override;
-  ParticleEmitter mEmitter;
+  WeakHandle<ParticleEmitter> mEmitter;
   uint32_t mStreamBasePos{0u};
   float mAngle{0.0f};
@@ -64,12 +64,16 @@ mEmitter(emitter)
 void ImageExplodeEffectSource::Init()
 {
-  mStreamBasePos = mEmitter.GetParticleList().AddLocalStream<Vector3>(Vector3::ZERO);
+  auto handle = mEmitter.GetHandle();
+  if(handle)
+  {
+    mStreamBasePos = handle.GetParticleList().AddLocalStream<Vector3>(Vector3::ZERO);
+  }
 }
 uint32_t ImageExplodeEffectSource::Update(ParticleList& particleList, uint32_t count)
 {
-  if(!mShouldEmit)
+  if(!mShouldEmit || !mStreamBasePos)
   {
     return 0;
   }
@@ -24,6 +24,7 @@
 #include <dali-toolkit/public-api/particle-system/particle-list.h>
 #include <dali-toolkit/public-api/particle-system/particle.h>
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/public-api/object/weak-handle.h>
 #include <ctime>
 namespace Dali::ParticleEffect
@@ -46,7 +47,7 @@ public:
   void Init() override;
-  ParticleEmitter mEmitter;
+  WeakHandle<ParticleEmitter> mEmitter;
   uint32_t mImageWidth{0u};
   uint32_t mImageHeight{0u};
@@ -55,10 +55,6 @@ public:
   ~ParticleEffect();
   Dali::Toolkit::ParticleSystem::ParticleEmitter CreateEffectEmitter( EffectType effectType, Actor parentActor, const ParticleEffectParams& params );
-
-private:
-
-
 };
 }
@@ -42,13 +42,18 @@ void SparklesModifier::Update(ParticleList&amp; particleList, uint32_t first, uint32
   mAngle = ((mAngle + 2) % 360);
   // Retrieve the Source and get the stream
+  auto handle = mEmitter.GetHandle();
+  if(!handle)
+  {
+    return;
+  }
   if(!mStreamBasePos)
   {
-    mStreamBasePos = static_cast<SparklesSource*>(&mEmitter.GetSource().GetSourceCallback())->mStreamBasePos;
+    mStreamBasePos = static_cast<SparklesSource*>(&handle.GetSource().GetSourceCallback())->mStreamBasePos;
   }
   if(!mStreamBaseAngle)
   {
-    mStreamBaseAngle = static_cast<SparklesSource*>(&mEmitter.GetSource().GetSourceCallback())->mStreamBaseAngle;
+    mStreamBaseAngle = static_cast<SparklesSource*>(&handle.GetSource().GetSourceCallback())->mStreamBaseAngle;
   }
   // Missing stream, return!
@@ -77,7 +82,7 @@ void SparklesModifier::Update(ParticleList&amp; particleList, uint32_t first, uint32
     auto angle = particle.GetByIndex<float>(mStreamBaseAngle);
     auto                   radians  = ((angle * M_PI)/180.f);
     float                  lifetime = particle.Get<float>(ParticleStream::LIFETIME_STREAM_BIT);
-    position.y += velocity.y *sin(radians);
+    position.y += velocity.y * sin(radians);
     position.x += velocity.x * cos(radians);
     velocity *= 0.990f;
@@ -25,6 +25,7 @@
 #include <dali-toolkit/public-api/particle-system/particle-list.h>
 #include <dali-toolkit/public-api/particle-system/particle.h>
 #include <dali/public-api/common/vector-wrapper.h>
+#include <dali/public-api/object/weak-handle.h>
 #include <ctime>
 namespace Dali::ParticleEffect
@@ -41,7 +42,7 @@ public:
   void Update(ParticleList& particleList, uint32_t first, uint32_t count) override;
-  ParticleEmitter mEmitter;
+  Dali::WeakHandle<ParticleEmitter> mEmitter;
   uint32_t mStreamBasePos{0u};
   uint32_t mStreamBaseAngle{0u};
   uint32_t mAngle{0u};
@@ -39,12 +39,22 @@ mEmitter(emitter)
 void SparklesSource::Init()
 {
-  mStreamBasePos = mEmitter.GetParticleList().AddLocalStream<Vector3>(Vector3::ZERO);
-  mStreamBaseAngle = mEmitter.GetParticleList().AddLocalStream<float>(0.0f);
+  auto handle = mEmitter.GetHandle();
+  if(!handle)
+  {
+    return;
+  }
+  mStreamBasePos = handle.GetParticleList().AddLocalStream<Vector3>(Vector3::ZERO);
+  mStreamBaseAngle = handle.GetParticleList().AddLocalStream<float>(0.0f);
 }
 uint32_t SparklesSource::Update(ParticleList& particleList, uint32_t count)
 {
+  if(!mStreamBasePos || !mStreamBaseAngle)
+  {
+    return 0u;
+  }
+
   while(count--)
   {
     auto particle = particleList.NewParticle(LIFETIME);
@@ -23,6 +23,8 @@
 #include <dali-toolkit/public-api/particle-system/particle-modifier.h>
 #include <dali-toolkit/public-api/particle-system/particle-list.h>
 #include <dali-toolkit/public-api/particle-system/particle.h>
+#include <dali/public-api/object/weak-handle.h>
+
 #include <ctime>
 namespace Dali::ParticleEffect
@@ -43,7 +45,7 @@ public:
   void UpdateParticle(Vector3& position, Vector3& basePosition, Vector4& color, Vector3& velocity, Vector3& scale, float& angle);
-  ParticleEmitter mEmitter;
+  Dali::WeakHandle<ParticleEmitter> mEmitter;
   Dali::Vector2 mRadius;