Revision 1e1c61a8 server/src/Arbiter.cpp
server/src/Arbiter.cpp | ||
---|---|---|
310 | 310 |
|
311 | 311 |
if (gaze_state_animation_restart) { |
312 | 312 |
// new incoming target, set up soft fade: |
313 |
cout << "NEW EMOTION\n"; |
|
313 | 314 |
gaze_state_old = gaze_state; |
314 | 315 |
gaze_state_end_time = get_system_time() + boost::posix_time::milliseconds(overblend_time); |
315 | 316 |
gaze_state_animation_restart = false; |
... | ... | |
318 | 319 |
boost::posix_time::time_duration tdiff = gaze_state_end_time - get_system_time(); |
319 | 320 |
if (tdiff.is_negative()) { |
320 | 321 |
// animation is done, exit now |
321 |
return result;
|
|
322 |
return gaze_target;
|
|
322 | 323 |
} else { |
323 | 324 |
// do smooth animation |
324 | 325 |
double diff_ms = tdiff.total_milliseconds(); |
Also available in: Unified diff