Converted all Platforms to new XML based configuration.

Added Checkbox to Waxe platform
TomByrne · Feb 5, 2013 · 1e57dbd · 1e57dbd
1 parent 0fc80a1
commit 1e57dbd
Show file tree

Hide file tree

Showing 41 changed files with 794 additions and 801 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/bin/windows
diff --git a/FD Project/GuiseUI.hxproj b/FD Project/GuiseUI.hxproj
@@ -11,23 +11,23 @@
     <movie version="3" />
     <movie minorVersion="0" />
     <movie platform="NME" />
-    <movie background="ffffff" />
+    <movie background="FFFFFF" />
   </output>
   <!-- Other classes to be compiled into your SWF -->
   <classpaths>
     <class path="..\src" />
     <class path="..\testSrc" />
     <class path="..\..\Composure\src" />
-    <class path="../bin/cpp/windows/haxe" />
-    <class path="../bin/cpp/haxe" />
+    <class path="C:\Motion-Twin\haxe\lib\waxe/1,0,1/" />
+    <class path="../bin/windows/cpp/haxe" />
   </classpaths>
   <!-- Build options -->
   <build>
-    <option directives="nme_install_tool&#xA;desktop&#xA;windows&#xA;code_completion" />
+    <option directives="nme_install_tool&#xA;windows&#xA;desktop" />
     <option flashStrict="False" />
     <option mainClass="ApplicationMain" />
     <option enabledebug="True" />
-    <option additional="--remap flash:nme" />
+    <option additional="--remap flash:nme&#xA;--remap browser:native" />
   </build>
   <!-- haxelib libraries -->
   <haxelib>
@@ -41,7 +41,6 @@
   <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>

diff --git a/FD Project/GuiseUI.nmml b/FD Project/GuiseUI.nmml
@@ -17,7 +17,6 @@
 
     <classpath name="..\src" />
     <classpath name="..\testSrc" />
-    <!--<classpath name="..\refs\easelhx\externs\0.4.2" />-->
     <classpath name="..\..\Composure\src" />
 
     <haxelib name="msignal" />
@@ -27,7 +26,7 @@
     <haxelib name="waxe" />
 	<!--<haxelib name="nme" unless="target_windows"/>-->
 
-	<assets path="../Assets" rename="assets" include="*" exclude="nme.svg" unless="target_html5"/>
+	<assets path="../Assets" rename="assets" include="*" exclude="nme.svg" if="target_flash"/>
 
 	<icon name="../Assets/nme.svg" />
 

diff --git a/Platforms/HTML5.xml b/Platforms/HTML5.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<class classpath="guise.platform.Html5" >
+
+	<meth name="install" static="true" public="true" scope="within" a-within="composure.core.ComposeItem">
+
+		<!-- Core display tags -->
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.core.CoreTags.WindowTag" addCall="addTrait" p-searchAscendants="true" p-searchDescendants="false">
+			<m-addInst params="guise.platform.html5.display.WindowTrait.inst()"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.core.CoreTags.StageTag" addCall="addTrait" p-searchAscendants="true" p-searchDescendants="false">
+			<m-addInst params="guise.platform.html5.display.StageTrait.inst()"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.core.CoreTags.ContainerTag" addCall="addTrait">
+			<m-addType params="guise.platform.html5.display.ContainerTrait,guise.platform.html5.display.ContainerTrait"/>
+		</obj>
+
+		<!-- Core control logic -->
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextButtonTag(true)" addCall="addTrait">
+			<m-addType params="guise.platform.html5.controls.TextButtonTrait"/>
+			<m-addType params="guise.platform.html5.logic.MouseClickable"/>
+			<m-addType params="guise.controls.data.TextLabel, guise.controls.data.ITextLabel"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextButtonTag(true)" addCall="addTrait" p-checkEnumParams="[0]">
+			<m-addType params="guise.controls.logic.input.ClickToggleSelect"/>
+			<m-addType params="guise.controls.data.Selected, guise.controls.data.ISelected"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextInputTag" addCall="addTrait">
+			<m-addType params="guise.platform.html5.controls.TextInputTrait"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextLabelTag" addCall="addTrait">
+			<m-addType params="guise.platform.html5.controls.TextLabelTrait"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.ToggleButtonTag" addCall="addTrait">
+			<m-addType params="guise.platform.html5.controls.CheckBoxTrait"/>
+			<m-addType params="guise.controls.data.Selected, guise.controls.data.ISelected"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.SliderTag(true)" addCall="addTrait">
+			<m-addType params="guise.platform.html5.controls.SliderTrait"/>
+			<m-addType params="guise.controls.data.NumRange, guise.controls.data.INumRange"/>
+		</obj>
+
+
+		<!-- Additional control logic -->
+	</meth>
+</class>
diff --git a/Platforms/NME.xml b/Platforms/NME.xml
@@ -1,26 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tags>
+<class classpath="guise.platform.Nme" >
 
