added imgui

This commit is contained in:
Lauchmelder 2021-12-21 15:22:47 +01:00
parent c6189b2dc3
commit f02b7f76cf
8 changed files with 58 additions and 7 deletions

View file

@ -46,7 +46,7 @@ void Transformable::Rotate(const glm::vec3& axis, float angle)
CalculateTransformationMatrix();
}
const glm::vec3& Transformable::SetScale()
const glm::vec3& Transformable::GetScale()
{
return scale;
}
@ -66,7 +66,7 @@ void Transformable::Scale(const glm::vec3& factor)
void Transformable::CalculateTransformationMatrix()
{
transformation = glm::mat4(1.0f);
glm::scale(transformation, scale);
transformation = glm::translate(transformation, position);
transformation *= glm::toMat4(orientation);
glm::translate(transformation, position);
transformation = glm::scale(transformation, scale);
}