AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-15 12:05:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #131 from lioncash/top-const

Browse Source 
CActor: Remove top-level const from GetScaledLocatorTransform() and GetLocatorTransform()
This commit is contained in:
Phillip Stephens 2020-01-30 20:11:12 -08:00 committed by GitHub
commit 11352ef042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CActor.cpp
View File

@ -343,11 +343,11 @@ void CActor::SetVolume(float vol) {
xd4_maxVol = vol;
}
const zeus::CTransform CActor::GetScaledLocatorTransform(std::string_view segName) const {
zeus::CTransform CActor::GetScaledLocatorTransform(std::string_view segName) const {
return x64_modelData->GetScaledLocatorTransform(segName);
}
const zeus::CTransform CActor::GetLocatorTransform(std::string_view segName) const {
zeus::CTransform CActor::GetLocatorTransform(std::string_view segName) const {
return x64_modelData->GetLocatorTransform(segName);
}

4
Runtime/World/CActor.hpp
View File

@ -134,8 +134,8 @@ public:
void SetMuted(bool);
const zeus::CTransform& GetTransform() const { return x34_transform; }
const zeus::CVector3f& GetTranslation() const { return x34_transform.origin; }
const zeus::CTransform GetScaledLocatorTransform(std::string_view segName) const;
const zeus::CTransform GetLocatorTransform(std::string_view segName) const;
zeus::CTransform GetScaledLocatorTransform(std::string_view segName) const;
zeus::CTransform GetLocatorTransform(std::string_view segName) const;
void RemoveMaterial(EMaterialTypes, EMaterialTypes, EMaterialTypes, EMaterialTypes, CStateManager&);
void RemoveMaterial(EMaterialTypes, EMaterialTypes, EMaterialTypes, CStateManager&);
void RemoveMaterial(EMaterialTypes, EMaterialTypes, CStateManager&);