From 81114b2bca795683c2462264ffe8cf7af1f3b2de Mon Sep 17 00:00:00 2001 From: rgrzanic <52929309+rgrzanic@users.noreply.github.com> Date: Tue, 16 Jul 2019 11:36:00 -0600 Subject: [PATCH] fade stuff fade stuff --- Bloble.yyp | 8 ++++ objects/obj_Back/Gesture_0.gml | 6 +-- objects/obj_Home/Gesture_0.gml | 6 +-- objects/obj_SelectBlue/Gesture_0.gml | 3 +- objects/obj_SelectGreen/Gesture_0.gml | 3 +- objects/obj_SelectOrange/Gesture_0.gml | 3 +- objects/obj_SelectPink/Gesture_0.gml | 3 +- objects/obj_SelectRainbow/Gesture_0.gml | 3 +- objects/obj_SelectRed/Gesture_0.gml | 3 +- objects/obj_SelectYellow/Gesture_0.gml | 3 +- objects/obj_Settings/Gesture_0.gml | 6 +-- objects/obj_Start/Gesture_0.gml | 6 +-- objects/obj_fade/Create_0.gml | 2 + objects/obj_fade/Draw_0.gml | 24 ++++++++++ objects/obj_fade/obj_fade.yy | 48 +++++++++++++++++++ views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy | 3 +- 16 files changed, 106 insertions(+), 24 deletions(-) create mode 100644 objects/obj_fade/Create_0.gml create mode 100644 objects/obj_fade/Draw_0.gml create mode 100644 objects/obj_fade/obj_fade.yy diff --git a/Bloble.yyp b/Bloble.yyp index 9064414..dfd6644 100644 --- a/Bloble.yyp +++ b/Bloble.yyp @@ -446,6 +446,14 @@ "resourceType": "GMObject" } }, + { + "Key": "af38b99a-bf74-4ec4-a90e-e0d59567991f", + "Value": { + "id": "90e766d6-8f70-43b1-8f36-251383835b1f", + "resourcePath": "objects\\obj_fade\\obj_fade.yy", + "resourceType": "GMObject" + } + }, { "Key": "afc8cc6f-3041-4e48-8ec0-b67d839d992f", "Value": { diff --git a/objects/obj_Back/Gesture_0.gml b/objects/obj_Back/Gesture_0.gml index 78e5cb7..35ca251 100644 --- a/objects/obj_Back/Gesture_0.gml +++ b/objects/obj_Back/Gesture_0.gml @@ -1,4 +1,2 @@ -/// @description Insert description here -// You can write your code in this editor - -room_goto(rm_Menu); \ No newline at end of file +global.roomset = rm_Menu; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_Home/Gesture_0.gml b/objects/obj_Home/Gesture_0.gml index 806c7d3..35ca251 100644 --- a/objects/obj_Home/Gesture_0.gml +++ b/objects/obj_Home/Gesture_0.gml @@ -1,4 +1,2 @@ -/// @description Insert description here -// You can write your code in this editor - -room_goto(rm_Menu) \ No newline at end of file +global.roomset = rm_Menu; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectBlue/Gesture_0.gml b/objects/obj_SelectBlue/Gesture_0.gml index 0885b23..651f746 100644 --- a/objects/obj_SelectBlue/Gesture_0.gml +++ b/objects/obj_SelectBlue/Gesture_0.gml @@ -1,2 +1,3 @@ object_set_sprite(obj_Player, spr_BlobBlue) -room_goto(rm_Player) \ No newline at end of file +global.roomset = rm_Player; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectGreen/Gesture_0.gml b/objects/obj_SelectGreen/Gesture_0.gml index 6b00288..6b55106 100644 --- a/objects/obj_SelectGreen/Gesture_0.gml +++ b/objects/obj_SelectGreen/Gesture_0.gml @@ -1,2 +1,3 @@ object_set_sprite(obj_Player, spr_BlobGreen) -room_goto(rm_Player) \ No newline at end of file +global.roomset = rm_Player; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectOrange/Gesture_0.gml b/objects/obj_SelectOrange/Gesture_0.gml index 0172105..5b2ef0e 100644 --- a/objects/obj_SelectOrange/Gesture_0.gml +++ b/objects/obj_SelectOrange/Gesture_0.gml @@ -1,2 +1,3 @@ object_set_sprite(obj_Player, spr_BlobOrange) -room_goto(rm_Player) \ No newline at end of file +global.roomset = rm_Player; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectPink/Gesture_0.gml b/objects/obj_SelectPink/Gesture_0.gml index 2601031..2f3f20a 100644 --- a/objects/obj_SelectPink/Gesture_0.gml +++ b/objects/obj_SelectPink/Gesture_0.gml @@ -1,2 +1,3 @@ object_set_sprite(obj_Player, spr_BlobPink) -room_goto(rm_Player) \ No newline at end of file +global.roomset = rm_Player; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectRainbow/Gesture_0.gml b/objects/obj_SelectRainbow/Gesture_0.gml index 1e19ea5..5de95b3 100644 --- a/objects/obj_SelectRainbow/Gesture_0.gml +++ b/objects/obj_SelectRainbow/Gesture_0.gml @@ -1,2 +1,3 @@ object_set_sprite(obj_Player, spr_BlobRainbow) -room_goto(rm_Player) \ No newline at end of file +global.roomset = rm_Player; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectRed/Gesture_0.gml b/objects/obj_SelectRed/Gesture_0.gml index 5114d2c..10e5271 100644 --- a/objects/obj_SelectRed/Gesture_0.gml +++ b/objects/obj_SelectRed/Gesture_0.gml @@ -1,2 +1,3 @@ object_set_sprite(obj_Player, spr_BlobRed) -room_goto(rm_Player) \ No newline at end of file +global.roomset = rm_Player; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_SelectYellow/Gesture_0.gml b/objects/obj_SelectYellow/Gesture_0.gml index 03de3cd..b30614b 100644 --- a/objects/obj_SelectYellow/Gesture_0.gml +++ b/objects/obj_SelectYellow/Gesture_0.gml @@ -1,2 +1,3 @@ object_set_sprite(obj_Player, spr_BlobYellow) -room_goto(rm_Player) \ No newline at end of file +global.roomset = rm_Player; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_Settings/Gesture_0.gml b/objects/obj_Settings/Gesture_0.gml index cd10dbf..1b01ee4 100644 --- a/objects/obj_Settings/Gesture_0.gml +++ b/objects/obj_Settings/Gesture_0.gml @@ -1,4 +1,2 @@ -/// @description Insert description here -// You can write your code in this editor - -room_goto(rm_Settings); \ No newline at end of file +global.roomset = rm_Settings; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_Start/Gesture_0.gml b/objects/obj_Start/Gesture_0.gml index 4d7b638..71f0f9b 100644 --- a/objects/obj_Start/Gesture_0.gml +++ b/objects/obj_Start/Gesture_0.gml @@ -1,4 +1,2 @@ -/// @description Insert description here -// You can write your code in this editor - -room_goto(rm_Start); \ No newline at end of file +global.roomset = rm_Start; +instance_create_depth(1,1,-1, obj_fade) diff --git a/objects/obj_fade/Create_0.gml b/objects/obj_fade/Create_0.gml new file mode 100644 index 0000000..bfa9ed4 --- /dev/null +++ b/objects/obj_fade/Create_0.gml @@ -0,0 +1,2 @@ +a = 0; +fade = 1; \ No newline at end of file diff --git a/objects/obj_fade/Draw_0.gml b/objects/obj_fade/Draw_0.gml new file mode 100644 index 0000000..68cb023 --- /dev/null +++ b/objects/obj_fade/Draw_0.gml @@ -0,0 +1,24 @@ +a = clamp(a + (fade * 0.05), 0, 1); + +if (a == 1) +{ + room_goto(global.roomset) + fade = -1; +} + +if (a == 0) && (fade == -1) +{ + instance_destroy(); +} + +draw_set_color(c_black); +draw_set_alpha(a); +draw_rectangle( + 0, + 0, + 1080, + 1920, + 0 +) +draw_set_alpha(1); + diff --git a/objects/obj_fade/obj_fade.yy b/objects/obj_fade/obj_fade.yy new file mode 100644 index 0000000..b8a1116 --- /dev/null +++ b/objects/obj_fade/obj_fade.yy @@ -0,0 +1,48 @@ +{ + "id": "af38b99a-bf74-4ec4-a90e-e0d59567991f", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_fade", + "eventList": [ + { + "id": "f0f973aa-6e5c-4ffc-ac0e-afa89cb7960b", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "af38b99a-bf74-4ec4-a90e-e0d59567991f" + }, + { + "id": "2ef44f88-ca84-4364-a8e2-5e46e4c884ba", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 8, + "m_owner": "af38b99a-bf74-4ec4-a90e-e0d59567991f" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": true, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "00000000-0000-0000-0000-000000000000", + "visible": true +} \ No newline at end of file diff --git a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy index 14be02a..170491c 100644 --- a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy +++ b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy @@ -27,7 +27,8 @@ "ee739527-7172-4028-8f39-2ef174a4ada5", "faeb0e35-a972-46c1-9af4-f4936410ca5e", "2d5d3f5e-5efc-4e76-80d4-c2ea839c96ba", - "334d75d0-c561-4e8d-8827-9ef8bae4ea2e" + "334d75d0-c561-4e8d-8827-9ef8bae4ea2e", + "af38b99a-bf74-4ec4-a90e-e0d59567991f" ], "filterType": "GMObject", "folderName": "objects",