Unchecked commits to resume work on linux

hGameTest/build.hxml

@@ -1,5 +1,11 @@
--main App
+
--js src/app.js
+#-main App
--cp node_modules/openfl/lib
+#-js src/app.js
+#-cp node_modules/openfl/lib
+#-cp src
+#-D buildhxml
+#-D source-map
+
+--main 
+-hl exp/out.hl
 -cp src
--D source-map

hGameTest/project.xml

@@ -3,28 +3,27 @@
 	<!-- NMML reference: https://gist.github.com/1763850 -->
 	
 	<!-- metadata, make sure 'package' is at least 3 segments (ie. com.mycompany.myproject) -->
-	<meta title="FLWork" package="FLWork" version="1.0.0" company="" />
+	<meta title="hgame" package="FLWork" version="1.0.0" company="" />
 	
 	<!-- output -->
-	<app main="Main" file="FLWork" path="bin" />
+	<app main="Main" file="hgame" path="bin" />
 	
-	<!-- <window background="#FFFFFF" fps="60" /> -->
+	<window background="#FFFFFF" fps="60" />
-	<window background="null" color-depth="32" fps="60" />
+	<!--<window width="320" height="480" unless="mobile" />-->
-	<window width="320" height="480" unless="mobile" />
+	<window width="1280" height="960" unless="mobile || html5" />
 	<window orientation="landscape" vsync="false" antialiasing="0" if="cpp" />
 	
 	<!-- classpath, haxe libs -->
 	<source path="src" />
-	<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"/>
 	<haxelib name="openfl" />
 	<haxelib name="actuate" />
 	<!-- assets -->
-	<icon path="assets/openfl.svg" />
+	<!--<icon path="assets/openfl.svg" /> -->
 	<!-- <assets path="assets/img" rename="img" /> -->
 	
 	<!-- optimize output
 	<haxeflag name="-dce full" /> -->
-	
 </project>

hGameTest/res/assets.manifest.json

@@ -0,0 +1,9 @@
+{
+    "datascheme": "assetmanifest",
+    "version": "1.0",
+    "type": "manifestmanifest",
+    "files": [
+        ""
+    ]
+
+}

hGameTest/src/App.hx

@@ -1,17 +1,25 @@
 import openfl.display.Sprite;
 import openfl.display.Stage;
 import openfl.events.Event;
