From a306eb8cb9c69fb7eea78c56189187544a4f06c9 Mon Sep 17 00:00:00 2001 From: andreas Date: Wed, 24 Mar 2021 21:59:05 +0100 Subject: [PATCH] changed a bunch of fucking shit --- hGameTest/src/game/Game.hx | 7 +- hGameTest/src/game/Input.hx | 29 ++---- hGameTest/src/game/ui/CVar.hx | 9 ++ hGameTest/src/game/ui/CVarType.hx | 9 ++ hGameTest/src/game/ui/ConVar.hx | 145 +++--------------------------- hGameTest/src/game/ui/Console.hx | 125 ++------------------------ hGameTest/src/game/video/Mode.hx | 8 +- 7 files changed, 47 insertions(+), 285 deletions(-) create mode 100644 hGameTest/src/game/ui/CVar.hx create mode 100644 hGameTest/src/game/ui/CVarType.hx diff --git a/hGameTest/src/game/Game.hx b/hGameTest/src/game/Game.hx index 3b135497..7ce63366 100644 --- a/hGameTest/src/game/Game.hx +++ b/hGameTest/src/game/Game.hx @@ -1,9 +1,5 @@ package game; -import engine.typedefs.CCmd; -import engine.enums.CVarFlag; -import engine.enums.CVarType; -import engine.typedefs.CVar; import openfl.display.DisplayObject; import game.ui.Console; import game.entities.Player; @@ -54,9 +50,10 @@ class Game //player.graphics.drawRect(0,0,16,16); // var bitmapData:BitmapData = Assets.getBitmapData("textures/sprites/character.png"); player = new Player(); + console = new Console(); gameLayer.addChild(player.sprite); uiLayer.addChild(console); - var cvar:CVar = ConVar.registerCVar("cl_kankerlow", CInt, 10, FCVAR_ARCHIVE, "is de speler een kankerlow?",null,false,false,0,0,false); + ConVar.setCVar("echo", "blaw"); //var sheet:SpriteSheet = new SpriteSheet(sheetData); //var playerBitmap:Bitmap = new Bitmap(Tileset.tilesetMap["testsheet"].tileMap["testTile5"]); //var someotherbitmap:Bitmap = new Bitmap(Tileset.tilesetMap["testsheet"].tileMap["testTile3"]); diff --git a/hGameTest/src/game/Input.hx b/hGameTest/src/game/Input.hx index 7249bf3a..e59ad3d1 100644 --- a/hGameTest/src/game/Input.hx +++ b/hGameTest/src/game/Input.hx @@ -1,14 +1,12 @@ package game; -import engine.enums.CVarFlag; -import engine.typedefs.CCmd; import game.ui.Console; import game.video.Mode; import openfl.events.KeyboardEvent; import openfl.ui.Keyboard in Kb; import openfl.Lib; -import engine.enums.CVarType; -import engine.typedefs.CVar; +import game.ui.CVarType; +import game.ui.CVar; import game.ui.ConVar; @@ -19,7 +17,6 @@ class Input{ //public static var bind:CVar = Convar.registerCVar("bind",CVarType.cCmd, null, ()->{ // //}); - public static var debugKeys = ConVar.registerCVar("cl_debuginput", CInt, 0, null, "print debug messages related to input to console", null, false, true, 0, 0, false); public static var keyCodeMap:Map = [ "HOME" => Kb.HOME, "END" => Kb.END, "INSERT" => Kb.INSERT, "DELETE" => Kb.DELETE, "PGUP" => Kb.PAGE_UP, "PGDN" => Kb.PAGE_DOWN, "ESC" => Kb.ESCAPE, "F1" => Kb.F1, "F2" => Kb.F2, "F3" => Kb.F3, "F4" => Kb.F4, "F5" => Kb.F5, @@ -77,31 +74,21 @@ class Input{ // } // } - private static var bind:CCmd = ConVar.registerCCmd("bind", (cArgs:Array)->{ - - ConVar.runCmd("echo",cArgs); - }); public static function onEnterFrame() { - if( keys[Kb.BACKQUOTE]){ - //Console.toggle(); - if(debugKeys.value > 0) Console.devMsg("toggle console"); - - } if( keys[Kb.ALTERNATE] && keys[Kb.ENTER] && !keysLast[Kb.ALTERNATE] && !keysLast[Kb.ENTER] ){ Mode.switchFsMode(); } if ( keys[Kb.ENTER] && !keysLast[Kb.ENTER] && !keysLast[Kb.ALTERNATE]){ - if(Lib.current.stage.focus == Console.consoleInstance.cIn){ - Console.consoleInstance.submitInput(); + if(Lib.current.stage.focus == Console.consoleIndex.cIn){ + Console.consoleIndex.submitInput(); } } - keysLast = keys.copy(); - //Console.devMsg("key array length:"+keys.length); - //for(i in 0...keys.length-1){ - // keysLast[i] = keys[i]; - //} + + for(i in 0...keys.length){ + keysLast[i] = keys[i]; + } //trace("enter pressed: " + keys[Kb.ENTER] + "enter pressed last: " + keysLast[Kb.ENTER]); //trace(keysLast[Kb.ENTER]); //keysLast = keys; diff --git a/hGameTest/src/game/ui/CVar.hx b/hGameTest/src/game/ui/CVar.hx new file mode 100644 index 00000000..cc5457b3 --- /dev/null +++ b/hGameTest/src/game/ui/CVar.hx @@ -0,0 +1,9 @@ +package game.ui; + + +typedef CVar = { + var name:String; + var type:CVarType; + var value:Dynamic; + @:optional var callback:Void -> Void; +}; diff --git a/hGameTest/src/game/ui/CVarType.hx b/hGameTest/src/game/ui/CVarType.hx new file mode 100644 index 00000000..32c4bb80 --- /dev/null +++ b/hGameTest/src/game/ui/CVarType.hx @@ -0,0 +1,9 @@ +package game.ui; + +enum CVarType { + CInt; + CFloat; + CString; + CBool; + CCmd; +} \ No newline at end of file diff --git a/hGameTest/src/game/ui/ConVar.hx b/hGameTest/src/game/ui/ConVar.hx index 9eed010e..7a715948 100644 --- a/hGameTest/src/game/ui/ConVar.hx +++ b/hGameTest/src/game/ui/ConVar.hx @@ -1,156 +1,33 @@ package game.ui; -import haxe.Constraints.Function; -import engine.typedefs.CVar; -import engine.typedefs.CCmd; -import engine.enums.CVarType; -import engine.enums.CVarFlag; -import engine.enums.CCmdType; +import game.ui.CVar; +import game.ui.CVarType; class ConVar{ static var CVarMap:Map = []; - static var CCmdMap:Map = []; - /** - * Registers a new CVar - * @param _name The name of the CVar. This is the way it is called in the console or referred to in code. - * @param _type CVar type as defined in the CVarType enum. - * @param _value The default value for this CVar. This needs to be in line with its CVarType. - * @param _flags CVar flags as defined in the CVarFlags enum. - * @param _helpString Help string that gets printed out in console when no value is specified. - * @param _callback The function that gets called when the CVar is set. Calls empty Void when left undefined. - * @param _callOnCreate Whether the callback function gets called or not after registering. - * @param _bMin Specifies if the CVar has a minimum numeric value. - * @param _fMin Specifies the minimum numeric value. - * @param _fMax Specifies the maximum numeric value. - * @param _bMax Specifies if the CVar has a maximum numeric value. - */ - public static inline function registerCVar(_name:String, _type:CVarType, _value:Dynamic, ?_flags:CVarFlag, ?_helpString:String = "", ?_callback:Void->Void, ?_callOnCreate:Bool=false, _bMin:Bool=false, _fMin:Float=0, _fMax:Float=0, _bMax:Bool = false):CVar + public static inline function registerCVar(_name:String, _type:CVarType, _value, _callback:Void->Void,_callOnSet:Bool=false) { - if(CVarMap[_name]!=null || CCmdMap[_name]!=null){ - Console.devMsg("Tried setting already defined convar: " + _name + ", returning null instead"); - return null; + if(CVarMap[_name]!=null){ + + return; } - if(_bMin && _value < _fMin) _value = _fMin; - if(_bMax && _value > _fMax) _value = _fMax; - var cvar:CVar = CVarMap[_name] = { + CVarMap[_name] = { name : _name, type : _type, value : _value, - flags: _flags, - helpString: _helpString, - bMin : _bMin, - fMin : _fMin, - fMax : _fMax, - bMax : _bMax, callback : _callback == null ? ()->{} : _callback } - if(_callback != null && _callOnCreate){ - _callback(); - } - return cvar; } - public static inline function registerCCmd(_name:String, ?_callback:Array->Void):CCmd + public static inline function setCVar(_name:String, _value:Dynamic) { - 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.is(_value, String)){ - var v:String = _value; - _value = v.toLowerCase(); - if(_value == "true" || _value == "1"){ - _value = true; - } - else{ - _value = false; - } - } - else if(Std.is(_value, Int) || Std.is(_value, Float)){ - if(_value %2 == 0){ - _value = false; - } - else{ - _value = true; - } - } - else if(Std.is(_value, Bool)){ - //do nothing - } - else{ - _value = cv.value; - } - case CString: - _value = Std.string(_value); - - } - cv.value = _value; - + if(CVarMap[_name] != null){ + CVarMap[_name] = _value; } else{ - Console.devMsg("trying to set null convar '"+_name+"'"); + 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){ - if(CCmdMap[_name] != null){ - CCmdMap[_name].callback(_args); - } - } - public static var cmdList:CCmd = ConVar.registerCCmd("list", (cArgs:Array)->{ - var keys:Array = [ - 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; - } - }); - 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]; - } } \ No newline at end of file diff --git a/hGameTest/src/game/ui/Console.hx b/hGameTest/src/game/ui/Console.hx index 2acd4d45..67b017a6 100644 --- a/hGameTest/src/game/ui/Console.hx +++ b/hGameTest/src/game/ui/Console.hx @@ -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) -> { Console.devMsg(args.join(" ").split('"').join(""));}); - ConVar.registerCCmd("quit", (args:Array) -> { 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>){ - for(command in commands){ - var cName:String = command[0]; - var cValue:String = command[1]; - var cArgs:Array = 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 = 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"); } } \ No newline at end of file diff --git a/hGameTest/src/game/video/Mode.hx b/hGameTest/src/game/video/Mode.hx index a5bb30f1..eee4bb0a 100644 --- a/hGameTest/src/game/video/Mode.hx +++ b/hGameTest/src/game/video/Mode.hx @@ -1,6 +1,5 @@ package game.video; -import game.ui.ConVar; import openfl.Lib; import openfl.display.StageDisplayState; @@ -10,15 +9,10 @@ class Mode { return Lib.application.window; } + public static function setVideoMode(width:Int, height:Int, fs:Int = null){ getWindow().resize(width,height); - if(fs != null){ - switchFsMode(fs); - } } - public static var cvMatSetVideoMode:engine.typedefs.CCmd = ConVar.registerCCmd("mat_setvideomode",(args:Array)->{ - setVideoMode(Std.parseInt(args[0]), Std.parseInt(args[1]), Std.parseInt(args[2])); - }); public static function switchFsMode(toState:Int = 0){ if(toState == 0){ if(Lib.current.stage.displayState != StageDisplayState.FULL_SCREEN_INTERACTIVE){