Merge branch 'LiquidFun' of https://github.com/marauder2k7/Torque2D-1 into LiquidFun

engine/source/2d/assets/ParticleAssetEmitter.cc

@@ -276,10 +276,8 @@ void ParticleAssetEmitter::initPersistFields()
     addProtectedField("EmitterName", TypeString, Offset(mEmitterName, ParticleAssetEmitter), &setEmitterName, &defaultProtectedGetFn, &defaultProtectedWriteFn, "");
     addProtectedField("EmitterType", TypeEnum, Offset(mEmitterType, ParticleAssetEmitter), &setEmitterType, &defaultProtectedGetFn, &writeEmitterType, 1, &EmitterTypeTable);
     addProtectedField("EmitterOffset", TypeVector2, Offset(mEmitterOffset, ParticleAssetEmitter), &setEmitterOffset, &defaultProtectedGetFn, &writeEmitterOffset, "");
-    //Target Particle
-    addProtectedField("TargetParticle", TypeBool, Offset(mTargetParticle, ParticleAssetEmitter), &setTargetParticle, &defaultProtectedGetFn, &writeTargetParticle, "");
+    addProtectedField("IsTargeting", TypeBool, Offset(mTargetParticle, ParticleAssetEmitter), &setIsTargeting, &defaultProtectedGetFn, &writeTargetParticle, "");
     addProtectedField("TargetPosition", TypeVector2, Offset(mTargetPosition, ParticleAssetEmitter), &setTargetPosition, &defaultProtectedGetFn, &writeTargetPosition, "");
-    //Target Particle end---
     addProtectedField("EmitterAngle", TypeF32, Offset(mEmitterAngle, ParticleAssetEmitter), &setEmitterAngle, &defaultProtectedGetFn, &writeEmitterAngle, "");
     addProtectedField("EmitterSize", TypeVector2, Offset(mEmitterSize, ParticleAssetEmitter), &setEmitterSize, &defaultProtectedGetFn, &writeEmitterSize, "");
     addProtectedField("FixedAspect", TypeBool, Offset(mFixedAspect, ParticleAssetEmitter), &setFixedAspect, &defaultProtectedGetFn, &writeFixedAspect, "");

engine/source/2d/assets/ParticleAssetEmitter_ScriptBinding.h

@@ -123,7 +123,11 @@ ConsoleMethodWithDocs(ParticleAssetEmitter, getEmitterOffset, ConsoleString, 2,
     return object->getEmitterOffset().scriptThis();
 }
 
-ConsoleMethodWithDocs(ParticleAssetEmitter, setTargetParticle, ConsoleVoid, 3, 3, (targetParticle))
+/*! Sets if the emitter targets a point.
+    @param target The point that the emitter's particles will be drawn to.
+    @return No return value.
+*/
+ConsoleMethodWithDocs(ParticleAssetEmitter, setIsTargeting, ConsoleVoid, 3, 3, (target))
 {
    object->setTargetParticle(dAtob(argv[2]));
 }
@@ -131,14 +135,17 @@ ConsoleMethodWithDocs(ParticleAssetEmitter, setTargetParticle, ConsoleVoid, 3, 3
 //-----------------------------------------------------------------------------
 
 /*! Gets whether the emitter targets a point.
-    @return Whether the emitter uses a target for particles.
+    @return True if the emitter uses a target for particles.
 */
-ConsoleMethodWithDocs(ParticleAssetEmitter, getTargetParticle, ConsoleBool, 2, 2, ())
+ConsoleMethodWithDocs(ParticleAssetEmitter, getIsTargeting, ConsoleBool, 2, 2, ())
 {
    return object->getTargetParticle();
 }
 
-
+/* Sets the world point that the emitter will target. Targeting must be turned on with setIsTargeting().
+    @param Position The world point that will be the target.
+    @return No return value.
+*/
 ConsoleMethodWithDocs(ParticleAssetEmitter, setTargetPosition, ConsoleVoid, 3, 4, (float X / float Y))
 {
    // Grab the element count.

modules/AngleToy/1/main.cs

@@ -102,7 +102,7 @@ function AngleToy::createBackground( %this )
     {
         %object = new ImageFont();
         %object.Image = "ToyAssets:Font";
-        %object.Position = Vector2Direction( %i, 30 ); // Polar ( 30, %i° )
+        %object.Position = Vector2Direction( %i, 30 ); // Polar ( 30, %i° )
         %object.Angle = %i - 90;
         %object.FontSize = "1.5 2";
         %object.TextAlignment = "Center";
@@ -133,7 +133,7 @@ function AngleToy::createTargets( %this )
 	%emitter.setEmitterType("ELLIPSE");
 	//%emitter.setAttachPositionToEmitter(false);
 	%emitter.setEmitterSize("40 40");
-	%emitter.TargetParticle = true;
+	%emitter.IsTargeting = true;
 	%emitter.setTargetPosition("0.0 0.0");
     %emitter.EmitterName = "AngledParticles";
     %emitter.setKeepAligned( true );
@@ -343,4 +343,4 @@ function LineSegment::drawTangent( %this, %from, %tan, %angleOnCircle )
     %tangentEnd = Vector2Add( %from, Vector2Direction( %tangentAngle, %length ) );
     
     %this.draw( %from, %tangentEnd );
-}
+}