diff --git a/externals/LibCommon b/externals/LibCommon index b37fc9a5..2c2e2bad 160000 --- a/externals/LibCommon +++ b/externals/LibCommon @@ -1 +1 @@ -Subproject commit b37fc9a516ad09be5484f343f730e8642c3495a3 +Subproject commit 2c2e2bad43b4566e1de5452a23673f0c9d5202f7 diff --git a/src/Core/GameProject/CGameInfo.cpp b/src/Core/GameProject/CGameInfo.cpp index 865cf78a..2c2dbf64 100644 --- a/src/Core/GameProject/CGameInfo.cpp +++ b/src/Core/GameProject/CGameInfo.cpp @@ -89,7 +89,7 @@ TString CGameInfo::GetDefaultGameInfoPath(EGame Game) return ""; const TString GameName = GetGameShortName(Game); - return TString::Format("%s/%s/GameInfo%s.%s", *gDataDir, *gkGameInfoDir, *GameName, *gkGameInfoExt); + return TString::Format("%s/%s/GameInfo%s.%s", gDataDir.ToStdString().c_str(), gkGameInfoDir, GameName.ToStdString().c_str(), gkGameInfoExt); } TString CGameInfo::GetExtension() diff --git a/src/Core/GameProject/CPackage.cpp b/src/Core/GameProject/CPackage.cpp index e7729c42..7d974c6c 100644 --- a/src/Core/GameProject/CPackage.cpp +++ b/src/Core/GameProject/CPackage.cpp @@ -444,12 +444,12 @@ bool CPackage::ContainsAsset(const CAssetID& rkID) const TString CPackage::DefinitionPath(bool Relative) const { - const TString RelPath = mPakPath + mPakName + ".pkd"; + TString RelPath = mPakPath + mPakName + ".pkd"; return Relative ? RelPath : mpProject->PackagesDir(false) + RelPath; } TString CPackage::CookedPackagePath(bool Relative) const { - const TString RelPath = mPakPath + mPakName + ".pak"; + TString RelPath = mPakPath + mPakName + ".pak"; return Relative ? RelPath : mpProject->DiscFilesystemRoot(false) + RelPath; } diff --git a/src/Core/Resource/Factory/CAnimationLoader.cpp b/src/Core/Resource/Factory/CAnimationLoader.cpp index 18fb3b74..7bde384e 100644 --- a/src/Core/Resource/Factory/CAnimationLoader.cpp +++ b/src/Core/Resource/Factory/CAnimationLoader.cpp @@ -1,6 +1,7 @@ #include "CAnimationLoader.h" #include #include +#include #include bool CAnimationLoader::UncompressedCheckEchoes() @@ -236,8 +237,10 @@ void CAnimationLoader::ReadCompressedANIM() { CBitStreamInWrapper BitStream(mpInput); - for (auto& flag : mKeyFlags) - flag = BitStream.ReadBit(); + for (size_t i = 0; i < mKeyFlags.size(); ++i) + { + mKeyFlags[i] = BitStream.ReadBit(); + } } mpInput->Seek(mGame == EGame::Prime ? 0x8 : 0x4, SEEK_CUR); @@ -462,9 +465,9 @@ CQuaternion CAnimationLoader::DequantizeRotation(bool Sign, int16 X, int16 Y, in const float Multiplier = Math::skHalfPi / static_cast(mRotationDivisor); CQuaternion Out; - Out.X = std::sinf(static_cast(X) * Multiplier); - Out.Y = std::sinf(static_cast(Y) * Multiplier); - Out.Z = std::sinf(static_cast(Z) * Multiplier); + Out.X = sinf(static_cast(X) * Multiplier); + Out.Y = sinf(static_cast(Y) * Multiplier); + Out.Z = sinf(static_cast(Z) * Multiplier); Out.W = Math::Sqrt(std::fmax(1.f - ((Out.X * Out.X) + (Out.Y * Out.Y) + (Out.Z * Out.Z)), 0.f)); if (Sign) diff --git a/src/Core/Resource/Script/Property/TPropertyRef.h b/src/Core/Resource/Script/Property/TPropertyRef.h index 7ed182ad..068a7aa9 100644 --- a/src/Core/Resource/Script/Property/TPropertyRef.h +++ b/src/Core/Resource/Script/Property/TPropertyRef.h @@ -73,7 +73,7 @@ public: } friend bool operator!=(const IProperty* pLeft, const TPropertyRef& kRight) { - return !operator==(pLeft, kRight); + return !(*pLeft == *kRight); } friend bool operator==(const TPropertyRef& left, const IProperty* right) @@ -82,7 +82,7 @@ public: } friend bool operator!=(const TPropertyRef& left, const IProperty* right) { - return !operator==(left, right); + return !(left.Property() == right); } }; diff --git a/src/Editor/CGizmo.h b/src/Editor/CGizmo.h index 209fe434..279c1518 100644 --- a/src/Editor/CGizmo.h +++ b/src/Editor/CGizmo.h @@ -94,16 +94,21 @@ private: // Model parts struct SModelPart { - FAxes ModelAxes{EAxis::None}; + FAxes ModelAxes; bool EnableRayCast = false; bool IsBillboard = false; TResPtr pModel; - SModelPart() = default; + SModelPart() : + ModelAxes(EAxis::None) + {}; + SModelPart(FAxes Axes, bool RayCastOn, bool Billboard, TResPtr _pModel) : - ModelAxes(Axes), EnableRayCast(RayCastOn), IsBillboard(Billboard), pModel(_pModel) {} + ModelAxes(Axes), EnableRayCast(RayCastOn), IsBillboard(Billboard), pModel(_pModel) + {} }; - SModelPart *mpCurrentParts = nullptr; + + SModelPart* mpCurrentParts = nullptr; uint32 mNumCurrentParts = 0; // Static @@ -116,7 +121,7 @@ public: CGizmo(); ~CGizmo() override; - void AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkViewInfo) override; + void AddToRenderer(CRenderer* pRenderer, const SViewInfo& rkViewInfo) override; void Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand Command, const SViewInfo& rkViewInfo) override; void IncrementSize(); @@ -130,22 +135,51 @@ public: void EndTransform(); // Accessors - EGizmoMode Mode() const { return mMode; } - ETransformSpace TransformSpace() const { return mTransformSpace; } - CVector3f Position() const { return mPosition; } - CVector3f DeltaTranslation() const { return mDeltaTranslation; } - CVector3f TotalTranslation() const { return mTotalTranslation; } - CQuaternion Rotation() const { return mRotation; } - CQuaternion DeltaRotation() const { return mDeltaRotation; } - CVector3f TotalRotation() const { return mTotalRotation; } - CVector3f Scale() const { return mScale; } - CVector3f DeltaScale() const { return mDeltaScale; } - CVector3f TotalScale() const { return mTotalScale; } - bool IsTransforming() const { return mIsTransforming; } - bool HasTransformed() const { return mHasTransformed; } + EGizmoMode Mode() const + { return mMode; } + + ETransformSpace TransformSpace() const + { return mTransformSpace; } + + CVector3f Position() const + { return mPosition; } + + CVector3f DeltaTranslation() const + { return mDeltaTranslation; } + + CVector3f TotalTranslation() const + { return mTotalTranslation; } + + CQuaternion Rotation() const + { return mRotation; } + + CQuaternion DeltaRotation() const + { return mDeltaRotation; } + + CVector3f TotalRotation() const + { return mTotalRotation; } + + CVector3f Scale() const + { return mScale; } + + CVector3f DeltaScale() const + { return mDeltaScale; } + + CVector3f TotalScale() const + { return mTotalScale; } + + bool IsTransforming() const + { return mIsTransforming; } + + bool HasTransformed() const + { return mHasTransformed; } + + void SetPosition(const CVector3f& rkPosition) + { mPosition = rkPosition; } + + void EnableCursorWrap(bool Enable) + { mEnableCursorWrap = Enable; } - void SetPosition(const CVector3f& rkPosition) { mPosition = rkPosition; } - void EnableCursorWrap(bool Enable) { mEnableCursorWrap = Enable; } void SetMode(EGizmoMode mode); void SetTransformSpace(ETransformSpace Space); void SetLocalRotation(const CQuaternion& rkOrientation); diff --git a/src/Editor/INodeEditor.h b/src/Editor/INodeEditor.h index 9a2c2e7f..df35bbba 100644 --- a/src/Editor/INodeEditor.h +++ b/src/Editor/INodeEditor.h @@ -16,15 +16,14 @@ class INodeEditor : public IEditor { Q_OBJECT - -protected: +public: enum class ECloneState { NotCloning, ReadyToClone, Cloning }; - +protected: // Node management CScene mScene; CNodeSelection *mpSelection; diff --git a/src/Editor/WorldEditor/CWorldTreeModel.cpp b/src/Editor/WorldEditor/CWorldTreeModel.cpp index 2ac5019f..0db216d2 100644 --- a/src/Editor/WorldEditor/CWorldTreeModel.cpp +++ b/src/Editor/WorldEditor/CWorldTreeModel.cpp @@ -222,7 +222,7 @@ void CWorldTreeModel::OnProjectChanged(CGameProject *pProj) // Metroid Prime series; fetch all world assets std::list WorldIDs; pProj->GetWorldList(WorldIDs); - QList QWorldIDs = QList::fromStdList(WorldIDs); + QList QWorldIDs = QList(WorldIDs.begin(), WorldIDs.end()); for (const CAssetID& rkID : QWorldIDs) {