AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make zooming better and qol in customize state

Browse Source
This commit is contained in:
KadeDeveloper 2021-08-09 00:31:19 -07:00
parent 8d6e9d88fa
commit 53f6095c26
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/GameplayCustomizeState.hx
View File

@ -122,13 +122,19 @@ class GameplayCustomizeState extends MusicBeatState
generateStaticArrows(0); generateStaticArrows(0);
generateStaticArrows(1); generateStaticArrows(1);
text = new FlxText(5, FlxG.height + 40, 0, "Click and drag around gameplay elements to customize their positions.\nPress R to reset. +/- to change zoom.\nPress Escape to go back.", 12); text = new FlxText(5, FlxG.height + 40, 0, "Click and drag around gameplay elements to customize their positions. Press R to reset. Q/E to change zoom. Press Escape to go back.", 12);
text.scrollFactor.set(); text.scrollFactor.set();
text.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); text.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
blackBorder = new FlxSprite(-30,FlxG.height + 40).makeGraphic((Std.int(text.width + 900)),Std.int(text.height + 600),FlxColor.BLACK); blackBorder = new FlxSprite(-30,FlxG.height + 40).makeGraphic((Std.int(text.width + 900)),Std.int(text.height + 600),FlxColor.BLACK);
blackBorder.alpha = 0.5; blackBorder.alpha = 0.5;
background.cameras = [camHUD];
text.cameras = [camHUD];
text.scrollFactor.set();
background.scrollFactor.set();
add(blackBorder); add(blackBorder);
add(text); add(text);
@ -156,13 +162,19 @@ class GameplayCustomizeState extends MusicBeatState
super.update(elapsed); super.update(elapsed);
if (FlxG.save.data.zoom < 0.8)
FlxG.save.data.zoom = 0.8;
if (FlxG.save.data.zoom > 1.2)
FlxG.save.data.zoom = 1.2;
FlxG.camera.zoom = FlxMath.lerp(0.9, FlxG.camera.zoom, 0.95); FlxG.camera.zoom = FlxMath.lerp(0.9, FlxG.camera.zoom, 0.95);
camHUD.zoom = FlxMath.lerp(1, camHUD.zoom, 0.95); camHUD.zoom = FlxMath.lerp(FlxG.save.data.zoom, camHUD.zoom, 0.95);
if (FlxG.mouse.overlaps(sick) && FlxG.mouse.pressed) if (FlxG.mouse.overlaps(sick) && FlxG.mouse.pressed)
{ {
sick.x = FlxG.mouse.x - sick.width / 2; sick.x = (FlxG.mouse.x - sick.width / 2) - 60;
sick.y = FlxG.mouse.y - sick.height; sick.y = (FlxG.mouse.y - sick.height) - 60;
} }
for (i in playerStrums) for (i in playerStrums)
@ -170,18 +182,19 @@ class GameplayCustomizeState extends MusicBeatState
for (i in strumLineNotes) for (i in strumLineNotes)
i.y = strumLine.y; i.y = strumLine.y;
if (FlxG.keys.pressed.PLUS) if (FlxG.keys.justPressed.Q)
{ {
FlxG.save.data.zoom += 0.1; FlxG.save.data.zoom += 0.02;
camHUD.zoom = FlxG.save.data.zoom; camHUD.zoom = FlxG.save.data.zoom;
} }
if (FlxG.keys.pressed.MINUS) if (FlxG.keys.justPressed.E)
{ {
FlxG.save.data.zoom -= 0.1; FlxG.save.data.zoom -= 0.02;
camHUD.zoom = FlxG.save.data.zoom; camHUD.zoom = FlxG.save.data.zoom;
} }
if (FlxG.mouse.overlaps(sick) && FlxG.mouse.justReleased) if (FlxG.mouse.overlaps(sick) && FlxG.mouse.justReleased)
{ {
FlxG.save.data.changedHitX = sick.x; FlxG.save.data.changedHitX = sick.x;

8
source/PlayState.hx
View File

@ -2783,8 +2783,14 @@ class PlayState extends MusicBeatState
if (camZooming) if (camZooming)
{ {
if (FlxG.save.data.zoom < 0.8)
FlxG.save.data.zoom = 0.8;
if (FlxG.save.data.zoom > 1.2)
FlxG.save.data.zoom = 1.2;
FlxG.camera.zoom = FlxMath.lerp(defaultCamZoom, FlxG.camera.zoom, 0.95); FlxG.camera.zoom = FlxMath.lerp(defaultCamZoom, FlxG.camera.zoom, 0.95);
camHUD.zoom = FlxMath.lerp(1, camHUD.zoom, 0.95); camHUD.zoom = FlxMath.lerp(FlxG.save.data.zoom, camHUD.zoom, 0.95);
} }
FlxG.watch.addQuick("curBPM", Conductor.bpm); FlxG.watch.addQuick("curBPM", Conductor.bpm);