From 5725698822d9d44e66f802a71e3253536d49ee9f Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 20 Apr 2024 11:06:56 -0700
Subject: [PATCH] build fix

---
 include/JSystem/J3DGraphAnimator/J3DSkinDeform.h |  2 +-
 src/JSystem/J3DGraphAnimator/J3DCluster.cpp      | 16 ++++++++--------
 src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
index 3adb43553..8dddbede3 100644
--- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
+++ b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
@@ -102,7 +102,7 @@ private:
     /* 0x00 */ J3DDeformData* mDeformData;
     /* 0x04 */ J3DAnmCluster* mAnmCluster;
     /* 0x08 */ f32* mWeightList;
-    /* 0x0C */ Vec* field_0x0c;
+    /* 0x0C */ f32* field_0x0c;
     /* 0x10 */ u32 mFlags;
 };  // Size: 0x14
 
diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
index 2fab82a67..0f4de6496 100644
--- a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
@@ -109,10 +109,10 @@ void J3DDeformer::deform(J3DVertexBuffer* vtx, u16 idx, f32* weightList) {
             f32* vtxNrmDeform = mDeformData->getVtxNrm();
 
             for (u16 i = 0; i < cluster->mNrmNum; i++) {
-                Vec* dst = &field_0x0c[i];
-                dst->x = 0.0f;
-                dst->y = 0.0f;
-                dst->z = 0.0f;
+                f32* dst = &field_0x0c[i * 3];
+                dst[0] = 0.0f;
+                dst[1] = 0.0f;
+                dst[2] = 0.0f;
 
                 for (u16 j = 0; j < cluster->mKeyNum; j++) {
                     u16 flag = key[j].field_0x8[i];
@@ -129,12 +129,12 @@ void J3DDeformer::deform(J3DVertexBuffer* vtx, u16 idx, f32* weightList) {
                     if (flag & 0x2000)
                         srcZ = -srcZ;
 
-                    dst->x += srcX * weightList[j];
-                    dst->y += srcY * weightList[j];
-                    dst->z += srcZ * weightList[j];
+                    dst[0] += srcX * weightList[j];
+                    dst[1] += srcY * weightList[j];
+                    dst[2] += srcZ * weightList[j];
                 }
 
-                normalize((f32*)dst);
+                normalize(dst);
             }
 
             for (u16 i = 0; i < cluster->field_0x16; i++) {
diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
index 55d914a9f..b12e06cf7 100644
--- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
@@ -98,7 +98,7 @@ void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) {
         cluster->mClusterVertex = &mpDeformData->mClusterVertex[vertexIdx];
         J3DDeformer* deformer = new J3DDeformer(mpDeformData);
         if (cluster->mNrmNum != 0) {
-            deformer->field_0x0c = new Vec[cluster->mNrmNum];
+            deformer->field_0x0c = new f32[cluster->mNrmNum * 3];
         } else {
             deformer->field_0x0c = NULL;
         }