Added support for model skinning

src/Core/Scene/CCharacterNode.cpp

@@ -23,22 +23,64 @@ void CCharacterNode::PostLoad()
     }
 }
 
-void CCharacterNode::AddToRenderer(CRenderer *pRenderer, const SViewInfo& /*rkViewInfo*/)
+void CCharacterNode::AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkViewInfo)
 {
     if (!mpCharacter) return;
+    // todo: frustum check. Currently don't have a means of pulling the AABox for the
+    // current animation so this isn't in yet.
 
-    if (mpCharacter->NodeSkeleton(mActiveCharSet))
+    CModel *pModel = mpCharacter->NodeModel(mActiveCharSet);
+    CSkeleton *pSkel = mpCharacter->NodeSkeleton(mActiveCharSet);
+
+    if (pModel)
     {
-        pRenderer->AddOpaqueMesh(this, 0, AABox(), eDrawMesh);
+        if (!pModel->HasTransparency(0))
+            pRenderer->AddOpaqueMesh(this, -1, AABox(), eDrawMesh);
+        else
+            AddSurfacesToRenderer(pRenderer, pModel, 0, rkViewInfo, false);
+    }
+
+    if (pSkel)
+    {
+        CAnimation *pAnim = mpCharacter->Animation(mActiveAnim);
+        pSkel->UpdateTransform(mTransformData, pAnim, mAnimTime, false);
+
+        if (rkViewInfo.ShowFlags.HasFlag(eShowSkeletons))
+            pRenderer->AddOpaqueMesh(this, -2, AABox(), eDrawMesh);
     }
 }
 
-void CCharacterNode::Draw(FRenderOptions Options, int /*ComponentIndex*/, const SViewInfo& /*rkViewInfo*/)
+void CCharacterNode::Draw(FRenderOptions Options, int ComponentIndex, const SViewInfo& rkViewInfo)
 {
     CSkeleton *pSkel = mpCharacter->NodeSkeleton(mActiveCharSet);
-    CAnimation *pAnim = mpCharacter->Animation(mActiveAnim);
-    pSkel->UpdateTransform(mTransformData, pAnim, mAnimTime, false);
-    pSkel->Draw(Options, mTransformData);
+
+    // Draw skeleton
+    if (ComponentIndex == -2)
+    {
+        pSkel->Draw(Options, mTransformData);
+    }
+
+    // Draw mesh
+    else
+    {
+        // Set lighting
+        CGraphics::SetDefaultLighting();
+        CGraphics::UpdateLightBlock();
+        CGraphics::sVertexBlock.COLOR0_Amb = CGraphics::skDefaultAmbientColor;
+        CGraphics::sPixelBlock.LightmapMultiplier = 1.f;
+        CGraphics::sPixelBlock.TevColor = CColor::skWhite;
+        CGraphics::sPixelBlock.TintColor = TintColor(rkViewInfo);
+
+        // Draw surface OR draw entire model
+        CGraphics::LoadBoneTransforms(mTransformData);
+        CGraphics::LoadBoneInverseBindTransforms(pSkel);
+        CModel *pModel = mpCharacter->NodeModel(mActiveCharSet);
+
+        if (ComponentIndex < 0)
+            pModel->Draw(Options, 0);
+        else
+            pModel->DrawSurface(Options, ComponentIndex, 0);
+    }
 }
 
 SRayIntersection CCharacterNode::RayNodeIntersectTest(const CRay& rkRay, u32 /*AssetID*/, const SViewInfo& /*rkViewInfo*/)

src/Core/Scene/CModelNode.cpp

@@ -83,6 +83,9 @@ void CModelNode::Draw(FRenderOptions Options, int ComponentIndex, const SViewInf
     CGraphics::sPixelBlock.TintColor = TintColor(rkViewInfo);
     LoadModelMatrix();
 
+    if (mpModel->IsSkinned())
+        CGraphics::LoadIdentityBoneTransforms();
+
     if (ComponentIndex < 0)
         mpModel->Draw(Options, mActiveMatSet);
     else

src/Core/Scene/CSceneNode.cpp

@@ -224,7 +224,7 @@ void CSceneNode::DrawRotationArrow() const
     spArrowModel->Draw(eNoRenderOptions, 0);
 }
 
-void CSceneNode::AddSurfacesToRenderer(CRenderer *pRenderer, CModel *pModel, u32 MatSet, const SViewInfo& rkViewInfo)
+void CSceneNode::AddSurfacesToRenderer(CRenderer *pRenderer, CModel *pModel, u32 MatSet, const SViewInfo& rkViewInfo, bool DoFrustumTest /*= true*/)
 {
     u32 SurfaceCount = pModel->GetSurfaceCount();
 
@@ -232,7 +232,7 @@ void CSceneNode::AddSurfacesToRenderer(CRenderer *pRenderer, CModel *pModel, u32
     {
         CAABox TransformedBox = pModel->GetSurfaceAABox(iSurf).Transformed(Transform());
 
-        if (rkViewInfo.ViewFrustum.BoxInFrustum(TransformedBox))
+        if (!DoFrustumTest || rkViewInfo.ViewFrustum.BoxInFrustum(TransformedBox))
         {
             if (!pModel->IsSurfaceTransparent(iSurf, MatSet))
                 pRenderer->AddOpaqueMesh(this, (int) iSurf, TransformedBox, eDrawMesh);

src/Core/Scene/CSceneNode.h

@@ -79,7 +79,7 @@ public:
     void LoadLights(const SViewInfo& rkViewInfo);
     void DrawBoundingBox() const;
     void DrawRotationArrow() const;
-    void AddSurfacesToRenderer(CRenderer *pRenderer, CModel *pModel, u32 MatSet, const SViewInfo& rkViewInfo);
+    void AddSurfacesToRenderer(CRenderer *pRenderer, CModel *pModel, u32 MatSet, const SViewInfo& rkViewInfo, bool DoFrustumTest = true);
 
     // Transform
     void Translate(const CVector3f& rkTranslation, ETransformSpace TransformSpace);

src/Core/Scene/FShowFlags.h

@@ -14,7 +14,8 @@ enum EShowFlag
     eShowObjects            = 0x18,
     eShowLights             = 0x20,
     eShowSky                = 0x40,
-    eShowAll                = 0x7F
+    eShowSkeletons          = 0x80,
+    eShowAll                = 0xFFFFFFFF
 };
 DECLARE_FLAGS(EShowFlag, FShowFlags)