mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 19:50:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid problems with comment ending in backslash

Browse Source
This commit is contained in:
Emma Broman
2021-04-27 11:19:18 +02:00
parent b016317fc2
commit 33a9dd2f09
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/base/rendering/renderablemodel.cpp
View File

@@ -690,7 +690,7 @@ void RenderableModel::update(const UpdateData& data) {
switch (_animationMode) {
case AnimationMode::LoopFromStart:
// Start looping from the start time
// s////
// s//// ...
relativeTime = std::fmod(now - startTime, duration);
break;
case AnimationMode::LoopInfinitely:
@@ -699,7 +699,7 @@ void RenderableModel::update(const UpdateData& data) {
// true modulo function, it just calculates the remainder of the division
// which can be negative. To make it true modulo it is bumped up to
// positive values when it is negative
// //s//
// //s// ...
relativeTime = std::fmod(now - startTime, duration);
if (relativeTime < 0.0) {
relativeTime += duration;
@@ -711,14 +711,14 @@ void RenderableModel::update(const UpdateData& data) {
// goes back to its initial position before starting again. Avoids a
// visible jump from the last position to the first position when loop
// starts again
// s/\/\/\/\
// s/\/\/\/\ ...
relativeTime =
duration - abs(fmod(now - startTime, 2 * duration) - duration);
break;
case AnimationMode::BounceInfinitely: {
// Bounce both before and after the start time where the model is
// in the initial position at the start time
// /\/\s/\/\
// /\/\s/\/\ ...
double modulo = fmod(now - startTime, 2 * duration);
if (modulo < 0.0) {
modulo += 2 * duration;