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

Compare commits

base: andreas:8951795e9b02f33c4218afded7923b25c9f5b52c
Branches Tags
andreas:master andreas:ui_unchecked andreas:aids andreas:changes_laptop
..
compare: andreas:changes_laptop
Branches Tags
andreas:master andreas:ui_unchecked andreas:aids andreas:changes_laptop

1 Commits
8951795e9b ... changes_la

Author SHA1 Message Date
andreas
e0e4109bde commiting changes to separate branch for later use 2021-06-11 13:13:11 +02:00
22 changed files with 396 additions and 749 deletions
Expand all files Collapse all files

1
hGameTest/src/Main.hx
View File

@@ -27,6 +27,7 @@ class Main extends Sprite {
stage.addEventListener(KeyboardEvent.KEY_UP,Input.onKeyIsUp); stage.addEventListener(KeyboardEvent.KEY_UP,Input.onKeyIsUp);
stage.addEventListener(Event.RESIZE,onResize); stage.addEventListener(Event.RESIZE,onResize);
game.onInit(); game.onInit();
//Mode.setVideoMode(1280, 960); //Mode.setVideoMode(1280, 960);
} }
private function onResize (event:Event):Void { private function onResize (event:Event):Void {

48
hGameTest/src/engine/HProfiler.hx
View File

@@ -1,48 +0,0 @@
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

2
hGameTest/src/engine/enums/console/CVarFlag.hx → hGameTest/src/engine/enums/CVarFlag.hx
View File

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

3
hGameTest/src/engine/enums/console/CVarType.hx → hGameTest/src/engine/enums/CVarType.hx
View File

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

7
hGameTest/src/engine/geom/Geom.hx
View File

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

34
hGameTest/src/engine/tools/HWindow.hx
View File

@@ -1,34 +0,0 @@
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()
}

48
hGameTest/src/engine/tools/ui/UITool.hx
View File

@@ -1,48 +0,0 @@
package engine.tools.ui;
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.
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;
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;
});
var tf:TextField = new TextField();
for(pane in UIPane.panelist){
//check if pane is toplevel
Console.devMsg("Pane: "+ pane.name);
if(pane.parent == null){
tf.appendText(pane.name+" \n ");
}
}
uiEditorSprite.addChild(tf);
}
public static function open(){
if(uiEditorWindow == null){
spawnUIEditorWindow();
}
}
public static function close(){
}
}

4
hGameTest/src/engine/typedefs/console/CCmd.hx → hGameTest/src/engine/typedefs/CCmd.hx
View File

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

6
hGameTest/src/engine/typedefs/console/CVar.hx → hGameTest/src/engine/typedefs/CVar.hx
View File

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

30
hGameTest/src/engine/ui/UIElement.hx
View File

@@ -1,30 +0,0 @@
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;
}
}

331
hGameTest/src/engine/ui/UIPane.hx
View File

@@ -1,331 +0,0 @@
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);
}
}
}

10
hGameTest/src/game/Bind.hx Normal file
View File

@@ -0,0 +1,10 @@
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;
}
}

43
hGameTest/src/game/Game.hx
View File

