Skip to content

Commit

Permalink
Side MIXER Finished
Browse files Browse the repository at this point in the history
  • Loading branch information
NagaseIori committed Jun 1, 2022
1 parent 16a342f commit 555e407
Show file tree
Hide file tree
Showing 17 changed files with 139 additions and 55 deletions.
11 changes: 6 additions & 5 deletions DyNode.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{"id":{"name":"DerpXmlExample_Write","path":"scripts/DerpXmlExample_Write/DerpXmlExample_Write.yy",},"order":3,},
{"id":{"name":"scribble_anim_wobble","path":"scripts/scribble_anim_wobble/scribble_anim_wobble.yy",},"order":9,},
{"id":{"name":"libfilesystem","path":"extensions/libfilesystem/libfilesystem.yy",},"order":3,},
{"id":{"name":"objMain","path":"objects/objMain/objMain.yy",},"order":2,},
{"id":{"name":"objMain","path":"objects/objMain/objMain.yy",},"order":1,},
{"id":{"name":"scribble_anim_shake","path":"scripts/scribble_anim_shake/scribble_anim_shake.yy",},"order":6,},
{"id":{"name":"scribble_anim_wheel","path":"scripts/scribble_anim_wheel/scribble_anim_wheel.yy",},"order":8,},
{"id":{"name":"__scribble_system","path":"scripts/__scribble_system/__scribble_system.yy",},"order":10,},
Expand Down Expand Up @@ -50,7 +50,7 @@
{"id":{"name":"scribble_font_duplicate","path":"scripts/scribble_font_duplicate/scribble_font_duplicate.yy",},"order":5,},
{"id":{"name":"FMODGMS_Util_SamplesToBeats","path":"scripts/FMODGMS_Util_SamplesToBeats/FMODGMS_Util_SamplesToBeats.yy",},"order":5,},
{"id":{"name":"__scribble_gen_1_model_limits_and_bezier_curves","path":"scripts/__scribble_gen_1_model_limits_and_bezier_curves/__scribble_gen_1_model_limits_and_bezier_curves.yy",},"order":0,},
{"id":{"name":"objManager","path":"objects/objManager/objManager.yy",},"order":1,},
{"id":{"name":"objManager","path":"objects/objManager/objManager.yy",},"order":0,},
{"id":{"name":"scribble_super_glyph_copy","path":"scripts/scribble_super_glyph_copy/scribble_super_glyph_copy.yy",},"order":2,},
{"id":{"name":"rMain","path":"rooms/rMain/rMain.yy",},"order":1,},
{"id":{"name":"__shd_scribble_bake_shadow","path":"shaders/__shd_scribble_bake_shadow/__shd_scribble_bake_shadow.yy",},"order":4,},
Expand Down Expand Up @@ -111,6 +111,7 @@
{"id":{"name":"DerpXmlRead_Read","path":"scripts/DerpXmlRead_Read/DerpXmlRead_Read.yy",},"order":7,},
{"id":{"name":"__shd_scribble_bake_outline_8dir_2px","path":"shaders/__shd_scribble_bake_outline_8dir_2px/__shd_scribble_bake_outline_8dir_2px.yy",},"order":3,},
{"id":{"name":"sprMIXshadow","path":"sprites/sprMIXshadow/sprMIXshadow.yy",},"order":1,},
{"id":{"name":"objShadowMIX","path":"objects/objShadowMIX/objShadowMIX.yy",},"order":3,},
{"id":{"name":"scribble_font_bake_outline","path":"scripts/scribble_font_bake_outline/scribble_font_bake_outline.yy",},"order":4,},
{"id":{"name":"DerpXmlExample_ReadOther","path":"scripts/DerpXmlExample_ReadOther/DerpXmlExample_ReadOther.yy",},"order":2,},
{"id":{"name":"scribble_font_bake_shadow","path":"scripts/scribble_font_bake_shadow/scribble_font_bake_shadow.yy",},"order":4,},
Expand Down Expand Up @@ -150,7 +151,7 @@
{"id":{"name":"scribble_font_add_msdf","path":"scripts/scribble_font_add_msdf/scribble_font_add_msdf.yy",},"order":3,},
{"id":{"name":"objHoldSub","path":"objects/objHoldSub/objHoldSub.yy",},"order":3,},
{"id":{"name":"scribble_super_clear","path":"scripts/scribble_super_clear/scribble_super_clear.yy",},"order":0,},
{"id":{"name":"objShadow","path":"objects/objShadow/objShadow.yy",},"order":3,},
{"id":{"name":"objShadow","path":"objects/objShadow/objShadow.yy",},"order":2,},
{"id":{"name":"scribble_rgb_to_bgr","path":"scripts/scribble_rgb_to_bgr/scribble_rgb_to_bgr.yy",},"order":6,},
{"id":{"name":"scribble_font_bake_outline_4dir","path":"scripts/scribble_font_bake_outline_4dir/scribble_font_bake_outline_4dir.yy",},"order":0,},
{"id":{"name":"sprChainL","path":"sprites/sprChainL/sprChainL.yy",},"order":15,},
Expand Down Expand Up @@ -213,7 +214,7 @@
{"folderPath":"folders/Scribble/Miscellaneous.yy","order":5,"resourceVersion":"1.0","name":"Miscellaneous","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scribble/Quick Functions.yy","order":6,"resourceVersion":"1.0","name":"Quick Functions","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scribble/Superfonts.yy","order":7,"resourceVersion":"1.0","name":"Superfonts","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects/DerpXml.yy","order":5,"resourceVersion":"1.0","name":"DerpXml","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects/DerpXml.yy","order":4,"resourceVersion":"1.0","name":"DerpXml","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scripts/compatibility.yy","order":1,"resourceVersion":"1.0","name":"compatibility","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scripts/compatibility/instance.yy","order":1,"resourceVersion":"1.0","name":"instance","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scripts/compatibility/object.yy","order":2,"resourceVersion":"1.0","name":"object","tags":[],"resourceType":"GMFolder",},
Expand All @@ -223,7 +224,7 @@
{"folderPath":"folders/Scripts/DerpXml/Read.yy","order":3,"resourceVersion":"1.0","name":"Read","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scripts/DerpXml/Write.yy","order":4,"resourceVersion":"1.0","name":"Write","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Scripts/FMODGMS.yy","order":5,"resourceVersion":"1.0","name":"FMODGMS","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects/MNotes.yy","order":6,"resourceVersion":"1.0","name":"MNotes","tags":[],"resourceType":"GMFolder",},
{"folderPath":"folders/Objects/MNotes.yy","order":5,"resourceVersion":"1.0","name":"MNotes","tags":[],"resourceType":"GMFolder",},
],
"AudioGroups": [
{"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",},
Expand Down
13 changes: 6 additions & 7 deletions objects/objmain/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@

// Mixer

mixerXL = global.resolutionH/2;
mixerXR = global.resolutionH/2;
mixerNextXL = global.resolutionH/2;
mixerNextXR = global.resolutionH/2;
mixerSpeed = 0.2;
mixerX = array_create(2, global.resolutionH/2);
mixerNextX = array_create(2, note_pos_to_x(2.5, 1));
mixerSpeed = 0.5;
mixerMaxSpeed = 250; // px per frame
mixerNextNote = [-1, -1]

// Chart Properties

Expand All @@ -64,8 +64,7 @@
chartBarPerMin = 180/4;
chartOffset = 0;
chartDifficulty = "CASUAL";
chartLeftType = "MIXER";
chartRightType = "MULTI";
chartSideType = ["MIXER", "MULTI"];
chartID = "";
chartMusicFile = "";
chartFile = "";
Expand Down
9 changes: 9 additions & 0 deletions objects/objmain/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ var _nw = global.resolutionW, _nh = global.resolutionH;

part_system_drawit(partSysNote);

// Draw Mixer

for(var i=0; i<2; i++) {
if(chartSideType[i] == "MIXER") {
draw_sprite(sprMixer, 0,
i*_nw + (i? -1:1) * targetLineBeside, mixerX[i]);
}
}

// Debug

// scribble("Music to Chart Delay: " + string(sfmod_channel_get_position(channel, sampleRate) - nowTime) +
Expand Down
6 changes: 6 additions & 0 deletions objects/objmain/Step_1.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/// @description Reset Tags

// Mixer

mixerNextNote = [-1, -1]
// mixerNextX = array_create(2, note_pos_to_x(2.5, 1));
7 changes: 7 additions & 0 deletions objects/objmain/Step_2.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

// Mixer Update

for(var i=0; i<2; i++) {
mixerX[i] = lerp_lim(mixerX[i], mixerNextX[i],
mixerSpeed * global.fpsAdjust, mixerMaxSpeed * global.fpsAdjust);
}
2 changes: 2 additions & 0 deletions objects/objmain/objmain.yy
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
{"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
{"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
{"isDnD":false,"eventNum":0,"eventType":12,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
{"isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
{"isDnD":false,"eventNum":2,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
],
"properties": [],
"overriddenProperties": [],
Expand Down
7 changes: 4 additions & 3 deletions objects/objnote/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ depth = 100;
pWidth = (width * 300 - 30)*2; // Width In Pixels
originalWidth = sprite_get_width(sprite_index);

shadow = objShadow;

animSpeed = 0.4;
animTargetA = 0;
animTargetLstA = lastAlpha;
Expand Down Expand Up @@ -85,7 +83,10 @@ depth = 100;
global.resolutionW - objMain.targetLineBeside;
_y = y;
}
var _inst = instance_create_depth(_x, _y, depth, shadow), _scl = 1;
var _shadow = objShadow;
if(side > 0 && objMain.chartSideType[side-1] == "MIXER")
_shadow = objShadowMIX;
var _inst = instance_create_depth(_x, _y, depth, _shadow), _scl = 1;
_inst.nowWidth = pWidth;
_inst.visible = true;
_inst.image_angle = image_angle;
Expand Down
11 changes: 11 additions & 0 deletions objects/objnote/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ else {
visible = false;
else
visible = true;

if(visible) {
var _nside = side-1, _noff = offset, _nx = y, _nid = id;

with(objMain) {
if(mixerNextNote[_nside] == -1 || _noff < mixerNextNote[_nside].offset) {
mixerNextNote[_nside] = _nid;
mixerNextX[_nside] = _nx;
}
}
}
}


Expand Down
1 change: 0 additions & 1 deletion objects/objshadow/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// In-Variables

visible = false;
animSpeed = 0.07;
animState = 1.0;
animTarget = 0.0;
animTargetX = 0.8;
Expand Down
2 changes: 0 additions & 2 deletions objects/objshadow/Step_0.gml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

animLast ++;

nowScaleX = (nowWidth + extraWidth) / originalWidth;

animState = animcurve_channel_evaluate(animCurvChan, animLast/animTime);
image_xscale = lerp(nowScaleX, nowScaleX * animTargetX, 1-animState);
image_yscale = lerp(1, animTargetY, 1-animState);
Expand Down
3 changes: 3 additions & 0 deletions objects/objshadow/Step_1.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/// @description Init width & scale

nowScaleX = (nowWidth + extraWidth) / originalWidth;
11 changes: 6 additions & 5 deletions objects/objshadow/objshadow.yy
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
{
"name": "objShadow",
"spriteId": {
"name": "sprShadow",
"path": "sprites/sprShadow/sprShadow.yy",
},
"spriteMaskId": null,
"visible": true,
"solid": false,
"persistent": false,
"physicsObject": false,
"visible": true,
"managed": true,
"spriteMaskId": null,
"persistent": false,
"parentObjectId": null,
"physicsObject": false,
"physicsSensor": false,
"physicsShape": 1,
"physicsGroup": 1,
Expand All @@ -26,6 +25,7 @@
{"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
{"isDnD":false,"eventNum":0,"eventType":3,"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":1,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
],
"properties": [],
"overriddenProperties": [],
Expand All @@ -34,6 +34,7 @@
"path": "folders/Objects.yy",
},
"resourceVersion": "1.0",
"name": "objShadow",
"tags": [],
"resourceType": "GMObject",
}
6 changes: 6 additions & 0 deletions objects/objshadowmix/Create_0.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/// @description

// Inherit the parent event
event_inherited();

animTime = room_speed * 0.1;
41 changes: 41 additions & 0 deletions objects/objshadowmix/objshadowmix.yy
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"spriteId": {
"name": "sprMIXshadow",
"path": "sprites/sprMIXshadow/sprMIXshadow.yy",
},
"solid": false,
"visible": true,
"managed": true,
"spriteMaskId": null,
"persistent": false,
"parentObjectId": {
"name": "objShadow",
"path": "objects/objShadow/objShadow.yy",
},
"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": [
{"isDnD":false,"eventNum":1,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
{"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
],
"properties": [],
"overriddenProperties": [],
"parent": {
"name": "Objects",
"path": "folders/Objects.yy",
},
"resourceVersion": "1.0",
"name": "objShadowMIX",
"tags": [],
"resourceType": "GMObject",
}
4 changes: 2 additions & 2 deletions scripts/scrSystem/scrSystem.gml
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@ function map_load_xml(_file) {
objMain.chartOffset = real(_val);
break;
case "m_leftRegion":
objMain.chartLeftType = _val;
objMain.chartSideType[0] = _val;
break;
case "m_rightRegion":
objMain.chartRightType = _val;
objMain.chartSideType[1] = _val;
break;
case "m_mapID":
objMain.chartID = _val;
Expand Down
30 changes: 15 additions & 15 deletions sprites/sprmixshadow/sprmixshadow.yy
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
{
"name": "sprMIXshadow",
"HTile": false,
"VTile": false,
"For3D": false,
"bboxMode": 0,
"collisionKind": 1,
"type": 0,
"origin": 9,
"preMultiplyAlpha": false,
"edgeFiltering": false,
"collisionTolerance": 0,
"swfPrecision": 2.525,
"bbox_left": 1,
"bbox_right": 376,
"bbox_top": 0,
"bbox_bottom": 425,
"origin": 9,
"bboxMode": 0,
"collisionKind": 1,
"type": 0,
"swfPrecision": 2.525,
"HTile": false,
"VTile": false,
"For3D": false,
"width": 381,
"height": 437,
"textureGroupId": {
Expand All @@ -30,12 +29,6 @@
],"parent":{"name":"sprMIXshadow","path":"sprites/sprMIXshadow/sprMIXshadow.yy",},"resourceVersion":"1.0","name":"a5939efc-6f86-4d5e-bc22-06e1f72151bb","tags":[],"resourceType":"GMSpriteFrame",},
],
"sequence": {
"tracks": [
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
{"id":"ff148b31-2845-4d1d-8409-4fed0224c1af","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a5939efc-6f86-4d5e-bc22-06e1f72151bb","path":"sprites/sprMIXshadow/sprMIXshadow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],},
],
"visibleRange": null,
"spriteId": {"name":"sprMIXshadow","path":"sprites/sprMIXshadow/sprMIXshadow.yy",},
"timeUnits": 1,
"playback": 1,
Expand All @@ -46,6 +39,12 @@
"length": 1.0,
"events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MessageEventKeyframe>",},
"moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
"tracks": [
{"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
{"id":"ff148b31-2845-4d1d-8409-4fed0224c1af","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"a5939efc-6f86-4d5e-bc22-06e1f72151bb","path":"sprites/sprMIXshadow/sprMIXshadow.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack","modifiers":[],},
],
"visibleRange": null,
"lockOrigin": false,
"showBackdrop": true,
"showBackdropImage": false,
Expand Down Expand Up @@ -74,6 +73,7 @@
"path": "folders/Sprites.yy",
},
"resourceVersion": "1.0",
"name": "sprMIXshadow",
"tags": [],
"resourceType": "GMSprite",
}
Loading

0 comments on commit 555e407

Please sign in to comment.