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

General: Migrate off non-constexpr constants

Browse Source
This commit is contained in:
Lioncash
2020-06-16 22:22:54 -04:00
parent 31bfca7aac
commit 566a32fd75
50 changed files with 304 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Render/CCamera.h
View File

@@ -88,7 +88,7 @@ public:
void SetLookSpeed(float LookSpeed) { mLookSpeed = LookSpeed; }
void SetAspectRatio(float AspectRatio) { mAspectRatio = AspectRatio; mProjectionDirty = true; mFrustumPlanesDirty = true; }
void ResetOrbit() { SetOrbit(CVector3f::skZero, 5.f); }
void ResetOrbit() { SetOrbit(CVector3f::Zero(), 5.f); }
// Private
private:

6
src/Core/Render/CDrawUtil.cpp
View File

@@ -63,13 +63,13 @@ void CDrawUtil::DrawSquare(const float *pTexCoords)
void CDrawUtil::DrawLine(const CVector3f& PointA, const CVector3f& PointB)
{
DrawLine(PointA, PointB, CColor::skWhite);
DrawLine(PointA, PointB, CColor::White());
}
void CDrawUtil::DrawLine(const CVector2f& PointA, const CVector2f& PointB)
{
// Overload for 2D lines
DrawLine(CVector3f(PointA.X, PointA.Y, 0.f), CVector3f(PointB.X, PointB.Y, 0.f), CColor::skWhite);
DrawLine(CVector3f(PointA.X, PointA.Y, 0.f), CVector3f(PointB.X, PointB.Y, 0.f), CColor::White());
}
void CDrawUtil::DrawLine(const CVector3f& PointA, const CVector3f& PointB, const CColor& LineColor)
@@ -281,7 +281,7 @@ void CDrawUtil::UseColorShaderLighting(const CColor& kColor)
void CDrawUtil::UseTextureShader()
{
UseTextureShader(CColor::skWhite);
UseTextureShader(CColor::White());
}
void CDrawUtil::UseTextureShader(const CColor& TintColor)

8
src/Core/Render/CDrawUtil.h
View File

@@ -86,17 +86,17 @@ public:
static void DrawSphere(bool DoubleSided = false);
static void DrawSphere(const CColor& Color);
static void DrawWireSphere(const CVector3f& Position, float Radius, const CColor& Color = CColor::skWhite);
static void DrawWireSphere(const CVector3f& Position, float Radius, const CColor& Color = CColor::White());
static void DrawBillboard(CTexture* pTexture, const CVector3f& Position, const CVector2f& Scale = CVector2f::skOne, const CColor& Tint = CColor::skWhite);
static void DrawBillboard(CTexture* pTexture, const CVector3f& Position, const CVector2f& Scale = CVector2f::One(), const CColor& Tint = CColor::White());
static void DrawLightBillboard(ELightType Type, const CColor& LightColor, const CVector3f& Position, const CVector2f& Scale = CVector2f::skOne, const CColor& Tint = CColor::skWhite);
static void DrawLightBillboard(ELightType Type, const CColor& LightColor, const CVector3f& Position, const CVector2f& Scale = CVector2f::One(), const CColor& Tint = CColor::White());
static void UseColorShader(const CColor& Color);
static void UseColorShaderLighting(const CColor& Color);
static void UseTextureShader();
static void UseTextureShader(const CColor& TintColor);
static void UseCollisionShader(bool IsFloor, bool IsUnstandable, const CColor& TintColor = CColor::skWhite);
static void UseCollisionShader(bool IsFloor, bool IsUnstandable, const CColor& TintColor = CColor::White());
static CShader* GetTextShader();
static void LoadCheckerboardTexture(uint32 GLTextureUnit);

8
src/Core/Render/CGraphics.cpp
View File

@@ -22,7 +22,7 @@ CGraphics::SLightBlock CGraphics::sLightBlock;
CGraphics::ELightingMode CGraphics::sLightMode;
uint32 CGraphics::sNumLights;
CColor CGraphics::sAreaAmbientColor = CColor::skTransparentBlack;
CColor CGraphics::sAreaAmbientColor = CColor::TransparentBlack();
float CGraphics::sWorldLightMultiplier;
std::array<CLight, 3> CGraphics::sDefaultDirectionalLights{{
CLight::BuildDirectional(CVector3f(0), CVector3f(0.f, -0.866025f, -0.5f), CColor(0.3f, 0.3f, 0.3f, 0.3f)),
@@ -169,8 +169,8 @@ void CGraphics::SetDefaultLighting()
sNumLights = 0;
UpdateLightBlock();
sVertexBlock.COLOR0_Amb = CColor::skGray;
sVertexBlock.COLOR0_Mat = CColor::skWhite;
sVertexBlock.COLOR0_Amb = CColor::Gray();
sVertexBlock.COLOR0_Mat = CColor::White();
UpdateVertexBlock();
}
@@ -181,7 +181,7 @@ void CGraphics::SetupAmbientColor()
else if (sLightMode == ELightingMode::Basic)
sVertexBlock.COLOR0_Amb = skDefaultAmbientColor;
else
sVertexBlock.COLOR0_Amb = CColor::skTransparentWhite;
sVertexBlock.COLOR0_Amb = CColor::TransparentWhite();
}
void CGraphics::SetIdentityMVP()

2
src/Core/Render/CRenderBucket.cpp
View File

