TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix loop(restart = 0, fromFrame = x)

Browse Source
This commit is contained in:
David Rose 2008-11-11 02:04:14 +00:00
parent 0ae9a55bdb
commit 0def22bd7b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/putil/animInterface.cxx
View File

@ -270,10 +270,11 @@ loop(bool restart, double from, double to) {
_paused_f = 0.0; _paused_f = 0.0;
if (!restart) { if (!restart) {
fframe = min(max(fframe, from), to);
if (_paused) { if (_paused) {
_paused_f = fframe - _start_frame; _paused_f = fframe - _start_frame;
} else { } else {
_start_time -= fframe / _effective_frame_rate; _start_time -= (fframe - _start_frame) / _effective_frame_rate;
} }
} }
} }
@ -303,10 +304,11 @@ pingpong(bool restart, double from, double to) {
_paused_f = 0.0; _paused_f = 0.0;
if (!restart) { if (!restart) {
fframe = min(max(fframe, from), to);
if (_paused) { if (_paused) {
_paused_f = fframe - _start_frame; _paused_f = fframe - _start_frame;
} else { } else {
_start_time -= fframe / _effective_frame_rate; _start_time -= (fframe - _start_frame) / _effective_frame_rate;
} }
} }
} }