Fixed so that player grounded is unaffected by gravity from (other) planets, partially fixes #5 and the commit Måns made a few commits back

Author: ErikBjare

Assets/Scripts/GravitySink.cs

@@ -3,19 +3,29 @@
 
 [RequireComponent(typeof(Rigidbody))]
 public class GravitySink : MonoBehaviour {
-
-	bool autoApply = true;
 	Rigidbody body;
 	Vector3 force;
 	Vector3 prevForce;
 
+	bool acceptsForce = true;
+	bool autoApply = true;
+
 	// Use this for initialization
 	void Start () {
 		body = GetComponent<Rigidbody> ();
 	}
 
 	public void addForce(Vector3 force) {
-		this.force += force;
+		// TODO: There is no need to even calculate the force if it is never applied
+		//       So the logic that calculates gravity should probably take the enabled
+		//	     state of the GravitySink into consideration.
+		if (acceptsForce) {
+			this.force += force;
+		}
+	}
+
+	public void setAcceptsForce(bool acceptsForce) {
+		this.acceptsForce = acceptsForce;
 	}
 
 	public void setAutoApply(bool autoApply) {
@@ -33,7 +43,7 @@ void FixedUpdate() {
 	void FixedUpdate() {
 		if (autoApply) {
 			body.AddForce (force);
+			force = Vector3.zero;
 		}
-		force = Vector3.zero;
 	}
 }

Assets/Scripts/PlayerController.cs

@@ -227,11 +227,16 @@ void movePlayer(float forwardCharacterInput, float sidewaysCharacterInput, float
 			camerat = (camerat * Mathf.Cos (degree_rotation * Mathf.PI / 180) + trajectory2 * Mathf.Sin (degree_rotation * Mathf.PI / 180)).normalized;
 		}
 
+		GravitySink gravitySink = this.GetComponent<GravitySink> ();
+
 		if (isBound || stuck) {
 			// Måns is love, Måns is life
 			// We should only do this when grounded, otherwise jumping will be weird
 			// Also, we should inherit the planet velocity when grounded and jumping
 
+			// Don't apply gravity when grounded
+			gravitySink.setAcceptsForce (false);
+
 			// Calculate how much the planet has moved since last cycle, and move the player along with it.
 			Vector3 dv = planet.transform.position - planetProperties.position;
 			planetProperties = new PlanetProperties (planet, playerHeight);
@@ -258,13 +263,14 @@ void movePlayer(float forwardCharacterInput, float sidewaysCharacterInput, float
 			} else {
 				body.velocity = factor * moveSpeed * (forwardOrBackwardVector + sidewaysVector).normalized;
 			}
-			if (isBound) {
-				land ();
-			}
+			land ();
+
 			if (jump) {
 				body.position += up * 2 * planetProperties.boundaryCondition;
 				body.velocity += up * jumpSpeed;
 			}
+		} else {
+			gravitySink.setAcceptsForce (true);
 		}