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

Fix broken ConVar file

Browse Source
This commit is contained in:
Andreas Schaafsma 2025-03-11 09:07:48 +01:00
parent 36ad6d10a5
commit ee45fc04b0
1 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
hGameTest/src/engine/ConVar.hx
View File

@ -1,29 +1,59 @@
package engine; package engine;
import haxe.Constraints.Function;
import engine.typedefs.console.CVar; import engine.typedefs.console.CVar;
import engine.typedefs.console.CCmd; import engine.typedefs.console.CCmd;
import engine.enums.console.CVarType; import engine.enums.console.CVarType;
import engine.enums.console.CVarFlag; import engine.enums.console.CVarFlag;
import game.ui.console.Console; import game.ui.console.Console;
import engine.ConVars_Engine;
class ConVar{ class ConVar{
static var CVarMap:Map<String, CVar> = []; // Hush the compiler about unused import
public static inline function registerCVar(_name:String, _type:CVarType, _value, _callback:Void->Void,_callOnSet:Bool=false) // static var ConVars_Engine:Class<ConVars_Engine> = ConVars_Engine;
{
if(CVarMap[_name]!=null){
return; static var CVarMap:Map<String, CVar> = [];
static var CCmdMap:Map<String, CCmd> = [];
/**
* 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
{
if(CVarMap[_name]!=null || CCmdMap[_name]!= null){
Console.devMsg("Tried setting already defined convar: " + _name + ", returning null instead");
return null;
} }
CVarMap[_name] = { if(_bMin && _value < _fMin) _value = _fMin;
if(_bMax && _value > _fMax) _value = _fMax;
var cvar:CVar = CVarMap[_name] = {
name : _name, name : _name,
type : _type, type : _type,
value : _value, value : _value,
flags: _flags,
helpString: _helpString,
bMin : _bMin,
fMin : _fMin,
fMax : _fMax,
bMax : _bMax,
callback : _callback == null ? ()->{} : _callback callback : _callback == null ? ()->{} : _callback
} }
if(_callback != null && _callOnCreate){
_callback();
}
return cvar;
} }
public static inline function setCVar(_name:String, _value:Dynamic) public static inline function registerCCmd(_name:String, ?_callback:Array<String>->Void):CCmd
{ {
if(CVarMap[_name]!=null || CCmdMap[_name]!=null){ if(CVarMap[_name]!=null || CCmdMap[_name]!=null){
Console.devMsg("Tried setting already defined command: " + _name + ", returning null instead"); Console.devMsg("Tried setting already defined command: " + _name + ", returning null instead");
@ -77,7 +107,7 @@ class ConVar{
} }
else{ else{
Console.consoleIndex.devMsg("trying to set null convar '"+_name+"'"); Console.devMsg("trying to set null convar '"+_name+"'");
} }
} }
@ -116,20 +146,13 @@ class ConVar{
}); });
return keys; 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 public static inline function getCVar(_name:String):CVar
{ {
return CVarMap[_name]; return CVarMap[_name];
} }
public static inline function getCVarMap():Map<String, CVar>
{
return CVarMap;
}
} }