Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

add grid nav controls

Browse source
This commit is contained in:
George FunBook 2021-02-23 18:59:09 -06:00
parent 38496ea74d
commit d3e17274a8
1 changed files with 76 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
source/ui/MenuList.hx
View file

@ -29,7 +29,7 @@ class MenuTypedList<T:MenuItem> extends FlxTypedGroup<T>
super(); super();
} }
function addItem(name:String, item:T):T public function addItem(name:String, item:T):T
{ {
if (length == selectedIndex) if (length == selectedIndex)
item.select(); item.select();
@ -63,23 +63,20 @@ class MenuTypedList<T:MenuItem> extends FlxTypedGroup<T>
{ {
var controls = PlayerSettings.player1.controls; var controls = PlayerSettings.player1.controls;
switch(navControls) var newIndex = switch(navControls)
{ {
case Vertical: case Vertical : navList(controls.UP_P , controls.DOWN_P);
{ case Horizontal : navList(controls.LEFT_P, controls.RIGHT_P);
if (controls.UP_P ) prev(); case Both : navList(controls.LEFT_P || controls.UP_P, controls.RIGHT_P || controls.DOWN_P);
if (controls.DOWN_P) next();
case Columns(num): navGrid(num, controls.LEFT_P, controls.RIGHT_P, controls.UP_P, controls.DOWN_P);
case Rows (num): navGrid(num, controls.UP_P, controls.DOWN_P, controls.LEFT_P, controls.RIGHT_P);
} }
case Horizontal:
if (newIndex != selectedIndex)
{ {
if (controls.LEFT_P ) prev(); FlxG.sound.play(Paths.sound('scrollMenu'));
if (controls.RIGHT_P) next(); selectItem(newIndex);
}
case Both:
{
if (controls.LEFT_P || controls.UP_P ) prev();
if (controls.RIGHT_P || controls.DOWN_P) next();
}
} }
//Todo: bypass popup blocker on firefox //Todo: bypass popup blocker on firefox
@ -87,6 +84,64 @@ class MenuTypedList<T:MenuItem> extends FlxTypedGroup<T>
accept(); accept();
} }
function navAxis(index:Int, size:Int, prev:Bool, next:Bool, allowWrap:Bool):Int
{
if (prev == next)
return index;
if (prev)
{
if (index > 0)
index--;
else if (allowWrap)
index = size - 1;
}
else
{
if (index < size - 1)
index++;
else if (allowWrap)
index = 0;
}
return index;
}
/**
* Controls navigation on a linear list of items such as Vertical.
* @param prev
* @param next
* @param allowWrap
*/
inline function navList(prev:Bool, next:Bool, allowWrap:Bool = true)
{
return navAxis(selectedIndex, length, prev, next, allowWrap);
}
/**
* Controls navigation on a grid
* @param latSize The size of the fixed axis of the grid, or the "lateral axis"
* @param latPrev Whether the 'prev' key is pressed along the fixed-lengthed axis. eg: "left" in Column mode
* @param latNext Whether the 'next' key is pressed along the fixed-lengthed axis. eg: "right" in Column mode
* @param prev Whether the 'prev' key is pressed along the variable-lengthed axis. eg: "up" in Column mode
* @param next Whether the 'next' key is pressed along the variable-lengthed axis. eg: "down" in Column mode
* @param allowWrap unused
*/
function navGrid(latSize:Int, latPrev:Bool, latNext:Bool, prev:Bool, next:Bool, allowWrap:Bool = true):Int
{
// The grid lenth along the variable-length axis
var size = Math.ceil(length / latSize);
// The selected position along the variable-length axis
var index = Math.floor(selectedIndex / latSize);
// The selected position along the fixed axis
var latIndex = selectedIndex % latSize;
latIndex = navAxis(latIndex, latSize, latPrev, latNext, allowWrap);
index = navAxis(index, size, prev, next, allowWrap);
return Std.int(Math.min(length - 1, index * latSize + latIndex));
}
public function accept() public function accept()
{ {
var selected = members[selectedIndex]; var selected = members[selectedIndex];
@ -106,21 +161,6 @@ class MenuTypedList<T:MenuItem> extends FlxTypedGroup<T>
} }
} }
inline function prev() changeItem(-1);
inline function next() changeItem(1);
function changeItem(amount:Int)
{
FlxG.sound.play(Paths.sound('scrollMenu'));
var index = selectedIndex + amount;
if (index >= length)
index = 0;
else if (index < 0)
index = length - 1;
selectItem(index);
}
public function selectItem(index:Int) public function selectItem(index:Int)
{ {
members[selectedIndex].idle(); members[selectedIndex].idle();
@ -146,6 +186,8 @@ class MenuTypedList<T:MenuItem> extends FlxTypedGroup<T>
{ {
super.destroy(); super.destroy();
byName.clear(); byName.clear();
onChange.removeAll();
onAcceptPress.removeAll();
} }
} }
@ -291,4 +333,6 @@ enum NavControls
Horizontal; Horizontal;
Vertical; Vertical;
Both; Both;
Columns(num:Int);
Rows(num:Int);
} }