Tutorial improvements again

Aggror · Aggror · commit 6a936546e475 · 2022-05-16T10:22:09.000+02:00
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/03_Raycasting/Completed-Raycasting.sdscene b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/03_Raycasting/Completed-Raycasting.sdscene
@@ -202,7 +202,7 @@ Hierarchy:
                             9a7f8a5f2a4dee8e21a358916c686069: ref!! ad45eb14-a372-4b8e-ab78-640cd773ff67
                     d5fc5b9d4033b3675a0b46ddc44d0280: !CSharpIntermediate.Code.RaycastPenetratingDemo,CSharpIntermediate.Game
                         Id: b15a1386-b2d5-4098-a34e-c53b31617f34
-                        CollideWithGroup: CustomFilter1
+                        CollideWithGroup: DefaultFilter, StaticFilter, KinematicFilter, DebrisFilter, SensorTrigger, CharacterFilter, CustomFilter2, CustomFilter3, CustomFilter4, CustomFilter5, CustomFilter6, CustomFilter7, CustomFilter8, CustomFilter9, CustomFilter10
                         CollideWithTriggers: true
                     79f1213321ddbd79da50fb28d0798030: !CSharpIntermediate.Code.OmniDirectionMovement,CSharpIntermediate.Game
                         Id: 070c4dd1-8316-46d6-acc9-65d662867913
@@ -604,7 +604,7 @@ Hierarchy:
                 Components:
                     21639b2f688316c585e191db6981e6ea: !TransformComponent
                         Id: b05306f0-b949-4817-b06a-9665935f9425
-                        Position: {X: 0.0, Y: 0.060330506, Z: -4.5027337}
+                        Position: {X: 0.0, Y: 0.060330506, Z: -4.2770786}
                         Rotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                         Scale: {X: 0.66130906, Y: 0.66130906, Z: 0.66130906}
                         Children: {}
@@ -1197,7 +1197,7 @@ Hierarchy:
                 Components:
                     21639b2f688316c585e191db6981e6ea: !TransformComponent
                         Id: 57fe2e7e-cfa6-48c9-a43c-5cc743e96aae
-                        Position: {X: 0.0, Y: 2.0603304, Z: -4.5001907}
+                        Position: {X: 0.0, Y: 2.0603304, Z: -4.2745357}
                         Rotation: {X: 0.0, Y: 1.0, Z: 0.0, W: -4.371139E-08}
                         Scale: {X: 0.66130906, Y: 0.66130906, Z: 0.66130906}
                         Children: {}
@@ -1513,7 +1513,7 @@ Hierarchy:
                 Components:
                     21639b2f688316c585e191db6981e6ea: !TransformComponent
                         Id: 26c2be03-ca3b-42b3-8471-14db962f7bde
-                        Position: {X: 0.0, Y: 1.0603305, Z: -4.5001907}
+                        Position: {X: 0.0, Y: 1.0603305, Z: -4.2745357}
                         Rotation: {X: 0.0, Y: 1.0, Z: 0.0, W: -4.371139E-08}
                         Scale: {X: 0.66130906, Y: 0.66130906, Z: 0.66130906}
                         Children: {}
@@ -1622,7 +1622,6 @@ Hierarchy:
                             5df289f2597cd279d9dcc05bc9e895fd~0: c5f8292f-4ef2-4417-b296-ca46f08b2411:Materials/Transparent
                     a611784bb47a2fd81a5464c73697642e: !StaticColliderComponent
                         Id: 32e82212-0b4f-4a47-b77e-22c51d71b3e1
-                        CollisionGroup: CustomFilter1
                         CanSleep: false
                         Restitution: 0.0
                         Friction: 0.5
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/06_SceneLoading/Completed-SceneA.sdscene b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/06_SceneLoading/Completed-SceneA.sdscene
@@ -127,8 +127,8 @@ Hierarchy:
                         Id: 19d7b33c-9f1c-40da-a04b-60ba49a2dc11
                         SceneToLoad: d2f251fc-d4eb-43b8-b7e0-0247597eca81:Scenes/06_SceneLoading/Completed-SceneB
                         DrawY: 20
