Unchecked commits to resume work on linux

Merge branch 'ui_unchecked' of git-subsonics-andreas:andreas/hGameTest into ui_unchecked
minor changes
2021-11-27 08:34:42 +01:00 · 2021-10-09 21:37:52 +02:00 · 2021-10-09 21:37:42 +02:00 · 2021-10-07 01:52:03 +02:00 · 2021-09-27 21:02:11 +02:00 · 2021-06-28 10:29:12 +02:00
18 changed files with 406 additions and 744 deletions
@@ -1,4 +0,0 @@
-{
-  "version": "4.3.6",
-  "resolveLibs": "scoped"
-}
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-	<title>test</title>
+	<title>nigger</title>
 	<link rel="shortcut icon" type="image/png" href="./favicon.png">
 </head>
 <body>
@@ -1,3 +0,0 @@
-# @install: lix --silent download "haxelib:/actuate#1.9.0" into actuate/1.9.0/haxelib
-cp ${HAXE_LIBCACHE}/actuate/1.9.0/haxelib/src
-D actuate=1.9.0
@@ -1,4 +0,0 @@
-# @install: lix --silent download "haxelib:/hxcpp-debug-server#1.2.4" into hxcpp-debug-server/1.2.4/haxelib
-cp ${HAXE_LIBCACHE}/hxcpp-debug-server/1.2.4/haxelib/
-D hxcpp-debug-server=1.2.4
--macro hxcpp.debug.jsonrpc.Macro.injectServer()
@@ -1,6 +0,0 @@
-# @install: lix --silent download "haxelib:/lime#8.2.2" into lime/8.2.2/haxelib
-# @run: haxelib run-dir lime "${HAXE_LIBCACHE}/lime/8.2.2/haxelib"
-cp ${HAXE_LIBCACHE}/lime/8.2.2/haxelib/src
-D lime=8.2.2
--macro lime._internal.macros.DefineMacro.run()
-lib ndll:${HAXE_LIBCACHE}/lime/8.2.2/haxelib/ndll/
@@ -1,5 +0,0 @@
-# @install: lix --silent download "haxelib:/openfl#9.4.1" into openfl/9.4.1/haxelib
-# @run: haxelib run-dir openfl "${HAXE_LIBCACHE}/openfl/9.4.1/haxelib"
-cp ${HAXE_LIBCACHE}/openfl/9.4.1/haxelib/src
-D openfl=9.4.1
--macro openfl.utils._internal.ExtraParamsMacro.include()
@@ -1,5 +1,5 @@
 {
-  "name": "test",
+  "name": "nigger",
  "version": "1.0.0",
  "lockfileVersion": 1,
  "requires": true,
@@ -1,5 +1,5 @@
 {
-  "name": "test",
+  "name": "nigger",
  "version": "1.0.0",
  "private": true,
  "config": {
@@ -15,10 +15,6 @@
 	
 	<!-- classpath, haxe libs -->
 	<source path="src" />
-	
-	<!-- Macro configuration -->
-	<haxeflag name="--macro" value="addGlobalMetadata('', '@:build(engine.macros.ConVarDecorators.build())')" />
-
 	<assets path="./res/textures" rename="textures" />
 	<assets path="./res/fonts" rename="fonts" />
 	<assets path="./res/data" rename="data"/>
@@ -28,6 +24,6 @@
 	<!--<icon path="assets/openfl.svg" /> -->
 	<!-- <assets path="assets/img" rename="img" /> -->
 	
-	<!-- optimize output -->
-	<haxeflag name="-dce full" />
+	<!-- optimize output
+	<haxeflag name="-dce full" /> -->
 </project>
@@ -0,0 +1,9 @@
+package engine;
+
+
+typedef CVar = {
+    var name:String;
+    var type:CVarType;
+    var value:Dynamic;
+    @:optional var callback:Void -> Void;
+};
@@ -1,17 +1,14 @@
 package engine;

+import haxe.Constraints.Function;
 import engine.typedefs.console.CVar;
 import engine.typedefs.console.CCmd;
 import engine.enums.console.CVarType;
 import engine.enums.console.CVarFlag;
 import game.ui.console.Console;

-import engine.ConVars_Engine;

 class ConVar{
-    // Hush the compiler about unused import
-    // static var ConVars_Engine:Class<ConVars_Engine> = ConVars_Engine;
-
    static var CVarMap:Map<String, CVar> = [];
    static var CCmdMap:Map<String, CCmd> = [];
    /**
@@ -30,7 +27,7 @@ class ConVar{
     */
    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
    {
-        if(CVarMap[_name]!=null || CCmdMap[_name]!= null){
+        if(CVarMap[_name]!=null || CCmdMap[_name]!=null){
            Console.devMsg("Tried setting already defined convar: " + _name + ", returning null instead");
            return null;
        }
@@ -67,10 +64,6 @@ class ConVar{
    }
    public static inline function setCVar(_name:String, _value:Dynamic):Void
    {
-        if(CVarMap == null){
-            Console.devMsg("CVarMap is null");
-            return;
-        }
        var cv = getCVar(_name);
        if(cv != null){
            switch(cv.type){
@@ -150,13 +143,20 @@ class ConVar{
        });
        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];
    }
-    public static inline function getCVarMap():Map<String, CVar>
-    {
-        return CVarMap;
-    }
+
 }
@@ -1,36 +0,0 @@
-package engine;
-
-import game.video.Mode;
-import haxe.macro.Expr.Field;
-import engine.typedefs.console.CVar;
-import engine.typedefs.console.CCmd;
-import engine.enums.console.CVarType;
-import engine.enums.console.CVarFlag;
-import engine.macros.ConVarDecorators;
-import game.ui.console.Console;
-
-@:keep
-// @:build(engine.macros.CCmdDecorator.build()) // No longer needed because we added the build macro to the project.xml
-class ConVars_Engine {
-
-    @:concmd("list")
-    public static function listCommands(args:Array<String>) {
-        var CVarMap:Map<String, CVar> = ConVar.getCVarMap();
-        var keys:Array<String> = ConVar.getCVarNames();
-        for(key in keys){
-            if(CVarMap[key] != null){
-                Console.devMsg(key+" "+ CVarMap[key].value);
-            }
-            else{
-                Console.devMsg(key);
-            }
-        }    
-    }
-
-    @:concmd("test")
-    public static function testCommand() {
-        // Command implementation
-        trace("Test Output");
-    }
-
-}
@@ -1,7 +1,6 @@
 package engine.enums.console;

 enum CVarFlag{
-    FCVAR_NONE;
    FCVAR_ARCHIVE;
    FCVAR_CHEAT;
    FVCAR_REPLICATED;
@@ -1,268 +0,0 @@
-package engine.macros;
-
-#if macro
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import haxe.macro.Type;
-import haxe.macro.Expr.Field;
-import haxe.macro.Expr.Function;
-import haxe.macro.Expr.Access;
-
-private typedef CVarMetadata = {
-    name:Expr,
-    type:String,
-    value:Expr,
-    flags:Expr,
-    help:Expr,
-    ?callback:Expr
-}
-
-class ConVarDecorators {
-    static function extractCVarMetadata(params:Array<Expr>):CVarMetadata {
-        if (params == null || params.length == 0) return null;
-        
-        var metadata:CVarMetadata = {
-            name: macro "",
-            type: "CString",
-            value: macro 0,
-            flags: macro "FCVAR_NONE",
-            help: macro "",
-            callback: macro null
-        };
-
-        switch (params[0].expr) {
-            case EObjectDecl(fields):
-                var fieldMap = [
-                    "name" => function(expr) metadata.name = expr,
-                    "type" => function(expr) metadata.type = switch (expr.expr) {
-                        case EConst(CString(s)): s;
-                        case _: "CString";
-                    },
-                    "value" => function(expr) metadata.value = expr,
-                    "flags" => function(expr) metadata.flags = expr,
-                    "help" => function(expr) metadata.help = expr,
-                    "callback" => function(expr) metadata.callback = expr
-                ];
-
-                for (field in fields) {
-                    if (fieldMap.exists(field.field)) {
-                        fieldMap[field.field](field.expr);
-                    } else {
-                        Context.error("Unexpected field: " + field.field, field.expr.pos);
-                    }
-                }
-            case _:
-        }
-        return metadata;
-    }
-    
-    // Process command fields
-    private static function processCommandField(field:Field, cmdMeta:MetadataEntry, extraFields:Array<Field>):Void {
-        if (!isFieldKind(field, "FFun")) {
-            Context.error("The @:concmd metadata can only be applied to functions", field.pos);
-            return;
-        }
-        
-        var pos = Context.currentPos();
-        var functionReference = getFunctionFromField(field);
-        if (functionReference == null) return;
-        
-        var name = cmdMeta.params.length > 0 ? getStringFromExpr(cmdMeta.params[0]) ?? field.name : field.name;
-        var functionExpression = macro function(args:Array<String>) ${functionReference.expr};
-        
-        var initExpr = macro {
-            var cmd = engine.ConVar.registerCCmd($v{name}, $functionExpression);
-            cmd;
-        };
-        
-        var initName = "__init__cmd_" + name;
-        extraFields.push(createStaticInitField(initName, initExpr, pos));
-    }
-    
-    // Process convar fields
-    private static function processConVarField(field:Field, cvarMeta:MetadataEntry, extraFields:Array<Field>):Void {
-        if (!isFieldKind(field, "FVar")) {
-            Context.error("The @:convar metadata can only be applied to variables", field.pos);
-            return;
-        }
-        
-        var pos = Context.currentPos();
-        var meta = extractCVarMetadata(cvarMeta.params);
-        if (meta == null) {
-            Context.error("Metadata extraction failed for field: " + field.name, field.pos);
-            return;
-        }
-        
-        var cvarName = getStringFromMetaExpr(meta.name) ?? field.name;
-        var fieldName = field.name;
-        var isStatic = hasAccess(field, AStatic);
-        
-        var varType = getVarType(field);
-        
-        if (isStatic) {
-            // Handle static fields
-            var staticInitExpr = macro {
-                var cvar = $i{fieldName} = engine.ConVar.registerCVar(
-                    ${meta.name},
-                    ${Context.parse('engine.enums.console.CVarType.' + meta.type, pos)}, 
-                    ${meta.value}, 
-                    ${Context.parse('engine.enums.console.CVarFlag.' + switch (meta.flags.expr) {
-                        case EConst(CString(s)): s;
-                        case _: "FCVAR_NONE";
-                    }, pos)}, 
-                    ${meta.help},
-                    ${meta.callback ?? macro null}
-                );
-                trace($v{"Registered CVar: "} + $e{meta.name});
-                cvar;
-            };
-            
-            extraFields.push(createStaticInitField("__init__" + cvarName, staticInitExpr, pos));
-        } else {
-            // Handle instance fields
-            updateFieldInitialValue(field, macro null);
-            
-            var instanceInitializerExpression = macro {
-                if (Reflect.field(this, $v{fieldName}) == null) {
-                    Reflect.setField(this, $v{fieldName}, engine.ConVar.registerCVar(
-                        ${meta.name},
-                        ${Context.parse('engine.enums.console.CVarType.' + meta.type, pos)}, 
-                        ${meta.value}, 
-                        ${Context.parse('engine.enums.console.CVarFlag.' + switch (meta.flags.expr) {
-                            case EConst(CString(s)): s;
-                            case _: "FCVAR_NONE";
-                        }, pos)}, 
-                        ${meta.help},
-                        ${meta.callback ?? macro null}
-                    ));
-                    trace($v{"Registered CVar: "} + $e{meta.name});
-                }
-            };
-            
-            ensureConstructorWithInit(extraFields, instanceInitializerExpression, pos);
-        }
-    }
-    
-    // Map to check field kinds
-    private static final fieldKindMap:Map<String, haxe.macro.FieldType->Bool> = [
-        "FFun" => function(ft) return switch(ft) { case FFun(_): true; case _: false; },
-        "FVar" => function(ft) return switch(ft) { case FVar(_, _): true; case _: false; },
-        "FProp" => function(ft) return switch(ft) { case FProp(_, _, _, _): true; case _: false; }
-    ];
-    
-    // Utility functions
-    private static function isFieldKind(field:Field, kind:String):Bool {
-        return fieldKindMap.exists(kind) ? fieldKindMap.get(kind)(field.kind) : false;
-    }
-    
-    private static function getFunctionFromField(field:Field):Function {
-        return switch (field.kind) {
-            case FFun(f): f;
-            case _: null;
-        }
-    }
-    
-    private static function getVarType(field:Field):ComplexType {
-        return switch (field.kind) {
-            case FVar(t, _): t;
-            case _: null;
-        }
-    }
-    
-    private static function updateFieldInitialValue(field:Field, expr:Expr):Void {
-        switch (field.kind) {
-            case FVar(t, _): field.kind = FVar(t, expr);
-            case _:
-        }
-    }
-    
-    private static function getStringFromExpr(expr:Expr):String {
-        return switch (expr.expr) {
-            case EConst(CString(s)): s;
-            case _: null;
-        }
-    }
-    
-    private static function getStringFromMetaExpr(expr:Expr):String {
-        return switch (expr.expr) {
-            case EConst(CString(s)): s;
-            case _: null;
-        }
-    }
-    
-    private static function hasAccess(field:Field, access:Access):Bool {
-        return field.access != null && field.access.indexOf(access) >= 0;
-    }
-    
-    private static function createStaticInitField(name:String, initExpr:Expr, pos:Position):Field {
-        return {
-            name: name,
-            access: [AStatic],
-            kind: FVar(null, initExpr),
-            pos: pos,
-            doc: null,
-            meta: [{ name: ":keep", params: [], pos: pos }]
-        };
-    }
-    
-    private static function ensureConstructorWithInit(fields:Array<Field>, initExpr:Expr, pos:Position):Void {
-        var cls = Context.getLocalClass().get();
-        var hasSuperClass = cls.superClass != null;
-        
-        var constructor = Lambda.find(fields, function(f) return f.name == "new");
-        if (constructor == null) {
-            constructor = {
-                name: "new",
-                access: [APublic],
-                kind: FFun({
-                    args: [],
-                    expr: if (hasSuperClass) macro {
-                        super();
-                        $initExpr;
-                    } else macro {
-                        $initExpr;
-                    },
-                    ret: null
-                }),
-                pos: pos,
-                meta: []
-            };
-            fields.push(constructor);
-        } else {
-            switch (constructor.kind) {
-                case FFun(f):
-                    switch(f.expr.expr) {
-                        case EBlock(exprs):
-                            exprs.push(initExpr);
-                        case _:
-                            f.expr = macro {
-                                ${f.expr};
-                                $initExpr;
-                            }
-                    }
-                case _:
-            }
-        }
-    }
-
-    public static macro function build():Array<Field> {
-        var fields = Context.getBuildFields();
-        var extraFields:Array<Field> = [];
-        
-        for (field in fields) {
-            if (field.meta == null) continue;
-            
-            var cmdMeta = Lambda.find(field.meta, function(m) return m.name == ":concmd");
-            var cvarMeta = Lambda.find(field.meta, function(m) return m.name == ":convar");
-            
-            if (cmdMeta != null) {
-                processCommandField(field, cmdMeta, extraFields);
-            } else if (cvarMeta != null && cvarMeta.params.length > 0) {
-                processConVarField(field, cvarMeta, extraFields);
-            }
-        }
-        
-        return fields.concat(extraFields);
-    }
-}
-#end
@@ -21,7 +21,7 @@ import openfl.text.TextField;
 import engine.ConVar;
 import engine.geom.Geom.P2d;

-enum abstract PaneLayout(Int) {
+@:enum abstract PaneLayout(Int) {
 	var HORIZONTAL = 0;
 	var VERTICAL = 1;
 }
@@ -18,19 +18,7 @@ class Input{
    public static var keys:Map<Int,Bool> = [];
    public static var keysLast:Map<Int,Bool> = [];
    public static var bindMap:Map<String, String> = ["~" => "toggleconsole", "\\" => "toggleconsole", "1" => "echo kak", "2" => "+attack"];
-    @:convar({
-        name: "cl_debuginput",
-        type: CVarType.CInt,
-        value: 0,
-        flags: CVarFlag.None,
-        help: "print debug messages related to input to console",
-        callback: function() {
-            trace("Debug input changed");
-        }
-    })
-    public static var cv_debugKeys:CVar;
-    
-    // public static var cv_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 cv_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 keyNameMap:Map<Int, String> = [
        Kb.HOME =>      "HOME",     Kb.END =>      "END",  Kb.INSERT =>   "INSERT", Kb.DELETE =>   "DELETE",     Kb.PAGE_UP =>     "PGUP", Kb.PAGE_DOWN =>    "PGDN", 
        Kb.ESCAPE =>    "ESC",      Kb.F1 =>       "F1",   Kb.F2 =>       "F2",     Kb.F3 =>       "F3",         Kb.F4 =>          "F4",   Kb.F5 =>           "F5", 
@@ -3,7 +3,6 @@ package game.ui.console;
 import game.ui.text.TextFormats;
 import assets.Fonts;
 import openfl.Lib;
-import engine.ui.UIPane.PaneLayout;
 import openfl.events.Event;
 import openfl.text.TextFieldAutoSize;
 import openfl.text.TextField;
@@ -18,381 +17,377 @@ import engine.typedefs.console.CCmd;
 import game.ui.console.elements.ConsoleInput;
 import engine.ui.UIPane;

-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;
+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 var ccmd_visible:CCmd = ConVar.registerCCmd("toggleconsole",(cArgs:Array<String>)->{
+        toggle();
+    });
+    public function new(){
+        super();
        
-	@: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);
+        consoleInstance = this;
+        
+
+        var consolePane:UIPane = new UIPane("yeeto",{width:800, height:600});
+
+        this.addChild(consolePane.sprite);
+        consolePane.layout = VERTICAL;
+
+        //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();
+        cAutoComp = new TextField();
+        
+        drawFields(cOut, cAutoComp);
+        
+        
+        cOut.addEventListener(Event.CHANGE, onOutputTextChange);
+        cIn.addEventListener(Event.CHANGE, onInputTextChange);
+        this.addChild(cOut);
+        this.addChild(cInput);
+        this.addChild(cAutoComp);
+        ConVar.registerCCmd("echo", (args:Array<String>) -> { Console.devMsg(args.join(" ").split('"').join(""));});
+        ConVar.registerCCmd("quit", (args:Array<String>) -> { Lib.application.window.close();});
+    }
+    public function drawFields(cOut:TextField, cAutoComp: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.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;
+    }
+
+
+    public function parseCmd(cmd:String, bNoHist:Bool = false){
+        if(!bNoHist)
+            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);
            }
        }
-    })
-	public static var scvar_mat_consolebg:CVar;
+        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);
+                }
                
-    public var cvar_mat_consolebg:CVar;
+            }
+            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){
+            // Store command name, value and args
+            var cName:String = command[0];
+            var cValue:String = command[1];
+            var cArgs:Array<String> = command.slice(1);
+            //Check if convar with that name actually exists
+            if(ConVar.isCVar(cName)){
+                //Get reference to convar object
+                var cv:CVar = ConVar.getCVar(command[0]);
+                //Check number of params
+                if(command.length == 1){
+                    //No params after the cmd, print help string
+                    devMsg(cv.name+" - "+cv.helpString);
+                    devMsg(cv.name+" = "+cv.value);
+                }
+                else{
+                    //Check for convar type and set value accordingly
+                    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;
+                    }
                    
-    public var ccmd_visible:CCmd = ConVar.registerCCmd("toggleconsole", (cArgs:Array<String>) -> {
-		toggle();
-	});
+                }
                
-	public function new() {
-		super();
+            }
+            //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(){
+        cOut.appendText(">"+cInput.getText()+"\n");
+        parseCmd(cInput.getText());
+        cInput.setText("");
+        cAutoComp.visible = false;
+        cOut.scrollV = cOut.maxScrollV;
+        histSelect = -1;
+    }
+    public function onOutputTextChange(e:Event){
+        cOut.scrollV = cOut.maxScrollV;
+    }
+    public function onInputTextChange(e:Event){
+        if(cInput.getText() != ""){
+            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;
+        if(!consoleInstance.visible){
+            if(Lib.current.stage.focus == consoleInstance.cIn){
+                Lib.current.stage.focus = null;
+            }
+        }
+        else{
+            Lib.current.stage.focus = consoleInstance.cIn;
+        }
+    }
+    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.cInput.getText().split(" ");
+        var inpStripped:Array<String> = [
+            for(word in inp){
+                if(word != "" && word != " "){
+                    word;
+                }
+            }
+        ];
+        // Stop if input is empty
+        if(inp.length == 0) return [];

-        cvar_mat_consolebg = scvar_mat_consolebg;
-		consoleInstance = this;
+        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.cInput.getText() == "" || histSelect != -1){
+            // Store current input in tmpInput
+            if(histSelect == -1) tmpInput = consoleInstance.cInput.getText();
+            // 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.cInput.setText(history[histSelect]);
+                }
+                else{
+                    // Restore tmp input
+                    consoleInstance.cInput.setText(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){
                    
-		var consolePane = new UIPane("yeeto", {width: 800, height: 600, minWidth: 400, minHeight: 300, maxWidth: 1200, maxHeight: 800});
+                }
+                // Not currently selecting an autocomplete entry
+                else{
    
-		consolePane.layout = VERTICAL;
-		consolePane.layout = VERTICAL;
-
-		// 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;
+                }
+            }
                
            
-		cOut = new TextField();
-		cAutoComp = new TextField();
-
-		drawFields(cOut, cAutoComp);
-
-		cOut.addEventListener(Event.CHANGE, onOutputTextChange);
-		cIn.addEventListener(Event.CHANGE, onInputTextChange);
-		this.addChild(cOut);
-		this.addChild(cInput);
-		this.addChild(cAutoComp);
-		ConVar.registerCCmd("echo", (args:Array<String>) -> {
-			Console.devMsg(args.join(" ").split('"').join(""));
-		});
-		ConVar.registerCCmd("quit", (args:Array<String>) -> {
-			Lib.application.window.close();
-		});
-	}
-
-	public function drawFields(cOut:TextField, cAutoComp:TextField) {
-		cOut.text = "hConsole Initialized\n";
-		cOut.defaultTextFormat = TextFormats.getFormats().cOutputFmt;
-		cOut.wordWrap = true;
-		// cOut.autoSize = TextFieldAutoSize.LEFT;
-		cOut.multiline = true;
-		cOut.background = true;
-        trace(cvar_mat_consolebg);
-		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.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;
-	}
-
-	public function parseCmd(cmd:String, bNoHist:Bool = false) {
-		if (!bNoHist)
-			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) {
-			// Store command name, value and args
-			var cName:String = command[0];
-			var cValue:String = command[1];
-			var cArgs:Array<String> = command.slice(1);
-			// Check if convar with that name actually exists
-			if (ConVar.isCVar(cName)) {
-				// Get reference to convar object
-				var cv:CVar = ConVar.getCVar(command[0]);
-				// Check number of params
-				if (command.length == 1) {
-					// No params after the cmd, print help string
-					devMsg(cv.name + " - " + cv.helpString);
-					devMsg(cv.name + " = " + cv.value);
-				} else {
-					// Check for convar type and set value accordingly
-					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;
-					}
-				}
-			}
-			// 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() {
-		cOut.appendText(">" + cInput.getText() + "\n");
-		parseCmd(cInput.getText());
-		cInput.setText("");
-		cAutoComp.visible = false;
-		cOut.scrollV = cOut.maxScrollV;
-		histSelect = -1;
-	}
-
-	public function onOutputTextChange(e:Event) {
-		cOut.scrollV = cOut.maxScrollV;
-	}
-
-	public function onInputTextChange(e:Event) {
-		if (cInput.getText() != "") {
-			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;
-		if (!consoleInstance.visible) {
-			if (Lib.current.stage.focus == consoleInstance.cIn) {
-				Lib.current.stage.focus = null;
-			}
-		} else {
-			Lib.current.stage.focus = consoleInstance.cIn;
-		}
-	}
-
-	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.cInput.getText().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.cInput.getText() == "" || histSelect != -1) {
-			// Store current input in tmpInput
-			if (histSelect == -1)
-				tmpInput = consoleInstance.cInput.getText();
-			// 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.cInput.setText(history[histSelect]);
-				} else {
-					// Restore tmp input
-					consoleInstance.cInput.setText(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;
-			}
-		}
-	}
+        }
+    }
+    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;
+            }
+        }
+    }
 }
