Removing old script loading logic.

PixelVision8 · Feb 4, 2020 · cf9d9bc · cf9d9bc
1 parent 4f3be8a
commit cf9d9bc
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 244 deletions.
diff --git a/Runners/PixelVision8/Runner/PixelVision8Runner.cs b/Runners/PixelVision8/Runner/PixelVision8Runner.cs
@@ -27,6 +27,7 @@
 using MoonSharp.Interpreter;
 using PixelVision8.Engine;
 using PixelVision8.Engine.Chips;
+using PixelVision8.Runner.Editors;
 using PixelVision8.Runner.Services;
 using PixelVision8.Runner.Workspace;
 
@@ -644,6 +645,32 @@ public override void ShutdownActiveEngine()
         }
 
 
+        private GameEditor _editor;
+
+        public GameEditor Editor
+        {
+            get
+            {
+                if (_editor == null)
+                {
+                    _editor = new GameEditor(this, serviceManager);
+                }
+
+                return _editor;
+            }
+        }
+
+        public override void ConfigureEngine(Dictionary<string, string> metaData = null)
+        {
+            base.ConfigureEngine(metaData);
+
+            var luaGameChip = tmpEngine.GameChip as LuaGameChip;
+
+            // Register the game editor with  the lua service
+            UserData.RegisterType<GameEditor>();
+            luaGameChip.LuaScript.Globals["gameEditor"] = Editor;
+        }
+
         public override void RunGame()
         {
             // TODO This should be moved into the desktop runner?

diff --git a/Runners/PixelVision8/Runner/Services/ExportService.cs b/Runners/PixelVision8/Runner/Services/ExportService.cs
@@ -96,18 +96,18 @@ public void ExportGame(string path, IEngine engine, SaveFlags saveFlags)
                 AddExporter(new SystemExporter(path + "data.json", targetEngine));
 
             // Step 2 (optional). Load up the Lua script
-            if ((saveFlags & SaveFlags.Code) == SaveFlags.Code)
-            {
-                //                //var scriptExtension = ".lua";
-                //                    
-                //                var paths = files.Keys.Where(s => textExtensions.Any(x => s.EndsWith(x))).ToList();
-                //
-                //                foreach (var fileName in paths)
-                //                {
-                //                    parser = LoadScript(fileName, files[fileName]);
-                //                    AddExporter(parser);
-                //                }
-            }
+            // if ((saveFlags & SaveFlags.Code) == SaveFlags.Code)
+            // {
+            //     //                //var scriptExtension = ".lua";
+            //     //                    
+            //     //                var paths = files.Keys.Where(s => textExtensions.Any(x => s.EndsWith(x))).ToList();
+            //     //
+            //     //                foreach (var fileName in paths)
+            //     //                {
+            //     //                    parser = LoadScript(fileName, files[fileName]);
+            //     //                    AddExporter(parser);
+            //     //                }
+            // }
 
             // Step 3 (optional). Look for new colors
             if ((saveFlags & SaveFlags.Colors) == SaveFlags.Colors)

diff --git a/Runners/PixelVision8/Runner/Services/LuaServicePlus.cs b/Runners/PixelVision8/Runner/Services/LuaServicePlus.cs
@@ -124,23 +124,11 @@ public override void ConfigureScript(Script luaScript)
             luaScript.Globals["SaveText"] = new Action<WorkspacePath, string>(SaveText);
             luaScript.Globals["SaveImage"] = new Action<WorkspacePath, Image>(SaveImage);
 
-            //
-            //            // Expose Bios APIs
-            //            luaScript.Globals["ReadBiosData"] = new Func<string, string, string>((key, defaultValue) =>
-            //                desktopRunner.bios.ReadBiosData(key, defaultValue));
-            //            luaScript.Globals["WriteBiosData"] = new Action<string, string>(desktopRunner.bios.UpdateBiosData);
-
-            //            luaScript.Globals["RemapKey"] = new Action<string, int>(RemapKey);
-
             luaScript.Globals["NewWorkspacePath"] = new Func<string, WorkspacePath>(WorkspacePath.Parse);
 
             UserData.RegisterType<WorkspacePath>();
             UserData.RegisterType<Image>();
 
-            // Register the game editor with  the lua service
-            gameEditor = new GameEditor(desktopRunner, locator);
-            UserData.RegisterType<GameEditor>();
-            luaScript.Globals["gameEditor"] = gameEditor;
         }
 
         public void PlayWav(WorkspacePath workspacePath)

diff --git a/SDK/Engine/PixelVisionEngine.cs b/SDK/Engine/PixelVisionEngine.cs
@@ -45,7 +45,6 @@ public PixelVisionEngine(IServiceLocator serviceLocator, string[] chips = null,
 
             Name = name;
             ServiceLocator = serviceLocator;
-            //this.canWrite = readOnly;
 
             Init();
         }
@@ -173,11 +172,6 @@ public virtual void Shutdown()
             // Shutdown chips
             foreach (var chip in Chips) chip.Value.Shutdown();
 
-            //            // Remove chips
-            //            chips.Clear();
-            //            
-            //            // Removed references to services
-            //            _services.Clear();
         }
 
         /// <summary>

diff --git a/SDK/Runner/DesktopRunner.cs b/SDK/Runner/DesktopRunner.cs
@@ -25,7 +25,6 @@
 using System.Text;
 using Microsoft.Xna.Framework;
 using MoonSharp.Interpreter;
-using MoonSharp.Interpreter.Loaders;
 using PixelVision8.Engine;
 using PixelVision8.Engine.Chips;
 using PixelVision8.Runner.Data;

diff --git a/SDK/Runner/GameRunner.cs b/SDK/Runner/GameRunner.cs
@@ -549,7 +549,6 @@ protected void ParseFiles(Dictionary<string, string> files, SaveFlags? flags = n
             if (!flags.HasValue)
             {
                 flags = SaveFlags.System;
-                flags |= SaveFlags.Code;
                 flags |= SaveFlags.Colors;
                 flags |= SaveFlags.ColorMap;
                 flags |= SaveFlags.Sprites;