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

camGameZoomMult, camHudZoomMult

Browse Source
This commit is contained in:
Ralty
2025-08-06 19:22:26 +07:00
parent 70195051ec
commit f8aa7201c0
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/system/Flags.hx
+5 -6
View File
@@ -138,8 +138,12 @@ class Flags {
public static var DEFAULT_HUD_ZOOM:Float = 1.0;
public static var DEFAULT_ZOOM:Float = 1.0;
public static var DEFAULT_ZOOM_LERP:Float = 0.05;
public static var MAX_CAMERA_ZOOM_MULT:Float = 10;
public static var USE_CAM_ZOOM_MULT:Bool = true;
public static var MAX_CAMERA_ZOOM_MULT:Float = 1.35;
public static var DEFAULT_CAM_ZOOM_MULT:Float = 0.015;
public static var DEFAULT_HUD_ZOOM_MULT:Float = 0.03;
public static var DEFAULT_CAM_ZOOM_LERP:Float = 0.05;
public static var DEFAULT_HUD_ZOOM_LERP:Float = 0.05;
// to translate these you need to convert them into ids
// Resume -> pause.resume
@@ -167,11 +171,6 @@ class Flags {
public static var DEFAULT_INTRO_LENGTH:Int = 5;
public static var DEFAULT_INTRO_SPRITES:Array<String> = [null, 'game/ready', 'game/set', 'game/go'];
public static var CAM_BOP_STRENGTH:Float = 0.015;
public static var HUD_BOP_STRENGTH:Float = 0.03;
public static var DEFAULT_CAM_ZOOM_LERP:Float = 0.05;
public static var DEFAULT_HUD_ZOOM_LERP:Float = 0.05;
public static var MAX_SPLASHES:Int = 8;
public static var STUNNED_TIME:Float = 5 / 60;
source/funkin/game/PlayState.hx
+17 -7
View File
@@ -362,6 +362,10 @@ class PlayState extends MusicBeatState
* Speed at which the game camera zoom lerps to.
*/
public var camGameZoomLerp:Float = Flags.DEFAULT_CAM_ZOOM_LERP;
/**
* The current multiplier for game camera zooming.
*/
public var camGameZoomMult:Float = Flags.DEFAULT_CAM_ZOOM_MULT;
/**
* Camera zoom at which the hud lerps to.
@@ -371,6 +375,10 @@ class PlayState extends MusicBeatState
* Speed at which the hud camera zoom lerps to.
*/
public var camHUDZoomLerp:Float = Flags.DEFAULT_HUD_ZOOM_LERP;
/**
* The current multiplier for game camera zooming.
*/
public var camHUDZoomMult:Float = Flags.DEFAULT_HUD_ZOOM_MULT;
/**
* Camera zoom at which the cameras that zooms lerps to.
@@ -420,7 +428,7 @@ class PlayState extends MusicBeatState
*/
public var useCamZoomMult:Bool = Flags.USE_CAM_ZOOM_MULT;
/**
* The current multiplier for cam zooming.
* The current multiplier for camera zooming.
* (Only used if useCamZoomMult is on).
*/
public var camZoomingMult:Float = Flags.DEFAULT_ZOOM;
@@ -429,7 +437,7 @@ class PlayState extends MusicBeatState
*/
public var maxCamZoom(get, default):Float = Math.NaN;
private inline function get_maxCamZoom() return Math.isNaN(maxCamZoom) ? maxCamZoomMult * defaultCamZoom : maxCamZoom;
private inline function get_maxCamZoom() return Math.isNaN(maxCamZoom) ? defaultCamZoom + (camZoomingMult * camGameZoomMult) : maxCamZoom;
/**
* Zoom for the pixel assets.
@@ -1348,10 +1356,12 @@ class PlayState extends MusicBeatState
var beat = Conductor.getBeats(camZoomingEvery, camZoomingInterval, camZoomingOffset);
if (camZoomingLastBeat != beat) {
camZoomingLastBeat = beat;
if (useCamZoomMult) camZoomingMult = Math.min(camZoomingMult + camZoomingStrength, defaultZoom + camZoomingStrength);
if (useCamZoomMult) {
if (camZoomingMult < maxCamZoomMult) camZoomingMult += camZoomingStrength;
}
else if (FlxG.camera.zoom < maxCamZoom) {
FlxG.camera.zoom += 0.015 * camZoomingStrength;
camHUD.zoom += 0.03 * camZoomingStrength;
FlxG.camera.zoom += camGameZoomMult * camZoomingStrength;
camHUD.zoom += camHUDZoomMult * camZoomingStrength;
}
}
}
@@ -1397,8 +1407,8 @@ class PlayState extends MusicBeatState
if (camZooming) {
if (useCamZoomMult) {
camZoomingMult = lerp(camZoomingMult, defaultZoom, camZoomLerp) - defaultZoom;
FlxG.camera.zoomMultiplier = camZoomingMult * 0.015 + defaultZoom;
camHUD.zoomMultiplier = camZoomingMult * 0.03 + defaultZoom;
FlxG.camera.zoomMultiplier = camZoomingMult * camGameZoomMult + defaultZoom;
camHUD.zoomMultiplier = camZoomingMult * camHUDZoomMult + defaultZoom;
camZoomingMult += defaultZoom;
}
FlxG.camera.zoom = lerp(FlxG.camera.zoom, defaultCamZoom, camGameZoomLerp);