-	<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>
+	<meth name="install" static="true" public="true" scope="within" a-within="composure.core.ComposeItem">
 
+		<obj type="guise.platform.cross.AccessProvider" addCall="addTrait">
+			<m-mapAccessType params="guise.accessTypes.IFilterableAccess, guise.platform.nme.accessTypes.FilterableAccess"/>
+			<m-mapAccessType params="guise.accessTypes.IGraphicsAccess, guise.platform.nme.accessTypes.GraphicsAccess"/>
+			<m-mapAccessType params="guise.accessTypes.IPositionAccess, guise.platform.nme.accessTypes.PositionAccess"/>
+			<m-mapAccessType params="guise.accessTypes.IBoxPosAccess, guise.platform.nme.accessTypes.PositionAccess"/>
+			<m-mapAccessType params="guise.accessTypes.ITextInputAccess, guise.platform.nme.accessTypes.TextAccess"/>
+			<m-mapAccessType params="guise.accessTypes.ITextOutputAccess, guise.platform.nme.accessTypes.TextAccess"/>
+			<m-mapAccessType params="guise.accessTypes.IFocusableAccess, guise.platform.nme.accessTypes.FocusableAccess"/>
+			<m-mapAccessType params="guise.accessTypes.IFilterableAccess, guise.platform.nme.accessTypes.FilterableAccess"/>
+			<m-mapAccessType params="guise.accessTypes.IMouseClickableAccess, guise.platform.nme.accessTypes.MouseClickableAccess"/>
+			<m-mapAccessType params="guise.accessTypes.IMouseInteractionsAccess, guise.platform.nme.accessTypes.MouseInteractionsAccess"/>
+		</obj>
 
-	<!--<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>-->
+		<!-- Core display tags -->
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.core.CoreTags.WindowTag" addCall="addTrait" p-searchAscendants="true" p-searchDescendants="false">
+			<m-addInst params="guise.platform.nme.display.StageTrait.inst(),guise.platform.nme.display.StageTrait"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.core.CoreTags.StageTag" addCall="addTrait" p-searchAscendants="true" p-searchDescendants="false">
+			<m-addInst params="guise.platform.nme.display.StageTrait.inst(),guise.platform.nme.display.StageTrait"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.core.CoreTags.ContainerTag" addCall="addTrait">
+			<m-addType params="guise.platform.nme.display.ContainerTrait,guise.platform.nme.display.ContainerTrait"/>
+		</obj>
 
-	<tag type="guise.controls.logic.states.ButtonStateMapper" natures="guise.accessTypes.IMouseClickableAccess,guise.accessTypes.IMouseInteractionsAccess">
+		<!-- Core control logic -->
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextButtonTag(true)" addCall="addTrait">
+			<m-addType params="guise.controls.logic.input.MouseOverTrait"/>
+			<m-addType params="guise.controls.logic.states.ButtonStateMapper"/>
+			<m-addType params="guise.controls.logic.input.ButtonClickTrait"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextButtonTag(true)" addCall="addTrait" p-checkEnumParams="[0]">
+			<m-addType params="guise.controls.logic.states.SelectableStateMapper"/>
+			<m-addType params="guise.controls.logic.input.ClickToggleSelect"/>
+			<m-addType params="guise.controls.data.Selected, guise.controls.data.ISelected"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextInputTag" addCall="addTrait">
+			<m-addType params="guise.controls.logic.input.TextInputPrompt"/>
+			<m-addFact params="function(into:Dynamic):Dynamic return new guise.controls.logic.states.FocusStateMapper(guise.controls.ControlLayers.INPUT_TEXT)"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.ToggleButtonTag" addCall="addTrait">
+			<m-addType params="guise.controls.logic.input.MouseOverTrait"/>
+			<m-addType params="guise.controls.logic.states.ButtonStateMapper"/>
+			<m-addType params="guise.controls.logic.input.ButtonClickTrait"/>
+			<m-addType params="guise.controls.logic.input.ClickToggleSelect"/>
+			<m-addType params="guise.controls.logic.states.SelectableStateMapper"/>
+			<m-addType params="guise.controls.data.Selected, guise.controls.data.ISelected"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.SliderTag(true)" addCall="addTrait">
+			<m-addType params="guise.controls.logic.input.MouseOverTrait"/>
+			<m-addType params="guise.controls.logic.states.ButtonStateMapper"/>
+			<m-addFact params="function(into:Dynamic):Dynamic return new guise.controls.logic.input.MouseDragChangeValue(null,true,guise.controls.data.INumRange,'valueNorm',null,null,new guise.skin.values.Bind(guise.layout.BoxPos, 'w', 'sizeChanged'))"/>
+			<m-addType params="guise.controls.data.NumRange, guise.controls.data.INumRange"/>
+		</obj>
 
