begin refactor

1 files changed, 12 insertions, 12 deletions

diff --git a/save b/save
index 69147da..9714ac1 100644
--- a/save
+++ b/save
@@ -1,12 +1,12 @@
-Entity("2a08965c-962c-4800-9033-8127e39e891c", {renderQuad={textures={ourTexture={filename="44d9a0ec1c18e6126a5e9d9d9317f5ac.png"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}}})
-Entity("62f52427-4a91-4d9b-8728-b84c029a491c", {onFramebufferSize={script="scripts.viewportResize"},onKey={script="scripts.loadSaveQuit"}})
-Entity("a5d93d49-f1bf-4481-a9b2-a535c7f572fe", {onScroll={script="scripts.character.cameraDistance"},node={parent="5ed47a34-36bf-45b3-b6a0-c77bbb3da102",matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 20.0000, 0.0000, 0.0000, 0.0000, 1.0000}},onFramebufferSize={script="scripts.cameraHandleResize"},camera={render="screen",projection=Mat4{2.5518, 0.0000, 0.0000, 0.0000, 0.0000, 2.4142, 0.0000, 0.0000, 0.0000, 0.0000, -1.0002, -0.2000, 0.0000, 0.0000, -1.0000, 0.0000}}})
-Entity("66a57409-094d-4ccb-80b8-b76e68d1cf35", {script={script="scripts.capsuleMove"},node={matrix=Mat4{1.0000, 0.0000, 0.0000, 6.9968, 0.0000, 0.0000, -1.0000, 3.8860, 0.0000, 1.0000, 0.0000, 6.7345, 0.0000, 0.0000, 0.0000, 1.0000}},collision={class="capsule",length=2,collide=-3,radius=1,category=2},renderMesh={mesh={index=1,filename="assets/capsule.obj"},textures={ourTexture={filename="assets/green-grass.jpg"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},physics={mass={class="capsule",direction=3,length=2,mass=10,radius=1},maxAngularSpeed=0,surface=true,velocity=Vec3{0.0000, 0.0080, 0.0000},angularVelocity=Vec3{0.0000, 0.0000, 0.0000}}})
-Entity("cb39f828-cf3b-4eb5-b165-b51cea3d065e", {spring={F=0},node={parent="66a57409-094d-4ccb-80b8-b76e68d1cf35",matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, -1.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000},name="spring"},collision={class="ray",length=4,collide=-3,category=2},onCollision={script="scripts.character.spring"}})
-Entity("50f43874-fef7-43ec-bbaf-51095ec4a154", {node={parent="66a57409-094d-4ccb-80b8-b76e68d1cf35",matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, -0.0000, 1.0000, 0.0000, 0.0000, -1.0000, -0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000},name="p"}})
-Entity("5ed47a34-36bf-45b3-b6a0-c77bbb3da102", {node={parent="50f43874-fef7-43ec-bbaf-51095ec4a154",matrix=Mat4{-0.8090, 0.2759, -0.5190, 0.0000, 0.0000, 0.8829, 0.4695, 0.0000, 0.5878, 0.3798, -0.7143, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000},name="pivot"},onCursorPos={script="scripts.cameraPivot"},pitchyaw={pitch=-28,yaw=-144}})
-Entity("b26e69d3-0707-42a0-8f02-91b3e96de271", {collision={class="plane"},node={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("10192474-032a-4d1f-84d1-ddd283bfec5d", {renderMesh={mesh={index=1,filename="assets/skybox.obj"},textures={ourTexture={filename="assets/skyboxsun5deg2_tn.jpg"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},node={matrix=Mat4{2.0000, 0.0000, 0.0000, 0.0000, 0.0000, -0.0000, -2.0000, 0.0000, 0.0000, 2.0000, -0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
-Entity("8cc5b679-57a4-4337-8328-fa618a900c3f", {renderMesh={mesh={index=1,filename="builtin.quad"},textures={ourTexture={filename="assets/green+grass-1024x1024.jpg"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},node={parent="b26e69d3-0707-42a0-8f02-91b3e96de271",matrix=Mat4{20.0000, 0.0000, 0.0000, 0.0000, 0.0000, -0.0000, -20.0000, 0.0000, 0.0000, 20.0000, -0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
-Entity("5ce8bc4a-b6ce-4e6f-8a1c-4c9ae4b0d500", {node={matrix=Mat4{-0.5859, 0.8104, 0.0000, -40.8664, -0.8104, -0.5859, 0.0000, -2.5749, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}},collision={class="sphere",radius=1},renderMesh={mesh={index=1,filename="assets/icosahedron.obj"},textures={ourTexture={filename="77155.png"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},physics={mass={class="sphere",density=1,radius=1},surface=true,velocity=Vec3{-7.1146, -0.6224, 0.0000},angularVelocity=Vec3{0.0000, 0.0000, 7.1418}}})
-Entity("b79ee907-fe95-41d7-9496-1be53e2a5c0e", {renderMesh={mesh={index=1,filename="builtin.quad"},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},node={parent="5ce8bc4a-b6ce-4e6f-8a1c-4c9ae4b0d500",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}}})
+Entity("aa9871f0-68f3-45e8-b8b3-039636ab107a", {physics={mass={class="sphere",density=1,radius=1},surface=true,velocity=Vec3{-0.6450, -0.0564, 0.0000},angularVelocity=Vec3{0.0000, 0.0000, 0.6474}},collision={class="sphere",radius=1},renderMesh={mesh={index=1,filename="assets/icosahedron.obj"},textures={ourTexture={filename="77155.png"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},node={matrix=Mat4{0.4291, -0.9032, 0.0000, -0.3406, 0.9032, 0.4291, 0.0000, 0.9707, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
+Entity("a72d6341-3aab-4894-9333-406047e31381", {renderMesh={mesh={index=1,filename="builtin.quad"},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},node={parent="aa9871f0-68f3-45e8-b8b3-039636ab107a",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}}})
+Entity("f71b4478-2e56-47b3-91e2-90b4bb01bf99", {renderQuad={textures={ourTexture={filename="44d9a0ec1c18e6126a5e9d9d9317f5ac.png"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}}})
+Entity("7ea29d98-d771-4043-b1c3-9bedcdd63d02", {onFramebufferSize={script="scripts.viewportResize"},onKey={script="scripts.loadSaveQuit"}})
+Entity("a3a3370d-0a83-4f59-82b4-a348ec7766a3", {renderMesh={mesh={index=1,filename="assets/skybox.obj"},textures={ourTexture={filename="assets/skyboxsun5deg2_tn.jpg"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},node={matrix=Mat4{2.0000, 0.0000, 0.0000, 0.0000, 0.0000, -0.0000, -2.0000, 0.0000, 0.0000, 2.0000, -0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
+Entity("91129422-7f25-4d37-9c99-6321fac97c40", {script={script="scripts.capsuleMove"},node={matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, -1.0000, 5.3150, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}},renderMesh={mesh={index=1,filename="assets/capsule.obj"},textures={ourTexture={filename="assets/green-grass.jpg"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},collision={class="capsule",category=2,collide=-3,length=2,radius=1},physics={mass={class="capsule",direction=3,length=2,mass=10,radius=1},surface=true,maxAngularSpeed=0,angularVelocity=Vec3{0.0000, 0.0000, 0.0000},velocity=Vec3{0.0000, -8.1776, 0.0000}}})
+Entity("90ec4e2f-6050-4633-98a5-772fe8c095b7", {onCollision={script="scripts.character.spring"},spring={F=0},node={name="spring",parent="91129422-7f25-4d37-9c99-6321fac97c40",matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, -1.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}},collision={class="ray",category=2,collide=-3,length=4}})
+Entity("bd2f6455-a564-404c-bee4-78d5bf4313ed", {node={name="p",parent="91129422-7f25-4d37-9c99-6321fac97c40",matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, -0.0000, 1.0000, 0.0000, 0.0000, -1.0000, -0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
+Entity("ab2a855c-ae50-45ca-bfbc-256f916cffea", {pitchyaw={pitch=0,yaw=0},node={name="pivot",parent="bd2f6455-a564-404c-bee4-78d5bf4313ed",matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}},onCursorPos={script="scripts.cameraPivot"}})
+Entity("cd7c5fdc-58b6-4d03-85dd-db93a3689469", {onFramebufferSize={script="scripts.cameraHandleResize"},onScroll={script="scripts.character.cameraDistance"},camera={projection=Mat4{2.5518, 0.0000, 0.0000, 0.0000, 0.0000, 2.4142, 0.0000, 0.0000, 0.0000, 0.0000, -1.0002, -0.2000, 0.0000, 0.0000, -1.0000, 0.0000},render="screen"},node={parent="ab2a855c-ae50-45ca-bfbc-256f916cffea",matrix=Mat4{1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000, 20.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})
+Entity("541629cd-36c6-4f21-8de0-4305096241ff", {collision={class="plane"},node={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("f5cf3a1f-472a-48ea-bf88-1e45561d5137", {renderMesh={mesh={index=1,filename="builtin.quad"},textures={ourTexture={filename="assets/green+grass-1024x1024.jpg"}},shader={vertex="vertex.glsl",fragment="fragment.glsl"}},node={parent="541629cd-36c6-4f21-8de0-4305096241ff",matrix=Mat4{20.0000, 0.0000, 0.0000, 0.0000, 0.0000, -0.0000, -20.0000, 0.0000, 0.0000, 20.0000, -0.0000, 0.0000, 0.0000, 0.0000, 0.0000, 1.0000}}})