Merge pull request MonoGame#49 from AristurtleDev/redraft/chapter-05

AristurtleDev · web-flow · commit 5df0fd796640 · 2025-05-09T11:37:15.000-04:00
Redraft/chapter 05
diff --git a/articles/tutorials/building_2d_games/05_content_pipeline/images/content-pipeline-workflow-full.png b/articles/tutorials/building_2d_games/05_content_pipeline/images/content-pipeline-workflow-full.png
diff --git a/articles/tutorials/building_2d_games/05_content_pipeline/images/content-pipeline-workflow-full.svg b/articles/tutorials/building_2d_games/05_content_pipeline/images/content-pipeline-workflow-full.svg
diff --git a/articles/tutorials/building_2d_games/05_content_pipeline/index.md b/articles/tutorials/building_2d_games/05_content_pipeline/index.md
diff --git a/articles/tutorials/building_2d_games/05_content_pipeline/snippets/content_build_dir_tree.sh b/articles/tutorials/building_2d_games/05_content_pipeline/snippets/content_build_dir_tree.sh
diff --git a/articles/tutorials/building_2d_games/05_content_pipeline/snippets/content_dir_tree.sh b/articles/tutorials/building_2d_games/05_content_pipeline/snippets/content_dir_tree.sh
diff --git a/articles/tutorials/building_2d_games/05_content_pipeline/snippets/contentpaths.sh b/articles/tutorials/building_2d_games/05_content_pipeline/snippets/contentpaths.sh
diff --git a/articles/tutorials/building_2d_games/05_content_pipeline/snippets/game1.cs b/articles/tutorials/building_2d_games/05_content_pipeline/snippets/game1.cs
@@ -25,7 +25,6 @@ protected override void Initialize()
     protected override void LoadContent()
     {
         _logo = Content.Load<Texture2D>("images/logo");
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/05_content_pipeline/snippets/project_build_dir_tree.sh b/articles/tutorials/building_2d_games/05_content_pipeline/snippets/project_build_dir_tree.sh
diff --git a/articles/tutorials/building_2d_games/07_optimizing_texture_rendering/index.md b/articles/tutorials/building_2d_games/07_optimizing_texture_rendering/index.md
@@ -191,7 +191,7 @@ Add this texture atlas to your content project using the MGCB Editor:
 
 First, we will explore creating the texture atlas and defining the texture regions directly in code.  Replace the contents of `Game1.cs` with the following:
 
-[!code-csharp[](./snippets/game1/textureatlas_usage.cs?highlight=5,11-15,31-47,67-77)]
+[!code-csharp[](./snippets/game1/textureatlas_usage.cs?highlight=5,11-15,31-47,65-75)]
 
 The key changes in this implementation are:
 
diff --git a/articles/tutorials/building_2d_games/07_optimizing_texture_rendering/snippets/game1/textureatlas_usage.cs b/articles/tutorials/building_2d_games/07_optimizing_texture_rendering/snippets/game1/textureatlas_usage.cs
@@ -45,8 +45,6 @@ protected override void LoadContent()
 
         // retrieve the bat region from the atlas.
         _bat = atlas.GetRegion("bat");
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/07_optimizing_texture_rendering/snippets/game1/textureatlas_xml_usage.cs b/articles/tutorials/building_2d_games/07_optimizing_texture_rendering/snippets/game1/textureatlas_xml_usage.cs
@@ -36,8 +36,6 @@ protected override void LoadContent()
 
         // retrieve the bat region from the atlas.
         _bat = atlas.GetRegion("bat");
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/08_the_sprite_class/index.md b/articles/tutorials/building_2d_games/08_the_sprite_class/index.md
@@ -75,7 +75,7 @@ We can simplify this process by adding a sprite creation method to the `TextureA
 
 Now we can adjust our game now to use the `Sprite` class instead of just the texture regions.  Update the contents of `Game1.cs` with the following:
 
-[!code-csharp[](./snippets/game1.cs?highlight=11-15,34-40,63-67)]
+[!code-csharp[](./snippets/game1.cs?highlight=11-15,34-40,61-65)]
 
 The key changes in this implementation are:
 
diff --git a/articles/tutorials/building_2d_games/08_the_sprite_class/snippets/game1.cs b/articles/tutorials/building_2d_games/08_the_sprite_class/snippets/game1.cs
@@ -38,8 +38,6 @@ protected override void LoadContent()
         // Create the bat sprite from the atlas.
         _bat = atlas.CreateSprite("bat");
         _bat.Scale = new Vector2(4.0f, 4.0f);
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/09_the_animatedsprite_class/index.md b/articles/tutorials/building_2d_games/09_the_animatedsprite_class/index.md
@@ -178,7 +178,7 @@ We can simplify this process by adding an animated sprite creation method to the
 
 We can now adjust our game now to use the `AnimatedSprite` class to see our sprites come to life. Update the contents of `Game1.cs` with the following:
 
-[!code-csharp[](./snippets/game1.cs?highlight=11-15,34-40,50-54)]
+[!code-csharp[](./snippets/game1.cs?highlight=11-15,34-40,48-52)]
 
 Here are the key changes in this implementation:
 
diff --git a/articles/tutorials/building_2d_games/09_the_animatedsprite_class/snippets/game1.cs b/articles/tutorials/building_2d_games/09_the_animatedsprite_class/snippets/game1.cs
@@ -38,8 +38,6 @@ protected override void LoadContent()
         // Create the bat animated sprite from the atlas.
         _bat = atlas.CreateAnimatedSprite("bat-animation");
         _bat.Scale = new Vector2(4.0f, 4.0f);
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/10_handling_input/index.md b/articles/tutorials/building_2d_games/10_handling_input/index.md
diff --git a/articles/tutorials/building_2d_games/10_handling_input/snippets/game1.cs b/articles/tutorials/building_2d_games/10_handling_input/snippets/game1.cs
@@ -44,8 +44,6 @@ protected override void LoadContent()
         // Create the bat animated sprite from the atlas.
         _bat = atlas.CreateAnimatedSprite("bat-animation");
         _bat.Scale = new Vector2(4.0f, 4.0f);
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/11_input_management/index.md b/articles/tutorials/building_2d_games/11_input_management/index.md
@@ -382,7 +382,7 @@ The key changes to the `Core` class are:
 
 Now we can update our `Game1` class to use the new input management system through the `Core` class.  Open `Game1.cs` in the game project and update it to the following:
 
-[!code-csharp[](./snippets/game1.cs?highlight=1,7,77,83,89,95,101,109,114,117,121,127,129-130,135,141,147,153)]
+[!code-csharp[](./snippets/game1.cs?highlight=6,74,80,86,92,98,106,111,114,118,124,126-127,132,138,144,150)]
 
 The key changes to the `Game1` class are:
 
diff --git a/articles/tutorials/building_2d_games/11_input_management/snippets/game1.cs b/articles/tutorials/building_2d_games/11_input_management/snippets/game1.cs
@@ -46,8 +46,6 @@ protected override void LoadContent()
         // Create the bat animated sprite from the atlas.
         _bat = atlas.CreateAnimatedSprite("bat-animation");
         _bat.Scale = new Vector2(4.0f, 4.0f);
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/12_collision_detection/index.md b/articles/tutorials/building_2d_games/12_collision_detection/index.md
@@ -311,7 +311,7 @@ If you run the game right now and move the slime around, you will notice a few i
 
 We can now implement these features using collision detection and response in our game.  In the *DungeonSlime* project (your main game project), open the `Game1.cs` file and make the following changes to the `Game1` class:
 
-[!code-csharp[](./snippets/game1.cs?highlight=25-29,40-45,81-181,186-198,298-299)]
+[!code-csharp[](./snippets/game1.cs?highlight=1,5,25-29,40-45,79-179,184-196,296-297)]
 
 The key changes made here are:
 
diff --git a/articles/tutorials/building_2d_games/12_collision_detection/snippets/game1.cs b/articles/tutorials/building_2d_games/12_collision_detection/snippets/game1.cs
@@ -57,8 +57,6 @@ protected override void LoadContent()
         // Create the bat animated sprite from the atlas.
         _bat = atlas.CreateAnimatedSprite("bat-animation");
         _bat.Scale = new Vector2(4.0f, 4.0f);
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/13_working_with_tilemaps/index.md b/articles/tutorials/building_2d_games/13_working_with_tilemaps/index.md
@@ -186,7 +186,7 @@ This tilemap configuration creates a simple dungeon layout with walls around the
 
 With all of the assets now in place and configured, we can update the `Game1` class to load the tilemap and draw it.  We will also need to update the collision logic so that the boundary is no longer the edge of the screen, but instead the edges of the wall tiles of the tilemap.  Open `Game1.cs` and make the following updates:
 
-[!code-csharp[](./snippets/game1.cs?highlight=31-35,46-61,80-82,114,116,118,120,123,125,127,129,147,150,152,155,158,161,163,166,181-183,305-306)]
+[!code-csharp[](./snippets/game1.cs?highlight=31-35,46-61,80-82,112,114,116,128,121,123,125,127,145,148,150,153,156,159,161,164,179-181,303-304)]
 
 The key changes to the `Game1` class include:
 
diff --git a/articles/tutorials/building_2d_games/13_working_with_tilemaps/snippets/game1.cs b/articles/tutorials/building_2d_games/13_working_with_tilemaps/snippets/game1.cs
@@ -80,8 +80,6 @@ protected override void LoadContent()
         // Create the tilemap from the XML configuration file.
         _tilemap = Tilemap.FromFile(Content, "images/tilemap-definition.xml");
         _tilemap.Scale = new Vector2(4.0f, 4.0f);
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/14_soundeffects_and_music/index.md b/articles/tutorials/building_2d_games/14_soundeffects_and_music/index.md
@@ -175,7 +175,7 @@ Add these files to your content project using the MGCB Editor:
 
 Next, open the `Game1.cs` file and update it to the following:
 
-[!code-csharp[](./snippets/game1.cs?highlight=3,6,39-43,92-111,205-206,224-225)]
+[!code-csharp[](./snippets/game1.cs?highlight=3,6,39-43,92-111,203-204,222-223)]
 
 The key changes here are:
 
diff --git a/articles/tutorials/building_2d_games/14_soundeffects_and_music/snippets/game1.cs b/articles/tutorials/building_2d_games/14_soundeffects_and_music/snippets/game1.cs
@@ -109,8 +109,6 @@ protected override void LoadContent()
 
         // Set the theme music to repeat.
         MediaPlayer.IsRepeating = true;
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/15_audio_controller/index.md b/articles/tutorials/building_2d_games/15_audio_controller/index.md
@@ -131,7 +131,7 @@ The key changes made here are:
 
 Next, update the `Game1` class to use the audio controller for audio playback.  Open `Game1.cs` and make the following updates:
 
-[!code-csharp[](./snippets/game1.cs?highlight=45-46,77-78,104-105,199-200,218-219,272-290)]
+[!code-csharp[](./snippets/game1.cs?highlight=45-46,77-78,104-105,197-198,216-217,270-288)]
 
 > [!NOTE]
 > Note there were a lot of replacements in the `LoadContent` method, switching from loading and initializing the background Song and replacing it with a call to the new `AudioController` to do all the work managing the Song reference.  Much cleaner.
diff --git a/articles/tutorials/building_2d_games/15_audio_controller/snippets/game1.cs b/articles/tutorials/building_2d_games/15_audio_controller/snippets/game1.cs
@@ -103,8 +103,6 @@ protected override void LoadContent()
 
         // Load the background theme music
         _themeSong = Content.Load<Song>("audio/theme");
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/16_working_with_spritefonts/index.md b/articles/tutorials/building_2d_games/16_working_with_spritefonts/index.md
@@ -217,7 +217,7 @@ The key changes here are:
 
 Finally, open the `Game1.cs` file and make the following changes:
 
-[!code-csharp[](./snippets/game1.cs?highlight=48-58,93-99,129-130,246-247,391-402)]
+[!code-csharp[](./snippets/game1.cs?highlight=48-58,93-99,129-130,244-245,389-400)]
 
 The key changes made are:
 
diff --git a/articles/tutorials/building_2d_games/16_working_with_spritefonts/snippets/game1.cs b/articles/tutorials/building_2d_games/16_working_with_spritefonts/snippets/game1.cs
@@ -127,8 +127,6 @@ protected override void LoadContent()
 
         // Load the font
         _font = Content.Load<SpriteFont>("fonts/04B_30");
-
-        base.LoadContent();
     }
 
     protected override void Update(GameTime gameTime)
diff --git a/articles/tutorials/building_2d_games/17_scenes/snippets/game1.cs b/articles/tutorials/building_2d_games/17_scenes/snippets/game1.cs
@@ -27,8 +27,6 @@ protected override void Initialize()
 
     protected override void LoadContent()
     {
-        base.LoadContent();
-
         // Load the background theme music
         _themeSong = Content.Load<Song>("audio/theme");
     }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ protected override void Initialize()`
`25`	`25`	`protected override void LoadContent()`
`26`	`26`	`{`
`27`	`27`	`_logo = Content.Load<Texture2D>("images/logo");`
`28`		`- base.LoadContent();`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`protected override void Update(GameTime gameTime)`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ protected override void LoadContent()`
`45`	`45`
`46`	`46`	`// retrieve the bat region from the atlas.`
`47`	`47`	`_bat = atlas.GetRegion("bat");`
`48`		`-`
`49`		`- base.LoadContent();`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`protected override void Update(GameTime gameTime)`