From 56690b7b6d124aff8ffacca8b829bd1acbc867f4 Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Fri, 17 Feb 2023 01:56:32 -0800
Subject: [PATCH] Add DCLN, and CBAH

---
 CAABoxCollisionTree.bt |  66 ----------------
 CAudioBusHierarchy.bt  |  30 ++++++++
 CCollisionTree.bt      | 166 +++++++++++++++++++++++++++++++++++++++++
 CDataEnumObject.bt     |  16 ++++
 COBBox.bt              |  12 +++
 Run.bt                 |  17 ++++-
 6 files changed, 238 insertions(+), 69 deletions(-)
 delete mode 100644 CAABoxCollisionTree.bt
 create mode 100644 CAudioBusHierarchy.bt
 create mode 100644 CCollisionTree.bt
 create mode 100644 CDataEnumObject.bt
 create mode 100644 COBBox.bt

diff --git a/CAABoxCollisionTree.bt b/CAABoxCollisionTree.bt
deleted file mode 100644
index c41632e..0000000
--- a/CAABoxCollisionTree.bt
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _CAABOXCOLLISIONTREE
-#define _CAABOXCOLLISIONTREE
-
-#include "CTransform4f.bt"
-
-struct CCollisionMaterial {
-  uint orientation;
-  uint materialType;
-  uint worldType;
-  uint behaviorList;
-  uint filterList;
-};
-
-struct CIndexedTriangle {
-  uint idx1;
-  uint idx2;
-  uint idx3;
-  ushort material;
-  ushort unk2;
-};
-
-struct CollisionMaterialVector {
-  uint count;
-  CCollisionMaterial collisionMaterials[count];
-};
-
-struct VertexVector {
-  uint count;
-  CVector3f vertices[count];
-};
-
-struct IndexedTriangleVector {
-  uint count;
-  CIndexedTriangle tris[count];
-};
-
-struct ModConData {
-  char id[16];
-  CTransform4f xf;
-  ushort unk;
-};
-
-struct CAABoxCollisionTree(uint64 size) {
-  local uint64 start<format = hex, hidden = true> = FTell();
-  while (FTell() != start + size) {
-    struct Chunk {
-      ChunkDescriptor desc;
-      union {
-        switch (desc.id) {
-        case "MTRL":
-          CollisionMaterialVector materials;
-          break;
-        case "TRIS":
-          IndexedTriangleVector triangles;
-          break;
-        case "VERT":
-          VertexVector vertices;
-          break;
-        }
-        char raw[desc.size];
-      } data;
-    } chunks;
-  }
-};
-
-#endif // _CAABOXCOLLISIONTREE
diff --git a/CAudioBusHierarchy.bt b/CAudioBusHierarchy.bt
new file mode 100644
index 0000000..f216dc8
--- /dev/null
+++ b/CAudioBusHierarchy.bt
@@ -0,0 +1,30 @@
+#ifndef _CAUDIOBUSHIERARCHY
+#define _CAUDIOBUSHIERARCHY
+
+typedef struct CAudioBusData {
+    uint unk1;
+    uint unk2;
+    float unk3;
+    float unk4;
+    float unk5;
+    float unk6;
+    float unk7;
+    ushort unk8;
+    ushort unk9;
+    ushort unk10;
+} CAudioBusData;
+
+typedef struct CAudioBus {
+    uchar unk1;
+    uchar unk2;
+    uchar unk3;
+    CAudioBusData data;
+    uint unk;
+} CAudioBus;
+
+typedef struct {
+    uint unk1;
+    CAudioBus buses[unk1];
+} CAudioBusHierarchy;
+
+#endif// _CAUDIOBUSHIERARCHY
diff --git a/CCollisionTree.bt b/CCollisionTree.bt
new file mode 100644
index 0000000..cef829a
--- /dev/null
+++ b/CCollisionTree.bt
@@ -0,0 +1,166 @@
+#ifndef _CAABOXCOLLISIONTREE
+#define _CAABOXCOLLISIONTREE
+
+#include "CAABox.bt"
+#include "COBBox.bt"
+#include "CTransform4f.bt"
+
+typedef enum {
+  kCOL_AABox = 0,
+  kCOL_OBBox = 1,
+} CollisionPrimitiveType;
+
+struct CAABoxTreeNode {
+  CAABox bounds;
+  uint start;
+  uint end;
+  uchar unk3;
+  uchar unk4;
+  uchar unk5;
+  uchar unk6;
+};
+
+struct COBBoxTreeNode {
+  COBBox bounds;
+  uint start;
+  uint end;
+  uchar unk3;
+  uchar unk4;
+  uchar unk5;
+  uchar unk6;
+};
+
+struct CCollisionMaterial {
+  uint orientation;
+  uint materialType;
+  uint worldType;
+  uint behaviorList;
+  uint filterList;
+};
+
+struct CIndexedTriangle {
+  uint idx1;
+  uint idx2;
+  uint idx3;
+  ushort material;
+  ushort unk2;
+};
+
+struct CollisionMaterialVector {
+  uint count;
+  CCollisionMaterial collisionMaterials[count];
+};
+
+struct VertexVector {
+  uint count;
+  CVector3f vertices[count];
+};
+
+struct IndexedTriangleVector {
+  uint count;
+  CIndexedTriangle tris[count];
+};
+
+struct TreeNodeVector(CollisionPrimitiveType type) {
+  uint count;
+  switch (type) {
+  case kCOL_AABox:
+    CAABoxTreeNode nodes[count];
+    break;
+  case kCOL_OBBox:
+    COBBoxTreeNode nodes[count];
+    break;
+  }
+};
+
+struct ModConData {
+  char id[16];
+  CTransform4f xf;
+  ushort unk;
+};
+
+typedef struct CCollisionTree(uint64 size, CollisionPrimitiveType type) {
+  local CollisionPrimitiveType tmpType <hidden = true> = type;
+  local uint64 start<format = hex, hidden = true> = FTell();
+  while (FTell() != start + size) {
+    struct Chunk {
+      ChunkDescriptor desc;
+      union {
+        switch (desc.id) {
+        case "INFO":
+          CAABox bounds;
+          break;
+        case "MTRL":
+          CollisionMaterialVector materials;
+          break;
+        case "TRIS":
+          IndexedTriangleVector triangles;
+          break;
+        case "VERT":
+          VertexVector vertices;
+          break;
+        case "TREE":
+          TreeNodeVector treeNodes(tmpType);
+          break;
+        }
+        char raw[desc.size];
+      } data;
+    } chunks;
+  }
+  /*
+    local int i = 0;
+    for (i = 0; i < chunks[0].data.vertices.count; ++i) {
+      Printf("v %f  %f %f\n", chunks[0].data.vertices.vertices[i].x,
+             chunks[0].data.vertices.vertices[i].y,
+             chunks[0].data.vertices.vertices[i].z);
+    }
+
+    local int t;
+    local int y;
+    local int prevMat = -1;
+    for (i = 0; i < chunks[2].data.triangles.count; ++i) {
+
+      if (chunks[2].data.triangles.tris[i].material != prevMat) {
+        Printf("o mat_%i_%08X\n", chunks[2].data.triangles.tris[i].material,
+               chunks[1]
+                   .data.materials
+                   .collisionMaterials[chunks[2].data.triangles.tris[i].material]
+                   .filterList);
+        prevMat = chunks[2].data.triangles.tris[i].material;
+      }
+      Printf("f %i %i %i\n", chunks[2].data.triangles.tris[i].idx1 + 1,
+             chunks[2].data.triangles.tris[i].idx2 + 1,
+             chunks[2].data.triangles.tris[i].idx3 + 1);
+    }
+  */
+  /*
+    for (i = 0; i < chunks[2].data.triangles.count; ++i) {
+      Printf("%i->%i: orientation=%08X, materialType=%08X, worldType=%08X, "
+             "behaviorList=%08X, filterList=%08X\n",
+             i, chunks[2].data.triangles.tris[i].material,
+             chunks[1]
+                 .data.materials
+                 .collisionMaterials[chunks[2].data.triangles.tris[i].material]
+                 .orientation,
+             chunks[1]
+                 .data.materials
+                 .collisionMaterials[chunks[2].data.triangles.tris[i].material]
+                 .materialType,
+             chunks[1]
+                 .data.materials
+                 .collisionMaterials[chunks[2].data.triangles.tris[i].material]
+                 .worldType,
+             chunks[1]
+                 .data.materials
+                 .collisionMaterials[chunks[2].data.triangles.tris[i].material]
+                 .behaviorList,
+             chunks[1]
+                 .data.materials
+                 .collisionMaterials[chunks[2].data.triangles.tris[i].material]
+                 .filterList);
+    }
+    */
+}
+CCollisionTree;
+
+#endif // _CAABOXCOLLISIONTREE
diff --git a/CDataEnumObject.bt b/CDataEnumObject.bt
new file mode 100644
index 0000000..c11673b
--- /dev/null
+++ b/CDataEnumObject.bt
@@ -0,0 +1,16 @@
+#ifndef _CDATAENUMOBJECT
+#define _CDATAENUMOBJECT
+
+typedef struct  {
+    uint id;
+    uint value;
+} CDataEnumValue;
+
+typedef struct {
+    uint unkCount;
+    CDataEnumValue enums[unkCount];
+    uint objectIdCount;
+    GUID objectIds[objectIdCount];
+} CDataEnumObject;
+
+#endif// _CDATAENUMOBJECT
diff --git a/COBBox.bt b/COBBox.bt
new file mode 100644
index 0000000..1d1514b
--- /dev/null
+++ b/COBBox.bt
@@ -0,0 +1,12 @@
+#ifndef _COBBOX
+#define _COBBOX
+
+#include "CTransform4f.bt"
+#include "CVector3f.bt"
+
+typedef struct COBBox {
+    CTransform4f xf;
+    CVector3f extents;
+} COBBox;
+
+#endif// _COBBOX
diff --git a/Run.bt b/Run.bt
index 7e2e335..4a7b5bc 100644
--- a/Run.bt
+++ b/Run.bt
@@ -15,12 +15,14 @@ if (!exists(isDKCTF)) {
 
 // Files
 #include "CCharInfo.bt"
+#include "CAudioBusHierarchy.bt"
+#include "CDataEnumObject.bt"
 #include "CLightProbeData.bt"
 #include "CPakFile.bt"
 #include "MessageStudioBinaryText.bt"
 #include "MaterialArchive.bt"
 #include "CVectorField.bt"
-#include "CAABoxCollisionTree.bt"
+#include "CCollisionTree.bt"
 #include "CReflectionProbeData.bt"
 #include "CLegacyStateMachine.bt"
 //#include "CRuleSet.bt"
@@ -41,9 +43,15 @@ typedef struct
             } else if (form.readerVersion == 22) {
                 MaterialArchive materialArchive(form.size);
             } else {
-                Assert("Invalid version!");
+                Assert(false, "Invalid version!");
             }
             break;
+        case "CABH":
+            CAudioBusHierarchy audioBusHierarchy;
+            break;
+        case "ENUM":
+            CDataEnumObject dataEnum;
+            break;
         case "LTPB":
             CLightProbeData lightProbe(form.size);
             break;
@@ -54,8 +62,11 @@ typedef struct
             if (!isDKCTF)
                 LittleEndian();
             break;
+        case "DCLN":
+            CCollisionTree obboxCollisionTree(form.size, kCOL_OBBox);
+        break;
         case "CLSN":
-            CAABoxCollisionTree aaboxCollisionTree(form.size);
+            CCollisionTree aaboxCollisionTree(form.size, kCOL_AABox);
             break;
         case "CHPR":
             FCharInf charInfo;