mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-19 19:34:57 +00:00
Code Issues Releases Wiki Activity

Use multiplicative scaling in anim editor for a more uniform feel

Browse source
This commit is contained in:
fgenesis 2023-05-05 03:49:14 +02:00
parent 6d6697fd72
commit c73aa23906
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Aquaria/AnimationEditor.cpp
View file

@ -735,27 +735,28 @@ void AnimationEditor::update(float dt)
if (isActing(ACTION_SWIMDOWN, -1)) if (isActing(ACTION_SWIMDOWN, -1))
moveBoneStripPoint(Vector(0, dt)); moveBoneStripPoint(Vector(0, dt));
} }
int spd = 1; float spd = 1.0f;
if (core->mouse.scrollWheelChange < 0) if (core->mouse.scrollWheelChange < 0)
{ {
ctrlSprite->scale -= Vector(spd*0.05f,spd*0.05f); ctrlSprite->scale.x /= 1.12f;
} }
else if (core->mouse.scrollWheelChange > 0) else if (core->mouse.scrollWheelChange > 0)
{ {
ctrlSprite->scale += Vector(spd*0.05f,spd*0.05f); ctrlSprite->scale.x *= 1.12f;
} }
if (core->getKeyState(KEY_PGDN) && core->getShiftState()) if (core->getKeyState(KEY_PGDN) && core->getShiftState())
{ {
ctrlSprite->scale -= Vector(spd*0.05f,spd*0.05f); ctrlSprite->scale.x /= (1 + spd*dt);
} }
if (core->getKeyState(KEY_PGUP) && core->getShiftState()) if (core->getKeyState(KEY_PGUP) && core->getShiftState())
{ {
ctrlSprite->scale += Vector(spd*0.05f,spd*0.05f); ctrlSprite->scale.x *= (1 + spd*dt);
} }
if (ctrlSprite->scale.x < 0.05f) if (ctrlSprite->scale.x < 0.05f)
{ {
ctrlSprite->scale = Vector(0.05f,0.05f); ctrlSprite->scale.x = 0.05f;
} }
ctrlSprite->scale.y = ctrlSprite->scale.x;
if (boneEdit == 0) if (boneEdit == 0)
{ {