Browse Source

- Removed obsolete "TypeT2DVector".

MelvMay-GG 12 years ago
parent
commit
065770c

+ 1 - 1
engine/source/2d/scene/Scene.cc

@@ -389,7 +389,7 @@ void Scene::initPersistFields()
     Parent::initPersistFields();
 
     // Physics.
-    addProtectedField("Gravity", TypeT2DVector, Offset(mWorldGravity, Scene), &setGravity, &getGravity, &writeGravity, "" );
+    addProtectedField("Gravity", TypeVector2, Offset(mWorldGravity, Scene), &setGravity, &getGravity, &writeGravity, "" );
     addField("VelocityIterations", TypeS32, Offset(mVelocityIterations, Scene), &writeVelocityIterations, "" );
     addField("PositionIterations", TypeS32, Offset(mPositionIterations, Scene), &writePositionIterations, "" );
 

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

@@ -114,7 +114,7 @@ void ImageFont::initPersistFields()
     addProtectedField("image", TypeImageAssetPtr, Offset(mImageAsset, ImageFont), &setImage, &getImage, &writeImage, "");
     addProtectedField("text", TypeString, 0, setText, getText, &writeText, "The text to be displayed." );  
     addProtectedField("textAlignment", TypeEnum, Offset(mTextAlignment, ImageFont), &setTextAlignment, &defaultProtectedGetFn, &writeTextAlignment, 1, &gTextAlignmentTable, "");
-    addProtectedField("fontSize", TypeT2DVector, Offset(mFontSize, ImageFont), &setFontSize, &defaultProtectedGetFn,&writeFontSize, "" );
+    addProtectedField("fontSize", TypeVector2, Offset(mFontSize, ImageFont), &setFontSize, &defaultProtectedGetFn,&writeFontSize, "" );
     addProtectedField("fontPadding", TypeF32, Offset(mFontPadding, ImageFont), &setFontPadding, &defaultProtectedGetFn, &writeFontPadding, "" );
 }
 

+ 0 - 50
engine/source/console/consoleTypes.cc

@@ -33,56 +33,6 @@
 #include "2d/core/Vector2.h"
 #endif
 
-//////////////////////////////////////////////////////////////////////////
-// TypeString
-//////////////////////////////////////////////////////////////////////////
-ConsoleType( Vector2, TypeT2DVector, sizeof(Vector2), "" )
-
-ConsoleGetType( TypeT2DVector )
-{
-    Vector2* pVector = (Vector2*)dptr;  
-    return pVector->scriptThis();
-}
-
-ConsoleSetType( TypeT2DVector )
-{
-    Vector2* pVector = (Vector2*)dptr;  
-    F32 x;
-    F32 y;
-    if( argc == 1 )
-    {
-        S32 args = dSscanf(argv[0], "%g %g", &x, &y);
-        if ( args == 2 )
-        {
-            pVector->Set( x, y );
-            return;
-        }
-        else if ( args == 1 )
-        {
-            pVector->Set( x, x );
-            return;
-        }
-        else
-        {
-            // Warn.
-            Con::warnf("Vector2 must be set as { x [,y] }");
-            return;
-        }
-
-    }
-    else if ( argc == 2 )
-    {
-        pVector->Set( dAtof(argv[0]), dAtof(argv[1]) );
-        return;
-    }
-    else
-    {
-        // Warn.
-        Con::warnf("Vector2 must be set as { x [,y] }");
-        return;
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
 // TypeString
 //////////////////////////////////////////////////////////////////////////

+ 0 - 1
engine/source/console/consoleTypes.h

@@ -52,6 +52,5 @@ DefineConsoleType( TypeFlag )
 DefineConsoleType( TypeSimObjectPtr )
 DefineConsoleType( TypeSimObjectName )
 DefineConsoleType( TypeSimObjectId )
-DefineConsoleType( TypeT2DVector )
 
 #endif