Fixing copy and setting pixels.

PixelVision8 · Oct 28, 2020 · 4b78a17 · 4b78a17
1 parent 3fad259
commit 4b78a17
Show file tree

Hide file tree

Showing 27 changed files with 196 additions and 257 deletions.
diff --git a/Content/PixelVisionOS/Tools/BootTool/boot-text.lua b/Content/PixelVisionOS/Tools/BootTool/boot-text.lua
@@ -8,5 +8,5 @@ message = " " .. SystemName() ..
 "\n\n\n" ..
 "The " .. SystemName() .. " is built on top of the open source Pixel Vision SDK thanks to the following sponsors: " ..
 "Jan Rochat and Ethan Shaughnessy" ..
-"\n\n\n\n" ..
+"\n\n" ..
 "Learn more at pixelvision8.com"
diff --git a/Content/PixelVisionOS/Tools/BootTool/code.lua b/Content/PixelVisionOS/Tools/BootTool/code.lua
@@ -44,7 +44,7 @@ local nextScreenDelay = .3
 local nextScreenTime = 0
 local startDelay = .5
 local ready = false
-local bottomBorder = 224 + 8
+local bottomBorder = 232
 local safeMode = false
 local showPlugin = -1
 

diff --git a/Content/PixelVisionOS/Tools/BootTool/data.json b/Content/PixelVisionOS/Tools/BootTool/data.json
@@ -13,8 +13,8 @@
   },
   "DisplayChip":
   {
-    "width": 264,
-    "height": 248,
+    "width": 256,
+    "height": 240,
     "overscanX": 1,
     "overscanY": 1,
     "layers": 6

diff --git a/Content/PixelVisionOS/Tools/ErrorTool/data.json b/Content/PixelVisionOS/Tools/ErrorTool/data.json
@@ -10,8 +10,8 @@
   },
   "DisplayChip":
   {
-    "width": 264,
-    "height": 248,
+    "width": 256,
+    "height": 240,
     "overscanX": 1,
     "overscanY": 1,
     "layers": 6

diff --git a/Content/PixelVisionOS/Tools/LoadTool/data.json b/Content/PixelVisionOS/Tools/LoadTool/data.json
@@ -10,8 +10,8 @@
   },
   "DisplayChip":
   {
-    "width": 264,
-    "height": 248,
+    "width": 256,
+    "height": 240,
     "overscanX": 1,
     "overscanY": 1,
     "layers": 6

diff --git a/Disks/PixelVisionOS/System/Tools/ChipEditor/code-chip-templates.lua b/Disks/PixelVisionOS/System/Tools/ChipEditor/code-chip-templates.lua
@@ -13,14 +13,7 @@ gpuChips = {
         name = "displayHeightInputData",
         value = 248
       },
-      {
-        name = "overscanRightInputData",
-        value = 1
-      },
-      {
-        name = "overscanBottomInputData",
-        value = 1
-      },
+
       {
         name = "drawsInputData",
         value = 0
@@ -68,14 +61,6 @@ gpuChips = {
         name = "displayHeightInputData",
         value = 240
       },
-      {
-        name = "overscanRightInputData",
-        value = 1
-      },
-      {
-        name = "overscanBottomInputData",
-        value = 1
-      },
       {
         name = "drawsInputData",
         value = 64
@@ -169,14 +154,7 @@ gpuChips = {
         name = "displayHeightInputData",
         value = 192
       },
-      {
-        name = "overscanRightInputData",
-        value = 1
-      },
-      {
-        name = "overscanBottomInputData",
-        value = 1
-      },
+
       {
         name = "drawsInputData",
         value = 64
@@ -282,14 +260,7 @@ gpuChips = {
         name = "displayHeightInputData",
         value = 152
       },
-      {
-        name = "overscanRightInputData",
-        value = 1
-      },
-      {
-        name = "overscanBottomInputData",
-        value = 1
-      },
+
       {
         name = "drawsInputData",
         value = 40
@@ -370,14 +341,7 @@ gpuChips = {
         name = "displayHeightInputData",
         value = 136
       },
-      {
-        name = "overscanRightInputData",
-        value = 1
-      },
-      {
-        name = "overscanBottomInputData",
-        value = 1
-      },
+
       {
         name = "drawsInputData",
         value = 0
@@ -426,14 +390,7 @@ gpuChips = {
         name = "displayHeightInputData",
         value = 72
       },
-      {
-        name = "overscanRightInputData",
-        value = 1
-      },
-      {
-        name = "overscanBottomInputData",
-        value = 1
-      },
+
       {
         name = "drawsInputData",
         value = 0
@@ -467,14 +424,7 @@ gpuChips = {
         name = "displayHeightInputData",
         value = 208
       },
-      {
-        name = "overscanRightInputData",
-        value = 1
-      },
-      {
-        name = "overscanBottomInputData",
-        value = 1
-      },
+
       {
         name = "drawsInputData",
         value = 0

diff --git a/Disks/PixelVisionOS/System/Tools/ChipEditor/code.lua b/Disks/PixelVisionOS/System/Tools/ChipEditor/code.lua
@@ -314,42 +314,42 @@ function Init()
     table.insert(inputFields, displayHeightInputData)
 
 
-    local overscanSize = gameEditor:OverscanBorder()
-
-    overscanRightInputData = editorUI:CreateInputField({x = 96, y = 208, w = 8}, tostring(overscanSize.x), "Crops a column (8 px) from the right of the display.", "number")
-    overscanRightInputData.min = 0
-    overscanRightInputData.max = 4
-    overscanRightInputData.onAction = function(value)
-
-      local size = gameEditor:OverscanBorder()
-
-      gameEditor:OverscanBorder(tonumber(value), tonumber(overscanBottomInputData.text))
-
-      ChangeChipGraphic(1, "chipcustomgpu" )
-
-      InvalidateData()
-
-    end
-
-    table.insert(inputFields, overscanRightInputData)
-
-
-    overscanBottomInputData = editorUI:CreateInputField({x = 120, y = 208, w = 8}, tostring(overscanSize.y), "Crops a row (8 px) from the bottom of the display.", "number")
-    overscanBottomInputData.min = 0
-    overscanBottomInputData.max = 4
-    overscanBottomInputData.onAction = function(value)
-
-      local size = gameEditor:OverscanBorder()
-
-      gameEditor:OverscanBorder(tonumber(overscanRightInputData.text), tonumber(value))
-
-      ChangeChipGraphic(1, "chipcustomgpu" )
-
-      InvalidateData()
-
-    end
-
-    table.insert(inputFields, overscanBottomInputData)
+    --local overscanSize = gameEditor:OverscanBorder()
+    --
+    --overscanRightInputData = editorUI:CreateInputField({x = 96, y = 208, w = 8}, tostring(overscanSize.x), "Crops a column (8 px) from the right of the display.", "number")
+    --overscanRightInputData.min = 0
+    --overscanRightInputData.max = 4
+    --overscanRightInputData.onAction = function(value)
+    --
+    --  local size = gameEditor:OverscanBorder()
+    --
+    --  gameEditor:OverscanBorder(tonumber(value), tonumber(overscanBottomInputData.text))
+    --
+    --  ChangeChipGraphic(1, "chipcustomgpu" )
+    --
+    --  InvalidateData()
+    --
+    --end
+    --
+    --table.insert(inputFields, overscanRightInputData)
+    --
+    --
+    --overscanBottomInputData = editorUI:CreateInputField({x = 120, y = 208, w = 8}, tostring(overscanSize.y), "Crops a row (8 px) from the bottom of the display.", "number")
+    --overscanBottomInputData.min = 0
+    --overscanBottomInputData.max = 4
+    --overscanBottomInputData.onAction = function(value)
+    --
+    --  local size = gameEditor:OverscanBorder()
+    --
+    --  gameEditor:OverscanBorder(tonumber(overscanRightInputData.text), tonumber(value))
+    --
+    --  ChangeChipGraphic(1, "chipcustomgpu" )
+    --
+    --  InvalidateData()
+    --
+    --end
+    --
+    --table.insert(inputFields, overscanBottomInputData)
 
 
     drawsInputData = editorUI:CreateInputField({x = 144, y = 208, w = 24}, tostring(gameEditor:MaxSpriteCount()), "Caps the total spites on the screen. Zero removes the limit.", "number")
@@ -684,8 +684,8 @@ function OnSelectChip(value)
 
       editorUI:TextEditorInvalidateBuffer(displayWidthInputData)
       editorUI:TextEditorInvalidateBuffer(displayHeightInputData)
-      editorUI:TextEditorInvalidateBuffer(overscanRightInputData)
-      editorUI:TextEditorInvalidateBuffer(overscanBottomInputData)
+      --editorUI:TextEditorInvalidateBuffer(overscanRightInputData)
+      --editorUI:TextEditorInvalidateBuffer(overscanBottomInputData)
       editorUI:TextEditorInvalidateBuffer(drawsInputData)
 
       editorUI:TextEditorInvalidateBuffer(cpsInputData)
@@ -963,8 +963,8 @@ function Update(timeDelta)
         if(runnerName ~= DrawVersion) then
           editorUI:UpdateInputField(displayWidthInputData)
           editorUI:UpdateInputField(displayHeightInputData)
-          editorUI:UpdateInputField(overscanRightInputData)
-          editorUI:UpdateInputField(overscanBottomInputData)
+          --editorUI:UpdateInputField(overscanRightInputData)
+          --editorUI:UpdateInputField(overscanBottomInputData)
           editorUI:UpdateInputField(drawsInputData)
         else
           editorUI:UpdateInputField(spritePagesInputData)

diff --git a/Disks/PixelVisionOS/System/Tools/ChipEditor/data.json b/Disks/PixelVisionOS/System/Tools/ChipEditor/data.json
@@ -10,8 +10,8 @@
     },
     "DisplayChip":
     {
-        "width":264,
-        "height":248,
+        "width":256,
+        "height":240,
         "overscanX":1,
         "overscanY":1,
         "layers":6

diff --git a/Disks/PixelVisionOS/System/Tools/DrawTool/data.json b/Disks/PixelVisionOS/System/Tools/DrawTool/data.json
@@ -10,8 +10,8 @@
     },
     "DisplayChip":
     {
-        "width":264,
-        "height":248,
+        "width":256,
+        "height":240,
         "overscanX":1,
         "overscanY":1,
         "layers":6

diff --git a/Disks/PixelVisionOS/System/Tools/FontTool/data.json b/Disks/PixelVisionOS/System/Tools/FontTool/data.json
@@ -1 +1 @@
-{"ColorChip":{"maxColors":128,"backgroundColor":0,"maskColor":"#FF00FF","unique":false,"debug":false,},"DisplayChip":{"width":264,"height":248,"overscanX":1,"overscanY":1,"layers":6},"FontChip":{},"GameChip":{"lockSpecs":false,"maxSize":256,"saveSlots":8},"MusicChip":{"totalSongs":1,"notesPerTrack":127,"totalPatterns":8,"totalLoop":8},"SoundChip":{"totalChannels":4,"totalSounds":8,"channelTypes":[-1,-1,-1,-1]},"SpriteChip":{"maxSpriteCount":0,"unique":true,"spriteWidth":8,"spriteHeight":8,"pages":4,"cps":8},"TilemapChip":{"columns":36,"rows":32,"totalFlags":16,"autoImport":false,}}
+{"ColorChip":{"maxColors":128,"backgroundColor":0,"maskColor":"#FF00FF","unique":false,"debug":false,},"DisplayChip":{"width":256,"height":240,"overscanX":1,"overscanY":1,"layers":6},"FontChip":{},"GameChip":{"lockSpecs":false,"maxSize":256,"saveSlots":8},"MusicChip":{"totalSongs":1,"notesPerTrack":127,"totalPatterns":8,"totalLoop":8},"SoundChip":{"totalChannels":4,"totalSounds":8,"channelTypes":[-1,-1,-1,-1]},"SpriteChip":{"maxSpriteCount":0,"unique":true,"spriteWidth":8,"spriteHeight":8,"pages":4,"cps":8},"TilemapChip":{"columns":36,"rows":32,"totalFlags":16,"autoImport":false,}}
diff --git a/Disks/PixelVisionOS/System/Tools/ImagePreviewTool/data.json b/Disks/PixelVisionOS/System/Tools/ImagePreviewTool/data.json
@@ -1,6 +1,6 @@
 {
   "ColorChip": { "maxColors": 512, "backgroundColor": 0, "maskColor": "#FF00FF", "unique": false, "debug": true, },
-  "DisplayChip": { "width": 264, "height": 248, "overscanX": 1, "overscanY": 1, "layers": 6 },
+  "DisplayChip": { "width": 256, "height": 240, "overscanX": 1, "overscanY": 1, "layers": 6 },
   "FontChip": {},
   "GameChip": { "lockSpecs": false, "maxSize": 256, "saveSlots": 8 },
   "MusicChip": { "totalSongs": 16, "notesPerTrack": 127, "totalPatterns": 16, "totalLoop": 16 },

diff --git a/Disks/PixelVisionOS/System/Tools/InfoTool/data.json b/Disks/PixelVisionOS/System/Tools/InfoTool/data.json
@@ -1 +1 @@
-{"ColorChip":{"maxColors":128,"backgroundColor":5,"maskColor":"#FF00FF","unique":false,"debug":false,},"DisplayChip":{"width":264,"height":248,"overscanX":1,"overscanY":1,"layers":6},"FontChip":{},"GameChip":{"lockSpecs":false,"maxSize":512,"saveSlots":8},"MusicChip":{"totalSongs":16,"notesPerTrack":127,"totalPatterns":24,"totalLoop":24},"SoundChip":{"totalChannels":5,"totalSounds":32,"channelTypes":[-1,-1,-1,-1,-1]},"SpriteChip":{"maxSpriteCount":0,"unique":true,"spriteWidth":8,"spriteHeight":8,"pages":8,"cps":8},"TilemapChip":{"columns":36,"rows":32,"totalFlags":16,"autoImport":false,}}
+{"ColorChip":{"maxColors":128,"backgroundColor":5,"maskColor":"#FF00FF","unique":false,"debug":false,},"DisplayChip":{"width":256,"height":240,"overscanX":1,"overscanY":1,"layers":6},"FontChip":{},"GameChip":{"lockSpecs":false,"maxSize":512,"saveSlots":8},"MusicChip":{"totalSongs":16,"notesPerTrack":127,"totalPatterns":24,"totalLoop":24},"SoundChip":{"totalChannels":5,"totalSounds":32,"channelTypes":[-1,-1,-1,-1,-1]},"SpriteChip":{"maxSpriteCount":0,"unique":true,"spriteWidth":8,"spriteHeight":8,"pages":8,"cps":8},"TilemapChip":{"columns":36,"rows":32,"totalFlags":16,"autoImport":false,}}
diff --git a/Disks/PixelVisionOS/System/Tools/InstallerTool/data.json b/Disks/PixelVisionOS/System/Tools/InstallerTool/data.json
@@ -1,6 +1,6 @@
 {
   "ColorChip": { "maxColors": 128, "backgroundColor": 5, "maskColor": "#FF00FF", "unique": false, "debug": false, },
-  "DisplayChip": { "width": 264, "height": 248, "overscanX": 1, "overscanY": 1, "layers": 6 },
+  "DisplayChip": { "width": 256, "height": 240, "overscanX": 1, "overscanY": 1, "layers": 6 },
   "FontChip": {},
   "GameChip": { "lockSpecs": false, "maxSize": 512, "saveSlots": 8 },
   "MusicChip": { "totalSongs": 16, "notesPerTrack": 127, "totalPatterns": 24, "totalLoop": 24 },

diff --git a/Disks/PixelVisionOS/System/Tools/MusicTool/data.json b/Disks/PixelVisionOS/System/Tools/MusicTool/data.json
@@ -1,6 +1,6 @@
 {
   "ColorChip": { "maxColors": 256, "backgroundColor": 0, "maskColor": "#FF00FF", "unique": false, "debug": false, },
-  "DisplayChip": { "width": 264, "height": 248, "overscanX": 1, "overscanY": 1, "layers": 6 },
+  "DisplayChip": { "width": 256, "height": 240, "overscanX": 1, "overscanY": 1, "layers": 6 },
   "FontChip": {},
   "GameChip": { "lockSpecs": false, "maxSize": 512, "saveSlots": 32 },
   "MusicChip": { "totalSongs": 32, "notesPerTrack": 127, "totalPatterns": 24, "totalLoop": 24 },

diff --git a/Disks/PixelVisionOS/System/Tools/SFXTool/data.json b/Disks/PixelVisionOS/System/Tools/SFXTool/data.json
@@ -1,6 +1,6 @@
 {
   "ColorChip": { "maxColors": 192, "backgroundColor": 0, "maskColor": "#FF00FF", "unique": false, "debug": false, },
-  "DisplayChip": { "width": 264, "height": 248, "overscanX": 1, "overscanY": 1, "layers": 6 },
+  "DisplayChip": { "width": 256, "height": 240, "overscanX": 1, "overscanY": 1, "layers": 6 },
   "FontChip": {},
   "GameChip": { "lockSpecs": false, "maxSize": 357, "saveSlots": 8 },
   "MusicChip": { "totalSongs": 16, "notesPerTrack": 127, "totalPatterns": 8, "totalLoop": 8 },

diff --git a/Disks/PixelVisionOS/System/Tools/SettingsTool/data.json b/Disks/PixelVisionOS/System/Tools/SettingsTool/data.json
@@ -1,6 +1,6 @@
 {
   "ColorChip": { "maxColors": 128, "backgroundColor": 0, "maskColor": "#FF00FF", "unique": false, "debug": false, },
-  "DisplayChip": { "width": 264, "height": 248, "overscanX": 1, "overscanY": 1, "layers": 6 },
+  "DisplayChip": { "width": 256, "height": 240, "overscanX": 1, "overscanY": 1, "layers": 6 },
   "FontChip": {},
   "GameChip": { "lockSpecs": true, "maxSize": 512, "saveSlots": 8 },
   "MusicChip": { "totalSongs": 16, "notesPerTrack": 127, "totalPatterns": 24, "totalLoop": 24 },

diff --git a/Disks/PixelVisionOS/System/Tools/TextEditorTool/data.json b/Disks/PixelVisionOS/System/Tools/TextEditorTool/data.json
@@ -1,6 +1,6 @@
 {
   "ColorChip": { "maxColors": 256, "backgroundColor": 0, "maskColor": "#FF00FF", "unique": false, "debug": false, },
-  "DisplayChip": { "width": 264, "height": 248, "overscanX": 1, "overscanY": 1, "layers": 6 },
+  "DisplayChip": { "width": 256, "height": 240, "overscanX": 1, "overscanY": 1, "layers": 6 },
   "FontChip": {},
   "GameChip": { "lockSpecs": false, "maxSize": 256, "saveSlots": 8 },
   "MusicChip": { "totalSongs": 16, "notesPerTrack": 127, "totalPatterns": 16, "totalLoop": 16 },

diff --git a/Disks/PixelVisionOS/System/Tools/TilemapTool/data.json b/Disks/PixelVisionOS/System/Tools/TilemapTool/data.json
@@ -10,8 +10,8 @@
     },
     "DisplayChip":
     {
-        "width":264,
-        "height":248,
+        "width":256,
+        "height":240,
         "overscanX":1,
         "overscanY":1,
         "layers":6

diff --git a/Disks/PixelVisionOS/System/Tools/WorkspaceTool/data.json b/Disks/PixelVisionOS/System/Tools/WorkspaceTool/data.json
@@ -9,8 +9,8 @@
     },
     "DisplayChip":
     {
-        "width":264,
-        "height":248,
+        "width":256,
+        "height":240,
         "overscanX":1,
         "overscanY":1,
         "layers":6

diff --git a/SDK/Editor/Editors/GameEditor.cs b/SDK/Editor/Editors/GameEditor.cs
@@ -501,14 +501,14 @@ public Point DisplaySize(int? width = null, int? height = null)
         /// <param name="x"></param>
         /// <param name="y"></param>
         /// <returns></returns>
-        public Point OverscanBorder(int? x, int? y)
-        {
-            if (x.HasValue) displayChip.OverscanX = x.Value;
-
-            if (y.HasValue) displayChip.OverscanY = y.Value;
-
-            return new Point(displayChip.OverscanX, displayChip.OverscanY);
-        }
+        // public Point OverscanBorder(int? x, int? y)
+        // {
+        //     if (x.HasValue) displayChip.OverscanX = x.Value;
+        //
+        //     if (y.HasValue) displayChip.OverscanY = y.Value;
+        //
+        //     return new Point(displayChip.OverscanX, displayChip.OverscanY);
+        // }
 
 
         public void RedrawDisplay()