lauchmelder/OpenGL-utility
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reowrd transformations yet again

Browse source
This commit is contained in:
Robert 2021-01-23 20:09:59 +01:00
parent 83b5453088
commit 25021db694
3 changed files with 105 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/transformable.cpp
View file

@ -41,22 +41,37 @@ namespace oglu
recalculateMatrix = true;
}
void Transformable::SetRotation(float rotX, float rotY, float rotZ)
void Transformable::SetRotation(float pitch, float yaw, float roll)
{
SetRotation(glm::vec3(rotX, rotY, rotZ));
SetRotation(glm::vec3(pitch, yaw, roll));
}
void Transformable::SetRotation(const float* rotation)
void Transformable::SetRotation(const float* pitchYawRoll)
{
SetRotation(glm::make_vec3(rotation));
SetRotation(glm::make_vec3(pitchYawRoll));
}
void Transformable::SetRotation(const glm::vec3& rotation)
void Transformable::SetRotation(const glm::vec3& pitchYawRoll)
{
orientation = glm::quat(glm::radians(rotation));
orientation = glm::quat(glm::radians(pitchYawRoll));
recalculateMatrix = true;
}
inline void Transformable::SetPitch(float angle)
{
SetRotation(glm::vec3(angle, 0.0f, 0.0f));
}
inline void Transformable::SetYaw(float angle)
{
SetRotation(glm::vec3(0.0f, angle, 0.0f));
}
inline void Transformable::SetRoll(float angle)
{
SetRotation(glm::vec3(0.0f, 0.0f, angle));
}
void Transformable::SetRotation(float angle, float xAxis, float yAxis, float zAxis)
{
SetRotation(angle, glm::vec3(xAxis, yAxis, zAxis));
@ -105,22 +120,37 @@ namespace oglu
recalculateMatrix = true;
}
void Transformable::Rotate(float rotX, float rotY, float rotZ)
void Transformable::Rotate(float pitch, float yaw, float roll)
{
Rotate(glm::vec3(rotX, rotY, rotZ));
Rotate(glm::vec3(pitch, yaw, roll));
}
void Transformable::Rotate(const float* rotation)
void Transformable::Rotate(const float* pitchYawRoll)
{
Rotate(glm::make_vec3(rotation));
Rotate(glm::make_vec3(pitchYawRoll));
}
void Transformable::Rotate(const glm::vec3& rotation)
void Transformable::Rotate(const glm::vec3& pitchYawRoll)
{
orientation *= glm::quat(glm::radians(rotation));
orientation *= glm::quat(glm::radians(pitchYawRoll));
recalculateMatrix = true;
}
inline void Transformable::Pitch(float angle)
{
Rotate(glm::vec3(angle, 0.0f, 0.0f));
}
inline void Transformable::Yaw(float angle)
{
Rotate(glm::vec3(0.0f, angle, 0.0f));
}
inline void Transformable::Roll(float angle)
{
Rotate(glm::vec3(0.0f, 0.0f, angle));
}
void Transformable::Rotate(float angle, float xAxis, float yAxis, float zAxis)
{
Rotate(angle, glm::vec3(xAxis, yAxis, zAxis));