gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for decimals in cam bop offset and rate

Browse Source
This commit is contained in:
Kolo
2026-01-29 22:07:58 -07:00
committed by Hundrec
parent 583700006c
commit c2055a322d
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/play/PlayState.hx
+15 -15
View File
@@ -352,14 +352,14 @@ class PlayState extends MusicBeatSubState
* How many beats (quarter notes) between camera zooms.
* @default One camera zoom per measure (four beats).
*/
public var cameraZoomRate:Int = Constants.DEFAULT_ZOOM_RATE;
public var cameraZoomRate:Float = Constants.DEFAULT_ZOOM_RATE;
/**
* How many beats (quarter notes) the zoom rate is offset.
* For if you want the zoom to happen off-beat.
* @default Zero beats (on-beat).
*/
public var cameraZoomRateOffset:Int = Constants.DEFAULT_ZOOM_OFFSET;
public var cameraZoomRateOffset:Float = Constants.DEFAULT_ZOOM_OFFSET;
/**
* Whether the game is currently in the countdown before the song resumes.
@@ -1838,6 +1838,19 @@ class PlayState extends MusicBeatSubState
iconP1?.onStepHit(Std.int(Conductor.instance.currentStep));
iconP2?.onStepHit(Std.int(Conductor.instance.currentStep));
// Only bop camera if zoom level is below 135%
if (Preferences.zoomCamera
&& FlxG.camera.zoom < (1.35 * FlxCamera.defaultZoom)
&& cameraZoomRate > 0
&& (Conductor.instance.currentStep + cameraZoomRateOffset * Constants.STEPS_PER_BEAT) % (cameraZoomRate * Constants.STEPS_PER_BEAT) == 0)
{
// Set zoom multiplier for camera bop.
cameraBopMultiplier = cameraBopIntensity;
// HUD camera zoom still uses old system. To change. (+3%)
camHUD.zoom += hudCameraZoomIntensity * defaultHUDCameraZoom;
}
// trace('Not bopping camera: ${FlxG.camera.zoom} < ${(1.35 * defaultCameraZoom)} && ${cameraZoomRate} > 0 && ${Conductor.instance.currentBeat} % ${cameraZoomRate} == ${Conductor.instance.currentBeat % cameraZoomRate}}');
// Try to call hold note haptics each step hit. Works if atleast one note status is NoteStatus.isHoldNotePressed.
playerStrumline.noteVibrations.tryHoldNoteVibration();
@@ -1898,19 +1911,6 @@ class PlayState extends MusicBeatSubState
}
}
// Only bop camera if zoom level is below 135%
if (Preferences.zoomCamera
&& FlxG.camera.zoom < (1.35 * FlxCamera.defaultZoom)
&& cameraZoomRate > 0
&& (Conductor.instance.currentBeat + cameraZoomRateOffset) % cameraZoomRate == 0)
{
// Set zoom multiplier for camera bop.
cameraBopMultiplier = cameraBopIntensity;
// HUD camera zoom still uses old system. To change. (+3%)
camHUD.zoom += hudCameraZoomIntensity * defaultHUDCameraZoom;
}
// trace('Not bopping camera: ${FlxG.camera.zoom} < ${(1.35 * defaultCameraZoom)} && ${cameraZoomRate} > 0 && ${Conductor.instance.currentBeat} % ${cameraZoomRate} == ${Conductor.instance.currentBeat % cameraZoomRate}}');
if (playerStrumline != null) playerStrumline.onBeatHit();
if (opponentStrumline != null) opponentStrumline.onBeatHit();
source/funkin/play/event/SetCameraBopSongEvent.hx
+7 -10
View File
@@ -40,12 +40,9 @@ class SetCameraBopSongEvent extends SongEvent
// Does nothing if there is no PlayState camera or stage.
if (PlayState.instance == null) return;
var rate:Null<Int> = data.getInt('rate');
if (rate == null) rate = Constants.DEFAULT_ZOOM_RATE;
var offset:Null<Int> = data.getInt('offset');
if (rate == null) offset = Constants.DEFAULT_ZOOM_OFFSET;
var intensity:Null<Float> = data.getFloat('intensity');
if (intensity == null) intensity = 1.0;
var rate:Float = data.getFloat('rate') ?? Constants.DEFAULT_ZOOM_RATE;
var offset:Float = data.getFloat('offset') ?? Constants.DEFAULT_ZOOM_OFFSET;
var intensity:Float = data.getFloat('intensity') ?? 1.0;
PlayState.instance.cameraBopIntensity = (Constants.DEFAULT_BOP_INTENSITY - 1.0) * intensity + 1.0;
PlayState.instance.hudCameraZoomIntensity = (Constants.DEFAULT_BOP_INTENSITY - 1.0) * intensity * 2.0;
@@ -84,8 +81,8 @@ class SetCameraBopSongEvent extends SongEvent
name: 'offset',
title: 'Offset',
defaultValue: Constants.DEFAULT_ZOOM_OFFSET,
step: 1,
type: SongEventFieldType.INTEGER,
step: 0.25,
type: SongEventFieldType.FLOAT,
units: 'beats'
},
{
@@ -93,8 +90,8 @@ class SetCameraBopSongEvent extends SongEvent
title: 'Rate',
defaultValue: Constants.DEFAULT_ZOOM_RATE,
min: 0,
step: 1,
type: SongEventFieldType.INTEGER,
step: 0.25,
type: SongEventFieldType.FLOAT,
units: 'beats/zoom'
}
]);