Decoupling core PixelVision8 Player and Runner logic from MonoGame. C…

…reated new Point and Rectangle classes as well as adding Clamp to the Utilities class.
PixelVision8 · Mar 17, 2021 · f701352 · f701352
1 parent df2f256
commit f701352
Show file tree

Hide file tree

Showing 88 changed files with 393 additions and 272 deletions.
diff --git a/Projects/PixelVision8/PixelVision8.CoreDesktop.csproj b/Projects/PixelVision8/PixelVision8.CoreDesktop.csproj
@@ -48,8 +48,11 @@
     <Compile Include="..\..\SDK\Player\Chips\Game\GameChip.Log.cs">
       <Link>SDK\Player\Chips\Game\GameChip.Log.cs</Link>
     </Compile>
-    <Compile Include="..\..\SDK\Player\Utils\Utilities.Math.cs">
-      <Link>SDK\Player\Utils\Utilities.Math.cs</Link>
+    <Compile Include="..\..\SDK\Player\Data\Point.cs">
+      <Link>SDK\Player\Data\Point.cs</Link>
+    </Compile>
+    <Compile Include="..\..\SDK\Player\Data\Rectangle.cs">
+      <Link>SDK\Player\Data\Rectangle.cs</Link>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="..\..\SDK\Editor\Audio\SfxrMusicGeneratorChip.cs">

diff --git a/Projects/PixelVision8Lite/PixelVision8Lite.CoreDesktop.csproj b/Projects/PixelVision8Lite/PixelVision8Lite.CoreDesktop.csproj
@@ -142,6 +142,12 @@
 
   <!-- Parser -->
   <ItemGroup>
+    <Compile Include="..\..\SDK\Player\Data\Point.cs">
+      <Link>SDK\Player\Data\Point.cs</Link>
+    </Compile>
+    <Compile Include="..\..\SDK\Player\Data\Rectangle.cs">
+      <Link>SDK\Player\Data\Rectangle.cs</Link>
+    </Compile>
     <Compile Include="..\..\SDK\Runner\Data\DisplayTarget.MonoGame.cs">
       <Link>SDK\Runner\Data\DisplayTarget.MonoGame.cs</Link>
     </Compile>
@@ -219,9 +225,6 @@
     <Compile Include="../../SDK/Player/Chips/Input/ControllerChip.cs">
       <Link>SDK/Player/Chips/Input/ControllerChip.cs</Link>
     </Compile>
-    <Compile Include="..\..\SDK\Player\Chips\Input\InputMap.cs">
-      <Link>SDK/Player/Chips/Input/InputMap.cs</Link>
-    </Compile>
     <Compile Include="..\..\SDK\Player\Chips\Input\KeyboardInputChip.cs">
       <Link>SDK/Player/Chips/Input/KeyboardInputChip.cs</Link>
     </Compile>

diff --git a/SDK/Editor/Audio/SfxrMusicGeneratorChip.cs b/SDK/Editor/Audio/SfxrMusicGeneratorChip.cs
@@ -18,12 +18,11 @@
 // Shawn Rakowski - @shwany
 //
 
-using Microsoft.Xna.Framework;
 using PixelVision8.Player;
 using System;
 using System.Collections.Generic;
 
