From f31a78657083ef1db6296826f4fc90f2a24ca48a Mon Sep 17 00:00:00 2001 From: copygirl Date: Mon, 2 Jul 2018 14:39:44 +0200 Subject: [PATCH] More messing with MoveAndSlide --- Level.tscn | 1 + Player.cs | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Level.tscn b/Level.tscn index c422acf..c35eddd 100644 --- a/Level.tscn +++ b/Level.tscn @@ -100,5 +100,6 @@ disabled = false [node name="Player" parent="." index="1" instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6, 0 ) +collision/safe_margin = 0.1 _sections_unfolded = [ "Axis Lock", "Transform", "collision" ] diff --git a/Player.cs b/Player.cs index 99e00a5..5d4704f 100644 --- a/Player.cs +++ b/Player.cs @@ -9,7 +9,7 @@ public class Player : KinematicBody private Vector3 _velocity = Vector3.Zero; public float MouseSensitivity { get; set; } = 0.2F; - public float Gravity { get; set; } = -9.8F; + public float Gravity { get; set; } = -19.8F; public float MaxMoveSpeed { get; set; } = 20.0F; public float MoveAcceleration { get; set; } = -4.5F; public float MoveDeacceleration { get; set; } = -16.0F; @@ -41,13 +41,16 @@ public override void _PhysicsProcess(float delta) // var lookVector = _camera.GetGlobalTransform(); // movementVector.Rotated(_rotation.Rotation.y); - GD.Print($"Floor: { IsOnFloor() }, Wall: { IsOnWall() }, Ceil: { IsOnCeiling() }"); - - if (Input.IsActionJustPressed("move_jump") && IsOnFloor()) - _velocity.y = JumpVelocity; + // if (Input.IsActionJustPressed("move_jump") && IsOnFloor()) + // _velocity.y = JumpVelocity; + var before = IsOnFloor(); _velocity = MoveAndSlide(_velocity, Vector3.Up, floorMaxAngle: Mathf.Deg2Rad(MaxSlopeAngle)); // GD.Print($"Velocity: { _velocity }"); + var after = IsOnFloor(); + GD.Print($"Before: { before }, After: { after }"); + // Just jump automatically if either call to IsOnFloor returned true. + if (before || after) _velocity.y = JumpVelocity; } public override void _UnhandledInput(InputEvent @event)