Cleanup files that did merge properly

- Remove warning from audio streaming fix
- Update VS2010 project

README.md

@@ -4,3 +4,5 @@ Torque2D
 MIT Licensed Open Source version of Torque 2D from GarageGames.
 
 You can find the main Wiki page [here](https://github.com/GarageGames/Torque2D/wiki)
+
+This branch is dedicated to active development. Bug fixes, new features, and pull requests should happen here. It should always be considered unstable. Once changes are tested and accepted, this branch will be pushed into the Master.

engine/compilers/VisualStudio 2010/Torque 2D.vcxproj

@@ -344,6 +344,7 @@
     <ClCompile Include="..\..\source\console\consoleNamespace.cc" />
     <ClCompile Include="..\..\source\console\ConsoleTypeValidators.cc" />
     <ClCompile Include="..\..\source\console\metaScripting_ScriptBinding.cc" />
+    <ClCompile Include="..\..\source\console\Package.cc" />
     <ClCompile Include="..\..\source\debug\profiler.cc" />
     <ClCompile Include="..\..\source\debug\remote\RemoteDebugger1.cc" />
     <ClCompile Include="..\..\source\debug\remote\RemoteDebuggerBase.cc" />
@@ -673,7 +674,6 @@
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectRotateToEvent.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectSet.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectSet_ScriptBinding.h" />
-    <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectTimerEvent.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObject_ScriptBinding.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\Scroller.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\Scroller_ScriptBinding.h" />
@@ -803,6 +803,7 @@
     <ClInclude Include="..\..\source\console\expando_ScriptBinding.h" />
     <ClInclude Include="..\..\source\console\inputManagement_ScriptBinding.h" />
     <ClInclude Include="..\..\source\console\output_ScriptBinding.h" />
+    <ClInclude Include="..\..\source\console\Package.h" />
     <ClInclude Include="..\..\source\console\taggedStrings_ScriptBinding.h" />
     <ClInclude Include="..\..\source\debug\profiler.h" />
     <ClInclude Include="..\..\source\debug\profiler_ScriptBinding.h" />
@@ -879,7 +880,6 @@
     <ClInclude Include="..\..\source\input\actionMap_ScriptBinding.h" />
     <ClInclude Include="..\..\source\io\bitStream.h" />
     <ClInclude Include="..\..\source\io\bufferStream.h" />
-    <ClInclude Include="..\..\source\io\fileio.h" />
     <ClInclude Include="..\..\source\io\fileObject.h" />
     <ClInclude Include="..\..\source\io\fileObject_ScriptBinding.h" />
     <ClInclude Include="..\..\source\io\fileStream.h" />

engine/compilers/VisualStudio 2010/Torque 2D.vcxproj.filters

@@ -1335,6 +1335,9 @@
     <ClCompile Include="..\..\source\platform\platformNetwork_ScriptBinding.cc">
       <Filter>platform</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\console\Package.cc">
+      <Filter>console</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\audio\audio.h">
@@ -2108,9 +2111,6 @@
     <ClInclude Include="..\..\source\io\bufferStream.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\io\fileio.h">
-      <Filter>io</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\io\fileObject.h">
       <Filter>io</Filter>
     </ClInclude>
@@ -2387,9 +2387,6 @@
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectRotateToEvent.h">
       <Filter>2d\sceneobject</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectTimerEvent.h">
-      <Filter>2d\sceneobject</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\2d\sceneobject\Scroller.h">
       <Filter>2d\sceneobject</Filter>
     </ClInclude>
@@ -2979,6 +2976,9 @@
     <ClInclude Include="..\..\source\network\RemoteCommandEvent.h">
       <Filter>network</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\console\Package.h">
+      <Filter>console</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\source\math\mMath_ASM.asm">

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

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Copyright (c) 2013 GarageGames, LLC
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -88,6 +87,119 @@ ConsoleMethodWithDocs(ParticleAssetEmitter, getEmitterType, ConsoleString, 2, 2,
 
 //-----------------------------------------------------------------------------
 
+/*! Offsets the position of the emitter relative to the effect or player position.
+    @return No return value.
+*/
+ConsoleMethodWithDocs(ParticleAssetEmitter, setEmitterOffset, ConsoleVoid, 3, 4, (float X / float Y))
+{
+    // Grab the element count.
+    U32 elementCount =Utility::mGetStringElementCount(argv[2]);
+    
+    // ("positionX positionY")
+    if ( (elementCount == 2) && (argc < 4) )
+    {
+        object->setEmitterOffset( Vector2( argv[2] ) );
+        return;
+    }
+    
+    // (positionX, positionY)
+    if ( (elementCount == 1) && (argc > 3) )
+    {
+        object->setEmitterOffset( Vector2( dAtof(argv[2]), dAtof(argv[3]) ) );
+        return;
+    }
+    
+    // Warn.
+    Con::warnf( "ParticleAssetEmitter::setEmitterOffset() - Invalid number of parameters!" );
+}
+
+//------------------------------------------------------------------------------
+
+/*! Gets the emitter offset position.
+    @return (float x/float y) The offset of the emitter relative to the effect or player position.
+*/
+ConsoleMethodWithDocs(ParticleAssetEmitter, getEmitterOffset, ConsoleString, 2, 2, ())
+{
+    return object->getEmitterOffset().scriptThis();
+}
+
+//------------------------------------------------------------------------------
+
+/*! Sets the emitter size.
+    @param width The width of the emitter.
+    @param height The height of the emitter.
+    @return No return value.
+*/
+ConsoleMethodWithDocs(ParticleAssetEmitter, setEmitterSize, ConsoleVoid, 3, 4, (width / height))
+{
+    F32 width, height;
+    
+    const U32 elementCount = Utility::mGetStringElementCount(argv[2]);
+    
+    // ("width height")
+    if ((elementCount == 2) && (argc == 3))
+    {
+        width = dAtof(Utility::mGetStringElement(argv[2], 0));
+        height = dAtof(Utility::mGetStringElement(argv[2], 1));
+    }
+    
+    // (width, [height])
+    else if (elementCount == 1)
+    {
+        width = dAtof(argv[2]);
+        
+        if (argc > 3)
+            height = dAtof(argv[3]);
+        else
+            height = width;
+    }
+    
+    // Invalid
+    else
+    {
+        Con::warnf("ParticleAssetEmitter::setEmitterSize() - Invalid number of parameters!");
+        return;
+    }
+    
+    // Set Size.
+    object->setEmitterSize(Vector2(width, height));
+}
+
+//------------------------------------------------------------------------------
+
+/*! Gets the emitter size.
+    @return (float width/float height) The width and height of the emitter.
+*/
+ConsoleMethodWithDocs(ParticleAssetEmitter, getEmitterSize, ConsoleString, 2, 2, ())
+{
+    return object->getEmitterSize().scriptThis();
+}
+
+//------------------------------------------------------------------------------
+
+/*! Sets the emitter angle.
+    @param angle The angle of the emitter.
+    @return No return value.
+*/
+ConsoleMethodWithDocs(ParticleAssetEmitter, setEmitterAngle, ConsoleVoid, 3, 3, (angle))
+{
+    // Set Rotation.
+    object->setEmitterAngle( mDegToRad( dAtof(argv[2]) ) );
+}
+
+//-----------------------------------------------------------------------------
+
+/*! Gets the emitter angle.
+    @return (float angle) The emitter's current angle.
+*/
+ConsoleMethodWithDocs(ParticleAssetEmitter, getEmitterAngle, ConsoleFloat, 2, 2, ())
+{
+    // Return angle.
+    return mRadToDeg( object->getEmitterAngle());
+}
+
+//-----------------------------------------------------------------------------
+
 /*! Sets the emitter to used a fixed-aspect for particles.
     @param fixedAspect Whether to use a fixed-aspect or not.
     @return No return value.
@@ -444,6 +556,27 @@ ConsoleMethodWithDocs(ParticleAssetEmitter, getImageFrame, ConsoleInt, 2, 2, ())
 
 //------------------------------------------------------------------------------
 
+/*! Disables the Frame field and uses a random frame from the specified ImageAsset.
+    @param randomImageFrame Whether to use a random image frame or not.
+    @return No return value.
+*/
+ConsoleMethodWithDocs(ParticleAssetEmitter, setRandomImageFrame, ConsoleVoid, 3, 3, (randomImageFrame))
+{
+    object->setRandomImageFrame( dAtob(argv[2]) );
+}
+
+//------------------------------------------------------------------------------
+
+/*! Gets whether a random frame from the specified ImageAsset is being used or not.
+    @return Whether to use a random image frame or not.
+*/
+ConsoleMethodWithDocs(ParticleAssetEmitter, getRandomImageFrame, ConsoleBool, 2, 2, ())
+{
+    return object->getRandomImageFrame();
+}
+
+//------------------------------------------------------------------------------
+
 /*! Sets the emitter to use the specified animation asset Id.
     @param animationAssetId The animation asset Id to use.
     @return Whether the operation was successful or not.
@@ -824,806 +957,4 @@ ConsoleMethodWithDocs(ParticleAssetEmitter, getValueScale, ConsoleFloat, 2, 2, (
    return object->getParticleFields().getValueScale();
 }
 
-ConsoleMethodGroupEndWithDocs(ParticleAssetEmitter)
-=======
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/// Particle emitter accessors.
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getOwner, const char*, 2, 2,    "() Gets the asset owner of the emitter.\n"
-                                                                    "@return The asset owner of the emitter or nothing if no owner assigned." )
-{
-    // Fetch the owner.
-    ParticleAsset* pParticleAsset = object->getOwner();
-
-    return pParticleAsset == NULL ? StringTable->EmptyString : pParticleAsset->getIdString();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setEmitterName, void, 3, 3,     "(emitterName) Sets the name of the emitter.\n"
-                                                                    "@param emitterName The name to set the emitter to.\n"
-                                                                    "@return No return value." )
-{
-    object->setEmitterName( argv[2] );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getEmitterName, const char*, 2, 2,  "() Gets the name of the emitter.\n"
-                                                                        "@return The name of the emitter." )
-{
-    return object->getEmitterName();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setEmitterType, void, 3, 3,     "(emitterType) Sets the type of the emitter.\n"
-                                                                    "@param emitterType The type to set the emitter.  Either 'POINT', 'LINE', 'BOX' or 'DISK', 'ELLIPSE' or 'TORUS'.\n"
-                                                                    "An emitter-type of 'POINT' creates the particles at the position of the particle asset.\n"
-                                                                    "An emitter-type of 'LINE' creates the particles along a line defined by the particle width.\n"
-                                                                    "An emitter-type of 'BOX' creates the particles within the dimensions defined by the particle size.\n"
-                                                                    "An emitter-type of 'DISK' creates the particles within a disk with radii defined by the particle size.\n"
-                                                                    "An emitter-type of 'ELLIPSE' creates the particles on an ellipse with the radii defined by the particle size.\n"
-                                                                    "An emitter-type of 'TORUS' creates the particles within a torus with a maximum and minimum radii defined by the particle width and height respectively.\n"
-                                                                    "@return No return value." )
-{
-    object->setEmitterType( ParticleAssetEmitter::getEmitterTypeEnum(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getEmitterType, const char*, 2, 2,  "() Gets the type of the emitter.\n"
-                                                                        "@return The type of the emitter." )
-{
-    return ParticleAssetEmitter::getEmitterTypeDescription( object->getEmitterType() );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setEmitterOffset, void, 3, 4,   "(float X / float Y) - Offsets the position of the emitter relative to the effect or player position.\n"
-                                                                    "@return No return value.")
-{
-    // Grab the element count.
-    U32 elementCount =Utility::mGetStringElementCount(argv[2]);
-    
-    // ("positionX positionY")
-    if ( (elementCount == 2) && (argc < 4) )
-    {
-        object->setEmitterOffset( Vector2( argv[2] ) );
-        return;
-    }
-    
-    // (positionX, positionY)
-    if ( (elementCount == 1) && (argc > 3) )
-    {
-        object->setEmitterOffset( Vector2( dAtof(argv[2]), dAtof(argv[3]) ) );
-        return;
-    }
-    
-    // Warn.
-    Con::warnf( "ParticleAssetEmitter::setEmitterOffset() - Invalid number of parameters!" );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getEmitterOffset, const char*, 2, 2,    "Gets the emitter offset position.\n"
-                                                                            "@return (float x/float y) The offset of the emitter relative to the effect or player position.")
-{
-    return object->getEmitterOffset().scriptThis();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setEmitterSize, void, 3, 4, "(float width / float height) - Sets the emitter size.\n"
-                                                                "@param width The width of the emitter.\n"
-                                                                "@param height The height of the emitter.\n"
-                                                                "@return No return value.")
-{
-    F32 width, height;
-    
-    const U32 elementCount = Utility::mGetStringElementCount(argv[2]);
-    
-    // ("width height")
-    if ((elementCount == 2) && (argc == 3))
-    {
-        width = dAtof(Utility::mGetStringElement(argv[2], 0));
-        height = dAtof(Utility::mGetStringElement(argv[2], 1));
-    }
-    
-    // (width, [height])
-    else if (elementCount == 1)
-    {
-        width = dAtof(argv[2]);
-        
-        if (argc > 3)
-            height = dAtof(argv[3]);
-        else
-            height = width;
-    }
-    
-    // Invalid
-    else
-    {
-        Con::warnf("ParticleAssetEmitter::setEmitterSize() - Invalid number of parameters!");
-        return;
-    }
-    
-    // Set Size.
-    object->setEmitterSize(Vector2(width, height));
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getEmitterSize, const char*, 2, 2,  "Gets the emitter size.\n"
-                                                                        "@return (float width/float height) The width and height of the emitter.")
-{
-    return object->getEmitterSize().scriptThis();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setEmitterAngle, void, 3, 3,    "(float angle) - Sets the emitter angle.\n"
-                                                                    "@param angle The angle of the emitter."
-                                                                    "@return No return value.")
-{
-    // Set Rotation.
-    object->setEmitterAngle( mDegToRad( dAtof(argv[2]) ) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getEmitterAngle, F32, 2, 2, "() Gets the emitter angle.\n"
-                                                                "@return (float angle) The emitter's current angle.")
-{
-    // Return angle.
-    return mRadToDeg( object->getEmitterAngle());
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setFixedAspect, void, 3, 3,     "(fixedAspect) Sets the emitter to used a fixed-aspect for particles.\n"
-                                                                    "@param fixedAspect Whether to use a fixed-aspect or not.\n"
-                                                                    "@return No return value." )
-{
-    object->setFixedAspect( dAtob(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getFixedAspect, bool, 2, 2,     "() Gets whether the emitter uses a fixed-aspect for particles or not.\n"
-                                                                    "@return Whether the emitter uses a fixed-aspect for particles or not." )
-{
-    return object->getFixedAspect();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setFixedForceAngle, void, 3, 3, "(fixedForceAngle) Sets the emitter fixed-force angle for particles.\n"
-                                                                    "@param fixedForceAngle The fixed-force angle for particles.\n"
-                                                                    "@return No return value." )
-{
-    object->setFixedForceAngle( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getFixedForceAngle, F32, 2, 2,  "() Gets the emitter fixed-force angle for particles.\n"
-                                                                    "@return The fixed-force angle for particles." )
-{
-    return object->getFixedForceAngle();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setOrientationType, void, 3, 3,     "(orientationType) Sets the orientation-type of the emitter.\n"
-                                                                        "@param orientationType The orientation-type to set the emitter to.  Either 'FIXED', 'ALIGNED' or 'RANDOM'.\n"
-                                                                        "An orientation-type of 'FIXED' causes the particles to be orientation at a fixed angle.\n"
-                                                                        "An orientation-type of 'ALIGNED' causes the particles to be orientation at the current emission angle.\n"
-                                                                        "An orientation-type of 'RANDOM' causes the particles to be orientation at a fixed angle.\n"
-                                                                        "@return No return value." )
-{
-    object->setOrientationType( ParticleAssetEmitter::getOrientationTypeEnum(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getOrientationType, const char*, 2, 2,  "() Gets the orientation-type of the emitter.\n"
-                                                                            "@return The orientation-type of the emitter." )
-{
-    return ParticleAssetEmitter::getOrientationTypeDescription( object->getOrientationType() );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setKeepAligned, void, 3, 3,     "(keepAligned) Sets whether to keep emitted particles aligned or not."
-                                                                    "@keepAligned Whether to keep emitted particles aligned or not.\n"
-                                                                    "@return No return value." )
-{
-    object->setKeepAligned( dAtob(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getKeepAligned, bool, 2, 2, "() Gets whether to keep emitted particles aligned or not.\n"
-                                                                "@return Whether to keep emitted particles aligned or not." )
-{
-    return object->getKeepAligned();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setAlignedAngleOffset, void, 3, 3,  "(alignAngleOffset) Sets the aligned angle offset.\n"
-                                                                        "@param alignAngleOffset The aligned angle offset.\n"
-                                                                        "@return No return value." )
-{
-    object->setAlignedAngleOffset( dAtof(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getAlignedAngleOffset, F32, 2, 2,  "() Gets the aligned angle offset.\n"
-                                                                        "@return The aligned angle offset." )
-{
-    return object->getAlignedAngleOffset();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setRandomAngleOffset, void, 3, 3, "(randomAngle) - Set Random-Orientation Angle-Offset.")
-{
-    object->setRandomAngleOffset( dAtof(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getRandomAngleOffset, F32, 2, 2, "Get Random-Orientation Angle-Offset.")
-{
-    return object->getRandomAngleOffset();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setRandomArc, void, 3, 3, "(randomArc) - Set Random-Orientation Arc.")
-{
-    object->setRandomArc( dAtof(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getRandomArc, F32, 2, 2, "Get Random-Orientation Arc.")
-{
-    return object->getRandomArc();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setFixedAngleOffset, void, 3, 3, "(randomAngle) - Set Fixed-Orientation Angle-Offset.")
-{
-    object->setFixedAngleOffset( dAtof(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getFixedAngleOffset, F32, 2, 2, "Get Fixed-Orientation Angle-Offset.")
-{
-    return object->getFixedAngleOffset();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setPivotPoint, void, 3, 4, "(pivotX / pivotY) - Set the Pivot-Point.")
-{
-    // Grab the element count.
-    U32 elementCount =Utility::mGetStringElementCount(argv[2]);
-
-    // ("pivotX pivotY")
-    if ( (elementCount == 2) && (argc < 4) )
-    {
-        object->setPivotPoint( Vector2( argv[2] ) );
-        return;
-    }
-
-    // (pivotX, pivotY)
-    if ( (elementCount == 1) && (argc > 3) )
-    {
-        object->setPivotPoint( Vector2( dAtof(argv[2]), dAtof(argv[3]) ) );
-        return;
-    }
-
-    // Warn.
-    Con::warnf( "ParticleAssetEmitter::setPivotPoint() - Invalid number of parameters!" );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getPivotPoint, const char*, 2, 2, "Get Pivot-Point.")
-{
-    return object->getPivotPoint().scriptThis();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setLinkEmissionRotation, void, 3, 3, "(linkEmissionRotation) - Set Link-Emission-Rotation Flag.")
-{
-    object->setLinkEmissionRotation( dAtob(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getLinkEmissionRotation, bool, 2, 2, "Get Link-Emission-Rotation Flag.")
-{
-    return object->getLinkEmissionRotation();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setIntenseParticles, void, 3, 3, "(intenseParticles) - Set Intense-Particles Flag.")
-{
-    object->setIntenseParticles( dAtob(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getIntenseParticles, bool, 2, 2, "Get Intense-Particles Flag.")
-{
-    return object->getIntenseParticles();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setSingleParticle, void, 3, 3, "(singleParticle) - Set Single-Particle Flag.")
-{
-    // Set Single Particle.
-    object->setSingleParticle( dAtob(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getSingleParticle, bool, 2, 2, "Get Single-Particle Flag.")
-{
-    return object->getSingleParticle();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setAttachPositionToEmitter, void, 3, 3, "(attachPositionToEmitter) - Set Attach-Position-To-Emitter Flag.")
-{
-    object->setAttachPositionToEmitter( dAtob(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getAttachPositionToEmitter, bool, 2, 2, "Get Attach-Position-To-Emitter Flag.")
-{
-    return object->getAttachPositionToEmitter();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setAttachRotationToEmitter, void, 3, 3, "(attachRotationToEmitter) - Set Attach-Rotation-To-Emitter Flag.")
-{
-    object->setAttachRotationToEmitter( dAtob(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getAttachRotationToEmitter, bool, 2, 2, "Get Attach-Rotation-To-Emitter Flag.")
-{
-    return object->getAttachRotationToEmitter();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setOldestInFront, void, 3, 3,   "(oldestInFront) Sets whether to render particles as oldest on front or not.\n"
-                                                                    "@param oldestInFront Whether to render particles as oldest on front or not.\n"
-                                                                    "@return No return value." )
-{
-    object->setOldestInFront( dAtob(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getOldestInFront, bool, 2, 2,   "() Gets whether to render particles as oldest on front or not.\n"
-                                                                    "@return Whether to render particles as oldest on front or not." )
-{
-    return object->getOldestInFront();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setImage, bool, 3, 4,   "(imageAssetId, [frame]) Sets the emitter to use the specified image asset Id and optional frame.\n"
-                                                            "@param imageAssetId The image asset Id to use.\n"
-                                                            "@param frame The frame of the image asset Id to use.  Optional.\n"
-                                                            "@return Whether the operation was successful or not." )
-{
-    // Fetch the frame.
-    const U32 frame = argc >= 4 ? dAtoi(argv[3]) : 0;
-
-    return object->setImage( argv[2], frame );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getImage, const char*, 2, 2,    "() Gets the asset Id of the image asset assigned to the emitter.\n"
-                                                                    "@return The asset Id of the image asset assigned to the emitter or nothing if no image is assigned." )
-{
-    return object->getImage();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setImageFrame, bool, 3, 3,   "(frame) Sets the emitter to use the specified image frame.\n"
-                                                                "@param frame The frame of the image to use..\n"
-                                                                "@return Whether the operation was successful or not." )
-{
-    return object->setImageFrame( dAtoi(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getImageFrame, S32, 2, 2,    "() Gets the asset Id of the image asset assigned to the emitter.\n"
-                                                                    "@return The asset Id of the image asset assigned to the emitter or nothing if no image is assigned." )
-{
-    return object->getImageFrame();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setRandomImageFrame, void, 3, 3,    "(randomImageFrame) Disables the Frame field and uses a random frame from the specified ImageAsset.\n"
-                                                                        "@param randomImageFrame Whether to use a random image frame or not.\n"
-                                                                        "@return No return value." )
-{
-    object->setRandomImageFrame( dAtob(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getRandomImageFrame, bool, 2, 2,    "() Gets whether a random frame from the specified ImageAsset is being used or not.\n"
-                                                                        "@return Whether to use a random image frame or not." )
-{
-    return object->getRandomImageFrame();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setAnimation, bool, 3, 3,   "(animationAssetId) Sets the emitter to use the specified animation asset Id.\n"
-                                                                "@param animationAssetId The animation asset Id to use.\n"
-                                                                "@return Whether the operation was successful or not." )
-{
-    return object->setAnimation( argv[2] );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getAnimation, const char*, 2, 2,    "() Gets the asset Id of the animation asset assigned to the emitter.\n"
-                                                                        "@return The asset Id of the animation asset assigned to the emitter or nothing if no animation is assigned." )
-{
-    return object->getAnimation();
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setBlendMode, void, 3, 3,   "(blendMode) Sets whether to use render blending or not.\n"
-                                                                "@param blendMode Whether to use render blending or not.\n"
-                                                                "@return No return value." )
-{
-    object->setBlendMode( dAtob(argv[2]) );
-}
-
-//------------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getBlendMode, bool, 2, 2,   "() Gets whether to use render blending or not.\n"
-                                                                "@return Whether to use render blending or not." )
-{
-    return object->getBlendMode();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setSrcBlendFactor, void, 3, 3,  "(srcBlend) - Sets the source blend factory.\n"
-                                                                    "@param srcBlend The source blend factor.\n"
-                                                                    "@return No return Value.")
-{
-    // Fetch source blend factor.
-    const  GLenum blendFactor = SceneObject::getSrcBlendFactorEnum(argv[2]);
-
-    object->setSrcBlendFactor( blendFactor );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getSrcBlendFactor, const char*, 2, 2,   "() - Gets the source render blend factor.\n"
-                                                                            "@return (srcBlend) The source render blend factor.")
-{
-   return SceneObject::getSrcBlendFactorDescription(object->getSrcBlendFactor());
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setDstBlendFactor, void, 3, 3,  "(dstBlend) - Sets the destination render blend factor.\n"
-                                                                    "@param dstBlend The destination render blend factor.\n"
-                                                                    "@return No return Value.")
-{
-    // Fetch destination blend factor.
-    const GLenum blendFactor = SceneObject::getDstBlendFactorEnum(argv[2]);
-
-    object->setDstBlendFactor( blendFactor );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getDstBlendFactor, const char*, 2, 2,   "() - Gets the destination render blend factor.\n"
-                                                                            "@return (dstBlend) The destination render blend factor.")
-{
-   return SceneObject::getDstBlendFactorDescription(object->getDstBlendFactor());
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setAlphaTest, void, 3, 3,   "(float alpha) - Set the render alpha test threshold.\n"
-                                                                "@param alpha The alpha test threshold in the range of 0.0 to 1.0.  Less than zero to disable alpha testing.\n"
-                                                                "@return No return value." )
-
-{
-    object->setAlphaTest(dAtof(argv[2]));
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getAlphaTest, F32, 2, 2,    "() - Gets the render alpha test threshold.\n"
-                                                                "@return The render alpha test threshold in the range of 0.0f to 1.0.  Less than zero represents disabled alpha testing.")
-{
-    return object->getAlphaTest();
-}
-
-
-//-----------------------------------------------------------------------------
-/// Particle emitter fields.
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getSelectableFieldCount, S32, 2, 2, "() Gets the number of available selectable fields.\n"
-                                                                        "@return The number of available selectable fields." )
-{
-    return object->getParticleFields().getFields().size();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getSelectableFieldName, const char*, 3, 3, "(fieldIndex) Gets the selectable field at the specified index.\n"
-                                                                                "@return The selectable field name at the specified index." )
-{
-    // Fetch the field hash.
-    const ParticleAssetFieldCollection::typeFieldHash& fieldHash = object->getParticleFields().getFields();
-
-    // Fetch the index.
-    S32 fieldIndex = dAtoi( argv[2] );
-
-    // Is the field index valid?
-    if ( fieldIndex >= 0 && fieldIndex < (S32)fieldHash.size() )
-    {
-        // Yes, but because the fields are in a hash-table, we'll have to iterate and get O(index).
-        for( ParticleAssetFieldCollection::typeFieldHash::const_iterator fieldItr = fieldHash.begin(); fieldItr != fieldHash.end(); ++fieldItr, --fieldIndex )
-        {
-            // Skip if this is not the field index we're looking for?
-            if ( fieldIndex != 0 )
-                continue;
-
-            // Found it so return the field name.
-            return fieldItr->value->getFieldName();
-        }
-    }
-
-
-    // Warn.
-    Con::warnf( "ParticleAssetEmitter::getSelectableFieldName() - Index '%d' is out of range.", fieldIndex );
-
-    return StringTable->EmptyString;
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, selectField, bool, 3, 3,   "(fieldName) Select the specified field by its name.\n"
-                                                                "@param fieldName The field name to use for the selection.  Use an empty name to deselect to stop accidental changes.\n"
-                                                            "@return Whether the field was successfully selected or not.")
-{
-    return object->getParticleFields().selectField( argv[2] ) != NULL;
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, deselectField, void, 2, 2,  "() Deselect any selected field.  If no field is selected then nothing happens.\n"
-                                                                "@return No return value.")
-{
-    object->getParticleFields().deselectField();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getSelectedField, const char*, 2, 2,   "() Gets the selected field name or nothing if no field is selected.\n"
-                                                                    "@return The selected field name or nothing if no fields is selected.")
-{
-    // Get the selected field.
-    const ParticleAssetField* pParticleAssetField = object->getParticleFields().getSelectedField();
-
-    return pParticleAssetField == NULL ? StringTable->EmptyString : pParticleAssetField->getFieldName();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setSingleDataKey, S32, 3, 3,    "(value) Sets a single data-key at time-zero with the specified value.  All existing keys are cleared.\n"
-                                                                    "@param value The value to set the key to.\n"
-                                                                    "@return Returns the index of the new data-key (always zero) or -1 on failure.")
-{
-    return object->getParticleFields().setSingleDataKey( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, addDataKey, S32, 4, 4,  "(time, value) Add Data-Key to Graph.\n"
-                                                            "@param time The key time.\n"
-                                                            "@param value The value at specified time\n"
-                                                            "@return Returns the index of the new data-key or -1 on failure.")
-{
-    return object->getParticleFields().addDataKey( dAtof(argv[2]), dAtof(argv[3]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, removeDataKey, bool, 3, 3,  "(keyIndex) Remove the data-key from the field.\n"
-                                                                "@param keyIndex The index of the data-key you want to remove.\n"
-                                                                "@return Whether the operation was successful or not.")
-{
-   return object->getParticleFields().removeDataKey( dAtoi(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, clearDataKeys, bool, 2, 2,  "() Clears all data-key(s) from the field.\n"
-                                                                "@return Whether the operation was successful or not.")
-{
-   return object->getParticleFields().clearDataKeys();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setDataKeyValue, bool, 4, 4,    "(keyIndex, value) Set data-key value for the field.\n"
-                                                                    "@param keyIndex The index of the key to be modified.\n"
-                                                                    "@param value The value to change the key to.\n"
-                                                                    "@return Whether the operation was successful or not.")
-{
-   // Set Data Key.
-   return object->getParticleFields().setDataKey( dAtoi(argv[2]), dAtof(argv[3]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getDataKeyCount, S32, 2, 2,     "() Gets the data-key count.\n"
-                                                                    "@return The number of data-keys in the currently selected field or -1 if no field is selected.")
-{
-   // Get Data Key Count.
-   return object->getParticleFields().getDataKeyCount();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getDataKey, const char*, 3, 3,  "(keyIndex) Gets the data-key at the specified index from the field.\n"
-                                                                    "@param keyIndex The index of the data-key to be retrieved.\n"
-                                                                    "@return The data-key comprising both the time and value or nothing if the key is invalid.")
-{
-   // Fetch the key index.
-   const S32 keyIndex = dAtoi(argv[2]);
-
-   // Fetch the data-key.
-   const ParticleAssetField::DataKey dataKey = object->getParticleFields().getDataKey( keyIndex );
-
-   // Finish if the data-key is bad.
-   if ( dataKey == ParticleAssetField::BadDataKey )
-       return StringTable->EmptyString;
-
-   // Create Returnable Buffer.
-   char* pBuffer = Con::getReturnBuffer(32);
-
-   // Format Buffer.
-   dSprintf(pBuffer, 32, "%f %f", dataKey.mTime, dataKey.mValue );
-
-   // Return buffer.
-   return pBuffer;
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getMinValue, F32, 2, 2,     "() Get the minimum value for the field.\n"
-                                                                "@return The minimum value for the field or always 0.0 if no field is selected." )
-{
-   return object->getParticleFields().getMinValue();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getMaxValue, F32, 2, 2,     "() Get the maximum value for the field.\n"
-                                                                "@return The maximum value for the field or always 0.0 if no field is selected." )
-{
-   return object->getParticleFields().getMaxValue();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getMinTime, F32, 2, 2,      "() Get the minimum time for the field.\n"
-                                                                "@return The minimum time for the field or always 0.0 if no field is selected." )
-{
-   return object->getParticleFields().getMinTime();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getMaxTime, F32, 2, 2,      "() Get the maximum time for the field.\n"
-                                                                "@return The maximum time for the field or always 0.0 if no field is selected." )
-{
-   return object->getParticleFields().getMaxTime();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getFieldValue, F32, 3, 3,   "(time) Get the fields' value at the specified time.\n"
-                                                                "@param time The time to sample the field value at.\n"
-                                                                "@return The fields' value at the specified time or always 0.0 if no field is selected.")
-{
-   return object->getParticleFields().getFieldValue( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setRepeatTime, bool, 3, 3,  "(repeatTime) Sets the time period to repeat (cycle) the fields' values at.\n"
-                                                                "@return Whether the operation was successful or not.")
-{
-   return object->getParticleFields().setRepeatTime( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getRepeatTime, F32, 2, 2,   "() Gets the time period that the fields' value repeat (cycle) at.\n"
-                                                                "@return The time period that the fields' value repeat (cycle) at.\n" )
-{
-   return object->getParticleFields().getRepeatTime();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, setValueScale, bool, 3, 3,  "(valueScale) Set the scaling of field values retrieved from the field.  This does not alter the actual data-key values.\n"
-                                                                "@param valueScale The scale for field values retrieved from the field.\n"
-                                                                "@return Whether the operation was successful or not.")
-{
-   return object->getParticleFields().setValueScale( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAssetEmitter, getValueScale, F32, 2, 2,   "() Gets the scaling of field values' retrieved from the field.\n"
-                                                                "@return The scaling of field values' retrieved from the field." )
-{
-   return object->getParticleFields().getValueScale();
-}
->>>>>>> 6e2964681666532c99f49535de98f93c3b6dfb24
+ConsoleMethodGroupEndWithDocs(ParticleAssetEmitter)

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

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Copyright (c) 2013 GarageGames, LLC
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -469,407 +468,4 @@ ConsoleMethodWithDocs(ParticleAsset, moveEmitter, ConsoleVoid, 4, 4, (fromEmitte
    object->moveEmitter( dAtoi(argv[2]), dAtoi(argv[3]) );
 }
 
-ConsoleMethodGroupEndWithDocs(ParticleAsset)
-=======
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-/// Particle asset accessors.
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, setLifeMode, void, 3, 3,   "(lifeMode) Sets the life-mode of the particle effect.\n"
-                                                        "@param lifeMode The life-mode of the particle effect (either INFINITE, CYCLE, KILL or STOP.\n"
-                                                        "A life-mode of INFINITE causes the particle effect to last forever.\n"
-                                                        "A life-mode of CYCLE causes the particle effect to restart playing when its specified 'lifetime' has been reached.\n"
-                                                        "A life-mode of KILL causes the particle effect to be deleted when its specified 'lifetime' has been reached.\n"
-                                                        "A life-mode of STOP causes the particle effect to stop playing (but not be deleted) when its specified lifetime has been reached.\n"
-                                                        "@return No return value.")
-{
-    object->setLifeMode( ParticleAsset::getParticleAssetLifeModeEnum( argv[2] ) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod( ParticleAsset, getLifeMode, const char*, 2, 2,   "() - Gets the life-mode of the particle effect.\n"
-                                                                "@return The life-mode of the particle effect." )
-{
-    return ParticleAsset::getParticleAssetLifeModeDescription( object->getLifeMode() );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, setLifetime, void, 3, 3,   "(lifeTime) Sets the lifetime of the particle effect.\n"
-                                                        "@param lifeTime The lifetime of the particle effect.  This is used according to the 'lifeMode' setting.\n"
-                                                        "@return No return value." )
-{
-    object->setLifetime( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getLifetime, F32, 2, 2,    "() Gets the lifetime of the particle effect.\n"
-                                                        "@return The lifetime of the particle effect." )
-{
-    return object->getLifetime();
-}
-
-//-----------------------------------------------------------------------------
-/// Particle asset fields.
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getSelectableFieldCount, S32, 2, 2,    "() Gets the number of available selectable fields.\n"
-                                                                    "@return The number of available selectable fields." )
-{
-    return object->getParticleFields().getFields().size();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getSelectableFieldName, const char*, 3, 3, "(fieldIndex) Gets the selectable field at the specified index.\n"
-                                                                        "@return The selectable field name at the specified index." )
-{
-    // Fetch the field hash.
-    const ParticleAssetFieldCollection::typeFieldHash& fieldHash = object->getParticleFields().getFields();
-
-    // Fetch the index.
-    S32 fieldIndex = dAtoi( argv[2] );
-
-    // Is the field index valid?
-    if ( fieldIndex >= 0 && fieldIndex < (S32)fieldHash.size() )
-    {
-        // Yes, but because the fields are in a hash-table, we'll have to iterate and get O(index).
-        for( ParticleAssetFieldCollection::typeFieldHash::const_iterator fieldItr = fieldHash.begin(); fieldItr != fieldHash.end(); ++fieldItr, --fieldIndex )
-        {
-            // Skip if this is not the field index we're looking for?
-            if ( fieldIndex != 0 )
-                continue;
-
-            // Found it so return the field name.
-            return fieldItr->value->getFieldName();
-        }
-    }
-
-
-    // Warn.
-    Con::warnf( "ParticleAsset::getSelectableFieldName() - Index '%d' is out of range.", fieldIndex );
-
-    return StringTable->EmptyString;
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, selectField, bool, 3, 3,   "(fieldName) Select the specified field by its name.\n"
-                                                        "@param fieldName The field name to use for the selection.  Use an empty name to deselect to stop accidental changes.\n"
-                                                        "@return Whether the field was successfully selected or not.")
-{
-    return object->getParticleFields().selectField( argv[2] ) != NULL;
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, deselectField, void, 2, 2, "() Deselect any selected field.  If no field is selected then nothing happens.\n"
-                                                        "@return No return value.")
-{
-    object->getParticleFields().deselectField();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getSelectedField, const char*, 2, 2,  "() Gets the selected field name or nothing if no field is selected.\n"
-                                                            "@return The selected field name or nothing if no fields is selected.")
-{
-    // Get the selected field.
-    const ParticleAssetField* pParticleAssetField = object->getParticleFields().getSelectedField();
-
-    return pParticleAssetField == NULL ? StringTable->EmptyString : pParticleAssetField->getFieldName();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, setSingleDataKey, S32, 3, 3,   "(value) Sets a single data-key at time-zero with the specified value.  All existing keys are cleared.\n"
-                                                            "@param value The value to set the key to.\n"
-                                                            "@return Returns the index of the new data-key (always zero) or -1 on failure.")
-{
-    return object->getParticleFields().setSingleDataKey( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, addDataKey, S32, 4, 4, "(time, value) Add Data-Key to Graph.\n"
-                                                    "@param time The key time.\n"
-                                                    "@param value The value at specified time\n"
-                                                    "@return Returns the index of the new data-key or -1 on failure.")
-{
-    return object->getParticleFields().addDataKey( dAtof(argv[2]), dAtof(argv[3]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, removeDataKey, bool, 3, 3, "(keyIndex) Remove the data-key from the field.\n"
-                                                        "@param keyIndex The index of the data-key you want to remove.\n"
-                                                        "@return Whether the operation was successful or not.")
-{
-   return object->getParticleFields().removeDataKey( dAtoi(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, clearDataKeys, bool, 2, 2,     "() Clears all data-key(s) from the field.\n"
-                                                            "@return Whether the operation was successful or not.")
-{
-   return object->getParticleFields().clearDataKeys();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, setDataKeyValue, bool, 4, 4, "(keyIndex, value) Set data-key value for the field.\n"
-                                                          "@param keyIndex The index of the key to be modified.\n"
-                                                          "@param value The value to change the key to.\n"
-                                                          "@return Whether the operation was successful or not.")
-{
-   // Set Data Key.
-   return object->getParticleFields().setDataKey( dAtoi(argv[2]), dAtof(argv[3]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getDataKeyCount, S32, 2, 2,    "() Gets the data-key count.\n"
-                                                            "@return The number of data-keys in the currently selected field or -1 if no field is selected.")
-{
-   // Get Data Key Count.
-   return object->getParticleFields().getDataKeyCount();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getDataKey, const char*, 3, 3, "(keyIndex) Gets the data-key at the specified index from the field.\n"
-                                                            "@param keyIndex The index of the data-key to be retrieved.\n"
-                                                            "@return The data-key comprising both the time and value or nothing if the key is invalid.")
-{
-   // Fetch the key index.
-   const S32 keyIndex = dAtoi(argv[2]);
-
-   // Fetch the data-key.
-   const ParticleAssetField::DataKey dataKey = object->getParticleFields().getDataKey( keyIndex );
-
-   // Finish if the data-key is bad.
-   if ( dataKey == ParticleAssetField::BadDataKey )
-       return StringTable->EmptyString;
-
-   // Create Returnable Buffer.
-   char* pBuffer = Con::getReturnBuffer(32);
-
-   // Format Buffer.
-   dSprintf(pBuffer, 32, "%f %f", dataKey.mTime, dataKey.mValue );
-
-   // Return buffer.
-   return pBuffer;
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getMinValue, F32, 2, 2,    "() Get the minimum value for the field.\n"
-                                                        "@return The minimum value for the field or always 0.0 if no field is selected." )
-{
-   return object->getParticleFields().getMinValue();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getMaxValue, F32, 2, 2,    "() Get the maximum value for the field.\n"
-                                                        "@return The maximum value for the field or always 0.0 if no field is selected." )
-{
-   return object->getParticleFields().getMaxValue();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getMinTime, F32, 2, 2,     "() Get the minimum time for the field.\n"
-                                                        "@return The minimum time for the field or always 0.0 if no field is selected." )
-{
-   return object->getParticleFields().getMinTime();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getMaxTime, F32, 2, 2,     "() Get the maximum time for the field.\n"
-                                                        "@return The maximum time for the field or always 0.0 if no field is selected." )
-{
-   return object->getParticleFields().getMaxTime();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getFieldValue, F32, 3, 3,  "(time) Get the fields' value at the specified time.\n"
-                                                        "@param time The time to sample the field value at.\n"
-                                                        "@return The fields' value at the specified time or always 0.0 if no field is selected.")
-{
-   return object->getParticleFields().getFieldValue( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, setRepeatTime, bool, 3, 3, "(repeatTime) Sets the time period to repeat (cycle) the fields' values at.\n"
-                                                        "@return Whether the operation was successful or not.")
-{
-   return object->getParticleFields().setRepeatTime( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getRepeatTime, F32, 2, 2,  "() Gets the time period that the fields' value repeat (cycle) at.\n"
-                                                        "@return The time period that the fields' value repeat (cycle) at.\n" )
-{
-   return object->getParticleFields().getRepeatTime();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, setValueScale, bool, 3, 3, "(valueScale) Set the scaling of field values retrieved from the field.  This does not alter the actual data-key values.\n"
-                                                        "@param valueScale The scale for field values retrieved from the field.\n"
-                                                        "@return Whether the operation was successful or not.")
-{
-   return object->getParticleFields().setValueScale( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getValueScale, F32, 2, 2,  "() Gets the scaling of field values' retrieved from the field.\n"
-                                                        "@return The scaling of field values' retrieved from the field." )
-{
-   return object->getParticleFields().getValueScale();
-}
-
-//-----------------------------------------------------------------------------
-/// Emitter asset methods.
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, createEmitter, const char*, 2, 2,  "() - Creates and add a new emitter.\n"
-                                                                "@return The new emitter that was added or 0 if failed.")
-{
-    // Find the emitter.
-    ParticleAssetEmitter* pEmitter = object->createEmitter();
-
-    return pEmitter == NULL ? StringTable->EmptyString : pEmitter->getIdString();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, addEmitter, bool, 3, 3,    "(emitterId) - Adds an existing emitter.\n"
-                                                        "@param emitterId The emitter to add.\n"
-                                                        "@return On success it returns the ID of the emitter, or 0 if failed.")
-{
-    // Find the emitter.
-    ParticleAssetEmitter* pEmitter = Sim::findObject<ParticleAssetEmitter>( argv[2] );
-
-    // Did we find the emitter?
-    if ( pEmitter == NULL )
-    {
-        // No, so warn.
-        Con::warnf( "ParticleAsset::addEmitter() - Could not find the emitter '%s'.", argv[2] );
-        return false;
-    }
-
-    return object->addEmitter(pEmitter);
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, removeEmitter, bool, 3, 4, "(emitterId, [bool deleteEmitter]) - Removes an emitter.\n"
-                                                        "@param emitterId The emitter to remove.\n"
-                                                        "@return No return value.")
-{
-    // Find the emitter.
-    ParticleAssetEmitter* pEmitter = Sim::findObject<ParticleAssetEmitter>( argv[2] );
-
-    // Did we find the emitter?
-    if ( pEmitter == NULL )
-    {
-        // No, so warn.
-        Con::warnf( "ParticleAsset::removeEmitter() - Could not find the emitter '%s'.", argv[2] );
-        return false;
-    }
-
-    bool deleteEmitter = true;
-    if (argc > 3)
-        deleteEmitter = dAtob(argv[3]);
-
-    // Remove the emitter.
-    object->removeEmitter( pEmitter, deleteEmitter );
-
-    return true;
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, clearEmitters, void, 2, 2, "() Clear all the emitters.\n"
-                                                        "@return No return Value.")
-{
-   // Clear Emitters.
-   object->clearEmitters();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getEmitterCount, S32, 2, 2,    "() Gets the emitter count.\n"
-                                                            "@return Returns the number of emitters as an integer.")
-{
-   // Get Emitter Count.
-   return object->getEmitterCount();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, getEmitter, S32, 3, 3,     "(emitterIndex) Gets the emitter at the specified index.\n"
-                                                        "@param emitterIndex The index for the desired emitter\n"
-                                                        "@return The emitter or 0 if not found.")
-{
-   // Get the emitter.
-   ParticleAssetEmitter* pEmitter = object->getEmitter( dAtoi(argv[2]) );
-
-   return pEmitter == NULL ? 0 : pEmitter->getId();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, findEmitter, S32, 3, 3,    "(emitterName) Finds the emitter by its name.\n"
-                                                        "@param emitterName The name of the desired emitter.\n"
-                                                        "@return The emitter or 0 if not found.")
-{
-   // Find the emitter.
-   ParticleAssetEmitter* pEmitter = object->findEmitter( argv[2] );
-
-   return pEmitter == NULL ? 0 : pEmitter->getId();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticleAsset, moveEmitter, void, 4, 4, "(fromEmitterIndex, toEmitterIndex) Moves the emitter order.\n"
-              "@param fromEmitterIndex The source index of the emitter to move.\n"
-              "@param toEmitterIndex The destination index to move the emitter to.\n"
-              "@return No return value.")
-{
-   // Move Emitter Object.
-   object->moveEmitter( dAtoi(argv[2]), dAtoi(argv[3]) );
-}
->>>>>>> 6e2964681666532c99f49535de98f93c3b6dfb24
+ConsoleMethodGroupEndWithDocs(ParticleAsset)

engine/source/2d/controllers/PointForceController_ScriptBinding.h

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Copyright (c) 2013 GarageGames, LLC
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -60,7 +59,7 @@ ConsoleMethodWithDocs(PointForceController, setPosition, ConsoleVoid, 3, 4, (flo
 /*! Gets the position of the force center.
     @return (float x/float y) The x and y (horizontal and vertical) position of the force center.
 */
-ConsoleMethodWithDocs(PointForceController, PointForceController, ConsoleString, 2, 2, ())
+ConsoleMethodWithDocs(PointForceController, getPosition, ConsoleString, 2, 2, ())
 {
     // Get position.
     return object->getPosition().scriptThis();
@@ -198,175 +197,4 @@ ConsoleMethodWithDocs(PointForceController, getTrackedObject, ConsoleString, 2,
     return pSceneObject == NULL ? NULL : pSceneObject->getIdString();
 } 
 
-ConsoleMethodGroupEndWithDocs(PointForceController)
-=======
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, setPosition, void, 3, 4,    "(float x, float y) - Sets the position of the force center.\n"
-                                                                "@param x The position along the horizontal axis.\n"
-                                                                "@param y The position along the vertical axis.\n"
-                                                                "@return No return value.")
-{
-    // The new position.
-    b2Vec2 position;
-
-    // Elements in the first argument.
-    U32 elementCount = Utility::mGetStringElementCount(argv[2]);
-
-    // ("x y")
-    if ((elementCount == 2) && (argc == 3))
-        position = Utility::mGetStringElementVector(argv[2]);
-
-    // (x, y)
-    else if ((elementCount == 1) && (argc == 4))
-        position.Set(dAtof(argv[2]), dAtof(argv[3]));
-
-    // Invalid
-    else
-    {
-        Con::warnf("PointForceController::setPosition() - Invalid number of parameters!");
-        return;
-    }
-
-    // Set Position.
-    object->setPosition(position);
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, getPosition, const char*, 2, 2,    "() Gets the position of the force center.\n"
-                                                                                "@return (float x/float y) The x and y (horizontal and vertical) position of the force center.")
-{
-    // Get position.
-    return object->getPosition().scriptThis();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, setRadius, void, 3, 3,       "(radius) - Sets the radius of the point force to use.\n"
-                                                                "@param radius The radius of the point force to use.\n"
-                                                                "@return No return value.")
-{
-    object->setRadius( dAtof(argv[2]) );
-} 
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, getRadius, F32, 2, 2,        "() Gets the radius of the point force being used.\n"
-                                                                "@return The radius of the point force being used.")
-{
-    return object->getRadius();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, setForce, void, 3, 3,       "(force) - Sets the point force to use.\n"
-                                                                "@param force The point force to use.\n"
-                                                                "@return No return value.")
-{
-    object->setForce( dAtof(argv[2]) );
-} 
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, getForce, F32, 2, 2,        "() Gets the point force being used.\n"
-                                                                "@return The point force being used.")
-{
-    return object->getForce();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, setLinearDrag, void, 3, 3,  "(linearDrag) - Sets the linear drag coefficient (0.0 to 1.0).\n"
-                                                                "@param linearDrag The linear drag coefficient\n"
-                                                                "@return No return value.")
-{
-    object->setLinearDrag( dAtof(argv[2]) );
-} 
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, getLinearDrag, F32, 2, 2,   "() Gets the linear drag coefficient.\n"
-                                                                "@return The linear drag coefficient.")
-{
-    return object->getLinearDrag();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, setAngularDrag, void, 3, 3, "(angularDrag) - Sets the angular drag coefficient (0.0 to 1.0).\n"
-                                                                "@param angularDrag The angular drag coefficient\n"
-                                                                "@return No return value.")
-{
-    object->setAngularDrag( dAtof(argv[2]) );
-} 
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, getAngularDrag, F32, 2, 2,  "() Gets the angular drag coefficient.\n"
-                                                                "@return The angular drag coefficient.")
-{
-    return object->getAngularDrag();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, setNonLinear, void, 3, 3,   "(nonLinear) - Sets whether to apply the force non-linearly (using the inverse square law) or linearly.\n"
-                                                                "@param nonLinear whether to apply the force non-linearly (using the inverse square law) or linearly.\n"
-                                                                "@return No return value.")
-{
-    object->setNonLinear( dAtob(argv[2]) );
-} 
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, getNonLinear, bool, 2, 2,  "() Gets whether to apply the force non-linearly (using the inverse square law) or linearly.\n"
-                                                                "@return Whether to apply the force non-linearly (using the inverse square law) or linearly.")
-{
-    return object->getNonLinear();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, setTrackedObject, void, 3, 3,   "(sceneObject) - Sets a scene object from which the position will be tracked.\n"
-                                                                    "@param sceneObject The scene object from which the position will be tracked.  An empty string will stop tracking.\n"
-                                                                    "@return No return value.")
-{
-    // Find the scene object.
-    SceneObject* pSceneObject = Sim::findObject<SceneObject>( argv[2] );
-
-    object->setTrackedObject( pSceneObject );
-} 
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(PointForceController, getTrackedObject, const char*, 2, 2,    "() - Gets the scene object from which the position will be tracked.\n"
-                                                                            "@return The scene object from which the position will be tracked or an empty string if nothing is being tracked.")
-{
-    // Fetch the scene object.
-    SceneObject* pSceneObject = object->getTrackedObject();
-
-    return pSceneObject == NULL ? NULL : pSceneObject->getIdString();
-} 
-
->>>>>>> 6e2964681666532c99f49535de98f93c3b6dfb24
+ConsoleMethodGroupEndWithDocs(PointForceController)

