mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-05-10 11:03:51 +00:00
Code Issues Releases Wiki Activity

fix some asserts

Browse source
This commit is contained in:
fgenesis 2023-08-01 22:39:48 +02:00
parent e27a031229
commit ff035a37fa
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Aquaria/AnimationEditor.cpp
View file

@ -1604,7 +1604,7 @@ void AnimationEditor::applyBoneToSplineGrid()
Animation *a = editSprite->getCurrentAnimation(); Animation *a = editSprite->getCurrentAnimation();
BoneKeyframe *bk = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx); BoneKeyframe *bk = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx);
assert(bk->controlpoints.size() == splinegrid->getSpline().ctrlX() * splinegrid->getSpline().ctrlY()); assert(bk->controlpoints.size() == splinegrid->getSpline().ctrlX() * splinegrid->getSpline().ctrlY());
assert(bk->grid.size() == editingBone->getDrawGrid().linearsize()); assert(bk->grid.size() == editingBone->getGrid()->linearsize());
splinegrid->importControlPoints(&bk->controlpoints[0]); splinegrid->importControlPoints(&bk->controlpoints[0]);
} }
} }
@ -1616,7 +1616,7 @@ void AnimationEditor::applySplineGridToBone()
Animation *a = editSprite->getCurrentAnimation(); Animation *a = editSprite->getCurrentAnimation();
BoneKeyframe *bk = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx); BoneKeyframe *bk = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx);
assert(bk->controlpoints.size() == splinegrid->getSpline().ctrlX() * splinegrid->getSpline().ctrlY()); assert(bk->controlpoints.size() == splinegrid->getSpline().ctrlX() * splinegrid->getSpline().ctrlY());
assert(bk->grid.size() == editingBone->getDrawGrid().linearsize()); assert(bk->grid.size() == editingBone->getGrid()->linearsize());
splinegrid->exportControlPoints(&bk->controlpoints[0]); splinegrid->exportControlPoints(&bk->controlpoints[0]);
BoneGridInterpolator *interp = a->getBoneGridInterpolator(editingBone->boneIdx); BoneGridInterpolator *interp = a->getBoneGridInterpolator(editingBone->boneIdx);
interp->updateGridAndBone(*bk, editingBone); interp->updateGridAndBone(*bk, editingBone);

2
BBGE/SkeletalSprite.cpp
View file

@ -1073,7 +1073,7 @@ bool SkeletalSprite::saveSkeletal(const std::string &fn)
const BoneGridInterpolator& bgip = a->interpolators[j]; const BoneGridInterpolator& bgip = a->interpolators[j];
XMLElement *interp = xml->NewElement("Interpolator"); XMLElement *interp = xml->NewElement("Interpolator");
Bone *bone = this->getBoneByIdx(bgip.idx); Bone *bone = this->getBoneByIdx(bgip.idx);
assert(bone->gridType == Quad::GRID_INTERP); assert(bone->grid->gridType == GRID_INTERP);
if(bgip.storeBoneByIdx) if(bgip.storeBoneByIdx)
interp->SetAttribute("bone", (int)bone->boneIdx); interp->SetAttribute("bone", (int)bone->boneIdx);
else else