SA2B model structs

X-Hax · Sep 14, 2019 · b4d762b · b4d762b
1 parent ef53523
commit b4d762b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/SA2ModLoader/include/SA2Variables.h b/SA2ModLoader/include/SA2Variables.h
@@ -157,7 +157,7 @@ DataPointer(int, CurrentChaoArea, 0x134046C);
 DataPointer(int, NextChaoArea, 0x134062C);
 DataPointer(ObjectListEntry, AL_RaceMaster_ObjectArray, 0x1353338);
 DataPointer(ObjectListHead, AL_RaceMaster_ObjectList, 0x13533F8);
-DataArray(NJS_VECTOR*, ProbablyChaoSpawnPoints, 0x1366260, 48);
+DataArray(NJS_VECTOR, ProbablyChaoSpawnPoints, 0x1366260, 48);
 DataArray(ChaoSegmentData, ChaoSegments, 0x1366580, 48);
 DataPointer(LevelHeader, ChaoHeader, 0x1367380);
 DataPointer(ObjectListEntry, IronGate2P_ObjectArray, 0x1368EB0);

diff --git a/SA2ModLoader/include/ninja.h b/SA2ModLoader/include/ninja.h
@@ -1148,32 +1148,32 @@ typedef struct {
 	void            *null;
 } NJS_MODEL_SADX;
 
-struct struct_0
+struct SA2B_VertexData
 {
 	char DataType; // 1 = Vertex, 3 = VColor?, 5 = UV?, 0xFF = end list
 	char ElementSize;
 	__int16 ElementCount;
 	int field_4;
-	void *Data;
+	void* Data;
 	int DataSize;
 };
 
-struct struct_1
+struct SA2B_GeometryData
 {
-	int  *ptr1;
-	int   cnt1;
-	char *ptr2;
-	int   cnt2;
+	int* ParameterOffset;
+	int   ParameterCount;
+	char* PrimitiveOffset;
+	int   PrimitiveCount;
 };
 
 struct SA2B_Model
 {
-	struct_0 *Vertices;
-	int field_4;
-	struct_1 *Poly;
-	int field_C;
-	__int16 PolyCount;
-	__int16 field_12;
+	SA2B_VertexData* Vertices;
+	int field_4; //unknown1?
+	SA2B_GeometryData* OpaqueGeoData;
+	SA2B_GeometryData* TranslucentGeoData;
+	__int16 OpaqueGeometryCount;
+	__int16 TranslucentGeometryCount;
 	NJS_VECTOR Center;
 	float Radius;
 };