Waxe rebuild

Merge branch 'master' of github.com:TomByrne/Guise

Conflicts:
	FD Project/GuiseUI.hxproj

FD Project/.build

@@ -1 +1 @@
-1183
+1412

FD Project/GuiseUI.hxproj

@@ -17,29 +17,31 @@
   <classpaths>
     <class path="..\src" />
     <class path="..\testSrc" />
-    <class path="../bin/flash/haxe" />
+    <class path="..\..\Composure\src" />
+    <class path="../bin/cpp/windows/haxe" />
+    <class path="../bin/cpp/haxe" />
   </classpaths>
   <!-- Build options -->
   <build>
-    <option directives="nme_install_tool&#xA;web&#xA;code_completion" />
+    <option directives="nme_install_tool&#xA;desktop&#xA;windows&#xA;code_completion" />
     <option flashStrict="False" />
     <option mainClass="ApplicationMain" />
     <option enabledebug="True" />
-    <option additional="-swf-version 10.1" />
+    <option additional="--remap flash:nme" />
   </build>
   <!-- haxelib libraries -->
   <haxelib>
-    <library name="nme" />
     <library name="msignal" />
     <library name="xirsys_stdjs" />
     <library name="feffects" />
     <library name="mpartial" />
-    <library name="composure-hx" />
+    <library name="waxe" />
   </haxelib>
   <!-- Class files to compile (other referenced classes will automatically be included) -->
   <compileTargets>
     <compile path="..\testSrc\NmeTest.hx" />
     <compile path="..\testSrc\NativeTest.hx" />
+    <compile path="..\testSrc\WaxeTest.hx" />
   </compileTargets>
   <!-- Assets to embed into the output SWF -->
   <library>

FD Project/GuiseUI.nmml

@@ -3,7 +3,15 @@
 
 	<app title="GuiseUI" file="GuiseUI" main="NativeTest" package="org.tbyrne.guiseUI" version="1.0.0" company="Tom Byrne" />
 
-	<window width="800" height="600" fps="30" orientation="portrait" resizable="true" background="0xffffff"/>
+	<window
+		width="800"
+		height="600"
+		orientation="landscape"
+		fps="30"
+		background="0xffffff"
+		resizeable="true"
+		hardware="true"
+		/>
 
 	<set name="BUILD_DIR" value="../bin" />
 
@@ -12,11 +20,12 @@
     <!--<classpath name="..\refs\easelhx\externs\0.4.2" />-->
     <classpath name="..\..\Composure\src" />
 
-	<haxelib name="nme" />
     <haxelib name="msignal" />
     <haxelib name="xirsys_stdjs" />
     <haxelib name="feffects" />
     <haxelib name="mpartial" />
+    <haxelib name="waxe" />
+	<!--<haxelib name="nme" unless="target_windows"/>-->
 
 	<assets path="../Assets" rename="assets" include="*" exclude="nme.svg" unless="target_html5"/>
 
@@ -27,4 +36,6 @@
 	<ndll name="zlib" />
 	<ndll name="nme" haxelib="nme" />
 
+	<ndll name="waxe" haxelib="waxe" />
+
 </project>

Platforms/NME.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tags>
+
+	<tag type="guise.core.CoreTags.WindowTag" isEnum="true" asc="true" desc="false">
+		<add type="TInst" e="guise.platform.nme.display.StageTrait.inst()"/>
+	</tag>
+	<tag type="guise.core.CoreTags.ContainerTag" isEnum="true" natures="guise.platform.nme.display.ContainerTrait">
+
+	</tag>
+
+
+	<!--<tag type="guise.controls.ControlTags.TextButtonTag(true)" isEnum="true" natures="guise.controls.logic.input.MouseOverTrait,guise.controls.logic.states.ButtonStateMapper,guise.controls.logic.input.ButtonClickTrait">
+		
+	</tag>
+	<tag type="guise.controls.ControlTags.TextButtonTag(true)" isEnum="true" checkEnumParams="0" natures="guise.controls.logic.states.SelectableStateMapper,guise.controls.logic.input.ClickToggleSelect">
+		
+	</tag>-->
+
+	<tag type="guise.controls.logic.states.ButtonStateMapper" natures="guise.accessTypes.IMouseClickableAccess,guise.accessTypes.IMouseInteractionsAccess">
+
+	</tag>
+
+	<tag type="guise.platform.nme.addTypes.IDisplayObjectType" natures="guise.platform.nme.display.ContainerTrait,guise.platform.nme.layers.LayerSwapper,guise.layer.LayerOrderer">
+
+	</tag>
+<tags>

