Browse Source

Target Particles

-Fix: setIsTargeting was not set in the class and so was throwing an error
marauder2k7 5 năm trước cách đây
mục cha
commit
b1e052f20a

+ 2 - 2
engine/source/2d/assets/ParticleAssetEmitter.h

@@ -193,7 +193,7 @@ public:
     //Particle Target
     inline void setTargetPosition(const Vector2& targetPos) { mTargetPosition = targetPos; }
     inline const Vector2& getTargetPosition(void) const { return mTargetPosition; }
-    inline void setTargetParticle(const bool targetParticle) { mTargetParticle = targetParticle; refreshAsset(); }
+    inline void setIsTargeting(const bool targetParticle) { mTargetParticle = targetParticle; refreshAsset(); }
     inline bool getTargetParticle(void) const { return mTargetParticle; }
     //Particle Target end---
     inline void setKeepAligned( const bool keepAligned ) { mKeepAligned = keepAligned; refreshAsset(); }
@@ -314,7 +314,7 @@ protected:
     static bool     setEmitterOffset(void* obj, const char* data)                       { static_cast<ParticleAssetEmitter*>(obj)->setEmitterOffset(Vector2(data)); return false; }
     static bool     writeEmitterOffset( void* obj, StringTableEntry pFieldName )        { return static_cast<ParticleAssetEmitter*>(obj)->getEmitterOffset().notZero(); }
 
-    static bool     setTargetParticle(void* obj, const char* data)                      { static_cast<ParticleAssetEmitter*>(obj)->setTargetParticle(dAtob(data)); return false; }
+    static bool     setIsTargeting(void* obj, const char* data)                      { static_cast<ParticleAssetEmitter*>(obj)->setIsTargeting(dAtob(data)); return false; }
     static bool     writeTargetParticle(void* obj, StringTableEntry pFieldName)         { return static_cast<ParticleAssetEmitter*>(obj)->getTargetParticle() == false; }
     static bool     setTargetPosition(void* obj, const char* data)                      { static_cast<ParticleAssetEmitter*>(obj)->setTargetPosition(Vector2(data)); return false; }
     static bool     writeTargetPosition(void* obj, StringTableEntry pFieldName)         { return static_cast<ParticleAssetEmitter*>(obj)->getTargetPosition().notZero(); }

+ 1 - 1
engine/source/2d/assets/ParticleAssetEmitter_ScriptBinding.h

@@ -129,7 +129,7 @@ ConsoleMethodWithDocs(ParticleAssetEmitter, getEmitterOffset, ConsoleString, 2,
 */
 ConsoleMethodWithDocs(ParticleAssetEmitter, setIsTargeting, ConsoleVoid, 3, 3, (target))
 {
-   object->setTargetParticle(dAtob(argv[2]));
+   object->setIsTargeting(dAtob(argv[2]));
 }
 
 //-----------------------------------------------------------------------------