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

lerp t now clamped at 1.0

Browse Source
This commit is contained in:
Darren Ranalli 2002-07-31 18:13:00 +00:00
parent cf031f570a
commit 8316aaa340
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
panda/src/lerp/lerp.cxx
View File

@ -66,14 +66,17 @@ Lerp& Lerp::operator=(const Lerp& c) {
}
void Lerp::step(void) {
if (is_done())
return;
_t += _delta;
float t = scale_t(_t, _startt, _endt);
t = (_blend==(LerpBlendType*)0L)?t:(*_blend)(t);
(*_func)(t);
if (is_done() && !_event.empty())
throw_event(_event);
if (is_done()) {
(*_func)(1.0);
if (!_event.empty()) {
throw_event(_event);
}
} else {
float t = scale_t(_t, _startt, _endt);
t = (_blend==(LerpBlendType*)0L)?t:(*_blend)(t);
(*_func)(t);
}
}
void Lerp::set_step_size(float delta) {
@ -183,6 +186,8 @@ std::string AutonomousLerp::get_end_event(void) const {
}
void AutonomousLerp::step(void) {
// Probably broken because it does not set the final value when t
// exceeds end_t. see fixed Lerp::step() above
if (is_done()) {
stop();
return;