engine/source/2d/sceneobject/ImageFont_ScriptBinding.h

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Copyright (c) 2013 GarageGames, LLC
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -159,143 +158,4 @@ ConsoleMethodWithDocs(ImageFont, getFontPadding, ConsoleInt, 2, 2, ())
     return object->getFontPadding();
 }
 
-ConsoleMethodGroupEndWithDocs(ImageFont)
-=======
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, setImage, bool, 3, 3,  "(imageAssetId) - Sets the image asset to use..\n"
-                                                "@param imageName The image asset to use.\n"
-                                                "@return Returns true on success.")
-{
-    // Set Image.
-    return object->setImage( argv[2] );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, getImage, const char*, 2, 2,   "() - Gets current image asset..\n"
-                                                        "@return The current image asset.")
-{
-    // Get Image.
-    return object->getImage();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, setText, void, 3, 3,   "(text) - Set the text to render.\n")
-{
-    object->setText(argv[2]);
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, getText, const char*, 2, 2,    "() - Gets the text being rendered.\n")
-{
-    return object->getText().getPtr8();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, setTextAlignment, void, 3, 3,  "(alignment) - Set the text alignment to 'left', 'center' or 'right'.\n"
-                                                        "@param alignment The text alignment of 'left', 'center' or 'right'.\n"
-                                                        "@return No return value.")
-{
-
-    object->setTextAlignment( ImageFont::getTextAlignmentEnum(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, getTextAlignment, const char*, 2, 2,   "() - Gets the text alignment.\n"
-                                                                "@return The text alignment of 'left', 'center' or 'right'.")
-{
-    return ImageFont::getTextAlignmentDescription(object->getTextAlignment());
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, setFontSize, void, 3, 4,   "(width, height) - Set the size of the font characters.\n"
-                                                    "@param width The width of a font character.\n"
-                                                    "@param height The height of a font character.\n"
-                                                    "@return No return value.")
-{
-    F32 width, height;
-
-    U32 elementCount = Utility::mGetStringElementCount(argv[2]);
-
-    // ("width height")
-    if ((elementCount == 2) && (argc == 3))
-    {
-        width = dAtof(Utility::mGetStringElement(argv[2], 0));
-        height = dAtof(Utility::mGetStringElement(argv[2], 1));
-    }
-
-    // (width, [height])
-    else if (elementCount == 1)
-    {
-        width = dAtof(argv[2]);
-
-        if (argc > 3)
-            height = dAtof(argv[3]);
-        else
-            height = width;
-    }
-    // Invalid
-    else
-    {
-        Con::warnf("ImageFont::setFontSize() - Invalid number of parameters!");
-        return;
-    }
-
-    // Set character size.
-    object->setFontSize(Vector2(width, height));
-
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, getFontSize, const char*, 2, 2,    "() - Gets the size of the font characters.\n"
-                                                            "@return The size of the font characters.")
-{
-    return object->getFontSize().scriptThis();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, setFontPadding, void, 3, 3,    "(padding) - Set the font padding.\n"
-                                                        "@param padding The space added in-between font characters.\n"
-                                                        "@return No return value.")
-{
-   // Set character padding.
-   object->setFontPadding( dAtof(argv[2]) );
-
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ImageFont, getFontPadding, F32, 2, 2,     "() - Gets the font padding.\n"
-                                                        "@return The font padding.")
-{
-    return object->getFontPadding();
-}
->>>>>>> 6e2964681666532c99f49535de98f93c3b6dfb24
+ConsoleMethodGroupEndWithDocs(ImageFont)

engine/source/2d/sceneobject/ParticlePlayer_ScriptBinding.h

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Copyright (c) 2013 GarageGames, LLC
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -65,6 +64,26 @@ ConsoleMethodWithDocs(ParticlePlayer, getCameraIdleDistance, ConsoleFloat, 2, 2,
 
 //-----------------------------------------------------------------------------
 
+/*! Sets whether the intermediate world position, rotation, and size data points of particles between ticks are calculated.
+    @return No return value.
+*/
+ConsoleMethodWithDocs(ParticlePlayer, setParticleInterpolation, ConsoleVoid, 3, 3, (bool status))
+{
+    object->setParticleInterpolation( dAtof(argv[2]) );
+}
+
+//-----------------------------------------------------------------------------
+
+/*! Gets whether the intermediate world position, rotation, and size data points of particles between ticks are calculated.
+    @return (bool status) Whether interpolation is calculated or not.
+*/
+ConsoleMethodWithDocs(ParticlePlayer, getParticleInterpolation, ConsoleFloat, 2, 2, ())
+{
+    return object->getParticleInterpolation();
+}
+
+//-----------------------------------------------------------------------------
+
 /*! Sets the scale for the particle player emission rate.
     @param scale The scale for the particle player emission rate.
     @return No return value.
@@ -125,6 +144,28 @@ ConsoleMethodWithDocs(ParticlePlayer, getForceScale, ConsoleFloat, 2, 2, ())
 {
     return object->getForceScale();
 }
+
+//-----------------------------------------------------------------------------
+
+/*! Sets the scale for the particle player lifetimes.
+    @param scale The scale for the particle player lifetimes.
+    @return No return value.
+*/
+ConsoleMethodWithDocs(ParticlePlayer, setTimeScale, void, 3, 3, (scale))
+{
+    object->setTimeScale( dAtof(argv[2]) );
+}
+
+//-----------------------------------------------------------------------------
+
+/*! Gets the scale for the particle player particle lifetimes.
+    @return The scale for the particle player lifetimes.
+*/
+ConsoleMethodWithDocs(ParticlePlayer, getTimeScale, ConsoleFloat, 2, 2, ())
+{
+    return object->getTimeScale();
+}
+
 //-----------------------------------------------------------------------------
 
 /*! Starts the particle player playing.
@@ -235,233 +276,4 @@ ConsoleMethodWithDocs(ParticlePlayer, getEmitterVisible, ConsoleBool, 3, 3, (emi
     return object->getEmitterVisible( dAtob(argv[2]) );
 }
 
-ConsoleMethodGroupEndWithDocs(ParticlePlayer)
-=======
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setParticleAsset, void, 3, 3,     "(particleAssetId?) Sets the particle asset Id to play.\n"
-                                                                "@param particleAssetId The particle asset Id to play.\n"
-                                                                "@return No return value.")
-{
-    object->setParticle( argv[2] );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getParticleAsset, const char*, 2, 2,  "() Gets the particle asset Id.\n"
-                                                                    "@return The particle asset Id.")
-{
-    return object->getParticle();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setCameraIdleDistance, void, 3, 3,    "(idleDistance) Sets the distance from any camera when the particle player will become idle i.e. stop integrating and rendering.\n"
-                                                                    "@param pauseDistance The distance from any camera when the particle player will become idle i.e. stop integrating and rendering.\n"
-                                                                    "@return No return value.")
-{
-    object->setCameraIdleDistance( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getCameraIdleDistance, F32, 2, 2,     "() Gets the distance from any camera when the particle player will become idle i.e. stop integrating and rendering.\n"
-                                                                    "@return The distance from any camera when the particle player will become idle i.e. stop integrating and rendering.")
-{
-    return object->getCameraIdleDistance();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setParticleInterpolation, void, 3, 3,     "(bool status) Sets whether the intermediate world position, rotation, and size data points of particles between ticks are calculated.\n"
-                                                                        "@return No return value.")
-{
-    object->setParticleInterpolation( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getParticleInterpolation, F32, 2, 2,  "() Gets whether the intermediate world position, rotation, and size data points of particles between ticks are calculated.\n"
-                                                                    "@return (bool status) Whether interpolation is calculated or not.")
-{
-    return object->getParticleInterpolation();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setEmissionRateScale, void, 3, 3,     "(scale) Sets the scale for the particle player emission rate.\n"
-                                                                    "@param scale The scale for the particle player emission rate.\n"
-                                                                    "@return No return value.")
-{
-    object->setEmissionRateScale( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getEmissionRateScale, F32, 2, 2,     "() Gets the scale for the particle player emission rate.\n"
-                                                                    "@return The scale for the particle player emission rate.")
-{
-    return object->getEmissionRateScale();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setSizeScale, void, 3, 3,     "(scale) Sets the scale for the particle player particle sizes.\n"
-                                                            "@param scale The scale for the particle player particle sizes.\n"
-                                                            "@return No return value.")
-{
-    object->setSizeScale( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getSizeScale, F32, 2, 2,      "() Gets the scale for the particle player particle sizes.\n"
-                                                            "@return The scale for the particle player particle sizes.")
-{
-    return object->getSizeScale();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setForceScale, void, 3, 3,    "(scale) Sets the scale for the particle player forces.\n"
-                                                            "@param scale The scale for the particle player forces.\n"
-                                                            "@return No return value.")
-{
-    object->setForceScale( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getForceScale, F32, 2, 2,     "() Gets the scale for the particle player forces.\n"
-                                                            "@return The scale for the particle player forces.")
-{
-    return object->getForceScale();
-}
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setTimeScale, void, 3, 3,     "(scale) Sets the scale for the particle player particle lifetimes.\n"
-                                                            "@param scale The scale for the particle player particle lifetimes.\n"
-                                                            "@return No return value.")
-{
-    object->setTimeScale( dAtof(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getTimeScale, F32, 2, 2,  "() Gets the scale for the particle player particle lifetimes.\n"
-                                                        "@return The scale for the particle player particle lifetimes.")
-{
-    return object->getTimeScale();
-}
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, play, bool, 2, 3, "([resetParticles]) Starts the particle player playing.\n"
-                                                "@param resetParticles Whether to reset any existing particles before starting to play.  Default is true.\n"
-                                                "@return Returns true on success and false otherwise.")
-{
-    // Fetch the reset-particle flag.
-    const bool resetParticles = argc >= 3 ? dAtob(argv[2]) : true;
-
-    return object->play( resetParticles );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, stop, void, 2, 4, "([waitForParticles?, killEffect?]) - Stops the Particle Effect.\n"
-              "@param waitForParticles Whether or not the effect should wait until all of its particles have run their course, or just stop immediately and delete the particles (default true).\n"
-              "@param killEffect Whether or not the effect should be deleted after it has stopped (default false).\n"
-              "@return No return value.")
-{
-    // Fetch the wait-for-particles flag.
-   const bool waitForParticles = argc >= 3 ? dAtob(argv[2]) : true;
-
-   // Fetch the kill-effect flag.
-   const bool killEffect = argc >= 4 ? dAtob(argv[3]) : false;
-
-   // Stop playing.
-   object->stop( waitForParticles, killEffect );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getIsPlaying, bool, 2, 2, "() Gets whether the particle player is playing or not.\n"
-                                                        "@return Whether the particle player is playing or not." )
-{
-   return object->getIsPlaying();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setPaused, void, 3, 3,    "(paused?) Sets whether the particle player is paused or not.\n"
-                                                        "@param paused Whether the particle player is paused or not.\n"
-                                                        "@return No return value.")
-{
-    object->setPaused( dAtob(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getPaused, bool, 2, 2,    "() Gets whether the particle player is paused or not.\n"
-                                                        "@return Whether the particle player is paused or not.")
-{
-    return object->getPaused();
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setEmitterPaused, void, 4, 4, "(paused, emitterIndex) Sets whether the specified particle emitter is paused or not.\n"
-                                                            "@param paused Whether the specified particle emitter is paused or not.\n"
-                                                            "@param emitterIndex The index of the emitter to modify.\n"
-                                                            "@return No return value.")
-{
-    object->setEmitterPaused( dAtob(argv[2]), dAtoi(argv[3]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getEmitterPaused, bool, 3, 3, "(emitterIndex) Gets whether the specified particle emitter is paused or not.\n"
-                                                            "@param emitterIndex The index of the emitter to modify.\n"
-                                                            "@return Whether the specified particle emitter is paused or not.")
-{
-    return object->getEmitterPaused( dAtob(argv[2]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, setEmitterVisible, void, 4, 4,    "(visible, emitterIndex) Sets whether the specified particle emitter is visible or not.\n"
-                                                                "@param paused Whether the specified particle emitter is visible or not.\n"
-                                                                "@param emitterIndex The index of the emitter to modify.\n"
-                                                                "@return No return value.")
-{
-    object->setEmitterVisible( dAtob(argv[2]), dAtoi(argv[3]) );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleMethod(ParticlePlayer, getEmitterVisible, bool, 3, 3,    "(emitterIndex) Gets whether the specified particle emitter is visible or not.\n"
-                                                                "@param emitterIndex The index of the emitter to modify.\n"
-                                                                "@return Whether the specified particle emitter is visible or not.")
-{
-    return object->getEmitterVisible( dAtob(argv[2]) );
-}
->>>>>>> 6e2964681666532c99f49535de98f93c3b6dfb24
+ConsoleMethodGroupEndWithDocs(ParticlePlayer)

engine/source/2d/sceneobject/SceneObject_ScriptBinding.h

@@ -1994,7 +1994,6 @@ ConsoleMethodWithDocs(SceneObject, isRotateToComplete, ConsoleBool, 2, 2, ())
 
 //-----------------------------------------------------------------------------
 
-<<<<<<< HEAD
 /*! Applies a force at a world point.
     If the force is not applied at the center of mass, it will generate a torque and affect the angular velocity.
     @param worldForceX/Y - The world force vector in Newtons (N).
@@ -2002,13 +2001,6 @@ ConsoleMethodWithDocs(SceneObject, isRotateToComplete, ConsoleBool, 2, 2, ())
     @return No return Value.
 */
 ConsoleMethodWithDocs(SceneObject, applyForce, ConsoleVoid, 4, 6, (worldForce X/Y, [worldPoint X/Y]))
-=======
-ConsoleMethod(SceneObject, applyForce, void, 3, 6,       "(worldForce X/Y, [worldPoint X/Y]) - Applies a force at a world point.\n"
-                                                            "If the force is not applied at the center of mass, it will generate a torque and affect the angular velocity.\n"
-                                                            "@param worldForceX/Y - The world force vector in Newtons (N)."
-                                                            "@param worldPointX/Y - The world point where the force is applied.  If world point is not specified, the center of mass is used."
-                                                            "@return No return Value.")
->>>>>>> 6e2964681666532c99f49535de98f93c3b6dfb24
 {
     // World force.
     const U32 worldForceElementCount = Utility::mGetStringElementCount(argv[2]);
@@ -2082,7 +2074,6 @@ ConsoleMethodWithDocs(SceneObject, applyTorque, ConsoleVoid, 3, 3, (torque))
 
 //-----------------------------------------------------------------------------
 
-<<<<<<< HEAD
 /*! Applies an impulse at a world point.
     This immediately modifies the linear velocity.  It also modifies the angular velocity if the point of application is not the center of mass.
     @param worldImpulse/Y - The world impulse vector in Newtons (N-seconds) or Kg-m/s.
@@ -2090,13 +2081,6 @@ ConsoleMethodWithDocs(SceneObject, applyTorque, ConsoleVoid, 3, 3, (torque))
     @return No return Value.
 */
 ConsoleMethodWithDocs(SceneObject, applyLinearImpulse, ConsoleVoid, 4, 6, (worldImpulse X/Y, [worldPoint X/Y]))
-=======
-ConsoleMethod(SceneObject, applyLinearImpulse, void, 3, 6,   "(worldImpulse X/Y, [worldPoint X/Y]) - Applies an impulse at a world point.\n"
-                                                                "This immediately modifies the linear velocity.  It also modifies the angular velocity if the point of application is not the center of mass.\n"
-                                                                "@param worldImpulse/Y - The world impulse vector in Newtons (N-seconds) or Kg-m/s."
-                                                                "@param worldPointX/Y - The world point where the force is applied.  If world point is not specified, the center of mass is used."
-                                                                "@return No return Value.")
->>>>>>> 6e2964681666532c99f49535de98f93c3b6dfb24
 {
     // World impulse.
     const U32 worldImpulseElementCount = Utility::mGetStringElementCount(argv[2]);

engine/source/audio/audio.cc

@@ -581,7 +581,7 @@ static void alxSourcePlay(AudioStreamSource *streamSource)
    ALuint source = streamSource->mSource;
    Audio::Description& desc = streamSource->mDescription;
 
-   bool ret = streamSource->initStream();
+   streamSource->initStream();
 
    alSourcef(source, AL_GAIN, Audio::linearToDB(desc.mVolume * mAudioChannelVolumes[desc.mVolumeChannel] * mMasterVolume));
 //   alSourcei(source, AL_LOOPING, AL_FALSE);

engine/source/io/fileSystem_ScriptBinding.cc

@@ -648,18 +648,12 @@ ConsoleFunctionWithDocs(restartInstance, ConsoleVoid, 1, 1, ())
    Platform::postQuitMessage( 0 );
 }
 
-<<<<<<< HEAD:engine/source/io/fileSystem_ScriptBinding.cc
-/*! creates the path or path to the file name
-*/
-ConsoleFunctionWithDocs( createPath, ConsoleBool, 2,2, (fileName or pathName))
-=======
-ConsoleFunction( createPath, bool, 2,2, "createPath(\"path\");  creates the path.  "
-                "Verifies all the elements in a path exists or creates them if they do not.  "
-                "Note that the path should end with a slash (/).  Otherwise, the last element in the path "
-                "will be assumed to be a filename and not a path component, and it will not be created.  "
-                "For example \"data/stage2/part1\" will verify or create \"data/stage2/\" and not \"part1\"."
-                )
->>>>>>> 6e2964681666532c99f49535de98f93c3b6dfb24:engine/source/io/fileSystemFunctions.cpp
+
+/*! Creates the path, verifing all the elements in a path exist or creating them if they do not.
+    Note that the path should end with a slash (/).  Otherwise, the last element in the path will be assumed to be a filename and not a path component, and it will not be created.
+    For example \"data/stage2/part1\" will verify or create \"data/stage2/\" and not \"part1\".
+*/
+ConsoleFunctionWithDocs( createPath, ConsoleBool, 2,2, (pathName))
 {
    static char pathName[1024];
 
@@ -670,4 +664,4 @@ ConsoleFunction( createPath, bool, 2,2, "createPath(\"path\");  creates the path
 
 ConsoleFunctionGroupEnd(FileSystem)
 
-/*! @} */ // group FileSystem
+/*! @} */ // group FileSystem

engine/source/math/mConsoleFunctions.cc

@@ -1,315 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-#include "platform/platform.h"
-#include "console/console.h"
-#include "math/mMathFn.h"
-#include "math/mRandom.h"
-#include "string/stringUnit.h"
-
-ConsoleFunctionGroupBegin( GeneralMath, "General math functions. Use these whenever possible, as they'll run much faster than script equivalents.");
-
-ConsoleFunction( mSolveQuadratic, const char *, 4, 4, "(float a, float b, float c)"
-              "Solve a quadratic equation of form a*x^2 + b*x + c = 0.\n\n"
-              "@returns A triple, contanining: sol x0 x1. sol is the number of"
-              " solutions (being 0, 1, or 2), and x0 and x1 are the solutions, if any."
-              " Unused x's are undefined.")
-{
-   char * retBuffer = Con::getReturnBuffer(256);
-   F32 x[2];
-   U32 sol = mSolveQuadratic(dAtof(argv[1]), dAtof(argv[2]), dAtof(argv[3]), x);
-   dSprintf(retBuffer, 256, "%d %g %g", sol, x[0], x[1]);
-   return retBuffer;
-}
-
-ConsoleFunction( mSolveCubic, const char *, 5, 5, "(float a, float b, float c, float d)"
-              "Solve a cubic equation of form a*x^3 + b*x^2 + c*x + d = 0.\n\n"
-              "@returns A 4-tuple, contanining: sol x0 x1 x2. sol is the number of"
-              " solutions (being 0, 1, 2, or 3), and x0, x1, x2 are the solutions, if any."
-              " Unused x's are undefined.")
-{
-   char * retBuffer = Con::getReturnBuffer(256);
-   F32 x[3];
-   U32 sol = mSolveCubic(dAtof(argv[1]), dAtof(argv[2]), dAtof(argv[3]), dAtof(argv[4]), x);
-   dSprintf(retBuffer, 256, "%d %g %g %g", sol, x[0], x[1], x[2]);
-   return retBuffer;
-}
-
-ConsoleFunction( mSolveQuartic, const char *, 6, 6, "(float a, float b, float c, float d, float e)"
-              "Solve a quartic equation of form a*x^4 + b*x^3 + c*x^2 + d*x + e = 0.\n\n"
-              "@returns A 5-tuple, contanining: sol x0 x1 x2 x3. sol is the number of"
-              " solutions (ranging from 0-4), and x0, x1, x2 and x3 are the solutions, if any."
-              " Unused x's are undefined.")
-{
-   char * retBuffer = Con::getReturnBuffer(256);
-   F32 x[4];
-   U32 sol = mSolveQuartic(dAtof(argv[1]), dAtof(argv[2]), dAtof(argv[3]), dAtof(argv[4]), dAtof(argv[5]), x);
-   dSprintf(retBuffer, 256, "%d %g %g %g %g", sol, x[0], x[1], x[2], x[3]);
-   return retBuffer;
-}
-
-ConsoleFunction( mFloor, S32, 2, 2, "( val ) Use the mFloor function to calculate the next lowest integer value from val.\n"
-                                                                "@param val A floating-point value.\n"
-                                                                "@return Returns an integer representing the next lowest integer from val.\n"
-                                                                "@sa mCeil")
-{
-   return (S32)mFloor(dAtof(argv[1]));
-}
-ConsoleFunction( mRound, F32, 2, 2, "(float v) Rounds a number. 0.5 is rounded up.\n"
-                "@param val A floating-point value\n"
-                "@return Returns the integer value closest to the given float")
-
-{
-   return mRound( dAtof(argv[1]) );
-}
-
-ConsoleFunction( mCeil, S32, 2, 2, "( val ) Use the mCeil function to calculate the next highest integer value from val.\n"
-                                                                "@param val A floating-point value.\n"
-                                                                "@return Returns an integer representing the next highest integer from val.\n"
-                                                                "@sa mFloor")
-{
-   return (S32)mCeil(dAtof(argv[1]));
-}
-
-
-ConsoleFunction( mFloatLength, const char *, 3, 3, "( val , numDecimals ) Use the mFloatLength function to limit the number of decimal places in val to numDecimals.\n"
-                                                                "@param val A floating-point value.\n"
-                                                                "@param numDecimals An integer between 0 and inf representing the number of decimal places to allow val to have.\n"
-                                                                "@return Returns a floating-point value equivalent to a truncated version of val, where the new version has numDecimals decimal places")
-{
-   char * outBuffer = Con::getReturnBuffer(256);
-   char fmtString[8] = "%.0f";
-   U32 precision = dAtoi(argv[2]);
-   if (precision > 9)
-      precision = 9;
-   fmtString[2] = '0' + precision;
-
-   dSprintf(outBuffer, 255, fmtString, dAtof(argv[1]));
-   return outBuffer;
-}
-
-//------------------------------------------------------------------------------
-ConsoleFunction( mAbs, F32, 2, 2, "( val ) Use the mAbs function to get the magnitude of val.\n"
-                                                                "@param val An integer or a floating-point value.\n"
-                                                                "@return Returns the magnitude of val")
-{
-   return(mFabs(dAtof(argv[1])));
-}
-
-ConsoleFunction( mSign, F32, 2, 2, "( val ) Use the mSign function to get the signum of a number.\n"
-                                                                "@param val An integer or a floating-point value.\n"
-                                                                "@return Returns +1 if the number is >= 0, or -1 if it's < 0")
-{
-   return(mFsign(dAtof(argv[1])));
-}
-
-ConsoleFunction( mSqrt, F32, 2, 2, "( val ) Use the mSqrt function to calculated the square root of val.\n"
-                                                                "@param val A numeric value.\n"
-                                                                "@return Returns the the squareroot of val")
-{
-   return(mSqrt(dAtof(argv[1])));
-}
-
-ConsoleFunction( mPow, F32, 3, 3, "( val , power ) Use the mPow function to calculated val raised to the power of power.\n"
-                                                                "@param val A numeric (integer or floating-point) value to be raised to a power.\n"
-                                                                "@param power A numeric (integer or floating-point) power to raise val to.\n"
-                                                                "@return Returns val^power")
-{
-   return(mPow(dAtof(argv[1]), dAtof(argv[2])));
-}
-
-ConsoleFunction( mLog, F32, 2, 2, "( val ) Use the mLog function to calculate the natural logarithm of val.\n"
-                                                                "@param val A numeric value.\n"
-                                                                "@return Returns the natural logarithm of val")
-{
-   return(mLog(dAtof(argv[1])));
-}
-
-ConsoleFunction( mSin, F32, 2, 2, "( val ) Use the mSin function to get the sine of the radian angle val.\n"
-                                                                "@param val A value between -3.14159 and 3.14159.\n"
-                                                                "@return Returns the sine of val. This value will be in the range [ -1.0 , 1.0 ].\n"
-                                                                "@sa mAsin")
-{
-   return(mSin(dAtof(argv[1])));
-}
-
-ConsoleFunction( mCos, F32, 2, 2, "( val ) Use the mCos function to get the cosine of the radian angle val.\n"
-                                                                "@param val A value between -3.14159 and 3.14159.\n"
-                                                                "@return Returns the cosine of val. This value will be in the range [ -1.0 , 1.0 ].\n"
-                                                                "@sa mAcos")
-{
-   return(mCos(dAtof(argv[1])));
-}
-
-ConsoleFunction( mTan, F32, 2, 2, "( val ) Use the mTan function to get the tangent of the radian angle val.\n"
-                                                                "@param val A value between -3.14159/2 and 3.14159/2.\n"
-                                                                "@return Returns the tangent of val. This value will be in the range [ -inf.0 , inf.0 ].\n"
-                                                                "@sa mAtan")
-{
-   return(mTan(dAtof(argv[1])));
-}
-
-ConsoleFunction( mAsin, F32, 2, 2, "( val ) Use the mAsin function to get the inverse sine of val in radians.\n"
-                                                                "@param val A value between -1.0 and 1.0 equal to the sine of some angle theta.\n"
-                                                                "@return Returns the inverse sine of val in radians. This value will be in the range [ - 3.14159/2 , 3.14159/2 ].\n"
-                                                                "@sa mSin")
-{
-   return(mAsin(dAtof(argv[1])));
-}
-
-ConsoleFunction( mAcos, F32, 2, 2, "( val ) Use the mAcos function to get the inverse cosine of val in radians.\n"
-                                                                "@param val A value between -1.0 and 1.0 equal to the cosine of some angle theta.\n"
-                                                                "@return Returns the inverse cosine of val in radians. This value will be in the range [ 0 , 3.14159 ].\n"
-                                                                "@sa mCos")
-{
-   return(mAcos(dAtof(argv[1])));
-}
-
-ConsoleFunction( mAtan, F32, 3, 3, "( val ) Use the mAtan function to get the inverse tangent of rise/run in radians.\n"
-                                                                "@param rise Vertical component of a line.\n"
-                                                                "@param run Horizontal component of a line.\n"
-                                                                "@return Returns the slope in radians (the arc-tangent) of a line with the given rise and run.\n"
-                                                                "@sa mTan")
-{
-   return(mAtan(dAtof(argv[1]), dAtof(argv[2])));
-}
-
-ConsoleFunction( mRadToDeg, F32, 2, 2, "( val ) Use the mRadToDeg function to convert radians to degrees.\n"
-                                                                "@param val A floating-point number representing some number of radians.\n"
-                                                                "@return Returns the equivalent of the radian value val in degrees.\n"
-                                                                "@sa mDegToRad")
-{
-   return(mRadToDeg(dAtof(argv[1])));
-}
-
-ConsoleFunction( mDegToRad, F32, 2, 2, "( val ) Use the mDegToRad function to convert degrees to radians.\n"
-                                                                "@param val A floating-point number representing some number of degrees.\n"
-                                                                "@return Returns the equivalent of the degree value val in radians.\n"
-                                                                "@sa mRadToDeg")
-{
-   return(mDegToRad(dAtof(argv[1])));
-}
-
-ConsoleFunction( mClamp, F32, 4, 4, "(float number, float min, float max) Clamp a value between two other values.\n"
-                "@param number A float value representing the number to clamp\n"
-                "@param min The lower bound\n"
-                "@param max The upper bound\n"
-                "@return A float value the is within the given range")
-{
-   F32 value = dAtof( argv[1] );
-   F32 min = dAtof( argv[2] );
-   F32 max = dAtof( argv[3] );
-   return mClampF( value, min, max );
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleFunction( mGetMin, F32, 3, 3, "(a, b) - Returns the Minimum of two values.")
-{
-   return getMin(dAtof(argv[1]), dAtof(argv[2]));
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleFunction( mGetMax, F32, 3, 3, "(a, b) - Returns the Maximum of two values.")
-{
-   return getMax(dAtof(argv[1]), dAtof(argv[2]));
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleFunction( bits, const char*, 2, 2, "Converts a list of bit-positions into a value." )
-{
-    // Calculate Element Count.
-    U32 elementCount = StringUnit::getUnitCount( argv[1], " \t\n" );
-
-    // Return nothing if there's no elements.
-    if ( elementCount < 1 )
-    {
-        // Error!
-        Con::printf("bits() - Invalid number of parameters!");
-        return "0";
-    }
-
-    // Reset Bit Value.
-    U32 bitValue = 0;
-
-    // Parse Bits.
-    for ( U32 n = 0; n < elementCount; n++ )
-    {
-        // Merge Bit Value.
-        bitValue |= (U32)BIT(dAtoi(StringUnit::getUnit(argv[1], n, " \t\n")));
-    }
-
-    // Create Returnable Buffer.
-    char* pBuffer = Con::getReturnBuffer(16);
-    // Format Output.
-    dSprintf( pBuffer, 16, "%u", bitValue );
-    // Return Buffer.
-    return pBuffer;
-}
-
-//-----------------------------------------------------------------------------
-
-ConsoleFunction( bit, const char*, 2, 2, "Converts a bit-position into a value." )
-{
-    // Create Returnable Buffer.
-    char* pBuffer = Con::getReturnBuffer(16);
-
-    // Format Output.
-    dSprintf( pBuffer, 16, "%u", U32(BIT(dAtoi(argv[1]))) );
-
-    // Return Buffer.
-    return pBuffer;
-}
-
-ConsoleFunction( bitInverse, const char*, 2, 2, "Returns the ones complement of a bit." )
-{
-    // Create Returnable Buffer.
-    char* pBuffer = Con::getReturnBuffer(16);
-
-    // Format Output.
-    dSprintf( pBuffer, 16, "%u", U32(~BIT(dAtoi(argv[1]))) );
-
-    // Return Buffer.
-    return pBuffer;
-}
-
-ConsoleFunction( addBitToMask, S32, 3, 3, "( mask, bit ) - Returns the mask with a bit added to it" )
-{
-   U32 mask;
-   dSscanf( argv[1], "%u", &mask );
-   U32 bit = BIT( dAtoi( argv[2] ) );
-   
-   return mask | bit;
-}
-
-ConsoleFunction( removeBitFromMask, S32, 3, 3, "( mask, bit ) - Returns the mask with a bit removed from it" )
-{
-   U32 mask;
-   dSscanf( argv[1], "%u", &mask );
-   U32 bit = BIT( dAtoi( argv[2] ) );
-   
-   return mask & ~bit;
-}
-
-ConsoleFunctionGroupEnd( GeneralMath );

engine/source/platform/eaxtypes.h

@@ -1,482 +0,0 @@
-//-----------------------------------------------------------------------------
-// Copyright (c) 2013 GarageGames, LLC
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//-----------------------------------------------------------------------------
-
-typedef struct _ALGUID
-{
-    unsigned long  Data1;
-    unsigned short Data2;
-    unsigned short Data3;
-    unsigned char  Data4[8];
-}ALGUID;
-
-#ifndef INITGUID
-    #define DEFINE_ALGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        extern const ALGUID name
-#else
-    #define DEFINE_ALGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        extern const ALGUID name = { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
-#endif // INITGUID
-
-
-
-/*
- * EAX 3.0 listener property set {A8FA6880-B476-11d3-BDB9-00C0F02DDF87}
- */
-DEFINE_ALGUID(DSPROPSETID_EAX30_ListenerProperties, 
-    0xa8fa6882, 
-    0xb476, 
-    0x11d3, 
-    0xbd, 0xb9, 0x00, 0xc0, 0xf0, 0x2d, 0xdf, 0x87);
-
-// For compatibility with future EAX versions:
-#define DSPROPSETID_EAX_ListenerProperties DSPROPSETID_EAX30_ListenerProperties
-
-typedef enum
-{
-    DSPROPERTY_EAXLISTENER_NONE,
-    DSPROPERTY_EAXLISTENER_ALLPARAMETERS,
-    DSPROPERTY_EAXLISTENER_ENVIRONMENT,
-    DSPROPERTY_EAXLISTENER_ENVIRONMENTSIZE,
-    DSPROPERTY_EAXLISTENER_ENVIRONMENTDIFFUSION,
-    DSPROPERTY_EAXLISTENER_ROOM,
-    DSPROPERTY_EAXLISTENER_ROOMHF,
-    DSPROPERTY_EAXLISTENER_ROOMLF,
-    DSPROPERTY_EAXLISTENER_DECAYTIME,
-    DSPROPERTY_EAXLISTENER_DECAYHFRATIO,
-    DSPROPERTY_EAXLISTENER_DECAYLFRATIO,
-    DSPROPERTY_EAXLISTENER_REFLECTIONS,
-    DSPROPERTY_EAXLISTENER_REFLECTIONSDELAY,
-    DSPROPERTY_EAXLISTENER_REFLECTIONSPAN,
-    DSPROPERTY_EAXLISTENER_REVERB,
-    DSPROPERTY_EAXLISTENER_REVERBDELAY,
-    DSPROPERTY_EAXLISTENER_REVERBPAN,
-    DSPROPERTY_EAXLISTENER_ECHOTIME,
-    DSPROPERTY_EAXLISTENER_ECHODEPTH,
-    DSPROPERTY_EAXLISTENER_MODULATIONTIME,
-    DSPROPERTY_EAXLISTENER_MODULATIONDEPTH,
-    DSPROPERTY_EAXLISTENER_AIRABSORPTIONHF,
-    DSPROPERTY_EAXLISTENER_HFREFERENCE,
-    DSPROPERTY_EAXLISTENER_LFREFERENCE,
-    DSPROPERTY_EAXLISTENER_ROOMROLLOFFFACTOR,
-    DSPROPERTY_EAXLISTENER_FLAGS
-} DSPROPERTY_EAX_LISTENERPROPERTY;
-
-// OR these flags with property id
-#define DSPROPERTY_EAXLISTENER_IMMEDIATE 0x00000000 // changes take effect immediately
-#define DSPROPERTY_EAXLISTENER_DEFERRED  0x80000000 // changes take effect later
-#define DSPROPERTY_EAXLISTENER_COMMITDEFERREDSETTINGS (DSPROPERTY_EAXLISTENER_NONE | \
-                                                       DSPROPERTY_EAXLISTENER_IMMEDIATE)
-
-typedef struct _EAXVECTOR {
-	float x;
-	float y;
-	float z;
-} EAXVECTOR;
-
-// Use this structure for DSPROPERTY_EAXLISTENER_ALLPARAMETERS
-// - all levels are hundredths of decibels
-// - all times and delays are in seconds
-//
-// NOTE: This structure may change in future EAX versions.
-//       It is recommended to initialize fields by name:
-//              myListener.lRoom = -1000;
-//              myListener.lRoomHF = -100;
-//              ...
-//              myListener.dwFlags = myFlags /* see EAXLISTENERFLAGS below */ ;
-//       instead of:
-//              myListener = { -1000, -100, ... , 0x00000009 };
-//       If you want to save and load presets in binary form, you 
-//       should define your own structure to insure future compatibility.
-//
-typedef struct _EAXLISTENERPROPERTIES
-{
-    unsigned long ulEnvironment;   // sets all listener properties
-    float flEnvironmentSize;       // environment size in meters
-    float flEnvironmentDiffusion;  // environment diffusion
-    long  lRoom;                    // room effect level (at mid frequencies)
-    long  lRoomHF;                  // relative room effect level at high frequencies
-    long  lRoomLF;                  // relative room effect level at low frequencies  
-    float flDecayTime;             // reverberation decay time at mid frequencies
-    float flDecayHFRatio;          // high-frequency to mid-frequency decay time ratio
-    float flDecayLFRatio;          // low-frequency to mid-frequency decay time ratio   
-    long  lReflections;             // early reflections level relative to room effect
-    float flReflectionsDelay;      // initial reflection delay time
-    EAXVECTOR vReflectionsPan;     // early reflections panning vector
-    long  lReverb;                  // late reverberation level relative to room effect
-    float flReverbDelay;           // late reverberation delay time relative to initial reflection
-    EAXVECTOR vReverbPan;          // late reverberation panning vector
-    float flEchoTime;              // echo time
-    float flEchoDepth;             // echo depth
-    float flModulationTime;        // modulation time
-    float flModulationDepth;       // modulation depth
-    float flAirAbsorptionHF;       // change in level per meter at high frequencies
-    float flHFReference;           // reference high frequency
-    float flLFReference;           // reference low frequency 
-    float flRoomRolloffFactor;     // like DS3D flRolloffFactor but for room effect
-    unsigned long ulFlags;         // modifies the behavior of properties
-} EAXLISTENERPROPERTIES, *LPEAXLISTENERPROPERTIES;
-
-// used by DSPROPERTY_EAXLISTENER_ENVIRONMENT
-enum
-{
-    EAX_ENVIRONMENT_GENERIC,
-    EAX_ENVIRONMENT_PADDEDCELL,
-    EAX_ENVIRONMENT_ROOM,
-    EAX_ENVIRONMENT_BATHROOM,
-    EAX_ENVIRONMENT_LIVINGROOM,
-    EAX_ENVIRONMENT_STONEROOM,
-    EAX_ENVIRONMENT_AUDITORIUM,
-    EAX_ENVIRONMENT_CONCERTHALL,
-    EAX_ENVIRONMENT_CAVE,
-    EAX_ENVIRONMENT_ARENA,
-    EAX_ENVIRONMENT_HANGAR,
-    EAX_ENVIRONMENT_CARPETEDHALLWAY,
-    EAX_ENVIRONMENT_HALLWAY,
-    EAX_ENVIRONMENT_STONECORRIDOR,
-    EAX_ENVIRONMENT_ALLEY,
-    EAX_ENVIRONMENT_FOREST,
-    EAX_ENVIRONMENT_CITY,
-    EAX_ENVIRONMENT_MOUNTAINS,
-    EAX_ENVIRONMENT_QUARRY,
-    EAX_ENVIRONMENT_PLAIN,
-    EAX_ENVIRONMENT_PARKINGLOT,
-    EAX_ENVIRONMENT_SEWERPIPE,
-    EAX_ENVIRONMENT_UNDERWATER,
-    EAX_ENVIRONMENT_DRUGGED,
-    EAX_ENVIRONMENT_DIZZY,
-    EAX_ENVIRONMENT_PSYCHOTIC,
-
-    EAX_ENVIRONMENT_UNDEFINED,
-
-    EAX_ENVIRONMENT_COUNT
-};
-
-// Used by DSPROPERTY_EAXLISTENER_FLAGS
-//
-// Note: The number and order of flags may change in future EAX versions.
-//       It is recommended to use the flag defines as follows:
-//              myFlags = EAXLISTENERFLAGS_DECAYTIMESCALE | EAXLISTENERFLAGS_REVERBSCALE;
-//       instead of:
-//              myFlags = 0x00000009;
-//
-// These flags determine what properties are affected by environment size.
-#define EAXLISTENERFLAGS_DECAYTIMESCALE        0x00000001 // reverberation decay time
-#define EAXLISTENERFLAGS_REFLECTIONSSCALE      0x00000002 // reflection level
-#define EAXLISTENERFLAGS_REFLECTIONSDELAYSCALE 0x00000004 // initial reflection delay time
-#define EAXLISTENERFLAGS_REVERBSCALE           0x00000008 // reflections level
-#define EAXLISTENERFLAGS_REVERBDELAYSCALE      0x00000010 // late reverberation delay time
-#define EAXLISTENERFLAGS_ECHOTIMESCALE         0x00000040 // echo time
-#define EAXLISTENERFLAGS_MODULATIONTIMESCALE   0x00000080 // modulation time
-
-// This flag limits high-frequency decay time according to air absorption.
-#define EAXLISTENERFLAGS_DECAYHFLIMIT          0x00000020
- 
-#define EAXLISTENERFLAGS_RESERVED              0xFFFFFF00 // reserved future use
-
-// Property ranges and defaults:
-
-#define EAXLISTENER_MINENVIRONMENT                0
-#define EAXLISTENER_MAXENVIRONMENT                (EAX_ENVIRONMENT_COUNT-1)
-#define EAXLISTENER_DEFAULTENVIRONMENT            EAX_ENVIRONMENT_GENERIC
-
-#define EAXLISTENER_MINENVIRONMENTSIZE            1.0f
-#define EAXLISTENER_MAXENVIRONMENTSIZE            100.0f
-#define EAXLISTENER_DEFAULTENVIRONMENTSIZE        7.5f
-
-#define EAXLISTENER_MINENVIRONMENTDIFFUSION       0.0f
-#define EAXLISTENER_MAXENVIRONMENTDIFFUSION       1.0f
-#define EAXLISTENER_DEFAULTENVIRONMENTDIFFUSION   1.0f
-
-#define EAXLISTENER_MINROOM                       (-10000)
-#define EAXLISTENER_MAXROOM                       0
-#define EAXLISTENER_DEFAULTROOM                   (-1000)
-
-#define EAXLISTENER_MINROOMHF                     (-10000)
-#define EAXLISTENER_MAXROOMHF                     0
-#define EAXLISTENER_DEFAULTROOMHF                 (-100)
-
-#define EAXLISTENER_MINROOMLF                     (-10000)
-#define EAXLISTENER_MAXROOMLF                     0
-#define EAXLISTENER_DEFAULTROOMLF                 0
-
-#define EAXLISTENER_MINDECAYTIME                  0.1f
-#define EAXLISTENER_MAXDECAYTIME                  20.0f
-#define EAXLISTENER_DEFAULTDECAYTIME              1.49f
-
-#define EAXLISTENER_MINDECAYHFRATIO               0.1f
-#define EAXLISTENER_MAXDECAYHFRATIO               2.0f
-#define EAXLISTENER_DEFAULTDECAYHFRATIO           0.83f
-
-#define EAXLISTENER_MINDECAYLFRATIO               0.1f
-#define EAXLISTENER_MAXDECAYLFRATIO               2.0f
-#define EAXLISTENER_DEFAULTDECAYLFRATIO           1.00f
-
-#define EAXLISTENER_MINREFLECTIONS                (-10000)
-#define EAXLISTENER_MAXREFLECTIONS                1000
-#define EAXLISTENER_DEFAULTREFLECTIONS            (-2602)
-
-#define EAXLISTENER_MINREFLECTIONSDELAY           0.0f
-#define EAXLISTENER_MAXREFLECTIONSDELAY           0.3f
-#define EAXLISTENER_DEFAULTREFLECTIONSDELAY       0.007f
-
-#define EAXLISTENER_MINREVERB                     (-10000)
-#define EAXLISTENER_MAXREVERB                     2000
-#define EAXLISTENER_DEFAULTREVERB                 200
-
-#define EAXLISTENER_MINREVERBDELAY                0.0f
-#define EAXLISTENER_MAXREVERBDELAY                0.1f
-#define EAXLISTENER_DEFAULTREVERBDELAY            0.011f
-
-#define EAXLISTENER_MINECHOTIME                   0.075f
-#define EAXLISTENER_MAXECHOTIME	                  0.25f
-#define EAXLISTENER_DEFAULTECHOTIME               0.25f
-
-#define EAXLISTENER_MINECHODEPTH                  0.0f
-#define EAXLISTENER_MAXECHODEPTH                  1.0f
-#define EAXLISTENER_DEFAULTECHODEPTH              0.0f
-
-#define EAXLISTENER_MINMODULATIONTIME             0.04f
-#define EAXLISTENER_MAXMODULATIONTIME             4.0f
-#define EAXLISTENER_DEFAULTMODULATIONTIME         0.25f
-
-#define EAXLISTENER_MINMODULATIONDEPTH            0.0f
-#define EAXLISTENER_MAXMODULATIONDEPTH            1.0f
-#define EAXLISTENER_DEFAULTMODULATIONDEPTH        0.0f
-
-#define EAXLISTENER_MINAIRABSORPTIONHF            (-100.0f)
-#define EAXLISTENER_MAXAIRABSORPTIONHF            0.0f
-#define EAXLISTENER_DEFAULTAIRABSORPTIONHF        (-5.0f)
-
-#define EAXLISTENER_MINHFREFERENCE                1000.0f
-#define EAXLISTENER_MAXHFREFERENCE                20000.0f
-#define EAXLISTENER_DEFAULTHFREFERENCE            5000.0f
-
-#define EAXLISTENER_MINLFREFERENCE                20.0f
-#define EAXLISTENER_MAXLFREFERENCE                1000.0f
-#define EAXLISTENER_DEFAULTLFREFERENCE            250.0f
-
-#define EAXLISTENER_MINROOMROLLOFFFACTOR          0.0f
-#define EAXLISTENER_MAXROOMROLLOFFFACTOR          10.0f
-#define EAXLISTENER_DEFAULTROOMROLLOFFFACTOR      0.0f
-
-#define EAXLISTENER_DEFAULTFLAGS                  (EAXLISTENERFLAGS_DECAYTIMESCALE |        \
-                                                   EAXLISTENERFLAGS_REFLECTIONSSCALE |      \
-                                                   EAXLISTENERFLAGS_REFLECTIONSDELAYSCALE | \
-                                                   EAXLISTENERFLAGS_REVERBSCALE |           \
-                                                   EAXLISTENERFLAGS_REVERBDELAYSCALE |      \
-                                                   EAXLISTENERFLAGS_DECAYHFLIMIT)
-
-
-
-/*
-* EAX 3.0 buffer property set {A8FA6881-B476-11d3-BDB9-00C0F02DDF87}
-*/
-DEFINE_ALGUID(DSPROPSETID_EAX30_BufferProperties, 
-	0xa8fa6881, 
-	0xb476, 
-	0x11d3, 
-	0xbd, 0xb9, 0x0, 0xc0, 0xf0, 0x2d, 0xdf, 0x87);
-
-// For compatibility with future EAX versions:
-#define DSPROPSETID_EAX_BufferProperties DSPROPSETID_EAX30_BufferProperties
-#define DSPROPSETID_EAX_SourceProperties DSPROPSETID_EAX30_BufferProperties
-
-typedef enum
-{
-    DSPROPERTY_EAXBUFFER_NONE,
-    DSPROPERTY_EAXBUFFER_ALLPARAMETERS,
-    DSPROPERTY_EAXBUFFER_OBSTRUCTIONPARAMETERS,
-    DSPROPERTY_EAXBUFFER_OCCLUSIONPARAMETERS,
-    DSPROPERTY_EAXBUFFER_EXCLUSIONPARAMETERS,
-    DSPROPERTY_EAXBUFFER_DIRECT,
-    DSPROPERTY_EAXBUFFER_DIRECTHF,
-    DSPROPERTY_EAXBUFFER_ROOM,
-    DSPROPERTY_EAXBUFFER_ROOMHF,
-    DSPROPERTY_EAXBUFFER_OBSTRUCTION,
-    DSPROPERTY_EAXBUFFER_OBSTRUCTIONLFRATIO,
-    DSPROPERTY_EAXBUFFER_OCCLUSION, 
-    DSPROPERTY_EAXBUFFER_OCCLUSIONLFRATIO,
-    DSPROPERTY_EAXBUFFER_OCCLUSIONROOMRATIO,
-    DSPROPERTY_EAXBUFFER_OCCLUSIONDIRECTRATIO,
-    DSPROPERTY_EAXBUFFER_EXCLUSION, 
-    DSPROPERTY_EAXBUFFER_EXCLUSIONLFRATIO,
-    DSPROPERTY_EAXBUFFER_OUTSIDEVOLUMEHF, 
-    DSPROPERTY_EAXBUFFER_DOPPLERFACTOR, 
-    DSPROPERTY_EAXBUFFER_ROLLOFFFACTOR, 
-    DSPROPERTY_EAXBUFFER_ROOMROLLOFFFACTOR,
-    DSPROPERTY_EAXBUFFER_AIRABSORPTIONFACTOR,
-    DSPROPERTY_EAXBUFFER_FLAGS
-} DSPROPERTY_EAX_BUFFERPROPERTY;    
-
-// OR these flags with property id
-#define DSPROPERTY_EAXBUFFER_IMMEDIATE 0x00000000 // changes take effect immediately
-#define DSPROPERTY_EAXBUFFER_DEFERRED  0x80000000 // changes take effect later
-#define DSPROPERTY_EAXBUFFER_COMMITDEFERREDSETTINGS (DSPROPERTY_EAXBUFFER_NONE | \
-                                                     DSPROPERTY_EAXBUFFER_IMMEDIATE)
-
-// Use this structure for DSPROPERTY_EAXBUFFER_ALLPARAMETERS
-// - all levels are hundredths of decibels
-// - all delays are in seconds
-//
-// NOTE: This structure may change in future EAX versions.
-//       It is recommended to initialize fields by name:
-//              myBuffer.lDirect = 0;
-//              myBuffer.lDirectHF = -200;
-//              ...
-//              myBuffer.dwFlags = myFlags /* see EAXBUFFERFLAGS below */ ;
-//       instead of:
-//              myBuffer = { 0, -200, ... , 0x00000003 };
-//
-typedef struct _EAXBUFFERPROPERTIES
-{
-    long  lDirect;                 // direct path level (at low and mid frequencies)
-    long  lDirectHF;               // relative direct path level at high frequencies
-    long  lRoom;                   // room effect level (at low and mid frequencies)
-    long  lRoomHF;                 // relative room effect level at high frequencies
-    long  lObstruction;            // main obstruction control (attenuation at high frequencies) 
-    float flObstructionLFRatio;   // obstruction low-frequency level re. main control
-    long  lOcclusion;              // main occlusion control (attenuation at high frequencies)
-    float flOcclusionLFRatio;     // occlusion low-frequency level re. main control
-    float flOcclusionRoomRatio;   // relative occlusion control for room effect
-    float flOcclusionDirectRatio; // relative occlusion control for direct path
-    long  lExclusion;              // main exlusion control (attenuation at high frequencies)
-    float flExclusionLFRatio;     // exclusion low-frequency level re. main control
-    long  lOutsideVolumeHF;        // outside sound cone level at high frequencies
-    float flDopplerFactor;        // like DS3D flDopplerFactor but per source
-    float flRolloffFactor;        // like DS3D flRolloffFactor but per source
-    float flRoomRolloffFactor;    // like DS3D flRolloffFactor but for room effect
-    float flAirAbsorptionFactor;  // multiplies DSPROPERTY_EAXLISTENER_AIRABSORPTIONHF
-    unsigned long ulFlags;        // modifies the behavior of properties
-} EAXBUFFERPROPERTIES, *LPEAXBUFFERPROPERTIES;
-
-// Use this structure for DSPROPERTY_EAXBUFFER_OBSTRUCTION,
-typedef struct _EAXOBSTRUCTIONPROPERTIES
-{
-    long  lObstruction;
-    float flObstructionLFRatio;
-} EAXOBSTRUCTIONPROPERTIES, *LPEAXOBSTRUCTIONPROPERTIES;
-
-// Use this structure for DSPROPERTY_EAXBUFFER_OCCLUSION
-typedef struct _EAXOCCLUSIONPROPERTIES
-{
-    long  lOcclusion;
-    float flOcclusionLFRatio;
-    float flOcclusionRoomRatio;
-    float flOcclusionDirectRatio;
-} EAXOCCLUSIONPROPERTIES, *LPEAXOCCLUSIONPROPERTIES;
-
-// Use this structure for DSPROPERTY_EAXBUFFER_EXCLUSION
-typedef struct _EAXEXCLUSIONPROPERTIES
-{
-    long  lExclusion;
-    float flExclusionLFRatio;
-} EAXEXCLUSIONPROPERTIES, *LPEAXEXCLUSIONPROPERTIES;
-
-// Used by DSPROPERTY_EAXBUFFER_FLAGS
-//    TRUE:    value is computed automatically - property is an offset
-//    FALSE:   value is used directly
-//
-// Note: The number and order of flags may change in future EAX versions.
-//       To insure future compatibility, use flag defines as follows:
-//              myFlags = EAXBUFFERFLAGS_DIRECTHFAUTO | EAXBUFFERFLAGS_ROOMAUTO;
-//       instead of:
-//              myFlags = 0x00000003;
-//
-#define EAXBUFFERFLAGS_DIRECTHFAUTO          0x00000001 // affects DSPROPERTY_EAXBUFFER_DIRECTHF
-#define EAXBUFFERFLAGS_ROOMAUTO              0x00000002 // affects DSPROPERTY_EAXBUFFER_ROOM
-#define EAXBUFFERFLAGS_ROOMHFAUTO            0x00000004 // affects DSPROPERTY_EAXBUFFER_ROOMHF
-
-#define EAXBUFFERFLAGS_RESERVED              0xFFFFFFF8 // reserved future use
-
-// Property ranges and defaults:
-
-#define EAXBUFFER_MINDIRECT                    (-10000)
-#define EAXBUFFER_MAXDIRECT                    1000
-#define EAXBUFFER_DEFAULTDIRECT                0
-
-#define EAXBUFFER_MINDIRECTHF                  (-10000)
-#define EAXBUFFER_MAXDIRECTHF                  0
-#define EAXBUFFER_DEFAULTDIRECTHF              0
-
-#define EAXBUFFER_MINROOM                      (-10000)
-#define EAXBUFFER_MAXROOM                      1000
-#define EAXBUFFER_DEFAULTROOM                  0
-
-#define EAXBUFFER_MINROOMHF                    (-10000)
-#define EAXBUFFER_MAXROOMHF                    0
-#define EAXBUFFER_DEFAULTROOMHF                0
-
-#define EAXBUFFER_MINOBSTRUCTION               (-10000)
-#define EAXBUFFER_MAXOBSTRUCTION               0
-#define EAXBUFFER_DEFAULTOBSTRUCTION           0
-
-#define EAXBUFFER_MINOBSTRUCTIONLFRATIO        0.0f
-#define EAXBUFFER_MAXOBSTRUCTIONLFRATIO        1.0f
-#define EAXBUFFER_DEFAULTOBSTRUCTIONLFRATIO    0.0f
-
-#define EAXBUFFER_MINOCCLUSION                 (-10000)
-#define EAXBUFFER_MAXOCCLUSION                 0
-#define EAXBUFFER_DEFAULTOCCLUSION             0
-
-#define EAXBUFFER_MINOCCLUSIONLFRATIO          0.0f
-#define EAXBUFFER_MAXOCCLUSIONLFRATIO          1.0f
-#define EAXBUFFER_DEFAULTOCCLUSIONLFRATIO      0.25f
-
-#define EAXBUFFER_MINOCCLUSIONROOMRATIO        0.0f
-#define EAXBUFFER_MAXOCCLUSIONROOMRATIO        10.0f
-#define EAXBUFFER_DEFAULTOCCLUSIONROOMRATIO    1.5f
-
-#define EAXBUFFER_MINOCCLUSIONDIRECTRATIO      0.0f
-#define EAXBUFFER_MAXOCCLUSIONDIRECTRATIO      10.0f
-#define EAXBUFFER_DEFAULTOCCLUSIONDIRECTRATIO  1.0f
-
-#define EAXBUFFER_MINEXCLUSION                 (-10000)
-#define EAXBUFFER_MAXEXCLUSION                 0
-#define EAXBUFFER_DEFAULTEXCLUSION             0
-
-#define EAXBUFFER_MINEXCLUSIONLFRATIO          0.0f
-#define EAXBUFFER_MAXEXCLUSIONLFRATIO          1.0f
-#define EAXBUFFER_DEFAULTEXCLUSIONLFRATIO      1.0f
-
-#define EAXBUFFER_MINOUTSIDEVOLUMEHF           (-10000)
-#define EAXBUFFER_MAXOUTSIDEVOLUMEHF           0
-#define EAXBUFFER_DEFAULTOUTSIDEVOLUMEHF       0
-
-#define EAXBUFFER_MINDOPPLERFACTOR             0.0f
-#define EAXBUFFER_MAXDOPPLERFACTOR             10.f
-#define EAXBUFFER_DEFAULTDOPPLERFACTOR         0.0f
-
-#define EAXBUFFER_MINROLLOFFFACTOR             0.0f
-#define EAXBUFFER_MAXROLLOFFFACTOR             10.f
-#define EAXBUFFER_DEFAULTROLLOFFFACTOR         0.0f
-
-#define EAXBUFFER_MINROOMROLLOFFFACTOR         0.0f
-#define EAXBUFFER_MAXROOMROLLOFFFACTOR         10.f
-#define EAXBUFFER_DEFAULTROOMROLLOFFFACTOR     0.0f
-
-#define EAXBUFFER_MINAIRABSORPTIONFACTOR       0.0f
-#define EAXBUFFER_MAXAIRABSORPTIONFACTOR       10.0f
-#define EAXBUFFER_DEFAULTAIRABSORPTIONFACTOR   1.0f
-
-#define EAXBUFFER_DEFAULTFLAGS                 (EAXBUFFERFLAGS_DIRECTHFAUTO |       \
-                                                EAXBUFFERFLAGS_ROOMAUTO |           \
-                                                EAXBUFFERFLAGS_ROOMHFAUTO )

tools/documentation/config/torqueScriptReference.cfg

@@ -708,7 +708,7 @@ INPUT_ENCODING         = UTF-8
 # T2D: note that we allow any suffix after "_ScriptBinding".  The goal it to include,
 # for example, Trigger_ScriptBinding.h and Trigger_ScriptBinding.dox
 
-FILE_PATTERNS          = *_ScriptBinding.* *_ScriptPage.*
+FILE_PATTERNS          = *_ScriptBinding.* *_Reference.*
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.
@@ -1496,7 +1496,7 @@ MAN_LINKS              = NO
 
 # T2D
 
-GENERATE_XML           = YES
+GENERATE_XML           = NO
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be