@@ -1,22 +1,14 @@
package game; package game;
import engine.typedefs.CVar;
import game.entities.Player;
import openfl.display.Stage; import openfl.display.Stage;
import openfl.display.Sprite; import openfl.display.Sprite;
import openfl.events.Event; import openfl.events.Event;
import engine.HProfiler;
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 assets.Scanner; import assets.Scanner;
import assets.HTex;
import game.ui.ConVar;
import game.ui.console.Console;
class Game class Game
{ {
@@ -25,12 +17,12 @@ class Game
public var uiLayer:Sprite; public var uiLayer:Sprite;
public function new(_stage:Stage){ public function new(_stage:Stage){
stage = _stage; stage = _stage;
#if PRECACHE_ASSETS & sys /*
Scanner.scanTextureDir(); Scanner.scanTextureDir();
for(tex in Scanner.textures){ for(tex in Scanner.textures){
HTex.createTextureObjectFromJSON(tex); HTex.createTextureObjectFromJSON(tex);
} }
#end */
gameLayer = new Sprite(); gameLayer = new Sprite();
uiLayer = new Sprite(); uiLayer = new Sprite();
trace("wattafak"); trace("wattafak");
@@ -40,23 +32,32 @@ class Game
public function loadData():Void public function loadData():Void
{ {
new game.ui.text.TextFormats(); new game.ui.text.TextFormats();
} }
public function onInit():Void public function onInit():Void
{ {
gameLayer = new Sprite(); gameLayer = new Sprite();
uiLayer = new Sprite(); uiLayer = new Sprite();
stage.addChild(gameLayer); stage.addChild(gameLayer);
stage.addChild(uiLayer); stage.addChild(uiLayer);
var console2:ConsolePane = new ConsolePane(); //player.graphics.lineStyle(2,0xFF0000);
uiLayer.addChild(console2); //player.graphics.drawRect(0,0,16,16);
// var bitmapData:BitmapData = Assets.getBitmapData("textures/sprites/character.png");
//player = new Player();
//gameLayer.addChild(player.sprite);
uiLayer.addChild(console); uiLayer.addChild(console);
HProfiler.startProfiling("frametime"); var cvar_cl_kankerlow:CVar = ConVar.registerCVar("cl_kankerlow", CInt, 10, FCVAR_ARCHIVE, "is de speler een kankerlow?",null,false,false,0,0,false);
//UITool.spawnUIEditorWindow(); //var sheet:SpriteSheet = new SpriteSheet(sheetData);
//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 public function onEnterFrame(e:Event):Void
{ {
HProfiler.stopProfiling("frametime");
HProfiler.startProfiling("frametime");
Input.onEnterFrame(); Input.onEnterFrame();
} }
} }

84
hGameTest/src/game/Input.hx
View File

@@ -1,23 +1,24 @@
package game; package game;
import openfl.text.TextField; import engine.enums.CVarFlag;
import engine.typedefs.CCmd;
import game.ui.console.Console;
import game.video.Mode;
import openfl.events.KeyboardEvent; import openfl.events.KeyboardEvent;
import openfl.ui.Keyboard in Kb; import openfl.ui.Keyboard in Kb;
import openfl.Lib; 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{ class Input{
public static var keys:Map<Int,Bool> = []; public static var keys:Map<Int,Bool> = [];
public static var keysLast: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 bindMap:Map<String, String> = [];
//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 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> = [ 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.HOME => "HOME", Kb.END => "END", Kb.INSERT => "INSERT", Kb.DELETE => "DELETE", Kb.PAGE_UP => "PGUP", Kb.PAGE_DOWN => "PGDN",
@@ -45,16 +46,9 @@ class Input{
Console.devMsg(Std.string(keycode)); Console.devMsg(Std.string(keycode));
}); });
public static function onKeyIsDown(e:KeyboardEvent){ public static function onKeyIsDown(e:KeyboardEvent){
if(!Std.isOfType(Lib.current.stage.focus,TextField)){
// Check if not null so we don't end up cooming all over unallocated memory;
if(bindMap[keyNameMap[e.keyCode]] != null)
Console.consoleInstance.parseCmd(bindMap[keyNameMap[e.keyCode]]);
}
if(!keys[e.keyCode]){ if(!keys[e.keyCode]){
if(cv_debugKeys.value == 1) if(cv_debugKeys.value > 0)
Console.devMsg("triggered key: "+keyNameMap[e.keyCode]); Console.devMsg("triggered key: "+keyNameMap[e.keyCode]);
else if(cv_debugKeys.value > 1 )
Console.devMsg(""+e.keyCode);
} }
keys[e.keyCode] = true; keys[e.keyCode] = true;
var key:String = keyNameMap[e.keyCode]; var key:String = keyNameMap[e.keyCode];
@@ -62,43 +56,27 @@ class Input{
} }
public static function onKeyIsUp(e:KeyboardEvent){ public static function onKeyIsUp(e:KeyboardEvent){
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; keys[e.keyCode] = false;
} }
// public static function resolveKeyName(key:Int):String public static function resolveKeyName(key:Int):String
// {
// return keyNameMap[key];
// }
public static function bindKey(input:String, action:String):Void
{ {
bindMap[input] = action; return keyNameMap[key];
} }
private static var bind:CCmd = ConVar.registerCCmd("bind", (cArgs:Array<String>)->{ // public static function bind(input:Dynamic, action:String):Void
cArgs[0] = cArgs[0].toUpperCase(); // {
if(cArgs.length == 2){ // var key:Int;
if(keyCodeMap[cArgs[0]]!= null) { // if(Std.is(input,Int)){
if(cArgs[1].indexOf('"') == 0 && cArgs[1].lastIndexOf('"') == cArgs[1].length-1){ // key = input;
bindKey(cArgs[0], cArgs[1].substring(1,cArgs[1].length-1)); // }
} // else if(Std.is(input, String)){
else{ // var value:String = input;
bindKey(cArgs[0], cArgs[1]); // key = keyCodeMap[value.toUpperCase()];
} // }
} // }
} private static var bind:CCmd = ConVar.registerCCmd("bind", (cArgs:Array<String>)->{
else if(cArgs.length == 1){
Console.devMsg(bindMap[cArgs[0]]); ConVar.runCmd("echo",cArgs);
}
else{
Console.devMsg("usage: bind <key> <command>");
}
}); });
public static function onEnterFrame() public static function onEnterFrame()
{ {
@@ -121,12 +99,6 @@ class Input{
if (keys[Kb.DOWN] && !keysLast[Kb.DOWN]){ if (keys[Kb.DOWN] && !keysLast[Kb.DOWN]){
Console.histNext(); Console.histNext();
} }
}
if(Console.consoleInstance.visible){
if (keys[Kb.ESCAPE]){
Console.toggle();
}
} }
keysLast = keys.copy(); keysLast = keys.copy();
} }

2
hGameTest/src/engine/CVar.hx → hGameTest/src/game/ui/CVar.hx
View File

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

9
hGameTest/src/game/ui/CVarType.hx Normal file
View File

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

10
hGameTest/src/engine/ConVar.hx → hGameTest/src/game/ui/ConVar.hx
View File

@@ -1,10 +1,10 @@
package engine; package game.ui;
import haxe.Constraints.Function; import haxe.Constraints.Function;
import engine.typedefs.console.CVar; import engine.typedefs.CVar;
import engine.typedefs.console.CCmd; import engine.typedefs.CCmd;
import engine.enums.console.CVarType; import engine.enums.CVarType;
import engine.enums.console.CVarFlag; import engine.enums.CVarFlag;
import game.ui.console.Console; import game.ui.console.Console;

27
hGameTest/src/game/ui/UIContianer.hx
View File

@@ -1,27 +0,0 @@
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;
}
}

258
hGameTest/src/game/ui/UIPane.hx Normal file
View File

@@ -0,0 +1,258 @@
package game.ui;
import openfl.display.Sprite;
import openfl.display.BitmapData;
import openfl.display.DisplayObject;
import openfl.text.TextField;
typedef P2d = {
x:Float,
y:Float
}
enum PaneLayout{
HORIZONTAL;
VERTICAL;
}
enum PaneAnchor{
LEFT;
TOPLEFT;
TOP;
TOPRIGHT;
RIGHT;
BOTTOMLEFT;
BOTTOM;
BOTTOMRIGHT;
}
enum ExpandBehavior{
FACTOR;
ABSOLUTE;
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 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
};
}
// Initialize Sprite
initSprite();
// Draw debug pane for visualizing
//drawDebugPane();
}
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);
if(true){
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)
{
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){
if(child.autoArrange){
switch(layout){
case HORIZONTAL:
if(endOffset == 0) endOffset = width;
switch(child.dimensions.expandBehavior){
case STRETCH:
child.width = endOffset-startOffset;
child.height = height;
default:
child.height = height;
//
}
switch(child.align){
case START:
child.x = startOffset;
startOffset += child.width;
case END:
child.x = endOffset-= child.width;
}
case VERTICAL:
if(endOffset == 0) endOffset = height;
switch(child.dimensions.expandBehavior){
case STRETCH:
child.height = endOffset-startOffset;
child.width = width;
default:
child.width = width;
//
}
switch(child.align){
case START:
child.y = startOffset;
startOffset += child.height;
case END:
child.y = endOffset-=child.height;
}
}
}
}
public function arrangeChildren(){
startOffset = 0;
endOffset = 0;
for(child in children){
arrangeChild(child);
}
}
}

