andreas/DSTEngine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use new decorator syntax

Browse Source
This commit is contained in:
Andreas Schaafsma 2025-03-11 15:30:36 +01:00
parent 2383b5f026
commit ac5787e2fb
1 changed files with 370 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

312
hGameTest/src/game/ui/console/Console.hx
View File

@ -3,6 +3,7 @@ package game.ui.console;
import game.ui.text.TextFormats; import game.ui.text.TextFormats;
import assets.Fonts; import assets.Fonts;
import openfl.Lib; import openfl.Lib;
import engine.ui.UIPane.PaneLayout;
import openfl.events.Event; import openfl.events.Event;
import openfl.text.TextFieldAutoSize; import openfl.text.TextFieldAutoSize;
import openfl.text.TextField; import openfl.text.TextField;
@ -17,66 +18,82 @@ import engine.typedefs.console.CCmd;
import game.ui.console.elements.ConsoleInput; import game.ui.console.elements.ConsoleInput;
import engine.ui.UIPane; import engine.ui.UIPane;
class Console extends Sprite {
class Console extends Sprite{
public var textFormat:TextFormat; public var textFormat:TextFormat;
public var cOut:TextField; public var cOut:TextField;
public var cIn:TextField; public var cIn:TextField;
public var cInput:ConsoleInput; public var cInput:ConsoleInput;
public var cAutoComp:TextField; public var cAutoComp:TextField;
public static var consoleInstance:Console; public static var consoleInstance:Console;
@:convar({
name: "mat_consolebg",
type: "CString",
value: "0x222222",
help: "console background color",
callback: () -> {
if (Console.consoleInstance != null){
Console.consoleInstance.cOut.backgroundColor = Std.parseInt(Console.consoleInstance.cvar_mat_consolebg.value);
Console.consoleInstance.cIn.backgroundColor = Std.parseInt(Console.consoleInstance.cvar_mat_consolebg.value);
}
}
})
public static var scvar_mat_consolebg:CVar;
public var cvar_mat_consolebg:CVar; public var cvar_mat_consolebg:CVar;
public var ccmd_visible:CCmd = ConVar.registerCCmd("toggleconsole",(cArgs:Array<String>)->{
public var ccmd_visible:CCmd = ConVar.registerCCmd("toggleconsole", (cArgs:Array<String>) -> {
toggle(); toggle();
}); });
public function new(){
public function new() {
super(); super();
cvar_mat_consolebg = scvar_mat_consolebg;
consoleInstance = this; consoleInstance = this;
var consolePane = new UIPane("yeeto", {width: 800, height: 600, minWidth: 400, minHeight: 300, maxWidth: 1200, maxHeight: 800});
var consolePane:UIPane = new UIPane("yeeto",{width:800, height:600}); consolePane.layout = VERTICAL;
this.addChild(consolePane.sprite);
consolePane.layout = VERTICAL; consolePane.layout = VERTICAL;
//graphics.beginFill(0x555555); // graphics.beginFill(0x555555);
//graphics.drawRect(0,0,800,600); // graphics.drawRect(0,0,800,600);
cInput = new ConsoleInput(); cInput = new ConsoleInput();
cIn = cInput.tf; cIn = cInput.tf;
//cIn.setTextFormat(textFormat); // cIn.setTextFormat(textFormat);
cInput.y = 600-cInput.height-12; cInput.y = 600 - cInput.height - 12;
cInput.x = 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 = new TextField();
cAutoComp = new TextField(); cAutoComp = new TextField();
drawFields(cOut, cAutoComp); drawFields(cOut, cAutoComp);
cOut.addEventListener(Event.CHANGE, onOutputTextChange); cOut.addEventListener(Event.CHANGE, onOutputTextChange);
cIn.addEventListener(Event.CHANGE, onInputTextChange); cIn.addEventListener(Event.CHANGE, onInputTextChange);
this.addChild(cOut); this.addChild(cOut);
this.addChild(cInput); this.addChild(cInput);
this.addChild(cAutoComp); this.addChild(cAutoComp);
ConVar.registerCCmd("echo", (args:Array<String>) -> { Console.devMsg(args.join(" ").split('"').join(""));}); ConVar.registerCCmd("echo", (args:Array<String>) -> {
ConVar.registerCCmd("quit", (args:Array<String>) -> { Lib.application.window.close();}); Console.devMsg(args.join(" ").split('"').join(""));
});
ConVar.registerCCmd("quit", (args:Array<String>) -> {
Lib.application.window.close();
});
} }
public function drawFields(cOut:TextField, cAutoComp:TextField){
public function drawFields(cOut:TextField, cAutoComp:TextField) {
cOut.text = "hConsole Initialized\n"; cOut.text = "hConsole Initialized\n";
cOut.defaultTextFormat = TextFormats.getFormats().cOutputFmt; cOut.defaultTextFormat = TextFormats.getFormats().cOutputFmt;
cOut.wordWrap = true; cOut.wordWrap = true;
//cOut.autoSize = TextFieldAutoSize.LEFT; // cOut.autoSize = TextFieldAutoSize.LEFT;
cOut.multiline = true; cOut.multiline = true;
cOut.background = true; cOut.background = true;
trace(cvar_mat_consolebg);
cOut.backgroundColor = Std.parseInt(cvar_mat_consolebg.value); cOut.backgroundColor = Std.parseInt(cvar_mat_consolebg.value);
cOut.width = 800 - 24; cOut.width = 800 - 24;
cOut.height = 600 - cIn.height - 38; cOut.height = 600 - cIn.height - 38;
@ -93,64 +110,60 @@ class Console extends Sprite{
cAutoComp.borderColor = 0x55555500; cAutoComp.borderColor = 0x55555500;
cAutoComp.selectable = false; cAutoComp.selectable = false;
cAutoComp.width = 400; cAutoComp.width = 400;
cAutoComp.height = 32*5; cAutoComp.height = 32 * 5;
cAutoComp.visible = false; cAutoComp.visible = false;
cAutoComp.x = 0; cAutoComp.x = 0;
cAutoComp.y = 600; cAutoComp.y = 600;
} }
public function parseCmd(cmd:String, bNoHist:Bool = false) {
public function parseCmd(cmd:String, bNoHist:Bool = false){ if (!bNoHist)
if(!bNoHist)
history.push(cmd); history.push(cmd);
cmd = cmd.split(";").join(" ; "); cmd = cmd.split(";").join(" ; ");
var subStrings = []; var subStrings = [];
var startQuoteIndex:Int = cmd.indexOf('"'); var startQuoteIndex:Int = cmd.indexOf('"');
var endQuoteIndex:Int; var endQuoteIndex:Int;
if(startQuoteIndex != -1){ if (startQuoteIndex != -1) {
while((startQuoteIndex = cmd.indexOf('"')) > -1){ while ((startQuoteIndex = cmd.indexOf('"')) > -1) {
//push start of the cmd up until the quotes start // push start of the cmd up until the quotes start
subStrings.push(cmd.substring(0,startQuoteIndex)); subStrings.push(cmd.substring(0, startQuoteIndex));
//find next quote // find next quote
endQuoteIndex = cmd.indexOf('"',startQuoteIndex+1)+1; endQuoteIndex = cmd.indexOf('"', startQuoteIndex + 1) + 1;
if(endQuoteIndex == 0){ if (endQuoteIndex == 0) {
cmd+='"'; cmd += '"';
endQuoteIndex = cmd.length; endQuoteIndex = cmd.length;
} }
//push quote content // push quote content
subStrings.push(cmd.substring(startQuoteIndex,endQuoteIndex)); subStrings.push(cmd.substring(startQuoteIndex, endQuoteIndex));
cmd = cmd.substr(endQuoteIndex); cmd = cmd.substr(endQuoteIndex);
} }
} }
subStrings.push(cmd); subStrings.push(cmd);
//Split args // Split args
var newSubStrings = []; var newSubStrings = [];
for(subString in subStrings){ for (subString in subStrings) {
if(subString.indexOf('"') == -1){ if (subString.indexOf('"') == -1) {
// split spaced args // split spaced args
for(str in subString.split(" ")){ for (str in subString.split(" ")) {
//we want to discard empty strings // we want to discard empty strings
if(str != "") if (str != "")
newSubStrings.push(str); newSubStrings.push(str);
} }
} else {
}
else{
newSubStrings.push(subString); newSubStrings.push(subString);
} }
} }
var commands = []; var commands = [];
//split off additional commands // split off additional commands
while(newSubStrings.length > 0){ while (newSubStrings.length > 0) {
for(i in 0...newSubStrings.length){ for (i in 0...newSubStrings.length) {
if(newSubStrings[i] == ";"){ if (newSubStrings[i] == ";") {
commands.push(newSubStrings.splice(0,i)); commands.push(newSubStrings.splice(0, i));
newSubStrings.shift(); newSubStrings.shift();
break; break;
} }
if(newSubStrings.length-1 == i){ if (newSubStrings.length - 1 == i) {
commands.push(newSubStrings); commands.push(newSubStrings);
newSubStrings = []; newSubStrings = [];
} }
@ -159,232 +172,223 @@ class Console extends Sprite{
trace(commands); trace(commands);
execCommands(commands); execCommands(commands);
} }
public function execCommands(commands:Array<Array<String>>){
for(command in commands){ public function execCommands(commands:Array<Array<String>>) {
for (command in commands) {
// Store command name, value and args // Store command name, value and args
var cName:String = command[0]; var cName:String = command[0];
var cValue:String = command[1]; var cValue:String = command[1];
var cArgs:Array<String> = command.slice(1); var cArgs:Array<String> = command.slice(1);
//Check if convar with that name actually exists // Check if convar with that name actually exists
if(ConVar.isCVar(cName)){ if (ConVar.isCVar(cName)) {
//Get reference to convar object // Get reference to convar object
var cv:CVar = ConVar.getCVar(command[0]); var cv:CVar = ConVar.getCVar(command[0]);
//Check number of params // Check number of params
if(command.length == 1){ if (command.length == 1) {
//No params after the cmd, print help string // No params after the cmd, print help string
devMsg(cv.name+" - "+cv.helpString); devMsg(cv.name + " - " + cv.helpString);
devMsg(cv.name+" = "+cv.value); devMsg(cv.name + " = " + cv.value);
} } else {
else{ // Check for convar type and set value accordingly
//Check for convar type and set value accordingly switch (cv.type) {
switch(cv.type){
case CInt: case CInt:
ConVar.setCVar(cName,Std.parseInt(cValue)); ConVar.setCVar(cName, Std.parseInt(cValue));
trace(cValue); trace(cValue);
break; break;
case CFloat: case CFloat:
ConVar.setCVar(cName,Std.parseFloat(cValue)); ConVar.setCVar(cName, Std.parseFloat(cValue));
break; break;
case CBool: case CBool:
cValue = cValue.toLowerCase(); cValue = cValue.toLowerCase();
if(cValue == "1" || cValue == "true"){ if (cValue == "1" || cValue == "true") {
ConVar.setCVar(cName,true); ConVar.setCVar(cName, true);
} } else if (cValue == "0" || cValue == "false") {
else if(cValue == "0" || cValue == "false"){ ConVar.setCVar(cName, false);
ConVar.setCVar(cName,false);
} }
break; break;
case CString: case CString:
ConVar.setCVar(cName,cValue); ConVar.setCVar(cName, cValue);
break; break;
} }
}
}
// convar is actually a command, run it.
else if (ConVar.isCmd(cName)) {
ConVar.runCmd(cName, cArgs);
}
// convar doesn't exist
else {
devMsg("unkown command: " + command[0]);
}
}
} }
} public function submitInput() {
//convar is actually a command, run it. cOut.appendText(">" + cInput.getText() + "\n");
else if(ConVar.isCmd(cName)){
ConVar.runCmd(cName,cArgs);
}
//convar doesn't exist
else{
devMsg("unkown command: "+command[0]);
}
}
}
public function submitInput(){
cOut.appendText(">"+cInput.getText()+"\n");
parseCmd(cInput.getText()); parseCmd(cInput.getText());
cInput.setText(""); cInput.setText("");
cAutoComp.visible = false; cAutoComp.visible = false;
cOut.scrollV = cOut.maxScrollV; cOut.scrollV = cOut.maxScrollV;
histSelect = -1; histSelect = -1;
} }
public function onOutputTextChange(e:Event){
public function onOutputTextChange(e:Event) {
cOut.scrollV = cOut.maxScrollV; cOut.scrollV = cOut.maxScrollV;
} }
public function onInputTextChange(e:Event){
if(cInput.getText() != ""){ public function onInputTextChange(e:Event) {
if (cInput.getText() != "") {
cAutoComp.text = ""; cAutoComp.text = "";
for(string in (autocompleteList = getCompList())){ for (string in (autocompleteList = getCompList())) {
cAutoComp.text += string+"\n"; cAutoComp.text += string + "\n";
trace(string); trace(string);
} }
cAutoComp.visible = true; cAutoComp.visible = true;
} } else {
else{
cAutoComp.visible = false; cAutoComp.visible = false;
autocompleteList = history; autocompleteList = history;
} }
} }
public static function toggle():Void
{ public static function toggle():Void {
consoleInstance.visible = !consoleInstance.visible; consoleInstance.visible = !consoleInstance.visible;
if(!consoleInstance.visible){ if (!consoleInstance.visible) {
if(Lib.current.stage.focus == consoleInstance.cIn){ if (Lib.current.stage.focus == consoleInstance.cIn) {
Lib.current.stage.focus = null; Lib.current.stage.focus = null;
} }
} } else {
else{
Lib.current.stage.focus = consoleInstance.cIn; Lib.current.stage.focus = consoleInstance.cIn;
} }
} }
public static function devMsg(msg:String):Void
{ public static function devMsg(msg:String):Void {
consoleInstance.cOut.appendText(msg+"\n"); consoleInstance.cOut.appendText(msg + "\n");
consoleInstance.cOut.scrollV = consoleInstance.cOut.maxScrollV; consoleInstance.cOut.scrollV = consoleInstance.cOut.maxScrollV;
} }
public static var history:Array<String> = []; public static var history:Array<String> = [];
public static var histSelect:Int = -1; public static var histSelect:Int = -1;
public static var tmpInput:String = ""; public static var tmpInput:String = "";
public static var autocompleteList:Array<String> = []; public static var autocompleteList:Array<String> = [];
public static var compSelect:Int = -1; public static var compSelect:Int = -1;
public static function getCompList():Array<String>
{ public static function getCompList():Array<String> {
// Split words // Split words
var inp:Array<String> = consoleInstance.cInput.getText().split(" "); var inp:Array<String> = consoleInstance.cInput.getText().split(" ");
var inpStripped:Array<String> = [ var inpStripped:Array<String> = [
for(word in inp){ for (word in inp) {
if(word != "" && word != " "){ if (word != "" && word != " ") {
word; word;
} }
} }
]; ];
// Stop if input is empty // Stop if input is empty
if(inp.length == 0) return []; if (inp.length == 0)
return [];
var cVars:Array<String> = ConVar.getCVarNames(); var cVars:Array<String> = ConVar.getCVarNames();
var cVarFiltered:Array<String> = []; var cVarFiltered:Array<String> = [];
// Loop through convars // Loop through convars
for(cVar in cVars){ for (cVar in cVars) {
//if there's one word just check if the convar starts with the input string // if there's one word just check if the convar starts with the input string
if(inp.length == 1) if (inp.length == 1) {
{
// Check if the cvar starts with the input // Check if the cvar starts with the input
if(cVar.indexOf(inp[0]) == 0){ if (cVar.indexOf(inp[0]) == 0) {
cVarFiltered.push(cVar); cVarFiltered.push(cVar);
} }
} }
// User pressed space at least once but entered no other words. Check if first word occurs at any position // 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){ else if (inpStripped.length == 1 && inp.length > 1) {
if(cVar.indexOf(inp[0]) > -1){ if (cVar.indexOf(inp[0]) > -1) {
cVarFiltered.push(cVar); cVarFiltered.push(cVar);
} }
} }
// Multiple words, check for cvars that contain all of them // Multiple words, check for cvars that contain all of them
else if(inpStripped.length > 1) else if (inpStripped.length > 1) {
{
var bWordNotPresent:Bool = false; var bWordNotPresent:Bool = false;
for(word in inpStripped){ for (word in inpStripped) {
if(cVar.indexOf(word) == -1){ if (cVar.indexOf(word) == -1) {
bWordNotPresent = true; bWordNotPresent = true;
} }
} }
if(!bWordNotPresent) if (!bWordNotPresent)
cVarFiltered.push(cVar); cVarFiltered.push(cVar);
} }
} }
return cVarFiltered; return cVarFiltered;
} }
public static function histPrev():Void
{ public static function histPrev():Void {
// Only complete if input field is empty or scrolling through hist // Only complete if input field is empty or scrolling through hist
if(consoleInstance.cInput.getText() == "" || histSelect != -1){ if (consoleInstance.cInput.getText() == "" || histSelect != -1) {
// Store current input in tmpInput // Store current input in tmpInput
if(histSelect == -1) tmpInput = consoleInstance.cInput.getText(); if (histSelect == -1)
tmpInput = consoleInstance.cInput.getText();
// Only go through history if history is not empty // Only go through history if history is not empty
if(history.length != 0){ if (history.length != 0) {
// Check if currently selecting a history entry // Check if currently selecting a history entry
if(histSelect >= 0){ if (histSelect >= 0) {
histSelect--; histSelect--;
} }
// Not currently selecting a history entry // Not currently selecting a history entry
else{ else {
// Put selector to the newest // Put selector to the newest
histSelect = history.length -1; histSelect = history.length - 1;
} }
if(histSelect != -1){ if (histSelect != -1) {
// Put correct history entry in the input field // Put correct history entry in the input field
consoleInstance.cInput.setText(history[histSelect]); consoleInstance.cInput.setText(history[histSelect]);
} } else {
else{
// Restore tmp input // Restore tmp input
consoleInstance.cInput.setText(tmpInput); consoleInstance.cInput.setText(tmpInput);
} }
} }
// History is empty // History is empty
else{ else {
// Do nothing // Do nothing
return; return;
} }
} }
// Now we need to descend through the autocomplete list // Now we need to descend through the autocomplete list
else{ else {
if(autocompleteList.length == 0){ if (autocompleteList.length == 0) {
return; return;
} } else {
else{
// Check if currently selecting an autocomplete entry // Check if currently selecting an autocomplete entry
if(compSelect > -1){ if (compSelect > -1) {}
}
// Not currently selecting an autocomplete entry // Not currently selecting an autocomplete entry
else{ else {}
}
} }
} }
public static function histNext():Void {
}
}
public static function histNext():Void
{
// Only complete if input field is empty or scrolling through hist // Only complete if input field is empty or scrolling through hist
if(consoleInstance.cIn.text == "" || histSelect != -1){ if (consoleInstance.cIn.text == "" || histSelect != -1) {
// Store current input in tmpInput // Store current input in tmpInput
if(histSelect == -1) tmpInput = consoleInstance.cIn.text; if (histSelect == -1)
tmpInput = consoleInstance.cIn.text;
// Only go through history if history is not empty // Only go through history if history is not empty
if(history.length != 0){ if (history.length != 0) {
// Check if currently selecting a history entry // Check if currently selecting a history entry
if(histSelect < history.length -1){ if (histSelect < history.length - 1) {
histSelect++; histSelect++;
} }
// Otherwise wrap around // Otherwise wrap around
else{ else {
// Put selector to no selection // Put selector to no selection
histSelect = -1; histSelect = -1;
} }
if(histSelect != -1){ if (histSelect != -1) {
// Put correct history entry in the input field // Put correct history entry in the input field
consoleInstance.cIn.text = history[histSelect]; consoleInstance.cIn.text = history[histSelect];
} } else {
else{
// Restore tmp input // Restore tmp input
consoleInstance.cIn.text = tmpInput; consoleInstance.cIn.text = tmpInput;
} }
} }
// History is empty // History is empty
else{ else {
// Do nothing // Do nothing
return; return;
} }