Known flags values implemented

HanabishiRecca · HanabishiRecca · commit 4477df2dd083 · 2020-01-23T00:32:31.000+05:00
diff --git a/FastMDX/src/Objects/CollisionShape.cs b/FastMDX/src/Objects/CollisionShape.cs
@@ -1,39 +1,43 @@
 ﻿namespace FastMDX {
     public struct CollisionShape : IDataRW {
         public Node Node;
-        public uint Type;
+        public ShapeType Type;
         public Vec3 Vertices1, Vertices2;
         public float Radius;
 
         void IDataRW.ReadFrom(DataStream ds) {
             ds.ReadData(ref Node);
             ds.ReadStruct(ref Type);
 
-            if(Type > 3)
+            if((uint)Type > 3)
                 throw new ParsingException();
 
             ds.ReadStruct(ref Vertices1);
 
-            if(Type != 2)
+            if(Type != ShapeType.Sphere)
                 ds.ReadStruct(ref Vertices2);
 
-            if(Type > 1)
+            if((Type == ShapeType.Sphere) || (Type == ShapeType.Cylinder))
                 ds.ReadStruct(ref Radius);
         }
 
         void IDataRW.WriteTo(DataStream ds) {
-            if(Type > 3)
-                throw new ParsingException();
-
             ds.WriteData(ref Node);
             ds.WriteStruct(Type);
             ds.WriteStruct(ref Vertices1);
 
-            if(Type != 2)
+            if(Type != ShapeType.Sphere)
                 ds.WriteStruct(ref Vertices2);
 
-            if(Type > 1)
+            if((Type == ShapeType.Sphere) || (Type == ShapeType.Cylinder))
                 ds.WriteStruct(Radius);
         }
+
+        public enum ShapeType : uint {
+            Box,
+            Plane,
+            Sphere,
+            Cylinder,
+        }
     }
 }
