edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4987

Browse source 
4987: Fix editor animation offset time being affected by the animation spee… r=def- a=Jupeyy

…d factor

As reported by Derp in Discord:

The animation offset should not be affected by the time scale, the offset is a static offset, unrelated to how the animation works

WRONG:

![Screenshot_39](https://user-images.githubusercontent.com/6654924/163543537-8b243234-2e1a-4173-b43c-175d4b335512.png)
![Screenshot_40](https://user-images.githubusercontent.com/6654924/163543544-b226affc-2d22-472b-802e-9716b90eca29.png)

RIGHT:

![screenshot_2022-04-15_10-04-31](https://user-images.githubusercontent.com/6654924/163543669-13847136-de5a-454a-bafe-16feddd94396.png)
![screenshot_2022-04-15_10-04-36](https://user-images.githubusercontent.com/6654924/163543675-337349a9-2abf-4b20-9b42-dc4ee44367c4.png)


## Checklist

- [x] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2022-04-15 19:49:13 +00:00 committed by GitHub
parent f60ae47be1 d892de2b03
commit df7bb16c75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/editor/editor.cpp
View file

@ -280,8 +280,9 @@ void CEditor::EnvelopeEval(int TimeOffsetMillis, int Env, float *pChannels, void
} }
CEnvelope *e = pThis->m_Map.m_lEnvelopes[Env]; CEnvelope *e = pThis->m_Map.m_lEnvelopes[Env];
float t = pThis->m_AnimateTime + (TimeOffsetMillis / 1000.0f); float t = pThis->m_AnimateTime;
t *= pThis->m_AnimateSpeed; t *= pThis->m_AnimateSpeed;
t += (TimeOffsetMillis / 1000.0f);
e->Eval(t, pChannels); e->Eval(t, pChannels);
} }