diff --git a/kawase.yyp b/kawase.yyp index e9192f0..7d4597f 100644 --- a/kawase.yyp +++ b/kawase.yyp @@ -1,17 +1,12 @@ { + "resourceType": "GMProject", + "resourceVersion": "1.6", + "name": "kawase", "resources": [ {"id":{"name":"spr_test","path":"sprites/spr_test/spr_test.yy",},"order":1,}, - {"id":{"name":"kawase_create","path":"scripts/kawase_create/kawase_create.yy",},"order":0,}, - {"id":{"name":"kawase_destroy","path":"scripts/kawase_destroy/kawase_destroy.yy",},"order":1,}, - {"id":{"name":"kawase_get_surface","path":"scripts/kawase_get_surface/kawase_get_surface.yy",},"order":2,}, - {"id":{"name":"kawase_get_max_iterations","path":"scripts/kawase_get_max_iterations/kawase_get_max_iterations.yy",},"order":3,}, - {"id":{"name":"kawase_get_width","path":"scripts/kawase_get_width/kawase_get_width.yy",},"order":4,}, - {"id":{"name":"kawase_get_height","path":"scripts/kawase_get_height/kawase_get_height.yy",},"order":5,}, - {"id":{"name":"kawase_blur","path":"scripts/kawase_blur/kawase_blur.yy",},"order":6,}, - {"id":{"name":"kawase_draw_debug","path":"scripts/kawase_draw_debug/kawase_draw_debug.yy",},"order":7,}, - {"id":{"name":"__kawase_check_surface","path":"scripts/__kawase_check_surface/__kawase_check_surface.yy",},"order":0,}, - {"id":{"name":"shd_kawase_down","path":"shaders/shd_kawase_down/shd_kawase_down.yy",},"order":1,}, - {"id":{"name":"shd_kawase_up","path":"shaders/shd_kawase_up/shd_kawase_up.yy",},"order":2,}, + {"id":{"name":"Kawase","path":"scripts/Kawase/Kawase.yy",},"order":9,}, + {"id":{"name":"shdKawaseDown","path":"shaders/shdKawaseDown/shdKawaseDown.yy",},"order":1,}, + {"id":{"name":"shdKawaseUp","path":"shaders/shdKawaseUp/shdKawaseUp.yy",},"order":2,}, {"id":{"name":"obj_test","path":"objects/obj_test/obj_test.yy",},"order":2,}, {"id":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},"order":3,}, ], @@ -21,18 +16,16 @@ {"name":"HTML5","path":"options/html5/options_html5.yy",}, {"name":"iOS","path":"options/ios/options_ios.yy",}, {"name":"tvOS","path":"options/tvos/options_tvos.yy",}, - {"name":"Windows UWP","path":"options/windowsuap/options_windowsuap.yy",}, - {"name":"Xbox One","path":"options/xboxone/options_xboxone.yy",}, {"name":"Windows","path":"options/windows/options_windows.yy",}, {"name":"Linux","path":"options/linux/options_linux.yy",}, {"name":"Android","path":"options/android/options_android.yy",}, {"name":"macOS","path":"options/mac/options_mac.yy",}, {"name":"Main","path":"options/main/options_main.yy",}, {"name":"Amazon Fire","path":"options/amazonfire/options_amazonfire.yy",}, + {"name":"operagx","path":"options/operagx/options_operagx.yy",}, ], - "isDnDProject": false, + "defaultScriptType": 1, "isEcma": false, - "tutorialPath": "", "configs": { "name": "Default", "children": [], @@ -41,21 +34,17 @@ {"roomId":{"name":"rm_test","path":"rooms/rm_test/rm_test.yy",},}, ], "Folders": [ - {"folderPath":"folders/Kawase.yy","order":0,"resourceVersion":"1.0","name":"Kawase","tags":[],"resourceType":"GMFolder",}, - {"folderPath":"folders/Kawase/(System).yy","order":11,"resourceVersion":"1.0","name":"(System)","tags":[],"resourceType":"GMFolder",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Kawase","folderPath":"folders/Kawase.yy","order":0,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"(System)","folderPath":"folders/Kawase/(System).yy","order":10,}, ], "AudioGroups": [ - {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, + {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, ], "TextureGroups": [ - {"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, + {"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": "2.3.2.560", + "IDEVersion": "2022.0.2.51", }, - "resourceVersion": "1.4", - "name": "kawase", - "tags": [], - "resourceType": "GMProject", } \ No newline at end of file diff --git a/objects/obj_test/CleanUp_0.gml b/objects/obj_test/CleanUp_0.gml index e06bb01..059029f 100644 --- a/objects/obj_test/CleanUp_0.gml +++ b/objects/obj_test/CleanUp_0.gml @@ -1 +1,2 @@ -kawase_destroy(kawase); \ No newline at end of file +//kawase_destroy(kawase); +kawase.Destroy(); \ No newline at end of file diff --git a/objects/obj_test/Create_0.gml b/objects/obj_test/Create_0.gml index 80f3b55..86a02b9 100644 --- a/objects/obj_test/Create_0.gml +++ b/objects/obj_test/Create_0.gml @@ -1 +1,2 @@ -kawase = kawase_create(1280, 720, 4); \ No newline at end of file +//kawase = kawase_create(1280, 720, 4); +kawase = new Kawase(1280, 720, 4); \ No newline at end of file diff --git a/objects/obj_test/Draw_0.gml b/objects/obj_test/Draw_0.gml index 62bf060..cfa0a0d 100644 --- a/objects/obj_test/Draw_0.gml +++ b/objects/obj_test/Draw_0.gml @@ -1,10 +1,21 @@ -var _surface = kawase_get_surface(kawase); +//var _surface = kawase_get_surface(kawase); +// +//surface_set_target(_surface); +//draw_clear_alpha(c_black, 0); +//draw_sprite(spr_test, 1, 0, 0); +//surface_reset_target(); +// +//kawase_blur(kawase, round(kawase_get_max_iterations(kawase) * mouse_x / room_width)); +// +//draw_surface(_surface, 0, 0); + +var _surface = kawase.GetSurface(); surface_set_target(_surface); draw_clear_alpha(c_black, 0); draw_sprite(spr_test, 1, 0, 0); surface_reset_target(); -kawase_blur(kawase, round(kawase_get_max_iterations(kawase) * mouse_x / room_width)); +kawase.Blur(round(kawase.GetMaxIterations() * mouse_x / room_width)); draw_surface(_surface, 0, 0); \ No newline at end of file diff --git a/objects/obj_test/obj_test.yy b/objects/obj_test/obj_test.yy index 3e771a5..7233026 100644 --- a/objects/obj_test/obj_test.yy +++ b/objects/obj_test/obj_test.yy @@ -1,10 +1,14 @@ { + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_test", "spriteId": { "name": "spr_test", "path": "sprites/spr_test/spr_test.yy", }, "solid": false, "visible": true, + "managed": true, "spriteMaskId": null, "persistent": false, "parentObjectId": null, @@ -21,9 +25,9 @@ "physicsKinematic": false, "physicsShapePoints": [], "eventList": [ - {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, - {"isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"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":8,"collisionObjectId":null,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,}, ], "properties": [], "overriddenProperties": [], @@ -31,8 +35,4 @@ "name": "kawase", "path": "kawase.yyp", }, - "resourceVersion": "1.0", - "name": "obj_test", - "tags": [], - "resourceType": "GMObject", } \ No newline at end of file diff --git a/options/main/options_main.yy b/options/main/options_main.yy index 9652ffc..528d512 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -1,5 +1,9 @@ { + "resourceType": "GMMainOptions", + "resourceVersion": "1.4", + "name": "Main", "option_gameguid": "453dd234-1bab-4a0c-995d-1cab467e9c35", + "option_gameid": "0", "option_game_speed": 60, "option_mips_for_3d_textures": false, "option_draw_colour": 4294967295, @@ -7,10 +11,10 @@ "option_steam_app_id": "0", "option_sci_usesci": false, "option_author": "", - "option_lastchanged": "", + "option_collision_compatibility": true, + "option_copy_on_write_enabled": true, "option_spine_licence": false, - "resourceVersion": "1.2", - "name": "Main", - "tags": [], - "resourceType": "GMMainOptions", + "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/scripts/Kawase/Kawase.gml b/scripts/Kawase/Kawase.gml new file mode 100644 index 0000000..5aef26c --- /dev/null +++ b/scripts/Kawase/Kawase.gml @@ -0,0 +1,200 @@ +// Feather disable all + +/// Constructor that returns a struct that handles a Kawase blur. +/// +/// N.B. You must call the .Destroy() method on the returned struct to avoid memory leaks! +/// +/// This struct has the following methods: +/// .GetWidth() +/// .GetHeight() +/// .GetMaxIterations() +/// .GetSurface() +/// .Destroy() +/// .Blur([iterations]) +/// .DrawDebug(x, y) +/// +/// @param width +/// @param height +/// @param maxIterations + +#macro __KAWASE_VERSION "1.1.1" +#macro __KAWASE_DATE "2023-11-02" + +show_debug_message("Kawase: Welcome to Kawase by Juju Adams! This is version " + __KAWASE_VERSION + ", " + __KAWASE_DATE); + +function Kawase(_width, _height, _maxIterations) constructor +{ + __width = _width; + __height = _height; + __maxIterations = _maxIterations; + + __destroyed = false; + __surfaceArray = array_create(_maxIterations+1, undefined); + + var _w = __width; + var _h = __height; + var _i = 0; + repeat(__maxIterations + 1) + { + var _struct = { + __width: _w, + __height: _h, + __surface: -1, + __texelWidth: 1, + __texelHeight: 1, + } + + __surfaceArray[@ _i] = _struct; + __CheckSurface(_struct); + + _w = _w div 2; + _h = _h div 2; + ++_i; + } + + static Destroy = function() + { + if (__destroyed) return; + __destroyed = true; + + var _i = 0; + repeat(array_length(__surfaceArray)) + { + surface_free(__surfaceArray[_i].__surface); + ++_i; + } + } + + static GetWidth = function() + { + return __width; + } + + static GetHeight = function() + { + return __height; + } + + static GetMaxIterations = function() + { + return __maxIterations; + } + + static GetSurface = function() + { + return __CheckSurface(__surfaceArray[0]); + } + + static DrawDebug = function(_x, _y) + { + if (__destroyed) return; + + var _i = 0; + repeat(array_length(__surfaceArray)) + { + var _struct = __surfaceArray[_i]; + draw_surface(_struct.__surface, _x, _y); + + _x += _struct.__width; + ++_i; + } + } + + static Blur = function(_iterations = __maxIterations) + { + static _shd_kawase_down_vTexel = shader_get_uniform(shdKawaseDown, "u_vTexel"); + static _shd_kawase_up_vTexel = shader_get_uniform(shdKawaseUp , "u_vTexel"); + + if (__destroyed) return; + + _iterations = clamp(_iterations, 0, __maxIterations); + + var _i = 0; + repeat(_iterations + 1) + { + __CheckSurface(__surfaceArray[_i]); + ++_i; + } + + var _oldBlendEnable = gpu_get_blendenable(); + var _oldTexFilter = gpu_get_tex_filter(); + var _oldShader = shader_current(); + var _oldBlendmodeSrc = gpu_get_blendmode_src(); + var _oldBlendmodeDest = gpu_get_blendmode_dest(); + + gpu_set_blendenable(true); + gpu_set_tex_filter(true); + gpu_set_blendmode_ext(bm_one, bm_zero); + shader_set(shdKawaseDown); + + var _i = 1; + repeat(_iterations) + { + var _prevStruct = __surfaceArray[_i-1]; + var _nextStruct = __surfaceArray[_i ]; + + surface_set_target(_nextStruct.__surface); + shader_set_uniform_f(_shd_kawase_down_vTexel, _prevStruct.__texelWidth, _prevStruct.__texelHeight); + draw_surface_stretched(_prevStruct.__surface, 0, 0, _nextStruct.__width, _nextStruct.__height); + surface_reset_target(); + + ++_i; + } + + shader_set(shdKawaseUp); + + var _i = _iterations; + repeat(_iterations) + { + var _prevStruct = __surfaceArray[_i ]; + var _nextStruct = __surfaceArray[_i-1]; + + surface_set_target(_nextStruct.__surface); + shader_set_uniform_f(_shd_kawase_up_vTexel, _prevStruct.__texelWidth, _prevStruct.__texelHeight); + draw_surface_stretched(_prevStruct.__surface, 0, 0, _nextStruct.__width, _nextStruct.__height); + surface_reset_target(); + + --_i; + } + + gpu_set_blendenable(_oldBlendEnable); + gpu_set_tex_filter(_oldTexFilter); + shader_set(_oldShader); + gpu_set_blendmode_ext(_oldBlendmodeSrc, _oldBlendmodeDest); + } + + static __CheckSurface = function(_struct) + { + if (__destroyed) return; + + var _width = _struct.__width; + var _height = _struct.__height; + var _surface = _struct.__surface; + + var _newSurface = false; + + if (!surface_exists(_surface)) + { + _surface = surface_create(_width, _height); + _newSurface = true; + } + + if ((surface_get_width(_surface) != _width) || (surface_get_height(_surface) != _height)) + { + surface_free(_surface); + _surface = surface_create(_width, _height); + _newSurface = true; + } + + if (_newSurface) + { + _struct.__surface = _surface; + + var _texture = surface_get_texture(_surface); + _struct.__texelWidth = 0.5*texture_get_texel_width(_texture); + _struct.__texelHeight = 0.5*texture_get_texel_height(_texture); + } + + return _surface; + } +} \ No newline at end of file diff --git a/scripts/kawase_blur/kawase_blur.yy b/scripts/Kawase/Kawase.yy similarity index 82% rename from scripts/kawase_blur/kawase_blur.yy rename to scripts/Kawase/Kawase.yy index f227e0b..5c2fef3 100644 --- a/scripts/kawase_blur/kawase_blur.yy +++ b/scripts/Kawase/Kawase.yy @@ -1,12 +1,11 @@ { + "resourceType": "GMScript", + "resourceVersion": "1.0", + "name": "Kawase", "isDnD": false, "isCompatibility": false, "parent": { "name": "Kawase", "path": "folders/Kawase.yy", }, - "resourceVersion": "1.0", - "name": "kawase_blur", - "tags": [], - "resourceType": "GMScript", } \ No newline at end of file diff --git a/scripts/__kawase_check_surface/__kawase_check_surface.gml b/scripts/__kawase_check_surface/__kawase_check_surface.gml deleted file mode 100644 index 2fdaf47..0000000 --- a/scripts/__kawase_check_surface/__kawase_check_surface.gml +++ /dev/null @@ -1,40 +0,0 @@ -/// @param iterationArray - -function __kawase_check_surface(_array) -{ - var _width = _array[0]; - var _height = _array[1]; - var _surface = _array[2]; - - var _new_surface = false; - - if (!surface_exists(_surface)) - { - _surface = surface_create(_width, _height); - _new_surface = true; - } - - if ((surface_get_width(_surface) != _width) || (surface_get_height(_surface) != _height)) - { - surface_free(_surface); - _surface = surface_create(_width, _height); - _new_surface = true; - } - - if (_new_surface) - { - var _texture = surface_get_texture(_surface); - _array[@ 2] = _surface; - _array[@ 3] = 0.5*texture_get_texel_width(_texture); - _array[@ 4] = 0.5*texture_get_texel_height(_texture); - } - - return _surface; -} - - - -#macro __KAWASE_VERSION "1.1.1" -#macro __KAWASE_DATE "2022-07-07" - -show_debug_message("Kawase: Welcome to Kawase by @jujuadams! This is version " + __KAWASE_VERSION + ", " + __KAWASE_DATE); \ No newline at end of file diff --git a/scripts/__kawase_check_surface/__kawase_check_surface.yy b/scripts/__kawase_check_surface/__kawase_check_surface.yy deleted file mode 100644 index abb82a4..0000000 --- a/scripts/__kawase_check_surface/__kawase_check_surface.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "(System)", - "path": "folders/Kawase/(System).yy", - }, - "resourceVersion": "1.0", - "name": "__kawase_check_surface", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/kawase_blur/kawase_blur.gml b/scripts/kawase_blur/kawase_blur.gml deleted file mode 100644 index 5d70730..0000000 --- a/scripts/kawase_blur/kawase_blur.gml +++ /dev/null @@ -1,70 +0,0 @@ -/// @param kawaseArray -/// @param [iterations] - -function kawase_blur() -{ - var _root_array = argument[0]; - var _iterations = (argument_count > 1)? argument[1] : undefined; - - if (_iterations == undefined) - { - _iterations = array_length(_root_array) - 1; - } - else - { - _iterations = clamp(_iterations, 0, array_length(_root_array) - 1); - } - - var _i = 0; - repeat(_iterations + 1) - { - __kawase_check_surface(_root_array[_i]); - ++_i; - } - - var _old_blend_enable = gpu_get_blendenable(); - var _old_tex_filter = gpu_get_tex_filter(); - var _old_shader = shader_current(); - var _old_blendmode_src = gpu_get_blendmode_src(); - var _old_blendmode_dest = gpu_get_blendmode_dest(); - - gpu_set_blendenable(true); - gpu_set_tex_filter(true); - gpu_set_blendmode_ext(bm_one, bm_zero); - shader_set(shd_kawase_down); - - var _i = 1; - repeat(_iterations) - { - var _prev_array = _root_array[_i-1]; - var _next_array = _root_array[_i ]; - - surface_set_target(_next_array[2]); - shader_set_uniform_f(global.__kawase_down_texel_uniform, _prev_array[3], _prev_array[4]); - draw_surface_stretched(_prev_array[2], 0, 0, _next_array[0], _next_array[1]); - surface_reset_target(); - - ++_i; - } - - shader_set(shd_kawase_up); - - var _i = _iterations; - repeat(_iterations) - { - var _prev_array = _root_array[_i ]; - var _next_array = _root_array[_i-1]; - - surface_set_target(_next_array[2]); - shader_set_uniform_f(global.__kawase_up_texel_uniform, _prev_array[3], _prev_array[4]); - draw_surface_stretched(_prev_array[2], 0, 0, _next_array[0], _next_array[1]); - surface_reset_target(); - - --_i; - } - - gpu_set_blendenable(_old_blend_enable); - gpu_set_tex_filter(_old_tex_filter); - shader_set(_old_shader); - gpu_set_blendmode_ext(_old_blendmode_src, _old_blendmode_dest); -} \ No newline at end of file diff --git a/scripts/kawase_create/kawase_create.gml b/scripts/kawase_create/kawase_create.gml deleted file mode 100644 index 57667a8..0000000 --- a/scripts/kawase_create/kawase_create.gml +++ /dev/null @@ -1,35 +0,0 @@ -/// @param width -/// @param height -/// @param maxIterations - -function kawase_create(_width, _height, _iterations) -{ - global.__kawase_down_texel_uniform = shader_get_uniform(shd_kawase_down, "u_vTexel"); - global.__kawase_up_texel_uniform = shader_get_uniform(shd_kawase_up , "u_vTexel"); - - var _root_array = array_create(_iterations, undefined); - - var _w = _width; - var _h = _height; - var _i = 0; - repeat(_iterations + 1) - { - //Width - //Height - //Surface - //Texel Width - //Texel Height - var _array = [_w, _h, -1, 1, 1]; - _root_array[@ _i] = _array; - - __kawase_check_surface(_array); - - _w = _w div 2; - _h = _h div 2; - ++_i; - } - - return _root_array; - - -} diff --git a/scripts/kawase_create/kawase_create.yy b/scripts/kawase_create/kawase_create.yy deleted file mode 100644 index 1a881bd..0000000 --- a/scripts/kawase_create/kawase_create.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Kawase", - "path": "folders/Kawase.yy", - }, - "resourceVersion": "1.0", - "name": "kawase_create", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/kawase_destroy/kawase_destroy.gml b/scripts/kawase_destroy/kawase_destroy.gml deleted file mode 100644 index ff87327..0000000 --- a/scripts/kawase_destroy/kawase_destroy.gml +++ /dev/null @@ -1,12 +0,0 @@ -/// @param kawaseArray - -function kawase_destroy(_root_array) -{ - var _i = 0; - repeat(array_length(_root_array)) - { - var _array = _root_array[_i]; - surface_free(_array[2]); - ++_i; - } -} \ No newline at end of file diff --git a/scripts/kawase_destroy/kawase_destroy.yy b/scripts/kawase_destroy/kawase_destroy.yy deleted file mode 100644 index 985789b..0000000 --- a/scripts/kawase_destroy/kawase_destroy.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Kawase", - "path": "folders/Kawase.yy", - }, - "resourceVersion": "1.0", - "name": "kawase_destroy", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/kawase_draw_debug/kawase_draw_debug.gml b/scripts/kawase_draw_debug/kawase_draw_debug.gml deleted file mode 100644 index f5318dd..0000000 --- a/scripts/kawase_draw_debug/kawase_draw_debug.gml +++ /dev/null @@ -1,15 +0,0 @@ -/// @param kawaseArray - -function kawase_draw_debug(_root_array) -{ - var _i = 0; - var _x = 0; - repeat(array_length(_root_array)) - { - var _array = _root_array[_i]; - draw_surface(_array[2], _x, 0); - - _x += _array[0]; - ++_i; - } -} \ No newline at end of file diff --git a/scripts/kawase_draw_debug/kawase_draw_debug.yy b/scripts/kawase_draw_debug/kawase_draw_debug.yy deleted file mode 100644 index 799756c..0000000 --- a/scripts/kawase_draw_debug/kawase_draw_debug.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Kawase", - "path": "folders/Kawase.yy", - }, - "resourceVersion": "1.0", - "name": "kawase_draw_debug", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/kawase_get_height/kawase_get_height.gml b/scripts/kawase_get_height/kawase_get_height.gml deleted file mode 100644 index 222cda8..0000000 --- a/scripts/kawase_get_height/kawase_get_height.gml +++ /dev/null @@ -1,7 +0,0 @@ -/// @param kawaseArray - -function kawase_get_height(_root_array) -{ - var _array = _root_array[0]; - return _array[1]; -} \ No newline at end of file diff --git a/scripts/kawase_get_height/kawase_get_height.yy b/scripts/kawase_get_height/kawase_get_height.yy deleted file mode 100644 index 245b444..0000000 --- a/scripts/kawase_get_height/kawase_get_height.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Kawase", - "path": "folders/Kawase.yy", - }, - "resourceVersion": "1.0", - "name": "kawase_get_height", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/kawase_get_max_iterations/kawase_get_max_iterations.gml b/scripts/kawase_get_max_iterations/kawase_get_max_iterations.gml deleted file mode 100644 index ef2dd09..0000000 --- a/scripts/kawase_get_max_iterations/kawase_get_max_iterations.gml +++ /dev/null @@ -1,6 +0,0 @@ -/// @param kawaseArray - -function kawase_get_max_iterations(_root_array) -{ - return array_length(_root_array) - 1; -} \ No newline at end of file diff --git a/scripts/kawase_get_max_iterations/kawase_get_max_iterations.yy b/scripts/kawase_get_max_iterations/kawase_get_max_iterations.yy deleted file mode 100644 index 1628936..0000000 --- a/scripts/kawase_get_max_iterations/kawase_get_max_iterations.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Kawase", - "path": "folders/Kawase.yy", - }, - "resourceVersion": "1.0", - "name": "kawase_get_max_iterations", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/kawase_get_surface/kawase_get_surface.gml b/scripts/kawase_get_surface/kawase_get_surface.gml deleted file mode 100644 index 9983b30..0000000 --- a/scripts/kawase_get_surface/kawase_get_surface.gml +++ /dev/null @@ -1,6 +0,0 @@ -/// @param kawaseArray - -function kawase_get_surface(_root_array) -{ - return __kawase_check_surface(_root_array[0]); -} \ No newline at end of file diff --git a/scripts/kawase_get_surface/kawase_get_surface.yy b/scripts/kawase_get_surface/kawase_get_surface.yy deleted file mode 100644 index dfef356..0000000 --- a/scripts/kawase_get_surface/kawase_get_surface.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Kawase", - "path": "folders/Kawase.yy", - }, - "resourceVersion": "1.0", - "name": "kawase_get_surface", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/scripts/kawase_get_width/kawase_get_width.gml b/scripts/kawase_get_width/kawase_get_width.gml deleted file mode 100644 index 373c92c..0000000 --- a/scripts/kawase_get_width/kawase_get_width.gml +++ /dev/null @@ -1,7 +0,0 @@ -/// @param kawaseArray - -function kawase_get_width(_root_array) -{ - var _array = _root_array[0]; - return _array[0]; -} \ No newline at end of file diff --git a/scripts/kawase_get_width/kawase_get_width.yy b/scripts/kawase_get_width/kawase_get_width.yy deleted file mode 100644 index 5b3b164..0000000 --- a/scripts/kawase_get_width/kawase_get_width.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "isDnD": false, - "isCompatibility": false, - "parent": { - "name": "Kawase", - "path": "folders/Kawase.yy", - }, - "resourceVersion": "1.0", - "name": "kawase_get_width", - "tags": [], - "resourceType": "GMScript", -} \ No newline at end of file diff --git a/shaders/shd_kawase_down/shd_kawase_down.fsh b/shaders/shdKawaseDown/shdKawaseDown.fsh similarity index 100% rename from shaders/shd_kawase_down/shd_kawase_down.fsh rename to shaders/shdKawaseDown/shdKawaseDown.fsh diff --git a/shaders/shd_kawase_down/shd_kawase_down.vsh b/shaders/shdKawaseDown/shdKawaseDown.vsh similarity index 100% rename from shaders/shd_kawase_down/shd_kawase_down.vsh rename to shaders/shdKawaseDown/shdKawaseDown.vsh diff --git a/shaders/shd_kawase_up/shd_kawase_up.yy b/shaders/shdKawaseDown/shdKawaseDown.yy similarity index 79% rename from shaders/shd_kawase_up/shd_kawase_up.yy rename to shaders/shdKawaseDown/shdKawaseDown.yy index 6432574..a24bb4c 100644 --- a/shaders/shd_kawase_up/shd_kawase_up.yy +++ b/shaders/shdKawaseDown/shdKawaseDown.yy @@ -1,11 +1,10 @@ { + "resourceType": "GMShader", + "resourceVersion": "1.0", + "name": "shdKawaseDown", "type": 1, "parent": { "name": "(System)", "path": "folders/Kawase/(System).yy", }, - "resourceVersion": "1.0", - "name": "shd_kawase_up", - "tags": [], - "resourceType": "GMShader", } \ No newline at end of file diff --git a/shaders/shd_kawase_up/shd_kawase_up.fsh b/shaders/shdKawaseUp/shdKawaseUp.fsh similarity index 100% rename from shaders/shd_kawase_up/shd_kawase_up.fsh rename to shaders/shdKawaseUp/shdKawaseUp.fsh diff --git a/shaders/shd_kawase_up/shd_kawase_up.vsh b/shaders/shdKawaseUp/shdKawaseUp.vsh similarity index 100% rename from shaders/shd_kawase_up/shd_kawase_up.vsh rename to shaders/shdKawaseUp/shdKawaseUp.vsh diff --git a/shaders/shd_kawase_down/shd_kawase_down.yy b/shaders/shdKawaseUp/shdKawaseUp.yy similarity index 78% rename from shaders/shd_kawase_down/shd_kawase_down.yy rename to shaders/shdKawaseUp/shdKawaseUp.yy index 2eedd65..e6ad231 100644 --- a/shaders/shd_kawase_down/shd_kawase_down.yy +++ b/shaders/shdKawaseUp/shdKawaseUp.yy @@ -1,11 +1,10 @@ { + "resourceType": "GMShader", + "resourceVersion": "1.0", + "name": "shdKawaseUp", "type": 1, "parent": { "name": "(System)", "path": "folders/Kawase/(System).yy", }, - "resourceVersion": "1.0", - "name": "shd_kawase_down", - "tags": [], - "resourceType": "GMShader", } \ No newline at end of file diff --git a/sprites/spr_test/spr_test.yy b/sprites/spr_test/spr_test.yy index 9a37b65..e730aee 100644 --- a/sprites/spr_test/spr_test.yy +++ b/sprites/spr_test/spr_test.yy @@ -1,4 +1,7 @@ { + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_test", "bboxMode": 0, "collisionKind": 1, "type": 0, @@ -14,6 +17,7 @@ "HTile": false, "VTile": false, "For3D": false, + "DynamicTexturePage": false, "width": 1280, "height": 720, "textureGroupId": { @@ -24,15 +28,13 @@ "gridX": 0, "gridY": 0, "frames": [ - {"compositeImage":{"FrameId":{"name":"91db5e5b-2da2-4deb-ad80-bf6e7c7d700b","path":"sprites/spr_test/spr_test.yy",},"LayerId":null,"resourceVersion":"1.0","name":"imported","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"91db5e5b-2da2-4deb-ad80-bf6e7c7d700b","path":"sprites/spr_test/spr_test.yy",},"LayerId":{"name":"5297e07b-e5ac-4751-969f-b7010301b3b0","path":"sprites/spr_test/spr_test.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"spr_test","path":"sprites/spr_test/spr_test.yy",},"resourceVersion":"1.0","name":"91db5e5b-2da2-4deb-ad80-bf6e7c7d700b","tags":[],"resourceType":"GMSpriteFrame",}, - {"compositeImage":{"FrameId":{"name":"8cff7423-5c11-4dfc-a021-73c9940aa09c","path":"sprites/spr_test/spr_test.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ - {"FrameId":{"name":"8cff7423-5c11-4dfc-a021-73c9940aa09c","path":"sprites/spr_test/spr_test.yy",},"LayerId":{"name":"5297e07b-e5ac-4751-969f-b7010301b3b0","path":"sprites/spr_test/spr_test.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, - ],"parent":{"name":"spr_test","path":"sprites/spr_test/spr_test.yy",},"resourceVersion":"1.0","name":"8cff7423-5c11-4dfc-a021-73c9940aa09c","tags":[],"resourceType":"GMSpriteFrame",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"91db5e5b-2da2-4deb-ad80-bf6e7c7d700b",}, + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"8cff7423-5c11-4dfc-a021-73c9940aa09c",}, ], "sequence": { - "spriteId": {"name":"spr_test","path":"sprites/spr_test/spr_test.yy",}, + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "", "timeUnits": 1, "playback": 1, "playbackSpeed": 15.0, @@ -43,10 +45,10 @@ "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, "tracks": [ - {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","spriteId":null,"keyframes":{"Keyframes":[ {"id":"ca440d3c-03c9-4f14-af56-dbe6eb337a31","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"91db5e5b-2da2-4deb-ad80-bf6e7c7d700b","path":"sprites/spr_test/spr_test.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, {"id":"ddaac436-d808-45f6-94b5-8bf55b93d425","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"8cff7423-5c11-4dfc-a021-73c9940aa09c","path":"sprites/spr_test/spr_test.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, - ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"modifiers":[],}, ], "visibleRange": null, "lockOrigin": false, @@ -62,22 +64,13 @@ "yorigin": 0, "eventToFunction": {}, "eventStubScript": null, - "parent": {"name":"spr_test","path":"sprites/spr_test/spr_test.yy",}, - "resourceVersion": "1.3", - "name": "", - "tags": [], - "resourceType": "GMSequence", }, "layers": [ - {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"5297e07b-e5ac-4751-969f-b7010301b3b0","tags":[],"resourceType":"GMImageLayer",}, + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"5297e07b-e5ac-4751-969f-b7010301b3b0","visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default",}, ], "nineSlice": null, "parent": { "name": "kawase", "path": "kawase.yyp", }, - "resourceVersion": "1.0", - "name": "spr_test", - "tags": [], - "resourceType": "GMSprite", } \ No newline at end of file