@@ -11,14 +11,15 @@ 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);
+        }
    }
-    @:concmd("mat_setvideomode")
-    public static function cCmdMatSetVideoMode(args:Array<String>){
-        Mode.setVideoMode(Std.parseInt(args[0]), Std.parseInt(args[1]), Std.parseInt(args[2]));
-    }
+    public static var cvMatSetVideoMode:CCmd = ConVar.registerCCmd("mat_setvideomode",(args:Array<String>)->{
+        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){
Author	SHA1	Message	Date
andreas	180b0f4b3f	Unchecked commits to resume work on linux	2021-11-27 08:34:42 +01:00
andreas	d7bd0d02ee	Merge branch 'ui_unchecked' of git-subsonics-andreas:andreas/hGameTest into ui_unchecked	2021-10-09 21:37:52 +02:00
andreas	720b4d45f2	minor changes	2021-10-09 21:37:42 +02:00
andreas	8951795e9b	fixed inconsistency with var naming scheme	2021-10-07 01:52:03 +02:00
andreas	4208265d21	changed the tool window impolementation	2021-09-27 21:02:11 +02:00
andreas	5422b854e0	ya	2021-06-28 10:29:12 +02:00
andreas	4f9469ead5	Moved and added a bunch of stuff	2021-06-22 20:02:02 +02:00
andreas	a07bdb6b99	various changes	2021-06-19 18:12:24 +02:00
andreas	24432f1b91	Implemented UIPane	2021-06-11 13:17:49 +02:00
andreas	07fa2e7868	Moved ConVar related files to engine	2021-04-28 09:32:47 +02:00
andreas	4fe14e341c	removed unneeded class	2021-04-28 08:34:19 +02:00
andreas	c3ac30208b	implemented keybinds	2021-04-28 08:29:55 +02:00
andreas	7fa7ece574	refactoring console ui	2021-04-27 00:25:42 +02:00
andreas	be0c83e766	preprocessor definitions to prevent complaining	2021-04-27 00:25:07 +02:00
andreas	4f4cca4109	target hashlink	2021-04-27 00:24:30 +02:00
andreas	7e3369d128	some minor changes	2021-03-31 16:13:23 +02:00
andreas	33e5a67e4d	fixed import of deleted file	2021-03-31 15:13:52 +02:00
andreas	75d8032b5d	Merge branch 'aids' of git-subsonics-andreas:andreas/hGameTest into aids	2021-03-31 15:10:49 +02:00
andreas	013a27d0b3	implemented cvar, ccmd and parsing console input	2021-03-31 15:03:58 +02:00
andreas	8adb6bbaef	changed a bunch of fucking shit	2021-03-31 14:58:07 +02:00
andreas	5723371944	changed a bunch of fucking shit	2021-03-24 21:59:05 +01:00
andreas	4272c12ec1	added Bind class	2021-03-15 10:12:12 +01:00
andreas	923ac33302	bunch of shit	2021-03-14 18:39:55 +01:00
andreas	bc1a251842	added keyboard input	2021-03-13 04:11:21 +01:00
andreas	8973b65954	moved and changed Game.hx	2021-03-13 04:11:09 +01:00
andreas	132a9d63c0	added entity support	2021-03-13 04:10:27 +01:00
andreas	fbc3be26e4	changed tilesets	2021-03-13 04:10:02 +01:00
andreas	56d4651228	implemented atlas loading	2021-03-13 00:11:14 +01:00
andreas	570816c0b5	I don't even know what I changed at this point	2021-03-10 23:28:05 +01:00
andreas	90d44a1376	removed more ignore files	2021-03-07 06:28:46 +01:00
andreas	9a585cf24b	removed ignored files	2021-03-07 06:28:07 +01:00
andreas	728ab76571	updated gitignore	2021-03-07 06:26:24 +01:00
andreas	a96e97f2a0	added gitignore	2021-03-07 06:21:21 +01:00
andreas	8204c6b556	First commit	2021-03-07 05:58:59 +01:00