AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 13:37:02 +00:00
Code Issues Projects Releases Wiki Activity

More CModel RE, removed the separated normal types hack

Browse Source
This commit is contained in:
Phillip Stephens
2022-02-03 07:24:41 -08:00
parent a6106b6c42
commit 9461fe0563
2 changed files with 114 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
Runtime/Graphics/CCubeModel.hpp
View File

@@ -34,7 +34,7 @@ private:
std::unique_ptr<u8[]> x0_data;
u32 x4_dataLen;
std::vector<CCubeSurface> x8_surfaces;
std::vector<std::unique_ptr<CCubeSurface>> x8_surfaces; // Was a vector of void*
std::vector<SShader> x18_matSets;
std::unique_ptr<CCubeModel> x28_modelInst = nullptr;
u16 x2c_ = 0;
@@ -43,10 +43,8 @@ private:
CModel* x34_next;
u32 x38_lastFrame;
/* Resident copies of maintained data */
zeus::CAABox m_aabox;
std::vector<zeus::CVector3f> m_positions;
std::vector<zeus::CVector3f> m_floatNormals;
std::vector<std::array<s16, 3>> m_shortNormals;
std::vector<zeus::CVector3f> m_normals;
std::vector<zeus::CColor> m_colors;
std::vector<zeus::CVector2f> m_floatUVs;
std::vector<std::array<s16, 2>> m_shortUVs;
@@ -67,15 +65,60 @@ public:
#pragma region CCubeModel
class CCubeModel {
private:
class ModelInstance {
const std::vector<std::unique_ptr<CCubeSurface>>* x0_surfacePtrs; // was a pointer to vector of void
const u8* x4_materialData;
const std::vector<zeus::CVector3f>* x8_positions; // was a pointer to void
const std::vector<zeus::CVector3f>* xc_normals; // was a pointer to void
const std::vector<zeus::CColor>* x10_colors; // was a pointer to void
const std::vector<zeus::CVector2f>* x14_texCoords; // was a pointer to void
const std::vector<std::array<s16, 2>>* x18_packedTexCoords; // was a pointer to void
public:
ModelInstance(const std::vector<std::unique_ptr<CCubeSurface>>* surfaces, const u8* material,
const std::vector<zeus::CVector3f>* positions, const std::vector<zeus::CColor>* colors,
const std::vector<zeus::CVector3f>* normals, const std::vector<zeus::CVector2f>* texCoords,
const std::vector<std::array<s16, 2>>* packedTexCoords)
: x0_surfacePtrs(surfaces)
, x4_materialData(material)
, x8_positions(positions)
, xc_normals(normals)
, x10_colors(colors)
, x14_texCoords(texCoords)
, x18_packedTexCoords(packedTexCoords) {}
/* These functions have been slightly modified from their original to return the actual vector instead of a raw
* pointer
*/
[[nodiscard]] const std::vector<std::unique_ptr<CCubeSurface>>& Surfaces() const { return *x0_surfacePtrs; }
[[nodiscard]] const u8* GetMaterialPointer() const { return x4_materialData; }
void SetMaterialPointer(const u8* mat) { x4_materialData = mat; }
[[nodiscard]] const std::vector<zeus::CVector3f>& GetVertexPointer() const { return *x8_positions; }
[[nodiscard]] const std::vector<zeus::CVector3f>& GetNormalPointer() const { return *xc_normals; }
[[nodiscard]] const std::vector<zeus::CColor>& GetColorPointer() const { return *x10_colors; }
[[nodiscard]] const std::vector<zeus::CVector2f>& GetTCPointer() const { return *x14_texCoords; }
[[nodiscard]] const std::vector<std::array<s16, 2>>& GetPackedTCPointer() const { return *x18_packedTexCoords; }
};
ModelInstance x0_modelInstance;
const std::vector<TCachedToken<CTexture>>* x1c_textures;
zeus::CAABox x20_worldAABB;
CCubeSurface* x38_firstUnsortedSurf = nullptr;
CCubeSurface* x3c_firstSortedSurf = nullptr;
bool x40_24_;
u8 x41_visorFlags;
u32 x44_idx;
public:
CCubeModel(const std::vector<CCubeSurface>* surfaces, const std::vector<TCachedToken<CTexture>>* textures,
const u8* materialData, const std::vector<zeus::CVector3f>* positions,
const std::vector<zeus::CVector3f>* floatNormals, const std::vector<std::array<s16, 3>>* shortNormals,
const std::vector<zeus::CColor>* vtxColors, const std::vector<zeus::CVector2f>* floatUvs,
const std::vector<std::array<s16, 2>>* shortUVs, const zeus::CAABox* aabox, u8 flags, bool b1, u32 w1) {}
CCubeModel(const std::vector<std::unique_ptr<CCubeSurface>>* surfaces,
const std::vector<TCachedToken<CTexture>>* textures, const u8* materialData,
const std::vector<zeus::CVector3f>* positions, const std::vector<zeus::CColor>* colors,
const std::vector<zeus::CVector3f>* normals, const std::vector<zeus::CVector2f>* texCoords,
const std::vector<std::array<s16, 2>>* packedTexCoords, const zeus::CAABox& aabox, u8 flags, bool b1,
u32 idx);
void UnlockTextures();
static void MakeTexturesFromMats(const u8* ptr, std::vector<TCachedToken<CTexture>>& texture, bool b1);
};
#pragma endregion
@@ -83,29 +126,31 @@ public:
#pragma region CCubeSurface
class CCubeSurface {
static constexpr zeus::CVector3f skDefaultNormal{1.f, 0.f, 0.f};
public:
enum class ECookie {
};
zeus::CVector3f x0_center;
u32 xc_materialIndex;
u32 x10_displayListSize;
CCubeModel* x14_parent;
CCubeSurface* x18_nextSurface;
u32 x1c_extraSize;
zeus::CVector3f x20_normal;
zeus::CAABox x2c_bounds;
public:
CCubeSurface(u8* ptr);
bool IsValid() const;
static CCubeSurface* FromCookieValue(u32 value);
void GetCookie(ECookie cookie);
void SetCookie(ECookie cookie, u32 value);
u32 GetCookieValue() const;
s32 GetMaterialIndex() const;
s32 GetDisplayListSize() const;
u8* GetDisplayList() const;
u32 GetSurfaceHeaderSize() const;
zeus::CVector3f GetCenter() const;
u32 GetNormalHint() const;
zeus::CAABox GetBounds() const;
void SetParent(CCubeModel* parent) { x14_parent = parent; }
[[nodiscard]] u32 GetMaterialIndex() const { return xc_materialIndex; }
[[nodiscard]] u32 GetDisplayListSize() const { return x10_displayListSize & 0x7fffffff; }
[[nodiscard]] u32 GetNormalHint() const { return (x10_displayListSize >> 31) & 1; }
[[nodiscard]] u8* GetDisplayList() const;
// u32 GetSurfaceHeaderSize() const { }
[[nodiscard]] zeus::CVector3f GetCenter() const { return x0_center; }
[[nodiscard]] zeus::CAABox GetBounds() const {
return x1c_extraSize != 0 ? x2c_bounds : zeus::CAABox{x0_center, x0_center};
}
};
#pragma endregion
CFactoryFnReturn FModelFactory(const metaforce::SObjectTag& tag, std::unique_ptr<u8[]>&& in, u32 len,
const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef);
} // namespace metaforce
} // namespace metaforce::WIP