Progress

2015-12-04 01:37:30 +02:00
parent c064c5eb50
commit 242af12f14
25 changed files with 200 additions and 109 deletions
@@ -41,6 +41,7 @@ namespace Barotrauma
        private string filePath;
        private string name;

+        private Vector2 prevPosition;

        private float lastNetworkUpdate;

@@ -93,14 +94,18 @@ namespace Barotrauma
                return (loaded==null) ? Rectangle.Empty : Loaded.subBody.Borders;                
            }
        }
-
-
-
-        public Vector2 Position
+        
+        public override Vector2 Position
        {
            get { return subBody.Position; }
        }

+        public new Vector2 DrawPosition
+        {
+            get;
+            private set;
+        }
+
        public Vector2 Speed
        {
            get { return subBody==null ? Vector2.Zero : subBody.Speed; }
@@ -129,7 +134,7 @@ namespace Barotrauma

        //constructors & generation ----------------------------------------------------

-        public Submarine(string filePath, string hash = "")
+        public Submarine(string filePath, string hash = "") : base(null)
        {
            this.filePath = filePath;
            try
@@ -180,6 +185,12 @@ namespace Barotrauma
                    MapEntity.mapEntityList[i].Draw(spriteBatch, editing);
            }

+            if (Submarine.Loaded!=null)
+            {
+                Submarine.Loaded.DrawPosition = Physics.Interpolate(Submarine.Loaded.prevPosition, Submarine.Loaded.Position);
+            }
+        
+
            if (loaded == null) return;

            //foreach (HullBody hb in loaded.hullBodies)
@@ -373,6 +384,12 @@ namespace Barotrauma
            if (subBody != null) subBody.ApplyForce(force);
        }

+        public void SetPrevTransform(Vector2 position, Camera cam = null)
+        {
+            if (cam != null) cam.Position += prevPosition - position;
+            prevPosition = position;
+        }
+
        public void SetPosition(Vector2 position)
        {
            if (!MathUtils.IsValid(position)) return;
@@ -618,7 +635,7 @@ namespace Barotrauma
                try
                {
                    MethodInfo loadMethod = t.GetMethod("Load");
-                    loadMethod.Invoke(t, new object[] { element });
+                    loadMethod.Invoke(t, new object[] { element, this });
                }
                catch (Exception e)
                {