correctly implement capsule collisions and camera view matrix

1 files changed, 6 insertions, 4 deletions

diff --git a/save b/save
index 3d61fcb..a5e128c 100644
--- a/save
+++ b/save
@@ -1,4 +1,6 @@
-Entity("db523689-0ef0-4dd9-8847-7f2eb72409f1", {transform={parent="e928ddf1-98eb-49a6-9b22-fb815edef06f",matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 2.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}},renderMesh={mesh={index=1,filename="assets/tetrahedron.obj"},shader={vertex="vertex.glsl",fragment="fragment.glsl"}}})
-Entity("e928ddf1-98eb-49a6-9b22-fb815edef06f", {transform={matrix=Mat4{0.0297, 0.9996, 0.0000, -10.2024, -0.9996, 0.0297, 0.0000, 0.1079, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}},collision={radius=1,class="sphere"},physics={angularVelocity=Vec3{0.0000, 0.0000, 3.5659},mass={radius=1,class="sphere",density=1},velocity=Vec3{-3.5523, -0.3108, 0.0000}},renderMesh={mesh={index=1,filename="assets/icosahedron.obj"},textures={ourTexture={filename="77155.png"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}}})
-Entity("badbb36e-27ae-40bd-8601-13f90d6ad936", {onKey={script="cameraKeyHandler"},transform={matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, -59.7493, 0.0000, 0.0000, 0.0000, 1.0000}},script={script="cameraRotationScript"},camera={projection=Mat4{1.8107, 0.0000, 0.0000, 0.0000, 0.0000, 2.4142, 0.0000, 0.0000, 0.0000, 0.0000, -1.0020, -0.2002, 0.0000, 0.0000, -1.0000, 0.0000}},z={value=-60},onWindowResize={script="cameraHandleResize"}})
-Entity("862b003d-99f6-4dfa-8319-f11477bb4bba", {collision={class="plane"},transform={matrix=Mat4{0.9962, -0.0872, 0.0000, 0.0000, 0.0872, 0.9962, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
+Entity("4ed429ea-a611-4b0e-9cab-fe2abdb86b9c", {collision={class="plane"},transform={matrix=Mat4{0.9962, -0.0872, 0.0000, 0.0000, 0.0872, 0.9962, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
+Entity("c632332d-2283-49cf-9aa6-9cf45d369bd9", {physics={velocity=Vec3{-0.6251, -0.0547, 0.0000},angularVelocity=Vec3{0.0000, 0.0000, 0.6275},mass={density=1,class="sphere",radius=1}},collision={class="sphere",radius=1},renderMesh={textures={ourTexture={filename="77155.png"}},mesh={index=1,filename="assets/icosahedron.obj"},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},transform={matrix=Mat4{0.4476, -0.8942, 0.0000, -0.3201, 0.8942, 0.4476, 0.0000, 0.9725, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
+Entity("c0e68906-f2f0-4455-918b-75fc2666d58b", {renderMesh={mesh={index=1,filename="builtin.quad"},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},transform={matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 2.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000},parent="c632332d-2283-49cf-9aa6-9cf45d369bd9"}})
+Entity("ad305b40-a3d8-4c61-95c6-654bd161b559", {renderQuad={textures={ourTexture={filename="44d9a0ec1c18e6126a5e9d9d9317f5ac.png"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}}})
+Entity("fb6a418d-d5b7-46fb-9dba-a86a6e214933", {physics={velocity=Vec3{0.0000, -10.0800, 0.0000},angularVelocity=Vec3{0.0000, 0.0000, 0.0000},mass={density=1,class="capsule",length=2,direction=3,radius=1}},collision={class="capsule",length=2,radius=1},renderMesh={mesh={index=1,filename="assets/capsule.obj"},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},transform={matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 4.8390, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
+Entity("19855b55-d756-4471-a65d-641270f2b4e3", {onKey={script="cameraKeyHandler"},onWindowResize={script="cameraHandleResize"},transform={matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.9397, 0.3420, 19.6575, 0.0000, -0.3420, 0.9397, 24.7706, 0.0000, 0.0000, 0.0000, 1.0000}},camera={render="screen",projection=Mat4{3.9434, 0.0000, 0.0000, 0.0000, 0.0000, 2.4142, 0.0000, 0.0000, 0.0000, 0.0000, -1.0020, -0.2002, 0.0000, 0.0000, -1.0000, 0.0000}},z={value=-60}})