AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-14 07:36:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup & refactoring

Browse Source
This commit is contained in:
Aruki
2018-12-16 14:00:40 -07:00
parent 2287b05bc3
commit c4829f5fda
197 changed files with 2461 additions and 2345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ CCharacterNode::CCharacterNode(CScene *pScene, uint32 NodeID, CAnimSet *pChar /*
ENodeType CCharacterNode::NodeType()
{
return eCharacterNode;
return ENodeType::Character;
}
void CCharacterNode::PostLoad()
@@ -34,13 +34,13 @@ void CCharacterNode::AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkView
CModel *pModel = mpCharacter->Character(mActiveCharSet)->pModel;
CSkeleton *pSkel = mpCharacter->Character(mActiveCharSet)->pSkeleton;
if (pModel && rkViewInfo.ShowFlags.HasFlag(eShowObjectGeometry))
if (pModel && rkViewInfo.ShowFlags.HasFlag(EShowFlag::ObjectGeometry))
AddModelToRenderer(pRenderer, pModel, 0);
if (pSkel)
{
if (rkViewInfo.ShowFlags.HasFlag(eShowSkeletons))
pRenderer->AddMesh(this, 0, AABox(), false, eDrawMesh, eForeground);
if (rkViewInfo.ShowFlags.HasFlag(EShowFlag::Skeletons))
pRenderer->AddMesh(this, 0, AABox(), false, ERenderCommand::DrawMesh, EDepthGroup::Foreground);
}
}
@@ -81,7 +81,7 @@ void CCharacterNode::Draw(FRenderOptions Options, int ComponentIndex, ERenderCom
SRayIntersection CCharacterNode::RayNodeIntersectTest(const CRay& rkRay, uint32 /*AssetID*/, const SViewInfo& rkViewInfo)
{
// Check for bone under ray. Doesn't check for model intersections atm
if (mpCharacter && rkViewInfo.ShowFlags.HasFlag(eShowSkeletons))
if (mpCharacter && rkViewInfo.ShowFlags.HasFlag(EShowFlag::Skeletons))
{
CSkeleton *pSkel = mpCharacter->Character(mActiveCharSet)->pSkeleton;