use new decorator syntax

hGameTest/project.xml

@@ -17,7 +17,7 @@
 	<source path="src" />
 	
 	<!-- Macro configuration -->
-	<haxeflag name="--macro" value="addGlobalMetadata('', '@:build(engine.macros.CCmdDecorator.build())')" />
+	<haxeflag name="--macro" value="addGlobalMetadata('', '@:build(engine.macros.ConVarDecorators.build())')" />
 
 	<assets path="./res/textures" rename="textures" />
 	<assets path="./res/fonts" rename="fonts" />

hGameTest/src/engine/ConVar.hx

@@ -67,6 +67,10 @@ 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){

hGameTest/src/engine/ConVars_Engine.hx

@@ -6,14 +6,14 @@ import engine.typedefs.console.CVar;
 import engine.typedefs.console.CCmd;
 import engine.enums.console.CVarType;
 import engine.enums.console.CVarFlag;
-import engine.macros.CCmdDecorator;
+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 {
 
-    @:command("list")
+    @:concmd("list")
     public static function listCommands(args:Array<String>) {
         var CVarMap:Map<String, CVar> = ConVar.getCVarMap();
         var keys:Array<String> = ConVar.getCVarNames();
@@ -27,7 +27,7 @@ class ConVars_Engine {
         }    
     }
 
-    @:command("test")
+    @:concmd("test")
     public static function testCommand() {
         // Command implementation
         trace("Test Output");

hGameTest/src/engine/enums/console/CVarFlag.hx

@@ -1,6 +1,7 @@
 package engine.enums.console;
 
 enum CVarFlag{
+    FCVAR_NONE;
     FCVAR_ARCHIVE;
     FCVAR_CHEAT;
     FVCAR_REPLICATED;

hGameTest/src/engine/macros/CCmdDecorator.hx

@@ -1,46 +0,0 @@
-package engine.macros;
-
-import haxe.macro.Expr;
-import haxe.macro.Context;
-
-class CCmdDecorator {
-    public static macro function build():Array<Field> {
-        var fields = Context.getBuildFields();
-        var pos = Context.currentPos();
-        
-        for (field in fields) {
-            var meta = field.meta != null ? Lambda.find(field.meta, function(m) return m.name == ":command") : null;
-            if (meta != null) {
-                trace(meta);
-                switch field.kind {
-                    case FFun(f):
-                        var name = meta.params.length > 0 
-                            ? switch(meta.params[0].expr) { 
-                                case EConst(CString(s)): s; 
-                                case _: field.name;
-                            }
-                            : field.name;
-                            
-                        // Create a static initializer field
-                        var initField = {
-                            name: "__init__" + name,
-                            access: [AStatic, APrivate],
-                            kind: FVar(null, macro {
-                                engine.ConVar.registerCCmd($v{name}, function(args:Array<String>) {
-                                    ${f.expr};
-                                });
-                            }),
-                            pos: pos,
-                            doc: null,
-                            meta: []
-                        };
-                        
-                        // Add the initializer field
-                        fields.push(initField);
-                    case _:
-                }
-            }
-        }
-        return fields;
-    }
-}

hGameTest/src/engine/macros/ConVarDecorators.hx

@@ -0,0 +1,136 @@
+package engine.macros;
+
+import haxe.macro.Expr;
+import haxe.macro.Context;
+import haxe.macro.Expr.Field;
+
+private typedef CVarMetadata = {
+    name: Expr,
+    type: String,
+    value: Expr,
+    flags: Expr,
+    help: Expr,
+    ?callback: Expr
+}
+
+class ConVarDecorators {
+    static function extractCVarMetadata(params:Array<Expr>):CVarMetadata {
+        var metadata:CVarMetadata = null;
+        
+        switch (params[0].expr) {
+            case EObjectDecl(fields):
+                metadata = {
+                    name: macro "",
+                    type: "CString",
+                    value: macro 0,
+                    flags: macro "FCVAR_NONE",
+                    help: macro "",
+                    callback: macro null
+                };
+                
+                for (field in fields) {
+                    switch (field.field) {
+                        case "name": metadata.name = field.expr;
+                        case "type": metadata.type = switch(field.expr.expr) { 
+                            case EConst(CString(s)): s; 
+                            case _: "CString"; 
+                        }
+                        case "value": metadata.value = field.expr;
+                        case "flags": metadata.flags = field.expr;
+                        case "help": metadata.help = field.expr;
+                        case "callback": metadata.callback = field.expr;
+                        case _:
+                    }
+                }
+            case _:
+        }
+        return metadata;
+    }
+
+    public static macro function build():Array<Field> {
+        var fields = Context.getBuildFields();
+        var pos = Context.currentPos();
+
+        for (field in fields) {
+            var cmdMeta = field.meta != null ? Lambda.find(field.meta, function(m) return m.name == ":concmd") : null;
+            var cvarMeta = field.meta != null ? Lambda.find(field.meta, function(m) return m.name == ":convar") : null;
+
+            if (cmdMeta != null) {
+                switch field.kind {
+                    case FFun(f):
+                        var name = cmdMeta.params.length > 0 ? switch (cmdMeta.params[0].expr) {
+                            case EConst(CString(s)): s;
+                            case _: field.name;
+                        } : field.name;
+
+                        var fnExpr = macro function(args:Array<String>) ${f.expr};
+
+                        var initExpr = macro {
+                            var cmd = engine.ConVar.registerCCmd($v{name}, $fnExpr);
+                            cmd; // Return the command reference
+                        };
+
+                        // Generate a safe initialization field name
+                        var initName = "__init__" + name;
+
+                        fields.push({
+                            name: initName,
+                            access: [AStatic],
+                            kind: FVar(null, initExpr),
+                            pos: pos,
+                            doc: null,
+                            meta: [{
+                                name: ":keep",
+                                params: [],
+                                pos: pos
+                            }]
+                        });
+                    case _:
+                }
+            } else if (cvarMeta != null && cvarMeta.params.length > 0) {
+                switch (field.kind) {
+                    case FVar(t, e):
+                        var meta = extractCVarMetadata(cvarMeta.params);
+                        if (meta == null) continue;
+
+                        // Extract name from metadata expression
+                        var cvarName = switch(meta.name.expr) {
+                            case EConst(CString(s)): s;
+                            case _: field.name;
+                        };
+
+                        var initExpr = macro {
+                            var cvar = $i{field.name} = 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; // Return the CVar reference
+                        };
+
+                        fields.push({
+                            name: "__init__" + cvarName,
+                            access: [AStatic],
+                            kind: FVar(null, initExpr),
+                            pos: pos,
+                            doc: null,
+                            meta: [{
+                                name: ":keep",
+                                params: [],
+                                pos: pos
+                            }]
+                        });
+                    case _:
+                }
+            }
+        }
+        return fields;
+    }
+}

hGameTest/src/game/Input.hx

@@ -18,7 +18,19 @@ 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"];
-    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);
+    @: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 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", 

hGameTest/src/game/ui/console/Console.hx

@@ -3,6 +3,7 @@ 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;
@@ -17,27 +18,43 @@ 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;
+    @: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 ccmd_visible:CCmd = ConVar.registerCCmd("toggleconsole", (cArgs:Array<String>) -> {
 		toggle();
 	});
+
 	public function new() {
 		super();
         
+        cvar_mat_consolebg = scvar_mat_consolebg;
 		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;
 
 		// graphics.beginFill(0x555555);
@@ -50,33 +67,33 @@ class Console extends Sprite{
 		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("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.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;
@@ -99,7 +116,6 @@ class Console extends Sprite{
 		cAutoComp.y = 600;
 	}
 
-
 	public function parseCmd(cmd:String, bNoHist:Bool = false) {
 		if (!bNoHist)
 			history.push(cmd);
@@ -117,7 +133,6 @@ class Console extends Sprite{
 				if (endQuoteIndex == 0) {
 					cmd += '"';
 					endQuoteIndex = cmd.length;
-                    
 				}
 				// push quote content
 				subStrings.push(cmd.substring(startQuoteIndex, endQuoteIndex));
@@ -135,9 +150,7 @@ class Console extends Sprite{
 					if (str != "")
 						newSubStrings.push(str);
 				}
-                
+			} else {
-            }
-            else{
 				newSubStrings.push(subString);
 			}
 		}
@@ -159,6 +172,7 @@ class Console extends Sprite{
 		trace(commands);
 		execCommands(commands);
 	}
+
 	public function execCommands(commands:Array<Array<String>>) {
 		for (command in commands) {
 			// Store command name, value and args
@@ -174,8 +188,7 @@ class Console extends Sprite{
 					// No params after the cmd, print help string
 					devMsg(cv.name + " - " + cv.helpString);
 					devMsg(cv.name + " = " + cv.value);
-                }
+				} else {
-                else{
 					// Check for convar type and set value accordingly
 					switch (cv.type) {
 						case CInt:
@@ -189,8 +202,7 @@ class Console extends Sprite{
 							cValue = cValue.toLowerCase();
 							if (cValue == "1" || cValue == "true") {
 								ConVar.setCVar(cName, true);
-                            }
+							} else if (cValue == "0" || cValue == "false") {
-                            else if(cValue == "0" || cValue == "false"){
 								ConVar.setCVar(cName, false);
 							}
 							break;
@@ -198,9 +210,7 @@ class Console extends Sprite{
 							ConVar.setCVar(cName, cValue);
 							break;
 					}
-                    
 				}
-                
 			}
 			// convar is actually a command, run it.
 			else if (ConVar.isCmd(cName)) {
@@ -212,6 +222,7 @@ class Console extends Sprite{
 			}
 		}
 	}
+
 	public function submitInput() {
 		cOut.appendText(">" + cInput.getText() + "\n");
 		parseCmd(cInput.getText());
@@ -220,9 +231,11 @@ class Console extends Sprite{
 		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 = "";
@@ -231,36 +244,35 @@ class Console extends Sprite{
 				trace(string);
 			}
 			cAutoComp.visible = true;
-        }
+		} else {
-        else{
 			cAutoComp.visible = false;
 			autocompleteList = history;
 		}
 	}
-    public static function toggle():Void
+
-    {
+	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 {
-        else{
 			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.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>
+
-    {
+	public static function getCompList():Array<String> {
 		// Split words
 		var inp:Array<String> = consoleInstance.cInput.getText().split(" ");
 		var inpStripped:Array<String> = [
@@ -271,15 +283,15 @@ class Console extends Sprite{
 			}
 		];
 		// Stop if input is empty
-        if(inp.length == 0) return [];
+		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)
+			if (inp.length == 1) {
-            {
 				// Check if the cvar starts with the input
 				if (cVar.indexOf(inp[0]) == 0) {
 					cVarFiltered.push(cVar);
@@ -292,8 +304,7 @@ class Console extends Sprite{
 				}
 			}
 			// Multiple words, check for cvars that contain all of them
-            else if(inpStripped.length > 1)
+			else if (inpStripped.length > 1) {
-            {
 				var bWordNotPresent:Bool = false;
 				for (word in inpStripped) {
 					if (cVar.indexOf(word) == -1) {
@@ -306,12 +317,13 @@ class Console extends Sprite{
 		}
 		return cVarFiltered;
 	}
-    public static function histPrev():Void
+
-    {
+	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();
+			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
@@ -326,8 +338,7 @@ class Console extends Sprite{
 				if (histSelect != -1) {
 					// Put correct history entry in the input field
 					consoleInstance.cInput.setText(history[histSelect]);
-                }
+				} else {
-                else{
 					// Restore tmp input
 					consoleInstance.cInput.setText(tmpInput);
 				}
@@ -342,27 +353,21 @@ class Console extends Sprite{
 		else {
 			if (autocompleteList.length == 0) {
 				return;
-            }
+			} else {
-            else{
 				// Check if currently selecting an autocomplete entry
-                if(compSelect > -1){
+				if (compSelect > -1) {}
-                    
-                }
 				// 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
 		if (consoleInstance.cIn.text == "" || histSelect != -1) {
 			// 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
 			if (history.length != 0) {
 				// Check if currently selecting a history entry
@@ -377,8 +382,7 @@ class Console extends Sprite{
 				if (histSelect != -1) {
 					// Put correct history entry in the input field
 					consoleInstance.cIn.text = history[histSelect];
-                }
+				} else {
-                else{
 					// Restore tmp input
 					consoleInstance.cIn.text = tmpInput;
 				}

hGameTest/src/game/video/Mode.hx

@@ -15,7 +15,7 @@ class Mode
     public static function setVideoMode(width:Int, height:Int, fs:Int = null){
         getWindow().resize(width,height);
     }
-    @:command("mat_setvideomode")
+    @:concmd("mat_setvideomode")
     public static function cCmdMatSetVideoMode(args:Array<String>){
         Mode.setVideoMode(Std.parseInt(args[0]), Std.parseInt(args[1]), Std.parseInt(args[2]));
     }