118
hGameTest/src/game/ui/console/Console.hx
View File

@@ -1,6 +1,5 @@
package game.ui.console; package game.ui.console;
import game.ui.text.TextFormats;
import assets.Fonts; import assets.Fonts;
import openfl.Lib; import openfl.Lib;
import openfl.events.Event; import openfl.events.Event;
@@ -10,12 +9,16 @@ import openfl.display.Sprite;
import openfl.Assets; import openfl.Assets;
import openfl.text.TextFormat; import openfl.text.TextFormat;
import openfl.text.TextFieldType; import openfl.text.TextFieldType;
import engine.ConVar; // Engine Imports
import engine.enums.console.CVarFlag; import engine.enums.CVarFlag;
import engine.typedefs.console.CVar; import engine.typedefs.CVar;
import engine.typedefs.console.CCmd; import engine.typedefs.CCmd;
// Game imports
import game.ui.ConVar;
import game.ui.text.TextFormats;
import game.ui.console.elements.ConsoleInput; import game.ui.console.elements.ConsoleInput;
import engine.ui.UIPane; import game.ui.UIPane;
class Console extends Sprite{ class Console extends Sprite{
@@ -26,22 +29,26 @@ class Console extends Sprite{
public var cAutoComp:TextField; public var cAutoComp:TextField;
public static var consoleInstance:Console; public static var consoleInstance:Console;
public var cvar_mat_consolebg:CVar; public var cvar_mat_consolebg:CVar;
public var ccmd_visible:CCmd = ConVar.registerCCmd("toggleconsole",(cArgs:Array<String>)->{
toggle();
});
public function new(){ public function new(){
super(); super();
consoleInstance = this; consoleInstance = this;
var consolePane:UIPane = new UIPane("console pane",{width: 800, height: 600});
var consolePane:UIPane = new UIPane("yeeto",{width:800, height:600}); var topBar:UIPane = new UIPane("top bar", {width: 800, height: 32});
var bottomBar:UIPane = new UIPane("input bar", {width: 800, height: 32});
this.addChild(consolePane.sprite); var outputPane:UIPane = new UIPane("output pane", {width: 800, height: 1});
outputPane.dimensions.expandBehavior = STRETCH;
bottomBar.align = END;
outputPane.align = END;
consolePane.layout = VERTICAL; consolePane.layout = VERTICAL;
topBar.align = START;
consolePane.addChild(topBar);
consolePane.addChild(bottomBar);
consolePane.addChild(outputPane);
addChild(consolePane.sprite);
//graphics.beginFill(0x555555); //graphics.beginFill(0x555555);
//graphics.drawRect(0,0,800,600); graphics.drawRect(0,0,800,600);
cInput = new ConsoleInput(); cInput = new ConsoleInput();
cIn = cInput.tf; cIn = cInput.tf;
@@ -56,21 +63,6 @@ class Console extends Sprite{
},false,false,0,0,false); },false,false,0,0,false);
cOut = new TextField(); 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.text = "hConsole Initialized\n";
cOut.defaultTextFormat = TextFormats.getFormats().cOutputFmt; cOut.defaultTextFormat = TextFormats.getFormats().cOutputFmt;
cOut.wordWrap = true; cOut.wordWrap = true;
@@ -78,11 +70,15 @@ class Console extends Sprite{
cOut.multiline = true; cOut.multiline = true;
cOut.background = true; cOut.background = true;
cOut.backgroundColor = Std.parseInt(cvar_mat_consolebg.value); cOut.backgroundColor = Std.parseInt(cvar_mat_consolebg.value);
cOut.width = 800 - 24; cOut.width = outputPane.dimensions.width;
cOut.height = 600 - cIn.height - 38; cOut.height = outputPane.dimensions.height;
cOut.y = 12; cOut.y = 0;
cOut.x = 12; cOut.x = 0;
cAutoComp = new TextField();
cAutoComp.text = ""; cAutoComp.text = "";
cAutoComp.defaultTextFormat = TextFormats.getFormats().cInputFmt; cAutoComp.defaultTextFormat = TextFormats.getFormats().cInputFmt;
cAutoComp.wordWrap = false; cAutoComp.wordWrap = false;
@@ -97,13 +93,21 @@ class Console extends Sprite{
cAutoComp.visible = false; cAutoComp.visible = false;
cAutoComp.x = 0; cAutoComp.x = 0;
cAutoComp.y = 600; cAutoComp.y = 600;
cOut.addEventListener(Event.CHANGE, onOutputTextChange);
cIn.addEventListener(Event.CHANGE, onInputTextChange);
//cOut.addEventListener()
outputPane.sprite.addChild(cOut);
this.addChild(cInput);
this.addChild(cAutoComp);
//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){
history.push(cmd);
public function parseCmd(cmd:String, bNoHist:Bool = false){
if(!bNoHist)
history.push(cmd);
cmd = cmd.split(";").join(" ; "); cmd = cmd.split(";").join(" ; ");
var subStrings = []; var subStrings = [];
var startQuoteIndex:Int = cmd.indexOf('"'); var startQuoteIndex:Int = cmd.indexOf('"');
@@ -161,22 +165,16 @@ class Console extends Sprite{
} }
public function execCommands(commands:Array<Array<String>>){ public function execCommands(commands:Array<Array<String>>){
for(command in commands){ for(command in commands){
// Store command name, value and args
var cName:String = command[0]; var cName:String = command[0];
var cValue:String = command[1]; var cValue:String = command[1];
var cArgs:Array<String> = command.slice(1); var cArgs:Array<String> = command.slice(1);
//Check if convar with that name actually exists
if(ConVar.isCVar(cName)){ if(ConVar.isCVar(cName)){
//Get reference to convar object
var cv:CVar = ConVar.getCVar(command[0]); var cv:CVar = ConVar.getCVar(command[0]);
//Check number of params
if(command.length == 1){ if(command.length == 1){
//No params after the cmd, print help string
devMsg(cv.name+" - "+cv.helpString); devMsg(cv.name+" - "+cv.helpString);
devMsg(cv.name+" = "+cv.value); devMsg(cv.name+" = "+cv.value);
} }
else{ else{
//Check for convar type and set value accordingly
switch(cv.type){ switch(cv.type){
case CInt: case CInt:
ConVar.setCVar(cName,Std.parseInt(cValue)); ConVar.setCVar(cName,Std.parseInt(cValue));
@@ -202,20 +200,18 @@ class Console extends Sprite{
} }
} }
//convar is actually a command, run it.
else if(ConVar.isCmd(cName)){ else if(ConVar.isCmd(cName)){
ConVar.runCmd(cName,cArgs); ConVar.runCmd(cName,cArgs);
} }
//convar doesn't exist
else{ else{
devMsg("unkown command: "+command[0]); devMsg("unkown command: "+command[0]);
} }
} }
} }
public function submitInput(){ public function submitInput(){
cOut.appendText(">"+cInput.getText()+"\n"); cOut.appendText(">"+cIn.text+"\n");
parseCmd(cInput.getText()); parseCmd(cIn.text);
cInput.setText(""); cIn.text = "";
cAutoComp.visible = false; cAutoComp.visible = false;
cOut.scrollV = cOut.maxScrollV; cOut.scrollV = cOut.maxScrollV;
histSelect = -1; histSelect = -1;
@@ -224,7 +220,7 @@ class Console extends Sprite{
cOut.scrollV = cOut.maxScrollV; cOut.scrollV = cOut.maxScrollV;
} }
public function onInputTextChange(e:Event){ public function onInputTextChange(e:Event){
if(cInput.getText() != ""){ if(cIn.text != ""){
cAutoComp.text = ""; cAutoComp.text = "";
for(string in (autocompleteList = getCompList())){ for(string in (autocompleteList = getCompList())){
cAutoComp.text += string+"\n"; cAutoComp.text += string+"\n";
@@ -240,14 +236,6 @@ class Console extends Sprite{
public static function toggle():Void public static function toggle():Void
{ {
consoleInstance.visible = !consoleInstance.visible; 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 public static function devMsg(msg:String):Void
{ {
@@ -262,7 +250,7 @@ class Console extends Sprite{
public static function getCompList():Array<String> public static function getCompList():Array<String>
{ {
// Split words // Split words
var inp:Array<String> = consoleInstance.cInput.getText().split(" "); var inp:Array<String> = consoleInstance.cIn.text.split(" ");
var inpStripped:Array<String> = [ var inpStripped:Array<String> = [
for(word in inp){ for(word in inp){
if(word != "" && word != " "){ if(word != "" && word != " "){
@@ -309,9 +297,9 @@ class Console extends Sprite{
public static function histPrev():Void public static function histPrev():Void
{ {
// Only complete if input field is empty or scrolling through hist // Only complete if input field is empty or scrolling through hist
if(consoleInstance.cInput.getText() == "" || histSelect != -1){ if(consoleInstance.cIn.text == "" || histSelect != -1){
// Store current input in tmpInput // Store current input in tmpInput
if(histSelect == -1) tmpInput = consoleInstance.cInput.getText(); if(histSelect == -1) tmpInput = consoleInstance.cIn.text;
// Only go through history if history is not empty // Only go through history if history is not empty
if(history.length != 0){ if(history.length != 0){
// Check if currently selecting a history entry // Check if currently selecting a history entry
@@ -325,11 +313,11 @@ class Console extends Sprite{
} }
if(histSelect != -1){ if(histSelect != -1){
// Put correct history entry in the input field // Put correct history entry in the input field
consoleInstance.cInput.setText(history[histSelect]); consoleInstance.cIn.text = history[histSelect];
} }
else{ else{
// Restore tmp input // Restore tmp input
consoleInstance.cInput.setText(tmpInput); consoleInstance.cIn.text = tmpInput;
} }
} }
// History is empty // History is empty

65
hGameTest/src/game/ui/console/ConsolePane.hx
View File

@@ -1,65 +0,0 @@
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);
}
}

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

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