diff --git a/matrices.yyp b/matrices.yyp index 1657c42..0a6e033 100644 --- a/matrices.yyp +++ b/matrices.yyp @@ -1,304 +1,53 @@ { - "id": "899f9863-2002-410a-ae31-89c9731c1484", - "modelName": "GMProject", - "mvc": "1.0", - "IsDnDProject": false, - "configs": [ - - ], - "option_ecma": false, - "parentProject": { - "id": "ce22fc58-bc42-44af-9c96-ddfa91e40ccc", - "modelName": "GMProjectParent", - "mvc": "1.0", - "alteredResources": [ - { - "Key": "ed6a955d-5826-4f98-a450-10b414266c27", - "Value": { - "configDeltas": [ - "inherited" - ], - "id": "e658088f-c1eb-4263-80e6-62475273f7b9", - "resourcePath": "options\\main\\options_main.yy", - "resourceType": "GMMainOptions" - } - } - ], - "hiddenResources": [ - - ], - "projectPath": "${base_project}" - }, - "resources": [ - { - "Key": "0775e65f-8cc6-4e55-9c0b-312ebf67bc35", - "Value": { - "id": "f14a5b82-aabd-4d5e-b379-421ddd7b6f05", - "resourcePath": "scripts\\matrix_build_rotation_axis\\matrix_build_rotation_axis.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "0a98f219-88ae-4e9a-adac-c1715adf6fc9", - "Value": { - "id": "a943e271-9e0a-4fe2-93fa-e4722275edce", - "resourcePath": "views\\0a98f219-88ae-4e9a-adac-c1715adf6fc9.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "238ebae9-ca84-4418-bd7e-4a1f960244e0", - "Value": { - "id": "529d9b9a-7c1e-4448-bca6-eb7ecac82266", - "resourcePath": "views\\238ebae9-ca84-4418-bd7e-4a1f960244e0.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "273a4646-cbde-469a-88ae-137dcc7dd752", - "Value": { - "id": "c5c0b2e8-345c-40b8-8c66-f228f2dc4a92", - "resourcePath": "scripts\\matrix_world_reset\\matrix_world_reset.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "2bdbfc2c-8e9e-4577-bca2-2ac33a48aec4", - "Value": { - "id": "07bae43e-b35c-4b56-ae2b-18426e1df184", - "resourcePath": "views\\2bdbfc2c-8e9e-4577-bca2-2ac33a48aec4.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "36ccb387-f771-48b2-9ff2-95b298a22db8", - "Value": { - "id": "3d86b4d1-9a42-4d73-b3cd-c42eb7f237b2", - "resourcePath": "views\\36ccb387-f771-48b2-9ff2-95b298a22db8.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "3d9f40cd-c33e-4cac-a359-59fd16cecb70", - "Value": { - "id": "fffb8954-1814-4d52-8cad-db7e71b00612", - "resourcePath": "scripts\\matrix_string\\matrix_string.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "3e57aff7-52cb-4f60-8c29-3d795187f482", - "Value": { - "id": "15c92a45-879a-46ba-8b42-7ae7166b7ba6", - "resourcePath": "scripts\\__matrices_config\\__matrices_config.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "4110cc2e-c595-412c-a56b-b614061e3959", - "Value": { - "id": "e9ea5723-2ec1-4b1e-9439-31a9568eb5f1", - "resourcePath": "scripts\\matrix_flip_y\\matrix_flip_y.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "4118d6fd-e5a4-4dae-b901-376e77da7cd1", - "Value": { - "id": "ab8d11b0-0b55-4732-866d-6143476d122e", - "resourcePath": "views\\4118d6fd-e5a4-4dae-b901-376e77da7cd1.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "41fcc7b4-9bad-4363-a27a-f1155d567ca3", - "Value": { - "id": "919ff190-5f16-4b6d-89cf-1dd3473744df", - "resourcePath": "views\\41fcc7b4-9bad-4363-a27a-f1155d567ca3.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "493b96c0-00d4-4b10-b32d-20833f9ef5a3", - "Value": { - "id": "9a1ef0ae-4865-4f07-bb39-181c20f8c691", - "resourcePath": "views\\493b96c0-00d4-4b10-b32d-20833f9ef5a3.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "4dfe404f-a2c3-4e89-b162-07335ebe3741", - "Value": { - "id": "4b9514e7-938d-454b-834f-7a53cdf6865d", - "resourcePath": "views\\4dfe404f-a2c3-4e89-b162-07335ebe3741.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "56ac7145-bd4b-4edb-bfae-a07981babb89", - "Value": { - "id": "a54bbe77-54bf-4b14-8a4f-4f37b08fd3f0", - "resourcePath": "views\\56ac7145-bd4b-4edb-bfae-a07981babb89.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "69d34c6d-0ef1-40cf-96fd-e3bfa52a68a1", - "Value": { - "id": "1685f3b2-4bef-44a3-b6a9-d0265f832301", - "resourcePath": "views\\69d34c6d-0ef1-40cf-96fd-e3bfa52a68a1.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "6b41e390-7d9e-4f3f-b929-d852fb5d3f22", - "Value": { - "id": "a7fafbcd-f372-4826-85c2-abed84198a15", - "resourcePath": "scripts\\matrix_world_multiply\\matrix_world_multiply.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "6b7b80f4-d1df-4363-a362-6a69b24cccd9", - "Value": { - "id": "97a7da81-275a-4107-918b-3a65fbf9d254", - "resourcePath": "views\\6b7b80f4-d1df-4363-a362-6a69b24cccd9.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "6d3cdacd-531c-4a9e-898a-511c90b98dc0", - "Value": { - "id": "8ce9eb51-ce35-4718-bfe8-2dcd38dcaab5", - "resourcePath": "views\\6d3cdacd-531c-4a9e-898a-511c90b98dc0.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "75ac291e-7061-4bcb-8e8a-3b3545332d41", - "Value": { - "id": "f47b6ea4-f6d8-45f3-b744-cd37f3acc523", - "resourcePath": "options\\html5\\options_html5.yy", - "resourceType": "GMHtml5Options" - } - }, - { - "Key": "93d017d3-d8d5-4c22-a3da-870fa111ab33", - "Value": { - "id": "03769f18-65f8-4b1c-a6c7-7246a797a6d5", - "resourcePath": "views\\93d017d3-d8d5-4c22-a3da-870fa111ab33.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "96088f3a-4cd0-4892-9f4b-d7bfe2bd7d19", - "Value": { - "id": "eb013bf1-b693-4e00-9281-e801bba8bd90", - "resourcePath": "views\\96088f3a-4cd0-4892-9f4b-d7bfe2bd7d19.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "99a67b70-d60c-4376-a648-c2dc41016e81", - "Value": { - "id": "898012bf-62b4-473a-b236-49a24a7938a8", - "resourcePath": "scripts\\matrix_world_transform_2d\\matrix_world_transform_2d.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "a570586c-9165-4c21-ba3b-f5eec0fc70fc", - "Value": { - "id": "028d1175-6f70-48b3-bfe7-bfeec8af8dcb", - "resourcePath": "scripts\\matrix_flip_x\\matrix_flip_x.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "a6c82e90-84d2-4072-b1bc-270da65ae85f", - "Value": { - "id": "0fe351b5-0fd1-4819-b9bc-baf6a59dea90", - "resourcePath": "views\\a6c82e90-84d2-4072-b1bc-270da65ae85f.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "a9188620-a624-4a5a-83ae-a1b53faf038b", - "Value": { - "id": "e8f4b162-1b8c-4718-a5dd-d00e1bf07b21", - "resourcePath": "options\\linux\\options_linux.yy", - "resourceType": "GMLinuxOptions" - } - }, - { - "Key": "aa0e925b-b142-48e3-81c1-8bade2009126", - "Value": { - "id": "7e299d61-0464-43dd-88b7-6f06766b1699", - "resourcePath": "scripts\\matrix_world_set\\matrix_world_set.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "c6d4cfa5-1a77-4b71-a1d0-66f068feca6e", - "Value": { - "id": "fca47196-2b72-4ac9-90d8-459ee44168ab", - "resourcePath": "scripts\\matrix_inverse\\matrix_inverse.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "c8438f4d-e474-4d40-8966-43298219dec1", - "Value": { - "id": "e4b2aa1d-d33f-44c5-a531-73df5e18f450", - "resourcePath": "views\\c8438f4d-e474-4d40-8966-43298219dec1.yy", - "resourceType": "GMFolder" - } - }, - { - "Key": "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "Value": { - "id": "c0531d78-0cc4-49d0-aa33-10cd0c446758", - "resourcePath": "options\\windows\\options_windows.yy", - "resourceType": "GMWindowsOptions" - } - }, - { - "Key": "e0d21f12-376d-451e-874e-28024d031a64", - "Value": { - "id": "21f541df-4a86-4cb3-8e19-f3048b69f199", - "resourcePath": "scripts\\matrix_reset\\matrix_reset.yy", - "resourceType": "GMScript" - } - }, - { - "Key": "f418569b-3bdd-4706-a0e4-364317f54032", - "Value": { - "id": "e84a6143-f5ba-46dc-aa6c-c25552a0ab8f", - "resourcePath": "options\\mac\\options_mac.yy", - "resourceType": "GMMacOptions" - } - }, - { - "Key": "fced5831-fb29-4e4e-b4c5-b03521f6ea40", - "Value": { - "id": "fcb835f6-2895-4f90-b2c5-bd4590b0a383", - "resourcePath": "views\\fced5831-fb29-4e4e-b4c5-b03521f6ea40.yy", - "resourceType": "GMFolder" - } - } - ], - "script_order": [ - "3e57aff7-52cb-4f60-8c29-3d795187f482", - "e0d21f12-376d-451e-874e-28024d031a64", - "aa0e925b-b142-48e3-81c1-8bade2009126", - "273a4646-cbde-469a-88ae-137dcc7dd752", - "6b41e390-7d9e-4f3f-b929-d852fb5d3f22", - "99a67b70-d60c-4376-a648-c2dc41016e81", - "0775e65f-8cc6-4e55-9c0b-312ebf67bc35", - "3d9f40cd-c33e-4cac-a359-59fd16cecb70", - "a570586c-9165-4c21-ba3b-f5eec0fc70fc", - "4110cc2e-c595-412c-a56b-b614061e3959", - "c6d4cfa5-1a77-4b71-a1d0-66f068feca6e" - ], - "tutorial": "" + "resourceType": "GMProject", + "resourceVersion": "1.6", + "name": "Matrices", + "resources": [ + {"id":{"name":"__MatrixSystem","path":"scripts/__MatrixSystem/__MatrixSystem.yy",},"order":12,}, + {"id":{"name":"MatrixReset","path":"scripts/MatrixReset/MatrixReset.yy",},"order":1,}, + {"id":{"name":"MatrixSet","path":"scripts/MatrixSet/MatrixSet.yy",},"order":2,}, + {"id":{"name":"MatrixMultiply","path":"scripts/MatrixMultiply/MatrixMultiply.yy",},"order":4,}, + {"id":{"name":"rTest","path":"rooms/rTest/rTest.yy",},"order":1,}, + {"id":{"name":"oCamera","path":"objects/oCamera/oCamera.yy",},"order":2,}, + {"id":{"name":"MatrixBuildTransform2D","path":"scripts/MatrixBuildTransform2D/MatrixBuildTransform2D.yy",},"order":5,}, + {"id":{"name":"MatrixBuildRotationAxis","path":"scripts/MatrixBuildRotationAxis/MatrixBuildRotationAxis.yy",},"order":6,}, + {"id":{"name":"MatrixString","path":"scripts/MatrixString/MatrixString.yy",},"order":7,}, + {"id":{"name":"MatrixTransformVertexExt","path":"scripts/MatrixTransformVertexExt/MatrixTransformVertexExt.yy",},"order":11,}, + {"id":{"name":"MatrixFlipX","path":"scripts/MatrixFlipX/MatrixFlipX.yy",},"order":8,}, + {"id":{"name":"MatrixFlipY","path":"scripts/MatrixFlipY/MatrixFlipY.yy",},"order":9,}, + {"id":{"name":"MatrixInverse","path":"scripts/MatrixInverse/MatrixInverse.yy",},"order":10,}, + ], + "Options": [ + {"name":"Linux","path":"options/linux/options_linux.yy",}, + {"name":"HTML5","path":"options/html5/options_html5.yy",}, + {"name":"macOS","path":"options/mac/options_mac.yy",}, + {"name":"Windows","path":"options/windows/options_windows.yy",}, + {"name":"Main","path":"options/main/options_main.yy",}, + {"name":"Android","path":"options/android/options_android.yy",}, + {"name":"iOS","path":"options/ios/options_ios.yy",}, + {"name":"tvOS","path":"options/tvos/options_tvos.yy",}, + {"name":"operagx","path":"options/operagx/options_operagx.yy",}, + ], + "defaultScriptType": 1, + "isEcma": false, + "configs": { + "name": "Default", + "children": [], + }, + "RoomOrderNodes": [ + {"roomId":{"name":"rTest","path":"rooms/rTest/rTest.yy",},}, + ], + "Folders": [ + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Matrices","folderPath":"folders/Matrices.yy","order":0,}, + ], + "AudioGroups": [ + {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, + ], + "TextureGroups": [ + {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","isScaled":true,"compressFormat":"bz2","loadType":"default","directory":"","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,}, + ], + "IncludedFiles": [], + "MetaData": { + "IDEVersion": "2022.0.2.51", + }, } \ No newline at end of file diff --git a/objects/oCamera/Create_0.gml b/objects/oCamera/Create_0.gml new file mode 100644 index 0000000..1749282 --- /dev/null +++ b/objects/oCamera/Create_0.gml @@ -0,0 +1,16 @@ +//Mouse lock variables (press F3 to lock the mouse and use mouselook) +mouseLock = false; +mouseLockTimer = 0; + +//Some variables to track the camera +camX = 450; +camY = 230; +camZ = 200; +camYaw = 120; +camPitch = -45; +camDX = dcos(camYaw)*dcos(camPitch); +camDY = -dsin(camYaw)*dcos(camPitch); +camDZ = dsin(camPitch); + +//F1 toggles the info panel +showInfo = true; \ No newline at end of file diff --git a/objects/oCamera/Draw_0.gml b/objects/oCamera/Draw_0.gml new file mode 100644 index 0000000..ccb649a --- /dev/null +++ b/objects/oCamera/Draw_0.gml @@ -0,0 +1,4 @@ +//UggRay(0, 0, 0, 100, 0, 0, c_red, 5); +//UggRay(0, 0, 0, 0, 100, 0, c_lime, 5); +//UggRay(0, 0, 0, 0, 0, 100, c_blue, 5); +//UggSphere(0, 0, 0, 5, c_white); \ No newline at end of file diff --git a/objects/oCamera/Draw_64.gml b/objects/oCamera/Draw_64.gml new file mode 100644 index 0000000..3a6a0ee --- /dev/null +++ b/objects/oCamera/Draw_64.gml @@ -0,0 +1,32 @@ +if (showInfo) +{ + var _string = "Matrices " + __MATRICES_VERSION + "\n"; + _string += "Juju Adams " + __MATRICES_DATE + "\n"; + _string += "\n"; + _string += "camera position = " + string(camX) + ", " + string(camY) + ", " + string(camZ) + "\n"; + _string += "camera yaw/pitch = " + string(camYaw) + ", " + string(camPitch) + "\n"; + _string += "\n"; + _string += "WASD/shift/space to move\n"; + _string += "Left click to toggle mouselook\n"; + _string += "F1 to toggle this panel\n"; + _string += "F4 to toggle fullscreen"; + + draw_set_colour(c_black); + draw_set_alpha(0.5); + draw_rectangle(10, 10, 20 + string_width(_string), 20 + string_height(_string), false); + draw_text(15, 16, _string); + draw_set_alpha(1.0); + draw_text(14, 15, _string); + draw_text(16, 15, _string); + draw_text(15, 14, _string); + draw_text(15, 16, _string); + draw_set_colour(c_white); + draw_text(15, 15, _string); +} + +var _x = 0.5*display_get_gui_width(); +var _y = 0.5*display_get_gui_height(); +gpu_set_blendmode_ext( bm_inv_dest_color, bm_inv_src_color); +draw_line(_x - 20, _y, _x + 20, _y); +draw_line(_x, _y - 20, _x, _y + 20); +gpu_set_blendmode(bm_normal); \ No newline at end of file diff --git a/objects/oCamera/Draw_72.gml b/objects/oCamera/Draw_72.gml new file mode 100644 index 0000000..679ac6a --- /dev/null +++ b/objects/oCamera/Draw_72.gml @@ -0,0 +1,14 @@ +//Turn on z-writing and z-testing so we're ready for 3D rendering +gpu_set_ztestenable(true); +gpu_set_zwriteenable(true); + +//Counterclockwise faces are backfaces. We want to cull these so we're drawing less +gpu_set_cullmode(cull_counterclockwise); + +//Set our view + projection matrices +old_world_matrix = matrix_get(matrix_world); +old_view_matrix = matrix_get(matrix_view); +old_projection_matrix = matrix_get(matrix_projection); + +matrix_set(matrix_view, view_matrix); +matrix_set(matrix_projection, projection_matrix); \ No newline at end of file diff --git a/objects/oCamera/Draw_73.gml b/objects/oCamera/Draw_73.gml new file mode 100644 index 0000000..f47c1ed --- /dev/null +++ b/objects/oCamera/Draw_73.gml @@ -0,0 +1,8 @@ +//Reset draw state +matrix_set(matrix_world, old_world_matrix ); +matrix_set(matrix_view, old_view_matrix ); +matrix_set(matrix_projection, old_projection_matrix); + +gpu_set_ztestenable(false); +gpu_set_zwriteenable(false); +gpu_set_cullmode(cull_noculling); \ No newline at end of file diff --git a/objects/oCamera/Step_0.gml b/objects/oCamera/Step_0.gml new file mode 100644 index 0000000..8e5919a --- /dev/null +++ b/objects/oCamera/Step_0.gml @@ -0,0 +1,62 @@ +//Toggle the info panel if we press F1 +if (keyboard_check_released(vk_f1)) showInfo = !showInfo; + +//Lock the mouse if we left click +if (mouse_check_button_released(mb_left)) +{ + mouseLock = !mouseLock; + mouseLockTimer = 0; + + //Hide the mouse if we're locked + window_set_cursor(mouseLock? cr_none : cr_default); +} + +//Toggle the fullscreen if we press f4 +if (keyboard_check_released(vk_f4)) window_set_fullscreen(!window_get_fullscreen()); + +//If we've got the mouse locked... +if (mouseLock) +{ + //Figure out where the centre of the window is + var _centreX = window_get_width()/2; + var _centreY = window_get_height()/2; + + //Increment a timer. Once that timer reaches 5, start pitching/panning the camera + //There's a little bit of lag between pressing F3 and the mouse actually + //centring in the window - this timer stops the camera freaking out! + ++mouseLockTimer; + if (mouseLockTimer > 4) + { + + var _dX = window_mouse_get_x() - _centreX; + var _dY = window_mouse_get_y() - _centreY; + camYaw -= 0.1*_dX; + camPitch -= 0.1*_dY; + + camPitch = clamp(camPitch, -89, 89); //Make sure we can't gimbal lock the camera + } + + //Now move the mouse + window_mouse_set(_centreX, _centreY); +} + +////Figure out where the camera is looking +camDX = dcos(camYaw)*dcos(camPitch); +camDY = -dsin(camYaw)*dcos(camPitch); +camDZ = dsin(camPitch); + +//Move parallel/perpendicular to the camera +var _para = 2*(keyboard_check(ord("W")) - keyboard_check(ord("S"))); +var _perp = 2*(keyboard_check(ord("A")) - keyboard_check(ord("D"))); +var _sin = dsin(camYaw); +var _cos = dcos(camYaw); + +camX += _para*_cos - _perp*_sin; +camY += -_para*_sin - _perp*_cos; +camZ += 2*(keyboard_check(vk_space) - keyboard_check(vk_shift)); + +//Calculate matrices that we'll want to use later +view_matrix = matrix_build_lookat(camX, camY, camZ, + camX+camDX, camY+camDY, camZ+camDZ, + 0, 0, 1); +projection_matrix = matrix_build_projection_perspective_fov(90, room_width/room_height, 1, 3000); \ No newline at end of file diff --git a/objects/oCamera/oCamera.yy b/objects/oCamera/oCamera.yy new file mode 100644 index 0000000..3aba6c8 --- /dev/null +++ b/objects/oCamera/oCamera.yy @@ -0,0 +1,38 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "oCamera", + "spriteId": null, + "solid": false, + "visible": true, + "managed": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":72,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":73,"eventType":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":64,"eventType":8,"collisionObjectId":null,}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "Matrices", + "path": "Matrices.yyp", + }, +} \ No newline at end of file diff --git a/options/android/options_android.yy b/options/android/options_android.yy new file mode 100644 index 0000000..a5d2f1d --- /dev/null +++ b/options/android/options_android.yy @@ -0,0 +1,78 @@ +{ + "resourceType": "GMAndroidOptions", + "resourceVersion": "1.0", + "name": "Android", + "option_android_sync_amazon": false, + "option_android_display_name": "Created with GameMaker", + "option_android_version": "1.0.0.0", + "option_android_tools_from_version": false, + "option_android_build_tools": "", + "option_android_support_lib": "", + "option_android_target_sdk": "", + "option_android_minimum_sdk": "", + "option_android_compile_sdk": "", + "option_android_package_domain": "com", + "option_android_package_company": "company", + "option_android_package_product": "game", + "option_android_arch_armv7": false, + "option_android_arch_arm64": true, + "option_android_arch_x86_64": false, + "option_android_orient_portrait": true, + "option_android_orient_portrait_flipped": true, + "option_android_orient_landscape": true, + "option_android_orient_landscape_flipped": true, + "option_android_gamepad_support": true, + "option_android_lint": false, + "option_android_install_location": 0, + "option_android_sleep_margin": 4, + "option_android_splash_screens_landscape": "${base_options_dir}/android/splash/landscape.png", + "option_android_splash_screens_portrait": "${base_options_dir}/android/splash/portrait.png", + "option_android_splash_time": 0, + "option_android_launchscreen_fill": 0, + "option_android_splashscreen_background_colour": 255, + "option_android_tv_banner": "${base_options_dir}/android/tv_banner.png", + "option_android_interpolate_pixels": false, + "option_android_screen_depth": 0, + "option_android_device_support": 0, + "option_android_scale": 0, + "option_android_texture_page": "2048x2048", + "option_android_icon_ldpi": "${base_options_dir}/android/icons/ldpi.png", + "option_android_icon_mdpi": "${base_options_dir}/android/icons/mdpi.png", + "option_android_icon_hdpi": "${base_options_dir}/android/icons/hdpi.png", + "option_android_icon_xhdpi": "${base_options_dir}/android/icons/xhdpi.png", + "option_android_icon_xxhdpi": "${base_options_dir}/android/icons/xxhdpi.png", + "option_android_icon_xxxhdpi": "${base_options_dir}/android/icons/xxxhdpi.png", + "option_android_icon_adaptive_generate": false, + "option_android_icon_adaptive_ldpi": "${base_options_dir}/android/icons_adaptive/ldpi.png", + "option_android_icon_adaptive_mdpi": "${base_options_dir}/android/icons_adaptive/mdpi.png", + "option_android_icon_adaptive_hdpi": "${base_options_dir}/android/icons_adaptive/hdpi.png", + "option_android_icon_adaptive_xhdpi": "${base_options_dir}/android/icons_adaptive/xhdpi.png", + "option_android_icon_adaptive_xxhdpi": "${base_options_dir}/android/icons_adaptive/xxhdpi.png", + "option_android_icon_adaptive_xxxhdpi": "${base_options_dir}/android/icons_adaptive/xxxhdpi.png", + "option_android_icon_adaptivebg_ldpi": "${base_options_dir}/android/icons_adaptivebg/ldpi.png", + "option_android_icon_adaptivebg_mdpi": "${base_options_dir}/android/icons_adaptivebg/mdpi.png", + "option_android_icon_adaptivebg_hdpi": "${base_options_dir}/android/icons_adaptivebg/hdpi.png", + "option_android_icon_adaptivebg_xhdpi": "${base_options_dir}/android/icons_adaptivebg/xhdpi.png", + "option_android_icon_adaptivebg_xxhdpi": "${base_options_dir}/android/icons_adaptivebg/xxhdpi.png", + "option_android_icon_adaptivebg_xxxhdpi": "${base_options_dir}/android/icons_adaptivebg/xxxhdpi.png", + "option_android_use_facebook": false, + "option_android_facebook_id": "", + "option_android_facebook_app_display_name": "", + "option_android_google_cloud_saving": false, + "option_android_google_services_app_id": "", + "option_android_permission_write_external_storage": false, + "option_android_permission_read_phone_state": false, + "option_android_permission_network_state": false, + "option_android_permission_internet": true, + "option_android_permission_bluetooth": true, + "option_android_permission_record_audio": false, + "option_android_application_tag_inject": "", + "option_android_attribute_allow_backup": false, + "option_android_google_apk_expansion": false, + "option_android_google_dynamic_asset_delivery": false, + "option_android_google_licensing_public_key": "", + "option_android_tv_isgame": true, + "option_android_tv_supports_leanback": true, + "option_android_proguard_minifying": false, + "option_android_proguard_shrinking": false, +} \ No newline at end of file diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy index 998025c..dcd3b69 100644 --- a/options/html5/options_html5.yy +++ b/options/html5/options_html5.yy @@ -1,39 +1,33 @@ { - "id": "75ac291e-7061-4bcb-8e8a-3b3545332d41", - "modelName": "GMHtml5Options", - "mvc": "1.0", - "name": "HTML5", - "option_html5_allow_fullscreen": true, - "option_html5_browser_title": "Made in GameMaker Studio 2", - "option_html5_centregame": false, - "option_html5_display_cursor": true, - "option_html5_facebook_app_display_name": "", - "option_html5_facebook_id": "", - "option_html5_flurry_enable": false, - "option_html5_flurry_id": "", - "option_html5_foldername": "html5game", - "option_html5_google_analytics_enable": false, - "option_html5_google_tracking_id": "", - "option_html5_icon": "${base_options_dir}\/html5\/fav.ico", - "option_html5_index": "", - "option_html5_interpolate_pixels": false, - "option_html5_jsprepend": "", - "option_html5_loadingbar": "", - "option_html5_localrunalert": true, - "option_html5_outputdebugtoconsole": true, - "option_html5_outputname": "index.html", - "option_html5_scale": 0, - "option_html5_splash_png": "${base_options_dir}\/html5\/splash.png", - "option_html5_texture_page": "2048x2048", - "option_html5_use_facebook": false, - "option_html5_usebuiltinfont": false, - "option_html5_usebuiltinparticles": true, - "option_html5_usesplash": false, - "option_html5_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - }, - "option_html5_webgl": 2 + "resourceType": "GMHtml5Options", + "resourceVersion": "1.0", + "name": "HTML5", + "option_html5_browser_title": "Made in GameMaker Studio 2", + "option_html5_version": "1.0.0.0", + "option_html5_foldername": "html5game", + "option_html5_outputname": "index.html", + "option_html5_splash_png": "${base_options_dir}/html5/splash.png", + "option_html5_usesplash": false, + "option_html5_outputdebugtoconsole": true, + "option_html5_display_cursor": true, + "option_html5_localrunalert": true, + "option_html5_index": "", + "option_html5_loadingbar": "", + "option_html5_jsprepend": "", + "option_html5_icon": "${base_options_dir}/html5/fav.ico", + "option_html5_allow_fullscreen": true, + "option_html5_interpolate_pixels": false, + "option_html5_centregame": false, + "option_html5_usebuiltinparticles": true, + "option_html5_usebuiltinfont": false, + "option_html5_webgl": 2, + "option_html5_scale": 0, + "option_html5_texture_page": "2048x2048", + "option_html5_use_facebook": false, + "option_html5_facebook_id": "", + "option_html5_facebook_app_display_name": "", + "option_html5_flurry_enable": false, + "option_html5_flurry_id": "", + "option_html5_google_analytics_enable": false, + "option_html5_google_tracking_id": "", } \ No newline at end of file diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy new file mode 100644 index 0000000..64c726b --- /dev/null +++ b/options/ios/options_ios.yy @@ -0,0 +1,46 @@ +{ + "resourceType": "GMiOSOptions", + "resourceVersion": "1.3", + "name": "iOS", + "option_ios_display_name": "Created with GameMaker", + "option_ios_bundle_name": "com.company.game", + "option_ios_version": "1.0.0.0", + "option_ios_output_dir": "~/gamemakerstudio2", + "option_ios_team_id": "", + "option_ios_min_version": "10.0", + "option_ios_cocoapods_checkbox": true, + "option_ios_orientation_portrait": true, + "option_ios_orientation_portrait_flipped": true, + "option_ios_orientation_landscape": true, + "option_ios_orientation_landscape_flipped": true, + "option_ios_devices": 2, + "option_ios_defer_home_indicator": false, + "option_ios_icon_iphone_app_120": "${base_options_dir}/ios/icons/app/iphone_120.png", + "option_ios_icon_iphone_app_180": "${base_options_dir}/ios/icons/app/iphone_180.png", + "option_ios_icon_ipad_app_76": "${base_options_dir}/ios/icons/app/ipad_76.png", + "option_ios_icon_ipad_app_152": "${base_options_dir}/ios/icons/app/ipad_152.png", + "option_ios_icon_ipad_pro_app_167": "${base_options_dir}/ios/icons/app/ipad_pro_167.png", + "option_ios_icon_iphone_notification_40": "${base_options_dir}/ios/icons/notification/iphone_40.png", + "option_ios_icon_iphone_notification_60": "${base_options_dir}/ios/icons/notification/iphone_60.png", + "option_ios_icon_ipad_notification_20": "${base_options_dir}/ios/icons/notification/ipad_20.png", + "option_ios_icon_ipad_notification_40": "${base_options_dir}/ios/icons/notification/ipad_40.png", + "option_ios_icon_iphone_spotlight_80": "${base_options_dir}/ios/icons/spotlight/iphone_80.png", + "option_ios_icon_iphone_spotlight_120": "${base_options_dir}/ios/icons/spotlight/iphone_120.png", + "option_ios_icon_ipad_spotlight_40": "${base_options_dir}/ios/icons/spotlight/ipad_40.png", + "option_ios_icon_ipad_spotlight_80": "${base_options_dir}/ios/icons/spotlight/ipad_80.png", + "option_ios_icon_iphone_settings_58": "${base_options_dir}/ios/icons/settings/iphone_58.png", + "option_ios_icon_iphone_settings_87": "${base_options_dir}/ios/icons/settings/iphone_87.png", + "option_ios_icon_ipad_settings_29": "${base_options_dir}/ios/icons/settings/ipad_29.png", + "option_ios_icon_ipad_settings_58": "${base_options_dir}/ios/icons/settings/ipad_58.png", + "option_ios_icon_itunes_artwork_1024": "${base_options_dir}/ios/icons/itunes/itunes_1024.png", + "option_ios_splashscreen_background_colour": 255, + "option_ios_launchscreen_image": "${base_options_dir}/ios/splash/launchscreen.png", + "option_ios_launchscreen_image_landscape": "${base_options_dir}/ios/splash/launchscreen-landscape.png", + "option_ios_launchscreen_fill": 0, + "option_ios_interpolate_pixels": false, + "option_ios_half_ipad1_textures": false, + "option_ios_scale": 0, + "option_ios_texture_page": "2048x2048", + "option_ios_podfile_path": "${options_dir}/ios/Podfile", + "option_ios_podfile_lock_path": "${options_dir}/ios/Podfile.lock", +} \ No newline at end of file diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy index 420f04b..84b09c8 100644 --- a/options/linux/options_linux.yy +++ b/options/linux/options_linux.yy @@ -1,30 +1,24 @@ { - "id": "a9188620-a624-4a5a-83ae-a1b53faf038b", - "modelName": "GMLinuxOptions", - "mvc": "1.0", - "name": "Linux", - "option_linux_allow_fullscreen": false, - "option_linux_disable_sandbox": false, - "option_linux_display_cursor": true, - "option_linux_display_name": "Made in GameMaker Studio 2", - "option_linux_display_splash": false, - "option_linux_enable_steam": false, - "option_linux_homepage": "http:\/\/www.yoyogames.com", - "option_linux_icon": "${base_options_dir}\/linux\/icons\/64.png", - "option_linux_interpolate_pixels": false, - "option_linux_long_desc": "", - "option_linux_maintainer_email": "", - "option_linux_resize_window": false, - "option_linux_scale": 0, - "option_linux_short_desc": "", - "option_linux_splash_screen": "${base_options_dir}\/linux\/splash\/splash.png", - "option_linux_start_fullscreen": false, - "option_linux_sync": false, - "option_linux_texture_page": "2048x2048", - "option_linux_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - } + "resourceType": "GMLinuxOptions", + "resourceVersion": "1.0", + "name": "Linux", + "option_linux_display_name": "Made in GameMaker Studio 2", + "option_linux_version": "1.0.0.0", + "option_linux_maintainer_email": "", + "option_linux_homepage": "http://www.yoyogames.com", + "option_linux_short_desc": "", + "option_linux_long_desc": "", + "option_linux_splash_screen": "${base_options_dir}/linux/splash/splash.png", + "option_linux_display_splash": false, + "option_linux_icon": "${base_options_dir}/linux/icons/64.png", + "option_linux_start_fullscreen": false, + "option_linux_allow_fullscreen": false, + "option_linux_interpolate_pixels": false, + "option_linux_display_cursor": true, + "option_linux_sync": false, + "option_linux_resize_window": false, + "option_linux_scale": 0, + "option_linux_texture_page": "2048x2048", + "option_linux_enable_steam": false, + "option_linux_disable_sandbox": false, } \ No newline at end of file diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy index 0dfeb89..8e2b3ad 100644 --- a/options/mac/options_mac.yy +++ b/options/mac/options_mac.yy @@ -1,36 +1,35 @@ { - "id": "f418569b-3bdd-4706-a0e4-364317f54032", - "modelName": "GMMacOptions", - "mvc": "1.0", - "name": "macOS", - "option_mac_allow_fullscreen": false, - "option_mac_allow_incoming_network": false, - "option_mac_allow_outgoing_network": false, - "option_mac_app_category": "Games", - "option_mac_app_id": "com.company.game", - "option_mac_build_app_store": false, - "option_mac_copyright": "(c) 2018 CompanyName", - "option_mac_disable_sandbox": false, - "option_mac_display_cursor": true, - "option_mac_display_name": "Made in GameMaker Studio 2", - "option_mac_enable_retina": false, - "option_mac_enable_steam": false, - "option_mac_icon_png": "${base_options_dir}\/mac\/icons\/1024.png", - "option_mac_interpolate_pixels": false, - "option_mac_menu_dock": false, - "option_mac_output_dir": "~\/GameMakerStudio2\/Mac", - "option_mac_resize_window": false, - "option_mac_scale": 0, - "option_mac_signing_identity": "Developer ID Application:", - "option_mac_splash_png": "${base_options_dir}\/mac\/splash\/splash.png", - "option_mac_start_fullscreen": false, - "option_mac_team_id": null, - "option_mac_texture_page": "2048x2048", - "option_mac_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - }, - "option_mac_vsync": false + "resourceType": "GMMacOptions", + "resourceVersion": "1.0", + "name": "macOS", + "option_mac_display_name": "Made in GameMaker Studio 2", + "option_mac_app_id": "com.company.game", + "option_mac_version": "1.0.0.0", + "option_mac_output_dir": "~/GameMakerStudio2/Mac", + "option_mac_team_id": null, + "option_mac_signing_identity": "Developer ID Application:", + "option_mac_copyright": "(c) 2018 CompanyName", + "option_mac_splash_png": "${base_options_dir}/mac/splash/splash.png", + "option_mac_icon_png": "${base_options_dir}/mac/icons/1024.png", + "option_mac_installer_background_png": "${base_options_dir}/mac/splash/installer_background.png", + "option_mac_menu_dock": false, + "option_mac_display_cursor": true, + "option_mac_start_fullscreen": false, + "option_mac_allow_fullscreen": false, + "option_mac_interpolate_pixels": false, + "option_mac_vsync": false, + "option_mac_resize_window": false, + "option_mac_enable_retina": false, + "option_mac_scale": 0, + "option_mac_texture_page": "2048x2048", + "option_mac_build_app_store": false, + "option_mac_allow_incoming_network": false, + "option_mac_allow_outgoing_network": false, + "option_mac_app_category": "Games", + "option_mac_enable_steam": false, + "option_mac_disable_sandbox": false, + "option_mac_x86_64": true, + "option_mac_arm64": true, + "option_mac_apple_sign_in": false, + "option_mac_min_version": null, } \ No newline at end of file diff --git a/options/main/options_main.yy b/options/main/options_main.yy new file mode 100644 index 0000000..f1ed668 --- /dev/null +++ b/options/main/options_main.yy @@ -0,0 +1,20 @@ +{ + "resourceType": "GMMainOptions", + "resourceVersion": "1.4", + "name": "Main", + "option_gameguid": "599c2376-7b68-407b-8957-5875ba486d7c", + "option_gameid": "", + "option_game_speed": 30, + "option_mips_for_3d_textures": false, + "option_draw_colour": 4294967295, + "option_window_colour": 255, + "option_steam_app_id": "0", + "option_sci_usesci": false, + "option_author": "", + "option_collision_compatibility": false, + "option_copy_on_write_enabled": false, + "option_spine_licence": false, + "option_template_image": "${base_options_dir}/main/template_image.png", + "option_template_icon": "${base_options_dir}/main/template_icon.png", + "option_template_description": null, +} \ No newline at end of file diff --git a/options/operagx/options_operagx.yy b/options/operagx/options_operagx.yy new file mode 100644 index 0000000..9571f96 --- /dev/null +++ b/options/operagx/options_operagx.yy @@ -0,0 +1,18 @@ +{ + "resourceType": "GMOperaGXOptions", + "resourceVersion": "1.0", + "name": "operagx", + "option_operagx_version": "1.0.0.0", + "option_operagx_next_version": "1.0.0.0", + "option_operagx_game_name": "${project_name}", + "option_operagx_interpolate_pixels": true, + "option_operagx_scale": 0, + "option_operagx_texture_page": "2048x2048", + "option_operagx_display_cursor": true, + "option_operagx_guid": "", + "option_operagx_team_name": "", + "option_operagx_team_id": "", + "option_operagx_editUrl": "", + "option_operagx_internalShareUrl": "", + "option_operagx_publicShareUrl": "", +} \ No newline at end of file diff --git a/options/tvos/options_tvos.yy b/options/tvos/options_tvos.yy new file mode 100644 index 0000000..4dca9da --- /dev/null +++ b/options/tvos/options_tvos.yy @@ -0,0 +1,28 @@ +{ + "resourceType": "GMtvOSOptions", + "resourceVersion": "1.3", + "name": "tvOS", + "option_tvos_display_name": "Made in GameMaker", + "option_tvos_bundle_name": "com.company.game", + "option_tvos_version": "1.0.0.0", + "option_tvos_output_dir": "~/GameMakerStudio2/tvOS", + "option_tvos_team_id": "", + "option_tvos_min_version": "10.0", + "option_tvos_cocoapods_checkbox": true, + "option_tvos_icon_400": "${base_options_dir}/tvos/icons/400.png", + "option_tvos_icon_400_2x": "${base_options_dir}/tvos/icons/400_2x.png", + "option_tvos_icon_1280": "${base_options_dir}/tvos/icons/1280.png", + "option_tvos_topshelf": "${base_options_dir}/tvos/topshelf/topshelf.png", + "option_tvos_topshelf_2x": "${base_options_dir}/tvos/topshelf/topshelf_2x.png", + "option_tvos_topshelf_wide": "${base_options_dir}/tvos/topshelf/topshelf_wide.png", + "option_tvos_topshelf_wide_2x": "${base_options_dir}/tvos/topshelf/topshelf_wide_2x.png", + "option_tvos_splashscreen": "${base_options_dir}/tvos/splash/splash.png", + "option_tvos_splashscreen_2x": "${base_options_dir}/tvos/splash/splash_2x.png", + "option_tvos_splash_time": 0, + "option_tvos_interpolate_pixels": true, + "option_tvos_scale": 0, + "option_tvos_texture_page": "2048x2048", + "option_tvos_display_cursor": false, + "option_tvos_podfile_path": "${options_dir}\\tvos\\Podfile", + "option_tvos_podfile_lock_path": "${options_dir}\\tvos\\Podfile.lock", +} \ No newline at end of file diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy index 7289c2d..015f253 100644 --- a/options/windows/options_windows.yy +++ b/options/windows/options_windows.yy @@ -1,40 +1,34 @@ { - "id": "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "modelName": "GMWindowsOptions", - "mvc": "1.0", - "name": "Windows", - "option_windows_allow_fullscreen_switching": false, - "option_windows_borderless": false, - "option_windows_company_info": "YoYo Games Ltd", - "option_windows_copy_exe_to_dest": false, - "option_windows_copyright_info": "(c) 2018 CompanyName", - "option_windows_description_info": "A GameMaker Studio 2 Game", - "option_windows_disable_sandbox": false, - "option_windows_display_cursor": true, - "option_windows_display_name": "Made in GameMaker Studio 2", - "option_windows_enable_steam": false, - "option_windows_executable_name": "${project_name}", - "option_windows_icon": "${base_options_dir}\\windows\\icons\\icon.ico", - "option_windows_installer_finished": "${base_options_dir}\\windows\\installer\\finished.bmp", - "option_windows_installer_header": "${base_options_dir}\\windows\\installer\\header.bmp", - "option_windows_interpolate_pixels": false, - "option_windows_license": "${base_options_dir}\\windows\\installer\\license.txt", - "option_windows_nsis_file": "${base_options_dir}\\windows\\installer\\nsis_script.nsi", - "option_windows_product_info": "Made in GameMaker Studio 2", - "option_windows_resize_window": false, - "option_windows_save_location": 0, - "option_windows_scale": 0, - "option_windows_sleep_margin": 10, - "option_windows_splash_screen": "${base_options_dir}\\windows\\splash\\splash.png", - "option_windows_start_fullscreen": false, - "option_windows_steam_use_alternative_launcher": false, - "option_windows_texture_page": "2048x2048", - "option_windows_use_splash": false, - "option_windows_version": { - "build": 0, - "major": 1, - "minor": 0, - "revision": 0 - }, - "option_windows_vsync": false + "resourceType": "GMWindowsOptions", + "resourceVersion": "1.1", + "name": "Windows", + "option_windows_display_name": "Made in GameMaker Studio 2", + "option_windows_executable_name": "${project_name}", + "option_windows_version": "1.0.0.0", + "option_windows_company_info": "YoYo Games Ltd", + "option_windows_product_info": "Made in GameMaker Studio 2", + "option_windows_copyright_info": "(c) 2018 CompanyName", + "option_windows_description_info": "A GameMaker Studio 2 Game", + "option_windows_display_cursor": true, + "option_windows_icon": "${base_options_dir}/windows/icons/icon.ico", + "option_windows_save_location": 0, + "option_windows_splash_screen": "${base_options_dir}/windows/splash/splash.png", + "option_windows_use_splash": false, + "option_windows_start_fullscreen": false, + "option_windows_allow_fullscreen_switching": false, + "option_windows_interpolate_pixels": false, + "option_windows_vsync": false, + "option_windows_resize_window": false, + "option_windows_borderless": false, + "option_windows_scale": 0, + "option_windows_copy_exe_to_dest": false, + "option_windows_sleep_margin": 10, + "option_windows_texture_page": "2048x2048", + "option_windows_installer_finished": "${base_options_dir}/windows/installer/finished.bmp", + "option_windows_installer_header": "${base_options_dir}/windows/installer/header.bmp", + "option_windows_license": "${base_options_dir}/windows/installer/license.txt", + "option_windows_nsis_file": "${base_options_dir}/windows/installer/nsis_script.nsi", + "option_windows_enable_steam": false, + "option_windows_disable_sandbox": false, + "option_windows_steam_use_alternative_launcher": false, } \ No newline at end of file diff --git a/rooms/rTest/rTest.yy b/rooms/rTest/rTest.yy new file mode 100644 index 0000000..8ecd3fb --- /dev/null +++ b/rooms/rTest/rTest.yy @@ -0,0 +1,55 @@ +{ + "resourceType": "GMRoom", + "resourceVersion": "1.0", + "name": "rTest", + "isDnd": false, + "volume": 1.0, + "parentRoom": null, + "views": [ + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"objectId":null,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"objectId":null,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"objectId":null,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"objectId":null,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"objectId":null,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"objectId":null,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"objectId":null,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,}, + {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"objectId":null,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,}, + ], + "layers": [ + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","instances":[ + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_2F06D71D","properties":[],"isDnd":false,"objectId":{"name":"oCamera","path":"objects/oCamera/oCamera.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":0.0,"y":0.0,}, + ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritVisibility":true,"inheritSubLayers":true,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","spriteId":null,"colour":4287933618,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritVisibility":true,"inheritSubLayers":true,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, + ], + "inheritLayers": false, + "creationCodeFile": "", + "inheritCode": false, + "instanceCreationOrder": [ + {"name":"inst_2F06D71D","path":"rooms/rTest/rTest.yy",}, + ], + "inheritCreationOrder": false, + "sequenceId": null, + "roomSettings": { + "inheritRoomSettings": false, + "Width": 1366, + "Height": 768, + "persistent": false, + }, + "viewSettings": { + "inheritViewSettings": false, + "enableViews": false, + "clearViewBackground": false, + "clearDisplayBuffer": true, + }, + "physicsSettings": { + "inheritPhysicsSettings": false, + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0.0, + "PhysicsWorldGravityY": 10.0, + "PhysicsWorldPixToMetres": 0.1, + }, + "parent": { + "name": "Matrices", + "path": "Matrices.yyp", + }, +} \ No newline at end of file diff --git a/scripts/MatrixBuildRotationAxis/MatrixBuildRotationAxis.gml b/scripts/MatrixBuildRotationAxis/MatrixBuildRotationAxis.gml new file mode 100644 index 0000000..392b86a --- /dev/null +++ b/scripts/MatrixBuildRotationAxis/MatrixBuildRotationAxis.gml @@ -0,0 +1,36 @@ +/// @param x +/// @param y +/// @param z +/// @param angle + +function MatrixBuildRotationAxis(_x, _y, _z, _angle) +{ + var _cos = dcos(-_angle); + var _sin = dsin(-_angle); + var _one_minus_cos = 1.0 - _cos; + + var _d = 1/sqrt(_x*_x + _y*_y + _z*_z); + _x *= _d; + _y *= _d; + _z *= _d; + + var _matrix; + + _matrix[@ 15] = 1; + + _matrix[@ 0] = _one_minus_cos*_x*_x + _cos; + _matrix[@ 1] = _one_minus_cos*_x*_y + _sin*_z; + _matrix[@ 2] = _one_minus_cos*_x*_z - _sin*_y; + + _matrix[@ 4] = _one_minus_cos*_x*_y - _sin*_z; + _matrix[@ 5] = _one_minus_cos*_y*_y + _cos; + _matrix[@ 6] = _one_minus_cos*_y*_z + _sin*_x; + + _matrix[@ 8] = _one_minus_cos*_x*_z + _sin*_y; + _matrix[@ 9] = _one_minus_cos*_y*_z - _sin*_x; + _matrix[@ 10] = _one_minus_cos*_z*_z + _cos; + + return _matrix; + + +} diff --git a/scripts/MatrixBuildRotationAxis/MatrixBuildRotationAxis.yy b/scripts/MatrixBuildRotationAxis/MatrixBuildRotationAxis.yy new file mode 100644 index 0000000..54095a3 --- /dev/null +++ b/scripts/MatrixBuildRotationAxis/MatrixBuildRotationAxis.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixBuildRotationAxis", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/MatrixBuildTransform2D/MatrixBuildTransform2D.gml b/scripts/MatrixBuildTransform2D/MatrixBuildTransform2D.gml new file mode 100644 index 0000000..7a7ae8a --- /dev/null +++ b/scripts/MatrixBuildTransform2D/MatrixBuildTransform2D.gml @@ -0,0 +1,10 @@ +/// @param x +/// @param y +/// @param angle + +function MatrixBuildTransform2D(_x, _y, _angle) +{ + var _matrix = matrix_multiply(matrix_get(matrix_world), matrix_build(_x, _y, 0, 0, 0, _angle, 1, 1, 1)); + matrix_set(matrix_world, _matrix); + return _matrix; +} \ No newline at end of file diff --git a/scripts/MatrixBuildTransform2D/MatrixBuildTransform2D.yy b/scripts/MatrixBuildTransform2D/MatrixBuildTransform2D.yy new file mode 100644 index 0000000..9f92296 --- /dev/null +++ b/scripts/MatrixBuildTransform2D/MatrixBuildTransform2D.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixBuildTransform2D", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/MatrixFlipX/MatrixFlipX.gml b/scripts/MatrixFlipX/MatrixFlipX.gml new file mode 100644 index 0000000..271b06c --- /dev/null +++ b/scripts/MatrixFlipX/MatrixFlipX.gml @@ -0,0 +1,10 @@ +/// @param matrix + +function MatrixFlipX(_matrix) +{ + _matrix[@ 0] = -_matrix[ 0]; + _matrix[@ 4] = -_matrix[ 4]; + _matrix[@ 8] = -_matrix[ 8]; + _matrix[@ 12] = -_matrix[12]; + return _matrix; +} \ No newline at end of file diff --git a/scripts/MatrixFlipX/MatrixFlipX.yy b/scripts/MatrixFlipX/MatrixFlipX.yy new file mode 100644 index 0000000..dd98963 --- /dev/null +++ b/scripts/MatrixFlipX/MatrixFlipX.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixFlipX", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/MatrixFlipY/MatrixFlipY.gml b/scripts/MatrixFlipY/MatrixFlipY.gml new file mode 100644 index 0000000..c2140ff --- /dev/null +++ b/scripts/MatrixFlipY/MatrixFlipY.gml @@ -0,0 +1,10 @@ +/// @param matrix + +function MatrixFlipY(_matrix) +{ + _matrix[@ 1] = -_matrix[ 1]; + _matrix[@ 5] = -_matrix[ 5]; + _matrix[@ 9] = -_matrix[ 9]; + _matrix[@ 13] = -_matrix[13]; + return _matrix; +} \ No newline at end of file diff --git a/scripts/MatrixFlipY/MatrixFlipY.yy b/scripts/MatrixFlipY/MatrixFlipY.yy new file mode 100644 index 0000000..e7003d0 --- /dev/null +++ b/scripts/MatrixFlipY/MatrixFlipY.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixFlipY", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/MatrixInverse/MatrixInverse.gml b/scripts/MatrixInverse/MatrixInverse.gml new file mode 100644 index 0000000..34cd846 --- /dev/null +++ b/scripts/MatrixInverse/MatrixInverse.gml @@ -0,0 +1,165 @@ +/// @desc Returns the inverse of a 4x4 matrix +/// +/// @param matrix 4x4 matrix to calcuate the inverse of + +function MatrixInverse(_matrix) +{ + var _matrix00 = _matrix[ 0]; + var _matrix01 = _matrix[ 1]; + var _matrix02 = _matrix[ 2]; + var _matrix03 = _matrix[ 3]; + var _matrix04 = _matrix[ 4]; + var _matrix05 = _matrix[ 5]; + var _matrix06 = _matrix[ 6]; + var _matrix07 = _matrix[ 7]; + var _matrix08 = _matrix[ 8]; + var _matrix09 = _matrix[ 9]; + var _matrix10 = _matrix[10]; + var _matrix11 = _matrix[11]; + var _matrix12 = _matrix[12]; + var _matrix13 = _matrix[13]; + var _matrix14 = _matrix[14]; + var _matrix15 = _matrix[15]; + + var _inv = array_create(16, undefined); + + _inv[@ 0] = _matrix05*_matrix10*_matrix15 - + _matrix05*_matrix11*_matrix14 - + _matrix09*_matrix06*_matrix15 + + _matrix09*_matrix07*_matrix14 + + _matrix13*_matrix06*_matrix11 - + _matrix13*_matrix07*_matrix10; + + _inv[@ 4] = -_matrix04*_matrix10*_matrix15 + + _matrix04*_matrix11*_matrix14 + + _matrix08*_matrix06*_matrix15 - + _matrix08*_matrix07*_matrix14 - + _matrix12*_matrix06*_matrix11 + + _matrix12*_matrix07*_matrix10; + + _inv[@ 8] = _matrix04*_matrix09*_matrix15 - + _matrix04*_matrix11*_matrix13 - + _matrix08*_matrix05*_matrix15 + + _matrix08*_matrix07*_matrix13 + + _matrix12*_matrix05*_matrix11 - + _matrix12*_matrix07*_matrix09; + + _inv[@ 12] = -_matrix04*_matrix09*_matrix14 + + _matrix04*_matrix10*_matrix13 + + _matrix08*_matrix05*_matrix14 - + _matrix08*_matrix06*_matrix13 - + _matrix12*_matrix05*_matrix10 + + _matrix12*_matrix06*_matrix09; + + _inv[@ 1] = -_matrix01*_matrix10*_matrix15 + + _matrix01*_matrix11*_matrix14 + + _matrix09*_matrix02*_matrix15 - + _matrix09*_matrix03*_matrix14 - + _matrix13*_matrix02*_matrix11 + + _matrix13*_matrix03*_matrix10; + + _inv[@ 5] = _matrix00*_matrix10*_matrix15 - + _matrix00*_matrix11*_matrix14 - + _matrix08*_matrix02*_matrix15 + + _matrix08*_matrix03*_matrix14 + + _matrix12*_matrix02*_matrix11 - + _matrix12*_matrix03*_matrix10; + + _inv[@ 9] = -_matrix00*_matrix09*_matrix15 + + _matrix00*_matrix11*_matrix13 + + _matrix08*_matrix01*_matrix15 - + _matrix08*_matrix03*_matrix13 - + _matrix12*_matrix01*_matrix11 + + _matrix12*_matrix03*_matrix09; + + _inv[@ 13] = _matrix00*_matrix09*_matrix14 - + _matrix00*_matrix10*_matrix13 - + _matrix08*_matrix01*_matrix14 + + _matrix08*_matrix02*_matrix13 + + _matrix12*_matrix01*_matrix10 - + _matrix12*_matrix02*_matrix09; + + _inv[@ 2] = _matrix01*_matrix06*_matrix15 - + _matrix01*_matrix07*_matrix14 - + _matrix05*_matrix02*_matrix15 + + _matrix05*_matrix03*_matrix14 + + _matrix13*_matrix02*_matrix07 - + _matrix13*_matrix03*_matrix06; + + _inv[@ 6] = -_matrix00*_matrix06*_matrix15 + + _matrix00*_matrix07*_matrix14 + + _matrix04*_matrix02*_matrix15 - + _matrix04*_matrix03*_matrix14 - + _matrix12*_matrix02*_matrix07 + + _matrix12*_matrix03*_matrix06; + + _inv[@ 10] = _matrix00*_matrix05*_matrix15 - + _matrix00*_matrix07*_matrix13 - + _matrix04*_matrix01*_matrix15 + + _matrix04*_matrix03*_matrix13 + + _matrix12*_matrix01*_matrix07 - + _matrix12*_matrix03*_matrix05; + + _inv[@ 14] = -_matrix00*_matrix05*_matrix14 + + _matrix00*_matrix06*_matrix13 + + _matrix04*_matrix01*_matrix14 - + _matrix04*_matrix02*_matrix13 - + _matrix12*_matrix01*_matrix06 + + _matrix12*_matrix02*_matrix05; + + _inv[@ 3] = -_matrix01*_matrix06*_matrix11 + + _matrix01*_matrix07*_matrix10 + + _matrix05*_matrix02*_matrix11 - + _matrix05*_matrix03*_matrix10 - + _matrix09*_matrix02*_matrix07 + + _matrix09*_matrix03*_matrix06; + + _inv[@ 7] = _matrix00*_matrix06*_matrix11 - + _matrix00*_matrix07*_matrix10 - + _matrix04*_matrix02*_matrix11 + + _matrix04*_matrix03*_matrix10 + + _matrix08*_matrix02*_matrix07 - + _matrix08*_matrix03*_matrix06; + + _inv[@ 11] = -_matrix00*_matrix05*_matrix11 + + _matrix00*_matrix07*_matrix09 + + _matrix04*_matrix01*_matrix11 - + _matrix04*_matrix03*_matrix09 - + _matrix08*_matrix01*_matrix07 + + _matrix08*_matrix03*_matrix05; + + _inv[@ 15] = _matrix00*_matrix05*_matrix10 - + _matrix00*_matrix06*_matrix09 - + _matrix04*_matrix01*_matrix10 + + _matrix04*_matrix02*_matrix09 + + _matrix08*_matrix01*_matrix06 - + _matrix08*_matrix02*_matrix05; + + var _det = _matrix00*_inv[0] + _matrix01*_inv[4] + _matrix02*_inv[8] + _matrix03*_inv[12]; + if (_det == 0) + { + show_debug_message("Determinant of the matrix is zero:" + MatrixString(_matrix, " |")); + return _matrix; + } + + _det = 1 / _det; + + _inv[@ 0] *= _det; + _inv[@ 1] *= _det; + _inv[@ 2] *= _det; + _inv[@ 3] *= _det; + _inv[@ 4] *= _det; + _inv[@ 5] *= _det; + _inv[@ 6] *= _det; + _inv[@ 7] *= _det; + _inv[@ 8] *= _det; + _inv[@ 9] *= _det; + _inv[@ 10] *= _det; + _inv[@ 11] *= _det; + _inv[@ 12] *= _det; + _inv[@ 13] *= _det; + _inv[@ 14] *= _det; + _inv[@ 15] *= _det; + + return _inv; +} \ No newline at end of file diff --git a/scripts/MatrixInverse/MatrixInverse.yy b/scripts/MatrixInverse/MatrixInverse.yy new file mode 100644 index 0000000..2d2f3d1 --- /dev/null +++ b/scripts/MatrixInverse/MatrixInverse.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixInverse", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/MatrixMultiply/MatrixMultiply.gml b/scripts/MatrixMultiply/MatrixMultiply.gml new file mode 100644 index 0000000..a1a1041 --- /dev/null +++ b/scripts/MatrixMultiply/MatrixMultiply.gml @@ -0,0 +1,9 @@ +/// @param matrix +/// @param [target=world] + +function MatrixMultiply(_matrix, _target = matrix_world) +{ + _matrix = matrix_multiply(matrix_get(_target), _matrix); + matrix_set(_target, _matrix); + return _matrix; +} \ No newline at end of file diff --git a/scripts/MatrixMultiply/MatrixMultiply.yy b/scripts/MatrixMultiply/MatrixMultiply.yy new file mode 100644 index 0000000..6ef351b --- /dev/null +++ b/scripts/MatrixMultiply/MatrixMultiply.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixMultiply", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/MatrixReset/MatrixReset.gml b/scripts/MatrixReset/MatrixReset.gml new file mode 100644 index 0000000..98b5540 --- /dev/null +++ b/scripts/MatrixReset/MatrixReset.gml @@ -0,0 +1,7 @@ +/// @param [target=world] + +function MatrixReset(_target = matrix_world) +{ + static _identityMatrix = matrix_build_identity(); + matrix_set(_target, _identityMatrix); +} \ No newline at end of file diff --git a/scripts/MatrixReset/MatrixReset.yy b/scripts/MatrixReset/MatrixReset.yy new file mode 100644 index 0000000..e4d7022 --- /dev/null +++ b/scripts/MatrixReset/MatrixReset.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixReset", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/MatrixSet/MatrixSet.gml b/scripts/MatrixSet/MatrixSet.gml new file mode 100644 index 0000000..c61858e --- /dev/null +++ b/scripts/MatrixSet/MatrixSet.gml @@ -0,0 +1,7 @@ +/// @param matrix +/// @param [target=world] + +function MatrixSet(_matrix, _target = matrix_world) +{ + matrix_set(_target, _matrix); +} \ No newline at end of file diff --git a/scripts/MatrixSet/MatrixSet.yy b/scripts/MatrixSet/MatrixSet.yy new file mode 100644 index 0000000..5e20a99 --- /dev/null +++ b/scripts/MatrixSet/MatrixSet.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixSet", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/MatrixString/MatrixString.gml b/scripts/MatrixString/MatrixString.gml new file mode 100644 index 0000000..6d8347b --- /dev/null +++ b/scripts/MatrixString/MatrixString.gml @@ -0,0 +1,13 @@ +/// Returns a string containing the contents of a 4x4 matrix +/// This function gives greater decimal accuracy which is useful when dealing with real-world matrices +/// +/// @param matrix 4x4 matrix to stringify +/// @param [newlineChar] Character to use for each newline. If not provided, this will default to \n + +function MatrixString(_matrix, _newline = "\n") +{ + return string_format(_matrix[ 0], 2, 5) + "," + string_format(_matrix[ 1], 2, 5) + "," + string_format(_matrix[ 2], 2, 5) + "," + string_format(_matrix[ 3], 2, 5) + _newline + + string_format(_matrix[ 4], 2, 5) + "," + string_format(_matrix[ 5], 2, 5) + "," + string_format(_matrix[ 6], 2, 5) + "," + string_format(_matrix[ 7], 2, 5) + _newline + + string_format(_matrix[ 8], 2, 5) + "," + string_format(_matrix[ 9], 2, 5) + "," + string_format(_matrix[10], 2, 5) + "," + string_format(_matrix[11], 2, 5) + _newline + + string_format(_matrix[12], 2, 5) + "," + string_format(_matrix[13], 2, 5) + "," + string_format(_matrix[14], 2, 5) + "," + string_format(_matrix[15], 2, 5); +} \ No newline at end of file diff --git a/scripts/MatrixString/MatrixString.yy b/scripts/MatrixString/MatrixString.yy new file mode 100644 index 0000000..bbddbab --- /dev/null +++ b/scripts/MatrixString/MatrixString.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixString", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/MatrixTransformVertexExt/MatrixTransformVertexExt.gml b/scripts/MatrixTransformVertexExt/MatrixTransformVertexExt.gml new file mode 100644 index 0000000..c8fba41 --- /dev/null +++ b/scripts/MatrixTransformVertexExt/MatrixTransformVertexExt.gml @@ -0,0 +1,18 @@ +/// Transforms a vec4 by the given 4x4 matrix and returns the resulting vec4 +/// This is an improvement of GameMaker's native matrix_transform_vertex() as this function allows an input w-component to be specified and returns a vec4 +/// +/// @param matrix Matrix to use for the transformation +/// @param x x-component of the input vec4 +/// @param y y-component of the input vec4 +/// @param z z-component of the input vec4 +/// @param w w-component of the input vec4 + +function MatrixTransformVertexExt(_matrix, _x_in, _y_in, _z_in, _w_in) +{ + var _x = _x_in*_matrix[0] + _y_in*_matrix[4] + _z_in*_matrix[ 8] + _w_in*_matrix[12]; + var _y = _x_in*_matrix[1] + _y_in*_matrix[5] + _z_in*_matrix[ 9] + _w_in*_matrix[13]; + var _z = _x_in*_matrix[2] + _y_in*_matrix[6] + _z_in*_matrix[10] + _w_in*_matrix[14]; + var _w = _x_in*_matrix[3] + _y_in*_matrix[7] + _z_in*_matrix[11] + _w_in*_matrix[15]; + + return [_x, _y, _z, _w]; +} \ No newline at end of file diff --git a/scripts/MatrixTransformVertexExt/MatrixTransformVertexExt.yy b/scripts/MatrixTransformVertexExt/MatrixTransformVertexExt.yy new file mode 100644 index 0000000..a002d83 --- /dev/null +++ b/scripts/MatrixTransformVertexExt/MatrixTransformVertexExt.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "MatrixTransformVertexExt", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/__MatrixSystem/__MatrixSystem.gml b/scripts/__MatrixSystem/__MatrixSystem.gml new file mode 100644 index 0000000..dd8c35b --- /dev/null +++ b/scripts/__MatrixSystem/__MatrixSystem.gml @@ -0,0 +1,4 @@ +#macro __MATRICES_VERSION "0.1.0" +#macro __MATRICES_DATE "2023-12-22" + +show_debug_message("Welcome to Matrices by Juju Adams! This is version " + __MATRICES_VERSION + " " + __MATRICES_DATE); \ No newline at end of file diff --git a/scripts/__MatrixSystem/__MatrixSystem.yy b/scripts/__MatrixSystem/__MatrixSystem.yy new file mode 100644 index 0000000..e0cef39 --- /dev/null +++ b/scripts/__MatrixSystem/__MatrixSystem.yy @@ -0,0 +1,11 @@ +{ + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "__MatrixSystem", + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "Matrices", + "path": "folders/Matrices.yy", + }, +} \ No newline at end of file diff --git a/scripts/__matrices_config/__matrices_config.gml b/scripts/__matrices_config/__matrices_config.gml deleted file mode 100644 index f6e128e..0000000 --- a/scripts/__matrices_config/__matrices_config.gml +++ /dev/null @@ -1,6 +0,0 @@ -#region Internal definitions - -#macro MATRICES_VERSION "1.0.0" -#macro MATRICES_DATE "2018/06/06" - -#endregion \ No newline at end of file diff --git a/scripts/__matrices_config/__matrices_config.yy b/scripts/__matrices_config/__matrices_config.yy deleted file mode 100644 index ddacd79..0000000 --- a/scripts/__matrices_config/__matrices_config.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "3e57aff7-52cb-4f60-8c29-3d795187f482", - "modelName": "GMScript", - "mvc": "1.0", - "name": "__matrices_config", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_build_rotation_axis/matrix_build_rotation_axis.gml b/scripts/matrix_build_rotation_axis/matrix_build_rotation_axis.gml deleted file mode 100644 index f285c5b..0000000 --- a/scripts/matrix_build_rotation_axis/matrix_build_rotation_axis.gml +++ /dev/null @@ -1,35 +0,0 @@ -/// @param x -/// @param y -/// @param z -/// @param angle - -var _x = argument0; -var _y = argument1; -var _z = argument2; - -var _cos = dcos(-argument3); -var _sin = dsin(-argument3); -var _one_minus_cos = 1.0 - _cos; - -var _d = 1/sqrt(_x*_x + _y*_y + _z*_z); -_x *= _d; -_y *= _d; -_z *= _d; - -var _matrix; - -_matrix[15] = 1; - -_matrix[ 0] = _one_minus_cos*_x*_x + _cos; -_matrix[ 1] = _one_minus_cos*_x*_y + _sin*_z; -_matrix[ 2] = _one_minus_cos*_x*_z - _sin*_y; - -_matrix[ 4] = _one_minus_cos*_x*_y - _sin*_z; -_matrix[ 5] = _one_minus_cos*_y*_y + _cos; -_matrix[ 6] = _one_minus_cos*_y*_z + _sin*_x; - -_matrix[ 8] = _one_minus_cos*_x*_z + _sin*_y; -_matrix[ 9] = _one_minus_cos*_y*_z - _sin*_x; -_matrix[10] = _one_minus_cos*_z*_z + _cos; - -return _matrix; \ No newline at end of file diff --git a/scripts/matrix_build_rotation_axis/matrix_build_rotation_axis.yy b/scripts/matrix_build_rotation_axis/matrix_build_rotation_axis.yy deleted file mode 100644 index 15b84d7..0000000 --- a/scripts/matrix_build_rotation_axis/matrix_build_rotation_axis.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "0775e65f-8cc6-4e55-9c0b-312ebf67bc35", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_build_rotation_axis", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_flip_x/matrix_flip_x.gml b/scripts/matrix_flip_x/matrix_flip_x.gml deleted file mode 100644 index 1020161..0000000 --- a/scripts/matrix_flip_x/matrix_flip_x.gml +++ /dev/null @@ -1,8 +0,0 @@ -/// @param matrix - -var _matrix = argument0; -_matrix[ 0] = -_matrix[ 0]; -_matrix[ 4] = -_matrix[ 4]; -_matrix[ 8] = -_matrix[ 8]; -_matrix[12] = -_matrix[12]; -return _matrix; \ No newline at end of file diff --git a/scripts/matrix_flip_x/matrix_flip_x.yy b/scripts/matrix_flip_x/matrix_flip_x.yy deleted file mode 100644 index 2b3e18f..0000000 --- a/scripts/matrix_flip_x/matrix_flip_x.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "a570586c-9165-4c21-ba3b-f5eec0fc70fc", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_flip_x", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_flip_y/matrix_flip_y.gml b/scripts/matrix_flip_y/matrix_flip_y.gml deleted file mode 100644 index 3eda460..0000000 --- a/scripts/matrix_flip_y/matrix_flip_y.gml +++ /dev/null @@ -1,8 +0,0 @@ -/// @param matrix - -var _matrix = argument0; -_matrix[ 1] = -_matrix[ 1]; -_matrix[ 5] = -_matrix[ 5]; -_matrix[ 9] = -_matrix[ 9]; -_matrix[13] = -_matrix[13]; -return _matrix; \ No newline at end of file diff --git a/scripts/matrix_flip_y/matrix_flip_y.yy b/scripts/matrix_flip_y/matrix_flip_y.yy deleted file mode 100644 index 83cc763..0000000 --- a/scripts/matrix_flip_y/matrix_flip_y.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "4110cc2e-c595-412c-a56b-b614061e3959", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_flip_y", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_inverse/matrix_inverse.gml b/scripts/matrix_inverse/matrix_inverse.gml deleted file mode 100644 index 8c3dba7..0000000 --- a/scripts/matrix_inverse/matrix_inverse.gml +++ /dev/null @@ -1,135 +0,0 @@ -/// @desc Returns the inverse of a 4x4 matrix -/// @param matrix - -var _matrix = argument0; - -var _inv; -_inv[15] = _matrix[0] * _matrix[5] * _matrix[10] - - _matrix[0] * _matrix[6] * _matrix[9] - - _matrix[4] * _matrix[1] * _matrix[10] + - _matrix[4] * _matrix[2] * _matrix[9] + - _matrix[8] * _matrix[1] * _matrix[6] - - _matrix[8] * _matrix[2] * _matrix[5]; - -_inv[ 0] = _matrix[5] * _matrix[10] * _matrix[15] - - _matrix[5] * _matrix[11] * _matrix[14] - - _matrix[9] * _matrix[6] * _matrix[15] + - _matrix[9] * _matrix[7] * _matrix[14] + - _matrix[13] * _matrix[6] * _matrix[11] - - _matrix[13] * _matrix[7] * _matrix[10]; - -_inv[ 4] = -_matrix[4] * _matrix[10] * _matrix[15] + - _matrix[4] * _matrix[11] * _matrix[14] + - _matrix[8] * _matrix[6] * _matrix[15] - - _matrix[8] * _matrix[7] * _matrix[14] - - _matrix[12] * _matrix[6] * _matrix[11] + - _matrix[12] * _matrix[7] * _matrix[10]; - -_inv[ 8] = _matrix[4] * _matrix[9] * _matrix[15] - - _matrix[4] * _matrix[11] * _matrix[13] - - _matrix[8] * _matrix[5] * _matrix[15] + - _matrix[8] * _matrix[7] * _matrix[13] + - _matrix[12] * _matrix[5] * _matrix[11] - - _matrix[12] * _matrix[7] * _matrix[9]; - -_inv[12] = -_matrix[4] * _matrix[9] * _matrix[14] + - _matrix[4] * _matrix[10] * _matrix[13] + - _matrix[8] * _matrix[5] * _matrix[14] - - _matrix[8] * _matrix[6] * _matrix[13] - - _matrix[12] * _matrix[5] * _matrix[10] + - _matrix[12] * _matrix[6] * _matrix[9]; - -_inv[ 1] = -_matrix[1] * _matrix[10] * _matrix[15] + - _matrix[1] * _matrix[11] * _matrix[14] + - _matrix[9] * _matrix[2] * _matrix[15] - - _matrix[9] * _matrix[3] * _matrix[14] - - _matrix[13] * _matrix[2] * _matrix[11] + - _matrix[13] * _matrix[3] * _matrix[10]; - -_inv[ 5] = _matrix[0] * _matrix[10] * _matrix[15] - - _matrix[0] * _matrix[11] * _matrix[14] - - _matrix[8] * _matrix[2] * _matrix[15] + - _matrix[8] * _matrix[3] * _matrix[14] + - _matrix[12] * _matrix[2] * _matrix[11] - - _matrix[12] * _matrix[3] * _matrix[10]; - -_inv[ 9] = -_matrix[0] * _matrix[9] * _matrix[15] + - _matrix[0] * _matrix[11] * _matrix[13] + - _matrix[8] * _matrix[1] * _matrix[15] - - _matrix[8] * _matrix[3] * _matrix[13] - - _matrix[12] * _matrix[1] * _matrix[11] + - _matrix[12] * _matrix[3] * _matrix[9]; - -_inv[13] = _matrix[0] * _matrix[9] * _matrix[14] - - _matrix[0] * _matrix[10] * _matrix[13] - - _matrix[8] * _matrix[1] * _matrix[14] + - _matrix[8] * _matrix[2] * _matrix[13] + - _matrix[12] * _matrix[1] * _matrix[10] - - _matrix[12] * _matrix[2] * _matrix[9]; - -_inv[ 2] = _matrix[1] * _matrix[6] * _matrix[15] - - _matrix[1] * _matrix[7] * _matrix[14] - - _matrix[5] * _matrix[2] * _matrix[15] + - _matrix[5] * _matrix[3] * _matrix[14] + - _matrix[13] * _matrix[2] * _matrix[7] - - _matrix[13] * _matrix[3] * _matrix[6]; - -_inv[ 6] = -_matrix[0] * _matrix[6] * _matrix[15] + - _matrix[0] * _matrix[7] * _matrix[14] + - _matrix[4] * _matrix[2] * _matrix[15] - - _matrix[4] * _matrix[3] * _matrix[14] - - _matrix[12] * _matrix[2] * _matrix[7] + - _matrix[12] * _matrix[3] * _matrix[6]; - -_inv[10] = _matrix[0] * _matrix[5] * _matrix[15] - - _matrix[0] * _matrix[7] * _matrix[13] - - _matrix[4] * _matrix[1] * _matrix[15] + - _matrix[4] * _matrix[3] * _matrix[13] + - _matrix[12] * _matrix[1] * _matrix[7] - - _matrix[12] * _matrix[3] * _matrix[5]; - -_inv[14] = -_matrix[0] * _matrix[5] * _matrix[14] + - _matrix[0] * _matrix[6] * _matrix[13] + - _matrix[4] * _matrix[1] * _matrix[14] - - _matrix[4] * _matrix[2] * _matrix[13] - - _matrix[12] * _matrix[1] * _matrix[6] + - _matrix[12] * _matrix[2] * _matrix[5]; - -_inv[ 3] = -_matrix[1] * _matrix[6] * _matrix[11] + - _matrix[1] * _matrix[7] * _matrix[10] + - _matrix[5] * _matrix[2] * _matrix[11] - - _matrix[5] * _matrix[3] * _matrix[10] - - _matrix[9] * _matrix[2] * _matrix[7] + - _matrix[9] * _matrix[3] * _matrix[6]; - -_inv[ 7] = _matrix[0] * _matrix[6] * _matrix[11] - - _matrix[0] * _matrix[7] * _matrix[10] - - _matrix[4] * _matrix[2] * _matrix[11] + - _matrix[4] * _matrix[3] * _matrix[10] + - _matrix[8] * _matrix[2] * _matrix[7] - - _matrix[8] * _matrix[3] * _matrix[6]; - -_inv[11] = -_matrix[0] * _matrix[5] * _matrix[11] + - _matrix[0] * _matrix[7] * _matrix[9] + - _matrix[4] * _matrix[1] * _matrix[11] - - _matrix[4] * _matrix[3] * _matrix[9] - - _matrix[8] * _matrix[1] * _matrix[7] + - _matrix[8] * _matrix[3] * _matrix[5]; - -var _det = _matrix[0] * _inv[0] + _matrix[1] * _inv[4] + _matrix[2] * _inv[8] + _matrix[3] * _inv[12]; -if ( _det == 0 ) -{ - show_debug_message("Determinant of the matrix is zero = " + matrix_string(_matrix)); - return _matrix; -} - -_det = 1 / _det; - -var _i = 0; -repeat(16) -{ - _inv[_i] *= _det; - ++_i; -} - -return _inv; \ No newline at end of file diff --git a/scripts/matrix_inverse/matrix_inverse.yy b/scripts/matrix_inverse/matrix_inverse.yy deleted file mode 100644 index 1f70a7b..0000000 --- a/scripts/matrix_inverse/matrix_inverse.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "c6d4cfa5-1a77-4b71-a1d0-66f068feca6e", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_inverse", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_reset/matrix_reset.gml b/scripts/matrix_reset/matrix_reset.gml deleted file mode 100644 index 19130bb..0000000 --- a/scripts/matrix_reset/matrix_reset.gml +++ /dev/null @@ -1,3 +0,0 @@ -/// @param matrix - -matrix_set(argument0, matrix_build_identity()); \ No newline at end of file diff --git a/scripts/matrix_reset/matrix_reset.yy b/scripts/matrix_reset/matrix_reset.yy deleted file mode 100644 index 1a912d2..0000000 --- a/scripts/matrix_reset/matrix_reset.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "e0d21f12-376d-451e-874e-28024d031a64", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_reset", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_string/matrix_string.gml b/scripts/matrix_string/matrix_string.gml deleted file mode 100644 index d4f8464..0000000 --- a/scripts/matrix_string/matrix_string.gml +++ /dev/null @@ -1,27 +0,0 @@ -/// @param matrix - -var _matrix = argument0; - -var _string = "["; - -_string += string_format( _matrix[ 0], 0, 5) + ", "; -_string += string_format( _matrix[ 1], 0, 5) + ", "; -_string += string_format( _matrix[ 2], 0, 5) + ", "; -_string += string_format( _matrix[ 3], 0, 5) + ", "; - -_string += string_format( _matrix[ 4], 0, 5) + ", "; -_string += string_format( _matrix[ 5], 0, 5) + ", "; -_string += string_format( _matrix[ 6], 0, 5) + ", "; -_string += string_format( _matrix[ 7], 0, 5) + ", "; - -_string += string_format( _matrix[ 8], 0, 5) + ", "; -_string += string_format( _matrix[ 9], 0, 5) + ", "; -_string += string_format( _matrix[10], 0, 5) + ", "; -_string += string_format( _matrix[11], 0, 5) + ", "; - -_string += string_format( _matrix[12], 0, 5) + ", "; -_string += string_format( _matrix[13], 0, 5) + ", "; -_string += string_format( _matrix[14], 0, 5) + ", "; -_string += string_format( _matrix[15], 0, 5) + "]"; - -return _string; \ No newline at end of file diff --git a/scripts/matrix_string/matrix_string.yy b/scripts/matrix_string/matrix_string.yy deleted file mode 100644 index fc1963d..0000000 --- a/scripts/matrix_string/matrix_string.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "3d9f40cd-c33e-4cac-a359-59fd16cecb70", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_string", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_world_multiply/matrix_world_multiply.gml b/scripts/matrix_world_multiply/matrix_world_multiply.gml deleted file mode 100644 index 0753604..0000000 --- a/scripts/matrix_world_multiply/matrix_world_multiply.gml +++ /dev/null @@ -1,5 +0,0 @@ -/// @param matrix - -var _matrix = matrix_multiply(matrix_get(matrix_world), argument0); -matrix_set(matrix_world, _matrix); -return _matrix; \ No newline at end of file diff --git a/scripts/matrix_world_multiply/matrix_world_multiply.yy b/scripts/matrix_world_multiply/matrix_world_multiply.yy deleted file mode 100644 index 399f23c..0000000 --- a/scripts/matrix_world_multiply/matrix_world_multiply.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "6b41e390-7d9e-4f3f-b929-d852fb5d3f22", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_world_multiply", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_world_reset/matrix_world_reset.gml b/scripts/matrix_world_reset/matrix_world_reset.gml deleted file mode 100644 index 0ab6eab..0000000 --- a/scripts/matrix_world_reset/matrix_world_reset.gml +++ /dev/null @@ -1 +0,0 @@ -matrix_set(matrix_world, matrix_build_identity()); \ No newline at end of file diff --git a/scripts/matrix_world_reset/matrix_world_reset.yy b/scripts/matrix_world_reset/matrix_world_reset.yy deleted file mode 100644 index 0d43ffd..0000000 --- a/scripts/matrix_world_reset/matrix_world_reset.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "273a4646-cbde-469a-88ae-137dcc7dd752", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_world_reset", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_world_set/matrix_world_set.gml b/scripts/matrix_world_set/matrix_world_set.gml deleted file mode 100644 index 43bdb72..0000000 --- a/scripts/matrix_world_set/matrix_world_set.gml +++ /dev/null @@ -1,3 +0,0 @@ -/// @param matrix - -matrix_set(matrix_world, argument0); \ No newline at end of file diff --git a/scripts/matrix_world_set/matrix_world_set.yy b/scripts/matrix_world_set/matrix_world_set.yy deleted file mode 100644 index 1e7f7ed..0000000 --- a/scripts/matrix_world_set/matrix_world_set.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "aa0e925b-b142-48e3-81c1-8bade2009126", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_world_set", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/scripts/matrix_world_transform_2d/matrix_world_transform_2d.gml b/scripts/matrix_world_transform_2d/matrix_world_transform_2d.gml deleted file mode 100644 index 28392bd..0000000 --- a/scripts/matrix_world_transform_2d/matrix_world_transform_2d.gml +++ /dev/null @@ -1,7 +0,0 @@ -/// @param x -/// @param y -/// @param angle - -var _matrix = matrix_multiply(matrix_get(matrix_world), matrix_build(argument0,argument1,0, 0,0,argument2, 1,1,1)); -matrix_set(matrix_world, _matrix); -return _matrix; \ No newline at end of file diff --git a/scripts/matrix_world_transform_2d/matrix_world_transform_2d.yy b/scripts/matrix_world_transform_2d/matrix_world_transform_2d.yy deleted file mode 100644 index 233fc27..0000000 --- a/scripts/matrix_world_transform_2d/matrix_world_transform_2d.yy +++ /dev/null @@ -1,8 +0,0 @@ -{ - "id": "99a67b70-d60c-4376-a648-c2dc41016e81", - "modelName": "GMScript", - "mvc": "1.0", - "name": "matrix_world_transform_2d", - "IsCompatibility": false, - "IsDnD": false -} \ No newline at end of file diff --git a/views/0a98f219-88ae-4e9a-adac-c1715adf6fc9.yy b/views/0a98f219-88ae-4e9a-adac-c1715adf6fc9.yy deleted file mode 100644 index 490d041..0000000 --- a/views/0a98f219-88ae-4e9a-adac-c1715adf6fc9.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "0a98f219-88ae-4e9a-adac-c1715adf6fc9", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "0a98f219-88ae-4e9a-adac-c1715adf6fc9", - "children": [ - - ], - "filterType": "GMTileSet", - "folderName": "tilesets", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Tilesets" -} \ No newline at end of file diff --git a/views/238ebae9-ca84-4418-bd7e-4a1f960244e0.yy b/views/238ebae9-ca84-4418-bd7e-4a1f960244e0.yy deleted file mode 100644 index 438c7c9..0000000 --- a/views/238ebae9-ca84-4418-bd7e-4a1f960244e0.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "238ebae9-ca84-4418-bd7e-4a1f960244e0", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "238ebae9-ca84-4418-bd7e-4a1f960244e0", - "children": [ - "93d017d3-d8d5-4c22-a3da-870fa111ab33" - ], - "filterType": "GMScript", - "folderName": "scripts", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Scripts" -} \ No newline at end of file diff --git a/views/2bdbfc2c-8e9e-4577-bca2-2ac33a48aec4.yy b/views/2bdbfc2c-8e9e-4577-bca2-2ac33a48aec4.yy deleted file mode 100644 index d2eeb1f..0000000 --- a/views/2bdbfc2c-8e9e-4577-bca2-2ac33a48aec4.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "2bdbfc2c-8e9e-4577-bca2-2ac33a48aec4", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "2bdbfc2c-8e9e-4577-bca2-2ac33a48aec4", - "children": [ - - ], - "filterType": "GMSprite", - "folderName": "sprites", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Sprites" -} \ No newline at end of file diff --git a/views/36ccb387-f771-48b2-9ff2-95b298a22db8.yy b/views/36ccb387-f771-48b2-9ff2-95b298a22db8.yy deleted file mode 100644 index 135eaae..0000000 --- a/views/36ccb387-f771-48b2-9ff2-95b298a22db8.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "36ccb387-f771-48b2-9ff2-95b298a22db8", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "36ccb387-f771-48b2-9ff2-95b298a22db8", - "children": [ - - ], - "filterType": "GMConfig", - "folderName": "configs", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Configs" -} \ No newline at end of file diff --git a/views/4118d6fd-e5a4-4dae-b901-376e77da7cd1.yy b/views/4118d6fd-e5a4-4dae-b901-376e77da7cd1.yy deleted file mode 100644 index 0fabc41..0000000 --- a/views/4118d6fd-e5a4-4dae-b901-376e77da7cd1.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "4118d6fd-e5a4-4dae-b901-376e77da7cd1", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "4118d6fd-e5a4-4dae-b901-376e77da7cd1", - "children": [ - - ], - "filterType": "GMIncludedFile", - "folderName": "datafiles", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_IncludedFiles" -} \ No newline at end of file diff --git a/views/41fcc7b4-9bad-4363-a27a-f1155d567ca3.yy b/views/41fcc7b4-9bad-4363-a27a-f1155d567ca3.yy deleted file mode 100644 index 1c1f13d..0000000 --- a/views/41fcc7b4-9bad-4363-a27a-f1155d567ca3.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "41fcc7b4-9bad-4363-a27a-f1155d567ca3", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "41fcc7b4-9bad-4363-a27a-f1155d567ca3", - "children": [ - - ], - "filterType": "GMObject", - "folderName": "objects", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Objects" -} \ No newline at end of file diff --git a/views/493b96c0-00d4-4b10-b32d-20833f9ef5a3.yy b/views/493b96c0-00d4-4b10-b32d-20833f9ef5a3.yy deleted file mode 100644 index 4b46a8e..0000000 --- a/views/493b96c0-00d4-4b10-b32d-20833f9ef5a3.yy +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "493b96c0-00d4-4b10-b32d-20833f9ef5a3", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "493b96c0-00d4-4b10-b32d-20833f9ef5a3", - "children": [ - "ed6a955d-5826-4f98-a450-10b414266c27", - "a9188620-a624-4a5a-83ae-a1b53faf038b", - "75ac291e-7061-4bcb-8e8a-3b3545332d41", - "cc98d028-7bdd-4680-85f3-c87a7baa481e", - "f418569b-3bdd-4706-a0e4-364317f54032" - ], - "filterType": "GMOptions", - "folderName": "options", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Options" -} \ No newline at end of file diff --git a/views/4dfe404f-a2c3-4e89-b162-07335ebe3741.yy b/views/4dfe404f-a2c3-4e89-b162-07335ebe3741.yy deleted file mode 100644 index f65cb38..0000000 --- a/views/4dfe404f-a2c3-4e89-b162-07335ebe3741.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "4dfe404f-a2c3-4e89-b162-07335ebe3741", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "4dfe404f-a2c3-4e89-b162-07335ebe3741", - "children": [ - - ], - "filterType": "GMExtension", - "folderName": "extensions", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Extensions" -} \ No newline at end of file diff --git a/views/56ac7145-bd4b-4edb-bfae-a07981babb89.yy b/views/56ac7145-bd4b-4edb-bfae-a07981babb89.yy deleted file mode 100644 index ce462e8..0000000 --- a/views/56ac7145-bd4b-4edb-bfae-a07981babb89.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "56ac7145-bd4b-4edb-bfae-a07981babb89", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "56ac7145-bd4b-4edb-bfae-a07981babb89", - "children": [ - - ], - "filterType": "GMNotes", - "folderName": "notes", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Notes" -} \ No newline at end of file diff --git a/views/69d34c6d-0ef1-40cf-96fd-e3bfa52a68a1.yy b/views/69d34c6d-0ef1-40cf-96fd-e3bfa52a68a1.yy deleted file mode 100644 index b52db2e..0000000 --- a/views/69d34c6d-0ef1-40cf-96fd-e3bfa52a68a1.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "69d34c6d-0ef1-40cf-96fd-e3bfa52a68a1", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "69d34c6d-0ef1-40cf-96fd-e3bfa52a68a1", - "children": [ - - ], - "filterType": "GMSound", - "folderName": "sounds", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Sounds" -} \ No newline at end of file diff --git a/views/6b7b80f4-d1df-4363-a362-6a69b24cccd9.yy b/views/6b7b80f4-d1df-4363-a362-6a69b24cccd9.yy deleted file mode 100644 index 46ad93e..0000000 --- a/views/6b7b80f4-d1df-4363-a362-6a69b24cccd9.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "6b7b80f4-d1df-4363-a362-6a69b24cccd9", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "6b7b80f4-d1df-4363-a362-6a69b24cccd9", - "children": [ - - ], - "filterType": "GMPath", - "folderName": "paths", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Paths" -} \ No newline at end of file diff --git a/views/6d3cdacd-531c-4a9e-898a-511c90b98dc0.yy b/views/6d3cdacd-531c-4a9e-898a-511c90b98dc0.yy deleted file mode 100644 index 1eeffb6..0000000 --- a/views/6d3cdacd-531c-4a9e-898a-511c90b98dc0.yy +++ /dev/null @@ -1,27 +0,0 @@ -{ - "id": "6d3cdacd-531c-4a9e-898a-511c90b98dc0", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "6d3cdacd-531c-4a9e-898a-511c90b98dc0", - "children": [ - "2bdbfc2c-8e9e-4577-bca2-2ac33a48aec4", - "0a98f219-88ae-4e9a-adac-c1715adf6fc9", - "69d34c6d-0ef1-40cf-96fd-e3bfa52a68a1", - "6b7b80f4-d1df-4363-a362-6a69b24cccd9", - "238ebae9-ca84-4418-bd7e-4a1f960244e0", - "c8438f4d-e474-4d40-8966-43298219dec1", - "fced5831-fb29-4e4e-b4c5-b03521f6ea40", - "a6c82e90-84d2-4072-b1bc-270da65ae85f", - "41fcc7b4-9bad-4363-a27a-f1155d567ca3", - "96088f3a-4cd0-4892-9f4b-d7bfe2bd7d19", - "56ac7145-bd4b-4edb-bfae-a07981babb89", - "4118d6fd-e5a4-4dae-b901-376e77da7cd1", - "4dfe404f-a2c3-4e89-b162-07335ebe3741", - "493b96c0-00d4-4b10-b32d-20833f9ef5a3", - "36ccb387-f771-48b2-9ff2-95b298a22db8" - ], - "filterType": "root", - "folderName": "Default", - "isDefaultView": true, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/93d017d3-d8d5-4c22-a3da-870fa111ab33.yy b/views/93d017d3-d8d5-4c22-a3da-870fa111ab33.yy deleted file mode 100644 index 8bdc17d..0000000 --- a/views/93d017d3-d8d5-4c22-a3da-870fa111ab33.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "id": "93d017d3-d8d5-4c22-a3da-870fa111ab33", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "93d017d3-d8d5-4c22-a3da-870fa111ab33", - "children": [ - "3e57aff7-52cb-4f60-8c29-3d795187f482", - "e0d21f12-376d-451e-874e-28024d031a64", - "aa0e925b-b142-48e3-81c1-8bade2009126", - "273a4646-cbde-469a-88ae-137dcc7dd752", - "6b41e390-7d9e-4f3f-b929-d852fb5d3f22", - "99a67b70-d60c-4376-a648-c2dc41016e81", - "0775e65f-8cc6-4e55-9c0b-312ebf67bc35", - "3d9f40cd-c33e-4cac-a359-59fd16cecb70", - "a570586c-9165-4c21-ba3b-f5eec0fc70fc", - "4110cc2e-c595-412c-a56b-b614061e3959", - "c6d4cfa5-1a77-4b71-a1d0-66f068feca6e" - ], - "filterType": "GMScript", - "folderName": "Matrices", - "isDefaultView": false, - "localisedFolderName": "" -} \ No newline at end of file diff --git a/views/96088f3a-4cd0-4892-9f4b-d7bfe2bd7d19.yy b/views/96088f3a-4cd0-4892-9f4b-d7bfe2bd7d19.yy deleted file mode 100644 index 0114667..0000000 --- a/views/96088f3a-4cd0-4892-9f4b-d7bfe2bd7d19.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "96088f3a-4cd0-4892-9f4b-d7bfe2bd7d19", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "96088f3a-4cd0-4892-9f4b-d7bfe2bd7d19", - "children": [ - - ], - "filterType": "GMRoom", - "folderName": "rooms", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Rooms" -} \ No newline at end of file diff --git a/views/a6c82e90-84d2-4072-b1bc-270da65ae85f.yy b/views/a6c82e90-84d2-4072-b1bc-270da65ae85f.yy deleted file mode 100644 index a49ca50..0000000 --- a/views/a6c82e90-84d2-4072-b1bc-270da65ae85f.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "a6c82e90-84d2-4072-b1bc-270da65ae85f", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "a6c82e90-84d2-4072-b1bc-270da65ae85f", - "children": [ - - ], - "filterType": "GMTimeline", - "folderName": "timelines", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Timelines" -} \ No newline at end of file diff --git a/views/c8438f4d-e474-4d40-8966-43298219dec1.yy b/views/c8438f4d-e474-4d40-8966-43298219dec1.yy deleted file mode 100644 index c554a82..0000000 --- a/views/c8438f4d-e474-4d40-8966-43298219dec1.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "c8438f4d-e474-4d40-8966-43298219dec1", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "c8438f4d-e474-4d40-8966-43298219dec1", - "children": [ - - ], - "filterType": "GMShader", - "folderName": "shaders", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Shaders" -} \ No newline at end of file diff --git a/views/fced5831-fb29-4e4e-b4c5-b03521f6ea40.yy b/views/fced5831-fb29-4e4e-b4c5-b03521f6ea40.yy deleted file mode 100644 index 8f1731f..0000000 --- a/views/fced5831-fb29-4e4e-b4c5-b03521f6ea40.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": "fced5831-fb29-4e4e-b4c5-b03521f6ea40", - "modelName": "GMFolder", - "mvc": "1.1", - "name": "fced5831-fb29-4e4e-b4c5-b03521f6ea40", - "children": [ - - ], - "filterType": "GMFont", - "folderName": "fonts", - "isDefaultView": false, - "localisedFolderName": "ResourceTree_Fonts" -} \ No newline at end of file