Styles/Chutzpah.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tags>
+	<tag type="guise.controls.ControlTags.TextButtonTag(true)" isEnum="true">
+		<layer name="backing" natures="guise.accessTypes.IGraphicsAccess,guise.accessTypes.IPositionAccess,guise.accessTypes.IFilterableAccess">
+
+		</layer>
+		<layer name="labelText" natures="guise.accessTypes.ITextInputAccess,guise.accessTypes.IBoxPosAccess,guise.accessTypes.IFilterableAccess">
+
+		</layer>
+	</tag>
+	<tag type="guise.controls.ControlTags.TextLabelTag" isEnum="true">
+		<layer name="labelText" natures="guise.accessTypes.ITextInputAccess,guise.accessTypes.IBoxPosAccess,guise.accessTypes.IFilterableAccess">
+
+		</layer>
+	</tag>
+	<tag type="guise.controls.ControlTags.TextInputTag" isEnum="true">
+		<layer name="backing" natures="guise.accessTypes.IGraphicsAccess,guise.accessTypes.IPositionAccess,guise.accessTypes.IFilterableAccess">
+
+		</layer>
+		<layer name="inputText" natures="guise.accessTypes.ITextInputAccess,guise.accessTypes.ITextOutputAccess,guise.accessTypes.IBoxPosAccess,guise.accessTypes.IFilterableAccess,guise.accessTypes.IFocusableAccess">
+
+		</layer>
+	</tag>
+	<tag type="guise.controls.ControlTags.SliderTag(true)" isEnum="true">
+		<layer name="backing" natures="guise.accessTypes.IGraphicsAccess,guise.accessTypes.IPositionAccess,guise.accessTypes.IFilterableAccess">
+
+		</layer>
+		<layer name="controlHandle" natures="guise.accessTypes.IGraphicsAccess,guise.accessTypes.IPositionAccess,guise.accessTypes.IFilterableAccess">
+
+		</layer>
+	</tag>
+	<tag type="guise.controls.ControlTags.ToggleButtonTag" isEnum="true">
+		<layer name="backing" natures="guise.accessTypes.IGraphicsAccess,guise.accessTypes.IPositionAccess,guise.accessTypes.IFilterableAccess">
+
+		</layer>
+		<layer name="controlHandle" natures="guise.accessTypes.IGraphicsAccess,guise.accessTypes.IPositionAccess,guise.accessTypes.IFilterableAccess">
+
+		</layer>
+	</tag>
+
+
+	<obj type="">
+
+	</obj>
+<tags>

bin/.build

@@ -0,0 +1 @@
+3

src/guise/accessTypes/IAccessType.hx

@@ -0,0 +1,9 @@
+package guise.accessTypes;
+
+import msignal.Signal;
+import composure.core.ComposeItem;
+
+
+interface IAccessType {
+	public var layerName(default, set_layerName):String;
+}

src/guise/accessTypes/IBitmapGraphicsAccess.hx

@@ -0,0 +1,13 @@
+package guise.accessTypes;
+
+import guise.geom.Matrix;
+#if nme
+import nme.display.BitmapData;
+#end
+interface IBitmapGraphicsAccess implements IGraphicsAccess
+{
+
+	function beginBitmapFill(bitmap:BitmapData, matrix:Matrix = null, repeat:Bool = true, smooth:Bool = false):Void;
+	function beginBitmapStroke(bitmap:BitmapData, matrix:Matrix = null, repeat:Bool = true, smooth:Bool = false):Void;
+
+}

src/guise/accessTypes/IBoxPosAccess.hx

@@ -0,0 +1,6 @@
+package guise.accessTypes;
+
+interface IBoxPosAccess implements IPositionAccess {
+	public function set(x:Float, y:Float, w:Float, h:Float):Void;
+	public function setSize(w:Float, h:Float):Void;
+}

src/guise/accessTypes/IFilterableAccess.hx

@@ -0,0 +1,9 @@
+package guise.accessTypes;
+
+interface IFilterableAccess implements IAccessType {
+	function setFilters(?filters:Array<FilterType>):Void;
+}
+enum FilterType {
+	DropShadow(distance:Float, angle:Float, size:Float, color:Int, alpha:Float, ?inner:Bool);
+	Glow(size:Float, color:Int, alpha:Float, ?inner:Bool);
+}

src/guise/accessTypes/IFocusableAccess.hx

