v7 develop branch merge

ChangeLog.md

@@ -1,4 +1,26 @@
-## 06/11/2018
+## 08/29/2018 V7.0.0
+
+- Draw(SpriteBatch batch, Point position, Point size, Font font) has been removed.
+- Cell/CellState have a Decorators list which are used to add extra glyph draws to individual cells.
+- CellDecorator class added that has a color, glyph, and mirror setting.
+- SadConsole.Serialization uses Newtonsoft.Json instead of the default .NET classes.
+- SadConsole.Serialization supports GZIP compression now.
+- Settings.SerializationIsCompressed can be set to true to set all internal save/load to use compression.
+- New SurfaceBase class which all Surface's inherit from.
+- SurfaceBase has an IRenderer on it directly now.
+- SurfaceEditor has been removed and is now implemented on SurfaceBase directly.
+- Console no longer combines Renderer and TextSurface for drawing.
+- Control themes completely rewritten. Themes control all drawing for a control now.
+- Windows/ControlsConsole use a theme for drawing.
+- InputBox renamed TextBox.
+- Removed GameHelpers namespace. Types moved to root namespace.
+- GameObject renamed to Entity.
+- Surface.RenderArea changed to Surface.ViewPort
+- Readded Zone and HotSpot types.
+- Removed random level generation.
+- Added Entities.EntityManager which helps control entity visibility and offsets based on a parent console. Also handles zones/hotspots.
+
+## 06/11/2018
 
 - Fix a stack overflow problem in the window object introduced by the previous mouse bug fix.
 - Cell states can be stored and restored with variables now. Each cell still has a backing cellstate that can be used.

Fonts/IBM_ext.font

@@ -0,0 +1 @@
+{"FilePath":"IBM8x16_NoPadding_extended.png","GlyphHeight":16,"GlyphPadding":0,"GlyphWidth":8,"Name":"IBM-extended","SolidGlyphIndex":219}

SadConsole - Desktop.sln

@@ -0,0 +1,49 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2042
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00 Misc", "00 Misc", "{D011790C-9E77-4E56-AA1F-8683AA1B89FD}"
+	ProjectSection(SolutionItems) = preProject
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		ChangeLog.md = ChangeLog.md
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SadConsole.Shared", "src\SadConsole.Shared\SadConsole.Shared.shproj", "{111F8273-2EAD-47D3-88EC-CB0CD6122BE8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SadConsole", "src\SadConsole\SadConsole.csproj", "{F44A9E76-B19D-4219-AFAE-561089354280}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DemoProject", "src\DemoProject\SharedCode\DemoProject.shproj", "{B41A356C-4BA6-40CC-AC03-0E5D46B0B981}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoProject.OpenGL", "src\DemoProject\DesktopGL\DemoProject.OpenGL.csproj", "{D6129AE5-B519-4368-B080-805A73405EDA}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\SadConsole.Shared\SadConsole.Shared.projitems*{111f8273-2ead-47d3-88ec-cb0cd6122be8}*SharedItemsImports = 13
+		src\DemoProject\SharedCode\DemoProject.projitems*{b41a356c-4ba6-40cc-ac03-0e5d46b0b981}*SharedItemsImports = 13
+		src\DemoProject\SharedCode\DemoProject.projitems*{d6129ae5-b519-4368-b080-805a73405eda}*SharedItemsImports = 4
+		src\SadConsole.Shared\SadConsole.Shared.projitems*{f44a9e76-b19d-4219-afae-561089354280}*SharedItemsImports = 4
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F44A9E76-B19D-4219-AFAE-561089354280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F44A9E76-B19D-4219-AFAE-561089354280}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F44A9E76-B19D-4219-AFAE-561089354280}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F44A9E76-B19D-4219-AFAE-561089354280}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6129AE5-B519-4368-B080-805A73405EDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6129AE5-B519-4368-B080-805A73405EDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6129AE5-B519-4368-B080-805A73405EDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6129AE5-B519-4368-B080-805A73405EDA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9ABB685B-DC99-44D7-A42A-CB3644BB5324}
+	EndGlobalSection
+EndGlobal

