Merge pull request #128 from CreepNT/topic/correct_spline_ids

Assign proper ID to Splines when parsing a level

Author: MilchRatchet

LibReplanetizer/Level Objects/Gameplay/Spline.cs

@@ -21,8 +21,6 @@ public class Spline : LevelObject, ITransformable, IRenderable
         [Category("Attributes"), DisplayName("offset")]
         public long offset { get; set; }
 
-        static int CNT = 0;
-
         /*public override Vector3 position
         {
             get { return _position; }
@@ -57,20 +55,20 @@ public Spline(int name, float[] vertexBuffer)
             }
         }
 
-        public Spline(byte[] splineBlock, int offset)
+        public Spline(byte[] splineBlock, int offset, int id)
         {
+            this.id = id;
             this.offset = offset;
             LoadFromByteArray(splineBlock, offset);
         }
 
-        public static LevelObject CreateFromByteArray(byte[] splineBlock, int offset)
+        public static LevelObject CreateFromByteArray(byte[] splineBlock, int offset, int id)
         {
-            return new Spline(splineBlock, offset);
+            return new Spline(splineBlock, offset, id);
         }
 
         public void LoadFromByteArray(byte[] splineBlock, int offset)
         {
-            id = CNT;
             int count = ReadInt(splineBlock, offset);
             vertexBuffer = new float[count * 3];
             wVals = new float[count];
@@ -86,8 +84,6 @@ public void LoadFromByteArray(byte[] splineBlock, int offset)
             {
                 //_position = new Vector3(vertexBuffer[0], vertexBuffer[1], vertexBuffer[2]);
             }
-
-            CNT++;
         }
 
         public override byte[] ToByteArray()

LibReplanetizer/Parsers/GameplayParser.cs

@@ -43,7 +43,7 @@ public List<Spline> GetSplines()
             for (int i = 0; i < splineCount; i++)
             {
                 int offset = ReadInt(splineHeadBlock, (i * 4));
-                splines.Add(new Spline(splineBlock, offset));
+                splines.Add(new Spline(splineBlock, offset, i));
             }
             return splines;
         }
@@ -332,8 +332,12 @@ public List<GrindPath> GetGrindPaths()
 
             for (int i = 0; i < count; i++)
             {
+                /*
+                 * Use ID -1 for the Spline objects created here
+                 * as they are used only for rendering.
+                 */
                 int offset = ReadInt(splineHeadBlock, i * 0x04);
-                splines.Add(new Spline(splineBlock, offset));
+                splines.Add(new Spline(splineBlock, offset, -1));
             }
 
             for (int i = 0; i < count; i++)