From ce9c4b07152984110b871709ce72dbabb7f9b7f4 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Tue, 25 Jun 2024 13:58:15 +0700 Subject: [PATCH] - [WAV File in] Fix file reading error. --- PixelComposer.resource_order | 1 + PixelComposer.yyp | 1 + scripts/wav_file_read/wav_file_read.gml | 5 +- .../549edffd-9fc0-45db-8e73-40427c866f2e.png | Bin 0 -> 3707 bytes .../4f1ea2f4-b418-4333-9d11-8579b39fdbf8.png | Bin 0 -> 3707 bytes .../s_node_3d_stack_slice.yy | 90 ++++++++++++++++++ 6 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 sprites/s_node_3d_stack_slice/549edffd-9fc0-45db-8e73-40427c866f2e.png create mode 100644 sprites/s_node_3d_stack_slice/layers/549edffd-9fc0-45db-8e73-40427c866f2e/4f1ea2f4-b418-4333-9d11-8579b39fdbf8.png create mode 100644 sprites/s_node_3d_stack_slice/s_node_3d_stack_slice.yy diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 052f01f4f..e0d699c80 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -1652,6 +1652,7 @@ {"name":"s_node_3d_sphere_ico","order":15,"path":"sprites/s_node_3d_sphere_ico/s_node_3d_sphere_ico.yy",}, {"name":"s_node_3d_sphere_uv","order":16,"path":"sprites/s_node_3d_sphere_uv/s_node_3d_sphere_uv.yy",}, {"name":"s_node_3d_sphere","order":8,"path":"sprites/s_node_3d_sphere/s_node_3d_sphere.yy",}, + {"name":"s_node_3d_stack_slice","order":32,"path":"sprites/s_node_3d_stack_slice/s_node_3d_stack_slice.yy",}, {"name":"s_node_3d_transform_scene","order":22,"path":"sprites/s_node_3d_transform_scene/s_node_3d_transform_scene.yy",}, {"name":"s_node_3d_transform","order":4,"path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",}, {"name":"s_node_ace","order":61,"path":"sprites/s_node_ace/s_node_ace.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index 4f8f7df58..db4bcf464 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -2195,6 +2195,7 @@ {"id":{"name":"s_node_3d_sphere_ico","path":"sprites/s_node_3d_sphere_ico/s_node_3d_sphere_ico.yy",},}, {"id":{"name":"s_node_3d_sphere_uv","path":"sprites/s_node_3d_sphere_uv/s_node_3d_sphere_uv.yy",},}, {"id":{"name":"s_node_3d_sphere","path":"sprites/s_node_3d_sphere/s_node_3d_sphere.yy",},}, + {"id":{"name":"s_node_3d_stack_slice","path":"sprites/s_node_3d_stack_slice/s_node_3d_stack_slice.yy",},}, {"id":{"name":"s_node_3d_transform_scene","path":"sprites/s_node_3d_transform_scene/s_node_3d_transform_scene.yy",},}, {"id":{"name":"s_node_3d_transform","path":"sprites/s_node_3d_transform/s_node_3d_transform.yy",},}, {"id":{"name":"s_node_9patch","path":"sprites/s_node_9patch/s_node_9patch.yy",},}, diff --git a/scripts/wav_file_read/wav_file_read.gml b/scripts/wav_file_read/wav_file_read.gml index 2bfb577e1..e543349ab 100644 --- a/scripts/wav_file_read/wav_file_read.gml +++ b/scripts/wav_file_read/wav_file_read.gml @@ -89,6 +89,7 @@ function file_read_wav(path) { content.packet = bits; printIf(global.FLAG.wav_import, debug_str); + print($"Reading buffer {bits} pack from data length {l} with remaining data {_buffer_left}"); return content; } @@ -103,7 +104,8 @@ function file_read_wav_step() { else if(content.bit_depth == 16) { bf_type = buffer_s16; lim = 32_768; } else if(content.bit_depth == 32) { bf_type = buffer_s32; lim = 2_147_483_648; } - for(; wav_file_prg < content.packet; wav_file_prg++ ) { + // print($"Reading {wav_file_prg} to {content.packet} ({content.packet - wav_file_prg}) with remaining data {(buffer_get_size(wav_file_reader) - buffer_tell(wav_file_reader)) / (content.bit_depth / 8)}"); + while(wav_file_prg < content.packet) { var ch = 0; var cha = content.channels; var j = 0; @@ -116,6 +118,7 @@ function file_read_wav_step() { } content.soundF[0][wav_file_prg] = ch / content.channels; + wav_file_prg++; if(current_time - t > 1000 / 30) return false; } diff --git a/sprites/s_node_3d_stack_slice/549edffd-9fc0-45db-8e73-40427c866f2e.png b/sprites/s_node_3d_stack_slice/549edffd-9fc0-45db-8e73-40427c866f2e.png new file mode 100644 index 0000000000000000000000000000000000000000..3593789c0da48367a4c9b33bc9f05d8081169126 GIT binary patch literal 3707 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 literal 0 HcmV?d00001 diff --git a/sprites/s_node_3d_stack_slice/layers/549edffd-9fc0-45db-8e73-40427c866f2e/4f1ea2f4-b418-4333-9d11-8579b39fdbf8.png b/sprites/s_node_3d_stack_slice/layers/549edffd-9fc0-45db-8e73-40427c866f2e/4f1ea2f4-b418-4333-9d11-8579b39fdbf8.png new file mode 100644 index 0000000000000000000000000000000000000000..3593789c0da48367a4c9b33bc9f05d8081169126 GIT binary patch literal 3707 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 literal 0 HcmV?d00001 diff --git a/sprites/s_node_3d_stack_slice/s_node_3d_stack_slice.yy b/sprites/s_node_3d_stack_slice/s_node_3d_stack_slice.yy new file mode 100644 index 000000000..fb2beca3c --- /dev/null +++ b/sprites/s_node_3d_stack_slice/s_node_3d_stack_slice.yy @@ -0,0 +1,90 @@ +{ + "$GMSprite":"", + "%Name":"s_node_3d_stack_slice", + "bboxMode":0, + "bbox_bottom":60, + "bbox_left":1, + "bbox_right":62, + "bbox_top":3, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"","%Name":"549edffd-9fc0-45db-8e73-40427c866f2e","name":"549edffd-9fc0-45db-8e73-40427c866f2e","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":64, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"4f1ea2f4-b418-4333-9d11-8579b39fdbf8","blendMode":0,"displayName":"default","isLocked":false,"name":"4f1ea2f4-b418-4333-9d11-8579b39fdbf8","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"s_node_3d_stack_slice", + "nineSlice":null, + "origin":4, + "parent":{ + "name":"3D", + "path":"folders/nodes/icons/3D.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"", + "%Name":"s_node_3d_stack_slice", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"s_node_3d_stack_slice", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"549edffd-9fc0-45db-8e73-40427c866f2e","path":"sprites/s_node_3d_stack_slice/s_node_3d_stack_slice.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"626bcbe7-74cf-416d-8c0f-abf2b90c3799","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":32, + "yorigin":32, + }, + "swatchColours":null, + "swfPrecision":0.5, + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "type":0, + "VTile":false, + "width":64, +} \ No newline at end of file