SadConsole.sln

@@ -65,6 +65,7 @@ Global
 		src\DemoProject\SharedCode\DemoProject.projitems*{680ff2f5-ae1c-4ae7-92f2-62bee74f7a43}*SharedItemsImports = 4
 		src\DemoProject\SharedCode\DemoProject.projitems*{74327ccc-4606-40b8-9587-60e55b1d6a80}*SharedItemsImports = 4
 		SampleGames\Snake\Snake.projitems*{7a8507b4-db2c-453e-a72b-2384175bdff1}*SharedItemsImports = 13
+		src\DemoProject\SharedCode\DemoProject.projitems*{7b1f1dbf-f16c-4402-9cb0-6e035ba76c6d}*SharedItemsImports = 4
 		SampleGames\Castle\Castle.projitems*{99eb89b5-bab6-47cb-899d-55653fc2b8dc}*SharedItemsImports = 4
 		src\DemoProject\SharedCode\DemoProject.projitems*{b41a356c-4ba6-40cc-ac03-0e5d46b0b981}*SharedItemsImports = 13
 		SampleGames\Castle\Castle.projitems*{bd5d2b21-2cd6-448d-acd7-5b90da247250}*SharedItemsImports = 13

nuget/SadConsole-debug.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>SadConsole</id>
-    <version>6.4.11-pre1</version>
+    <version>7.0.0-pre1</version>
     <title>SadConsole for MonoGame</title>
     <authors>SadLogic</authors>
     <owners>Thraka</owners>
@@ -11,8 +11,26 @@
     <iconUrl>https://raw.githubusercontent.com/Thraka/SadConsole/gh-pages/images/oD8yyro5.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A MonoGame library that emulates old-school console and command prompt style graphics.</description>
-    <releaseNotes>
-      - Fixed bug in mouse processing (thanks VGA256)
+    <releaseNotes>[BREAKING CHANGES]
+- New SurfaceBase class which all Surface's inherit from.
+- SurfaceBase has an IRenderer on it directly now.
+- SurfaceEditor has been removed and is now implemented on SurfaceBase directly.
+- Console no longer combines Renderer and TextSurface for drawing.
+- Draw(SpriteBatch batch, Point position, Point size, Font font) has been removed.
+- Cell/CellState have a Decorators list which are used to add extra glyph draws to individual cells.
+- CellDecorator class added that has a color, glyph, and mirror setting.
+- SadConsole.Serialization uses Newtonsoft.Json instead of the default .NET classes.
+- SadConsole.Serialization supports GZIP compression now.
+- Settings.SerializationIsCompressed can be set to true to set all internal save/load to use compression.
+- Control themes completely rewritten. Themes control all drawing for a control now.
+- Windows/ControlsConsole use a theme for drawing.
+- InputBox renamed TextBox.
+- Removed GameHelpers namespace. Types moved to root namespace.
+- GameObject renamed to Entity.
+- Surface.RenderArea changed to Surface.ViewPort
+- Readded Zone and HotSpot types.
+- Removed random level generation.
+- Added Entities.EntityManager which helps control entity visibility and offsets based on a parent console. Also handles zones/hotspots.
     </releaseNotes>
     <copyright>Copyright 2018 Steve De George JR</copyright>
     <tags>monogame roguelike cli xna game development console ansi ascii</tags>

nuget/SadConsole.Starter.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>SadConsole.Starter</id>
-    <version>2.0.1</version>
+    <version>2.0.3</version>
     <title>Starter kit for SadConsole. Use with a new project.</title>
     <authors>SadLogic</authors>
     <owners>Thraka</owners>
