different stuff in physics

2026-03-18 18:41:28 +02:00
parent b56d85f95d
commit 79ceac1005
8 changed files with 223 additions and 18 deletions
--- a/game/client/worldrender.cpp
+++ b/game/client/worldrender.cpp
@@ -228,6 +228,13 @@ void CFunnyWorldRenderer::Frame( float fDelta )
 	glm_mat4_identity(matCamera);
 	glm_mat4_identity(matCamera2);
 	glm_translate(matCamera2, m_vPos);
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+	glm_mat4_inv(matCamera2, matCamera2);
+>>>>>>> c251089 (different stuff in physics)
+>>>>>>> a2652ed (merges)
 	glm_perspective(glm_rad(75), uWidth/(float)uHeight, 0.01, 10000, matCamera);
 	glm_mul(matCamera, matCamera2, matCamera);
 	m_pViewBufferData = (ViewBuffer_t*)m_pViewBuffer->Map();