diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-01-24 18:25:25 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-01-24 18:25:25 +0100 |
| commit | b4aaaae52b3b746a5e1ef8a98151c627f2787e38 (patch) | |
| tree | 397eee51c86670f46947d94838c36f57c320f3d7 /client/src/camera.rs | |
| parent | ce82f40bc4bd03963390d2c95ec688fccc4740b0 (diff) | |
| download | weareserver-b4aaaae52b3b746a5e1ef8a98151c627f2787e38.tar weareserver-b4aaaae52b3b746a5e1ef8a98151c627f2787e38.tar.bz2 weareserver-b4aaaae52b3b746a5e1ef8a98151c627f2787e38.tar.zst | |
fix things up but no light
Diffstat (limited to 'client/src/camera.rs')
| -rw-r--r-- | client/src/camera.rs | 7 |
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( |