-	</tag>
 
-	<tag type="guise.platform.nme.addTypes.IDisplayObjectType" natures="guise.platform.nme.display.ContainerTrait,guise.platform.nme.layers.LayerSwapper,guise.layer.LayerOrderer">
-
-	</tag>
-<tags>
+		<!-- Additional control logic -->
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.logic.states.ButtonStateMapper" addCall="addTrait">
+			<obj type="guise.layer.LayerAccessRequire"	 addCall="addInst">
+				<m-add params="guise.accessTypes.IMouseClickableAccess"/>
+				<m-add params="guise.accessTypes.IMouseInteractionsAccess"/>
+			</obj>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.platform.nme.addTypes.IDisplayObjectType" addCall="addTrait">
+			<m-addType params="guise.platform.nme.display.ContainerTrait, guise.platform.nme.display.ContainerTrait"/>
+			<m-addType params="guise.platform.nme.layers.LayerSwapper"/>
+			<m-addType params="guise.layer.LayerOrderer"/>
+		</obj>
+	</meth>
+</class>
diff --git a/Platforms/Waxe.xml b/Platforms/Waxe.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<class classpath="guise.platform.Waxe" >
+
+	<meth name="install" static="true" public="true" scope="within" a-within="composure.core.ComposeItem">
+
+		<!-- Core display tags -->
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.core.CoreTags.WindowTag" addCall="addTrait" p-searchAscendants="true" p-searchDescendants="false">
+			<m-addInst params="guise.platform.waxe.display.WindowTrait.inst()"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.core.CoreTags.StageTag" addCall="addTrait" p-searchAscendants="true" p-searchDescendants="false">
+			<m-addInst params="guise.platform.waxe.display.StageTrait.inst()"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.core.CoreTags.ContainerTag" addCall="addTrait">
+			<m-addType params="guise.platform.waxe.display.ContainerTrait,guise.platform.waxe.display.ContainerTrait"/>
+		</obj>
+
+		<!-- Core control logic -->
+		 <obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextButtonTag(true)" addCall="addTrait">
+			<m-addType params="guise.platform.waxe.controls.TextButtonTrait"/>
+			<m-addType params="guise.platform.waxe.logic.MouseClickable"/>
+			<!--<m-addType params="guise.controls.data.TextLabel, guise.controls.data.ITextLabel"/>-->
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextButtonTag(true)" addCall="addTrait" p-checkEnumParams="[0]">
+			<m-addType params="guise.controls.logic.input.ClickToggleSelect"/>
+			<m-addType params="guise.controls.data.Selected, guise.controls.data.ISelected"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextInputTag" addCall="addTrait">
+			<m-addType params="guise.platform.waxe.controls.TextInputTrait"/>
+		</obj>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextLabelTag" addCall="addTrait">
+			<m-addType params="guise.platform.waxe.controls.TextLabelTrait"/>
+		</obj> 
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.ToggleButtonTag" addCall="addTrait">
+			<m-addType params="guise.platform.waxe.controls.CheckBoxTrait"/>
+			<m-addType params="guise.controls.data.Selected, guise.controls.data.ISelected"/>
+		</obj>
+		<!-- <obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.SliderTag(true)" addCall="addTrait">
+			<m-addType params="guise.platform.waxe.controls.SliderTrait"/>
+			<m-addType params="guise.controls.data.NumRange, guise.controls.data.INumRange"/> 
+		</obj>-->
+
+
+		<!-- Additional control logic -->
+	</meth>
+</class>
diff --git a/Styles/Chutzpah.xml b/Styles/Chutzpah.xml
@@ -1,45 +1,67 @@
 <?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>
