Adding support for correctly displaying which code files will be load…

…ed to fix #445, #443, and #442.
PixelVision8 · Jan 14, 2021 · 2266c17 · 2266c17
1 parent c1f011a
commit 2266c17
Show file tree

Hide file tree

Showing 25 changed files with 141 additions and 80 deletions.
diff --git a/Content/PixelVisionOS/Tools/LoadTool/code.lua b/Content/PixelVisionOS/Tools/LoadTool/code.lua
@@ -293,7 +293,7 @@ function Draw()
 
     runnerType = ReadMetadata( "runnerType", "none" )
 
-    if(runnerType == "c#") then runnerType = "csharp" end
+    if(runnerType == "csharp") then runnerType = "csharp" end
 
     if(_G["runner"..runnerType] ~= nil) then
         DrawSprites( _G["runner"..runnerType].spriteIDs, 116, 72, _G["runner"..runnerType].width)

diff --git a/Disks/APIExamples/AddScript/info.json b/Disks/APIExamples/AddScript/info.json
@@ -8,7 +8,7 @@
     "soundChip":"PV8",
     "buildWin":"false",
     "buildExtras":"",
-    "runnerType":"",
+    "runnerType":"lua",
     "buildMac":"false",
     "buildLinux":"false",
     "paletteMode":"false",

diff --git a/Disks/APIExamples/Button/info.json b/Disks/APIExamples/Button/info.json
@@ -8,7 +8,7 @@
     "soundChip":"PV8",
     "buildWin":"false",
     "buildExtras":"",
-    "runnerType":"c#",
+    "runnerType":"lua",
     "buildMac":"false",
     "buildLinux":"false",
 

diff --git a/Disks/APIExamples/CalculateDistance/info.json b/Disks/APIExamples/CalculateDistance/info.json
@@ -8,7 +8,7 @@
     "soundChip":"PV8",
     "buildWin":"false",
     "buildExtras":"",
-    "runnerType":"c#",
+    "runnerType":"lua",
     "buildMac":"false",
     "buildLinux":"false",
 

diff --git a/Disks/APIExamples/CalculateIndex/info.json b/Disks/APIExamples/CalculateIndex/info.json
@@ -8,7 +8,7 @@
     "soundChip":"PV8",
     "buildWin":"false",
     "buildExtras":"",
-    "runnerType":"c#",
+    "runnerType":"lua",
     "buildMac":"false",
     "buildLinux":"false",
 

diff --git a/Disks/APIExamples/CalculatePosition/info.json b/Disks/APIExamples/CalculatePosition/info.json
@@ -8,7 +8,7 @@
     "soundChip":"PV8",
     "buildWin":"false",
     "buildExtras":"",
-    "runnerType":"c#",
+    "runnerType":"lua",
     "buildMac":"false",
     "buildLinux":"false",
 

diff --git a/Disks/APIExamples/Clamp/info.json b/Disks/APIExamples/Clamp/info.json
@@ -8,7 +8,7 @@
     "soundChip":"PV8",
     "buildWin":"false",
     "buildExtras":"",
-    "runnerType":"c#",
+    "runnerType":"lua",
     "buildMac":"false",
     "buildLinux":"false",
     "includeLibs":"",

diff --git a/Disks/APIExamples/Clear/info.json b/Disks/APIExamples/Clear/info.json
@@ -8,7 +8,7 @@
     "soundChip":"PV8",
     "buildWin":"false",
     "buildExtras":"",
-    "runnerType":"c#",
+    "runnerType":"lua",
     "buildMac":"false",
     "buildLinux":"false",
 

diff --git a/Disks/APIExamples/Color/info.json b/Disks/APIExamples/Color/info.json
@@ -8,7 +8,7 @@
     "soundChip":"PV8",
     "buildWin":"false",
     "buildExtras":"",
-    "runnerType":"c#",
+    "runnerType":"lua",
     "buildMac":"false",
     "buildLinux":"false",
 

diff --git a/Disks/APIExamples/ColorsPerSprite/info.json b/Disks/APIExamples/ColorsPerSprite/info.json
@@ -9,7 +9,7 @@
     "paletteMode":"false",
     "buildWin":"false",
     "buildExtras":"",