diff --git a/FastMDX/src/Objects/Geoset.cs b/FastMDX/src/Objects/Geoset.cs
@@ -5,7 +5,8 @@ namespace FastMDX {
 
     public struct Geoset : IDataRW {
         public Vec3[] VertexPositions, VertexNormals;
-        public uint[] FaceTypeGroups, FaceGroups, MatrixGroups, MatrixIndices;
+        public FaceTypeGroup[] FaceTypeGroups;
+        public uint[] FaceGroups, MatrixGroups, MatrixIndices;
         public ushort[] Faces;
         public byte[] VertexGroups;
         public LocalProperties Properties;
@@ -22,7 +23,7 @@ void IDataRW.ReadFrom(DataStream ds) {
             VertexNormals = ds.ReadStructArray<Vec3>();
 
             ds.CheckTag(PTYP);
-            FaceTypeGroups = ds.ReadStructArray<uint>();
+            FaceTypeGroups = ds.ReadStructArray<FaceTypeGroup>();
 
             ds.CheckTag(PCNT);
             FaceGroups = ds.ReadStructArray<uint>();
@@ -88,8 +89,27 @@ void IDataRW.WriteTo(DataStream ds) {
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         public struct LocalProperties {
             public int MaterialId;
-            public uint SelectionGroup, SelectionFlags;
+            public uint SelectionGroup;
+            public SelectionType SelectionType;
             public Extent Extent;
         }
+
+        public enum FaceTypeGroup : uint {
+            Points,
+            Lines,
+            LineLoop,
+            LineStrip,
+            Triangles,
+            TriangleStrip,
+            TriangleFan,
+            Quads,
+            QuadStrip,
+            Polygons,
+        }
+
+        public enum SelectionType : uint {
+            None,
+            Unselectable = 4,
+        }
     }
 }
diff --git a/FastMDX/src/Objects/GeosetAnimation.cs b/FastMDX/src/Objects/GeosetAnimation.cs
@@ -1,4 +1,5 @@
-﻿using System.Runtime.InteropServices;
+﻿using System;
+using System.Runtime.InteropServices;
 
 namespace FastMDX {
     using static OptionalBlocks;
@@ -31,9 +32,16 @@ void IDataRW.WriteTo(DataStream ds) {
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         public struct LocalProperties {
             public float Alpha;
-            public uint Flags;
+            public Flags Flags;
             public Color Color;
             public int GeosetId;
         }
+
+        [Flags]
+        public enum Flags : uint {
+            None = 0x0,
+            DropShadow = 0x1,
+            Color = 0x2,
+        }
     }
 }
diff --git a/FastMDX/src/Objects/Layer.cs b/FastMDX/src/Objects/Layer.cs
@@ -1,4 +1,5 @@
-﻿using System.Runtime.InteropServices;
+﻿using System;
+using System.Runtime.InteropServices;
 
 namespace FastMDX {
     using static OptionalBlocks;
@@ -30,9 +31,30 @@ void IDataRW.WriteTo(DataStream ds) {
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         public struct LocalProperties {
-            public uint FilterMode, ShadingFlags;
+            public FilterMode FilterMode;
+            public ShadingFlags ShadingFlags;
             public int TextureId, TextureAnimationId, CoordId;
             public float Alpha;
         }
+
+        public enum FilterMode : uint {
+            None,
+            Transparent,
+            Blend,
+            Additive,
+            AddAlpha,
+            Modulate,
+            Modulate2x,
+        }
+
+        [Flags]
+        public enum ShadingFlags : uint {
+            Unshaded = 0x1,
+            SphereEnvironmentMap = 0x2,
+            TwoSided = 0x10,
+            Unfogged = 0x20,
+            NoDepthTest = 0x40,
+            NoDepthSet = 0x80,
+        }
     }
 }
diff --git a/FastMDX/src/Objects/Light.cs b/FastMDX/src/Objects/Light.cs
@@ -39,12 +39,18 @@ void IDataRW.WriteTo(DataStream ds) {
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         public struct LocalProperties {
-            public uint Type;
+            public Type Type;
             public float AttenuationStart, AttenuationEnd;
             public Color Color;
             public float Intensity;
             public Color AmbientColor;
             public float AmbientIntensity;
         }
+
+        public enum Type : uint {
+            Omni,
+            Directional,
+            Ambient,
+        }
     }
 }
diff --git a/FastMDX/src/Objects/Material.cs b/FastMDX/src/Objects/Material.cs
@@ -1,4 +1,5 @@
-﻿using System.Runtime.InteropServices;
+﻿using System;
+using System.Runtime.InteropServices;
 
 namespace FastMDX {
     using static InnerBlocks;
@@ -26,7 +27,16 @@ void IDataRW.WriteTo(DataStream ds) {
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         public struct LocalProperties {
-            public uint PriorityPlane, Flags;
+            public uint PriorityPlane;
+            public Flags Flags;
+        }
+        
+        [Flags]
+        public enum Flags : uint {
+            None = 0x0,
+            ConstantColor = 0x1,
+            SortPrimitivesFarZ = 0x10,
+            FullResolution = 0x20,
         }
     }
 }
diff --git a/FastMDX/src/Objects/Node.cs b/FastMDX/src/Objects/Node.cs
@@ -1,4 +1,5 @@
-﻿using System.Runtime.InteropServices;
+﻿using System;
+using System.Runtime.InteropServices;
 
 namespace FastMDX {
     using static OptionalBlocks;
@@ -35,7 +36,7 @@ public struct LocalProperties {
 
             fixed byte name[(int)NAME_LEN];
             public int ObjectId, ParentId;
-            public uint Flags;
+            public Flags Flags;
 
             public string Name {
                 get {
@@ -48,5 +49,31 @@ public string Name {
                 }
             }
         }
+
+        [Flags]
+        public enum Flags : uint {
+            Helper = 0x0,
+            DontInheritTranslation = 0x1,
+            DontInheritRotation = 0x2,
+            DontInheritScaling = 0x4,
+            Billboarded = 0x8,
+            BillboardedLockX = 0x10,
+            BillboardedLockY = 0x20,
+            BillboardedLockZ = 0x40,
+            CameraAnchored = 0x80,
+            Bone = 0x100,
+            Light = 0x200,
+            EventObject = 0x400,
+            Attachment = 0x800,
+            ParticleEmitter = 0x1000,
+            CollisionShape = 0x2000,
+            RibbonEmitter = 0x4000,
+            PEUsesMdlPE2Unshaded = 0x8000,
+            PEUsesTgaPE2SortPrimitivesFarZ = 0x10000,
+            LineEmitter = 0x20000,
+            Unfogged = 0x40000,
+            ModelSpace = 0x80000,
+            XYQuad = 0x100000,
+        }
     }
 }
diff --git a/FastMDX/src/Objects/ParticleEmitter2.cs b/FastMDX/src/Objects/ParticleEmitter2.cs
@@ -39,14 +39,17 @@ void IDataRW.WriteTo(DataStream ds) {
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         public struct LocalProperties {
             public float Speed, Variation, Latitude, Gravity, Lifespan, EmissionRate, Length, Width;
-            public uint FilterMode, Rows, Columns, Flag;
+            public FilterMode FilterMode;
+            public uint Rows, Columns;
+            public HeadTailType HeadTailType;
             public float TailLength, Time;
             public SegmentColor SegmentColor;
             public SegmentAlpha SegmentAlpha;
             public Vec3 SegmentScaling;
             public Interval HeadInterval, HeadDecayInterval, TailInterval, TailDecayInterval;
             public int TextureId;
-            public uint Squirt, PriorityPlane;
+            public Squirt Squirt;
+            public uint PriorityPlane;
             public int ReplaceableId;
         }
 
@@ -64,5 +67,24 @@ public struct SegmentAlpha {
         public struct Interval {
             public uint Start, End, Repeat;
         }
+
+        public enum FilterMode : uint {
+            Blend,
+            Additive,
+            Modulate,
+            Modulate2x,
+            AddAlpha,
+        }
+
+        public enum HeadTailType : uint {
+            Head,
+            Tail,
+            Both,
+        }
+
+        public enum Squirt : uint {
+            NoSquirt,
+            Squirt,
+        }
     }
 }
diff --git a/FastMDX/src/Objects/Sequence.cs b/FastMDX/src/Objects/Sequence.cs
@@ -8,7 +8,7 @@ public unsafe struct Sequence {
         fixed byte name[(int)NAME_LEN];
         public uint IntervalStart, IntervalEnd;
         public float MoveSpeed;
-        public uint Flags;
+        public LoopType Type;
         public float Rarity;
         public uint SyncPoint;
         public Extent Extent;
@@ -23,5 +23,10 @@ public string Name {
                     BinaryString.Encode(value, n, NAME_LEN);
             }
         }
+
+        public enum LoopType : uint {
+            Looping,
+            NonLooping,
+        }
     }
 }
