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

Adjusted editor HUD elements

Browse Source 
-Made the camera follow object independent from the strum line

-Resized the strum line to exactly the size of the grid
This commit is contained in:
sperez 2021-07-11 14:53:04 -04:00
parent f67d0e4d92
commit 5c0124f398
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/ChartingState.hx
View File

@ -1,6 +1,7 @@
package; package;
import flixel.FlxCamera; import flixel.FlxCamera;
import flixel.FlxObject;
import flixel.addons.ui.FlxUIText; import flixel.addons.ui.FlxUIText;
import haxe.zip.Writer; import haxe.zip.Writer;
import Conductor.BPMChangeEvent; import Conductor.BPMChangeEvent;
@ -98,6 +99,8 @@ class ChartingState extends MusicBeatState
public var snapText:FlxText; public var snapText:FlxText;
var camFollow:FlxObject;
override function create() override function create()
{ {
curSection = lastSection; curSection = lastSection;
@ -121,8 +124,7 @@ class ChartingState extends MusicBeatState
}; };
} }
gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); addGrid(1);
add(gridBG);
var blackBorder:FlxSprite = new FlxSprite(60,10).makeGraphic(120,100,FlxColor.BLACK); var blackBorder:FlxSprite = new FlxSprite(60,10).makeGraphic(120,100,FlxColor.BLACK);
blackBorder.scrollFactor.set(); blackBorder.scrollFactor.set();
@ -171,7 +173,7 @@ class ChartingState extends MusicBeatState
bpmTxt.scrollFactor.set(); bpmTxt.scrollFactor.set();
add(bpmTxt); add(bpmTxt);
strumLine = new FlxSprite(0, 50).makeGraphic(Std.int(FlxG.width / 2), 4); strumLine = new FlxSprite(0, 50).makeGraphic(Std.int(GRID_SIZE * 8), 4);
add(strumLine); add(strumLine);
dummyArrow = new FlxSprite().makeGraphic(GRID_SIZE, GRID_SIZE); dummyArrow = new FlxSprite().makeGraphic(GRID_SIZE, GRID_SIZE);
@ -187,7 +189,7 @@ class ChartingState extends MusicBeatState
UI_box = new FlxUITabMenu(null, tabs, true); UI_box = new FlxUITabMenu(null, tabs, true);
UI_box.resize(300, 400); UI_box.resize(300, 400);
UI_box.x = FlxG.width / 2; UI_box.x = FlxG.width / 2 + 40;
UI_box.y = 20; UI_box.y = 20;
add(UI_box); add(UI_box);
@ -206,6 +208,12 @@ class ChartingState extends MusicBeatState
super.create(); super.create();
} }
function addGrid(?divisions:Float = 1)
{
remove(gridBG);
gridBG = FlxGridOverlay.create(GRID_SIZE, Std.int(GRID_SIZE / divisions), GRID_SIZE * 8, GRID_SIZE * 16);
add(gridBG);
}
function addSongUI():Void function addSongUI():Void
{ {
var UI_songTitle = new FlxUIInputText(10, 10, 70, _song.song, 8); var UI_songTitle = new FlxUIInputText(10, 10, 70, _song.song, 8);
@ -398,7 +406,10 @@ class ChartingState extends MusicBeatState
UI_box.addGroup(tab_group_assets); UI_box.addGroup(tab_group_assets);
UI_box.scrollFactor.set(); UI_box.scrollFactor.set();
FlxG.camera.follow(strumLine); camFollow = new FlxObject(280, 0, 1, 1);
add(camFollow);
FlxG.camera.follow(camFollow);
} }
var stepperLength:FlxUINumericStepper; var stepperLength:FlxUINumericStepper;
@ -717,7 +728,7 @@ class ChartingState extends MusicBeatState
} }
strumLine.y = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * _song.notes[curSection].lengthInSteps)); strumLine.y = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * _song.notes[curSection].lengthInSteps));
camFollow.y = strumLine.y;
if (playClaps) if (playClaps)
@ -1197,11 +1208,9 @@ class ChartingState extends MusicBeatState
stepperSusLength.value = curSelectedNote[2]; stepperSusLength.value = curSelectedNote[2];
} }
function updateGrid():Void function updateGrid(?divisions:Float = 1):Void
{ {
remove(gridBG); addGrid(divisions);
gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16);
add(gridBG);
remove(gridBlackLine); remove(gridBlackLine);
gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK); gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK);