Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix Skin export interface issue, #169

Browse source
This commit is contained in:
kaetemi 2014-07-29 15:42:11 +02:00
parent 7d79e75d1a
commit 20acc5a48c
1 changed files with 15 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp
View file

@ -18,64 +18,17 @@
#include "export_nel.h" #include "export_nel.h"
#include "export_appdata.h" #include "export_appdata.h"
#include "nel/3d/skeleton_shape.h" #include "nel/3d/skeleton_shape.h"
#include "iskin.h"
using namespace NLMISC; using namespace NLMISC;
using namespace NL3D; using namespace NL3D;
// *************************************************************************** // ***************************************************************************
#define SKIN_INTERFACE 0x00010000
// ***************************************************************************
#define SKIN_CLASS_ID Class_ID(9815843,87654)
#define PHYSIQUE_CLASS_ID Class_ID(PHYSIQUE_CLASS_ID_A, PHYSIQUE_CLASS_ID_B) #define PHYSIQUE_CLASS_ID Class_ID(PHYSIQUE_CLASS_ID_A, PHYSIQUE_CLASS_ID_B)
// *************************************************************************** // ***************************************************************************
class ISkinContextData
{
public:
virtual int GetNumPoints()=0;
virtual int GetNumAssignedBones(int vertexIdx)=0;
virtual int GetAssignedBone(int vertexIdx, int boneIdx)=0;
virtual float GetBoneWeight(int vertexIdx, int boneIdx)=0;
virtual int GetSubCurveIndex(int vertexIdx, int boneIdx)=0;
virtual int GetSubSegmentIndex(int vertexIdx, int boneIdx)=0;
virtual float GetSubSegmentDistance(int vertexIdx, int boneIdx)=0;
virtual Point3 GetTangent(int vertexIdx, int boneIdx)=0;
virtual Point3 GetOPoint(int vertexIdx, int boneIdx)=0;
virtual void SetWeight(int vertexIdx, int boneIdx, float weight)=0;
virtual void SetWeight(int vertexIdx, INode* bone, float weight)=0;
virtual void SetWeights(int vertexIdx, Tab<int> boneIdx, Tab<float> weights)=0;
virtual void SetWeights(int vertexIdx, INodeTab boneIdx, Tab<float> weights)=0;
};
// ***************************************************************************
class ISkin
{
public:
ISkin() {}
~ISkin() {}
virtual int GetBoneInitTM(INode *pNode, Matrix3 &InitTM, bool bObjOffset = false)=0;
virtual int GetSkinInitTM(INode *pNode, Matrix3 &InitTM, bool bObjOffset = false)=0;
virtual int GetNumBones()=0;
virtual INode *GetBone(int idx)=0;
virtual DWORD GetBoneProperty(int idx)=0;
virtual ISkinContextData *GetContextInterface(INode *pNode)=0;
virtual BOOL AddBone(INode *bone)=0;
virtual BOOL AddBones(INodeTab *bones)=0;
virtual BOOL RemoveBone(INode *bone)=0;
virtual void Invalidate()=0;
};
// ***************************************************************************
void CExportNel::buildSkeletonShape (CSkeletonShape& skeletonShape, INode& node, mapBoneBindPos* mapBindPos, TInodePtrInt& mapId, void CExportNel::buildSkeletonShape (CSkeletonShape& skeletonShape, INode& node, mapBoneBindPos* mapBindPos, TInodePtrInt& mapId,
TimeValue time) TimeValue time)
{ {
@ -422,7 +375,7 @@ bool CExportNel::isSkin (INode& node)
bool ok=false; bool ok=false;
// Get the skin modifier // Get the skin modifier
Modifier* skin=getModifier (&node, SKIN_CLASS_ID); Modifier* skin=getModifier (&node, SKIN_CLASSID);
// Found it ? // Found it ?
if (skin) if (skin)
@ -431,7 +384,7 @@ bool CExportNel::isSkin (INode& node)
//if (skin->IsEnabled()) //if (skin->IsEnabled())
{ {
// Get a com_skin2 interface // Get a com_skin2 interface
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE); ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN);
// Found com_skin2 ? // Found com_skin2 ?
if (comSkinInterface) if (comSkinInterface)
@ -446,7 +399,7 @@ bool CExportNel::isSkin (INode& node)
ok=true; ok=true;
// Release the interface // Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface); skin->ReleaseInterface (I_SKIN, comSkinInterface);
} }
} }
} }
@ -490,7 +443,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt
uint ok=NoError; uint ok=NoError;
// Get the skin modifier // Get the skin modifier
Modifier* skin=getModifier (&node, SKIN_CLASS_ID); Modifier* skin=getModifier (&node, SKIN_CLASSID);
// Build a the name array // Build a the name array
buildMesh.BonesNames.resize (skeletonShape.size()); buildMesh.BonesNames.resize (skeletonShape.size());
@ -513,7 +466,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt
// ********** COMSKIN EXPORT ********** // ********** COMSKIN EXPORT **********
// Get a com_skin2 interface // Get a com_skin2 interface
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE); ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN);
// Should been controled with isSkin before. // Should been controled with isSkin before.
nlassert (comSkinInterface); nlassert (comSkinInterface);
@ -645,7 +598,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt
} }
// Release the interface // Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface); skin->ReleaseInterface (I_SKIN, comSkinInterface);
} }
else else
{ {
@ -881,13 +834,13 @@ INode* CExportNel::getSkeletonRootBone (INode& node)
INode* ret=NULL; INode* ret=NULL;
// Get the skin modifier // Get the skin modifier
Modifier* skin=getModifier (&node, SKIN_CLASS_ID); Modifier* skin=getModifier (&node, SKIN_CLASSID);
// Found it ? // Found it ?
if (skin) if (skin)
{ {
// Get a com_skin2 interface // Get a com_skin2 interface
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE); ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN);
// Found com_skin2 ? // Found com_skin2 ?
if (comSkinInterface) if (comSkinInterface)
@ -921,7 +874,7 @@ INode* CExportNel::getSkeletonRootBone (INode& node)
} }
// Release the interface // Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface); skin->ReleaseInterface (I_SKIN, comSkinInterface);
} }
} }
else else
@ -1037,13 +990,13 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind
uint ok=NoError; uint ok=NoError;
// Get the skin modifier // Get the skin modifier
Modifier* skin=getModifier (&skinedNode, SKIN_CLASS_ID); Modifier* skin=getModifier (&skinedNode, SKIN_CLASSID);
// Found it ? // Found it ?
if (skin) if (skin)
{ {
// Get a com_skin2 interface // Get a com_skin2 interface
ISkin *comSkinInterface=(ISkin*)skin->GetInterface (SKIN_INTERFACE); ISkin *comSkinInterface=(ISkin*)skin->GetInterface (I_SKIN);
// Should been controled with isSkin before. // Should been controled with isSkin before.
nlassert (comSkinInterface); nlassert (comSkinInterface);
@ -1089,7 +1042,7 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind
} }
// Release the interface // Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, comSkinInterface); skin->ReleaseInterface (I_SKIN, comSkinInterface);
} }
} }
else else
@ -1274,7 +1227,7 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind
} }
// Release the interface // Release the interface
skin->ReleaseInterface (SKIN_INTERFACE, physiqueInterface); skin->ReleaseInterface (I_SKIN, physiqueInterface);
} }
} }
} }
@ -1286,7 +1239,7 @@ void CExportNel::addSkeletonBindPos (INode& skinedNode, mapBoneBindPos& boneBind
void CExportNel::enableSkinModifier (INode& node, bool enable) void CExportNel::enableSkinModifier (INode& node, bool enable)
{ {
// Get the skin modifier // Get the skin modifier
Modifier* skin=getModifier (&node, SKIN_CLASS_ID); Modifier* skin=getModifier (&node, SKIN_CLASSID);
// Found it ? // Found it ?
if (skin) if (skin)