From 906c78afb9498ebf164c7a235301a04cefb729ff Mon Sep 17 00:00:00 2001 From: fallenoak Date: Thu, 5 Jan 2023 20:58:16 -0600 Subject: [PATCH] chore(model): clean up function declarations --- src/model/CM2Cache.hpp | 4 ++-- src/model/CM2Lighting.hpp | 4 ++-- src/model/CM2Model.hpp | 26 +++++++++++++------------- src/model/CM2Scene.hpp | 2 +- src/model/CM2SceneRender.hpp | 16 ++++++++-------- src/model/CM2Shared.hpp | 16 ++++++++-------- src/model/M2Data.hpp | 6 +++--- src/model/Model2.hpp | 8 ++++---- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/model/CM2Cache.hpp b/src/model/CM2Cache.hpp index 3c12264..cba3ed1 100644 --- a/src/model/CM2Cache.hpp +++ b/src/model/CM2Cache.hpp @@ -19,8 +19,8 @@ class CM2Cache { CM2Shared* CreateShared(const char*, uint32_t); void GarbageCollect(int32_t a2); int32_t Initialize(uint32_t flags); - void UpdateShared(void); - void WaitThread(void); + void UpdateShared(); + void WaitThread(); }; #endif diff --git a/src/model/CM2Lighting.hpp b/src/model/CM2Lighting.hpp index 13825a3..6c7fc98 100644 --- a/src/model/CM2Lighting.hpp +++ b/src/model/CM2Lighting.hpp @@ -37,12 +37,12 @@ class CM2Lighting { void AddDiffuse(const C3Vector& dirColor, const C3Vector& dir); void AddLight(CM2Light* light); void AddSpecular(const C3Vector& specColor); - void CameraSpace(void); + void CameraSpace(); void Initialize(CM2Scene* scene, const CAaSphere& a3); void SetFog(const C3Vector& fogColor, float fogStart, float fogEnd); void SetFog(const C3Vector& fogColor, float fogStart, float fogEnd, float fogDensity); void SetupGxLights(const C3Vector* a2); - void SetupSunlight(void); + void SetupSunlight(); }; #endif diff --git a/src/model/CM2Model.hpp b/src/model/CM2Model.hpp index 318a058..1a757fe 100644 --- a/src/model/CM2Model.hpp +++ b/src/model/CM2Model.hpp @@ -135,45 +135,45 @@ class CM2Model { , m_flag200000(0) , m_flag400000(0) {}; - void Animate(void); - void AnimateCamerasST(void); + void Animate(); + void AnimateCamerasST(); void AnimateMT(const C44Matrix* view, const C3Vector& a3, const C3Vector& a4, float a5, float a6); void AnimateMTSimple(const C44Matrix* view, const C3Vector& a3, const C3Vector& a4, float a5, float a6); - void AnimateST(void); + void AnimateST(); void AttachToScene(CM2Scene* scene); void CancelDeferredSequences(uint32_t boneIndex, bool a3); - void DetachFromScene(void); + void DetachFromScene(); void FindKey(M2ModelBoneSeq* sequence, const M2TrackBase& track, uint32_t& currentKey, uint32_t& nextKey, float& ratio); CAaBox& GetBoundingBox(CAaBox& bounds); HCAMERA GetCameraByIndex(uint32_t index); - C3Vector GetPosition(void); + C3Vector GetPosition(); int32_t Initialize(CM2Scene* scene, CM2Shared* shared, CM2Model* a4, uint32_t flags); - int32_t InitializeLoaded(void); + int32_t InitializeLoaded(); int32_t IsBatchDoodadCompatible(M2Batch* batch); int32_t IsDrawable(int32_t a2, int32_t a3); int32_t IsLoaded(int32_t a2, int32_t attachments); - void LinkToCallbackListTail(void); + void LinkToCallbackListTail(); int32_t ProcessCallbacks(); - void ProcessCallbacksRecursive(void); - void Release(void); + void ProcessCallbacksRecursive(); + void Release(); void SetAnimating(int32_t animating); void SetBoneSequence(uint32_t boneId, uint32_t sequenceId, uint32_t a4, uint32_t time, float a6, int32_t a7, int32_t a8); void SetBoneSequenceDeferred(uint16_t a2, M2Data* data, uint16_t boneIndex, uint32_t time, float a6, M2SequenceFallback fallback, int32_t a8, int32_t a9, int32_t a10); - void SetIndices(void); + void SetIndices(); void SetLightingCallback(void (*lightingCallback)(CM2Model*, CM2Lighting*, void*), void* lightingArg); void SetLoadedCallback(void (*loadedCallback)(CM2Model*, void*), void* loadedArg); void SetPrimaryBoneSequence(uint16_t sequenceIndex, uint16_t boneIndex, M2SequenceFallback fallback, uint32_t time, float a6, int32_t a7); void SetSecondaryBoneSequence(uint16_t a2, uint16_t boneIndex, M2SequenceFallback fallback, uint32_t time, float a6); void SetupBoneSequence(uint16_t sequenceIndex, M2SequenceFallback fallback, uint32_t a4, float a5, M2ModelBoneSeq* boneSequence); - void SetupLighting(void); + void SetupLighting(); void SetVisible(int32_t visible); void SetWorldTransform(const C3Vector& position, float orientation, float scale); void Sub826350(M2SequenceFallback& fallback, uint32_t sequenceId); int32_t Sub8269C0(uint32_t boneId, uint16_t boneIndex); void Sub826E60(uint32_t* a2, uint32_t* a3); - void UnlinkFromCallbackList(void); + void UnlinkFromCallbackList(); void UnsetBoneSequence(uint32_t boneId, int32_t a3, int32_t a4); - void UpdateLoaded(void); + void UpdateLoaded(); void WaitForLoad(const char* a2); }; diff --git a/src/model/CM2Scene.hpp b/src/model/CM2Scene.hpp index 6a9bb74..e014b65 100644 --- a/src/model/CM2Scene.hpp +++ b/src/model/CM2Scene.hpp @@ -49,7 +49,7 @@ class CM2Scene { {}; void AdvanceTime(uint32_t a2); void Animate(const C3Vector& cameraPos); - CM2Model* CreateModel(const char*, uint32_t); + CM2Model* CreateModel(const char* file, uint32_t a3); int32_t Draw(M2PASS pass); void SelectLights(CM2Lighting* lighting); }; diff --git a/src/model/CM2SceneRender.hpp b/src/model/CM2SceneRender.hpp index 10aee81..38fa92f 100644 --- a/src/model/CM2SceneRender.hpp +++ b/src/model/CM2SceneRender.hpp @@ -57,17 +57,17 @@ class CM2SceneRender { , m_cache(scene->m_cache) {}; void Draw(M2PASS pass, M2Element* elements, uint32_t* a4, uint32_t a5); - void DrawBatch(void); + void DrawBatch(); void DrawBatchDoodad(M2Element* elements, uint32_t* a3); - void DrawBatchProj(void); - void DrawCallback(void); + void DrawBatchProj(); + void DrawCallback(); int32_t DrawParticle(uint32_t a2, M2Element* elements, uint32_t* a4, uint32_t a5); - void DrawRibbon(void); + void DrawRibbon(); void SetBatchVertices(int32_t a2); - void SetupBatchVertices(void); - void SetupLighting(void); - void SetupMaterial(void); - void SetupTextures(void); + void SetupBatchVertices(); + void SetupLighting(); + void SetupMaterial(); + void SetupTextures(); }; #endif diff --git a/src/model/CM2Shared.hpp b/src/model/CM2Shared.hpp index 2392248..91d4f2e 100644 --- a/src/model/CM2Shared.hpp +++ b/src/model/CM2Shared.hpp @@ -64,20 +64,20 @@ class CM2Shared { , m_flag20(0) , m_flag40(0) {}; - void AddRef(void); + void AddRef(); int32_t CallbackWhenLoaded(CM2Model* model); CShaderEffect* CreateSimpleEffect(uint32_t textureCount, uint16_t shader, uint16_t textureCoordComboIndex); CShaderEffect* GetEffect(M2Batch* batch); int32_t FinishLoadingSkinProfile(uint32_t size); - int32_t Initialize(void); - int32_t InitializeSkinProfile(void); - int32_t Load(SFile*, int32_t, CAaBox*); + int32_t Initialize(); + int32_t InitializeSkinProfile(); + int32_t Load(SFile* file, int32_t a3, CAaBox* a4); int32_t LoadSkinProfile(uint32_t profile); - void Release(void); - int32_t SetIndices(void); + void Release(); + int32_t SetIndices(); int32_t SetVertices(uint32_t a2); - void SubstituteSimpleShaders(void); - void SubstituteSpecializedShaders(void); + void SubstituteSimpleShaders(); + void SubstituteSpecializedShaders(); }; #endif diff --git a/src/model/M2Data.hpp b/src/model/M2Data.hpp index 0bdf4e5..a395005 100644 --- a/src/model/M2Data.hpp +++ b/src/model/M2Data.hpp @@ -63,9 +63,9 @@ struct M2Array { T& operator[](uint32_t i); T& operator[](uint32_t i) const; - uint32_t Count(void); - uint32_t Count(void) const; - T* Data(void); + uint32_t Count(); + uint32_t Count() const; + T* Data(); }; template diff --git a/src/model/Model2.hpp b/src/model/Model2.hpp index 04f7740..7eaff02 100644 --- a/src/model/Model2.hpp +++ b/src/model/Model2.hpp @@ -7,11 +7,11 @@ class C3Vector; -int32_t M2ConvertModelFileName(const char*, char*, uint32_t, uint32_t); +int32_t M2ConvertModelFileName(const char* source, char* dest, uint32_t a3, uint32_t a4); -CM2Scene* M2CreateScene(void); +CM2Scene* M2CreateScene(); -uint32_t M2GetCacheFlags(void); +uint32_t M2GetCacheFlags(); void M2Initialize(uint16_t flags, uint32_t a2); @@ -19,6 +19,6 @@ uint32_t M2RegisterCVars(); void M2SetGlobalOptFlags(uint16_t flags); -int32_t ModelBlobQuery(const char*, C3Vector&, C3Vector&); +int32_t ModelBlobQuery(const char* a1, C3Vector& a2, C3Vector& a3); #endif