Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions source/funkin/backend/scripting/events/gameplay/BopZoomEvent.hx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package funkin.backend.scripting.events.gameplay;

final class BopZoomEvent extends CancellableEvent {
/**
Whether to use the zoomMultiplier property in the camera.
**/
public var useZoomMultiplier:Bool;

/**
If higher than this, the zoom will be skipped.
**/
public var maxZoomMultiplier:Float;

/**
The zoom's strength multiplier.
**/
public var zoomStrength:Float;
}
32 changes: 25 additions & 7 deletions source/funkin/game/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -1428,13 +1428,8 @@ class PlayState extends MusicBeatState
var beat = Conductor.getBeats(camZoomingEvery, camZoomingInterval, camZoomingOffset);
if (camZoomingLastBeat != beat) {
camZoomingLastBeat = beat;
if (useCamZoomMult) {
if (camZoomingMult < maxCamZoomMult) camZoomingMult += camZoomingStrength;
}
else if (FlxG.camera.zoom < maxCamZoom) {
FlxG.camera.zoom += camGameZoomMult * camZoomingStrength;
camHUD.zoom += camHUDZoomMult * camZoomingStrength;
}

doBopZoom();
}
}

Expand Down Expand Up @@ -1514,6 +1509,29 @@ class PlayState extends MusicBeatState
scripts.event("postDraw", e);
}

public function doBopZoom()
{
var event:BopZoomEvent = EventManager.get(BopZoomEvent).recycle(useCamZoomMult, maxCamZoomMult, camZoomingStrength);
gameAndCharsEvent("OnBopZoom", event);

if (event.cancelled)
{
gameAndCharsEvent("onPostBopZoom", event);
return;
}

if (event.useZoomMultiplier) {
if (camZoomingMult < event.maxZoomMultiplier)
camZoomingMult += event.zoomStrength;
}
else if (FlxG.camera.zoom < maxCamZoom) {
FlxG.camera.zoom += camGameZoomMult * event.zoomStrength;
camHUD.zoom += camHUDZoomMult * event.zoomStrength;
}

gameAndCharsEvent("onPostBopZoom", event);
}

public function moveCamera() if (strumLines.members[curCameraTarget] != null) {
var data:CamPosData = getStrumlineCamPos(curCameraTarget);
data.pos.add(cameraFocusOffset.x, cameraFocusOffset.y);
Expand Down