@@ -0,0 +1,8 @@
+package guise.accessTypes;
+
+import msignal.Signal;
+
+interface IFocusableAccess implements IAccessType {
+	public var focused(default, null):Bool ;
+	public var focusedChanged(get_focusedChanged, null):Signal1 < IFocusableAccess > ;
+}

src/guise/platform/types/DrawingAccessTypes.hx → src/guise/accessTypes/IGraphicsAccess.hx

@@ -1,17 +1,10 @@
-package guise.platform.types;
+package guise.accessTypes;
 
-import guise.platform.IPlatformAccess;
 import guise.geom.Matrix;
 
-/**
- * @author Tom Byrne
- */
-
-class DrawingAccessTypes 
-{}
 
 // TODO: Split this down into more logical chunks
-interface IGraphics implements IAccessType
+interface IGraphicsAccess implements IAccessType
 {
 
 	function beginFill(color:Int, alpha:Float = 1.0):Void;
@@ -29,16 +22,7 @@ interface IGraphics implements IAccessType
 	function moveTo(inX:Float, inY:Float):Void;
 
 }
-#if nme
-import nme.display.BitmapData;
-#end
-interface IBitmapGraphics implements IGraphics
-{
 
-	function beginBitmapFill(bitmap:BitmapData, matrix:Matrix = null, repeat:Bool = true, smooth:Bool = false):Void;
-	function beginBitmapStroke(bitmap:BitmapData, matrix:Matrix = null, repeat:Bool = true, smooth:Bool = false):Void;
-
-}
 enum GradientType {
 	Linear;
 	Radial(?focalPointRatio:Float);

src/guise/accessTypes/IKeyboardAccess.hx

@@ -0,0 +1,21 @@
+package guise.accessTypes;
+import msignal.Signal;
+
+interface IKeyboardAccess implements IAccessType
+{
+
+	function keyDown(keyInfo:KeyInfo):Signal2<IKeyboardAccess, KeyInfo>;
+	function keyUp(keyInfo:KeyInfo):Signal2<IKeyboardAccess, KeyInfo>;
+
+	function isDown(keyInfo:KeyInfo):Bool;
+
+}
+enum KeyInfo {
+	Key(keyCode:Int, ?modKeys:Array<ModKeys>);
+	Char(charCode:Int, ?modKeys:Array<ModKeys>);
+}
+enum ModKeys {
+	Ctrl;
+	Alt;
+	Shift;
+}

src/guise/accessTypes/IMouseClickableAccess.hx

@@ -0,0 +1,21 @@
+package guise.accessTypes;
+
+import msignal.Signal;
+
+
+interface IMouseClickableAccess implements IAccessType
+{
+	public var clicked(get_clicked, null):Signal1<ClickInfo>;
+	public var doubleClicked(get_doubleClicked, null):Signal1<ClickInfo>;
+
+}
+class ClickInfo {
+	public var left:Bool;
+	public var altHeld:Bool;
+	public var ctrlHeld:Bool;
+	public var shiftHeld:Bool;
+
+	public function new() {
+
+	}
+}

src/guise/accessTypes/IMouseInteractionsAccess.hx

@@ -0,0 +1,22 @@
+package guise.accessTypes;
+
+import msignal.Signal;
+
+interface IMouseInteractionsAccess implements IAccessType
+{
+	public var pressed(get_pressed, null):Signal1<MouseInfo>;
+	public var released(get_released, null):Signal1<MouseInfo>;
+
+	public var rolledOver(get_rolledOver, null):Signal1<MouseInfo>;
+	public var rolledOut(get_rolledOut, null):Signal1<MouseInfo>;
+
+	public var moved(get_moved, null):Signal1<MouseInfo>;
+}
+class MouseInfo {
+	public var mouseX:Float;
+	public var mouseY:Float;
+
+	public function new() {
+
+	}
+}

src/guise/accessTypes/IPositionAccess.hx

@@ -0,0 +1,5 @@
+package guise.accessTypes;
+
+interface IPositionAccess implements IAccessType {
+	public function setPos(x:Float, y:Float):Void;
+}

src/guise/accessTypes/ITextInputAccess.hx

@@ -0,0 +1,12 @@
+package guise.accessTypes;
+import msignal.Signal;
+
+
+interface ITextInputAccess implements IAccessType {
+	public function getText():String ;
+	public var textChanged(get_textChanged, null):Signal1 < ITextInputAccess > ;
+
+	var inputEnabled(default, set_inputEnabled):Bool;
+}
+
+