summaryrefslogtreecommitdiff
path: root/client/src/camera.rs
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/camera.rs')
-rw-r--r--client/src/camera.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/client/src/camera.rs b/client/src/camera.rs
index 4264e40..bd86e79 100644
--- a/client/src/camera.rs
+++ b/client/src/camera.rs
@@ -46,10 +46,11 @@ impl Camera {
pub fn rotation_mat(&self) -> Mat3 {
Mat3::from_euler(EulerRot::YXZ, self.rot.x, self.rot.y, self.rot.z)
}
- pub fn to_matrix(&self) -> Mat4 {
+ pub fn view_matrix(&self) -> Mat4 {
+ Mat4::from_mat3(self.rotation_mat().inverse()) * Mat4::from_translation(-self.pos)
+ }
+ pub fn project_matrix(&self) -> Mat4 {
Mat4::perspective_rh(self.fov, self.aspect, 0.01, 300.)
- * Mat4::from_mat3(self.rotation_mat().inverse())
- * Mat4::from_translation(-self.pos)
}
pub fn new_ui_affine(&self) -> Affine3A {
Affine3A::from_mat3_translation(