Fix player being moved when hitting solid ceiling

Note that variable height jumps exist in the readme controls section Remove the 1 tile gap from level 3
nfaltermeier · Apr 6, 2021 · 089f397 · 089f397
1 parent 9b70e4c
commit 089f397
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/Components/PlayerController.cs b/Components/PlayerController.cs
@@ -163,9 +163,23 @@ public bool OnTouchWall(Fixture sender, Fixture wall, Contact contact)
                 Vector2 offset = points[0] - points[1];
                 if (offset.LengthSquared() < 5)
                 {
-                    Attached.Screen.ScreenManager.
-                        AddPostPhysicsStepAction(() => sender.Body.Position += offset * (reversed ? -1 : 1));
-                    ret = false;
+                    Vector2 raySource = points[reversed ? 1 : 0] + 2 * offset * (reversed ? -1 : 1);
+                    bool hit = false;
+                    MainGame.Instance.World.RayCast(
+                        (Fixture fixture, Vector2 point, Vector2 normal, float fraction) => {
+                            hit = fixture != null;
+                            return fraction;
+                        },
+                        raySource, raySource + new Vector2(0, 0.1f)
+                    );
+                    // If there is open space above where we are going to move the player
+                    // prevents the player from glitching out when touching a ceiling with no gaps
+                    if (!hit)
+                    {
+                        Attached.Screen.ScreenManager.
+                            AddPostPhysicsStepAction(() => sender.Body.Position += offset * (reversed ? -1 : 1));
+                        ret = false;
+                    }
                 }
             }
 

diff --git a/Content/Levels/3.tmx b/Content/Levels/3.tmx
@@ -15,7 +15,7 @@
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
 1,1,1,1,1,1,0,0,0,1,1,1,1,1,0,0,0,1,1,1,1,0,0,0,1,1,1,1,1,1,

diff --git a/README.txt b/README.txt
@@ -2,7 +2,7 @@ Swing. A platforming game. Navigate your blue square to the green square.
 
 ## Controls ##
 * Movement - WASD
-* Jump - Space
+* Jump - Space (Longer press means higher jump)
 * Interact with menu - Mouse
 * Pause - Escape