diff --git a/FastMDX/src/Objects/Texture.cs b/FastMDX/src/Objects/Texture.cs
@@ -1,4 +1,5 @@
-﻿using System.Runtime.InteropServices;
+﻿using System;
+using System.Runtime.InteropServices;
 
 namespace FastMDX {
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -7,7 +8,7 @@ public unsafe struct Texture {
 
         public int ReplaceableId;
         fixed byte name[(int)NAME_LEN];
-        public uint Flags;
+        public WrapFlags Flags;
 
         public string Name {
             get {
@@ -19,5 +20,12 @@ public string Name {
                     BinaryString.Encode(value, n, NAME_LEN);
             }
         }
+
+        [Flags]
+        public enum WrapFlags : uint {
+            None = 0x0,
+            WrapWidth = 0x1,
+            WrapHeight = 0x2,
+        }
     }
 }
diff --git a/FastMDX/src/Objects/Transform.cs b/FastMDX/src/Objects/Transform.cs
@@ -10,32 +10,39 @@ void IDataRW.ReadFrom(DataStream ds) {
             var tracksCount = ds.ReadStruct<uint>();
             ds.ReadStruct(ref Properties);
 
-            if(Properties.InterpolationType > 1)
+            if((uint)Properties.InterpolationType > 1)
                 TracksInter = ds.ReadStructArray<TrackInter<T>>(tracksCount);
             else
                 Tracks = ds.ReadStructArray<Track<T>>(tracksCount);
         }
 
         void IDataRW.WriteTo(DataStream ds) {
-            if(Properties.InterpolationType > 1)
+            if((uint)Properties.InterpolationType > 1)
                 ds.WriteStruct((uint)TracksInter.Length);
             else
                 ds.WriteStruct((uint)Tracks.Length);
 
             ds.WriteStruct(ref Properties);
 
-            if(Properties.InterpolationType > 1)
+            if((uint)Properties.InterpolationType > 1)
                 ds.WriteStructArray(TracksInter, false);
             else
                 ds.WriteStructArray(Tracks, false);
         }
 
-        bool IOptionalBlock.HasData => (Properties.InterpolationType > 1) ? (TracksInter?.Length > 0) : (Tracks?.Length > 0);
+        bool IOptionalBlock.HasData => ((uint)Properties.InterpolationType > 1) ? (TracksInter?.Length > 0) : (Tracks?.Length > 0);
 
         [StructLayout(LayoutKind.Sequential, Pack = 1)]
         public struct LocalProperties {
-            public uint InterpolationType;
+            public InterpolationType InterpolationType;
             public int GlobalSequenceId;
         }
+
+        public enum InterpolationType : uint {
+            None,
+            Linear,
+            Hermite,
+            Bezier,
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,18 @@ void IDataRW.WriteTo(DataStream ds) {`
`39`	`39`
`40`	`40`	`[StructLayout(LayoutKind.Sequential, Pack = 1)]`
`41`	`41`	`public struct LocalProperties {`
`42`		`- public uint Type;`
	`42`	`+ public Type Type;`
`43`	`43`	`public float AttenuationStart, AttenuationEnd;`
`44`	`44`	`public Color Color;`
`45`	`45`	`public float Intensity;`
`46`	`46`	`public Color AmbientColor;`
`47`	`47`	`public float AmbientIntensity;`
`48`	`48`	`}`
	`49`	`+`
	`50`	`+ public enum Type : uint {`
	`51`	`+ Omni,`
	`52`	`+ Directional,`
	`53`	`+ Ambient,`
	`54`	`+ }`
`49`	`55`	`}`
`50`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public unsafe struct Sequence {`
`8`	`8`	`fixed byte name[(int)NAME_LEN];`
`9`	`9`	`public uint IntervalStart, IntervalEnd;`
`10`	`10`	`public float MoveSpeed;`
`11`		`- public uint Flags;`
	`11`	`+ public LoopType Type;`
`12`	`12`	`public float Rarity;`
`13`	`13`	`public uint SyncPoint;`
`14`	`14`	`public Extent Extent;`
`@@ -23,5 +23,10 @@ public string Name {`
`23`	`23`	`BinaryString.Encode(value, n, NAME_LEN);`
`24`	`24`	`}`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ public enum LoopType : uint {`
	`28`	`+ Looping,`
	`29`	`+ NonLooping,`
	`30`	`+ }`
`26`	`31`	`}`
`27`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Runtime.InteropServices;`
	`1`	`+using System;`
	`2`	`+using System.Runtime.InteropServices;`
`2`	`3`
`3`	`4`	`namespace FastMDX {`
`4`	`5`	`[StructLayout(LayoutKind.Sequential, Pack = 1)]`
`@@ -7,7 +8,7 @@ public unsafe struct Texture {`
`7`	`8`
`8`	`9`	`public int ReplaceableId;`
`9`	`10`	`fixed byte name[(int)NAME_LEN];`
`10`		`- public uint Flags;`
	`11`	`+ public WrapFlags Flags;`
`11`	`12`
`12`	`13`	`public string Name {`
`13`	`14`	`get {`
`@@ -19,5 +20,12 @@ public string Name {`
`19`	`20`	`BinaryString.Encode(value, n, NAME_LEN);`
`20`	`21`	`}`
`21`	`22`	`}`
	`23`	`+`
	`24`	`+ [Flags]`
	`25`	`+ public enum WrapFlags : uint {`
	`26`	`+ None = 0x0,`
	`27`	`+ WrapWidth = 0x1,`
	`28`	`+ WrapHeight = 0x2,`
	`29`	`+ }`
`22`	`30`	`}`
`23`	`31`	`}`