MevLyshkin
/
doppler
mirror of https://github.com/Leinnan/doppler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Working rotation

This commit is contained in:
Piotr 2020-09-24 17:59:01 +02:00
parent 33f06bcd82
commit 1ce8b44b7d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gaia/components.rs
View File

@ -1,6 +1,6 @@
use crate::gaia::model::Model; use crate::gaia::model::Model;
use crate::gaia::shader::Shader; use crate::gaia::shader::Shader;
use cgmath::{vec3, Matrix4, Vector3}; use cgmath::{vec3, Matrix4, Vector3, Rad};
use imgui_glfw_rs::imgui; use imgui_glfw_rs::imgui;
use imgui_inspect::InspectArgsDefault; use imgui_inspect::InspectArgsDefault;
use imgui_inspect::InspectRenderDefault; use imgui_inspect::InspectRenderDefault;
@ -75,6 +75,9 @@ impl Transform {
pub fn get_matrix(&self) -> Matrix4<f32> { pub fn get_matrix(&self) -> Matrix4<f32> {
let mut m = Matrix4::<f32>::from_translation(self.position); let mut m = Matrix4::<f32>::from_translation(self.position);
m = m * Matrix4::from_nonuniform_scale(self.scale.x, self.scale.y, self.scale.z); m = m * Matrix4::from_nonuniform_scale(self.scale.x, self.scale.y, self.scale.z);
m = m * Matrix4::<f32>::from_angle_x(Rad(self.rotation.x.to_radians()));
m = m * Matrix4::<f32>::from_angle_y(Rad(self.rotation.y.to_radians()));
m = m * Matrix4::<f32>::from_angle_z(Rad(self.rotation.z.to_radians()));
m m
} }