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

Compare commits

base: andreas:b961c8de7583e03c37c80c9a3ce18393bd6c957e
Branches Tags
andreas:master
andreas:ui_unchecked
andreas:aids
andreas:changes_laptop
...
compare: andreas:7dc6ccd56879898b688a526ca43cc1b3af578409
Branches Tags
andreas:master
andreas:ui_unchecked
andreas:aids
andreas:changes_laptop

No commits in common. "b961c8de7583e03c37c80c9a3ce18393bd6c957e" and "7dc6ccd56879898b688a526ca43cc1b3af578409" have entirely different histories.
b961c8de75 ... 7dc6ccd568

3 changed files with 9 additions and 38 deletions
Show Stats Expand all files Collapse all files

2
hGameTest/dist/index.html vendored
View File

@ -1,7 +1,7 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>nigger</title> <title>test</title>
<link rel="shortcut icon" type="image/png" href="./favicon.png"> <link rel="shortcut icon" type="image/png" href="./favicon.png">
</head> </head>
<body> <body>

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

@ -10,47 +10,20 @@ import game.ui.console.Console;
class ConVar{ class ConVar{
static var CVarMap:Map<String, CVar> = []; static var CVarMap:Map<String, CVar> = [];
static var CCmdMap:Map<String, CCmd> = []; public static inline function registerCVar(_name:String, _type:CVarType, _value, _callback:Void->Void,_callOnSet:Bool=false)
/**
* 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){ if(CVarMap[_name]!=null){
Console.devMsg("Tried setting already defined convar: " + _name + ", returning null instead");
return null; return;
} }
if(_bMin && _value < _fMin) _value = _fMin; CVarMap[_name] = {
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 registerCCmd(_name:String, ?_callback:Array<String>->Void):CCmd public static inline function setCVar(_name:String, _value:Dynamic)
{ {
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");
@ -104,7 +77,7 @@ class ConVar{
} }
else{ else{
Console.devMsg("trying to set null convar '"+_name+"'"); Console.consoleIndex.devMsg("trying to set null convar '"+_name+"'");
} }
} }

4
hGameTest/src/game/video/Mode.hx
View File

@ -11,11 +11,9 @@ class Mode
{ {
return Lib.application.window; return Lib.application.window;
} }
public static function setVideoMode(width:Int, height:Int, fs:Int = null){ public static function setVideoMode(width:Int, height:Int, fs:Int = null){
getWindow().resize(width,height); getWindow().resize(width,height);
if(fs != null){
switchFsMode(fs);
}
} }
public static var cvMatSetVideoMode:CCmd = ConVar.registerCCmd("mat_setvideomode",(args:Array<String>)->{ 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])); setVideoMode(Std.parseInt(args[0]), Std.parseInt(args[1]), Std.parseInt(args[2]));