-                        Info: To load Scene B, press
-                        KeyToPress: None
+                        Info: Scene-B, press
+                        KeyToPress: B
         -   Folder: Ground
             Entity:
                 Id: 147a295b-1b60-4e9c-81a7-c8ecee8ce3d6
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/06_SceneLoading/Completed-SceneB.sdscene b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/06_SceneLoading/Completed-SceneB.sdscene
@@ -81,7 +81,7 @@ Hierarchy:
                                 LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         -   Entity:
                 Id: 86ea71e1-6822-4267-b0c5-3ca59ff226d2
-                Name: ReloadSceneA
+                Name: LoadSceneA
                 Components:
                     eb5035f857a0e6f5d775a26b64b3bf3f: !TransformComponent
                         Id: 6802fa61-110f-4b11-ad35-e8616143f6b9
@@ -93,8 +93,8 @@ Hierarchy:
                         Id: 890a1f70-25a0-4412-b94a-27ba469f1ac0
                         SceneToLoad: f6f2a96e-6b05-4119-bba1-87c1fa5c8fdf:Scenes/06_SceneLoading/Completed-SceneA
                         DrawY: 60
-                        Info: 'To go back to scene A, press '
-                        KeyToPress: None
+                        Info: Load scene-A, press
+                        KeyToPress: A
         -   Entity:
                 Id: 8d16a77c-de44-444c-9a80-48691f614e88
                 Name: Gate1x2x1
@@ -123,8 +123,8 @@ Hierarchy:
                         Id: c971497d-f0b0-4c4e-a922-4fdbac7ca9b5
                         SceneToLoad: d2f251fc-d4eb-43b8-b7e0-0247597eca81:Scenes/06_SceneLoading/Completed-SceneB
                         DrawY: 20
-                        Info: 'To reload scene, press '
-                        KeyToPress: None
+                        Info: Reload scene, press
+                        KeyToPress: B
         -   Entity:
                 Id: dbd15918-28c5-4576-8ee1-54c044e62e35
                 Name: Gate2x3x1
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/08_Audio/Completed-Audio.sdscene b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/08_Audio/Completed-Audio.sdscene
@@ -793,7 +793,7 @@ Hierarchy:
                         Environment: Small
                     9b5c17fd501f9839aed554a74bc4575e: !CSharpIntermediate.Code.AudioDemo,CSharpIntermediate.Game
                         Id: bb4b827c-f0e2-4a11-943e-2603cb6c83eb
-                        UkuleleSound: null
+                        UkuleleSound: 3885913c-4b28-49c8-b06f-5dbf54e7c5bb:Audio/Ukelele
                     6f2d27198339238056f47fbe7f621748: !CSharpIntermediate.Code.OmniDirectionMovement,CSharpIntermediate.Game
                         Id: e2bace7e-5a0c-404f-a436-c5edb10957df
                         MoveSpeed: 3.0
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/11_Navigation/Completed-Navigation.sdscene b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/Assets/Scenes/11_Navigation/Completed-Navigation.sdscene
@@ -786,7 +786,7 @@ Hierarchy:
                         Id: 3b988948-2838-42f5-9191-0a1ffd6ddee3
                         RegularCharacter: ref!! 8443a87b-1f25-4437-9f81-8898234cb94b
                         PathSphere: ref!! ffc6dedb-c9b2-4f25-9332-265551b04467
-                        MovementSpeed: 2.5
+                        MovementSpeed: 1.8
         -   Folder: Walls
             Entity:
                 Id: 9a2aed26-aa9f-4a79-80b7-907e529418cd
@@ -1342,7 +1342,7 @@ Hierarchy:
                 Components:
                     5df3ae39ecbb00c7c2c349e3b004fc40: !TransformComponent
                         Id: ae8da9e8-e1aa-43a3-916e-2d4475a3d37f
