Updated to .9.0

Author: Tyler Wozniak

Config/Input.yml

@@ -9,6 +9,8 @@ Left:
 Space:
     Keyboard: Space
 Select:
-    Keyboard: MouseLeft
+    Mouse: Left
 Toggle1:
-    Keyboard: M
+    Keyboard: M
+Exit:
+    Keyboard: Delete

Objects/environment.yml

@@ -1,10 +1,8 @@
 ---
 Name: Grid
-Behaviors:
-    - Class: grid.Grid
-      Fields:
-        Rows: 8
-        Cols: 8
+Grid:
+    Rows: 8
+    Cols: 8
 Transform:
     Position: !Vector3 -15.75 15.66 -50
     Rotation: !Vector3 90 0 0
@@ -18,6 +16,7 @@ Transform:
     Rotation: !Vector3 0 0 0
 ---
 Name: DirLight
-Light: !Light-Directional
+DirectionalLight:
     Color: !Vector3 1 1 1
-    Direction: !Vector3 -.3 -.7 -1
+    Direction: !Vector3 -1
+     -1 -.7

Prefabs/highlight.yml

@@ -1,9 +1,8 @@
 ---
 Name: Highlight
 Transform:
-
     Position: !Vector3 0 3 0
-Light: !Light-Point
+PointLight:
     Color: !Vector3 1.0 1.0 1.0
     Radius: 6
     FalloffRate: .5

Prefabs/tiles.yml

@@ -1,56 +1,40 @@
 ---
 Name: EmptyTile
-Behaviors:
-    - Class: grid.Tile
-      Fields:
-        Color: Empty
+Tile:
+  Color: Empty
 Mesh: tileyer
 ---
 Name: RedTile
-Behaviors:
-    - Class: grid.Tile
-      Fields:
-        Color: Red
+Tile:
+  Color: Red
 Mesh: tileyer
 ---
 Name: OrangeTile
-Behaviors:
-    - Class: grid.Tile
-      Fields:
-        Color: Orange
+Tile:
+  Color: Orange
 Mesh: tileyer
 ---
 Name: YellowTile
-Behaviors:
-    - Class: grid.Tile
-      Fields:
-        Color: Yellow
+Tile:
+  Color: Yellow
 Mesh: tileyer
 ---
 Name: GreenTile
-Behaviors:
-    - Class: grid.Tile
-      Fields:
-        Color: Green
+Tile:
+  Color: Green
 Mesh: tileyer
 ---
 Name: BlueTile
-Behaviors:
-    - Class: grid.Tile
-      Fields:
-        Color: Blue
+Tile:
+  Color: Blue
 Mesh: tileyer
 ---
 Name: PurpleTile
-Behaviors:
-    - Class: grid.Tile
-      Fields:
-        Color: Purple
+Tile:
+  Color: Purple
 Mesh: tileyer
 ---
 Name: BlackTile
-Behaviors:
-    - Class: grid.Tile
-      Fields:
-        Color: Black
+Tile:
+  Color: Black
 Mesh: tileyer

Scripts/game.d

@@ -11,7 +11,7 @@ class Game : DGame
 
         logInfo( "Initializing TestGame..." );
 
-        Input.addKeyDownEvent( Keyboard.Delete, ( uint kc ) { currentState = EngineState.Quit; } );
+        Input.addButtonDownEvent( "Exit", ( uint kc ) { currentState = EngineState.Quit; } );
 
         activeScene = new Scene;
         activeScene.loadObjects( "" );

Scripts/grid.d

@@ -4,6 +4,8 @@ import core, components, utility;
 import gl3n.linalg, gl3n.math, gl3n.interpolate;
 import std.conv, std.random, std.algorithm;
 
+mixin( registerComponents!q{grid} );
+
 public enum Color
 {
     Empty,
@@ -26,17 +28,10 @@ public enum GameStep
 public enum TILE_SIZE = 4.5f;
 public enum FALL_TIME = .2f;
 
-class GridArgs
-{
-    int Rows;
-    int Cols;
-}
-
-final class Grid : Behavior!GridArgs
+@yamlComponent("Grid")
+final class Grid : Component
 {
 private:
-
-    int rows, cols;
     Tile[] state;
     int selection;
     GameStep step;
@@ -46,11 +41,14 @@ private:
     PointLight highlight;
 
 public:
+    @field( "Rows" )
+    int rows;
+    @field( "Cols" )
+    int cols;
 
-    override void onInitialize()
+    override void initialize()
     {
-        rows = initArgs.Rows;
-        cols = initArgs.Cols;
+        logDebug( rows, ",", cols );
         step = GameStep.Input;
 
         state = new Tile[size];
@@ -61,7 +59,7 @@ public:
         owner.addChild(hl);
         highlight = cast(PointLight)(hl.light);
 
-        Input.addKeyDownEvent( Keyboard.MouseLeft, &mouseDown );
+        Input.addButtonDownEvent( "Select", &mouseDown );
     }
 
     this()
@@ -468,7 +466,7 @@ public:
     {
         auto obj = Prefabs[to!string(c) ~ "Tile"].createInstance;
         owner.addChild(obj);
-        return obj.behaviors.get!Tile;
+        return obj.getComponent!Tile;
     }
 
     Color randomColor()
@@ -494,7 +492,7 @@ public:
             if( step == GameStep.Input )
             {
                 auto selected = Input.mouseObject;
-                auto tile = selected.behaviors.get!Tile;
+                auto tile = selected.getComponent!Tile;
                 if( tile )
                 {
                     auto index = tile.index;
@@ -529,7 +527,7 @@ public:
             logDebug("Patience, I'm animating");
     }
 
-    override void onUpdate()
+    override void update()
     {
         debug
         {
@@ -629,20 +627,18 @@ class Match
     }
 }
 
-class TileFields
-{
-    string Color;
-}
-
-class Tile : Behavior!TileFields
+@yamlComponent( "Tile" )
+class Tile : Component
 {
 private:
     bool _animating;
+    Color color;
     vec3 start;
     vec3 target;
     float startTime;
 public:
-    Color color;
+    @field( "Color" )
+    string initColor;
     uint index;
     mixin( Property!_animating );
 
@@ -654,9 +650,9 @@ public:
             return owner.transform.position;
     }
 
-    override void onInitialize()
+    override void initialize()
     {
-        changeColor( to!Color(initArgs.Color) );
+        changeColor( to!Color(initColor) );
     }
 
     this()

dub.json

@@ -7,7 +7,7 @@
 		"Tyler Wozniak"
 	],
 	"dependencies": {
-		"dash": "==0.8.1" 
+		"dash": "==0.9.0" 
 	},
 	"sourcePaths": [ 
 		"Scripts/"