-    "runnerType":"c#",
+    "runnerType":"lua",
     "buildMac":"false",
     "buildLinux":"false",
 

diff --git a/Disks/APIExamples/Display/info.json b/Disks/APIExamples/Display/info.json
@@ -6,5 +6,5 @@
 	"gpuChip": "PV8",
 	"cartChip": "PV8",
 	"soundChip": "PV8",
-
+	"runnerType":"lua"
 }
diff --git a/Disks/APIExamples/DrawPixels/info.json b/Disks/APIExamples/DrawPixels/info.json
@@ -7,5 +7,5 @@
     "cartChip":"PV8",
     "soundChip":"PV8",
     "paletteMode":"false",
-
+    "runnerType":"lua"
 }
diff --git a/Disks/APIExamples/DrawRect/info.json b/Disks/APIExamples/DrawRect/info.json
@@ -6,5 +6,5 @@
 	"gpuChip": "PV8",
 	"cartChip": "PV8",
 	"soundChip": "PV8",
-
+	"runnerType":"lua"
 }
diff --git a/Disks/APIExamples/DrawSprite/info.json b/Disks/APIExamples/DrawSprite/info.json
@@ -6,5 +6,5 @@
 	"gpuChip": "PV8",
 	"cartChip": "PV8",
 	"soundChip": "PV8",
-
+	"runnerType":"lua"
 }
diff --git a/Disks/APIExamples/DrawSpriteBlock/info.json b/Disks/APIExamples/DrawSpriteBlock/info.json
@@ -6,5 +6,5 @@
 	"gpuChip": "PV8",
 	"cartChip": "PV8",
 	"soundChip": "PV8",
-
+	"runnerType":"lua"
 }
diff --git a/Disks/APIExamples/DrawSprites/info.json b/Disks/APIExamples/DrawSprites/info.json
@@ -6,5 +6,5 @@
 	"gpuChip": "PV8",
 	"cartChip": "PV8",
 	"soundChip": "PV8",
-
+	"runnerType":"lua"
 }
diff --git a/Disks/APIExamples/DrawText/info.json b/Disks/APIExamples/DrawText/info.json
@@ -6,5 +6,5 @@
 	"gpuChip": "PV8",
 	"cartChip": "PV8",
 	"soundChip": "PV8",
-
+	"runnerType":"lua"
 }
diff --git a/Disks/PixelVisionOS/System/Tools/InfoTool/code-runner-panel.lua b/Disks/PixelVisionOS/System/Tools/InfoTool/code-runner-panel.lua
@@ -12,7 +12,7 @@ local runnerInfoPanelID = "RunnerInfoPanel"
 
 function InfoTool:CreateRunnerInfoPanel()
 
-    self.runnerTypes = {"lua", "c#"}
+    self.runnerTypes = {"lua", "csharp"}
 
     -- Get runner setting
 

diff --git a/Disks/PixelVisionOS/System/Tools/TextEditorTool/code-drop-down-menu.lua b/Disks/PixelVisionOS/System/Tools/TextEditorTool/code-drop-down-menu.lua
@@ -46,7 +46,7 @@ end
 function TextTool:OnRunGame()
 
 
-    local data = {runnerType = self.extension == ".lua" and "lua" or "c#"}
+    local data = {runnerType = self.extension == ".lua" and "lua" or "csharp"}
 
     print("runnerType", data["runnerType"], self.extension)
 

