Skip to content
This repository has been archived by the owner on Jul 7, 2022. It is now read-only.

Commit

Permalink
Master update 2
Browse files Browse the repository at this point in the history 
Added ability to export/import animtions.
Added Envirinment generation for exported file.
Added skeleton pose capture frame for export.
  • Loading branch information
@PredatorCZ
PredatorCZ committed May 20, 2019
1 parent 3118e3d commit 31b4b96
Show file tree
Hide file tree
Showing 7 changed files with 497 additions and 53 deletions.
2 changes: 1 addition & 1 deletion 3rd_party/HavokLib
Submodule HavokLib updated 29 files
+1 −1 3rd_party/PreCore
+3 −0 HavokLib.vcxproj
+9 −0 HavokLib.vcxproj.filters
+8 −0 README.md
+ − _samples/Bin/samples_to_unpack.7z
+14 −4 _samples/HavokLibSamples.cpp
+1 −0 _samples/HavokLibSamples.vcxproj
+3 −0 _samples/HavokLibSamples.vcxproj.filters
+119 −0 _samples/InterleavedTesting.h
+93 −93 _samples/SkeletonTesting.h
+144 −20 include/HavokApi.hpp
+152 −1 include/HavokXMLApi.hpp
+31 −3 include/hkInternalInterfaces.h
+324 −4 source/hkBin2XML.cpp
+1 −1 source/hkCore.cpp
+5 −137 source/hkHeader.cpp
+1 −6 source/hkHeader.hpp
+1 −1 source/hkNewHeader.cpp
+28 −17 source/hkObjectBase.h
+44 −12 source/hkRegistry.cpp
+3 −0 source/hkXML.h
+46 −13 source/hkaAnimation.h
+164 −0 source/hkaAnimationBinding.h
+14 −0 source/hkaDecompressor.h
+4 −0 source/hkaDeltaCompressedAnimation.h
+66 −0 source/hkaDeltaDecompressor.h
+143 −0 source/hkaInterleavedAnimation.h
+4 −0 source/hkaWaveletCompressedAnimation.h
+73 −0 source/hkxEnvironment.h
246 changes: 236 additions & 10 deletions src/HavokExport.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@

#include "HavokMax.h"
#include "datas/esstring.h"
#include "datas/fileinfo.hpp"
#include <impapi.h>

#define HavokExport_CLASS_ID Class_ID(0x2b020aa4, 0x5c7f7d58)
static const TCHAR _className[] = _T("HavokExport");

class HavokExport : public SceneExport, HavokMaxV2
class HavokExport : public SceneExport, public HavokMaxV2
{
public:
//Constructor/Destructor
Expand All @@ -47,6 +48,8 @@ class HavokExport : public SceneExport, HavokMaxV2

float inverseScale = 1.0f;
Matrix3 inverseCorMat = 1.0f;

void ProcessAnimation(xmlSkeleton *skel, xmlAnimationBinding *binds, xmlInterleavedAnimation *anim);
};

class : public ClassDesc2
Expand Down Expand Up @@ -112,7 +115,7 @@ const TCHAR *HavokExport::OtherMessage2()

unsigned int HavokExport::Version()
{
return 100;
return HAVOKMAX_VERSIONINT;
}

void HavokExport::ShowAbout(HWND hWnd)
Expand All @@ -134,13 +137,14 @@ thread_local static class : public ITreeEnumProc
{
void AddBone(INode *nde)
{
TimeValue captureFrame = ex->IDC_EDIT_CAPTUREFRAME_index * GetTicksPerFrame();
xmlBoneMAX *currentNode = new xmlBoneMAX();
currentNode->ID = static_cast<short>(skeleton->bones.size());
currentNode->name = esString(nde->GetName());
currentNode->ref = nde;

INode *parentNode = nde->GetParentNode();
Matrix3 nodeTM = nde->GetNodeTM(0);
Matrix3 nodeTM = nde->GetNodeTM(captureFrame);

nodeTM.NoScale();

Expand All @@ -150,7 +154,7 @@ thread_local static class : public ITreeEnumProc
if (static_cast<xmlBoneMAX*>(b)->ref == parentNode)
{
currentNode->parent = b;
Matrix3 parentTM = static_cast<INode *>(static_cast<xmlBoneMAX *>(b)->ref)->GetNodeTM(0);
Matrix3 parentTM = static_cast<INode *>(static_cast<xmlBoneMAX *>(b)->ref)->GetNodeTM(captureFrame);
parentTM.NoScale();
parentTM.Invert();
nodeTM *= parentTM;
Expand All @@ -161,8 +165,9 @@ thread_local static class : public ITreeEnumProc
if (!currentNode->parent)
nodeTM *= ex->inverseCorMat;

currentNode->transform.position = reinterpret_cast<const Vector &>(nodeTM.GetTrans() * ex->inverseScale);
currentNode->transform.rotation = reinterpret_cast<Vector4 &>(static_cast<Quat>(nodeTM).Invert());
currentNode->transform.position = reinterpret_cast<const Vector4 &>(nodeTM.GetTrans() * ex->inverseScale);
currentNode->transform.position.W = 1.0f;
currentNode->transform.rotation = reinterpret_cast<Vector4 &>(static_cast<Quat>(nodeTM).Conjugate());

skeleton->bones.push_back(currentNode);
}
Expand All @@ -177,6 +182,204 @@ thread_local static class : public ITreeEnumProc
}
}iSceneScanner;