+import assets.Scanner;
+import openfl.utils.AssetManifest;
 
 
 class App extends Sprite {
 	
 	
 	public function new () {
-		
 		super ();
-		var game:Game = new Game(stage);
+		Scanner.scanTextureDir();
-		game.onInit();
+		trace("k");
-		stage.addEventListener(Event.ENTER_FRAME, game.onEnterFrame);
+		#if buildhxml
+			var manifest = new AssetManifest ();
+			
+			
+		#end
+		//var game:Game = new Game(stage);
+		//game.onInit();
+		//stage.addEventListener(Event.ENTER_FRAME, game.onEnterFrame);
 		
 		
 	}

hGameTest/src/Main.hx

@@ -1,3 +1,4 @@
+import assets.Scanner;
 import game.video.Mode;
 import openfl.events.KeyboardEvent;
 import openfl.display.Sprite;
@@ -16,6 +17,7 @@ class Main extends Sprite {
 	} 
 	private function onInit(e:Event)
 	{
+		//Scanner.scanTextureDir();
 		stage.frameRate = 1000;
 		var game:Game = new Game(stage);
 		stage.addEventListener(Event.ENTER_FRAME, game.onEnterFrame);
@@ -23,7 +25,7 @@ class Main extends Sprite {
 		stage.addEventListener(KeyboardEvent.KEY_UP,Input.onKeyIsUp);
 		stage.addEventListener(Event.RESIZE,onResize);
 		game.onInit();
-		Mode.setVideoMode(1920, 1080);
+		//Mode.setVideoMode(1280, 960);
 	}
 	private function onResize (event:Event):Void {
 		//Here we can do shit with window scaling

hGameTest/src/assets/Fonts.hx

@@ -0,0 +1,8 @@
+package assets;
+
+import openfl.text.Font;
+import openfl.Assets;
+
+class Fonts{
+    //public static var terminus:Font = Assets.getFont("fonts/Terminus.ttf");
+}

hGameTest/src/assets/HTex.hx

@@ -31,7 +31,7 @@ class HTex{
                     var tileNames:Array<String> = td.tilesetGeneric.tiles;
                     var atlas:TextureAtlas = new TextureAtlas(Assets.getBitmapData(baseTexturePath),width,height);
                     var tileSetGeneric = new TilesetGeneric(td.texName, atlas, tileNames);
-                    trace(tileSetGeneric);
+                    //trace(tileSetGeneric);
                 }
             }
         }

hGameTest/src/assets/Scanner.hx

@@ -1,7 +1,7 @@
 package assets;
+#if sys
 import sys.io.File;
 import sys.FileSystem;
-
 class Scanner{
     public static function scanTextureDir(){
         scanDirsRecursively("textures");
@@ -31,3 +31,15 @@ class Scanner{
         }
     }
 }
+#else
+import openfl.Assets;
+import openfl.utils.AssetType;
+class Scanner{
+    public static function scanTextureDir(){
+        trace(Assets.list(AssetType.TEXT));
+        for(str in Assets.list(AssetType.TEXT)){
+            trace(str);
+        }
+    }
+}
+#end

hGameTest/src/engine/CVar.hx

@@ -1,4 +1,4 @@
-package game.ui;
+package engine;
 
 
 typedef CVar = {

hGameTest/src/engine/ConVar.hx

@@ -1,11 +1,11 @@
-package game.ui;
+package engine;
 
 import haxe.Constraints.Function;
-import engine.typedefs.CVar;
+import engine.typedefs.console.CVar;
-import engine.typedefs.CCmd;
+import engine.typedefs.console.CCmd;
-import engine.enums.CVarType;
+import engine.enums.console.CVarType;
-import engine.enums.CVarFlag;
+import engine.enums.console.CVarFlag;
-import engine.enums.CCmdType;
+import game.ui.console.Console;
 
 
 class ConVar{
@@ -71,7 +71,7 @@ class ConVar{
                     if(cv.bMax && _value > cv.fMax) _value = cv.fMax;
                     if(cv.bMin && _value < cv.fMin) _value = cv.fMin;
                 case CBool:
-                    if(Std.is(_value, String)){
+                    if(Std.isOfType(_value, String)){
                         var v:String = _value;
                         _value = v.toLowerCase();
                         if(_value == "true" || _value == "1"){
@@ -81,7 +81,7 @@ class ConVar{
                             _value = false;
                         }
                     }
-                    else if(Std.is(_value, Int) || Std.is(_value, Float)){
+                    else if(Std.isOfType(_value, Int) || Std.isOfType(_value, Float)){
                         if(_value %2 == 0){
                             _value = false;
                         }
@@ -89,7 +89,7 @@ class ConVar{
                             _value = true;
                         }
                     }
-                    else if(Std.is(_value, Bool)){
+                    else if(Std.isOfType(_value, Bool)){
                         //do nothing
                     }
                     else{
@@ -100,6 +100,7 @@ class ConVar{
                     
             }
             cv.value = _value;
+            cv.callback();
 
         }
         else{
@@ -119,7 +120,8 @@ class ConVar{
             CCmdMap[_name].callback(_args);
         }
     }
-    public static var cmdList:CCmd = ConVar.registerCCmd("list", (cArgs:Array<String>)->{
+    public static inline function getCVarNames():Array<String>
+    {
         var keys:Array<String> = [
             for(iterator in [CCmdMap.keys(),CVarMap.keys()]){
                 for(key in iterator){
@@ -139,6 +141,10 @@ class ConVar{
                 return 0;
             }
         });
+        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);

hGameTest/src/engine/HProfiler.hx

@@ -0,0 +1,48 @@
+package engine;
+
+import game.ui.console.Console;
+import Sys;
+
+#if sys
+class HProfiler{
+    public static var profilerList:Array<HProfiler> = [];
+    public static var profilerMap:Map<String, HProfiler> = [];
+    private var tStart:Float;
+    private var tEnd:Float;
+    public var tDelta:Float;
+    private var name:String;
+    private function new(_name:String){
+        name = _name;
+        profilerMap[_name] = this;
+    }
+    public function start(){
+        tStart = Sys.time() * 1000.0;
+    }
+    public function stop(){
+        tEnd = Sys.time() * 1000.0;
+        tDelta = (tEnd-tStart);
+    }
+    //public static var 
+    public static function startProfiling(name:String):Void
+    {
+        if(profilerMap[name] == null)
+            profilerList.push(new HProfiler(name));
+        profilerMap[name].start();
+    }
+    public static function stopProfiling(name:String):Void
+    {
+        profilerMap[name].stop();
+    }
+
+    public static var ccmd_debug_tracetimes = ConVar.registerCCmd("debug_tracetimes", (args:Array<String>) -> { 
+        for(profiler in profilerList){
+            Console.devMsg(profiler.name + ": " + profiler.tDelta + "ms");
+        }
+    });
+}
+#else
+class HProfiler{
+    public static function startProfiling(name:String):Void{}
+    public static function stopProfiling(name:String):Void{}
+}
+#end

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

@@ -1,4 +1,4 @@
-package engine.enums;
+package engine.enums.console;
 
 enum CVarFlag{
     FCVAR_ARCHIVE;

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

@@ -1,8 +1,9 @@
-package engine.enums;
+package engine.enums.console;
 
 enum CVarType {
     CInt;
     CFloat;
     CString;
     CBool;
+    //CCmd;
 }

hGameTest/src/engine/geom/Geom.hx

@@ -0,0 +1,7 @@
+package engine.geom;
+
+
+typedef P2d = {
+    x:Float,
+    y:Float
+}

hGameTest/src/engine/tools/HWindow.hx

@@ -0,0 +1,34 @@
+package engine.tools;
+
+import lime.ui.WindowAttributes;
+import openfl.Lib;
+import openfl.display.Sprite;
+import openfl.display.Window;
+
+class HWindow extends Sprite{
+    public var window:Window;
+    public var attribs:WindowAttributes;
+    public static var windows:Array<Window> = [];
+    public function new(){
+        super();
+        window = Lib.application.createWindow(attribs);
+        windows.push(window);
+    }
+    public function initStage(spr:Sprite){
+        window.stage.addChild(this);
+    }
+    public function close(){
+        window.close();
+    }
+    public static function createEditorWindow()
+    {
+        
+    }
+    //public function open()
+
+
+
+
+
+
+}

hGameTest/src/engine/tools/ui/UITool.hx

@@ -0,0 +1,105 @@
+package engine.tools.ui;
+
+import game.ui.text.TextFormats;
+import openfl.text.TextFormat;
+import openfl.text.TextField;
+import engine.ui.UIPane;
+import lime.app.Event;
+import openfl.display.Sprite;
+import openfl.Lib;
+import lime.ui.Window;
+import engine.ConVar;
+import game.ui.console.Console;
+//import Lib.application.
+
+
+typedef UINode = {
+    object:UIPane,
+    ?children:Array<UINode>
+}
+
+
+class UITool{
+    public static var ccmd_dev_uitool = ConVar.registerCCmd("dev_uitool", (args:Array<String>) -> { open();});
+    public static var uiEditorWindow:openfl.display.Window;
+    public static var uiEditorSprite:Sprite; 
+    private static var tf:TextField;
+    public static function spawnUIEditorWindow(){
+        var secondWindow = Lib.application.createWindow({title: "UI Outliner"});
+        if(uiEditorSprite == null){
+            uiEditorSprite = new Sprite();
+            uiEditorSprite.graphics.beginFill(0x00ff00);
+            uiEditorSprite.graphics.drawRect(0,0,1280,960);
+        }
+        secondWindow.stage.addChild(uiEditorSprite);
+        uiEditorWindow = secondWindow;
+        secondWindow.onClose.add(()->{
+            uiEditorWindow = null;
+        });
+        tf = new TextField();
+        TextFormats.getFormats();
+        var tformat = TextFormats.formats.cInputFmt;
+        tf.setTextFormat(tformat);
+        tf.autoSize = LEFT;
+        uiEditorSprite.addChild(tf);
+        update([]);
+    }
+
+
+    public static var ccmd_dev_uitool_refresh = ConVar.registerCCmd("dev_uitool_refresh", update);
+
+    public static var uiNodes:Map<UIPane, UINode> = [];
+    public static var rootNodes:Array<UINode> = [];
+    public static function collect(){
+        for(pane in UIPane.panelist){
+            var node:UINode = null;
+            if(uiNodes[pane] == null){
+                node = {
+                    object: pane,
+                    children: []
+                };
+            }
+            else{
+                node = uiNodes[pane];
+            }
+            var parentNode:UINode = null;
+            if(uiNodes[pane.parent] == null){
+                parentNode = {
+                    object:pane.parent,
+                    children: []
+                }
+            }
+            else{
+                parentNode = uiNodes[pane.parent];
+            }
+            parentNode.children.push(node);
+            if(pane.parent == null){
+                rootNodes.push(node);
+            }
+        }
+    }
+    
+
+    public static function update(args:Array<String>){
+        tf.text = "";
+        for(pane in UIPane.panelist){
+            //check if pane is toplevel
+            Console.devMsg("Pane: "+ pane.name);
+            //Get all Root UI Panes
+            if(pane.parent == null) {
+                tf.appendText("-");
+                tf.appendText(pane.name+"\n");
+            }
+        }
+    }
+
+    public static function open(){
+        if(uiEditorWindow == null){
+            spawnUIEditorWindow();
+        }
+        
+    }
+    public static function close(){
+
+    }
+}

hGameTest/src/engine/typedefs/console/CCmd.hx

@@ -1,7 +1,6 @@
-package engine.typedefs;
+package engine.typedefs.console;
 
-import engine.typedefs.CVar;
+import engine.typedefs.console.CVar;
-import engine.enums.CCmdType;
 
 
 typedef CCmd = {

hGameTest/src/engine/typedefs/console/CVar.hx

@@ -1,7 +1,7 @@
-package engine.typedefs;
+package engine.typedefs.console;
 
-import engine.enums.CVarType;
+import engine.enums.console.CVarType;
-import engine.enums.CVarFlag;
+import engine.enums.console.CVarFlag;
 
 typedef CVar = {
     var name:String;

hGameTest/src/engine/ui/UIElement.hx

@@ -0,0 +1,30 @@
+package engine.ui;
+
+import engine.geom.Geom.P2d;
+import engine.ui.UIPane.PaneDimensions;
+import openfl.display.DisplayObject;
+
+class UIElement extends UIPane
+{
+    public var dispObj:DisplayObject;
+    public var padding:P2d;
+    public function new(_name:String, _dimensions:PaneDimensions, _displayObject:DisplayObject)
+    {
+        super(_name, _dimensions);
+        dispObj = _displayObject;
+        sprite.addChild(dispObj);
+    }
+    override public function onResize(){
+        super.onResize();
+        resizeDisplayObject();
+    }
+    public function resizeDisplayObject(){
+        if(padding == null)
+            padding = {x:0,y:0};
+        dispObj.width = this.dimensions.width - padding.x;
+        dispObj.height = this.dimensions.height - padding.y;
+        dispObj.x = padding.x / 2;
+        dispObj.y = padding.y / 2;
+    }
+    
+}

hGameTest/src/engine/ui/UIPane.hx

@@ -0,0 +1,334 @@
+package engine.ui;
+
+//  __      __     _____    ______
+// |  |    |  |  /  ___ \  |  ____|
+// |  |____|  | |  /  _\_| | |____
+// |   ____   | |  | |_ \  |  ____|
+// |  |    |  | |  \__/  | | |____
+// |__|    |__|  \______/  |______|
+
+/* 
+ / file: UIPane.hx
+ / author: and.schaafsma@gmail.com
+ / purpose: Class for resizable and scalable UI Panels
+ / My hope is that this code is so awful I'm never allowed to write UI code again.
+*/ 
+import game.ui.console.Console;
+import openfl.display.Sprite;
+import openfl.display.BitmapData;
+import openfl.display.DisplayObject;
+import openfl.text.TextField;
+import engine.ConVar;
+import engine.geom.Geom.P2d;
+
+@:enum abstract PaneLayout(Int) {
+	var HORIZONTAL = 0;
+	var VERTICAL = 1;
+}
+
+enum PaneAnchor {
+	LEFT;
+	TOPLEFT;
+	TOP;
+	TOPRIGHT;
+	RIGHT;
+	BOTTOMLEFT;
+	BOTTOM;
+	BOTTOMRIGHT;
+}
+
+enum ExpandBehavior {
+	// ABSOLUTE;
+	FACTOR(f:Float);
+	// CONTENT;
+	STRETCH;
+	// FILL;
+	// FIT;
+	NONE;
+}
+
+enum PaneAlign {
+	START;
+	END;
+}
+
+typedef PaneDimensions = {
+	var width:Float;
+	var height:Float;
+	@:optional var expandBehavior:ExpandBehavior;
+	@:optional var minWidth:Float;
+	@:optional var minHeight:Float;
+	@:optional var maxWidth:Float;
+	@:optional var maxHeight:Float;
+}
+
+typedef PaneProps = {
+	dimensions:PaneDimensions,
+	layout:PaneLayout
+}
+
+class UIPane {
+	public var name:String;
+	public var sprite:Sprite;
+	public var x(get, set):Float;
+	public var y(get, set):Float;
+
+	function get_x() {
+		return sprite.x;
+	}
+
+	function set_x(x) {
+		return sprite.x = x;
+	}
+
+	function get_y() {
+		return sprite.y;
+	}
+
+	function set_y(y) {
+		return sprite.y = y;
+	}
+
+	public var dimensions:PaneDimensions;
+	public var width(get, set):Float;
+
+	function get_width() {
+		return dimensions.width;
+	}
+
+	function set_width(width) {
+		dimensions.width = width;
+		onResize();
+		return width;
+	}
+
+	public var height(get, set):Float;
+
+	function get_height() {
+		return dimensions.height;
+	}
+
+	function set_height(height) {
+		dimensions.height = height;
+		onResize();
+		return height;
+	}
+
+	public var layout:PaneLayout;
+	public var autoArrange:Bool = true;
+	public var autoArrangeChildren = true;
+	public var expand:Bool;
+	public var children:Array<UIPane> = [];
+	public var parent:UIPane = null;
+	public var align:PaneAlign = START;
+	public var maskSprite:Sprite;
+
+	public static var panelist:Array<UIPane> = [];
+
+	public function new(_name:String, _dimensions:PaneDimensions) {
+		// Set name
+		name = _name;
+		// Set dimensions
+		if (_dimensions != null) {
+			dimensions = _dimensions;
+		} else {
+			dimensions = {
+				width: 0,
+				height: 0,
+				minWidth: 0,
+				minHeight: 0,
+				maxWidth: 0,
+				maxHeight: 0
+			};
+		}
+		if (name == null || name == "") {
+			Console.devMsg("UI Pane name init error");
+		}
+		// Initialize Sprite
+		initSprite();
+		// Draw debug pane for visualizing
+		drawDebugPane();
+		panelist.push(this);
+	}
+
+	public static var ccmd_ui_redraw = ConVar.registerCCmd("ui_redraw", (args:Array<String>) -> {
+		redrawUIPanes();
+	});
+
+	public static function redrawUIPanes() {
+		for (pane in panelist) {
+			pane.redraw();
+		}
+	}
+
+	public function getAnchorOffset(anchor:PaneAnchor):P2d {
+		switch (anchor) {
+			case LEFT:
+				return {x: 0, y: (height / 2)};
+			case TOPLEFT:
+				return {x: 0, y: 0};
+			case TOP:
+				return {x: width / 2, y: 0};
+			case TOPRIGHT:
+				return {x: width, y: 0};
+			case RIGHT:
+				return {x: width, y: height / 2}
+			case BOTTOMRIGHT:
+				return {x: width, y: height};
+			case BOTTOM:
+				return {x: width / 2, y: height};
+			case BOTTOMLEFT:
+				return {x: 0, y: height};
+		}
+	}
+
+	public function initSprite():Void {
+		// Construct Sprite object
+		sprite = new Sprite();
+
+		// Draw mask
+		maskSprite = new Sprite();
+		drawMask();
+		sprite.addChild(maskSprite);
+		sprite.mask = maskSprite;
+	}
+
+	public function drawMask():Void {
+		maskSprite.graphics.clear();
+		maskSprite.graphics.beginFill(0xffffff);
+		maskSprite.graphics.drawRect(0, 0, width, height);
+	}
+
+	public function drawDebugPane() {
+		// Clear graphics
+		sprite.graphics.clear();
+		// Create objects we need to draw.
+		var label:TextField = new TextField();
+		var bmp = new BitmapData(Std.int(width), Std.int(height), true, 0x00000000);
+		// Set textfield text to the panel name
+		label.text = name;
+		// Draw textfield to bitmap
+		bmp.draw(label);
+		// Draw graphics
+		sprite.graphics.beginFill(Std.int(Math.random() * 0xffffff), 0.5);
+		sprite.graphics.drawRect(0, 0, dimensions.width, dimensions.height);
+		sprite.graphics.beginBitmapFill(bmp, null);
+		sprite.graphics.drawRect(0, 0, dimensions.width, dimensions.height);
+		// Visualize Anchor Points
+		if (false) {
+			sprite.graphics.beginFill(Std.int(Math.random() * 0xffffff), 0.5);
+			sprite.graphics.drawCircle(getAnchorOffset(TOPLEFT).x, getAnchorOffset(TOPLEFT).y, 5);
+			sprite.graphics.drawCircle(getAnchorOffset(TOP).x, getAnchorOffset(TOP).y, 5);
+			sprite.graphics.drawCircle(getAnchorOffset(TOPRIGHT).x, getAnchorOffset(TOPRIGHT).y, 5);
+			sprite.graphics.drawCircle(getAnchorOffset(RIGHT).x, getAnchorOffset(RIGHT).y, 5);
+			sprite.graphics.drawCircle(getAnchorOffset(BOTTOMRIGHT).x, getAnchorOffset(BOTTOMRIGHT).y, 5);
+			sprite.graphics.drawCircle(getAnchorOffset(BOTTOM).x, getAnchorOffset(BOTTOM).y, 5);
+			sprite.graphics.drawCircle(getAnchorOffset(BOTTOMLEFT).x, getAnchorOffset(BOTTOMLEFT).y, 5);
+			sprite.graphics.drawCircle(getAnchorOffset(LEFT).x, getAnchorOffset(LEFT).y, 5);
+		}
+	}
+
+	public var endOffset:Float = 0;
+	public var startOffset:Float = 0;
+
+	public function addChild(child:UIPane) {
+		if (child.parent != null)
+			throw "Attempting to attach child UIPane that already has a parent";
+		children.push(child);
+		sprite.addChild(child.sprite);
+		child.parent = this;
+		if (child.autoArrange && autoArrangeChildren) {
+			arrangeChild(child);
+		}
+		return child;
+	}
+
+	public function redraw():Void {
+		drawDebugPane();
+		drawMask();
+	}
+
+	public function onResize() {
+		redraw();
+		if (autoArrangeChildren) {
+			arrangeChildren();
+		}
+	}
+
+	private function arrangeChild(child:UIPane) {
+		// We do not arrange the
+		if (!child.autoArrange) {
+			return;
+		}
+		if (endOffset == 0) {
+			switch (layout) {
+				case HORIZONTAL:
+					endOffset = width;
+				case VERTICAL:
+					endOffset = height;
+			}
+		}
+		var offsetDiff:Float = endOffset - startOffset;
+		// Set child dimensions
+		switch (child.dimensions.expandBehavior) {
+			case STRETCH:
+				switch (layout) {
+					case HORIZONTAL:
+						child.width = offsetDiff;
+						child.height = height;
+					case VERTICAL:
+						child.width = width;
+						child.height = offsetDiff;
+				}
+			case FACTOR(f):
+				switch (layout) {
+					case HORIZONTAL:
+						child.width = width * f;
+						child.height = height;
+					case VERTICAL:
+						child.width = width;
+						child.height = height * f;
+				}
+			default:
+				switch (layout) {
+					case HORIZONTAL:
+						// do some shit
+						child.height = height;
+					case VERTICAL:
+						// do some other shit
+						child.width = width;
+					default:
+						child.height = child.height;
+				}
+		}
+		// Set child position
+		switch (child.align) {
+			case START:
+				switch (layout) {
+					case HORIZONTAL:
+						child.x = startOffset;
+						startOffset += child.width;
+					case VERTICAL:
+						child.y = startOffset;
+						startOffset += child.height;
+				}
+			case END:
+				switch (layout) {
+					case HORIZONTAL:
+						child.x = endOffset -= child.width;
+					case VERTICAL:
+						child.y = endOffset -= child.height;
+				}
+		}
+	}
+
+	public function arrangeChildren() {
+		// reset offsets
+		startOffset = 0;
+		endOffset = 0;
+		// arrance each child
+		for (child in children) {
+			arrangeChild(child);
+		}
+	}
+}

hGameTest/src/game/Bind.hx

@@ -1,10 +0,0 @@
-package game;
-
-class Bind{
-    public var key:Int;
-    public var action:String;    
-    public function new(key:Int, action:String){
-        this.key = key;
-        this.action = action;
-    }
-}

hGameTest/src/game/Game.hx

@@ -1,28 +1,22 @@
 package game;
 
-import engine.typedefs.CCmd;
-import engine.enums.CVarFlag;
-import engine.enums.CVarType;
-import engine.typedefs.CVar;
-import openfl.display.DisplayObject;
-import game.ui.Console;
-import game.entities.Player;
-import assets.tilesets.TilesetGeneric;
-import assets.tilesets.Tileset;
-import openfl.display.Bitmap;
 import openfl.display.Stage;
-import openfl.display.Bitmap;
-import openfl.display.BitmapData;
 import openfl.display.Sprite;
-import openfl.ui.Keyboard;
 import openfl.events.Event;
-import openfl.Assets;
+
-import openfl.display.DisplayObject;
+import engine.HProfiler;
-import assets.Scanner;
+import engine.ConVar;
+import engine.ui.UIPane;
+import engine.typedefs.console.CVar;
+import engine.tools.ui.UITool;
+
+import game.ui.console.ConsolePane;
+import game.entities.Player;
+import game.ui.console.Console;
+
+
 import assets.HTex;
-import openfl.Lib;
+import assets.Scanner;
-import openfl.display.StageDisplayState;
-import game.ui.ConVar;
 
 class Game
 {
@@ -31,45 +25,38 @@ class Game
     public var uiLayer:Sprite;
     public function new(_stage:Stage){
         stage = _stage;
+#if PRECACHE_ASSETS & sys
         Scanner.scanTextureDir();
         for(tex in Scanner.textures){
             HTex.createTextureObjectFromJSON(tex);
         }
-        
+#end
         gameLayer = new Sprite();
         uiLayer = new Sprite();
-        
-
         trace("wattafak");
     }
     public var player:Player;
-    public var console:Console = new game.ui.Console();
+    public var console:Console = new Console();
+    public function loadData():Void
+    {
+        new game.ui.text.TextFormats();
+    }
     public function onInit():Void
     {
         gameLayer = new Sprite();
         uiLayer = new Sprite();
         stage.addChild(gameLayer);
         stage.addChild(uiLayer);
-		//player.graphics.lineStyle(2,0xFF0000);
+        var console2:ConsolePane = new ConsolePane();
-        //player.graphics.drawRect(0,0,16,16);
+        uiLayer.addChild(console2);
-        // var bitmapData:BitmapData = Assets.getBitmapData("textures/sprites/character.png");
-        player = new Player();
-        gameLayer.addChild(player.sprite);
         uiLayer.addChild(console);
-        var cvar:CVar = ConVar.registerCVar("cl_kankerlow", CInt, 10, FCVAR_ARCHIVE, "is de speler een kankerlow?",null,false,false,0,0,false);
+        HProfiler.startProfiling("frametime");
-        //var sheet:SpriteSheet = new SpriteSheet(sheetData);
+        //UITool.spawnUIEditorWindow();
-        //var playerBitmap:Bitmap = new Bitmap(Tileset.tilesetMap["testsheet"].tileMap["testTile5"]);
-        //var someotherbitmap:Bitmap = new Bitmap(Tileset.tilesetMap["testsheet"].tileMap["testTile3"]);
-        //playerBitmap.scaleX = playerBitmap.scaleY = 10;
-        //player.addChild(playerBitmap);
-        //TextureData.parseConfig();
-        //Sys.
 	}
 	public function onEnterFrame(e:Event):Void
 	{
+        HProfiler.stopProfiling("frametime");
+        HProfiler.startProfiling("frametime");
         Input.onEnterFrame();
-        
-        //player.x++;
-        //player.y++;
 	}
 }

hGameTest/src/game/Input.hx

@@ -1,42 +1,24 @@
 package game;
 
-import engine.enums.CVarFlag;
+import openfl.text.TextField;
-import engine.typedefs.CCmd;
-import game.ui.Console;
-import game.video.Mode;
 import openfl.events.KeyboardEvent;
 import openfl.ui.Keyboard in Kb;
 import openfl.Lib;
-import engine.enums.CVarType;
-import engine.typedefs.CVar;
-import game.ui.ConVar;
 
+import engine.enums.console.CVarFlag;
+import engine.enums.console.CVarType;
+import engine.typedefs.console.CCmd;
+import engine.typedefs.console.CVar;
+import engine.ConVar;
+
+import game.ui.console.Console;
+import game.video.Mode;
 
 class Input{
-    public static var keys:Array<Bool> = [];
+    public static var keys:Map<Int,Bool> = [];
-    public static var keysLast:Array<Bool> = [];
+    public static var keysLast:Map<Int,Bool> = [];
-    public static var bindMap:Map<String, String> = [];
+    public static var bindMap:Map<String, String> = ["~" => "toggleconsole", "\\" => "toggleconsole", "1" => "echo kak", "2" => "+attack"];
-    //public static var bind:CVar = Convar.registerCVar("bind",CVarType.cCmd, null, ()->{
+    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 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 keyCodeMap:Map<String, Int> = [
-        "HOME" =>       Kb.HOME,         "END" => Kb.END,      "INSERT" => Kb.INSERT,   "DELETE" => Kb.DELETE,   "PGUP" =>      Kb.PAGE_UP,  "PGDN" => Kb.PAGE_DOWN, 
-        "ESC" =>        Kb.ESCAPE,       "F1" =>  Kb.F1,       "F2" =>     Kb.F2,       "F3" =>     Kb.F3,       "F4" =>        Kb.F4,       "F5" =>   Kb.F5,
-        "F6" =>         Kb.F6,           "F7" =>  Kb.F7,       "F8" =>     Kb.F8,       "F9" =>     Kb.F9,       "F10" =>       Kb.F10,      "F11" =>  Kb.F11, 
-        "F12" =>        Kb.F12,
-        "~" =>          Kb.BACKQUOTE,    "1" =>   Kb.NUMBER_1, "2" =>      Kb.NUMBER_2, "3" =>      Kb.NUMBER_3, "4" =>         Kb.NUMBER_4, "5" =>    Kb.NUMBER_5, 
-        "6" =>          Kb.NUMBER_6,     "7" =>   Kb.NUMBER_7, "8" =>      Kb.NUMBER_8, "9" =>      Kb.NUMBER_9, "0" =>         Kb.NUMBER_0,
-        "TAB" =>        Kb.TAB,          "Q" =>   Kb.Q,        "W" =>      Kb.W,        "E" =>      Kb.E,        "R" =>         Kb.R,        "T" =>    Kb.T, 
-        "Y" =>          Kb.Y,            "U" =>   Kb.U,        "I" =>      Kb.I,        "O" =>      Kb.O,        "P" =>         Kb.P,        "[" =>    Kb.LEFTBRACKET, 
-        "]" =>          Kb.RIGHTBRACKET, "\\" =>  Kb.BACKSLASH,
-        "CAPSLOCK" =>   Kb.CAPS_LOCK,    "A" =>   Kb.A,        "S" =>      Kb.S,        "D" =>      Kb.D,        "F" =>         Kb.F,        "G" =>    Kb.G, 
-        "H" =>          Kb.H,            "J" =>   Kb.J,        "K" =>      Kb.K,        "L" =>      Kb.L,        "SEMICOLON" => Kb.SEMICOLON, "'" =>   Kb.QUOTE, 
-        "ENTER" =>      Kb.ENTER,
-        "SHIFT" =>      Kb.SHIFT,        "Z" =>   Kb.Z,        "X" =>      Kb.X,        "C" =>      Kb.C,        "V" =>         Kb.V,        "B" =>    Kb.B, 
-        "N" =>          Kb.N,            "M" =>   Kb.M,        "COMMA" => Kb.COMMA, "PERIOD" =>     Kb.PERIOD,   "/" =>         Kb.SLASH ,
-        "CTRL" =>       Kb.CONTROL,      "ALT" => Kb.ALTERNATE
-    ];
     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", 
@@ -52,60 +34,100 @@ class Input{
         Kb.M =>         "M",        Kb.COMMA =>    "COMMA",Kb.PERIOD =>   "PERIOD", Kb.SLASH =>     "/" ,
         Kb.CONTROL =>   "CTRL",     Kb.ALTERNATE =>"ALT"  
     ];
+    public static var keyCodeMap:Map<String, Int> = [
+        for(key in keyNameMap.keys()){
+            keyNameMap[key] => key;
+        }
+    ];
+    public static var cCmdGetKeyCode = ConVar.registerCCmd("getkey", (cArgs:Array<String>) -> {
+        var keycode:Int = keyCodeMap[cArgs[0]];
+        if(cArgs != null)
+            Console.devMsg(Std.string(keycode));
+    });
     public static function onKeyIsDown(e:KeyboardEvent){
-        keys[e.charCode] = true;
+        if(!Std.isOfType(Lib.current.stage.focus,TextField)){
-        var key:String = keyNameMap[e.charCode];
+            // Check if not null so we don't end up cooming all over unallocated memory;
-        if(debugKeys.value > 0)  Console.devMsg(""+key);
+            if(bindMap[keyNameMap[e.keyCode]] != null)
+                Console.consoleInstance.parseCmd(bindMap[keyNameMap[e.keyCode]]);
+        }
+        if(!keys[e.keyCode]){
+            if(cv_debugKeys.value == 1)
+                Console.devMsg("triggered key: "+keyNameMap[e.keyCode]);
+            else if(cv_debugKeys.value > 1 )
+                Console.devMsg(""+e.keyCode);
+        }
+        keys[e.keyCode] = true;
+        var key:String = keyNameMap[e.keyCode];
+        if(cv_debugKeys.value > 0)  Console.devMsg(""+key);
 
     }
     public static function onKeyIsUp(e:KeyboardEvent){
-        keys[e.charCode] = false;
+        if(!Std.isOfType(Lib.current.stage.focus,TextField)){
+            // Make sure we're not checking a null value (this can cause a crash)
+            if(bindMap[keyNameMap[e.keyCode]] != null){
+                if(bindMap[keyNameMap[e.keyCode]].indexOf("+") == 0){
+                    Console.consoleInstance.parseCmd(StringTools.replace(bindMap[keyNameMap[e.keyCode]],"+","-"));
+                }
+            }
+        }
+        keys[e.keyCode] = false;
     }
-    public static function resolveKeyName(key:Int):String
+    // public static function resolveKeyName(key:Int):String
-    {
-        return keyNameMap[key];
-    }
-    // public static function bind(input:Dynamic, action:String):Void
     // {
-    //     var key:Int;
+    //     return keyNameMap[key];
-    //     if(Std.is(input,Int)){
-    //         key = input;
-    //     }
-    //     else if(Std.is(input, String)){
-    //         var value:String = input;
-    //         key = keyCodeMap[value.toUpperCase()];
-    //     }
-        
     // }
+    public static function bindKey(input:String, action:String):Void
+    {
+        bindMap[input] = action;
+    }
     private static var bind:CCmd = ConVar.registerCCmd("bind", (cArgs:Array<String>)->{
+        cArgs[0] = cArgs[0].toUpperCase();
+        if(cArgs.length == 2){
+            if(keyCodeMap[cArgs[0]]!= null) {
+                if(cArgs[1].indexOf('"') == 0 && cArgs[1].lastIndexOf('"') == cArgs[1].length-1){
+                    bindKey(cArgs[0], cArgs[1].substring(1,cArgs[1].length-1));
+                }
+                else{
+                    bindKey(cArgs[0], cArgs[1]);
+                }
                 
-        ConVar.runCmd("echo",cArgs);
+            }
+        }
+        else if(cArgs.length == 1){
+            Console.devMsg(bindMap[cArgs[0]]);
+        }
+        else{
+            Console.devMsg("usage: bind <key> <command>");
+        }
     });
     public static function onEnterFrame()
     {
         if( keys[Kb.BACKQUOTE]){
             //Console.toggle();
-            if(debugKeys.value > 0) Console.devMsg("toggle console");
+            if(cv_debugKeys.value > 0) Console.devMsg("toggle console");
                 
         }
         if( keys[Kb.ALTERNATE] && keys[Kb.ENTER] && !keysLast[Kb.ALTERNATE] && !keysLast[Kb.ENTER] ){
             Mode.switchFsMode();    
         }
-        
+        // Console Input field is in focus
-        if ( keys[Kb.ENTER] && !keysLast[Kb.ENTER] && !keysLast[Kb.ALTERNATE]){
+        if(Lib.current.stage.focus == Console.consoleInstance.cIn){
-            if(Lib.current.stage.focus == Console.consoleInstance.cIn){
+            if ( keys[Kb.ENTER] && !keysLast[Kb.ENTER] && !keysLast[Kb.ALTERNATE]){
                 Console.consoleInstance.submitInput();
             }
+            if (keys[Kb.UP] && !keysLast[Kb.UP]){
+                Console.histPrev();
+            }
+            if (keys[Kb.DOWN] && !keysLast[Kb.DOWN]){
+                Console.histNext();
+            }
+            
+        }
+        if(Console.consoleInstance.visible){
+            if (keys[Kb.ESCAPE]){
+                Console.toggle();
+            }
         }
         keysLast = keys.copy();
-        //Console.devMsg("key array length:"+keys.length);
-        //for(i in 0...keys.length-1){
-        //    keysLast[i] = keys[i];
-        //}
-        //trace("enter pressed: " + keys[Kb.ENTER] + "enter pressed last: " + keysLast[Kb.ENTER]);
-        //trace(keysLast[Kb.ENTER]);
-        //keysLast = keys;
-        //trace(keys[Kb.ENTER]);
-        //trace(keysLast[Kb.ENTER]);
     }
 }

hGameTest/src/game/ui/CVarType.hx

@@ -1,9 +0,0 @@
-package game.ui;
-
-enum CVarType {
-    CInt;
-    CFloat;
-    CString;
-    CBool;
-    CCmd;
-}

hGameTest/src/game/ui/Console.hx

@@ -1,188 +0,0 @@
-package game.ui;
-
-import openfl.Lib;
-import openfl.events.Event;
-import openfl.text.TextFieldAutoSize;
-import openfl.text.TextField;
-import openfl.display.Sprite;
-import openfl.Assets;
-import openfl.text.TextFormat;
-import openfl.text.TextFieldType;
-import engine.typedefs.CVar;
-
-
-
-class Console extends Sprite{
-
-    public var textFormat:TextFormat;
-    public var cOut:TextField;
-    public var cIn:TextField;
-    public static var consoleInstance:Console;
-    public function new(){
-        super();
-
-        consoleInstance = this;
-
-        graphics.beginFill(0x111111);
-        graphics.drawRect(0,0,800,600);
-
-        textFormat = new TextFormat(Assets.getFont("fonts/Terminus.ttf").fontName, 24, 0x00ff00);
-        
-
-
-        cIn = new TextField();
-        cIn.type = TextFieldType.INPUT;
-        cIn.text = 'sv_kak bla "ik 1; ben 2; haast 3; niet 4" "in 5; staat 6;" om de straat "te verlaten";';
-        cIn.multiline = false;
-        //cIn.autoSize = TextFieldAutoSize.LEFT;
-        cIn.width = 800-24;
-        cIn.height = 32;
-        cIn.background = true;
-        cIn.backgroundColor = 0x000000;
-        cIn.selectable = true;
-        cIn.setTextFormat(textFormat);
-        cIn.y = 600-cIn.height-12;
-        cIn.x = 12;
-
-        cOut = new TextField();
-        cOut.text = "hConsole Initialized\n";
-        cOut.setTextFormat(textFormat);
-        cOut.wordWrap = true;
-        //cOut.autoSize = TextFieldAutoSize.LEFT;
-        cOut.multiline = true;
-        cOut.background = true;
-        cOut.backgroundColor = 0x000000;
-        cOut.width = 800 - 24;
-        cOut.height = 600 - cIn.height - 38;
-        cOut.y = 12;
-        cOut.x = 12;
-
-
-        cOut.addEventListener(Event.CHANGE, onOutputTextChange);
-        //cOut.addEventListener()
-        this.addChild(cOut);
-        this.addChild(cIn);
-        //ConVar.registerCVar("echo", CVarType.CCmd, null, devMsg())
-        ConVar.registerCCmd("echo", (args:Array<String>) -> { Console.devMsg(args.join(" ").split('"').join(""));});
-        ConVar.registerCCmd("quit", (args:Array<String>) -> { Lib.application.window.close();});
-    }
-    public function parseCmd(cmd:String){
-        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){
-            var cName:String = command[0];
-            var cValue:String = command[1];
-            var cArgs:Array<String> = command.slice(1);
-            if(ConVar.isCVar(cName)){
-                var cv:CVar = ConVar.getCVar(command[0]);
-                if(command.length == 1){
-                    devMsg(cv.name+" - "+cv.helpString);
-                    devMsg(cv.name+" = "+cv.value);
-                }
-                else{
-                    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;
-                    }
-                    
-                }
-                
-            }
-            else if(ConVar.isCmd(cName)){
-                ConVar.runCmd(cName,cArgs);
-            }
-            else{
-                devMsg("unkown command: "+command[0]);
-            }
-        }
-    }
-    public function submitInput(){
-        cOut.appendText(">"+cIn.text+"\n");
-        parseCmd(cIn.text);
-        cIn.text = "";
-        cOut.scrollV = cOut.maxScrollV;
-    }
-    public function onOutputTextChange(e:Event){
-        cOut.scrollV = cOut.maxScrollV;
-    }
-    public static function toggle():Void
-    {
-        consoleInstance.visible = !consoleInstance.visible;
-    }
-    public static function devMsg(msg:String):Void
-    {
-        consoleInstance.cOut.appendText(msg+"\n");
-        consoleInstance.cOut.scrollV = consoleInstance.cOut.maxScrollV;
-    }
-}

hGameTest/src/game/ui/UIContianer.hx

@@ -0,0 +1,27 @@
+package game.ui;
+
+import openfl.geom.Point;
+import openfl.display.Sprite;
+
+
+class UIContianer extends Sprite{
+    public static var UIDrawList:Array<UIElement>=[];
+    public var anchor:Point;
+    public function new(panchor,scale){
+        super();
+    }
+    public function onResize(){
+        
+    }
+    public function hide(){
+
+    }
+    public function show(){
+        
+    }
+    public function getParent()
+    {
+        return parent;
+    }
+    
+}

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

@@ -0,0 +1,393 @@
+package game.ui.console;
+
+import game.ui.text.TextFormats;
+import assets.Fonts;
+import openfl.Lib;
+import openfl.events.Event;
+import openfl.text.TextFieldAutoSize;
+import openfl.text.TextField;
+import openfl.display.Sprite;
+import openfl.Assets;
+import openfl.text.TextFormat;
+import openfl.text.TextFieldType;
+import engine.ConVar;
+import engine.enums.console.CVarFlag;
+import engine.typedefs.console.CVar;
+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;
+    public var cvar_mat_consolebg:CVar;
+    public var ccmd_visible:CCmd = ConVar.registerCCmd("toggleconsole",(cArgs:Array<String>)->{
+        toggle();
+    });
+    public function new(){
+        super();
+        
+        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);
+            }
+        }
+        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;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,65 @@
+package game.ui.console;
+
+import engine.HProfiler;
+import engine.ui.UIPane;
+import engine.ui.UIElement;
+import openfl.text.TextField;
+import openfl.display3D.textures.Texture;
+import openfl.display.Sprite;
+
+class ConsolePane extends Sprite{
+    public function new(){
+        super();
+        var testPane:UIPane = new UIPane("test",{height:800,width:600});
+        testPane.layout = VERTICAL;
+        
+        var titlebarPane:UIPane = new UIPane("titlebar", {height:32, width: 600});
+        titlebarPane.align = START;
+        titlebarPane.layout = HORIZONTAL;
+        
+        var inputPane:UIPane = new UIPane("inputbar", {height:32, width: 600});
+        inputPane.align = END;
+        inputPane.layout = HORIZONTAL;
+        
+        var outputPane:UIPane = new UIPane("output pane", {height: 32, width: 600});
+        outputPane.align = START;
+        outputPane.dimensions.expandBehavior = STRETCH;
+        HProfiler.startProfiling("ui_resize");
+        testPane.width = 1000;
+        HProfiler.stopProfiling("ui_resize");
+        
+        testPane.addChild(titlebarPane);
+        testPane.addChild(inputPane);
+        testPane.addChild(outputPane);
+
+
+
+        var textField:TextField = new TextField();
+        textField.background = true;
+        textField.backgroundColor = 0x00ff00;
+
+        var testInputElement:UIElement = new UIElement("inputelem", {height: 32, width: 300},textField);
+        testInputElement.dimensions.expandBehavior = STRETCH;
+        testInputElement.padding = {x: 8, y: 8};
+
+        var inputButtonPane:UIPane = new UIPane("submit button", {height: 32, width: 32});
+        inputButtonPane.align = END;
+        
+        var inputFieldPane:UIPane = new UIPane("input field", {height: 32, width: 3});
+        inputFieldPane.align = START;
+        inputFieldPane.dimensions.expandBehavior = STRETCH;
+
+        inputPane.addChild(inputButtonPane);
+        inputPane.addChild(inputFieldPane);
+        //inputFieldPane.addChild(testInputElement);
+
+
+
+        
+        
+        
+        addChild(testPane.sprite);
+    }    
+}
+
+

hGameTest/src/game/ui/console/elements/ConsoleInput.hx

@@ -0,0 +1,51 @@
+package game.ui.console.elements;
+
+import openfl.events.Event;
+import openfl.display.Sprite;
+import openfl.text.TextField;
+import openfl.text.TextFieldType;
+import openfl.text.TextFormat;
+import openfl.Assets;
+import game.ui.text.TextFormats;
+
+class ConsoleInput extends Sprite
+{
+    public var tf:TextField;
+    public function new(){
+        super();
+        tf = new TextField();
+        tf.defaultTextFormat = TextFormats.getFormats().cInputFmt;
+        tf.text = "";
+        //tf.setTextFormat(new TextFormat(Assets.getFont("fonts/Terminus.ttf").fontName, 24, 0x00ff00));
+        trace(tf.getTextFormat().color);
+        trace(tf.getTextFormat().font);
+        tf.type = TextFieldType.INPUT;
+        tf.multiline = false;
+        //tf.autoSize = TextFieldAutoSize.LEFT;
+        tf.width = 800-24;
+        tf.height = tf.textHeight+2;
+        tf.background = true;
+        tf.backgroundColor = 0x222222;
+        tf.selectable = true;
+        this.addChild(tf);
+        this.addEventListener(Event.RESIZE,onResize);
+        tf.addEventListener(Event.CHANGE, onTextChange);
+    }
+    public function onResize(e:Event){
+        tf.width = this.width;
+    }
+    public function onTextChange(e:Event){
+        
+    }
+    public function clearText(){
+        tf.text = "";
+    }
+    public function getText():String
+    {
+        return tf.text;
+    }
+    public function setText(t:String){
+        tf.text = t;
+    }
+    
+}

hGameTest/src/game/ui/text/TextFormats.hx

@@ -0,0 +1,24 @@
+package game.ui.text;
+
+
+import openfl.text.TextFormat;
+import openfl.Assets;
+import assets.Fonts;
+
+class TextFormats{
+    public static var formats:TextFormats;
+    public var cInputFmt:TextFormat;
+    public var cOutputFmt:TextFormat;
+    public function new(){
+        cInputFmt = new TextFormat(Assets.getFont("fonts/Terminus.ttf").fontName, 24, 0xffffff);
+        cOutputFmt = new TextFormat(Assets.getFont("fonts/Terminus.ttf").fontName, 24, 0xffffff);
+    }
+    public static function getFormats():TextFormats
+    {
+        if(formats == null){
+            formats = new TextFormats();
+        }
+        return formats;
+    }
+    
+}

hGameTest/src/game/video/Mode.hx

@@ -1,6 +1,7 @@
 package game.video;
 
-import game.ui.ConVar;
+import engine.ConVar;
+import engine.typedefs.console.CCmd;
 import openfl.Lib;
 import openfl.display.StageDisplayState;
 
@@ -16,7 +17,7 @@ class Mode
             switchFsMode(fs);
         }
     }
-    public static var cvMatSetVideoMode:engine.typedefs.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]));
     });
     public static function switchFsMode(toState:Int = 0){