changed a bunch of fucking shit

This commit is contained in:
2025-01-15 19:31:49 +01:00
committed by andreas
parent daa684b29c
commit 366ad1201c
7 changed files with 47 additions and 285 deletions
+7 -118
View File
@@ -1,6 +1,5 @@
package game.ui;
import openfl.Lib;
import openfl.events.Event;
import openfl.text.TextFieldAutoSize;
import openfl.text.TextField;
@@ -8,20 +7,17 @@ import openfl.display.Sprite;
import openfl.Assets;
import openfl.text.TextFormat;
import openfl.text.TextFieldType;
import engine.typedefs.CVar;
class Console extends Sprite{
public var textFormat:TextFormat;
public var cOut:TextField;
public var cIn:TextField;
public static var consoleInstance:Console;
public static var consoleIndex:Console;
public function new(){
super();
consoleInstance = this;
consoleIndex = this;
graphics.beginFill(0x111111);
graphics.drawRect(0,0,800,600);
@@ -32,7 +28,7 @@ class Console extends Sprite{
cIn = new TextField();
cIn.type = TextFieldType.INPUT;
cIn.text = 'sv_kak bla "ik 1; ben 2; haast 3; niet 4" "in 5; staat 6;" om de straat "te verlaten";';
cIn.text = "b";
cIn.multiline = false;
//cIn.autoSize = TextFieldAutoSize.LEFT;
cIn.width = 800-24;
@@ -47,7 +43,6 @@ class Console extends Sprite{
cOut = new TextField();
cOut.text = "hConsole Initialized\n";
cOut.setTextFormat(textFormat);
cOut.wordWrap = true;
//cOut.autoSize = TextFieldAutoSize.LEFT;
cOut.multiline = true;
cOut.background = true;
@@ -62,127 +57,21 @@ class Console extends Sprite{
//cOut.addEventListener()
this.addChild(cOut);
this.addChild(cIn);
//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){
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]);
}
}
var parts:Array<String> = cmd.split(" ");
}
public function submitInput(){
cOut.appendText(">"+cIn.text+"\n");
parseCmd(cIn.text);
cOut.appendText(">"+cIn.text+"\n");
cIn.text = "";
cOut.scrollV = cOut.maxScrollV;
}
public function onOutputTextChange(e:Event){
cOut.scrollV = cOut.maxScrollV;
}
public static function toggle():Void
public function devMsg(msg:String):Void
{
consoleInstance.visible = !consoleInstance.visible;
}
public static function devMsg(msg:String):Void
{
consoleInstance.cOut.appendText(msg+"\n");
consoleInstance.cOut.scrollV = consoleInstance.cOut.maxScrollV;
cOut.appendText(msg+"\n");
}
}