More accurate camera data (#11)

petfriendamy · Oct 16, 2024 · e6cf116 · e6cf116
1 parent 2edea6b
commit e6cf116
Show file tree

Hide file tree

Showing 10 changed files with 260 additions and 146 deletions.
diff --git a/src/HexParser.cs b/src/HexParser.cs
@@ -10,6 +10,7 @@ namespace FF7Scarlet
     public static class HexParser
     {
         public const ushort NULL_OFFSET_16_BIT = 0xFFFF;
+        public const short NULL_OFFSET_16_BIT_SIGNED = -1;
         public const uint NULL_OFFSET_32_BIT = 0xFFFFFFFF;
         public static CultureInfo CultureInfo { get; } = new CultureInfo("en-US");
 

diff --git a/src/Point3D.cs b/src/Point3D.cs
@@ -2,11 +2,11 @@
 {
     public class Point3D
     {
-        public ushort X { get; }
-        public ushort Y { get; }
-        public ushort Z { get; }
+        public short X { get; }
+        public short Y { get; }
+        public short Z { get; }
 
-        public Point3D(ushort x, ushort y, ushort z)
+        public Point3D(short x, short y, short z)
         {
             X = x;
             Y = y;

diff --git a/src/SceneEditor/CameraPlacementData.cs b/src/SceneEditor/CameraPlacementData.cs
@@ -2,7 +2,7 @@
 {
     public class CameraPlacementData
     {
-        public const int POSITION_COUNT = 3, BLOCK_SIZE = 48;
+        public const int POSITION_COUNT = 4, BLOCK_SIZE = 48;
         private readonly Point3D[]
             cameraPositions = new Point3D[POSITION_COUNT],
             cameraDirections = new Point3D[POSITION_COUNT];
@@ -20,29 +20,29 @@ public CameraPlacementData()
         {
             for (int i = 0; i < POSITION_COUNT; ++i)
             {
-                CameraPositions[i] = new Point3D(HexParser.NULL_OFFSET_16_BIT, HexParser.NULL_OFFSET_16_BIT,
-                    HexParser.NULL_OFFSET_16_BIT);
-                CameraDirections[i] = new Point3D(HexParser.NULL_OFFSET_16_BIT, HexParser.NULL_OFFSET_16_BIT,
-                    HexParser.NULL_OFFSET_16_BIT);
+                CameraPositions[i] = new Point3D(HexParser.NULL_OFFSET_16_BIT_SIGNED, HexParser.NULL_OFFSET_16_BIT_SIGNED,
+                    HexParser.NULL_OFFSET_16_BIT_SIGNED);
+                CameraDirections[i] = new Point3D(HexParser.NULL_OFFSET_16_BIT_SIGNED, HexParser.NULL_OFFSET_16_BIT_SIGNED,
+                    HexParser.NULL_OFFSET_16_BIT_SIGNED);
             }
         }
 
         public CameraPlacementData(byte[] data)
         {
-            ushort x, y, z;
+            short x, y, z;
             using (var ms = new MemoryStream(data, false))
             using (var reader = new BinaryReader(ms))
             {
                 for (int i = 0; i < POSITION_COUNT; ++i)
                 {
-                    x = reader.ReadUInt16();
-                    y = reader.ReadUInt16();
-                    z = reader.ReadUInt16();
+                    x = reader.ReadInt16();
+                    y = reader.ReadInt16();
+                    z = reader.ReadInt16();
                     CameraPositions[i] = new Point3D(x, y, z);
 
-                    x = reader.ReadUInt16();
-                    y = reader.ReadUInt16();
-                    z = reader.ReadUInt16();
+                    x = reader.ReadInt16();
+                    y = reader.ReadInt16();
+                    z = reader.ReadInt16();
                     CameraDirections[i] = new Point3D(x, y, z);
                 }
             }
@@ -64,7 +64,6 @@ public byte[] GetRawData()
                     writer.Write(CameraDirections[i].Y);
                     writer.Write(CameraDirections[i].Z);
                 }
-                writer.Write(HexParser.GetNullBlock(12)); //padding
             }
             return data;
         }

diff --git a/src/SceneEditor/Controls/CameraPositionControl.Designer.cs b/src/SceneEditor/Controls/CameraPositionControl.Designer.cs