xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

SP3-16 Quaternions #112

Merged
direnbharwani merged 17 commits from SP3-16-Math into main 2022-10-23 20:07:17 +08:00
Conversation 0 Commits 17 Files Changed 21 +8 -13
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e15f7696e6 - Show all commits

4
SHADE_Engine/src/Math/Transform/SHTransformComponent.h
View File

@ -127,8 +127,8 @@ namespace SHADE
// We store euler angle rotations separately to interface with transform quaternions. // We store euler angle rotations separately to interface with transform quaternions.
// Reading quaternions are unreliable. // Reading quaternions are unreliable.
SHVec3 localRotation; // Stored in degrees SHVec3 localRotation; // Stored in Radians
SHVec3 worldRotation; // Stored in degrees SHVec3 worldRotation; // Stored in Radians
SHTransform local; // Local TRS holds Local To World Transform SHTransform local; // Local TRS holds Local To World Transform
SHTransform world; SHTransform world;

17
SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
View File

@ -270,7 +270,7 @@ namespace SHADE
tf.world.position = SHVec3::Transform(tf.local.position, localToWorld); tf.world.position = SHVec3::Transform(tf.local.position, localToWorld);
tf.world.scale = tf.local.scale * (parent ? parent->GetLocalScale() : SHVec3::One); tf.world.scale = tf.local.scale * (parent ? parent->GetLocalScale() : SHVec3::One);
SHVec3 worldRotRad, localRotRad;
if (convertRotation) if (convertRotation)
{ {
@ -278,10 +278,11 @@ namespace SHADE
// Set the orientation // Set the orientation
// Wrap rotations between -360 and 360 and convert to radians // Wrap rotations between -360 and 360 and convert to radians
SHVec3 worldRotRad, localRotRad;
for (size_t i = 0; i < SHVec3::SIZE; ++i) for (size_t i = 0; i < SHVec3::SIZE; ++i)
{ {
worldRotRad[i] = SHMath::DegreesToRadians(SHMath::Wrap(tf.worldRotation[i], -360.0f, 360.0f)); worldRotRad[i] = SHMath::Wrap(tf.worldRotation[i], -SHMath::TWO_PI, SHMath::TWO_PI);
localRotRad[i] = SHMath::DegreesToRadians(SHMath::Wrap(tf.localRotation[i], -360.0f, 360.0f)); localRotRad[i] = SHMath::Wrap(tf.localRotation[i], -SHMath::TWO_PI, SHMath::TWO_PI);
} }
tf.world.orientation = SHQuaternion::FromEuler(worldRotRad); tf.world.orientation = SHQuaternion::FromEuler(worldRotRad);
@ -292,14 +293,8 @@ namespace SHADE
tf.world.orientation = (parent ? parent->GetLocalOrientation() : SHQuaternion::Identity) * tf.local.orientation; tf.world.orientation = (parent ? parent->GetLocalOrientation() : SHQuaternion::Identity) * tf.local.orientation;
// Set the euler angle rotations // Set the euler angle rotations
worldRotRad = tf.world.orientation.ToEuler(); tf.worldRotation = tf.world.orientation.ToEuler();
localRotRad = tf.local.orientation.ToEuler(); tf.localRotation = tf.local.orientation.ToEuler();
for (size_t i = 0; i < SHVec3::SIZE; ++i)
{
tf.worldRotation[i] = SHMath::RadiansToDegrees(worldRotRad[i]);
tf.localRotation[i] = SHMath::RadiansToDegrees(localRotRad[i]);
}
} }
tf.world.ComputeTRS(); tf.world.ComputeTRS();