@@ -11,11 +11,11 @@
     <iconUrl>https://raw.githubusercontent.com/Thraka/SadConsole/gh-pages/images/oD8yyro5.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Adds an example startup file and fonts for a SadConsole project.</description>
-    <releaseNotes>Added in the Dispose call for the example program.cs</releaseNotes>
+    <releaseNotes>Updated to SadConsole 7.0.0; Added the SadConsole extended font.</releaseNotes>
     <copyright>Copyright 2018 Steve De George JR</copyright>
     <tags>monogame roguelike cli xna game development console ansi ascii</tags>
     <dependencies>
-      <dependency id="SadConsole" version="6.1.3" />
+      <dependency id="SadConsole" version="7.0.0" />
     </dependencies>
   </metadata>
   <files>

nuget/SadConsole.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>SadConsole</id>
-    <version>6.5.0</version>
+    <version>7.0.0</version>
     <title>SadConsole for MonoGame</title>
     <authors>SadLogic</authors>
     <owners>Thraka</owners>
@@ -11,54 +11,32 @@
     <iconUrl>https://raw.githubusercontent.com/Thraka/SadConsole/gh-pages/images/oD8yyro5.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A MonoGame library that emulates old-school console and command prompt style graphics. Use the SadConsole.Starter package for new projects.</description>
-    <releaseNotes>
-## 6.5.0
-- Fix a stack overflow problem in the window object introduced by the previous mouse bug fix.
-- Cell states can be stored and restored with variables now. Each cell still has a backing cellstate that can be used.
-- NoDrawSurface.FromSurface is now static. (as it should have been)
-## 6.4.11
-- Fixed bug in mouse processing (thanks VGA256)
-## 6.4.10
-- Fixed WindowResized event to actually be event!
-## 6.4.9
-- Added WindowResized event to the Game class.
-- Added some new color extension methods (clear channel, alpha only).
-## 6.4.8
-- Added Settings.WindowMinimumSize.
-## 6.4.7
-- Fixed keyboard problem with selection button.
-- Font class now has a link back to the FontMaster instance.
-- Added SadConsole.Settings.GraphicsProfile for monogame hidef vs reach.
-- Added a Mouse.Clear to clear state (like keyboard has)
-- Game has a OnDestroy callback now for when the game starts to shut down.
-- VirtualCursor bugs fixed. Also supports print effects again.
-- DrawString instruction uses a VirtualCursor all the time (.Cursor property) to fix issues with printing. (thanks vga256)
-- VirtualCursor uses the solid square character as default now instead of underscore.
-- FontMaster caches Font objects created with GetFont. The same instance is passed around now instead of a new one.
-- Fade effect has UseCellDestinationReverse to reverse the logic of the of using the back/fore cell color.
-## 6.4.6
-- Fixed logic for TabStop with ControlsConsole. It was stopping a focused control from being tabbed off of, not stopping a control from being tabbed to.
-- Keyboard input was reversing '[' with '{' and ']' with '}'
-- Controls now refresh when you change the theme with Control.Theme = variable.
-## 6.4.5
-- Added SadConsole.GameHelpers.Directions class and helpers.
-- SurfaceEditor now supports basic shape functions. Easier to draw shapes than previous model. (Line only supported for now, more to come)
-- Lines can be auto connected through static SurfaceEditor.ConnectLines method.
-- Promoted a bunch of private members for the Window class to protected.
-- Window title row can be positioned by the class now. Use the protected titleLocationY variable.
-- ListBox.HideBorder instantly redraws instead of waiting for a `IsDirty` flag.
-## 6.4.4
-- Added new Palette and Timer classes.
-- Added extension method to ColorGradient that returns a Color[] based on the stops.
-- Fixed a bug in InputBox that happened when you clicked twice on the control. Thanks arxae and naknode!
-- Fixed effect manager remove methods.
-- Fixed mouse processing other consoles after it was found over the top-most
-- Created a LayeredSurface.Load single param overload to block accidentally calling BasicSurface.Load
-- MouseHandler for a Console has changed. If it assigned, the normal mouse processing logic will no longer run.
-- Fixed rendering problem with consoles created after initialization. (thanks kingvitamin103)
+    <releaseNotes>[BREAKING CHANGES]
+- New SurfaceBase class which all Surface's inherit from.
+- SurfaceBase has an IRenderer on it directly now.
+- SurfaceEditor has been removed and is now implemented on SurfaceBase directly.
+- Console no longer combines Renderer and TextSurface for drawing.
+- Draw(SpriteBatch batch, Point position, Point size, Font font) has been removed.
+- Cell/CellState have a Decorators list which are used to add extra glyph draws to individual cells.
+- CellDecorator class added that has a color, glyph, and mirror setting.
+- SadConsole.Serialization uses Newtonsoft.Json instead of the default .NET classes.
+- SadConsole.Serialization supports GZIP compression now.
+- Settings.SerializationIsCompressed can be set to true to set all internal save/load to use compression.
+- Control themes completely rewritten. Themes control all drawing for a control now.
+- Windows/ControlsConsole use a theme for drawing.
+- InputBox renamed TextBox.
+- Removed GameHelpers namespace. Types moved to root namespace.
+- GameObject renamed to Entity.
+- Surface.RenderArea changed to Surface.ViewPort
+- Readded Zone and HotSpot types.
+- Removed random level generation.
+- Added Entities.EntityManager which helps control entity visibility and offsets based on a parent console. Also handles zones/hotspots.
     </releaseNotes>
     <copyright>Copyright 2018 Steve De George JR</copyright>
     <tags>monogame roguelike cli xna game development console ansi ascii</tags>
