devZoGok/vb01
1
0
Fork 0
mirror of https://github.com/devZoGok/vb01.git synced 2026-08-26 19:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplified animatable objects interface

Browse Source
This commit is contained in:
devZoGok
2021-10-19 19:06:41 +03:00
parent 53bf4f41bd
commit c91a7f39f6
6 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vbModelReader.cpp
+3 -4
View File
@@ -170,7 +170,7 @@ namespace vb01{
}
}
void VbModelReader::readAnimations(Animatable *animatable, vector<string> &animationData, int numAnimations){
void VbModelReader::readAnimations(Animatable *animatable, AnimationController *controller, vector<string> &animationData, int numAnimations){
int animStartLine = 0;
for(int i = 0; i < numAnimations; i++){
@@ -179,7 +179,6 @@ namespace vb01{
string groupsLine = animationData[animStartLine + 1];
Animation *animation = new Animation(currentAnim);
AnimationController *controller = (animatable ? animatable->getAnimationController() : currentSkeleton->getAnimationController());
controller->addAnimation(animation);
int numKeyframeGroups = atoi(groupsLine.substr(groupsLine.find_first_of(':') + 2).c_str());
@@ -257,7 +256,7 @@ namespace vb01{
skeletonSubData.clear();
skeletonSubData = vector<string>(skeletonData.begin() + (boneStartLine + numBones + 1), skeletonData.end());
readAnimations(nullptr, skeletonSubData, numAnimations);
readAnimations(nullptr, controller, skeletonSubData, numAnimations);
skeletonSubData.clear();
currentSkeleton = nullptr;
@@ -436,7 +435,7 @@ namespace vb01{
int numAnimLineId = shapeKeyStartLine + numShapes * (1 + numVertices);
int numAnimations = atoi(meshData[numAnimLineId].substr(meshData[numAnimLineId].find_first_of(':') + 1).c_str());
meshSubData = vector<string>(meshData.begin() + (numAnimLineId + 1), meshData.end());
readAnimations(node, meshSubData, numAnimations);
readAnimations(node, controller, meshSubData, numAnimations);
meshSubData.clear();
string skeletonLine = meshData[5];