mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-24 17:26:41 +00:00
Code Issues Releases Wiki Activity

fix many new anim editor bugs & typos after recent changes

Browse source
This commit is contained in:
fgenesis 2025-01-12 04:24:42 +01:00
parent d2040adbd5
commit db2b71c3d8
2 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Aquaria/AnimationEditor.cpp
View file

@ -345,6 +345,7 @@ void KeyframeWidget::onUpdate(float dt)
void AnimationEditor::cycleLerpType() void AnimationEditor::cycleLerpType()
{ {
if (dsq->isNested()) return; if (dsq->isNested()) return;
if (editMode != AE_SELECT) return;
Animation *a = getCurrentPageAnimation(); Animation *a = getCurrentPageAnimation();
@ -860,9 +861,9 @@ void AnimationEditor::moveBoneStripPoint(const Vector &mov)
if (dsq->isNested()) return; if (dsq->isNested()) return;
Bone *sel = editingBone; Bone *sel = editingBone;
if (editingBone) if (sel)
{ {
BoneKeyframe *b = getCurrentPageAnimation()->getKeyframe(currentKey)->getBoneKeyframe(sel->boneIdx); BoneKeyframe *b = editingBoneSprite->getCurrentAnimation()->getKeyframe(currentKey)->getBoneKeyframe(sel->boneIdx);
if (b) if (b)
{ {
if (!sel->changeStrip.empty()) if (!sel->changeStrip.empty())
@ -872,7 +873,9 @@ void AnimationEditor::moveBoneStripPoint(const Vector &mov)
b->grid.resize(sel->changeStrip.size()); b->grid.resize(sel->changeStrip.size());
} }
b->grid[selectedStripPoint] = sel->changeStrip[selectedStripPoint] += mov*0.006f; Vector v = sel->changeStrip[selectedStripPoint] + mov*0.006f;
sel->changeStrip[selectedStripPoint] = v;
b->grid[selectedStripPoint] = v;
} }
} }
} }
@ -1108,8 +1111,6 @@ void AnimationEditor::update(float dt)
spr->setTime(t); spr->setTime(t);
} }
} }
for(size_t i = 0; i < NumPages; ++i)
getPageSprite(i)->updateBones();
} }
} }
@ -1118,6 +1119,9 @@ void AnimationEditor::update(float dt)
applySplineGridToBone(); applySplineGridToBone();
splinegrid->wasModified = false; splinegrid->wasModified = false;
} }
for(size_t i = 0; i < NumPages; ++i)
getPageSprite(i)->updateBones();
} }
void AnimationEditor::_copyKey() void AnimationEditor::_copyKey()
@ -1161,7 +1165,7 @@ void AnimationEditor::nextKey()
if (editMode == AE_STRIP) if (editMode == AE_STRIP)
{ {
selectedStripPoint++; selectedStripPoint++;
if (selectedStripPoint >= editSprite->getSelectedBone(false)->changeStrip.size() if (selectedStripPoint >= editingBoneSprite->getSelectedBone(false)->changeStrip.size()
&& selectedStripPoint > 0) && selectedStripPoint > 0)
selectedStripPoint --; selectedStripPoint --;
} }
@ -1276,7 +1280,7 @@ void AnimationEditor::editStripKey()
if(editingBone && editingBone->getGrid()) if(editingBone && editingBone->getGrid())
{ {
DynamicRenderGrid *grid = editingBone->getGrid(); DynamicRenderGrid *grid = editingBone->getGrid();
Animation *a = getCurrentPageAnimation(); Animation *a = editingBoneSprite->getCurrentAnimation();
BoneGridInterpolator *interp = a->getBoneGridInterpolator(editingBone->boneIdx); BoneGridInterpolator *interp = a->getBoneGridInterpolator(editingBone->boneIdx);
if(interp) if(interp)
@ -1314,12 +1318,12 @@ void AnimationEditor::editStripKey()
} }
else if(editingBone) else if(editingBone)
{ {
debugLog("Bone has no grid, cannot edit grid"); notify("Bone has no grid, cannot edit grid");
dsq->sound->playSfx("denied"); dsq->sound->playSfx("denied");
} }
else else
{ {
debugLog("No bone selected for grid edit mode"); notify("No bone selected for grid edit mode");
dsq->sound->playSfx("denied"); dsq->sound->playSfx("denied");
} }
} }
@ -1387,7 +1391,7 @@ void AnimationEditor::applyTranslation()
{ {
if (editingBone) if (editingBone)
{ {
Animation *a = getCurrentPageAnimation(); Animation *a = editingBoneSprite->getCurrentAnimation();
if (!core->getShiftState()) if (!core->getShiftState())
{ {
// one bone mode // one bone mode
@ -1442,12 +1446,15 @@ void AnimationEditor::applyTranslation()
void AnimationEditor::applyRotation() void AnimationEditor::applyRotation()
{ {
BoneKeyframe *b = getCurrentPageAnimation()->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx); if(editingBone)
{
BoneKeyframe *b = editingBoneSprite->getCurrentAnimation()->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx);
if (b) if (b)
{ {
b->rot = editingBone->rotation.z = 0; b->rot = editingBone->rotation.z = 0;
} }
} }
}
void AnimationEditor::lmbu() void AnimationEditor::lmbu()
{ {
@ -1496,7 +1503,7 @@ void AnimationEditor::flipRot()
updateEditingBone(); updateEditingBone();
if (editingBone) if (editingBone)
{ {
Animation *a = getCurrentPageAnimation(); Animation *a = editingBoneSprite->getCurrentAnimation();
if (!core->getShiftState()) if (!core->getShiftState())
{ {
BoneKeyframe *b = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx); BoneKeyframe *b = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx);
@ -1549,7 +1556,7 @@ void AnimationEditor::clearPos()
updateEditingBone(); updateEditingBone();
if (editingBone) if (editingBone)
{ {
BoneKeyframe *b = getCurrentPageAnimation()->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx); BoneKeyframe *b = editingBoneSprite->getCurrentAnimation()->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx);
if (b) if (b)
{ {
editingBone->position = Vector(0,0); editingBone->position = Vector(0,0);
@ -1578,7 +1585,7 @@ void AnimationEditor::rmbu()
editMode = AE_SELECT; editMode = AE_SELECT;
if (editingBone) if (editingBone)
{ {
Animation *a = getCurrentPageAnimation(); Animation *a = editingBoneSprite->getCurrentAnimation();
if (!core->getShiftState()) if (!core->getShiftState())
{ {
// one bone mode // one bone mode
@ -1637,7 +1644,7 @@ void AnimationEditor::cloneBoneAhead()
updateEditingBone(); updateEditingBone();
if (editingBone && currentKey >= 0) if (editingBone && currentKey >= 0)
{ {
Animation *a = getCurrentPageAnimation(); Animation *a = editingBoneSprite->getCurrentAnimation();
SkeletalKeyframe *s1 = a->getKeyframe(currentKey); SkeletalKeyframe *s1 = a->getKeyframe(currentKey);
BoneKeyframe *b1 = 0; BoneKeyframe *b1 = 0;
if (s1) if (s1)
@ -1748,9 +1755,9 @@ void AnimationEditor::quit()
void AnimationEditor::nextAnim() void AnimationEditor::nextAnim()
{ {
if (dsq->isNested()) return; if (dsq->isNested()) return;
if (editMode != AE_SELECT) return; if (core->getShiftState()) return;
if (!core->getShiftState()) if(editMode == AE_SELECT)
{ {
getCurrentPageSprite()->nextAnimation(); getCurrentPageSprite()->nextAnimation();
currentKey = 0; currentKey = 0;
@ -1761,9 +1768,9 @@ void AnimationEditor::nextAnim()
void AnimationEditor::prevAnim() void AnimationEditor::prevAnim()
{ {
if (dsq->isNested()) return; if (dsq->isNested()) return;
if (editMode != AE_SELECT) return; if (core->getShiftState()) return;
if (!core->getShiftState()) if(editMode == AE_SELECT)
{ {
getCurrentPageSprite()->prevAnimation(); getCurrentPageSprite()->prevAnimation();
currentKey = 0; currentKey = 0;
@ -1901,12 +1908,14 @@ void AnimationEditor::updateRenderBorders()
// Pick the closest bone // Pick the closest bone
void AnimationEditor::updateEditingBone() void AnimationEditor::updateEditingBone()
{ {
assert(editMode == AE_SELECT); if(editMode != AE_SELECT)
return;
if(!mouseSelection) if(!mouseSelection)
{ {
editingBoneSprite = getCurrentPageSprite(); editingBoneSprite = getCurrentPageSprite();
editingBone = editingBoneSprite->getSelectedBone(false); editingBone = editingBoneSprite->getSelectedBone(false);
editingBonePage = curPage;
return; return;
} }
@ -2104,7 +2113,7 @@ void AnimationEditor::applyBoneToSplineGrid()
{ {
if(splinegrid && editingBone) if(splinegrid && editingBone)
{ {
Animation *a = getCurrentPageAnimation(); Animation *a = editingBoneSprite->getCurrentAnimation();
BoneKeyframe *bk = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx); BoneKeyframe *bk = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx);
assert(bk->grid.size() == editingBone->getGrid()->linearsize()); assert(bk->grid.size() == editingBone->getGrid()->linearsize());
@ -2116,7 +2125,7 @@ void AnimationEditor::applySplineGridToBone()
{ {
if(splinegrid && editingBone) if(splinegrid && editingBone)
{ {
Animation *a = getCurrentPageAnimation(); Animation *a = editingBoneSprite->getCurrentAnimation();
BoneKeyframe *bk = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx); BoneKeyframe *bk = a->getKeyframe(currentKey)->getBoneKeyframe(editingBone->boneIdx);
assert(bk->grid.size() == editingBone->getGrid()->linearsize()); assert(bk->grid.size() == editingBone->getGrid()->linearsize());
splinegrid->exportKeyframe(bk); splinegrid->exportKeyframe(bk);

3
BBGE/SkeletalSprite.cpp
View file

@ -2154,6 +2154,9 @@ Bone* SkeletalSprite::getSelectedBone(bool mouseBased)
void SkeletalSprite::updateSelectedBoneColor() void SkeletalSprite::updateSelectedBoneColor()
{ {
if(!bones.size())
return;
for (size_t i = 0; i < bones.size(); i++) for (size_t i = 0; i < bones.size(); i++)
{ {
bones[i]->color = Vector(1,1,1); bones[i]->color = Vector(1,1,1);