mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-16 14:57:03 +00:00
Begin transitioning to new CModel/CCubeModel & friends
This commit is contained in:
@@ -3,84 +3,42 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "Runtime/GCNTypes.hpp"
|
||||
#include "Runtime/IObjectStore.hpp"
|
||||
#include "Runtime/Graphics/CTexture.hpp"
|
||||
#include "Runtime/CToken.hpp"
|
||||
#include "CStopwatch.hpp"
|
||||
#include "CToken.hpp"
|
||||
#include "GCNTypes.hpp"
|
||||
#include "Graphics/CTexture.hpp"
|
||||
#include "IObjectStore.hpp"
|
||||
|
||||
namespace metaforce::WIP {
|
||||
namespace metaforce {
|
||||
class CCubeSurface;
|
||||
class CCubeModel;
|
||||
class CCubeMaterial;
|
||||
struct CModelFlags;
|
||||
|
||||
#pragma region CModel
|
||||
class CModel {
|
||||
public:
|
||||
struct SShader {
|
||||
std::vector<TCachedToken<CTexture>> x0_textures;
|
||||
const u8* x10_data;
|
||||
|
||||
explicit SShader(const u8* data) : x10_data(data) {}
|
||||
|
||||
void UnlockTextures(){};
|
||||
};
|
||||
|
||||
private:
|
||||
static u32 sTotalMemory;
|
||||
static u32 sFrameCounter;
|
||||
static bool sIsTextureTimeoutEnabled;
|
||||
static CModel* sThisFrameList;
|
||||
static CModel* sOneFrameList;
|
||||
static CModel* sTwoFrameList;
|
||||
|
||||
std::unique_ptr<u8[]> x0_data;
|
||||
u32 x4_dataLen;
|
||||
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;
|
||||
u16 x2e_ = 0;
|
||||
CModel* x30_prev = nullptr;
|
||||
CModel* x34_next;
|
||||
u32 x38_lastFrame;
|
||||
/* Resident copies of maintained data */
|
||||
std::vector<zeus::CVector3f> m_positions;
|
||||
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;
|
||||
|
||||
public:
|
||||
CModel(std::unique_ptr<u8[]> in, u32 dataLen, IObjectStore* store);
|
||||
|
||||
void UpdateLastFrame();
|
||||
void MoveToThisFrameList();
|
||||
void RemoveFromList();
|
||||
void VerifyCurrentShader(s32 idx){};
|
||||
static void FrameDone();
|
||||
static void EnableTextureTimeout();
|
||||
static void DisableTextureTimeout();
|
||||
enum class ESurfaceSelection {
|
||||
Unsorted,
|
||||
Sorted,
|
||||
};
|
||||
|
||||
#pragma endregion
|
||||
// These parameters were originally float*
|
||||
using TVectorRef = const std::vector<zeus::CVector3f>*;
|
||||
|
||||
#pragma region CCubeModel
|
||||
class CCubeModel {
|
||||
friend class CModel;
|
||||
|
||||
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
|
||||
std::vector<CCubeSurface>* x0_surfacePtrs; // was rstl::vector<void*>*
|
||||
u8* x4_materialData; //
|
||||
std::vector<zeus::CVector3f>* x8_positions; // was void*
|
||||
std::vector<zeus::CVector3f>* xc_normals; // was void*
|
||||
std::vector<zeus::CColor>* x10_colors; // was void*
|
||||
std::vector<zeus::CVector2f>* x14_texCoords; // was void*
|
||||
std::vector<zeus::CVector2f>* x18_packedTexCoords; // was void*
|
||||
|
||||
public:
|
||||
ModelInstance(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)
|
||||
ModelInstance(std::vector<CCubeSurface>* surfaces, u8* material, std::vector<zeus::CVector3f>* positions,
|
||||
std::vector<zeus::CColor>* colors, std::vector<zeus::CVector3f>* normals,
|
||||
std::vector<zeus::CVector2f>* texCoords, std::vector<zeus::CVector2f>* packedTexCoords)
|
||||
: x0_surfacePtrs(surfaces)
|
||||
, x4_materialData(material)
|
||||
, x8_positions(positions)
|
||||
@@ -89,17 +47,18 @@ private:
|
||||
, x14_texCoords(texCoords)
|
||||
, x18_packedTexCoords(packedTexCoords) {}
|
||||
|
||||
/* These functions have been slightly modified from their original to return the actual vector instead of a raw
|
||||
/*
|
||||
* 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; }
|
||||
[[nodiscard]] std::vector<CCubeSurface>* Surfaces() const { return x0_surfacePtrs; }
|
||||
[[nodiscard]] u8* GetMaterialPointer() const { return x4_materialData; }
|
||||
void SetMaterialPointer(u8* mat) { x4_materialData = mat; }
|
||||
[[nodiscard]] TVectorRef GetVertexPointer() const { return x8_positions; }
|
||||
[[nodiscard]] TVectorRef GetNormalPointer() const { return xc_normals; }
|
||||
[[nodiscard]] std::vector<zeus::CColor>* GetColorPointer() const { return x10_colors; }
|
||||
[[nodiscard]] std::vector<zeus::CVector2f>* GetTCPointer() const { return x14_texCoords; }
|
||||
[[nodiscard]] std::vector<zeus::CVector2f>* GetPackedTCPointer() const { return x18_packedTexCoords; }
|
||||
};
|
||||
|
||||
ModelInstance x0_modelInstance;
|
||||
@@ -107,98 +66,51 @@ private:
|
||||
zeus::CAABox x20_worldAABB;
|
||||
CCubeSurface* x38_firstUnsortedSurf = nullptr;
|
||||
CCubeSurface* x3c_firstSortedSurf = nullptr;
|
||||
bool x40_24_;
|
||||
bool x40_24_texturesLoaded : 1 = false;
|
||||
bool x40_25_modelVisible : 1 = false;
|
||||
u8 x41_visorFlags;
|
||||
u32 x44_idx;
|
||||
|
||||
public:
|
||||
CCubeModel(std::vector<std::unique_ptr<CCubeSurface>>* surfaces,
|
||||
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);
|
||||
CCubeModel(std::vector<CCubeSurface>* surfaces, std::vector<TCachedToken<CTexture>>* textures, u8* materialData,
|
||||
std::vector<zeus::CVector3f>* positions, std::vector<zeus::CColor>* colors,
|
||||
std::vector<zeus::CVector3f>* normals, std::vector<zeus::CVector2f>* texCoords,
|
||||
std::vector<zeus::CVector2f>* packedTexCoords, const zeus::CAABox& aabb, u8 flags, bool b1, u32 idx);
|
||||
|
||||
CCubeMaterial GetMaterialByIndex(u32 idx);
|
||||
bool TryLockTextures();
|
||||
void UnlockTextures();
|
||||
static void MakeTexturesFromMats(const u8* ptr, std::vector<TCachedToken<CTexture>>& texture, IObjectStore* store, bool b1);
|
||||
void RemapMaterialData(u8* data, std::vector<TCachedToken<CTexture>>& textures);
|
||||
void Draw(CModelFlags flags);
|
||||
void DrawAlpha(CModelFlags flags);
|
||||
void DrawFlat(TVectorRef positions, TVectorRef normals, ESurfaceSelection surfaces);
|
||||
void DrawNormal(TVectorRef positions, TVectorRef normals, ESurfaceSelection surfaces);
|
||||
void DrawNormal(CModelFlags flags);
|
||||
void DrawSurface(const CCubeSurface& surface, CModelFlags flags);
|
||||
void DrawSurfaceWireframe(const CCubeSurface& surface);
|
||||
void SetArraysCurrent();
|
||||
|
||||
TVectorRef GetPositions() const { return x0_modelInstance.GetVertexPointer(); }
|
||||
TVectorRef GetNormals() const { return x0_modelInstance.GetNormalPointer(); }
|
||||
|
||||
static void EnableShadowMaps(CTexture shadowTex, zeus::CTransform textureProjXf, u8 chan0DisableMask,
|
||||
u8 chan1EnableLightMask);
|
||||
static void DisableShadowMaps();
|
||||
static void MakeTexturesFromMats(const u8* ptr, std::vector<TCachedToken<CTexture>>& texture, IObjectStore* store,
|
||||
bool b1);
|
||||
static void KillCachedViewDepState();
|
||||
static void SetDrawingOccluders(bool v);
|
||||
static void SetModelWireframe();
|
||||
static void SetNewPlayerPositionAndTime(const zeus::CVector3f& pos, const CStopwatch& time);
|
||||
static void SetRenderModelBlack(bool v);
|
||||
|
||||
private:
|
||||
void Draw(TVectorRef positions, TVectorRef normals, CModelFlags flags);
|
||||
void DrawAlphaSurfaces(CModelFlags flags);
|
||||
void DrawNormalSurfaces(CModelFlags flags);
|
||||
void DrawSurfaces(CModelFlags flags);
|
||||
void SetSkinningArraysCurrent(TVectorRef positions, TVectorRef normals);
|
||||
void SetStaticArraysCurrent();
|
||||
void SetUsingPackedLightmaps(bool v);
|
||||
};
|
||||
#pragma endregion
|
||||
|
||||
#pragma region CCubeSurface
|
||||
class CCubeSurface {
|
||||
static constexpr zeus::CVector3f skDefaultNormal{1.f, 0.f, 0.f};
|
||||
u8* x0_data;
|
||||
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:
|
||||
explicit CCubeSurface(u8* ptr);
|
||||
bool IsValid() const;
|
||||
void SetParent(CCubeModel* parent) { x14_parent = parent; }
|
||||
void SetNextSurface(CCubeSurface* next) { x18_nextSurface = next; }
|
||||
[[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 {
|
||||
return reinterpret_cast<u8*>(reinterpret_cast<uintptr_t>(x0_data) + GetSurfaceHeaderSize());
|
||||
}
|
||||
u32 GetSurfaceHeaderSize() const { return (0x4b + x1c_extraSize) & ~31; }
|
||||
[[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
|
||||
|
||||
#pragma region CCubeMaterial
|
||||
|
||||
enum class EStateFlags {
|
||||
Unused1 = 1 << 0,
|
||||
Unused2 = 1 << 1,
|
||||
Unused3 = 1 << 2,
|
||||
KonstEnabled = 1 << 3,
|
||||
DepthSorting = 1 << 4,
|
||||
AlphaTest = 1 << 5,
|
||||
Reflection = 1 << 6,
|
||||
DepthWrite = 1 << 7,
|
||||
ReflectionSurfaceEye = 1 << 8,
|
||||
OccluderMesh = 1 << 9,
|
||||
ReflectionIndirectTexture = 1 << 10,
|
||||
LightMap = 1 << 11,
|
||||
Unused4 = 1 << 12,
|
||||
LightmapUVArray = 1 << 13,
|
||||
};
|
||||
ENABLE_BITWISE_ENUM(EStateFlags);
|
||||
|
||||
class CCubeMaterial {
|
||||
const u8* x0_data;
|
||||
|
||||
public:
|
||||
explicit CCubeMaterial(const u8* data) : x0_data(data) {}
|
||||
|
||||
[[nodiscard]] u32 GetCompressedBlend() {
|
||||
const u32* ptr = reinterpret_cast<const u32*>(x0_data[(GetTextureCount() * 4) + 16]);
|
||||
if (IsFlagSet(EStateFlags::KonstEnabled)) {
|
||||
ptr += SBig(*ptr) + 1;
|
||||
}
|
||||
|
||||
return SBig(*ptr);
|
||||
}
|
||||
[[nodiscard]] EStateFlags GetFlags() const { return EStateFlags(SBig(*reinterpret_cast<const u32*>(x0_data))); }
|
||||
[[nodiscard]] bool IsFlagSet(EStateFlags flag) const { return True(GetFlags() & flag); }
|
||||
[[nodiscard]] u32 GetUsedTextureSlots() const { return static_cast<u32>(GetFlags()) >> 16; }
|
||||
[[nodiscard]] u32 GetTextureCount() const { return SBig(*reinterpret_cast<const u32*>(&x0_data[4])); }
|
||||
[[nodiscard]] u32 GetVertexDesc() const { return SBig(*reinterpret_cast<const u32*>(&x0_data[(GetTextureCount() * 4) + 8])); }
|
||||
};
|
||||
#pragma endregion
|
||||
|
||||
CFactoryFnReturn FModelFactory(const metaforce::SObjectTag& tag, std::unique_ptr<u8[]>&& in, u32 len,
|
||||
const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef);
|
||||
} // namespace metaforce::WIP
|
||||
} // namespace metaforce
|
||||
|
||||
Reference in New Issue
Block a user