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

Moved ConVar related files to engine

Browse Source
This commit is contained in:
Andreas 2021-04-28 09:32:47 +02:00 committed by Andreas Schaafsma
parent 08397633b2
commit 6b3f341e4c
7 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,4 +1,4 @@
package game.ui; package engine;
enum CVarType { enum CVarType {
CInt; CInt;

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

@ -1,4 +1,4 @@
package game.ui; package engine;
import haxe.Constraints.Function; import haxe.Constraints.Function;
import engine.typedefs.CVar; import engine.typedefs.CVar;

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

@ -7,7 +7,7 @@ import openfl.display.Sprite;
import openfl.events.Event; import openfl.events.Event;
import assets.Scanner; import assets.Scanner;
import assets.HTex; import assets.HTex;
import game.ui.ConVar; import engine.ConVar;
import game.ui.console.Console; import game.ui.console.Console;
class Game class Game
@ -41,20 +41,9 @@ class Game
uiLayer = new Sprite(); uiLayer = new Sprite();
stage.addChild(gameLayer); stage.addChild(gameLayer);
stage.addChild(uiLayer); stage.addChild(uiLayer);
//player.graphics.lineStyle(2,0xFF0000);
//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);
var cvar_cl_kankerlow:CVar = ConVar.registerCVar("cl_kankerlow", CInt, 10, FCVAR_ARCHIVE, "is de speler een kankerlow?",null,false,false,0,0,false); //var cvar_cl_kankerlow:CVar = ConVar.registerCVar("cl_kankerlow", CInt, 10, FCVAR_ARCHIVE, "is de speler een kankerlow?",null,false,false,0,0,false);
//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
{ {

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

@ -8,9 +8,9 @@ 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 game.ui.CVarType; import engine.enums.CVarType;
import game.ui.CVar; import engine.typedefs.CVar;
import game.ui.ConVar; import engine.ConVar;
class Input{ class Input{
public static var keys:Map<Int,Bool> = []; public static var keys:Map<Int,Bool> = [];
@ -58,8 +58,10 @@ class Input{
} }
public static function onKeyIsUp(e:KeyboardEvent){ public static function onKeyIsUp(e:KeyboardEvent){
if(bindMap[keyNameMap[e.keyCode]].indexOf("+") == 0){ if(!Std.isOfType(Lib.current.stage.focus,TextField)){
Console.consoleInstance.parseCmd(StringTools.replace(bindMap[keyNameMap[e.keyCode]],"+","-")); if(bindMap[keyNameMap[e.keyCode]].indexOf("+") == 0){
Console.consoleInstance.parseCmd(StringTools.replace(bindMap[keyNameMap[e.keyCode]],"+","-"));
}
} }
keys[e.keyCode] = false; keys[e.keyCode] = false;
} }
@ -112,6 +114,12 @@ 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/game/ui/console/Console.hx
View File

@ -12,7 +12,7 @@ import openfl.Assets;
import openfl.text.TextFormat; import openfl.text.TextFormat;
import openfl.text.TextFieldType; import openfl.text.TextFieldType;
import engine.typedefs.CVar; import engine.typedefs.CVar;
import game.ui.ConVar; import engine.ConVar;
import engine.typedefs.CCmd; import engine.typedefs.CCmd;
import game.ui.console.elements.ConsoleInput; import game.ui.console.elements.ConsoleInput;

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

@ -1,5 +1,6 @@
package game.video; package game.video;
import engine.ConVar;
import openfl.Lib; import openfl.Lib;
import openfl.display.StageDisplayState; import openfl.display.StageDisplayState;