+    <dependencies>
+      <dependency id="Newtonsoft.Json" version="11.0.2" />
+    </dependencies>
   </metadata>
   <files>
 

nuget/SadConsoleFNA.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>SadConsole.FNA</id>
-    <version>6.5.0</version>
+    <version>7.0.1</version>
     <title>SadConsole for FNA</title>
     <authors>SadLogic</authors>
     <owners>Thraka</owners>
@@ -11,54 +11,32 @@
     <iconUrl>https://raw.githubusercontent.com/Thraka/SadConsole/gh-pages/images/oD8yyro5.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>An FNA library that emulates old-school console and command prompt style graphics. Use the SadConsole.Starter package for new projects.</description>
-    <releaseNotes>
-## 6.5.0
-- Fix a stack overflow problem in the window object introduced by the previous mouse bug fix.
-- Cell states can be stored and restored with variables now. Each cell still has a backing cellstate that can be used.
-- NoDrawSurface.FromSurface is now static. (as it should have been)
-## 6.4.11
-- Fixed bug in mouse processing (thanks VGA256)
-## 6.4.10
-- Fixed WindowResized event to actually be event!
-## 6.4.9
-- Added WindowResized event to the Game class.
-- Added some new color extension methods (clear channel, alpha only).
-## 6.4.8
-- Added Settings.WindowMinimumSize.
-## 6.4.7
-- Fixed keyboard problem with selection button.
-- Font class now has a link back to the FontMaster instance.
-- Added SadConsole.Settings.GraphicsProfile for monogame hidef vs reach.
-- Added a Mouse.Clear to clear state (like keyboard has)
-- Game has a OnDestroy callback now for when the game starts to shut down.
-- VirtualCursor bugs fixed. Also supports print effects again.
-- DrawString instruction uses a VirtualCursor all the time (.Cursor property) to fix issues with printing. (thanks vga256)
-- VirtualCursor uses the solid square character as default now instead of underscore.
-- FontMaster caches Font objects created with GetFont. The same instance is passed around now instead of a new one.
-- Fade effect has UseCellDestinationReverse to reverse the logic of the of using the back/fore cell color.
-## 6.4.6
-- Fixed logic for TabStop with ControlsConsole. It was stopping a focused control from being tabbed off of, not stopping a control from being tabbed to.
-- Keyboard input was reversing '[' with '{' and ']' with '}'
-- Controls now refresh when you change the theme with Control.Theme = variable.
-## 6.4.5
-- Added SadConsole.GameHelpers.Directions class and helpers.
-- SurfaceEditor now supports basic shape functions. Easier to draw shapes than previous model. (Line only supported for now, more to come)
-- Lines can be auto connected through static SurfaceEditor.ConnectLines method.
-- Promoted a bunch of private members for the Window class to protected.
-- Window title row can be positioned by the class now. Use the protected titleLocationY variable.
-- ListBox.HideBorder instantly redraws instead of waiting for a `IsDirty` flag.
-## 6.4.4
-- Added new Palette and Timer classes.
-- Added extension method to ColorGradient that returns a Color[] based on the stops.
-- Fixed a bug in InputBox that happened when you clicked twice on the control. Thanks arxae and naknode!
-- Fixed effect manager remove methods.
-- Fixed mouse processing other consoles after it was found over the top-most
-- Created a LayeredSurface.Load single param overload to block accidentally calling BasicSurface.Load
-- MouseHandler for a Console has changed. If it assigned, the normal mouse processing logic will no longer run.
-- Fixed rendering problem with consoles created after initialization. (thanks kingvitamin103)
+    <releaseNotes>[BREAKING CHANGES]
+- New SurfaceBase class which all Surface's inherit from.
+- SurfaceBase has an IRenderer on it directly now.
+- SurfaceEditor has been removed and is now implemented on SurfaceBase directly.
+- Console no longer combines Renderer and TextSurface for drawing.
+- Draw(SpriteBatch batch, Point position, Point size, Font font) has been removed.
+- Cell/CellState have a Decorators list which are used to add extra glyph draws to individual cells.
+- CellDecorator class added that has a color, glyph, and mirror setting.
+- SadConsole.Serialization uses Newtonsoft.Json instead of the default .NET classes.
+- SadConsole.Serialization supports GZIP compression now.
+- Settings.SerializationIsCompressed can be set to true to set all internal save/load to use compression.
+- Control themes completely rewritten. Themes control all drawing for a control now.
+- Windows/ControlsConsole use a theme for drawing.
+- InputBox renamed TextBox.
+- Removed GameHelpers namespace. Types moved to root namespace.
+- GameObject renamed to Entity.
+- Surface.RenderArea changed to Surface.ViewPort
+- Readded Zone and HotSpot types.
+- Removed random level generation.
+- Added Entities.EntityManager which helps control entity visibility and offsets based on a parent console. Also handles zones/hotspots.
     </releaseNotes>
     <copyright>Copyright 2018 Steve De George JR</copyright>
     <tags>monogame roguelike cli xna game development console ansi ascii</tags>
+    <dependencies>
+      <dependency id="Newtonsoft.Json" version="11.0.2" />
+    </dependencies>
   </metadata>
   <files>
 

nuget/content-files/IBM_ext.font

@@ -0,0 +1 @@
+{"FilePath":"IBM8x16_NoPadding_extended.png","GlyphHeight":16,"GlyphPadding":0,"GlyphWidth":8,"Name":"IBM-extended","SolidGlyphIndex":219}

nuget/push-starter.bat

@@ -0,0 +1 @@
+nuget push SadConsole.Starter.%1.nupkg -Source https://www.nuget.org/api/v2/package

src/DemoProject/DemoProject.FNA/DemoProject.FNA.csproj

@@ -30,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>StarterProject.Program</StartupObject>

src/DemoProject/DesktopDX/DemoProject.DirectX.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>StarterProject</RootNamespace>
     <AssemblyName>StarterProject.Windows</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
@@ -36,6 +36,7 @@
     <DefineConstants>TRACE;MONOGAME</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>StarterProject.Program</StartupObject>