Merge branch 'model-ui-integration-work' of...

Merge branch 'model-ui-integration-work' of https://git.kucatdog.net/flatland/curvedflats into model-ui-integration-work

Assets/Scripts/FlatlandMovement.cs

@@ -170,15 +170,15 @@ public class FlatlandMovement : MonoBehaviour
         acceleration = (float)((Constants.c / deltat) * MathNet.Numerics.Trig.Asinh(v * Constants.Gamma(v * Constants.c))) * acceleration;
         // acceleration required to accelerate to v in deltat seconds: see https://en.wikiversity.org/wiki/Theory_of_relativity/Rindler_coordinates
 
-        var startv = levelManager.player.v;
+        var startv = this.v;
 
-        levelManager.player.alpha = acceleration;
+        this.alpha = acceleration;
 
         for(var j = 0; j < tinterval; ++j)
         {
             yield return new WaitForFixedUpdate();
         }
-        levelManager.player.alpha = new Vector3(0, 0, 0);
+        this.alpha = new Vector3(0, 0, 0);
 
         var atmp = (float)(v * Constants.c);
 
@@ -200,7 +200,7 @@ public class FlatlandMovement : MonoBehaviour
 
         Vector3 finaldeltav = new Vector3((float)(deltav[1] / tt), 0.0f, (float)(deltav[2] / tt));
 
-        levelManager.player.v = finaldeltav;
+        this.v = finaldeltav;
 
 
     }