Chapter 6 changes

Author: SimonDarksideJ

articles/tutorials/advanced/2d_shaders/06_color_swap_effect/index.md

@@ -0,0 +1 @@
+private Texture2D _colorMap;

articles/tutorials/advanced/2d_shaders/06_color_swap_effect/snippets/snippet-6-09-1.cs

@@ -6,6 +6,6 @@ public override void LoadContent()
     _colorSwapMaterial = Core.SharedContent.WatchMaterial("effects/colorSwapEffect");
     _colorSwapMaterial.IsDebugVisible = true;
 
-    var colorMap = Content.Load<Texture2D>("images/color-map-1");
-    _colorSwapMaterial.SetParameter("ColorMap", colorMap);
+    _colorMap = Core.SharedContent.Load<Texture2D>("images/color-map-1");
+    _colorSwapMaterial.SetParameter("ColorMap", _colorMap);
 }

articles/tutorials/advanced/2d_shaders/06_color_swap_effect/snippets/snippet-6-09-2.cs

@@ -1,11 +1,4 @@
-public override void Draw(GameTime gameTime)
-{
-    // ...
-
-    Core.SpriteBatch.Begin(
-        samplerState: SamplerState.PointClamp,
-        sortMode: SpriteSortMode.Immediate,
-        effect: _colorSwapMaterial.Effect);
-
-    // ...
-}
+Core.SpriteBatch.Begin(
+    samplerState: SamplerState.PointClamp,
+    sortMode: SpriteSortMode.Immediate,
+    effect: _colorSwapMaterial.Effect);

articles/tutorials/advanced/2d_shaders/06_color_swap_effect/snippets/snippet-6-16.cs

@@ -1,26 +1,20 @@
 public override void Draw(GameTime gameTime)
 {
-    // Clear the back buffer.
-    Core.GraphicsDevice.Clear(Color.CornflowerBlue);
-
-    Core.SpriteBatch.Begin(
-        samplerState: SamplerState.PointClamp,
-        sortMode: SpriteSortMode.Immediate,
-        effect: _colorSwapMaterial.Effect);
+    // ...
 
     // Update the colorMap
     _colorSwapMaterial.SetParameter("ColorMap", _colorMap);
-    
+
     // Draw the tilemap
     _tilemap.Draw(Core.SpriteBatch);
-    
+
     // Draw the bat.
     _bat.Draw();
 
     // Update the colorMap for the slime  
-    _colorSwapMaterial.SetParameter("ColorMap", _slimeColorMap.ColorMap);  
-    
-    // Draw the slime.  
+    _colorSwapMaterial.SetParameter("ColorMap", _slimeColorMap.ColorMap);
+
+    // Draw the slime.
     _slime.Draw();
 
     // Always end the sprite batch when finished.

articles/tutorials/advanced/2d_shaders/06_color_swap_effect/snippets/snippet-6-17.cs

@@ -0,0 +1,10 @@
+public override void Update(GameTime gameTime)
+{
+    // ...
+
+    // Update the bat;
+    _bat.Update(gameTime);
+
+    // Perform collision checks
+    CollisionChecks(gameTime);
+}