Browse Source

getIsTargeting

-Now getIsTargeting is set throughout too
marauder2k7 5 years ago
parent
commit
f6fcd9be20

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

@@ -194,7 +194,7 @@ public:
     inline void setTargetPosition(const Vector2& targetPos) { mTargetPosition = targetPos; }
     inline const Vector2& getTargetPosition(void) const { return mTargetPosition; }
     inline void setIsTargeting(const bool targetParticle) { mTargetParticle = targetParticle; refreshAsset(); }
-    inline bool getTargetParticle(void) const { return mTargetParticle; }
+    inline bool getIsTargeting(void) const { return mTargetParticle; }
     //Particle Target end---
     inline void setKeepAligned( const bool keepAligned ) { mKeepAligned = keepAligned; refreshAsset(); }
     inline bool getKeepAligned( void ) const { return mKeepAligned; }
@@ -315,7 +315,7 @@ protected:
     static bool     writeEmitterOffset( void* obj, StringTableEntry pFieldName )        { return static_cast<ParticleAssetEmitter*>(obj)->getEmitterOffset().notZero(); }
 
     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     writeTargetParticle(void* obj, StringTableEntry pFieldName)         { return static_cast<ParticleAssetEmitter*>(obj)->getIsTargeting() == 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

@@ -139,7 +139,7 @@ ConsoleMethodWithDocs(ParticleAssetEmitter, setIsTargeting, ConsoleVoid, 3, 3, (
 */
 ConsoleMethodWithDocs(ParticleAssetEmitter, getIsTargeting, ConsoleBool, 2, 2, ())
 {
-   return object->getTargetParticle();
+   return object->getIsTargeting();
 }
 
 /* Sets the world point that the emitter will target. Targeting must be turned on with setIsTargeting().

+ 1 - 1
engine/source/2d/sceneobject/ParticlePlayer.cc

@@ -1147,7 +1147,7 @@ void ParticlePlayer::configureParticle( EmitterNode* pEmitterNode, ParticleSyste
                                                                 pParticleAssetEmitter->getEmissionForceVariationField(),
                                                                 particlePlayerAge) * getForceScale();
 
-        if (pParticleAssetEmitter->getTargetParticle())
+        if (pParticleAssetEmitter->getIsTargeting())
         {
            Vector2 tPos = pParticleAssetEmitter->getTargetPosition();
            Vector2 pPos = pParticleNode->mPosition;