Merge pull request bfbbdecomp#10 from LivewireCB/dev

Ported all x***.h files over from BFBB. Ported some z***.cpp/.h files. Completed iException and linked it.

Author: LivewireCB

configure.py

@@ -339,7 +339,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "SB/Game/zParticleCustom.cpp"),
             Object(NonMatching, "SB/Core/gc/iWad.cpp"),
             Object(NonMatching, "SB/Core/gc/iTRC.cpp"),
-            Object(NonMatching, "SB/Core/gc/iException.cpp"),
+            Object(Matching, "SB/Core/gc/iException.cpp"),
             Object(NonMatching, "SB/Core/gc/iScrFX.cpp"),
             Object(NonMatching, "SB/Core/gc/iARAMTmp.cpp"),
 

include/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h

@@ -18,4 +18,4 @@ long abs(long n);
 }
 #endif
 
-#endif
+#endif

src/SB/Core/gc/iAnim.h

@@ -0,0 +1,16 @@
+#ifndef IANIM_H
+#define IANIM_H
+
+#include "xMath3.h"
+
+extern U8* giAnimScratch;
+
+void iAnimInit();
+F32 iAnimDuration(void* RawData);
+U32 iAnimBoneCount(void* RawData);
+void iAnimBlend(F32 BlendFactor, F32 BlendRecip, U16* BlendTimeOffset, F32* BoneTable,
+                U32 BoneCount, xVec3* Tran1, xQuat* Quat1, xVec3* Tran2, xQuat* Quat2,
+                xVec3* TranDest, xQuat* QuatDest);
+void iAnimEval(void* RawData, float time, unsigned int flags, class xVec3* tran, class xQuat* quat);
+
+#endif

src/SB/Core/gc/iAnimSKB.h

@@ -0,0 +1,26 @@
+#ifndef IANIMSKB_H
+#define IANIMSKB_H
+
+#include "xMath3.h"
+
+struct iAnimSKBHeader
+{
+    U32 Magic;
+    U32 Flags;
+    U16 BoneCount;
+    U16 TimeCount;
+    U32 KeyCount;
+    F32 Scale[3];
+};
+
+struct iAnimSKBKey
+{
+    U16 TimeIndex;
+    S16 Quat[4];
+    S16 Tran[3];
+};
+
+void iAnimEvalSKB(iAnimSKBHeader* data, F32 time, U32 flags, xVec3* tran, xQuat* quat);
+F32 iAnimDurationSKB(iAnimSKBHeader* data);
+
+#endif

src/SB/Core/gc/iCollide.h

@@ -0,0 +1,17 @@
+#ifndef ICOLLIDE_H
+#define ICOLLIDE_H
+
+#include "xMath3.h"
+#include "xModel.h"
+#include "xEnv.h"
+#include "xCollide.h"
+
+void iBoxForModelLocal(xBox* o, const xModelInstance* m);
+void iBoxForModel(xBox* o, const xModelInstance* m);
+S32 iSphereHitsEnv3(const xSphere* b, const xEnv* env, xCollis* colls, U8 ncolls, F32 sth);
+S32 iSphereHitsModel3(const xSphere* b, const xModelInstance* m, xCollis* colls, U8 ncolls,
+                        F32 sth);
+U32 iRayHitsModel(const xRay3* r, const xModelInstance* m, xCollis* coll);
+void iCollideInit(xScene* sc);
+
+#endif

src/SB/Core/gc/iCollideFast.h

@@ -0,0 +1,8 @@
+#ifndef ICOLLIDEFAST_H
+#define ICOLLIDEFAST_H
+
+#include "xScene.h"
+
+void iCollideFastInit(xScene* sc);
+
+#endif

src/SB/Core/gc/iColor.h

@@ -0,0 +1,23 @@
+#ifndef ICOLOR_H
+#define ICOLOR_H
+
+#include <types.h>
+
+struct iColor_tag
+{
+    U8 r;
+    U8 g;
+    U8 b;
+    U8 a;
+
+    iColor_tag& operator=(const iColor_tag& rhs)
+    {
+        this->r = rhs.r;
+        this->g = rhs.g;
+        this->b = rhs.b;
+        this->a = rhs.a;
+        return *this;
+    };
+};
+
+#endif

src/SB/Core/gc/iCutscene.h

@@ -0,0 +1,15 @@
+#ifndef ICUTSCENE_H
+#define ICUTSCENE_H
+
+#include "xCutscene.h"
+#include "xSnd.h"
+
+void iCSSoundSetup(xCutscene* csn);
+void* iCSSoundGetData(xSndVoiceInfo* vp, U32* size);
+U32 iCSFileOpen(xCutscene* csn);
+void iCSFileAsyncRead(xCutscene* csn, void* dest, U32 size);
+void iCSFileAsyncSkip(xCutscene* csn, U32 amount);
+void iCSFileClose(xCutscene* csn);
+S32 iCSLoadStep(xCutscene* csn);
+
+#endif

src/SB/Core/gc/iDraw.h

@@ -0,0 +1,10 @@
+#ifndef IDRAW_H
+#define IDRAW_H
+
+#include <types.h>
+
+void iDrawSetFBMSK(U32 abgr);
+void iDrawBegin();
+void iDrawEnd();
+
+#endif

src/SB/Core/gc/iEnv.h

@@ -0,0 +1,30 @@
+#ifndef IENV_H
+#define IENV_H
+
+#include "xJSP.h"
+
+#include <rwcore.h>
+#include <rpworld.h>
+
+struct iEnv
+{
+    RpWorld* world;
+    RpWorld* collision;
+    RpWorld* fx;
+    RpWorld* camera;
+    xJSPHeader* jsp;
+    RpLight* light[2];
+    RwFrame* light_frame[2];
+    S32 memlvl;
+};
+
+struct xEnvAsset;
+
+void iEnvLoad(iEnv* env, const void* data, U32 datasize, S32 dataType);
+void iEnvFree(iEnv* env);
+void iEnvDefaultLighting(iEnv*);
+void iEnvLightingBasics(iEnv*, xEnvAsset*);
+void iEnvRender(iEnv* env);
+void iEnvEndRenderFX(iEnv*);
+
+#endif