Skip to content

Smooth VUEs amendment #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jerethk wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −3
Open

Smooth VUEs amendment #600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions TheForceEngine/TFE_DarkForces/vueLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,13 +491,24 @@ namespace TFE_DarkForces
{
interpolatedFrame->mtx[i] = lerp(previous->mtx[i], current->mtx[i], t);
}

// If we are jumping > 180 degrees, take the shorter distance
// note: angles have already had ANGLE_MASK applied by vec2ToAngle() so they will always be between 0 and 16383
angle14_16 prevYaw, currYaw, prevPitch, currPitch, prevRoll, currRoll;
prevYaw = (previous->yaw - current->yaw > 8192) ? previous->yaw - ANGLE_MAX : previous->yaw;
currYaw = (current->yaw - previous->yaw > 8192) ? current->yaw - ANGLE_MAX : current->yaw;
prevPitch = (previous->pitch - current->pitch > 8192) ? previous->pitch - ANGLE_MAX : previous->pitch;
currPitch = (current->pitch - previous->pitch > 8192) ? current->pitch - ANGLE_MAX : current->pitch;
prevRoll = (previous->roll - current->roll > 8192) ? previous->roll - ANGLE_MAX : previous->roll;
currRoll = (current->roll - previous->roll > 8192) ? current->roll - ANGLE_MAX : current->roll;

// Use linear interpolation for offset and angles.
interpolatedFrame->offset.x = lerp(previous->offset.x, current->offset.x, t);
interpolatedFrame->offset.y = lerp(previous->offset.y, current->offset.y, t);
interpolatedFrame->offset.z = lerp(previous->offset.z, current->offset.z, t);
interpolatedFrame->pitch = lerp(previous->pitch, current->pitch, t);
interpolatedFrame->yaw = lerp(previous->yaw, current->yaw, t);
interpolatedFrame->roll = lerp(previous->roll, current->roll, t);
interpolatedFrame->pitch = lerp(prevPitch, currPitch, t);
interpolatedFrame->yaw = lerp(prevYaw, currYaw, t);
interpolatedFrame->roll = lerp(prevRoll, currRoll, t);
// Copy the flags from the current frame.
interpolatedFrame->flags = current->flags;
}
Expand Down
Loading