bool CanSkipBone(INode *cNode)
{
Control *ctr = cNode->GetTMController();
Control *posCtrl = ctr->GetPositionController();

if (!posCtrl)
return false;

IKeyControl *posCtr = GetKeyControlInterface(posCtrl);

int numKeys = 0;

if (posCtr)
numKeys |= posCtr->GetNumKeys();
else
{
posCtr = GetKeyControlInterface(posCtrl->GetXController());
numKeys |= posCtr->GetNumKeys();
posCtr = GetKeyControlInterface(posCtrl->GetYController());
numKeys |= posCtr->GetNumKeys();
posCtr = GetKeyControlInterface(posCtrl->GetZController());
numKeys |= posCtr->GetNumKeys();
}

Control *rotCtrl = ctr->GetRotationController();

if (!rotCtrl)
return false;

IKeyControl *rotCtr = GetKeyControlInterface(rotCtrl);

if (rotCtr)
numKeys |= rotCtr->GetNumKeys();
else
{
rotCtr = GetKeyControlInterface(rotCtrl->GetXController());
numKeys |= rotCtr->GetNumKeys();
rotCtr = GetKeyControlInterface(rotCtrl->GetYController());
numKeys |= rotCtr->GetNumKeys();
rotCtr = GetKeyControlInterface(rotCtrl->GetZController());
numKeys |= rotCtr->GetNumKeys();
}

Control *scaleCtrl = ctr->GetScaleController();

if (!scaleCtrl)
return false;

IKeyControl *scaleCtr = GetKeyControlInterface(scaleCtrl);

if (scaleCtr)
numKeys |= scaleCtr->GetNumKeys();
else
{
scaleCtr = GetKeyControlInterface(scaleCtrl->GetXController());
numKeys |= scaleCtr->GetNumKeys();
scaleCtr = GetKeyControlInterface(scaleCtrl->GetYController());
numKeys |= scaleCtr->GetNumKeys();
scaleCtr = GetKeyControlInterface(scaleCtrl->GetZController());
numKeys |= scaleCtr->GetNumKeys();
}

return numKeys < 2;
}

void HavokExport::ProcessAnimation(xmlSkeleton *skel, xmlAnimationBinding *binds, xmlInterleavedAnimation *anim)
{
anim->animType = HK_INTERLEAVED_ANIMATION;

Interval captureIterval(IDC_EDIT_ANISTART_index * GetTicksPerFrame(), IDC_EDIT_ANIEND_index * GetTicksPerFrame());

anim->duration = TicksToSec(captureIterval.End() - captureIterval.Start());
anim->annotations.reserve(skel->GetNumBones());

for (auto &b : skel->bones)
{
xmlBoneMAX *cBone = static_cast<xmlBoneMAX *>(b);
INode *cNode = static_cast<INode *>(cBone->ref);

if (flags[IDC_CH_ANIOPTIMIZE_checked] && flags[IDC_CH_ANIOPTIMIZE_enabled] && CanSkipBone(cNode))
continue;

binds->transformTrackToBoneIndices.push_back(cBone->ID);

xmlInterleavedAnimation::Transform_Container *aCont = new xmlInterleavedAnimation::Transform_Container;
aCont->reserve(captureIterval.Duration() / GetTicksPerFrame());

Control *rotateControl = (Control *)CreateInstance(CTRL_ROTATION_CLASS_ID, Class_ID(HYBRIDINTERP_ROTATION_CLASS_ID, 0));
IKeyControl *kCon = GetKeyControlInterface(rotateControl);

for (TimeValue t = captureIterval.Start(); t <= captureIterval.End(); t += GetTicksPerFrame())
{
Matrix3 lMat = cNode->GetNodeTM(t);
Matrix3 pMat;
INode *parentNode = cNode->GetParentNode();

if (parentNode && !parentNode->IsRootNode())
{
pMat = cNode->GetParentTM(t);
pMat.Invert();
}
else
pMat = inverseCorMat;

lMat *= pMat;

hkQTransform cTransform;

cTransform.scale = { lMat.GetRow(0).Length(), lMat.GetRow(1).Length(), lMat.GetRow(2).Length(), 0.0f };

if (parentNode && !parentNode->IsRootNode())
{
pMat = cNode->GetParentTM(t);
pMat.NoScale();
pMat.Invert();
}

lMat = cNode->GetNodeTM(t);
lMat.NoScale();
lMat *= pMat;

ILinRotKey cKey;
cKey.time = t;
cKey.val = Quat(lMat).Conjugate();
kCon->AppendKey(&cKey);

cTransform.position = reinterpret_cast<const Vector4 &>(lMat.GetTrans());
cTransform.position.W = 1.0f;
aCont->push_back(cTransform);
//TODO check scale
}

Control *rotateControl2 = (Control *)CreateInstance(CTRL_ROTATION_CLASS_ID, Class_ID(LININTERP_ROTATION_CLASS_ID , 0));
rotateControl2->Copy(rotateControl);
IKeyControl *kCon2 = GetKeyControlInterface(rotateControl2);

for (int k = 0; k < kCon2->GetNumKeys(); k++)
{
ILinRotKey cKey;
kCon2->GetKey(k, &cKey);

aCont->at(k).rotation = reinterpret_cast<Vector4 &>(cKey.val);
}

if (aCont->size() == 1)
for (auto &t : *aCont)
aCont->push_back(aCont->at(0));

anim->transforms.push_back(aCont);

xmlAnnotationTrack annot;
annot.name = cBone->name;
anim->annotations.push_back(annot);
}
}