-namespace PixelVision8.Runner.Chips
+namespace PixelVision8.Editor
 {
     public enum InstrumentType
     {

diff --git a/SDK/Editor/Editors/GameEditor.cs b/SDK/Editor/Editors/GameEditor.cs
@@ -22,7 +22,6 @@
 using Microsoft.Xna.Framework.Input;
 using PixelVision8.Player;
 using PixelVision8.Player.Audio;
-using PixelVision8.Runner.Chips;
 using PixelVision8.Runner.Exporters;
 using PixelVision8.Runner;
 using PixelVision8.Runner.Workspace;
@@ -31,8 +30,9 @@
 using System.IO;
 using System.Linq;
 using Buttons = PixelVision8.Player.Buttons;
+using Point = PixelVision8.Player.Point;
 
-namespace PixelVision8.Runner.Editors
+namespace PixelVision8.Editor
 {
     /// <summary>
     ///     This class allows you to edit the current sandbox game.
@@ -1459,13 +1459,13 @@ public void StopSound(int channel = 0)
             _gameChip.StopSound(channel);
         }
 
-        public void DrawSpriteBlock(int id, int x, int y, int width = 1, int height = 1, bool flipH = false,
-            bool flipV = false,
-            DrawMode drawMode = DrawMode.Sprite, int colorOffset = 0, bool onScreen = true, bool useScrollPos = true,
-            Rectangle? bounds = null)
-        {
-            throw new NotImplementedException();
-        }
+        // public void DrawSpriteBlock(int id, int x, int y, int width = 1, int height = 1, bool flipH = false,
+        //     bool flipV = false,
+        //     DrawMode drawMode = DrawMode.Sprite, int colorOffset = 0, bool onScreen = true, bool useScrollPos = true,
+        //     Rectangle? bounds = null)
+        // {
+        //     throw new NotImplementedException();
+        // }
 
         /// <summary>
         ///     Get or change the TotalDisks number of sounds

diff --git a/SDK/Editor/Exporters/BackgroundScriptRunner.cs b/SDK/Editor/Exporters/BackgroundScriptRunner.cs
@@ -27,7 +27,7 @@
 using System.Text;
 using PixelVision8.Player;
 
-namespace PixelVision8
+namespace PixelVision8.Editor
 {
     class BackgroundScriptRunner : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/ColorPaletteExporter.cs b/SDK/Editor/Exporters/ColorPaletteExporter.cs
@@ -22,8 +22,10 @@
 using PixelVision8.Player;
 using System;
 using System.Collections.Generic;
+using PixelVision8.Runner;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class ColorPaletteExporter : IExporter
     {

diff --git a/SDK/Editor/Exporters/DiskExporter.cs b/SDK/Editor/Exporters/DiskExporter.cs
@@ -21,8 +21,9 @@
 using PixelVision8.Runner;
 using PixelVision8.Runner.Workspace;
 using System.Collections.Generic;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class DiskExporter : ZipExporter
     {

diff --git a/SDK/Editor/Exporters/FontExporter.cs b/SDK/Editor/Exporters/FontExporter.cs
@@ -19,8 +19,9 @@
 //
 
 using PixelVision8.Player;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class FontExporter : SpriteExporter
     {

diff --git a/SDK/Editor/Exporters/GifExporter.cs b/SDK/Editor/Exporters/GifExporter.cs
@@ -20,15 +20,15 @@
 
 using Microsoft.Xna.Framework;
 using PixelVision8.Runner.Exporters;
-using PixelVision8.Runner;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using PixelVision8.Player;
+using PixelVision8.Runner;
 using PixelVision8.Runner.Gif;
 
-namespace PixelVision8.Runner
+namespace PixelVision8.Editor
 {
     public class GifExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/IImageExporter.cs b/SDK/Editor/Exporters/IImageExporter.cs
@@ -21,7 +21,7 @@
 using Microsoft.Xna.Framework;
 using System.IO;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public interface IImageExporter
     {

diff --git a/SDK/Editor/Exporters/ImageExporter.cs b/SDK/Editor/Exporters/ImageExporter.cs
@@ -20,8 +20,9 @@
 
 using Microsoft.Xna.Framework;
 using System.IO;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class ImageExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/MetaDataExporter.cs b/SDK/Editor/Exporters/MetaDataExporter.cs
@@ -19,10 +19,11 @@
 //
 
 using PixelVision8.Player;
-using PixelVision8.Runner;
 using System.Text;
+using PixelVision8.Runner;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class MetadataExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/MetaSpriteExporter.cs b/SDK/Editor/Exporters/MetaSpriteExporter.cs
@@ -21,8 +21,9 @@
 using PixelVision8.Player;
 using PixelVision8.Runner;
 using System.Text;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class MetaSpriteExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/MusicExporter.cs b/SDK/Editor/Exporters/MusicExporter.cs
@@ -21,8 +21,9 @@
 using PixelVision8.Player;
 using PixelVision8.Runner;
 using System.Text;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class MusicExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/PNGWriter.cs b/SDK/Editor/Exporters/PNGWriter.cs
@@ -22,9 +22,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using PixelVision8.Runner;
 using PixelVisionRunner.Utils;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class PNGWriter : IImageExporter
     {

diff --git a/SDK/Editor/Exporters/PixelDataExporter.cs b/SDK/Editor/Exporters/PixelDataExporter.cs
@@ -19,9 +19,9 @@
 //
 
 using Microsoft.Xna.Framework;
-using PixelVision8.Player;
+using PixelVision8.Runner;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class PixelDataExporter : ImageExporter
     {

diff --git a/SDK/Editor/Exporters/SfxrSoundExporter.cs b/SDK/Editor/Exporters/SfxrSoundExporter.cs
@@ -21,8 +21,9 @@
 using PixelVision8.Player;
 using PixelVision8.Runner;
 using System.Text;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class SfxrSoundExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/SongExporter.cs b/SDK/Editor/Exporters/SongExporter.cs
@@ -20,8 +20,9 @@
 
 using PixelVision8.Player.Audio;
 using PixelVision8.Player;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class SongExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/SoundExporter.cs b/SDK/Editor/Exporters/SoundExporter.cs
@@ -21,8 +21,9 @@
 using PixelVision8.Player;
 using PixelVision8.Runner;
 using System.Text;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class SoundExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/SpriteBuilderExporter.cs b/SDK/Editor/Exporters/SpriteBuilderExporter.cs
@@ -24,8 +24,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     /// <summary>
     ///     Leverage the built in sprite parser to do the cutting up and indexing work for us

diff --git a/SDK/Editor/Exporters/SpriteExporter.cs b/SDK/Editor/Exporters/SpriteExporter.cs
@@ -21,8 +21,10 @@
 using Microsoft.Xna.Framework;
 using PixelVision8.Player;
 using System.Collections.Generic;
+using PixelVision8.Runner;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class SpriteExporter : IExporter
     {

diff --git a/SDK/Editor/Exporters/SystemExporter.cs b/SDK/Editor/Exporters/SystemExporter.cs
@@ -21,8 +21,9 @@
 using PixelVision8.Player;
 using PixelVision8.Runner;
 using System.Text;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class SystemExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/TilemapJsonExporter.cs b/SDK/Editor/Exporters/TilemapJsonExporter.cs
@@ -23,8 +23,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     internal class SpriteVector
     {

diff --git a/SDK/Editor/Exporters/ZipDiskExporter.cs b/SDK/Editor/Exporters/ZipDiskExporter.cs
@@ -18,14 +18,15 @@
 // Shawn Rakowski - @shwany
 //
 
-using PixelVision8.Runner;
 using PixelVision8.Runner.Workspace;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using PixelVision8.Runner;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class ZipDiskExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Exporters/ZipExporter.cs b/SDK/Editor/Exporters/ZipExporter.cs
@@ -28,8 +28,9 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using PixelVision8.Runner.Exporters;
 
-namespace PixelVision8.Runner.Exporters
+namespace PixelVision8.Editor
 {
     public class ZipExporter : AbstractExporter
     {

diff --git a/SDK/Editor/Services/BaseExportService.cs b/SDK/Editor/Services/BaseExportService.cs
@@ -24,8 +24,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Threading;
+using PixelVision8.Runner;
 
-namespace PixelVision8.Runner
+namespace PixelVision8.Editor
 {
     public abstract class BaseExportService : AbstractService
     {

diff --git a/SDK/Editor/Services/GameDataExportService.cs b/SDK/Editor/Services/GameDataExportService.cs
@@ -22,8 +22,9 @@
 using PixelVision8.Runner.Exporters;
 using PixelVision8.Runner;
 using System.Collections.Generic;
+using PixelVision8.Editor;
 
-namespace PixelVision8.Runner
+namespace PixelVision8.Editor
 {
     public class GameDataExportService : BaseExportService
     {

diff --git a/SDK/Editor/Services/LuaPlatformAccessorService.cs b/SDK/Editor/Services/LuaPlatformAccessorService.cs
@@ -7,7 +7,7 @@
 using System.IO;
 using System.Text;
 
-namespace PixelVision8Runner.Runner.Services
+namespace PixelVision8.Editor
 {
     public class LuaPlatformAccessorService : AbstractService, IPlatformAccessor
     {

diff --git a/SDK/Editor/Services/ScreenshotService.cs b/SDK/Editor/Services/ScreenshotService.cs
@@ -20,11 +20,11 @@
 
 using Microsoft.Xna.Framework;
 using PixelVision8.Player;
-using PixelVision8.Runner.Exporters;
 using PixelVision8.Runner.Workspace;
 using System.Collections.Generic;
+using PixelVision8.Runner;
 
-namespace PixelVision8.Runner
+namespace PixelVision8.Editor
 {
     public class ScreenshotService : AbstractService
     {

diff --git a/SDK/Editor/Services/WorkspaceServicePlus.cs b/SDK/Editor/Services/WorkspaceServicePlus.cs
@@ -27,7 +27,7 @@
 using System.IO;
 using System.Linq;
 
-namespace PixelVision8.Runner
+namespace PixelVision8.Editor
 {
     public class WorkspaceServicePlus : WorkspaceService
     {