diff --git a/Disks/PixelVisionOS/System/Tools/WorkspaceTool/CodeTemplates/main-code.cs b/Disks/PixelVisionOS/System/Tools/WorkspaceTool/CodeTemplates/main-code.cs
@@ -20,7 +20,7 @@ public class CustomGameChip : GameChip
 	{
 		public override void Init()
 		{
-			BackgroundColor(12);
+
 			var message = "EMPTY C# GAME\n\n\nThis is an empty game template.\n\n\nVisit 'www.pixelvision8.com' to learn more about creating games from scratch.";
 
 			var wrap = WordWrap(message, (display.X / 8) - 2);

diff --git a/Disks/PixelVisionOS/System/Tools/WorkspaceTool/code-drop-down-menu.lua b/Disks/PixelVisionOS/System/Tools/WorkspaceTool/code-drop-down-menu.lua
@@ -178,10 +178,8 @@ end
 
 function WorkspaceTool:CreateNewCodeFile(defaultPath)
 
-
     local templatePath = NewWorkspacePath(ReadMetadata("RootPath", "/")).AppendDirectory(ReadMetadata("GameName", "untitled")).AppendDirectory("CodeTemplates")
 
-
     defaultPath = defaultPath or self.currentPath
 
     local fileName = "code"
@@ -199,26 +197,15 @@ function WorkspaceTool:CreateNewCodeFile(defaultPath)
             ext = data["runnerType"] ~= "lua" and  ".cs" or ".lua"
         end
 
-    -- else
+    elseif(PathExists(defaultPath.AppendFile("code.cs"))) then
 
-    --     -- Create a lua file by default
-    --     fileName = fileName .. ".lua"
+        ext = ".cs"
 
     end
 
     local empty = PathExists(defaultPath.AppendFile(fileName .. ext))
 
-    -- -- Test to see if a the code file already exists
-    -- fileName = (PathExists(defaultPath.AppendFile(fileName)) and "empty-" or "main-").. fileName
-
-
-
-
-    -- TODO read the info file
-    -- TODO if no info file exists, copy over the lua file
-    -- TODO if info file exists and is C# copy over the C# file
-
-    print("Create new code file at", defaultPath, fileName)
+    print("Create new code file at", defaultPath, fileName, ext)
 
     if(empty ~= true) then
 
@@ -241,41 +228,42 @@ function WorkspaceTool:CreateNewCodeFile(defaultPath)
         pixelVisionOS:OpenModal(newFileModal,
             function()
 
-                local newPath = UniqueFilePath(defaultPath.AppendFile(newFileModal.inputField.text .. ext))
-
-                CopyTo(templatePath.AppendFile("empty-" .. fileName .. ext), newPath)
-                -- local filePath = UniqueFilePath(defaultPath.AppendFile(newFileModal.inputField.text .. "." .. ext))
+                -- Check to see if ok was pressed on the model
+                if(newFileModal.selectionValue == true) then
 
-                -- print("Create and rename", filePath)
+                    local newPath = UniqueFilePath(defaultPath.AppendFile(newFileModal.inputField.text .. ext))
+
+                    local templatePath = templatePath.AppendFile("empty-" .. fileName .. ext)
 
-                self:RefreshWindow(true)
+                    -- TODO if this is a C# file, we need to rename the class
+                    if(ext == ".cs") then
 
-                self:SelectFile(newPath)
+                        local codeTemplate = ReadTextFile(templatePath)
 
-                -- local tmpPath = defaultPath.AppendFile(filePath.EntityName)
+                        local newClassName = newPath.EntityNameWithoutExtension:sub(1,1):upper() .. newPath.EntityNameWithoutExtension:gsub('%W',' '):gsub("%W%l", string.upper):sub(2):gsub('%W','') .. "Class"
 
-                -- Check for lua files first since we always want to make them empty
-                -- if(ext == "lua") then
+                        codeTemplate = codeTemplate:gsub( "CustomClass", newClassName)
 
-                    -- TODO need to see if a code.lua file exists first and decide to copy template over or make an empty file
 
-                    -- if(PathExists(self.currentPath.AppendFile("code.lua"))) then
+                        print("newClassName", newClassName)
+
+                        SaveTextToFile(newPath, codeTemplate)
 
-                    --   SaveText(filePath, "-- Empty code file")
 
-                    -- else
+                    else
 
-                    --   CopyTo(tmpPath, filePath)
-
-                    -- end
+                        -- Just copy the Lua template as is
+                        CopyTo(templatePath, newPath)
 
-                -- elseif(ext == "cs") then
+                    end
 
-                    -- TODO need to see if a code.lua file exists first and decide to copy template over or make an empty file
+
+                    self:RefreshWindow(true)
+
+                    self:SelectFile(newPath)
 
-                    -- SaveText(filePath, "-- Empty code file")
+                end
 
-                -- end
             end
         )