@@ -36,7 +36,7 @@ void CRenderBucket::CSubBucket::Sort(const CCamera* pkCamera, bool DebugVisualiz
{
SRenderablePtr *pPtr = &mRenderables[iPtr];
CVector3f Point = pPtr->AABox.ClosestPointAlongVector(pkCamera->Direction());
CDrawUtil::DrawWireCube(pPtr->AABox, CColor::skWhite);
CDrawUtil::DrawWireCube(pPtr->AABox, CColor::White());
CVector3f Dist = Point - pkCamera->Position();
float Dot = Dist.Dot(pkCamera->Direction());

61
src/Core/Render/CRenderer.cpp
View File

@@ -115,12 +115,16 @@ void CRenderer::SetViewportSize(uint32 Width, uint32 Height)
// ************ RENDER ************
void CRenderer::RenderBuckets(const SViewInfo& rkViewInfo)
{
if (!mInitialized) Init();
if (!mInitialized)
Init();
mSceneFramebuffer.Bind();
// Set backface culling
if (mOptions & ERenderOption::EnableBackfaceCull) glEnable(GL_CULL_FACE);
else glDisable(GL_CULL_FACE);
if (mOptions & ERenderOption::EnableBackfaceCull)
glEnable(GL_CULL_FACE);
else
glDisable(GL_CULL_FACE);
// Render scene to texture
glDepthRange(0.f, 1.f);
@@ -146,21 +150,36 @@ void CRenderer::RenderBuckets(const SViewInfo& rkViewInfo)
void CRenderer::RenderBloom()
{
// Check to ensure bloom is enabled. Also don't render bloom in unlit mode.
if (mBloomMode == EBloomMode::NoBloom || CGraphics::sLightMode != CGraphics::ELightingMode::World) return;
if (mBloomMode == EBloomMode::NoBloom || CGraphics::sLightMode != CGraphics::ELightingMode::World)
return;
// Setup
static const float skHOffset[6] = { -0.008595f, -0.005470f, -0.002345f,
0.002345f, 0.005470f, 0.008595f };
static constexpr float skHOffset[6] = {
-0.008595f,
-0.005470f,
-0.002345f,
0.002345f,
0.005470f,
0.008595f,
};
static const float skVOffset[6] = { -0.012275f, -0.007815f, -0.003350f,
0.003350f, 0.007815f, 0.012275f };
static constexpr float skVOffset[6] = {
-0.012275f,
-0.007815f,
-0.003350f,
0.003350f,
0.007815f,
0.012275f,
};
static const CColor skTintColors[6] = { CColor::Integral(17, 17, 17),
CColor::Integral(53, 53, 53),
CColor::Integral(89, 89, 89),
CColor::Integral(89, 89, 89),
CColor::Integral(53, 53, 53),
CColor::Integral(17, 17, 17) };
static constexpr CColor skTintColors[6] = {
CColor::Integral(17, 17, 17),
CColor::Integral(53, 53, 53),
CColor::Integral(89, 89, 89),
CColor::Integral(89, 89, 89),
CColor::Integral(53, 53, 53),
CColor::Integral(17, 17, 17),
};
uint32 BloomWidth = (mBloomMode == EBloomMode::Bloom ? mBloomWidth : mViewportWidth);
uint32 BloomHeight = (mBloomMode == EBloomMode::Bloom ? mBloomHeight : mViewportHeight);
@@ -195,7 +214,7 @@ void CRenderer::RenderBloom()
mBloomFramebuffers[1].Resize(BloomWidth, BloomHeight);
mBloomFramebuffers[1].Bind();
CDrawUtil::UseTextureShader(CColor::skGray);
CDrawUtil::UseTextureShader(CColor::Gray());
glBlendFunc(GL_ONE, GL_ZERO);
mBloomFramebuffers[0].Texture()->Bind(0);
CDrawUtil::DrawSquare();
@@ -215,7 +234,7 @@ void CRenderer::RenderBloom()
mBloomFramebuffers[2].Bind();
glClear(GL_COLOR_BUFFER_BIT);
CDrawUtil::UseTextureShader(CColor::skGray);
CDrawUtil::UseTextureShader(CColor::Gray());
glBlendFunc(GL_ONE, GL_ZERO);
mBloomFramebuffers[1].Texture()->Bind(0);
CDrawUtil::DrawSquare();
@@ -247,7 +266,7 @@ void CRenderer::RenderBloom()
{
// Bloom maps are in the framebuffer alpha channel.
// White * dst alpha = bloom map colors
CDrawUtil::UseColorShader(CColor::skWhite);
CDrawUtil::UseColorShader(CColor::White());
glBlendFunc(GL_DST_ALPHA, GL_ZERO);
CDrawUtil::DrawSquare();
}
@@ -269,10 +288,10 @@ void CRenderer::RenderSky(CModel *pSkyboxModel, const SViewInfo& rkViewInfo)
glEnable(GL_CULL_FACE);
CGraphics::sMVPBlock.ModelMatrix = CMatrix4f::skIdentity;
CGraphics::sVertexBlock.COLOR0_Amb = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::skTransparentWhite;
CGraphics::sPixelBlock.SetAllTevColors(CColor::skWhite);
CGraphics::sPixelBlock.TintColor = CColor::skWhite;
CGraphics::sVertexBlock.COLOR0_Amb = CColor::TransparentWhite();
CGraphics::sVertexBlock.COLOR0_Mat = CColor::TransparentWhite();
CGraphics::sPixelBlock.SetAllTevColors(CColor::White());
CGraphics::sPixelBlock.TintColor = CColor::White();
CGraphics::sNumLights = 0;
CGraphics::UpdateVertexBlock();
CGraphics::UpdatePixelBlock();

10
src/Core/Resource/Animation/CSkeleton.cpp
View File

@@ -24,7 +24,7 @@ void CBone::UpdateTransform(CBoneTransformData& rData, const SBoneTransformInfo&
pAnim->EvaluateTransform(Time, mID, &TransformInfo.Position, &TransformInfo.Rotation, &TransformInfo.Scale);
if (AnchorRoot && IsRoot())
TransformInfo.Position = CVector3f::skZero;
TransformInfo.Position = CVector3f::Zero();
// Apply parent transform
TransformInfo.Position = rkParentTransform.Position + (rkParentTransform.Rotation * (rkParentTransform.Scale * TransformInfo.Position));
@@ -125,9 +125,9 @@ void CSkeleton::Draw(FRenderOptions /*Options*/, const CBoneTransformData *pkDat
if (pBone->IsSelected())
{
const CQuaternion BoneRot = pkData ? pBone->TransformedRotation(*pkData) : pBone->Rotation();
CDrawUtil::DrawLine(BonePos, BonePos + BoneRot.XAxis(), CColor::skRed);
CDrawUtil::DrawLine(BonePos, BonePos + BoneRot.YAxis(), CColor::skGreen);
CDrawUtil::DrawLine(BonePos, BonePos + BoneRot.ZAxis(), CColor::skBlue);
CDrawUtil::DrawLine(BonePos, BonePos + BoneRot.XAxis(), CColor::Red());
CDrawUtil::DrawLine(BonePos, BonePos + BoneRot.YAxis(), CColor::Green());
CDrawUtil::DrawLine(BonePos, BonePos + BoneRot.ZAxis(), CColor::Blue());
}
// Draw child links
@@ -151,7 +151,7 @@ void CSkeleton::Draw(FRenderOptions /*Options*/, const CBoneTransformData *pkDat
Transform.Translate(BonePos);
CGraphics::sMVPBlock.ModelMatrix = Transform * BaseTransform;
CGraphics::UpdateMVPBlock();
CDrawUtil::DrawSphere(pBone->IsSelected() ? CColor::skRed : CColor::skWhite);
CDrawUtil::DrawSphere(pBone->IsSelected() ? CColor::Red() : CColor::White());
}
}

6
src/Core/Resource/Animation/CSkeleton.h
View File

@@ -15,9 +15,9 @@ class CBone;
struct SBoneTransformInfo
{
CVector3f Position{CVector3f::skZero};
CQuaternion Rotation{CQuaternion::skIdentity};
CVector3f Scale{CVector3f::skOne};
CVector3f Position{CVector3f::Zero()};
CQuaternion Rotation{CQuaternion::Identity()};
CVector3f Scale{CVector3f::One()};
SBoneTransformInfo() = default;
};

2
src/Core/Resource/Area/CGameArea.cpp
View File

@@ -110,7 +110,7 @@ void CGameArea::ClearTerrain()
mVertexCount = 0;
mTriangleCount = 0;
mTerrainMerged = false;
mAABox = CAABox::skInfinite;
mAABox = CAABox::Infinite();
}
void CGameArea::ClearScriptLayers()

6
src/Core/Resource/Area/CGameArea.h
View File

@@ -79,9 +79,9 @@ public:
CScriptObject* InstanceByID(uint32 InstanceID);
uint32 FindUnusedInstanceID() const;
CScriptObject* SpawnInstance(CScriptTemplate *pTemplate, CScriptLayer *pLayer,
const CVector3f& rkPosition = CVector3f::skZero,
const CQuaternion& rkRotation = CQuaternion::skIdentity,
const CVector3f& rkScale = CVector3f::skOne,
const CVector3f& rkPosition = CVector3f::Zero(),
const CQuaternion& rkRotation = CQuaternion::Identity(),
const CVector3f& rkScale = CVector3f::One(),
uint32 SuggestedID = -1, uint32 SuggestedLayerIndex = -1);
void AddInstanceToArea(CScriptObject *pInstance);
void DeleteInstance(CScriptObject *pInstance);

2
src/Core/Resource/CFont.h
View File

@@ -66,7 +66,7 @@ public:
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
CVector2f RenderString(const TString& rkString, CRenderer *pRenderer, float AspectRatio,
CVector2f Position = CVector2f(0,0),
CColor FillColor = CColor::skWhite, CColor StrokeColor = CColor::skBlack,
CColor FillColor = CColor::White(), CColor StrokeColor = CColor::Black(),
uint32 FontSize = CFONT_DEFAULT_SIZE);
// Accessors

2
src/Core/Resource/CMaterial.cpp
View File

@@ -9,7 +9,7 @@
#include <GL/glew.h>
uint64 CMaterial::sCurrentMaterial = 0;
CColor CMaterial::sCurrentTint = CColor::skWhite;
CColor CMaterial::sCurrentTint = CColor::White();
std::map<uint64, CMaterial::SMaterialShader> CMaterial::smShaderMap;
CMaterial::CMaterial()

6
src/Core/Resource/Collision/CCollisionMaterial.cpp
View File

@@ -68,9 +68,9 @@ const std::unordered_map<ECollisionFlag, CColor> gkTypeToColor = {
};
CColor CCollisionMaterial::SurfaceColor(EGame Game) const
{
ECollisionFlag SurfType = SurfaceType(Game);
auto FindColor = gkTypeToColor.find(SurfType);
return (FindColor == gkTypeToColor.end() ? CColor::skWhite : FindColor->second);
const ECollisionFlag SurfType = SurfaceType(Game);
const auto FindColor = gkTypeToColor.find(SurfType);
return (FindColor == gkTypeToColor.end() ? CColor::White() : FindColor->second);
}
bool CCollisionMaterial::IsFloor() const

4
src/Core/Resource/Collision/CCollisionRenderData.cpp
View File

@@ -225,7 +225,7 @@ void CCollisionRenderData::Render(bool Wireframe, int MaterialIndex /*= -1*/)
//@todo get these ugly OpenGL calls outta here
if (Wireframe)
{
CDrawUtil::UseColorShader(CColor::skBlack);
CDrawUtil::UseColorShader(CColor::Black());
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
}
@@ -252,7 +252,7 @@ void CCollisionRenderData::Render(bool Wireframe, int MaterialIndex /*= -1*/)
void CCollisionRenderData::RenderBoundingHierarchy(int MaxDepthLevel /*= -1*/)
{
mBoundingVertexBuffer.Bind();
CDrawUtil::UseColorShader(CColor::skBlue);
CDrawUtil::UseColorShader(CColor::Blue());
glLineWidth(1.f);
uint FirstIndex = mBoundingDepthOffsets[0];
uint LastIndex = (MaxDepthLevel > 0 ?

2
src/Core/Resource/Factory/CCollisionLoader.cpp
View File

@@ -260,7 +260,7 @@ std::unique_ptr<CCollisionMeshGroup> CCollisionLoader::LoadDCLN(IInputStream& rD
// Build bounding box
if (Loader.mVersion != EGame::DKCReturns)
{
Loader.mpMesh->mAABox = CAABox::skInfinite;
Loader.mpMesh->mAABox = CAABox::Infinite();
for (const auto& vert : Loader.mpMesh->mIndexData.Vertices)
{

2
src/Core/Resource/Factory/CMaterialLoader.h
View File

@@ -103,7 +103,7 @@ struct SMP3IntermediateMaterial
std::array<uint8, 5> mINTs{255, 255, 0, 32, 255};
uint8 GetINT(EINT eint) const { return mINTs[static_cast<size_t>(eint)]; }
std::array<CColor, 2> mCLRs{CColor::skWhite, CColor::skWhite};
std::array<CColor, 2> mCLRs{CColor::White(), CColor::White()};
const CColor& GetCLR(ECLR clr) const { return mCLRs[static_cast<size_t>(clr)]; }
};

10
src/Core/Resource/Factory/CModelLoader.cpp
View File

@@ -117,7 +117,7 @@ SSurface* CModelLoader::LoadSurface(IInputStream& rModel)
else
LoadSurfaceHeaderDKCR(rModel, pSurf);
const bool HasAABB = (pSurf->AABox != CAABox::skInfinite);
const bool HasAABB = pSurf->AABox != CAABox::Infinite();
CMaterial *pMat = mMaterials[0]->MaterialByIndex(pSurf->MaterialID, false);
// Primitive table
@@ -250,7 +250,7 @@ void CModelLoader::LoadSurfaceHeaderPrime(IInputStream& rModel, SSurface *pSurf)
}
else
{
pSurf->AABox = CAABox::skInfinite;
pSurf->AABox = CAABox::Infinite();
}
rModel.Seek(ExtraSize, SEEK_CUR);
@@ -273,7 +273,7 @@ void CModelLoader::LoadSurfaceHeaderDKCR(IInputStream& rModel, SSurface *pSurf)
}
else
{
pSurf->AABox = CAABox::skInfinite;
pSurf->AABox = CAABox::Infinite();
}
rModel.Seek(ExtraSize, SEEK_CUR);
@@ -326,8 +326,8 @@ SSurface* CModelLoader::LoadAssimpMesh(const aiMesh *pkMesh, CMaterialSet *pSet)
rPrim.Type = EPrimitiveType::Triangles;
// Generate bounding box, center point, and reflection projection
pSurf->CenterPoint = CVector3f::skZero;
pSurf->ReflectionDirection = CVector3f::skZero;
pSurf->CenterPoint = CVector3f::Zero();
pSurf->ReflectionDirection = CVector3f::Zero();
for (size_t iVtx = 0; iVtx < pkMesh->mNumVertices; iVtx++)
{

14
src/Core/Resource/Factory/CTextureDecoder.cpp
View File

@@ -818,7 +818,7 @@ CColor CTextureDecoder::DecodePixelC4(uint8 Byte, uint8 WhichPixel, IInputStream
if (mPaletteFormat == EGXPaletteFormat::RGB5A3)
return DecodePixelIA8(rPaletteStream.ReadShort());
return CColor::skTransparentBlack;
return CColor::TransparentBlack();
}
CColor CTextureDecoder::DecodePixelC8(uint8 Byte, IInputStream& rPaletteStream)
@@ -834,7 +834,7 @@ CColor CTextureDecoder::DecodePixelC8(uint8 Byte, IInputStream& rPaletteStream)
if (mPaletteFormat == EGXPaletteFormat::RGB5A3)
return DecodePixelIA8(rPaletteStream.ReadShort());
return CColor::skTransparentBlack;
return CColor::TransparentBlack();
}
CColor CTextureDecoder::DecodePixelRGB565(uint16 Short)
@@ -882,7 +882,7 @@ void CTextureDecoder::DecodeSubBlockCMPR(IInputStream& rSrc, IOutputStream& rDst
else
{
Palettes[2] = (Palettes[0] * 0.5f) + (Palettes[1] * 0.5f);
Palettes[3] = CColor::skTransparentBlack;
Palettes[3] = CColor::TransparentBlack();
}
for (uint32 iBlockY = 0; iBlockY < 4; iBlockY++)
@@ -921,7 +921,7 @@ void CTextureDecoder::DecodeBlockBC1(IInputStream& rSrc, IOutputStream& rDst, ui
else
{
Palettes[2] = (Palettes[0] * 0.5f) + (Palettes[1] * 0.5f);
Palettes[3] = CColor::skTransparentBlack;
Palettes[3] = CColor::TransparentBlack();
}
for (uint32 iBlockY = 0; iBlockY < 4; iBlockY++)
@@ -958,7 +958,7 @@ void CTextureDecoder::DecodeBlockBC2(IInputStream& rSrc, IOutputStream& rDst, ui
else
{
CPalettes[2] = (CPalettes[0] * 0.5f) + (CPalettes[1] * 0.5f);
CPalettes[3] = CColor::skTransparentBlack;
CPalettes[3] = CColor::TransparentBlack();
}
for (uint32 iBlockY = 0; iBlockY < 4; iBlockY++)
@@ -995,7 +995,7 @@ void CTextureDecoder::DecodeBlockBC3(IInputStream& rSrc, IOutputStream& rDst, ui
else
{
Palettes[2] = (Palettes[0] * 0.5f) + (Palettes[1] * 0.5f);
Palettes[3] = CColor::skTransparentBlack;
Palettes[3] = CColor::TransparentBlack();
}
for (uint32 iBlockY = 0; iBlockY < 4; iBlockY++)
@@ -1016,5 +1016,5 @@ void CTextureDecoder::DecodeBlockBC3(IInputStream& rSrc, IOutputStream& rDst, ui
CColor CTextureDecoder::DecodeDDSPixel(IInputStream& /*rDDS*/)
{
return CColor::skWhite;
return CColor::White();
}

2
src/Core/Resource/Model/CModel.h
View File

@@ -31,7 +31,7 @@ public:
void ClearGLBuffer() override;
void Draw(FRenderOptions Options, size_t MatSet);
void DrawSurface(FRenderOptions Options, size_t Surface, size_t MatSet);
void DrawWireframe(FRenderOptions Options, CColor WireColor = CColor::skWhite);
void DrawWireframe(FRenderOptions Options, CColor WireColor = CColor::White());
void SetSkin(CSkin *pSkin);
size_t GetMatSetCount() const;

2
src/Core/Resource/Model/CStaticModel.h
View File

@@ -26,7 +26,7 @@ public:
void ClearGLBuffer();
void Draw(FRenderOptions Options);
void DrawSurface(FRenderOptions Options, uint32 Surface);
void DrawWireframe(FRenderOptions Options, CColor WireColor = CColor::skWhite);
void DrawWireframe(FRenderOptions Options, CColor WireColor = CColor::White());
CMaterial* GetMaterial();
void SetMaterial(CMaterial *pMat);

6
src/Core/Resource/Script/CScriptObject.h
View File

@@ -93,9 +93,9 @@ public:
CLink* Link(ELinkType Type, uint32 Index) const { return (Type == ELinkType::Incoming ? mInLinks[Index] : mOutLinks[Index]); }
void* PropertyData() const { return (void*) mPropertyData.data(); }
CVector3f Position() const { return mPosition.IsValid() ? mPosition.Get() : CVector3f::skZero; }
CVector3f Rotation() const { return mRotation.IsValid() ? mRotation.Get() : CVector3f::skZero; }
CVector3f Scale() const { return mScale.IsValid() ? mScale.Get() : CVector3f::skOne; }
CVector3f Position() const { return mPosition.IsValid() ? mPosition.Get() : CVector3f::Zero(); }
CVector3f Rotation() const { return mRotation.IsValid() ? mRotation.Get() : CVector3f::Zero(); }
CVector3f Scale() const { return mScale.IsValid() ? mScale.Get() : CVector3f::One(); }
TString InstanceName() const { return mInstanceName.IsValid() ? mInstanceName.Get() : ""; }
bool IsActive() const { return mActive.IsValid() ? mActive.Get() : false; }
bool HasInGameModel() const { return mHasInGameModel; }

2
src/Core/SRayIntersection.h
View File

@@ -10,7 +10,7 @@ struct SRayIntersection
{
bool Hit = false;
float Distance = 0.0f;
CVector3f HitPoint{CVector3f::skZero};
CVector3f HitPoint{CVector3f::Zero()};
CSceneNode *pNode = nullptr;
uint ComponentIndex = UINT32_MAX;

8
src/Core/Scene/CCharacterNode.cpp
View File

@@ -62,9 +62,9 @@ void CCharacterNode::Draw(FRenderOptions Options, int ComponentIndex, ERenderCom
CGraphics::SetDefaultLighting();
CGraphics::UpdateLightBlock();
CGraphics::sVertexBlock.COLOR0_Amb = CGraphics::skDefaultAmbientColor;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::TransparentWhite();
CGraphics::sPixelBlock.LightmapMultiplier = 1.f;
CGraphics::sPixelBlock.SetAllTevColors(CColor::skWhite);
CGraphics::sPixelBlock.SetAllTevColors(CColor::White());
CGraphics::sPixelBlock.TintColor = TintColor(rkViewInfo);
LoadModelMatrix();
@@ -126,7 +126,7 @@ void CCharacterNode::SetCharSet(CAnimSet *pChar)
ConditionalSetDirty();
if (!mpCharacter)
mLocalAABox = CAABox::skOne;
mLocalAABox = CAABox::One();
}
void CCharacterNode::SetActiveChar(uint32 CharIndex)
@@ -138,7 +138,7 @@ void CCharacterNode::SetActiveChar(uint32 CharIndex)
{
CModel *pModel = mpCharacter->Character(CharIndex)->pModel;
mTransformData.ResizeToSkeleton(mpCharacter->Character(CharIndex)->pSkeleton);
mLocalAABox = pModel ? pModel->AABox() : CAABox::skZero;
mLocalAABox = pModel ? pModel->AABox() : CAABox::Zero();
MarkTransformChanged();
}
}

7
src/Core/Scene/CCollisionNode.cpp
View File

@@ -66,8 +66,7 @@ void CCollisionNode::Draw(FRenderOptions /*Options*/, int /*ComponentIndex*/, ER
CColor Tint = BaseTint;
if (rkViewInfo.CollisionSettings.HighlightMask != 0 && (kMat.RawFlags() & rkViewInfo.CollisionSettings.HighlightMask) == rkViewInfo.CollisionSettings.HighlightMask)
Tint *= CColor::skRed;
Tint *= CColor::Red();
else if (Game != EGame::DKCReturns && rkViewInfo.CollisionSettings.TintWithSurfaceColor)
Tint *= kMat.SurfaceColor(Game);
@@ -103,7 +102,7 @@ void CCollisionNode::Draw(FRenderOptions /*Options*/, int /*ComponentIndex*/, ER
{
if (Parent() && Parent()->NodeType() == ENodeType::Root && Game != EGame::DKCReturns)
{
CDrawUtil::DrawWireCube( mpCollision->MeshByIndex(0)->Bounds(), CColor::skRed );
CDrawUtil::DrawWireCube(mpCollision->MeshByIndex(0)->Bounds(), CColor::Red());
}
}
}
@@ -130,7 +129,7 @@ void CCollisionNode::SetCollision(CCollisionMeshGroup *pCollision)
mpCollision->BuildRenderData();
// Update bounds
mLocalAABox = CAABox::skInfinite;
mLocalAABox = CAABox::Infinite();
for (uint MeshIdx = 0; MeshIdx < pCollision->NumMeshes(); MeshIdx++)
{

4
src/Core/Scene/CLightNode.cpp
View File

@@ -8,7 +8,7 @@ CLightNode::CLightNode(CScene *pScene, uint32 NodeID, CSceneNode *pParent, CLigh
: CSceneNode(pScene, NodeID, pParent)
, mpLight(pLight)
{
mLocalAABox = CAABox::skOne;
mLocalAABox = CAABox::One();
mPosition = pLight->Position();
switch (pLight->Type())
@@ -34,7 +34,7 @@ void CLightNode::AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkViewInfo
if (IsSelected() && mpLight->Type() == ELightType::Custom)
{
CAABox RadiusBox = (CAABox::skOne * 2.f * mpLight->GetRadius()) + mPosition;
CAABox RadiusBox = (CAABox::One() * 2.f * mpLight->GetRadius()) + mPosition;
if (rkViewInfo.ViewFrustum.BoxInFrustum(RadiusBox))
pRenderer->AddMesh(this, -1, AABox(), false, ERenderCommand::DrawSelection);

14
src/Core/Scene/CModelNode.cpp
View File

@@ -9,9 +9,9 @@ CModelNode::CModelNode(CScene *pScene, uint32 NodeID, CSceneNode *pParent, CMode
, mWorldModel(false)
, mForceAlphaOn(false)
, mEnableScanOverlay(false)
, mTintColor(CColor::skWhite)
, mTintColor(CColor::White())
{
mScale = CVector3f::skOne;
mScale = CVector3f::One();
SetModel(pModel);
}
@@ -68,9 +68,9 @@ void CModelNode::Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand
CGraphics::SetDefaultLighting();
CGraphics::UpdateLightBlock();
CGraphics::sVertexBlock.COLOR0_Amb = CGraphics::skDefaultAmbientColor;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::TransparentWhite();
CGraphics::sPixelBlock.LightmapMultiplier = 1.f;
CGraphics::sPixelBlock.SetAllTevColors(CColor::skWhite);
CGraphics::sPixelBlock.SetAllTevColors(CColor::White());
}
else
{
@@ -79,7 +79,7 @@ void CModelNode::Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand
if (IsLightingEnabled)
{
CGraphics::sNumLights = 0;
CGraphics::sVertexBlock.COLOR0_Amb = CColor::skTransparentBlack;
CGraphics::sVertexBlock.COLOR0_Amb = CColor::TransparentBlack();
CGraphics::sPixelBlock.LightmapMultiplier = 1.f;
CGraphics::UpdateLightBlock();
}
@@ -87,10 +87,10 @@ void CModelNode::Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand
{
LoadLights(rkViewInfo);
if (CGraphics::sLightMode == CGraphics::ELightingMode::None)
CGraphics::sVertexBlock.COLOR0_Amb = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Amb = CColor::TransparentWhite();
}
CGraphics::sVertexBlock.COLOR0_Mat = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::TransparentWhite();
const float Mul = CGraphics::sWorldLightMultiplier;
CGraphics::sPixelBlock.SetAllTevColors(CColor(Mul,Mul,Mul));

2
src/Core/Scene/CModelNode.h
View File

@@ -33,7 +33,7 @@ public:
void SetWorldModel(bool World) { mWorldModel = World; }
void ForceAlphaEnabled(bool Enable) { mForceAlphaOn = Enable; }
void SetTintColor(const CColor& rkTintColor) { mTintColor = rkTintColor; }
void ClearTintColor() { mTintColor = CColor::skWhite; }
void ClearTintColor() { mTintColor = CColor::White(); }
void SetScanOverlayEnabled(bool Enable) { mEnableScanOverlay = Enable; }
void SetScanOverlayColor(const CColor& rkColor) { mScanOverlayColor = rkColor; }
CModel* Model() const { return mpModel; }

2
src/Core/Scene/CScene.cpp
View File

@@ -228,7 +228,7 @@ void CScene::SetActiveArea(CWorld *pWorld, CGameArea *pArea)
}
uint32 NumLightLayers = mpArea->NumLightLayers();
CGraphics::sAreaAmbientColor = CColor::skTransparentBlack;
CGraphics::sAreaAmbientColor = CColor::TransparentBlack();
for (uint32 iLyr = 0; iLyr < NumLightLayers; iLyr++)
{

29
src/Core/Scene/CSceneNode.cpp
View File

@@ -33,7 +33,7 @@ CSceneNode::~CSceneNode()
void CSceneNode::DrawSelection()
{
// Default implementation for virtual function
CDrawUtil::DrawWireCube(AABox(), CColor::skWhite);
CDrawUtil::DrawWireCube(AABox(), CColor::White());
}
void CSceneNode::RayAABoxIntersectTest(CRayCollisionTester& rTester, const SViewInfo& /*rkViewInfo*/)
@@ -54,13 +54,13 @@ bool CSceneNode::IsVisible() const
CColor CSceneNode::TintColor(const SViewInfo& rkViewInfo) const
{
// Default implementation for virtual function
return (IsSelected() && !rkViewInfo.GameMode ? skSelectionTint : CColor::skWhite);
return (IsSelected() && !rkViewInfo.GameMode ? skSelectionTint : CColor::White());
}
CColor CSceneNode::WireframeColor() const
{
// Default implementation for virtual function
return CColor::skWhite;
return CColor::White();
}
// ************ MAIN FUNCTIONALITY ************
@@ -119,7 +119,7 @@ void CSceneNode::LoadModelMatrix()
void CSceneNode::BuildLightList(CGameArea *pArea)
{
mLightCount = 0;
mAmbientColor = CColor::skTransparentBlack;
mAmbientColor = CColor::TransparentBlack();
uint32 Index = mLightLayerIndex;
if ((pArea->NumLightLayers() <= Index) || (pArea->NumLights(Index) == 0)) Index = 0;
@@ -139,7 +139,8 @@ void CSceneNode::BuildLightList(CGameArea *pArea)
// Default ambient color to white if there are no lights on the selected layer
uint32 NumLights = pArea->NumLights(Index);
if (NumLights == 0) mAmbientColor = CColor::skTransparentWhite;
if (NumLights == 0)
mAmbientColor = CColor::TransparentWhite();
for (uint32 iLight = 0; iLight < NumLights; iLight++)
{
@@ -147,16 +148,16 @@ void CSceneNode::BuildLightList(CGameArea *pArea)
// Ambient lights should only be present one per layer; need to check how the game deals with multiple ambients
if (pLight->Type() == ELightType::LocalAmbient)
mAmbientColor = pLight->Color();
// Other lights will be used depending which are closest to the node
else
{
bool IsInRange = AABox().IntersectsSphere(pLight->Position(), pLight->GetRadius());
mAmbientColor = pLight->Color();
}
else // Other lights will be used depending which are closest to the node
{
const bool IsInRange = AABox().IntersectsSphere(pLight->Position(), pLight->GetRadius());
if (IsInRange)
{
float Dist = mPosition.Distance(pLight->Position());
const float Dist = mPosition.Distance(pLight->Position());
LightEntries.push_back(SLightEntry(pLight, Dist));
}
}
@@ -179,7 +180,7 @@ void CSceneNode::LoadLights(const SViewInfo& rkViewInfo)
{
case CGraphics::ELightingMode::None:
// No lighting: full white ambient, no dynamic lights
CGraphics::sVertexBlock.COLOR0_Amb = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Amb = CColor::TransparentWhite();
break;
case CGraphics::ELightingMode::Basic:
@@ -197,7 +198,7 @@ void CSceneNode::LoadLights(const SViewInfo& rkViewInfo)
break;
}
CGraphics::sVertexBlock.COLOR0_Mat = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::TransparentWhite();
CGraphics::sPixelBlock.LightmapMultiplier = (Mode == CGraphics::ELightingMode::World ? 1.f : 0.f);
CGraphics::UpdateLightBlock();
@@ -244,7 +245,7 @@ void CSceneNode::DrawModelParts(CModel *pModel, FRenderOptions Options, size_t M
void CSceneNode::DrawBoundingBox() const
{
CDrawUtil::DrawWireCube(AABox(), CColor::skWhite);
CDrawUtil::DrawWireCube(AABox(), CColor::White());
}
void CSceneNode::DrawRotationArrow() const

6
src/Core/Scene/CSceneNode.h
View File

@@ -86,9 +86,9 @@ protected:
CSceneNode *mpParent;
CScene *mpScene;
CVector3f mPosition{CVector3f::skZero};
CQuaternion mRotation{CQuaternion::skIdentity};
CVector3f mScale{CVector3f::skOne};
CVector3f mPosition{CVector3f::Zero()};
CQuaternion mRotation{CQuaternion::Identity()};
CVector3f mScale{CVector3f::One()};
CAABox mLocalAABox;
bool mMouseHovering = false;

4
src/Core/Scene/CScriptAttachNode.cpp
View File

@@ -34,7 +34,7 @@ void CScriptAttachNode::AttachPropertyModified()
if (pModel && pModel->Type() == EResourceType::Model)
mLocalAABox = pModel->AABox();
else
mLocalAABox = CAABox::skInfinite;
mLocalAABox = CAABox::Infinite();
MarkTransformChanged();
}
@@ -93,7 +93,7 @@ void CScriptAttachNode::Draw(FRenderOptions Options, int /*ComponentIndex*/, ERe
CGraphics::UpdateVertexBlock();
CGraphics::sPixelBlock.TintColor = mpParent->TintColor(rkViewInfo);
CGraphics::sPixelBlock.SetAllTevColors(CColor::skWhite);
CGraphics::sPixelBlock.SetAllTevColors(CColor::White());
CGraphics::UpdatePixelBlock();
DrawModelParts(Model(), Options, 0, Command);
}

44
src/Core/Scene/CScriptNode.cpp
View File

@@ -176,8 +176,8 @@ void CScriptNode::Draw(FRenderOptions Options, int /*ComponentIndex*/, ERenderCo
if (CGraphics::sLightMode == CGraphics::ELightingMode::World && LightingOptions == EWorldLightingOptions::DisableWorldLighting)
{
CGraphics::sNumLights = 0;
CGraphics::sVertexBlock.COLOR0_Amb = CColor::skTransparentBlack;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Amb = CColor::TransparentBlack();
CGraphics::sVertexBlock.COLOR0_Mat = CColor::TransparentWhite();
CGraphics::sPixelBlock.LightmapMultiplier = 1.f;
CGraphics::UpdateLightBlock();
}
@@ -189,7 +189,7 @@ void CScriptNode::Draw(FRenderOptions Options, int /*ComponentIndex*/, ERenderCo
{
CGraphics::SetDefaultLighting();
CGraphics::sVertexBlock.COLOR0_Amb = CGraphics::skDefaultAmbientColor;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::TransparentWhite();
}
else
@@ -205,8 +205,10 @@ void CScriptNode::Draw(FRenderOptions Options, int /*ComponentIndex*/, ERenderCo
{
if (pModel->IsSkinned()) CGraphics::LoadIdentityBoneTransforms();
if (mpExtra) CGraphics::sPixelBlock.SetAllTevColors(mpExtra->TevColor());
else CGraphics::sPixelBlock.SetAllTevColors(CColor::skWhite);
if (mpExtra)
CGraphics::sPixelBlock.SetAllTevColors(mpExtra->TevColor());
else
CGraphics::sPixelBlock.SetAllTevColors(CColor::White());
CGraphics::sPixelBlock.TintColor = TintColor(rkViewInfo);
CGraphics::UpdatePixelBlock();
@@ -220,7 +222,7 @@ void CScriptNode::Draw(FRenderOptions Options, int /*ComponentIndex*/, ERenderCo
glDepthMask(GL_TRUE);
CGraphics::UpdateVertexBlock();
CGraphics::UpdatePixelBlock();
CDrawUtil::DrawShadedCube(CColor::skTransparentPurple * TintColor(rkViewInfo));
CDrawUtil::DrawShadedCube(CColor::TransparentPurple() * TintColor(rkViewInfo));
}
}
@@ -254,7 +256,7 @@ void CScriptNode::DrawSelection()
CGraphics::sMVPBlock.ModelMatrix = Transform;
CGraphics::UpdateMVPBlock();
CGraphics::sPixelBlock.TintColor = CColor::skWhite;
CGraphics::sPixelBlock.TintColor = CColor::White();
CGraphics::UpdatePixelBlock();
DrawRotationArrow();
@@ -270,14 +272,16 @@ void CScriptNode::DrawSelection()
// Don't draw in links if the other object is selected.
CLink *pLink = mpInstance->Link(ELinkType::Incoming, iIn);
CScriptNode *pLinkNode = mpScene->NodeForInstanceID(pLink->SenderID());
if (pLinkNode && !pLinkNode->IsSelected()) CDrawUtil::DrawLine(CenterPoint(), pLinkNode->CenterPoint(), CColor::skTransparentRed);
if (pLinkNode && !pLinkNode->IsSelected())
CDrawUtil::DrawLine(CenterPoint(), pLinkNode->CenterPoint(), CColor::TransparentRed());
}
for (uint32 iOut = 0; iOut < mpInstance->NumLinks(ELinkType::Outgoing); iOut++)
{
CLink *pLink = mpInstance->Link(ELinkType::Outgoing, iOut);
CScriptNode *pLinkNode = mpScene->NodeForInstanceID(pLink->ReceiverID());
if (pLinkNode) CDrawUtil::DrawLine(CenterPoint(), pLinkNode->CenterPoint(), CColor::skTransparentGreen);
if (pLinkNode)
CDrawUtil::DrawLine(CenterPoint(), pLinkNode->CenterPoint(), CColor::TransparentGreen());
}
}
}
@@ -594,7 +598,7 @@ void CScriptNode::GeneratePosition()
// For two or more links, average out the position of the connected objects.
else if (NumLinks >= 2)
{
CVector3f NewPos = CVector3f::skZero;
CVector3f NewPos = CVector3f::Zero();
for (uint32 iIn = 0; iIn < mpInstance->NumLinks(ELinkType::Incoming); iIn++)
{
@@ -631,7 +635,6 @@ void CScriptNode::TestGameModeVisibility()
// Don't render if we don't have an ingame model, or if this is the Prime series and the instance is not active.
if ((Template()->Game() < EGame::DKCReturns && !mpInstance->IsActive()) || !mpInstance->HasInGameModel())
mGameModeVisibility = EGameModeVisibility::NotVisible;
// If this is Returns, only render if the instance is active OR if it has a near visible activation.
else
mGameModeVisibility = (mpInstance->IsActive() || mpInstance->HasNearVisibleActivation()) ? EGameModeVisibility::Visible : EGameModeVisibility::NotVisible;
@@ -663,7 +666,7 @@ CModel* CScriptNode::ActiveModel() const
{
if (mpDisplayAsset->Type() == EResourceType::Model)
return static_cast<CModel*>(mpDisplayAsset.RawPointer());
else if (mpDisplayAsset->Type() == EResourceType::AnimSet || mpDisplayAsset->Type() == EResourceType::Character)
if (mpDisplayAsset->Type() == EResourceType::AnimSet || mpDisplayAsset->Type() == EResourceType::Character)
return static_cast<CAnimSet*>(mpDisplayAsset.RawPointer())->Character(mCharIndex)->pModel;
}
@@ -674,15 +677,18 @@ CAnimSet* CScriptNode::ActiveAnimSet() const
{
if (mpDisplayAsset && (mpDisplayAsset->Type() == EResourceType::AnimSet || mpDisplayAsset->Type() == EResourceType::Character))
return static_cast<CAnimSet*>(mpDisplayAsset.RawPointer());
else
return nullptr;
return nullptr;
}
CSkeleton* CScriptNode::ActiveSkeleton() const
{
CAnimSet *pSet = ActiveAnimSet();
if (pSet) return pSet->Character(mCharIndex)->pSkeleton;
else return nullptr;
if (pSet)
return pSet->Character(mCharIndex)->pSkeleton;
return nullptr;
}
CAnimation* CScriptNode::ActiveAnimation() const
@@ -712,7 +718,7 @@ bool CScriptNode::HasPreviewVolume() const
CAABox CScriptNode::PreviewVolumeAABox() const
{
if (!mHasVolumePreview)
return CAABox::skZero;
return CAABox::Zero();
else
return mpVolumePreviewNode->AABox();
}
@@ -752,7 +758,7 @@ void CScriptNode::SetDisplayAsset(CResource *pRes)
mAnimIndex = (IsAnimSet ? mpInstance->ActiveAnimIndex() : -1);
CModel *pModel = ActiveModel();
mLocalAABox = (pModel ? pModel->AABox() : CAABox::skOne);
mLocalAABox = (pModel ? pModel->AABox() : CAABox::One());
MarkTransformChanged();
for (uint32 iAttach = 0; iAttach < mAttachments.size(); iAttach++)
@@ -768,7 +774,7 @@ void CScriptNode::CalculateTransform(CTransform4f& rOut) const
if (pTemp->ScaleType() != CScriptTemplate::EScaleType::ScaleDisabled)
{
CVector3f Scale = (HasPreviewVolume() ? CVector3f::skOne : AbsoluteScale());
CVector3f Scale = (HasPreviewVolume() ? CVector3f::One() : AbsoluteScale());
rOut.Scale(Scale * pTemp->PreviewScale());
}

10
src/Core/Scene/CStaticNode.cpp
View File

@@ -9,7 +9,7 @@ CStaticNode::CStaticNode(CScene *pScene, uint32 NodeID, CSceneNode *pParent, CSt
, mpModel(pModel)
{
mLocalAABox = mpModel->AABox();
mScale = CVector3f::skOne;
mScale = CVector3f::One();
SetName("Static Node");
}
@@ -68,8 +68,8 @@ void CStaticNode::Draw(FRenderOptions Options, int ComponentIndex, ERenderComman
if (IsLightingEnabled)
{
CGraphics::sNumLights = 0;
CGraphics::sVertexBlock.COLOR0_Amb = UseWhiteAmbient ? CColor::skTransparentWhite : CColor::skTransparentBlack;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::skBlack;
CGraphics::sVertexBlock.COLOR0_Amb = UseWhiteAmbient ? CColor::TransparentWhite() : CColor::TransparentBlack();
CGraphics::sVertexBlock.COLOR0_Mat = CColor::Black();
CGraphics::sPixelBlock.LightmapMultiplier = 1.0f;
CGraphics::UpdateLightBlock();
}
@@ -78,8 +78,8 @@ void CStaticNode::Draw(FRenderOptions Options, int ComponentIndex, ERenderComman
{
LoadLights(rkViewInfo);
if (CGraphics::sLightMode == CGraphics::ELightingMode::None || UseWhiteAmbient)
CGraphics::sVertexBlock.COLOR0_Amb = CColor::skTransparentWhite;
CGraphics::sVertexBlock.COLOR0_Mat = CColor::skWhite;
CGraphics::sVertexBlock.COLOR0_Amb = CColor::TransparentWhite();
CGraphics::sVertexBlock.COLOR0_Mat = CColor::White();
}
float Mul = CGraphics::sWorldLightMultiplier;

2
src/Core/ScriptExtra/CDamageableTriggerExtra.cpp
View File

@@ -123,7 +123,7 @@ void CDamageableTriggerExtra::UpdatePlaneTransform()
}
if (mRenderSide == ERenderSide::NoRender)
mLocalAABox = CAABox::skZero;
mLocalAABox = CAABox::Zero();
else
mLocalAABox = CAABox(CVector3f(-1.f, -1.f, 0.f), CVector3f(1.f, 1.f, 0.f));

9
src/Core/ScriptExtra/CDoorExtra.cpp
View File

@@ -30,9 +30,8 @@ void CDoorExtra::PropertyModified(IProperty* pProperty)
if (mpShieldModel)
mLocalAABox = mpShieldModel->AABox();
else
mLocalAABox = CAABox::skInfinite;
mLocalAABox = CAABox::Infinite();
MarkTransformChanged();
}
@@ -46,10 +45,10 @@ void CDoorExtra::PropertyModified(IProperty* pProperty)
{
// The Echoes demo doesn't have the shield color property. The color is
// always cyan if the door is unlocked and always white if the door is locked.
mShieldColor = CColor::skWhite;
mShieldColor = CColor::White();
if (!mDisabledProp)
mShieldColor = CColor::skCyan;
mShieldColor = CColor::Cyan();
}
}
@@ -79,7 +78,7 @@ void CDoorExtra::Draw(FRenderOptions Options, int /*ComponentIndex*/, ERenderCom
CColor Tint = mpParent->TintColor(rkViewInfo) * mShieldColor;
CGraphics::sPixelBlock.TintColor = Tint;
CGraphics::sPixelBlock.SetAllTevColors(CColor::skWhite);
CGraphics::sPixelBlock.SetAllTevColors(CColor::White());
CGraphics::UpdatePixelBlock();
DrawModelParts(mpShieldModel, Options, 0, Command);
}

8
src/Core/ScriptExtra/CRadiusSphereExtra.cpp
View File

@@ -52,21 +52,21 @@ CColor CRadiusSphereExtra::Color() const
// Repulsor
case 0x63:
case FOURCC('REPL'):
return CColor::skGreen;
return CColor::Green();
// RadialDamage
case 0x68:
case FOURCC('RADD'):
return CColor::skRed;
return CColor::Red();
default:
return CColor::skWhite;
return CColor::White();
}
}
CAABox CRadiusSphereExtra::Bounds() const
{
CAABox Bounds = CAABox::skOne * 2.f * mRadius;
CAABox Bounds = CAABox::One() * 2.f * mRadius;
Bounds += mpParent->AbsolutePosition();
return Bounds;
}

2
src/Core/ScriptExtra/CScriptExtra.h
View File

@@ -56,7 +56,7 @@ public:
virtual void LinksModified() {}
virtual bool ShouldDrawNormalAssets() { return true; }
virtual bool ShouldDrawVolume() { return true; }
virtual CColor TevColor() { return CColor::skWhite; }
virtual CColor TevColor() { return CColor::White(); }
virtual void ModifyTintColor(CColor& /*Color*/) {}
// Create Script Extra

10
src/Core/ScriptExtra/CSpacePirateExtra.cpp
View File

@@ -19,16 +19,16 @@ CColor CSpacePirateExtra::TevColor()
{
// Priority: Plasma -> Ice -> Power -> Wave
if (mPlasmaVulnerability.IsValid() && mPlasmaVulnerability.Get() == EVulnerabilityTypeMP1::Normal)
return CColor::skRed;
return CColor::Red();
if (mIceVulnerability.IsValid() && mIceVulnerability.Get() == EVulnerabilityTypeMP1::Normal)
return CColor::skWhite;
return CColor::White();
if (mPowerVulnerability.IsValid() && mPowerVulnerability.Get() == EVulnerabilityTypeMP1::Normal)
return CColor::skYellow;
return CColor::Yellow();
if (mWaveVulnerability.IsValid() && mWaveVulnerability.Get() == EVulnerabilityTypeMP1::Normal)
return CColor::skPurple;
return CColor::Purple();
return CColor::skWhite;
return CColor::White();
}

2
src/Core/ScriptExtra/CSplinePathExtra.h
View File

@@ -17,7 +17,7 @@ class CSplinePathExtra : public CScriptExtra
public:
explicit CSplinePathExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pParent = nullptr);
~CSplinePathExtra() override { ClearWaypoints(); }
CColor PathColor() const { return mPathColor.IsValid() ? mPathColor.Get() : CColor::skBlack; }
CColor PathColor() const { return mPathColor.IsValid() ? mPathColor.Get() : CColor::Black(); }
void PostLoad() override;
void PropertyModified(IProperty* pProperty) override;

10
src/Core/ScriptExtra/CWaypointExtra.cpp
View File

@@ -37,11 +37,9 @@ void CWaypointExtra::CheckColor()
mColor = pMat->Konst(0);
}
}
// Use preset color (DKCR)
else
else // Use preset color (DKCR)
{
mColor = CColor::skCyan;
mColor = CColor::Cyan();
}
mColor.A = 0;
@@ -141,7 +139,7 @@ void CWaypointExtra::OnTransformed()
for (uint32 iLink = 0; iLink < mLinks.size(); iLink++)
{
SWaypointLink& rLink = mLinks[iLink];
rLink.LineAABB = CAABox::skInfinite;
rLink.LineAABB = CAABox::Infinite();
rLink.LineAABB.ExpandBounds(AbsolutePosition());
rLink.LineAABB.ExpandBounds(rLink.pWaypoint->AbsolutePosition());
}
@@ -183,5 +181,5 @@ void CWaypointExtra::Draw(FRenderOptions /*Options*/, int ComponentIndex, ERende
CColor CWaypointExtra::TevColor()
{
return (mGame < EGame::DKCReturns ? CColor::skWhite : mColor);
return (mGame < EGame::DKCReturns ? CColor::White() : mColor);
}

2
src/Core/ScriptExtra/CWaypointExtra.h
View File

@@ -8,7 +8,7 @@
class CWaypointExtra : public CScriptExtra
{
// Draw waypoint paths formed by script connections
CColor mColor{CColor::skBlack};
CColor mColor{CColor::Black()};
bool mLinksBuilt = false;
std::list<CSplinePathExtra*> mPaths;