Merge pull request #221 from capnlove/UserData

CompositeSprite UserData exposed to script
GarageGames · Jul 31, 2014 · 78e8575 · 78e8575
2 parents 7a1660d + 3e1ffb4
commit 78e8575
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/engine/source/2d/core/SpriteBatchItem.cc b/engine/source/2d/core/SpriteBatchItem.cc
@@ -57,6 +57,7 @@ static StringTableEntry spriteImageFrameName        = StringTable->insert("Frame
 static StringTableEntry spriteNamedImageFrameName   = StringTable->insert("NamedFrame");
 static StringTableEntry spriteAnimationName         = StringTable->insert("Animation");
 static StringTableEntry spriteDataObjectName        = StringTable->insert("DataObject");
+static StringTableEntry spriteUserDataName          = StringTable->insert("UserData");
 
 //------------------------------------------------------------------------------
 
@@ -433,6 +434,12 @@ void SpriteBatchItem::onTamlCustomWrite( TamlCustomNode* pParentNode )
     // Write data object.
     if ( getDataObject() != NULL )
         pSpriteNode->addNode( getDataObject() );
+
+    if ( getUserData() != NULL)
+    {   
+        const char* UserDatastr = (const char*) getUserData();
+        pSpriteNode->addField( "UserData", UserDatastr );
+    }
 }
 
 //------------------------------------------------------------------------------
@@ -582,6 +589,11 @@ void SpriteBatchItem::onTamlCustomRead( const TamlCustomNode* pSpriteNode )
             // Set logical position.
             setLogicalPosition( LogicalPosition( pLogicalPositionArgs ) );
         }
+        else if ( fieldName == spriteUserDataName )
+        {
+            StringTableEntry UserDatastr = StringTable->insert(pSpriteField->getFieldValue());
+            setUserData((void *)UserDatastr);
+        }
     }
 
     // Fetch sprite children.

diff --git a/engine/source/2d/sceneobject/CompositeSprite_ScriptBinding.h b/engine/source/2d/sceneobject/CompositeSprite_ScriptBinding.h
@@ -1050,6 +1050,20 @@ ConsoleMethodWithDocs(CompositeSprite, getSpriteId, ConsoleInt, 2, 2, ())
 
 //-----------------------------------------------------------------------------
 
+ConsoleMethodWithDocs(CompositeSprite, getSpriteUserData, ConsoleString, 2, 2, ())
+{
+    const char* UserDatastr = (const char*) object->getUserData();
+    return UserDatastr;
+}
+
+//-----------------------------------------------------------------------------
+
+ConsoleMethodWithDocs(CompositeSprite, setSpriteUserData, ConsoleVoid, 3, 3, (string))
+{
+    StringTableEntry UserDatastr = StringTable->insert(argv[2]);
+    object->setUserData((void *)UserDatastr);
+}
+
 /*! Picks sprites intersecting the specified point with optional group/layer masks.
     @param x/y The coordinate of the point as either (\x y\ or (x,y)
     @return Returns list of sprite Ids.