Cleaning up Meta Sprite look up and draw APIs.

jessefreeman · jessefreeman · commit 3dd8fe74790d · 2021-03-25T08:49:05.000-04:00
diff --git a/SDK/Lua/Chips/Game/LuaGameChip.MetaSprite.cs b/SDK/Lua/Chips/Game/LuaGameChip.MetaSprite.cs
@@ -11,9 +11,9 @@ public void RegisterMetaSprite()
             
             LuaScript.Globals["FindMetaSpriteId"] = new Func<string, int>(FindMetaSpriteId);
             LuaScript.Globals["TotalMetaSprites"] = new Func<int?, int>(TotalMetaSprites);
-            LuaScript.Globals["MetaSprite"] = new Func<int, SpriteCollection, SpriteCollection>(MetaSprite);
+            LuaScript.Globals["MetaSprite"] = new Func<object, SpriteCollection, SpriteCollection>(MetaSpriteRouter);
             LuaScript.Globals["DrawMetaSprite"] =
-                new Action<int, int, int, bool, bool, DrawMode, int>(DrawMetaSprite);
+                new Action<object, int, int, bool, bool, DrawMode, int>(DrawMetaSpriteRouter);
 
             UserData.RegisterType<SpriteData>();
             LuaScript.Globals["SpriteData"] = UserData.CreateStatic<SpriteData>();
@@ -33,5 +33,29 @@ public void RegisterMetaSprite()
             LuaScript.Globals["NewMetaSprite"] =
                 new Func<int, string, int[], int, int, SpriteCollection>(NewMetaSprite);
         }
+
+        public void DrawMetaSpriteRouter(object metaSprite, int x, int y, bool flipH = false, bool flipV = false, DrawMode drawMode = DrawMode.Sprite, int colorOffset = 0)
+        {
+            
+            if(metaSprite is string){
+                DrawMetaSprite((string)metaSprite, x, y, flipH, flipV, drawMode, colorOffset);
+            }else if(metaSprite is SpriteCollection){
+                DrawMetaSprite((SpriteCollection)metaSprite, x, y, flipH, flipV, drawMode, colorOffset);
+            }else{
+                // Convert to an int or throw an error
+                DrawMetaSprite(Convert.ToInt32(metaSprite), x, y, flipH, flipV, drawMode, colorOffset);
+            }
+            
+        }
+
+        public SpriteCollection MetaSpriteRouter(object id, SpriteCollection spriteCollection = null)
+        {
+            if(id is string)
+            {
+                return MetaSprite((string)id, spriteCollection);
+            }
+
+            return MetaSprite(Convert.ToInt32(id), spriteCollection);
+        }
     }
 }
diff --git a/SDK/Player/Chips/Game/GameChip.MetaSprite.cs b/SDK/Player/Chips/Game/GameChip.MetaSprite.cs
@@ -117,6 +117,11 @@ public int MaxSpriteCount()
             return SpriteChip.MaxSpriteCount;
         }
 
+        public SpriteCollection MetaSprite(string name, SpriteCollection spriteCollection = null)
+        {
+            return MetaSprite(FindMetaSpriteId(name), spriteCollection);
+        }
+
         public SpriteCollection MetaSprite(int id, SpriteCollection spriteCollection = null)
         {
             if (id < 0 || id > metaSprites.Length)
@@ -159,16 +164,30 @@ protected int FindMetaSpriteId(string name)
             return -1;
         }
 
+        public void DrawMetaSprite(string name, int x, int y, bool flipH = false, bool flipV = false,
+            DrawMode drawMode = DrawMode.Sprite, int colorOffset = 0)
+        {
+            DrawMetaSprite(FindMetaSpriteId(name), x, y, flipH, flipV, drawMode, colorOffset);
+        }
+
         public void DrawMetaSprite(int id, int x, int y, bool flipH = false, bool flipV = false,
             DrawMode drawMode = DrawMode.Sprite, int colorOffset = 0)
         {
             // This draw method doesn't support background or tile draw modes
             if (id == -1) return;
 
-            var spriteCollection = metaSprites[id];
+            DrawMetaSprite(metaSprites[id], x, y, flipH, flipV, drawMode, colorOffset);
+
+        }
+
+        public void DrawMetaSprite(SpriteCollection spriteCollection, int x, int y, bool flipH = false, bool flipV = false,
+            DrawMode drawMode = DrawMode.Sprite, int colorOffset = 0)
+        {
+
             // Get the sprite data for the meta sprite
             var tmpSpritesData = spriteCollection.Sprites;
             var total = tmpSpritesData.Count;
+            var id = 0;
 
             // When rendering in Tile Mode, switch to grid layout
             if (drawMode == DrawMode.Tile)
