refactoring console ui

This commit is contained in:
2025-01-15 19:45:00 +01:00
committed by andreas
parent 46f2ef5e09
commit 97833fc6d9
16 changed files with 691 additions and 153 deletions
+101 -2
View File
@@ -5,6 +5,7 @@ import engine.typedefs.CVar;
import engine.typedefs.CCmd;
import engine.enums.CVarType;
import engine.enums.CVarFlag;
import game.ui.console.Console;
class ConVar{
@@ -24,13 +25,111 @@ class ConVar{
}
public static inline function setCVar(_name:String, _value:Dynamic)
{
if(CVarMap[_name] != null){
CVarMap[_name] = _value;
if(CVarMap[_name]!=null || CCmdMap[_name]!=null){
Console.devMsg("Tried setting already defined command: " + _name + ", returning null instead");
return null;
}
var cmd:CCmd = CCmdMap[_name] = {
name : _name,
callback : _callback
}
return cmd;
}
public static inline function setCVar(_name:String, _value:Dynamic):Void
{
var cv = getCVar(_name);
if(cv != null){
switch(cv.type){
case CInt,CFloat:
if(cv.bMax && _value > cv.fMax) _value = cv.fMax;
if(cv.bMin && _value < cv.fMin) _value = cv.fMin;
case CBool:
if(Std.isOfType(_value, String)){
var v:String = _value;
_value = v.toLowerCase();
if(_value == "true" || _value == "1"){
_value = true;
}
else{
_value = false;
}
}
else if(Std.isOfType(_value, Int) || Std.isOfType(_value, Float)){
if(_value %2 == 0){
_value = false;
}
else{
_value = true;
}
}
else if(Std.isOfType(_value, Bool)){
//do nothing
}
else{
_value = cv.value;
}
case CString:
_value = Std.string(_value);
}
cv.value = _value;
cv.callback();
}
else{
Console.consoleIndex.devMsg("trying to set null convar '"+_name+"'");
}
}
public static inline function isCVar(_name:String){
return (CVarMap[_name] != null);
}
public static inline function isCmd(_name:String){
return (CCmdMap[_name] != null);
}
public static inline function runCmd(_name:String, _args:Array<String>){
if(CCmdMap[_name] != null){
CCmdMap[_name].callback(_args);
}
}
public static inline function getCVarNames():Array<String>
{
var keys:Array<String> = [
for(iterator in [CCmdMap.keys(),CVarMap.keys()]){
for(key in iterator){
key;
}
}
];
keys.sort(function(a:String, b:String):Int {
a = a.toUpperCase();
b = b.toUpperCase();
if (a < b) {
return -1;
}
else if (a > b) {
return 1;
} else {
return 0;
}
});
return keys;
}
public static var cmdList:CCmd = ConVar.registerCCmd("list", (cArgs:Array<String>)->{
var keys:Array<String> = getCVarNames();
for(key in keys){
if(CVarMap[key] != null){
Console.devMsg(key+" "+CVarMap[key].value);
}
else{
Console.devMsg(key);
}
}
});
public static inline function getCVar(_name:String):CVar
{
return CVarMap[_name];
}
}
-77
View File
@@ -1,77 +0,0 @@
package game.ui;
import openfl.events.Event;
import openfl.text.TextFieldAutoSize;
import openfl.text.TextField;
import openfl.display.Sprite;
import openfl.Assets;
import openfl.text.TextFormat;
import openfl.text.TextFieldType;
class Console extends Sprite{
public var textFormat:TextFormat;
public var cOut:TextField;
public var cIn:TextField;
public static var consoleIndex:Console;
public function new(){
super();
consoleIndex = this;
graphics.beginFill(0x111111);
graphics.drawRect(0,0,800,600);
textFormat = new TextFormat(Assets.getFont("fonts/Terminus.ttf").fontName, 24, 0x00ff00);
cIn = new TextField();
cIn.type = TextFieldType.INPUT;
cIn.text = '';
cIn.multiline = false;
//cIn.autoSize = TextFieldAutoSize.LEFT;
cIn.width = 800-24;
cIn.height = 32;
cIn.background = true;
cIn.backgroundColor = 0x000000;
cIn.selectable = true;
cIn.setTextFormat(textFormat);
cIn.y = 600-cIn.height-12;
cIn.x = 12;
cOut = new TextField();
cOut.text = "hConsole Initialized\n";
cOut.setTextFormat(textFormat);
//cOut.autoSize = TextFieldAutoSize.LEFT;
cOut.multiline = true;
cOut.background = true;
cOut.backgroundColor = 0x000000;
cOut.width = 800 - 24;
cOut.height = 600 - cIn.height - 38;
cOut.y = 12;
cOut.x = 12;
cOut.addEventListener(Event.CHANGE, onOutputTextChange);
//cOut.addEventListener()
this.addChild(cOut);
this.addChild(cIn);
}
public function parseCmd(cmd:String){
var parts:Array<String> = cmd.split(" ");
}
public function submitInput(){
parseCmd(cIn.text);
cOut.appendText(">"+cIn.text+"\n");
cIn.text = "";
cOut.scrollV = cOut.maxScrollV;
}
public function onOutputTextChange(e:Event){
cOut.scrollV = cOut.maxScrollV;
}
public function devMsg(msg:String):Void
{
cOut.appendText(msg+"\n");
}
}
+27
View File
@@ -0,0 +1,27 @@
package game.ui;
import openfl.geom.Point;
import openfl.display.Sprite;
class UIContianer extends Sprite{
public static var UIDrawList:Array<UIElement>=[];
public var anchor:Point;
public function new(panchor,scale){
super();
}
public function onResize(){
}
public function hide(){
}
public function show(){
}
public function getParent()
{
return parent;
}
}
+12
View File
@@ -0,0 +1,12 @@
package game.ui;
import openfl.geom.Point;
import openfl.display.Sprite;
class UIElement extends Sprite
{
public function new(){
super();
}
}
+15
View File
@@ -0,0 +1,15 @@
package game.ui;
class UIPane{
public static var paneList:Array<UIPane>=[];
public var x:Int;
public var y:Int;
public var width:Int;
public var height:Int;
public var parent:UIPane;
public function new(){
}
}
+363
View File
@@ -0,0 +1,363 @@
package game.ui.console;
import engine.enums.CVarFlag;
import game.ui.text.TextFormats;
import assets.Fonts;
import openfl.Lib;
import openfl.events.Event;
import openfl.text.TextFieldAutoSize;
import openfl.text.TextField;
import openfl.display.Sprite;
import openfl.Assets;
import openfl.text.TextFormat;
import openfl.text.TextFieldType;
import engine.typedefs.CVar;
import game.ui.ConVar;
import engine.typedefs.CCmd;
import game.ui.console.elements.ConsoleInput;
class Console extends Sprite{
public var textFormat:TextFormat;
public var cOut:TextField;
public var cIn:TextField;
public var cInput:ConsoleInput;
public var cAutoComp:TextField;
public static var consoleInstance:Console;
public var cvar_mat_consolebg:CVar;
public function new(){
super();
consoleInstance = this;
graphics.beginFill(0x555555);
graphics.drawRect(0,0,800,600);
cInput = new ConsoleInput();
cIn = cInput.tf;
//cIn.setTextFormat(textFormat);
cInput.y = 600-cInput.height-12;
cInput.x = 12;
cvar_mat_consolebg = ConVar.registerCVar("mat_consolebg",CString,"0x222222",null,"console background color", ()->{
cOut.backgroundColor = Std.parseInt(cvar_mat_consolebg.value);
cIn.backgroundColor = Std.parseInt(cvar_mat_consolebg.value);
},false,false,0,0,false);
cOut = new TextField();
cOut.text = "hConsole Initialized\n";
cOut.defaultTextFormat = TextFormats.getFormats().cOutputFmt;
cOut.wordWrap = true;
//cOut.autoSize = TextFieldAutoSize.LEFT;
cOut.multiline = true;
cOut.background = true;
cOut.backgroundColor = Std.parseInt(cvar_mat_consolebg.value);
cOut.width = 800 - 24;
cOut.height = 600 - cIn.height - 38;
cOut.y = 12;
cOut.x = 12;
cAutoComp = new TextField();
cAutoComp.text = "";
cAutoComp.defaultTextFormat = TextFormats.getFormats().cInputFmt;
cAutoComp.wordWrap = false;
cAutoComp.multiline = true;
cAutoComp.background = true;
cAutoComp.backgroundColor = 0x11111100;
cAutoComp.border = true;
cAutoComp.borderColor = 0x55555500;
cAutoComp.selectable = false;
cAutoComp.width = 400;
cAutoComp.height = 32*5;
cAutoComp.visible = false;
cAutoComp.x = 0;
cAutoComp.y = 600;
cOut.addEventListener(Event.CHANGE, onOutputTextChange);
cIn.addEventListener(Event.CHANGE, onInputTextChange);
//cOut.addEventListener()
this.addChild(cOut);
this.addChild(cInput);
this.addChild(cAutoComp);
//ConVar.registerCVar("echo", CVarType.CCmd, null, devMsg())
ConVar.registerCCmd("echo", (args:Array<String>) -> { Console.devMsg(args.join(" ").split('"').join(""));});
ConVar.registerCCmd("quit", (args:Array<String>) -> { Lib.application.window.close();});
}
public function parseCmd(cmd:String){
history.push(cmd);
cmd = cmd.split(";").join(" ; ");
var subStrings = [];
var startQuoteIndex:Int = cmd.indexOf('"');
var endQuoteIndex:Int;
if(startQuoteIndex != -1){
while((startQuoteIndex = cmd.indexOf('"')) > -1){
//push start of the cmd up until the quotes start
subStrings.push(cmd.substring(0,startQuoteIndex));
//find next quote
endQuoteIndex = cmd.indexOf('"',startQuoteIndex+1)+1;
if(endQuoteIndex == 0){
cmd+='"';
endQuoteIndex = cmd.length;
}
//push quote content
subStrings.push(cmd.substring(startQuoteIndex,endQuoteIndex));
cmd = cmd.substr(endQuoteIndex);
}
}
subStrings.push(cmd);
//Split args
var newSubStrings = [];
for(subString in subStrings){
if(subString.indexOf('"') == -1){
// split spaced args
for(str in subString.split(" ")){
//we want to discard empty strings
if(str != "")
newSubStrings.push(str);
}
}
else{
newSubStrings.push(subString);
}
}
var commands = [];
//split off additional commands
while(newSubStrings.length > 0){
for(i in 0...newSubStrings.length){
if(newSubStrings[i] == ";"){
commands.push(newSubStrings.splice(0,i));
newSubStrings.shift();
break;
}
if(newSubStrings.length-1 == i){
commands.push(newSubStrings);
newSubStrings = [];
}
}
}
trace(commands);
execCommands(commands);
}
public function execCommands(commands:Array<Array<String>>){
for(command in commands){
var cName:String = command[0];
var cValue:String = command[1];
var cArgs:Array<String> = command.slice(1);
if(ConVar.isCVar(cName)){
var cv:CVar = ConVar.getCVar(command[0]);
if(command.length == 1){
devMsg(cv.name+" - "+cv.helpString);
devMsg(cv.name+" = "+cv.value);
}
else{
switch(cv.type){
case CInt:
ConVar.setCVar(cName,Std.parseInt(cValue));
trace(cValue);
break;
case CFloat:
ConVar.setCVar(cName,Std.parseFloat(cValue));
break;
case CBool:
cValue = cValue.toLowerCase();
if(cValue == "1" || cValue == "true"){
ConVar.setCVar(cName,true);
}
else if(cValue == "0" || cValue == "false"){
ConVar.setCVar(cName,false);
}
break;
case CString:
ConVar.setCVar(cName,cValue);
break;
}
}
}
else if(ConVar.isCmd(cName)){
ConVar.runCmd(cName,cArgs);
}
else{
devMsg("unkown command: "+command[0]);
}
}
}
public function submitInput(){
cOut.appendText(">"+cIn.text+"\n");
parseCmd(cIn.text);
cIn.text = "";
cAutoComp.visible = false;
cOut.scrollV = cOut.maxScrollV;
histSelect = -1;
}
public function onOutputTextChange(e:Event){
cOut.scrollV = cOut.maxScrollV;
}
public function onInputTextChange(e:Event){
if(cIn.text != ""){
cAutoComp.text = "";
for(string in (autocompleteList = getCompList())){
cAutoComp.text += string+"\n";
trace(string);
}
cAutoComp.visible = true;
}
else{
cAutoComp.visible = false;
autocompleteList = history;
}
}
public static function toggle():Void
{
consoleInstance.visible = !consoleInstance.visible;
}
public static function devMsg(msg:String):Void
{
consoleInstance.cOut.appendText(msg+"\n");
consoleInstance.cOut.scrollV = consoleInstance.cOut.maxScrollV;
}
public static var history:Array<String> = [];
public static var histSelect:Int = -1;
public static var tmpInput:String = "";
public static var autocompleteList:Array<String> = [];
public static var compSelect:Int = -1;
public static function getCompList():Array<String>
{
// Split words
var inp:Array<String> = consoleInstance.cIn.text.split(" ");
var inpStripped:Array<String> = [
for(word in inp){
if(word != "" && word != " "){
word;
}
}
];
// Stop if input is empty
if(inp.length == 0) return [];
var cVars:Array<String> = ConVar.getCVarNames();
var cVarFiltered:Array<String> = [];
// Loop through convars
for(cVar in cVars){
//if there's one word just check if the convar starts with the input string
if(inp.length == 1)
{
// Check if the cvar starts with the input
if(cVar.indexOf(inp[0]) == 0){
cVarFiltered.push(cVar);
}
}
// User pressed space at least once but entered no other words. Check if first word occurs at any position
else if(inpStripped.length == 1 && inp.length > 1){
if(cVar.indexOf(inp[0]) > -1){
cVarFiltered.push(cVar);
}
}
// Multiple words, check for cvars that contain all of them
else if(inpStripped.length > 1)
{
var bWordNotPresent:Bool = false;
for(word in inpStripped){
if(cVar.indexOf(word) == -1){
bWordNotPresent = true;
}
}
if(!bWordNotPresent)
cVarFiltered.push(cVar);
}
}
return cVarFiltered;
}
public static function histPrev():Void
{
// Only complete if input field is empty or scrolling through hist
if(consoleInstance.cIn.text == "" || histSelect != -1){
// Store current input in tmpInput
if(histSelect == -1) tmpInput = consoleInstance.cIn.text;
// Only go through history if history is not empty
if(history.length != 0){
// Check if currently selecting a history entry
if(histSelect >= 0){
histSelect--;
}
// Not currently selecting a history entry
else{
// Put selector to the newest
histSelect = history.length -1;
}
if(histSelect != -1){
// Put correct history entry in the input field
consoleInstance.cIn.text = history[histSelect];
}
else{
// Restore tmp input
consoleInstance.cIn.text = tmpInput;
}
}
// History is empty
else{
// Do nothing
return;
}
}
// Now we need to descend through the autocomplete list
else{
if(autocompleteList.length == 0){
return;
}
else{
// Check if currently selecting an autocomplete entry
if(compSelect > -1){
}
// Not currently selecting an autocomplete entry
else{
}
}
}
}
public static function histNext():Void
{
// Only complete if input field is empty or scrolling through hist
if(consoleInstance.cIn.text == "" || histSelect != -1){
// Store current input in tmpInput
if(histSelect == -1) tmpInput = consoleInstance.cIn.text;
// Only go through history if history is not empty
if(history.length != 0){
// Check if currently selecting a history entry
if(histSelect < history.length -1){
histSelect++;
}
// Otherwise wrap around
else{
// Put selector to no selection
histSelect = -1;
}
if(histSelect != -1){
// Put correct history entry in the input field
consoleInstance.cIn.text = history[histSelect];
}
else{
// Restore tmp input
consoleInstance.cIn.text = tmpInput;
}
}
// History is empty
else{
// Do nothing
return;
}
}
}
}
@@ -0,0 +1,51 @@
package game.ui.console.elements;
import openfl.events.Event;
import openfl.display.Sprite;
import openfl.text.TextField;
import openfl.text.TextFieldType;
import openfl.text.TextFormat;
import openfl.Assets;
import game.ui.text.TextFormats;
class ConsoleInput extends Sprite
{
public var tf:TextField;
public function new(){
super();
tf = new TextField();
tf.defaultTextFormat = TextFormats.getFormats().cInputFmt;
tf.text = "";
//tf.setTextFormat(new TextFormat(Assets.getFont("fonts/Terminus.ttf").fontName, 24, 0x00ff00));
trace(tf.getTextFormat().color);
trace(tf.getTextFormat().font);
tf.type = TextFieldType.INPUT;
tf.multiline = false;
//tf.autoSize = TextFieldAutoSize.LEFT;
tf.width = 800-24;
tf.height = tf.textHeight+2;
tf.background = true;
tf.backgroundColor = 0x222222;
tf.selectable = true;
this.addChild(tf);
this.addEventListener(Event.RESIZE,onResize);
tf.addEventListener(Event.CHANGE, onTextChange);
}
public function onResize(e:Event){
tf.width = this.width;
}
public function onTextChange(e:Event){
}
public function clearText(){
tf.text = "";
}
public function getText():String
{
return tf.text;
}
public function setText(t:String){
tf.text = t;
}
}
+24
View File
@@ -0,0 +1,24 @@
package game.ui.text;
import openfl.text.TextFormat;
import openfl.Assets;
import assets.Fonts;
class TextFormats{
public static var formats:TextFormats;
public var cInputFmt:TextFormat;
public var cOutputFmt:TextFormat;
public function new(){
cInputFmt = new TextFormat(Assets.getFont("fonts/Terminus.ttf").fontName, 24, 0xffffff);
cOutputFmt = new TextFormat(Assets.getFont("fonts/Terminus.ttf").fontName, 24, 0xffffff);
}
public static function getFormats():TextFormats
{
if(formats == null){
formats = new TextFormats();
}
return formats;
}
}