void SaveEnvData(xmlEnvironment *env, const TCHAR *fileName)
{
TFileInfo fleInfo(fileName);
MSTR *curMaxFile = &GetCOREInterface()->GetCurFilePath();

if (curMaxFile->length())
{
TFileInfo maxInfo(curMaxFile->data());

xmlEnvironmentVariable asset;
asset.name = "asset";
asset.value = esString(maxInfo.GetFileName());
env->variables.push_back(asset);

xmlEnvironmentVariable assetFolder;
assetFolder.name = "assetFolder";
assetFolder.value = esString(maxInfo.GetPath());
env->variables.push_back(assetFolder);

xmlEnvironmentVariable assetPath;
assetPath.name = "assetPath";
assetPath.value = esString(maxInfo.GetFullPath());
env->variables.push_back(assetPath);
}

xmlEnvironmentVariable out;
out.name = "out";
out.value = esString(fleInfo.GetFileName());
env->variables.push_back(out);

xmlEnvironmentVariable outFolder;
outFolder.name = "outFolder";
outFolder.value = esString(fleInfo.GetPath());
env->variables.push_back(outFolder);

xmlEnvironmentVariable outPath;
outPath.name = "outPath";
outPath.value = esString(fleInfo.GetFullPath());
env->variables.push_back(outPath);
}

int HavokExport::DoExport(const TCHAR *fileName, ExpInterface *ei, Interface * /*i*/, BOOL suppressPrompts, DWORD /*options*/)
{
char *oldLocale = setlocale(LC_NUMERIC, NULL);
Expand All @@ -193,19 +396,42 @@ int HavokExport::DoExport(const TCHAR *fileName, ExpInterface *ei, Interface * /
xmlHavokFile hkFile = {};
xmlRootLevelContainer *cont = hkFile.NewClass<xmlRootLevelContainer>();
xmlAnimationContainer *aniCont = hkFile.NewClass<xmlAnimationContainer>();
xmlSkeleton *skel = hkFile.NewClass<xmlSkeleton>();
xmlEnvironment *envData = hkFile.NewClass<xmlEnvironment>();
const bool useSkeleton = (flags[IDC_CH_ANIMATION_checked] && flags[IDC_CH_ANISKELETON_checked]) || !flags[IDC_CH_ANIMATION_checked];
xmlSkeleton *skel = useSkeleton ? hkFile.NewClass<xmlSkeleton>() : new xmlSkeleton;

skel->name = "Reference";
cont->AddVariant(aniCont);
aniCont->skeletons.push_back(skel);
iSceneScanner.skeleton = skel;
iSceneScanner.ex = this;
ei->theScene->EnumTree(&iSceneScanner);
cont->AddVariant(aniCont);
cont->AddVariant(envData);
SaveEnvData(envData, fileName);

if (useSkeleton)
aniCont->skeletons.push_back(skel);

if (flags[IDC_CH_ANIMATION_checked])
{
xmlAnimationBinding *binding = hkFile.NewClass<xmlAnimationBinding>();
xmlInterleavedAnimation *anim = hkFile.NewClass<xmlInterleavedAnimation>();
binding->animation = dynamic_cast<xmlAnimation*>(anim);
aniCont->animations.push_back(binding->animation);
aniCont->bindings.push_back(binding);

if (flags[IDC_CH_ANISKELETON_checked])
binding->skeletonName = skel->name;

ProcessAnimation(skel, binding, anim);
}

std::wstring _filename = esString(fileName);
hkFile.ExportXML(_filename.c_str() , static_cast<hkXMLToolsets>(IDC_CB_TOOLSET_index + 1));

if (!useSkeleton)
delete skel;

setlocale(LC_NUMERIC, oldLocale);

return TRUE;
}

Loading

0 comments on commit 31b4b96

Please sign in to comment.