-                        Position: {X: 0.0, Y: -0.053181265, Z: 0.0}
+                        Position: {X: 1.3935742, Y: -0.053181265, Z: -3.4938378}
                         Rotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                         Scale: {X: 0.2, Y: 0.2, Z: 0.2}
                         Children: {}
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/02_Collision-Triggers/CollisionTriggerDemo.cs b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/02_Collision-Triggers/CollisionTriggerDemo.cs
@@ -15,31 +15,42 @@ public class CollisionTriggerDemo : SyncScript
 
         public override void Start()
         {
+            // Retrieve the Physics component of the current entity
             staticCollider = Entity.Get<StaticColliderComponent>();
+
+            // When the 'CollectionChanged' event occurs, execute the CollisionsChanged method
             staticCollider.Collisions.CollectionChanged += CollisionsChanged;
         }
 
         private void CollisionsChanged(object sender, TrackingCollectionChangedEventArgs args)
         {
+            // Cast the argument 'item' to a collision object
             var collision = (Collision)args.Item;
+
+            // We need to make sure which collision object is not the Trigger collider
+            // We perform a little check to find the ballCollider 
             var ballCollider = staticCollider == collision.ColliderA ? collision.ColliderB : collision.ColliderA;
 
             if (args.Action == NotifyCollectionChangedAction.Add)
             {
+                // When a collision has been added to the collision collection, we know an object has 'entered' our trigger
                 collisionStatus = ballCollider.Entity.Name + " entered " + staticCollider.Entity.Name;
             }
             else if (args.Action == NotifyCollectionChangedAction.Remove)
             {
+                // When a collision has been removed from the collision collection, we know an object 'left' our trigger
                 collisionStatus = ballCollider.Entity.Name + " left " + staticCollider.Entity.Name;
             }
         }
 
         public override void Update()
         {
+            // The trigger collider can have 0, 1, or multiple collision going on in a single frame
+            int drawX = 500, drawY = 300;
             foreach (var collision in staticCollider.Collisions)
             {
-                DebugText.Print("ColliderA: " + collision.ColliderA.Entity.Name, new Int2(500, 300));
-                DebugText.Print("ColliderB: " + collision.ColliderB.Entity.Name, new Int2(500, 320));
+                DebugText.Print("ColliderA: " + collision.ColliderA.Entity.Name, new Int2(drawX, drawY += 20));
+                DebugText.Print("ColliderB: " + collision.ColliderB.Entity.Name, new Int2(drawX, drawY += 20));
             }
 
             DebugText.Print(collisionStatus, new Int2(500, 400));
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/03_Raycasting/RaycastDemo.cs b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/03_Raycasting/RaycastDemo.cs
@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using CSharpIntermediate.Code.Extensions;
 using Stride.Core.Mathematics;
 using Stride.Engine;
 using Stride.Physics;
@@ -25,7 +26,7 @@ public override void Start()
 
         public override void Update()
         {
-            int drawX = 400;
+            int drawX = 340;
             int drawY = 80;
             DebugText.Print("Press Q and E to raise/lower weapons", new Int2(drawX, drawY));
 
@@ -44,7 +45,7 @@ public override void Update()
 
                 DebugText.Print("Hit a collider", new Int2(drawX, drawY));
                 DebugText.Print($"Raycast hit distance: {distance}", new Int2(drawX, drawY + 20));
-                DebugText.Print($"Raycast hit point: {hitResult.Point}", new Int2(drawX, drawY + 40));
+                DebugText.Print($"Raycast hit point: {hitResult.Point.Print()}", new Int2(drawX, drawY + 40));
                 DebugText.Print($"Raycast hit entity: {hitResult.Collider.Entity.Name}", new Int2(drawX, drawY + 60));
             }
             else
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/03_Raycasting/RaycastPenetratingDemo.cs b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/03_Raycasting/RaycastPenetratingDemo.cs
@@ -13,7 +13,7 @@ public class RaycastPenetratingDemo : SyncScript
         public bool CollideWithTriggers = false;
 
         private Entity laser;
-        private const float maxDistance = 4.0f;
+        private const float maxDistance = 3.0f;
         private Simulation simulation;
 
         public override void Start()
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/07_Animation/AnimationBasics.cs b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/07_Animation/AnimationBasics.cs
@@ -24,26 +24,28 @@ public override void Start()
 
         public override void Update()
         {
-            StopOrResumeAnimations();
+            int drawX = 800, drawY = 600;
 
-            AdjustAnimationSpeed();
+            StopOrResumeAnimations(drawX, drawY += 20);
 
-            DebugText.Print("I to start playing Idle", new Int2(320, 440));
+            AdjustAnimationSpeed(drawX, drawY += 20);
+
+            DebugText.Print("I to start playing Idle", new Int2(drawX, drawY += 20));
             if (Input.IsKeyPressed(Keys.I))
             {
                 latestAnimation = animation.Play("Idle");
                 latestAnimation.TimeFactor = AnimationSpeed;
             }
 
-            DebugText.Print("R to crossfade to Run", new Int2(320, 460));
+            DebugText.Print("R to crossfade to Run", new Int2(drawX, drawY += 20));
             if (Input.IsKeyPressed(Keys.R))
             {
                 latestAnimation = animation.Crossfade("Run", TimeSpan.FromSeconds(0.5));
                 latestAnimation.TimeFactor = AnimationSpeed;
             }
 
             // We can crossfade to a punch animation, but only if it is not already playing
-            DebugText.Print("P to crossfade to Punch and play it once", new Int2(320, 480));
+            DebugText.Print("P to crossfade to Punch and play it once", new Int2(drawX, drawY += 20));
             if (Input.IsKeyPressed(Keys.P) && !animation.IsPlaying("Punch"))
             {
                 latestAnimation = animation.Crossfade("Punch", TimeSpan.FromSeconds(0.1));
@@ -60,9 +62,9 @@ public override void Update()
             }
         }
 
-        private void StopOrResumeAnimations()
+        private void StopOrResumeAnimations(int drawX, int drawY)
         {
-            DebugText.Print($"S to pause or resume animations", new Int2(320, 420));
+            DebugText.Print($"S to pause or resume animations", new Int2(drawX, drawY));
             if (Input.IsKeyPressed(Keys.S))
             {
                 foreach (var playingAnimation in animation.PlayingAnimations)
@@ -72,9 +74,9 @@ private void StopOrResumeAnimations()
             }
         }
 
-        private void AdjustAnimationSpeed()
+        private void AdjustAnimationSpeed(int drawX, int drawY)
         {
-            DebugText.Print($"Q and E for speed {AnimationSpeed:0.0}", new Int2(320, 400));
+            DebugText.Print($"Q and E for speed {AnimationSpeed:0.0}", new Int2(drawX, drawY));
             if (Input.IsKeyPressed(Keys.E))
             {
                 AnimationSpeed += 0.1f;
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/08_Audio/AudioDemo.cs b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/08_Audio/AudioDemo.cs
@@ -28,16 +28,16 @@ public override void Start()
         public override void Update()
         {
             // Play a sound
-            DebugText.Print($"U to play the Ukelele once", new Int2(200, 40));
+            DebugText.Print($"U to play the Ukelele once", new Int2(200, 580));
             if (Input.IsKeyPressed(Keys.U))
             {
                 ukuleleInstance.Stop();
                 ukuleleInstance.Play();
             }
 
-            // Press left mouse button fire gun
-            DebugText.Print($"Press left mouse button fire gun", new Int2(200, 60));
-            if (Input.IsMouseButtonPressed(MouseButton.Left))
+            // Press right mouse button for gun fire sound
+            DebugText.Print($"Press right mouse button fire gun", new Int2(200, 640));
+            if (Input.IsMouseButtonPressed(MouseButton.Right))
             {
                 gunSoundEmitter.Play();
             }
diff --git a/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/08_Audio/LoadMusic.cs b/samples/Tutorials/CSharpIntermediate/CSharpIntermediate/CSharpIntermediate.Game/08_Audio/LoadMusic.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+ // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
@@ -27,7 +27,7 @@ public override async Task Execute()
             while (Game.IsRunning)
             {
                 // Play or pause
-                DebugText.Print($"Space to play/pause. Currently: {musicInstance.PlayState}", new Int2(800, 40));
+                DebugText.Print($"Space to play/pause. Currently: {musicInstance.PlayState}", new Int2(800, 580));
                 if (Input.IsKeyPressed(Keys.Space))
                 {
                     if (musicInstance.PlayState == PlayState.Playing)
@@ -41,7 +41,7 @@ public override async Task Execute()
                 }
 
                 // Volume 
-                DebugText.Print($"Up/Down to change volume: {musicInstance.Volume:0.0}", new Int2(800, 60));
+                DebugText.Print($"Up/Down to change volume: {musicInstance.Volume:0.0}", new Int2(800, 600));
                 if (Input.IsKeyPressed(Keys.Up))
                 {
                     musicInstance.Volume = Math.Clamp(musicInstance.Volume + 0.1f, 0, 2);
@@ -52,7 +52,7 @@ public override async Task Execute()
                 }
 
                 // Panning
-                DebugText.Print($"Left/Right to change panning: {musicInstance.Pan:0.0}", new Int2(800, 80));
+                DebugText.Print($"Left/Right to change panning: {musicInstance.Pan:0.0}", new Int2(800, 620));
                 if (Input.IsKeyPressed(Keys.Left))
                 {
                     musicInstance.Pan = Math.Clamp(musicInstance.Pan - 0.1f, -1, 1);

Original file line number	Diff line number	Diff line change
`@@ -15,31 +15,42 @@ public class CollisionTriggerDemo : SyncScript`
`15`	`15`
`16`	`16`	`public override void Start()`
`17`	`17`	`{`
	`18`	`+ // Retrieve the Physics component of the current entity`
`18`	`19`	`staticCollider = Entity.Get<StaticColliderComponent>();`
	`20`	`+`
	`21`	`+ // When the 'CollectionChanged' event occurs, execute the CollisionsChanged method`
`19`	`22`	`staticCollider.Collisions.CollectionChanged += CollisionsChanged;`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`private void CollisionsChanged(object sender, TrackingCollectionChangedEventArgs args)`
`23`	`26`	`{`
	`27`	`+ // Cast the argument 'item' to a collision object`
`24`	`28`	`var collision = (Collision)args.Item;`
	`29`	`+`
	`30`	`+ // We need to make sure which collision object is not the Trigger collider`
	`31`	`+ // We perform a little check to find the ballCollider`
`25`	`32`	`var ballCollider = staticCollider == collision.ColliderA ? collision.ColliderB : collision.ColliderA;`
`26`	`33`
`27`	`34`	`if (args.Action == NotifyCollectionChangedAction.Add)`
`28`	`35`	`{`
	`36`	`+ // When a collision has been added to the collision collection, we know an object has 'entered' our trigger`
`29`	`37`	`collisionStatus = ballCollider.Entity.Name + " entered " + staticCollider.Entity.Name;`
`30`	`38`	`}`
`31`	`39`	`else if (args.Action == NotifyCollectionChangedAction.Remove)`
`32`	`40`	`{`
	`41`	`+ // When a collision has been removed from the collision collection, we know an object 'left' our trigger`
`33`	`42`	`collisionStatus = ballCollider.Entity.Name + " left " + staticCollider.Entity.Name;`
`34`	`43`	`}`
`35`	`44`	`}`
`36`	`45`
`37`	`46`	`public override void Update()`
`38`	`47`	`{`
	`48`	`+ // The trigger collider can have 0, 1, or multiple collision going on in a single frame`
	`49`	`+ int drawX = 500, drawY = 300;`
`39`	`50`	`foreach (var collision in staticCollider.Collisions)`
`40`	`51`	`{`
`41`		`- DebugText.Print("ColliderA: " + collision.ColliderA.Entity.Name, new Int2(500, 300));`
`42`		`- DebugText.Print("ColliderB: " + collision.ColliderB.Entity.Name, new Int2(500, 320));`
	`52`	`+ DebugText.Print("ColliderA: " + collision.ColliderA.Entity.Name, new Int2(drawX, drawY += 20));`
	`53`	`+ DebugText.Print("ColliderB: " + collision.ColliderB.Entity.Name, new Int2(drawX, drawY += 20));`
`43`	`54`	`}`
`44`	`55`
`45`	`56`	`DebugText.Print(collisionStatus, new Int2(500, 400));`
Original file line number	Diff line number	Diff line change
`@@ -24,26 +24,28 @@ public override void Start()`
`24`	`24`
`25`	`25`	`public override void Update()`
`26`	`26`	`{`
`27`		`- StopOrResumeAnimations();`
	`27`	`+ int drawX = 800, drawY = 600;`
`28`	`28`
`29`		`- AdjustAnimationSpeed();`
	`29`	`+ StopOrResumeAnimations(drawX, drawY += 20);`
`30`	`30`
`31`		`- DebugText.Print("I to start playing Idle", new Int2(320, 440));`
	`31`	`+ AdjustAnimationSpeed(drawX, drawY += 20);`
	`32`	`+`
	`33`	`+ DebugText.Print("I to start playing Idle", new Int2(drawX, drawY += 20));`
`32`	`34`	`if (Input.IsKeyPressed(Keys.I))`
`33`	`35`	`{`
`34`	`36`	`latestAnimation = animation.Play("Idle");`
`35`	`37`	`latestAnimation.TimeFactor = AnimationSpeed;`
`36`	`38`	`}`
`37`	`39`
`38`		`- DebugText.Print("R to crossfade to Run", new Int2(320, 460));`
	`40`	`+ DebugText.Print("R to crossfade to Run", new Int2(drawX, drawY += 20));`
`39`	`41`	`if (Input.IsKeyPressed(Keys.R))`
`40`	`42`	`{`
`41`	`43`	`latestAnimation = animation.Crossfade("Run", TimeSpan.FromSeconds(0.5));`
`42`	`44`	`latestAnimation.TimeFactor = AnimationSpeed;`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`// We can crossfade to a punch animation, but only if it is not already playing`
`46`		`- DebugText.Print("P to crossfade to Punch and play it once", new Int2(320, 480));`
	`48`	`+ DebugText.Print("P to crossfade to Punch and play it once", new Int2(drawX, drawY += 20));`
`47`	`49`	`if (Input.IsKeyPressed(Keys.P) && !animation.IsPlaying("Punch"))`
`48`	`50`	`{`
`49`	`51`	`latestAnimation = animation.Crossfade("Punch", TimeSpan.FromSeconds(0.1));`
`@@ -60,9 +62,9 @@ public override void Update()`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`
`63`		`- private void StopOrResumeAnimations()`
	`65`	`+ private void StopOrResumeAnimations(int drawX, int drawY)`
`64`	`66`	`{`
`65`		`- DebugText.Print($"S to pause or resume animations", new Int2(320, 420));`
	`67`	`+ DebugText.Print($"S to pause or resume animations", new Int2(drawX, drawY));`
`66`	`68`	`if (Input.IsKeyPressed(Keys.S))`
`67`	`69`	`{`
`68`	`70`	`foreach (var playingAnimation in animation.PlayingAnimations)`
`@@ -72,9 +74,9 @@ private void StopOrResumeAnimations()`
`72`	`74`	`}`
`73`	`75`	`}`
`74`	`76`
`75`		`- private void AdjustAnimationSpeed()`
	`77`	`+ private void AdjustAnimationSpeed(int drawX, int drawY)`
`76`	`78`	`{`
`77`		`- DebugText.Print($"Q and E for speed {AnimationSpeed:0.0}", new Int2(320, 400));`
	`79`	`+ DebugText.Print($"Q and E for speed {AnimationSpeed:0.0}", new Int2(drawX, drawY));`
`78`	`80`	`if (Input.IsKeyPressed(Keys.E))`
`79`	`81`	`{`
`80`	`82`	`AnimationSpeed += 0.1f;`
Original file line number	Diff line number	Diff line change
`@@ -28,16 +28,16 @@ public override void Start()`
`28`	`28`	`public override void Update()`
`29`	`29`	`{`
`30`	`30`	`// Play a sound`
`31`		`- DebugText.Print($"U to play the Ukelele once", new Int2(200, 40));`
	`31`	`+ DebugText.Print($"U to play the Ukelele once", new Int2(200, 580));`
`32`	`32`	`if (Input.IsKeyPressed(Keys.U))`
`33`	`33`	`{`
`34`	`34`	`ukuleleInstance.Stop();`
`35`	`35`	`ukuleleInstance.Play();`
`36`	`36`	`}`
`37`	`37`
`38`		`- // Press left mouse button fire gun`
`39`		`- DebugText.Print($"Press left mouse button fire gun", new Int2(200, 60));`
`40`		`- if (Input.IsMouseButtonPressed(MouseButton.Left))`
	`38`	`+ // Press right mouse button for gun fire sound`
	`39`	`+ DebugText.Print($"Press right mouse button fire gun", new Int2(200, 640));`
	`40`	`+ if (Input.IsMouseButtonPressed(MouseButton.Right))`
`41`	`41`	`{`
`42`	`42`	`gunSoundEmitter.Play();`
`43`	`43`	`}`