From 1ce8b44b7d8a9713628c878a15123962c6f1cc89 Mon Sep 17 00:00:00 2001 From: Piotr Date: Thu, 24 Sep 2020 17:59:01 +0200 Subject: [PATCH] Working rotation --- src/gaia/components.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gaia/components.rs b/src/gaia/components.rs index b2fc15a..c1da00b 100644 --- a/src/gaia/components.rs +++ b/src/gaia/components.rs @@ -1,6 +1,6 @@ use crate::gaia::model::Model; use crate::gaia::shader::Shader; -use cgmath::{vec3, Matrix4, Vector3}; +use cgmath::{vec3, Matrix4, Vector3, Rad}; use imgui_glfw_rs::imgui; use imgui_inspect::InspectArgsDefault; use imgui_inspect::InspectRenderDefault; @@ -75,6 +75,9 @@ impl Transform { pub fn get_matrix(&self) -> Matrix4 { let mut m = Matrix4::::from_translation(self.position); m = m * Matrix4::from_nonuniform_scale(self.scale.x, self.scale.y, self.scale.z); + m = m * Matrix4::::from_angle_x(Rad(self.rotation.x.to_radians())); + m = m * Matrix4::::from_angle_y(Rad(self.rotation.y.to_radians())); + m = m * Matrix4::::from_angle_z(Rad(self.rotation.z.to_radians())); m }