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

Compare commits

base: andreas/DSTEngine:ui_unchecked
Branches Tags
andreas/DSTEngine:master andreas/DSTEngine:ui_unchecked andreas/DSTEngine:aids andreas/DSTEngine:changes_laptop
..
compare: andreas/DSTEngine:34a691fa68b910650c31bb047e8ed61b30f3fce3
Branches Tags
andreas/DSTEngine:master andreas/DSTEngine:ui_unchecked andreas/DSTEngine:aids andreas/DSTEngine:changes_laptop
38 Commits
ui_unchecked .. 34a691fa68
Author SHA1 Message Date
andreas 34a691fa68 Use macro to register ccmds 2025-03-11 09:11:45 +01:00
andreas 9571e136b3 update deprecated syntax 2025-03-11 09:08:59 +01:00
andreas ac8870a264 add haxe packages 2025-03-11 09:08:23 +01:00
andreas ee45fc04b0 Fix broken ConVar file 2025-03-11 09:07:48 +01:00
andreas 36ad6d10a5 use lix to manage packages 2025-03-11 09:07:17 +01:00
andreas 0ba32e0632 remove redundant file 2025-03-11 09:07:03 +01:00
andreas 5bc968b800 Unchecked commits to resume work on linux 2025-01-15 19:45:00 +01:00
andreas d1f92b47ed fixed inconsistency with var naming scheme 2025-01-15 19:45:00 +01:00
andreas d45675119a minor changes 2025-01-15 19:45:00 +01:00
andreas 7ba1a2bd8b changed the tool window impolementation 2025-01-15 19:45:00 +01:00
andreas 08bd13d3f3 ya 2025-01-15 19:45:00 +01:00
andreas 6654d53f91 Moved and added a bunch of stuff 2025-01-15 19:45:00 +01:00
andreas caa062a5aa various changes 2025-01-15 19:45:00 +01:00
andreas 96e0695497 Implemented UIPane 2025-01-15 19:45:00 +01:00
andreas 6b3f341e4c Moved ConVar related files to engine 2025-01-15 19:45:00 +01:00
andreas 08397633b2 removed unneeded class 2025-01-15 19:45:00 +01:00
andreas 35c030d6c2 implemented keybinds 2025-01-15 19:45:00 +01:00
andreas 97833fc6d9 refactoring console ui 2025-01-15 19:45:00 +01:00
andreas 46f2ef5e09 preprocessor definitions to prevent complaining 2025-01-15 19:44:59 +01:00
andreas 575450068d target hashlink 2025-01-15 19:44:59 +01:00
andreas 8e659e38a5 some minor changes 2025-01-15 19:44:59 +01:00
andreas abe162bbb1 fixed import of deleted file 2025-01-15 19:44:59 +01:00
andreas a306eb8cb9 changed a bunch of fucking shit 2025-01-15 19:44:59 +01:00
andreas 194e7014e9 implemented cvar, ccmd and parsing console input 2025-01-15 19:44:59 +01:00
andreas f3640412bb changed a bunch of fucking shit 2025-01-15 19:44:59 +01:00
andreas 3bd020fe0b added Bind class 2025-01-15 19:44:59 +01:00
andreas 36526435ac bunch of shit 2025-01-15 19:44:59 +01:00
andreas bbd08f0065 added keyboard input 2025-01-15 19:44:59 +01:00
andreas b4f9559d19 moved and changed Game.hx 2025-01-15 19:44:59 +01:00
andreas 6a3d97b45e added entity support 2025-01-15 19:44:59 +01:00
andreas 5ce383c4e3 changed tilesets 2025-01-15 19:44:59 +01:00
andreas 64fc9d91a1 implemented atlas loading 2025-01-15 19:44:59 +01:00
andreas daa2093e26 I don't even know what I changed at this point 2025-01-15 19:44:59 +01:00
andreas 444457db2a removed more ignore files 2025-01-15 19:44:59 +01:00
andreas d6c6f250d3 removed ignored files 2025-01-15 19:44:56 +01:00
andreas 0d0311f8d9 updated gitignore 2025-01-15 19:44:56 +01:00
andreas c88937dde9 added gitignore 2025-01-15 19:44:56 +01:00
andreas 6e1a5f9fe5 First commit 2025-01-15 19:42:35 +01:00
15 changed files with 129 additions and 35 deletions
Expand all files Collapse all files
hGameTest/.haxerc
+4
View File
@@ -0,0 +1,4 @@
{
"version": "4.3.6",
"resolveLibs": "scoped"
}
hGameTest/dist/index.html
Vendored
+1 -1
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>
hGameTest/haxe_libraries/actuate.hxml
+3
View File
@@ -0,0 +1,3 @@
# @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
hGameTest/haxe_libraries/hxcpp-debug-server.hxml
+4
View File
@@ -0,0 +1,4 @@
# @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()
hGameTest/haxe_libraries/lime.hxml
+6
View File
@@ -0,0 +1,6 @@
# @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/
hGameTest/haxe_libraries/openfl.hxml
+5
View File
@@ -0,0 +1,5 @@
# @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()
hGameTest/package-lock.json
Generated
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"name": "nigger", "name": "test",
"version": "1.0.0", "version": "1.0.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
hGameTest/package.json
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"name": "nigger", "name": "test",
"version": "1.0.0", "version": "1.0.0",
"private": true, "private": true,
"config": { "config": {
hGameTest/project.xml
+6 -2
View File
@@ -15,6 +15,10 @@
<!-- classpath, haxe libs --> <!-- classpath, haxe libs -->
<source path="src" /> <source path="src" />
<!-- Macro configuration -->
<haxeflag name="--macro" value="addGlobalMetadata('', '@:build(engine.macros.CCmdDecorator.build())')" />
<assets path="./res/textures" rename="textures" /> <assets path="./res/textures" rename="textures" />
<assets path="./res/fonts" rename="fonts" /> <assets path="./res/fonts" rename="fonts" />
<assets path="./res/data" rename="data"/> <assets path="./res/data" rename="data"/>
@@ -24,6 +28,6 @@
<!--<icon path="assets/openfl.svg" /> --> <!--<icon path="assets/openfl.svg" /> -->
<!-- <assets path="assets/img" rename="img" /> --> <!-- <assets path="assets/img" rename="img" /> -->
<!-- optimize output <!-- optimize output -->
<haxeflag name="-dce full" /> --> <haxeflag name="-dce full" />
</project> </project>
hGameTest/src/engine/CVar.hx
-9
View File
@@ -1,9 +0,0 @@
package engine;
typedef CVar = {
var name:String;
var type:CVarType;
var value:Dynamic;
@:optional var callback:Void -> Void;
};
hGameTest/src/engine/ConVar.hx
+10 -14
View File
@@ -1,14 +1,17 @@
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{
// Hush the compiler about unused import
// static var ConVars_Engine:Class<ConVars_Engine> = ConVars_Engine;
static var CVarMap:Map<String, CVar> = []; static var CVarMap:Map<String, CVar> = [];
static var CCmdMap:Map<String, CCmd> = []; static var CCmdMap:Map<String, CCmd> = [];
/** /**
@@ -27,7 +30,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 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"); Console.devMsg("Tried setting already defined convar: " + _name + ", returning null instead");
return null; return null;
} }
@@ -143,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;
}
} }
hGameTest/src/engine/ConVars_Engine.hx
+36
View File
@@ -0,0 +1,36 @@
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.CCmdDecorator;
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")
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);
}
}
}
@:command("test")
public static function testCommand() {
// Command implementation
trace("Test Output");
}
}
hGameTest/src/engine/macros/CCmdDecorator.hx
+46
View File
@@ -0,0 +1,46 @@
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/ui/UIPane.hx
+1 -1
View File
@@ -21,7 +21,7 @@ import openfl.text.TextField;
import engine.ConVar; import engine.ConVar;
import engine.geom.Geom.P2d; import engine.geom.Geom.P2d;
@:enum abstract PaneLayout(Int) { enum abstract PaneLayout(Int) {
var HORIZONTAL = 0; var HORIZONTAL = 0;
var VERTICAL = 1; var VERTICAL = 1;
} }
hGameTest/src/game/video/Mode.hx
+5 -6
View File
@@ -11,15 +11,14 @@ 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>)->{ @:command("mat_setvideomode")
setVideoMode(Std.parseInt(args[0]), Std.parseInt(args[1]), Std.parseInt(args[2])); public static function cCmdMatSetVideoMode(args:Array<String>){
}); Mode.setVideoMode(Std.parseInt(args[0]), Std.parseInt(args[1]), Std.parseInt(args[2]));
}
public static function switchFsMode(toState:Int = 0){ public static function switchFsMode(toState:Int = 0){
if(toState == 0){ if(toState == 0){
if(Lib.current.stage.displayState != StageDisplayState.FULL_SCREEN_INTERACTIVE){ if(Lib.current.stage.displayState != StageDisplayState.FULL_SCREEN_INTERACTIVE){