+<class classpath="guise.skin.drawn.Chutzpah" >
 
+	<meth name="install" static="true" public="true" scope="within" a-within="composure.core.ComposeItem">
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextButtonTag(true)" addCall="addTrait">
+			<obj type="guise.layer.LayerAccessRequire" addCall="addInst" p-layerName="'backing'">
+				<m-add params="guise.accessTypes.IGraphicsAccess"/>
+				<m-add params="guise.accessTypes.IPositionAccess"/>
+				<m-add params="guise.accessTypes.IFilterableAccess"/>
+			</obj>
+			<obj type="guise.layer.LayerAccessRequire" addCall="addInst" p-layerName="'labelText'">
+				<m-add params="guise.accessTypes.ITextInputAccess"/>
+				<m-add params="guise.accessTypes.IBoxPosAccess"/>
+				<m-add params="guise.accessTypes.IFilterableAccess"/>
+			</obj>
+		</obj>
 
-	<obj type="">
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextLabelTag" addCall="addTrait">
+			<obj type="guise.layer.LayerAccessRequire" addCall="addInst" p-layerName="'labelText'">
+				<m-add params="guise.accessTypes.ITextInputAccess"/>
+				<m-add params="guise.accessTypes.IBoxPosAccess"/>
+				<m-add params="guise.accessTypes.IFilterableAccess"/>
+			</obj>
+		</obj>
 
-	</obj>
-<tags>
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.TextInputTag" addCall="addTrait">
+			<obj type="guise.layer.LayerAccessRequire" addCall="addInst" p-layerName="'backing'">
+				<m-add params="guise.accessTypes.IGraphicsAccess"/>
+				<m-add params="guise.accessTypes.IPositionAccess"/>
+				<m-add params="guise.accessTypes.IFilterableAccess"/>
+			</obj>
+			<obj type="guise.layer.LayerAccessRequire" addCall="addInst" p-layerName="'inputText'">
+				<m-add params="guise.accessTypes.ITextInputAccess"/>
+				<m-add params="guise.accessTypes.ITextOutputAccess"/>
+				<m-add params="guise.accessTypes.IBoxPosAccess"/>
+				<m-add params="guise.accessTypes.IFilterableAccess"/>
+				<m-add params="guise.accessTypes.IFocusableAccess"/>
+			</obj>
+		</obj>
+
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.SliderTag(true)" addCall="addTrait">
+			<obj type="guise.layer.LayerAccessRequire" addCall="addInst" p-layerName="'backing'">
+				<m-add params="guise.accessTypes.IGraphicsAccess"/>
+				<m-add params="guise.accessTypes.IPositionAccess"/>
+				<m-add params="guise.accessTypes.IFilterableAccess"/>
+			</obj>
+			<obj type="guise.layer.LayerAccessRequire" addCall="addInst" p-layerName="'controlHandle'">
+				<m-add params="guise.accessTypes.IGraphicsAccess"/>
+				<m-add params="guise.accessTypes.IPositionAccess"/>
+				<m-add params="guise.accessTypes.IFilterableAccess"/>
+			</obj>
+		</obj>
+
+		<obj type="composure.utilTraits.Furnisher" p-concernedTraitType="guise.controls.ControlTags.ToggleButtonTag" addCall="addTrait">
+			<obj type="guise.layer.LayerAccessRequire" addCall="addInst" p-layerName="'backing'">
+				<m-add params="guise.accessTypes.IGraphicsAccess"/>
+				<m-add params="guise.accessTypes.IPositionAccess"/>
+				<m-add params="guise.accessTypes.IFilterableAccess"/>
+			</obj>
+			<obj type="guise.layer.LayerAccessRequire" addCall="addInst" p-layerName="'controlHandle'">
+				<m-add params="guise.accessTypes.IGraphicsAccess"/>
+				<m-add params="guise.accessTypes.IPositionAccess"/>
+				<m-add params="guise.accessTypes.IFilterableAccess"/>
+			</obj>
+		</obj>
+	</meth>
+</class>