From 648644dca6679407e9d412d75b6e8b1c23e21245 Mon Sep 17 00:00:00 2001 From: Victor Chelaru Date: Fri, 9 Oct 2026 05:56:57 -0600 Subject: [PATCH] Bump Gum to 2026.5.8.1 in 2dShaders Matches the main 2D tutorial. Also had to go to MonoGame 3.8.4.1 since newer Gum won't load against 3.8.4. Port the Gum UI changes the shaders missed (AnimatedButton public, dropped extra Dock calls in OptionsSlider) and bump the last two Gum refs in 27-Conclusion (Android, WindowsDX). --- .../src/02-Hot-Reload-System/.config/dotnet-tools.json | 10 +++++----- .../DungeonSlime/DungeonSlime.csproj | 6 +++--- .../DungeonSlime/UI/AnimatedButton.cs | 2 +- .../DungeonSlime/UI/OptionsSlider.cs | 2 -- .../MonoGameLibrary/MonoGameLibrary.csproj | 2 +- .../03-The-Material-Class/.config/dotnet-tools.json | 10 +++++----- .../DungeonSlime/DungeonSlime.csproj | 6 +++--- .../DungeonSlime/UI/AnimatedButton.cs | 2 +- .../DungeonSlime/UI/OptionsSlider.cs | 2 -- .../MonoGameLibrary/MonoGameLibrary.csproj | 2 +- .../src/04-Debug-UI/.config/dotnet-tools.json | 10 +++++----- .../src/04-Debug-UI/DungeonSlime/DungeonSlime.csproj | 6 +++--- .../src/04-Debug-UI/DungeonSlime/UI/AnimatedButton.cs | 2 +- .../src/04-Debug-UI/DungeonSlime/UI/OptionsSlider.cs | 2 -- .../04-Debug-UI/MonoGameLibrary/MonoGameLibrary.csproj | 2 +- .../src/05-Transition-Effect/.config/dotnet-tools.json | 10 +++++----- .../DungeonSlime/DungeonSlime.csproj | 6 +++--- .../DungeonSlime/UI/AnimatedButton.cs | 2 +- .../DungeonSlime/UI/OptionsSlider.cs | 2 -- .../MonoGameLibrary/MonoGameLibrary.csproj | 2 +- .../src/06-Color-Swap-Effect/.config/dotnet-tools.json | 10 +++++----- .../DungeonSlime/DungeonSlime.csproj | 6 +++--- .../DungeonSlime/UI/AnimatedButton.cs | 2 +- .../DungeonSlime/UI/OptionsSlider.cs | 2 -- .../MonoGameLibrary/MonoGameLibrary.csproj | 2 +- .../07-Sprite-Vertex-Effect/.config/dotnet-tools.json | 10 +++++----- .../DungeonSlime/DungeonSlime.csproj | 6 +++--- .../DungeonSlime/UI/AnimatedButton.cs | 2 +- .../DungeonSlime/UI/OptionsSlider.cs | 2 -- .../MonoGameLibrary/MonoGameLibrary.csproj | 2 +- .../src/08-Light-Effect/.config/dotnet-tools.json | 10 +++++----- .../08-Light-Effect/DungeonSlime/DungeonSlime.csproj | 6 +++--- .../08-Light-Effect/DungeonSlime/UI/AnimatedButton.cs | 2 +- .../08-Light-Effect/DungeonSlime/UI/OptionsSlider.cs | 2 -- .../MonoGameLibrary/MonoGameLibrary.csproj | 2 +- .../src/09-Shadows-Effect/.config/dotnet-tools.json | 10 +++++----- .../09-Shadows-Effect/DungeonSlime/DungeonSlime.csproj | 6 +++--- .../DungeonSlime/UI/AnimatedButton.cs | 2 +- .../09-Shadows-Effect/DungeonSlime/UI/OptionsSlider.cs | 2 -- .../MonoGameLibrary/MonoGameLibrary.csproj | 2 +- .../DungeonSlime/Platforms/Android/DungeonSlime.csproj | 2 +- .../Platforms/Windows/DungeonSlime.WindowsDX.csproj | 2 +- 42 files changed, 82 insertions(+), 98 deletions(-) diff --git a/Tutorials/2dShaders/src/02-Hot-Reload-System/.config/dotnet-tools.json b/Tutorials/2dShaders/src/02-Hot-Reload-System/.config/dotnet-tools.json index fbedee15..a07174a7 100644 --- a/Tutorials/2dShaders/src/02-Hot-Reload-System/.config/dotnet-tools.json +++ b/Tutorials/2dShaders/src/02-Hot-Reload-System/.config/dotnet-tools.json @@ -3,31 +3,31 @@ "isRoot": true, "tools": { "dotnet-mgcb": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb" ] }, "dotnet-mgcb-editor": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor" ] }, "dotnet-mgcb-editor-linux": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-linux" ] }, "dotnet-mgcb-editor-windows": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-windows" ] }, "dotnet-mgcb-editor-mac": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-mac" ] diff --git a/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/DungeonSlime.csproj b/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/DungeonSlime.csproj index 70122dcf..24028ee3 100644 --- a/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/DungeonSlime.csproj +++ b/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/DungeonSlime.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/UI/AnimatedButton.cs b/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/UI/AnimatedButton.cs index 2f33ade4..a98baf1a 100644 --- a/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/UI/AnimatedButton.cs +++ b/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/UI/AnimatedButton.cs @@ -15,7 +15,7 @@ namespace DungeonSlime.UI; /// A custom button implementation that inherits from Gum's Button class to provide /// animated visual feedback when focused. /// -internal class AnimatedButton : Button +public class AnimatedButton : Button { /// /// Creates a new AnimatedButton instance using graphics from the specified texture atlas. diff --git a/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/UI/OptionsSlider.cs b/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/UI/OptionsSlider.cs index 53d6ee94..2900d983 100644 --- a/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/UI/OptionsSlider.cs +++ b/Tutorials/2dShaders/src/02-Hot-Reload-System/DungeonSlime/UI/OptionsSlider.cs @@ -85,14 +85,12 @@ public OptionsSlider(TextureAtlas atlas) offBackground.TextureWidth = offBackgroundRegion.Width; offBackground.Width = 28f; offBackground.WidthUnits = DimensionUnitType.Absolute; - offBackground.Dock(Gum.Wireframe.Dock.Left); innerContainer.AddChild(offBackground); TextureRegion middleBackgroundRegion = atlas.GetRegion("slider-middle-background"); // Create the middle track portion of the slider NineSliceRuntime middleBackground = new NineSliceRuntime(); - middleBackground.Dock(Gum.Wireframe.Dock.FillVertically); middleBackground.Texture = middleBackgroundRegion.Texture; middleBackground.TextureAddress = TextureAddress.Custom; middleBackground.TextureHeight = middleBackgroundRegion.Height; diff --git a/Tutorials/2dShaders/src/02-Hot-Reload-System/MonoGameLibrary/MonoGameLibrary.csproj b/Tutorials/2dShaders/src/02-Hot-Reload-System/MonoGameLibrary/MonoGameLibrary.csproj index fe5b3f56..95e33922 100644 --- a/Tutorials/2dShaders/src/02-Hot-Reload-System/MonoGameLibrary/MonoGameLibrary.csproj +++ b/Tutorials/2dShaders/src/02-Hot-Reload-System/MonoGameLibrary/MonoGameLibrary.csproj @@ -3,7 +3,7 @@ net9.0 - + All diff --git a/Tutorials/2dShaders/src/03-The-Material-Class/.config/dotnet-tools.json b/Tutorials/2dShaders/src/03-The-Material-Class/.config/dotnet-tools.json index fbedee15..a07174a7 100644 --- a/Tutorials/2dShaders/src/03-The-Material-Class/.config/dotnet-tools.json +++ b/Tutorials/2dShaders/src/03-The-Material-Class/.config/dotnet-tools.json @@ -3,31 +3,31 @@ "isRoot": true, "tools": { "dotnet-mgcb": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb" ] }, "dotnet-mgcb-editor": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor" ] }, "dotnet-mgcb-editor-linux": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-linux" ] }, "dotnet-mgcb-editor-windows": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-windows" ] }, "dotnet-mgcb-editor-mac": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-mac" ] diff --git a/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/DungeonSlime.csproj b/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/DungeonSlime.csproj index 70122dcf..24028ee3 100644 --- a/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/DungeonSlime.csproj +++ b/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/DungeonSlime.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/UI/AnimatedButton.cs b/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/UI/AnimatedButton.cs index 2f33ade4..a98baf1a 100644 --- a/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/UI/AnimatedButton.cs +++ b/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/UI/AnimatedButton.cs @@ -15,7 +15,7 @@ namespace DungeonSlime.UI; /// A custom button implementation that inherits from Gum's Button class to provide /// animated visual feedback when focused. /// -internal class AnimatedButton : Button +public class AnimatedButton : Button { /// /// Creates a new AnimatedButton instance using graphics from the specified texture atlas. diff --git a/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/UI/OptionsSlider.cs b/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/UI/OptionsSlider.cs index 53d6ee94..2900d983 100644 --- a/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/UI/OptionsSlider.cs +++ b/Tutorials/2dShaders/src/03-The-Material-Class/DungeonSlime/UI/OptionsSlider.cs @@ -85,14 +85,12 @@ public OptionsSlider(TextureAtlas atlas) offBackground.TextureWidth = offBackgroundRegion.Width; offBackground.Width = 28f; offBackground.WidthUnits = DimensionUnitType.Absolute; - offBackground.Dock(Gum.Wireframe.Dock.Left); innerContainer.AddChild(offBackground); TextureRegion middleBackgroundRegion = atlas.GetRegion("slider-middle-background"); // Create the middle track portion of the slider NineSliceRuntime middleBackground = new NineSliceRuntime(); - middleBackground.Dock(Gum.Wireframe.Dock.FillVertically); middleBackground.Texture = middleBackgroundRegion.Texture; middleBackground.TextureAddress = TextureAddress.Custom; middleBackground.TextureHeight = middleBackgroundRegion.Height; diff --git a/Tutorials/2dShaders/src/03-The-Material-Class/MonoGameLibrary/MonoGameLibrary.csproj b/Tutorials/2dShaders/src/03-The-Material-Class/MonoGameLibrary/MonoGameLibrary.csproj index fe5b3f56..95e33922 100644 --- a/Tutorials/2dShaders/src/03-The-Material-Class/MonoGameLibrary/MonoGameLibrary.csproj +++ b/Tutorials/2dShaders/src/03-The-Material-Class/MonoGameLibrary/MonoGameLibrary.csproj @@ -3,7 +3,7 @@ net9.0 - + All diff --git a/Tutorials/2dShaders/src/04-Debug-UI/.config/dotnet-tools.json b/Tutorials/2dShaders/src/04-Debug-UI/.config/dotnet-tools.json index fbedee15..a07174a7 100644 --- a/Tutorials/2dShaders/src/04-Debug-UI/.config/dotnet-tools.json +++ b/Tutorials/2dShaders/src/04-Debug-UI/.config/dotnet-tools.json @@ -3,31 +3,31 @@ "isRoot": true, "tools": { "dotnet-mgcb": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb" ] }, "dotnet-mgcb-editor": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor" ] }, "dotnet-mgcb-editor-linux": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-linux" ] }, "dotnet-mgcb-editor-windows": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-windows" ] }, "dotnet-mgcb-editor-mac": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-mac" ] diff --git a/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/DungeonSlime.csproj b/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/DungeonSlime.csproj index 70122dcf..24028ee3 100644 --- a/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/DungeonSlime.csproj +++ b/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/DungeonSlime.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/UI/AnimatedButton.cs b/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/UI/AnimatedButton.cs index 2f33ade4..a98baf1a 100644 --- a/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/UI/AnimatedButton.cs +++ b/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/UI/AnimatedButton.cs @@ -15,7 +15,7 @@ namespace DungeonSlime.UI; /// A custom button implementation that inherits from Gum's Button class to provide /// animated visual feedback when focused. /// -internal class AnimatedButton : Button +public class AnimatedButton : Button { /// /// Creates a new AnimatedButton instance using graphics from the specified texture atlas. diff --git a/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/UI/OptionsSlider.cs b/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/UI/OptionsSlider.cs index 53d6ee94..2900d983 100644 --- a/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/UI/OptionsSlider.cs +++ b/Tutorials/2dShaders/src/04-Debug-UI/DungeonSlime/UI/OptionsSlider.cs @@ -85,14 +85,12 @@ public OptionsSlider(TextureAtlas atlas) offBackground.TextureWidth = offBackgroundRegion.Width; offBackground.Width = 28f; offBackground.WidthUnits = DimensionUnitType.Absolute; - offBackground.Dock(Gum.Wireframe.Dock.Left); innerContainer.AddChild(offBackground); TextureRegion middleBackgroundRegion = atlas.GetRegion("slider-middle-background"); // Create the middle track portion of the slider NineSliceRuntime middleBackground = new NineSliceRuntime(); - middleBackground.Dock(Gum.Wireframe.Dock.FillVertically); middleBackground.Texture = middleBackgroundRegion.Texture; middleBackground.TextureAddress = TextureAddress.Custom; middleBackground.TextureHeight = middleBackgroundRegion.Height; diff --git a/Tutorials/2dShaders/src/04-Debug-UI/MonoGameLibrary/MonoGameLibrary.csproj b/Tutorials/2dShaders/src/04-Debug-UI/MonoGameLibrary/MonoGameLibrary.csproj index 730f97be..630ae7c3 100644 --- a/Tutorials/2dShaders/src/04-Debug-UI/MonoGameLibrary/MonoGameLibrary.csproj +++ b/Tutorials/2dShaders/src/04-Debug-UI/MonoGameLibrary/MonoGameLibrary.csproj @@ -5,7 +5,7 @@ - + All diff --git a/Tutorials/2dShaders/src/05-Transition-Effect/.config/dotnet-tools.json b/Tutorials/2dShaders/src/05-Transition-Effect/.config/dotnet-tools.json index fbedee15..a07174a7 100644 --- a/Tutorials/2dShaders/src/05-Transition-Effect/.config/dotnet-tools.json +++ b/Tutorials/2dShaders/src/05-Transition-Effect/.config/dotnet-tools.json @@ -3,31 +3,31 @@ "isRoot": true, "tools": { "dotnet-mgcb": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb" ] }, "dotnet-mgcb-editor": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor" ] }, "dotnet-mgcb-editor-linux": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-linux" ] }, "dotnet-mgcb-editor-windows": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-windows" ] }, "dotnet-mgcb-editor-mac": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-mac" ] diff --git a/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/DungeonSlime.csproj b/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/DungeonSlime.csproj index 2e7b2398..9c8c3d7a 100644 --- a/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/DungeonSlime.csproj +++ b/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/DungeonSlime.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/UI/AnimatedButton.cs b/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/UI/AnimatedButton.cs index 2f33ade4..a98baf1a 100644 --- a/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/UI/AnimatedButton.cs +++ b/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/UI/AnimatedButton.cs @@ -15,7 +15,7 @@ namespace DungeonSlime.UI; /// A custom button implementation that inherits from Gum's Button class to provide /// animated visual feedback when focused. /// -internal class AnimatedButton : Button +public class AnimatedButton : Button { /// /// Creates a new AnimatedButton instance using graphics from the specified texture atlas. diff --git a/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/UI/OptionsSlider.cs b/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/UI/OptionsSlider.cs index 53d6ee94..2900d983 100644 --- a/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/UI/OptionsSlider.cs +++ b/Tutorials/2dShaders/src/05-Transition-Effect/DungeonSlime/UI/OptionsSlider.cs @@ -85,14 +85,12 @@ public OptionsSlider(TextureAtlas atlas) offBackground.TextureWidth = offBackgroundRegion.Width; offBackground.Width = 28f; offBackground.WidthUnits = DimensionUnitType.Absolute; - offBackground.Dock(Gum.Wireframe.Dock.Left); innerContainer.AddChild(offBackground); TextureRegion middleBackgroundRegion = atlas.GetRegion("slider-middle-background"); // Create the middle track portion of the slider NineSliceRuntime middleBackground = new NineSliceRuntime(); - middleBackground.Dock(Gum.Wireframe.Dock.FillVertically); middleBackground.Texture = middleBackgroundRegion.Texture; middleBackground.TextureAddress = TextureAddress.Custom; middleBackground.TextureHeight = middleBackgroundRegion.Height; diff --git a/Tutorials/2dShaders/src/05-Transition-Effect/MonoGameLibrary/MonoGameLibrary.csproj b/Tutorials/2dShaders/src/05-Transition-Effect/MonoGameLibrary/MonoGameLibrary.csproj index 730f97be..630ae7c3 100644 --- a/Tutorials/2dShaders/src/05-Transition-Effect/MonoGameLibrary/MonoGameLibrary.csproj +++ b/Tutorials/2dShaders/src/05-Transition-Effect/MonoGameLibrary/MonoGameLibrary.csproj @@ -5,7 +5,7 @@ - + All diff --git a/Tutorials/2dShaders/src/06-Color-Swap-Effect/.config/dotnet-tools.json b/Tutorials/2dShaders/src/06-Color-Swap-Effect/.config/dotnet-tools.json index fbedee15..a07174a7 100644 --- a/Tutorials/2dShaders/src/06-Color-Swap-Effect/.config/dotnet-tools.json +++ b/Tutorials/2dShaders/src/06-Color-Swap-Effect/.config/dotnet-tools.json @@ -3,31 +3,31 @@ "isRoot": true, "tools": { "dotnet-mgcb": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb" ] }, "dotnet-mgcb-editor": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor" ] }, "dotnet-mgcb-editor-linux": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-linux" ] }, "dotnet-mgcb-editor-windows": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-windows" ] }, "dotnet-mgcb-editor-mac": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-mac" ] diff --git a/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/DungeonSlime.csproj b/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/DungeonSlime.csproj index eb4b8973..6c49fc23 100644 --- a/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/DungeonSlime.csproj +++ b/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/DungeonSlime.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/UI/AnimatedButton.cs b/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/UI/AnimatedButton.cs index 2f33ade4..a98baf1a 100644 --- a/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/UI/AnimatedButton.cs +++ b/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/UI/AnimatedButton.cs @@ -15,7 +15,7 @@ namespace DungeonSlime.UI; /// A custom button implementation that inherits from Gum's Button class to provide /// animated visual feedback when focused. /// -internal class AnimatedButton : Button +public class AnimatedButton : Button { /// /// Creates a new AnimatedButton instance using graphics from the specified texture atlas. diff --git a/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/UI/OptionsSlider.cs b/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/UI/OptionsSlider.cs index 53d6ee94..2900d983 100644 --- a/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/UI/OptionsSlider.cs +++ b/Tutorials/2dShaders/src/06-Color-Swap-Effect/DungeonSlime/UI/OptionsSlider.cs @@ -85,14 +85,12 @@ public OptionsSlider(TextureAtlas atlas) offBackground.TextureWidth = offBackgroundRegion.Width; offBackground.Width = 28f; offBackground.WidthUnits = DimensionUnitType.Absolute; - offBackground.Dock(Gum.Wireframe.Dock.Left); innerContainer.AddChild(offBackground); TextureRegion middleBackgroundRegion = atlas.GetRegion("slider-middle-background"); // Create the middle track portion of the slider NineSliceRuntime middleBackground = new NineSliceRuntime(); - middleBackground.Dock(Gum.Wireframe.Dock.FillVertically); middleBackground.Texture = middleBackgroundRegion.Texture; middleBackground.TextureAddress = TextureAddress.Custom; middleBackground.TextureHeight = middleBackgroundRegion.Height; diff --git a/Tutorials/2dShaders/src/06-Color-Swap-Effect/MonoGameLibrary/MonoGameLibrary.csproj b/Tutorials/2dShaders/src/06-Color-Swap-Effect/MonoGameLibrary/MonoGameLibrary.csproj index 730f97be..630ae7c3 100644 --- a/Tutorials/2dShaders/src/06-Color-Swap-Effect/MonoGameLibrary/MonoGameLibrary.csproj +++ b/Tutorials/2dShaders/src/06-Color-Swap-Effect/MonoGameLibrary/MonoGameLibrary.csproj @@ -5,7 +5,7 @@ - + All diff --git a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/.config/dotnet-tools.json b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/.config/dotnet-tools.json index fbedee15..a07174a7 100644 --- a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/.config/dotnet-tools.json +++ b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/.config/dotnet-tools.json @@ -3,31 +3,31 @@ "isRoot": true, "tools": { "dotnet-mgcb": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb" ] }, "dotnet-mgcb-editor": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor" ] }, "dotnet-mgcb-editor-linux": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-linux" ] }, "dotnet-mgcb-editor-windows": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-windows" ] }, "dotnet-mgcb-editor-mac": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-mac" ] diff --git a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/DungeonSlime.csproj b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/DungeonSlime.csproj index fb2af7a2..9875124c 100644 --- a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/DungeonSlime.csproj +++ b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/DungeonSlime.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/UI/AnimatedButton.cs b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/UI/AnimatedButton.cs index 2f33ade4..a98baf1a 100644 --- a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/UI/AnimatedButton.cs +++ b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/UI/AnimatedButton.cs @@ -15,7 +15,7 @@ namespace DungeonSlime.UI; /// A custom button implementation that inherits from Gum's Button class to provide /// animated visual feedback when focused. /// -internal class AnimatedButton : Button +public class AnimatedButton : Button { /// /// Creates a new AnimatedButton instance using graphics from the specified texture atlas. diff --git a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/UI/OptionsSlider.cs b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/UI/OptionsSlider.cs index 53d6ee94..2900d983 100644 --- a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/UI/OptionsSlider.cs +++ b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/DungeonSlime/UI/OptionsSlider.cs @@ -85,14 +85,12 @@ public OptionsSlider(TextureAtlas atlas) offBackground.TextureWidth = offBackgroundRegion.Width; offBackground.Width = 28f; offBackground.WidthUnits = DimensionUnitType.Absolute; - offBackground.Dock(Gum.Wireframe.Dock.Left); innerContainer.AddChild(offBackground); TextureRegion middleBackgroundRegion = atlas.GetRegion("slider-middle-background"); // Create the middle track portion of the slider NineSliceRuntime middleBackground = new NineSliceRuntime(); - middleBackground.Dock(Gum.Wireframe.Dock.FillVertically); middleBackground.Texture = middleBackgroundRegion.Texture; middleBackground.TextureAddress = TextureAddress.Custom; middleBackground.TextureHeight = middleBackgroundRegion.Height; diff --git a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/MonoGameLibrary/MonoGameLibrary.csproj b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/MonoGameLibrary/MonoGameLibrary.csproj index 730f97be..630ae7c3 100644 --- a/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/MonoGameLibrary/MonoGameLibrary.csproj +++ b/Tutorials/2dShaders/src/07-Sprite-Vertex-Effect/MonoGameLibrary/MonoGameLibrary.csproj @@ -5,7 +5,7 @@ - + All diff --git a/Tutorials/2dShaders/src/08-Light-Effect/.config/dotnet-tools.json b/Tutorials/2dShaders/src/08-Light-Effect/.config/dotnet-tools.json index fbedee15..a07174a7 100644 --- a/Tutorials/2dShaders/src/08-Light-Effect/.config/dotnet-tools.json +++ b/Tutorials/2dShaders/src/08-Light-Effect/.config/dotnet-tools.json @@ -3,31 +3,31 @@ "isRoot": true, "tools": { "dotnet-mgcb": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb" ] }, "dotnet-mgcb-editor": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor" ] }, "dotnet-mgcb-editor-linux": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-linux" ] }, "dotnet-mgcb-editor-windows": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-windows" ] }, "dotnet-mgcb-editor-mac": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-mac" ] diff --git a/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/DungeonSlime.csproj b/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/DungeonSlime.csproj index fb2af7a2..9875124c 100644 --- a/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/DungeonSlime.csproj +++ b/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/DungeonSlime.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/UI/AnimatedButton.cs b/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/UI/AnimatedButton.cs index 2f33ade4..a98baf1a 100644 --- a/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/UI/AnimatedButton.cs +++ b/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/UI/AnimatedButton.cs @@ -15,7 +15,7 @@ namespace DungeonSlime.UI; /// A custom button implementation that inherits from Gum's Button class to provide /// animated visual feedback when focused. /// -internal class AnimatedButton : Button +public class AnimatedButton : Button { /// /// Creates a new AnimatedButton instance using graphics from the specified texture atlas. diff --git a/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/UI/OptionsSlider.cs b/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/UI/OptionsSlider.cs index 53d6ee94..2900d983 100644 --- a/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/UI/OptionsSlider.cs +++ b/Tutorials/2dShaders/src/08-Light-Effect/DungeonSlime/UI/OptionsSlider.cs @@ -85,14 +85,12 @@ public OptionsSlider(TextureAtlas atlas) offBackground.TextureWidth = offBackgroundRegion.Width; offBackground.Width = 28f; offBackground.WidthUnits = DimensionUnitType.Absolute; - offBackground.Dock(Gum.Wireframe.Dock.Left); innerContainer.AddChild(offBackground); TextureRegion middleBackgroundRegion = atlas.GetRegion("slider-middle-background"); // Create the middle track portion of the slider NineSliceRuntime middleBackground = new NineSliceRuntime(); - middleBackground.Dock(Gum.Wireframe.Dock.FillVertically); middleBackground.Texture = middleBackgroundRegion.Texture; middleBackground.TextureAddress = TextureAddress.Custom; middleBackground.TextureHeight = middleBackgroundRegion.Height; diff --git a/Tutorials/2dShaders/src/08-Light-Effect/MonoGameLibrary/MonoGameLibrary.csproj b/Tutorials/2dShaders/src/08-Light-Effect/MonoGameLibrary/MonoGameLibrary.csproj index 730f97be..630ae7c3 100644 --- a/Tutorials/2dShaders/src/08-Light-Effect/MonoGameLibrary/MonoGameLibrary.csproj +++ b/Tutorials/2dShaders/src/08-Light-Effect/MonoGameLibrary/MonoGameLibrary.csproj @@ -5,7 +5,7 @@ - + All diff --git a/Tutorials/2dShaders/src/09-Shadows-Effect/.config/dotnet-tools.json b/Tutorials/2dShaders/src/09-Shadows-Effect/.config/dotnet-tools.json index fbedee15..a07174a7 100644 --- a/Tutorials/2dShaders/src/09-Shadows-Effect/.config/dotnet-tools.json +++ b/Tutorials/2dShaders/src/09-Shadows-Effect/.config/dotnet-tools.json @@ -3,31 +3,31 @@ "isRoot": true, "tools": { "dotnet-mgcb": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb" ] }, "dotnet-mgcb-editor": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor" ] }, "dotnet-mgcb-editor-linux": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-linux" ] }, "dotnet-mgcb-editor-windows": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-windows" ] }, "dotnet-mgcb-editor-mac": { - "version": "3.8.4", + "version": "3.8.4.1", "commands": [ "mgcb-editor-mac" ] diff --git a/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/DungeonSlime.csproj b/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/DungeonSlime.csproj index fb2af7a2..9875124c 100644 --- a/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/DungeonSlime.csproj +++ b/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/DungeonSlime.csproj @@ -26,9 +26,9 @@ - - - + + + diff --git a/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/UI/AnimatedButton.cs b/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/UI/AnimatedButton.cs index 2f33ade4..a98baf1a 100644 --- a/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/UI/AnimatedButton.cs +++ b/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/UI/AnimatedButton.cs @@ -15,7 +15,7 @@ namespace DungeonSlime.UI; /// A custom button implementation that inherits from Gum's Button class to provide /// animated visual feedback when focused. /// -internal class AnimatedButton : Button +public class AnimatedButton : Button { /// /// Creates a new AnimatedButton instance using graphics from the specified texture atlas. diff --git a/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/UI/OptionsSlider.cs b/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/UI/OptionsSlider.cs index 53d6ee94..2900d983 100644 --- a/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/UI/OptionsSlider.cs +++ b/Tutorials/2dShaders/src/09-Shadows-Effect/DungeonSlime/UI/OptionsSlider.cs @@ -85,14 +85,12 @@ public OptionsSlider(TextureAtlas atlas) offBackground.TextureWidth = offBackgroundRegion.Width; offBackground.Width = 28f; offBackground.WidthUnits = DimensionUnitType.Absolute; - offBackground.Dock(Gum.Wireframe.Dock.Left); innerContainer.AddChild(offBackground); TextureRegion middleBackgroundRegion = atlas.GetRegion("slider-middle-background"); // Create the middle track portion of the slider NineSliceRuntime middleBackground = new NineSliceRuntime(); - middleBackground.Dock(Gum.Wireframe.Dock.FillVertically); middleBackground.Texture = middleBackgroundRegion.Texture; middleBackground.TextureAddress = TextureAddress.Custom; middleBackground.TextureHeight = middleBackgroundRegion.Height; diff --git a/Tutorials/2dShaders/src/09-Shadows-Effect/MonoGameLibrary/MonoGameLibrary.csproj b/Tutorials/2dShaders/src/09-Shadows-Effect/MonoGameLibrary/MonoGameLibrary.csproj index 730f97be..630ae7c3 100644 --- a/Tutorials/2dShaders/src/09-Shadows-Effect/MonoGameLibrary/MonoGameLibrary.csproj +++ b/Tutorials/2dShaders/src/09-Shadows-Effect/MonoGameLibrary/MonoGameLibrary.csproj @@ -5,7 +5,7 @@ - + All diff --git a/Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Android/DungeonSlime.csproj b/Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Android/DungeonSlime.csproj index 8ed1e297..456c1fc4 100644 --- a/Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Android/DungeonSlime.csproj +++ b/Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Android/DungeonSlime.csproj @@ -13,7 +13,7 @@ - + diff --git a/Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Windows/DungeonSlime.WindowsDX.csproj b/Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Windows/DungeonSlime.WindowsDX.csproj index 6e9ae34a..d7600c07 100644 --- a/Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Windows/DungeonSlime.WindowsDX.csproj +++ b/Tutorials/learn-monogame-2d/src/27-Conclusion/DungeonSlime/Platforms/Windows/DungeonSlime.WindowsDX.csproj @@ -12,7 +12,7 @@ Icon.ico - +