Merge branch 'release/v0.10.0'

.gitignore

@@ -190,3 +190,4 @@ __dummy.html
 docs.json
 libdash.a
 __test__*__
+dub.selections.json

.travis/setup_linux.sh

@@ -9,5 +9,5 @@ if [[ $TRAVIS_OS_NAME == "linux" ]]; then
     sudo dpkg -i ${DMD_DEB}
 
     # Install other dependencies
-    sudo apt-get install libfreeimage-dev libjpeg62-dev
+    sudo apt-get install libfreeimage-dev libjpeg62-dev libevent-dev libssl-dev
 fi

.travis/setup_osx.sh

@@ -8,4 +8,5 @@ if [[ $TRAVIS_OS_NAME == "osx" ]]; then
 
     brew update
     brew install freeimage
+    brew install libevent
 fi

dub.json

@@ -10,7 +10,10 @@
         "Eric Christenson",
         "Tyler Wozniak",
         "Sean Brennan",
-        "Timothy Reynolds"
+        "Timothy Reynolds",
+        "Dan Wild",
+        "Jim Arnold",
+        "Derin Yarsuvat"
     ],
 
     "dependencies": {
@@ -20,16 +23,20 @@
         "dyaml": "~>0.5",
         "gl3n" : "~master",
         "dlogg": "~>0.3",
+        "msgpack-d": "==0.9.2",
+        "vibe-d": "==0.7.21-alpha.4",
         "x11": { "version": "~>1.0", "optional": true }
     },
 
     "targetName": "dash",
     "targetType": "library",
 
-    "mainSourceFile": "source/app.d",
+    "mainSourceFile": "source/dash/core/main.d",
     "sourcePaths": [ "source/" ],
     "importPaths": [ "source/" ],
 
+    "versions": [ "VibeCustomMain" ],
+
     "-ddoxFilterArgs": [ "--min-protection=Protected" ],
 
     "importPaths-windows": [ "third_party/DWinProgramming" ],

source/dash/components/lights.d

@@ -16,20 +16,18 @@ mixin( registerComponents!q{dash.components.lights} );
  */
 abstract class Light : Component
 {
-private:
-    bool _castShadows;
-
 public:
     /// The color the light gives off.
     @field( "Color" )
     vec3 color;
     /// If it should cast shadows
-    mixin( Property!( _castShadows ) );
+    @field( "CastShadows" )
+    bool castShadows;
 
     this( vec3 color )
     {
         this.color = color;
-        _castShadows = false;
+        castShadows = false;
     }
 
     override void update() { }
@@ -76,6 +74,11 @@ public:
         this.direction = direction;
         super( color );
         this.castShadows = castShadows;
+    }
+
+    /// Initializes the lights.
+    override void initialize()
+    {
         if( castShadows )
         {
             // generate framebuffer for shadow map

source/dash/core/dgame.d

@@ -12,6 +12,8 @@ enum EngineState
 {
     /// The main game state.
     Run,
+    /// In edit mode
+    Editor,
     /// Refresh changed assets, but don't reset state.
     Refresh,
     /// Reload all assets at the beginning of the next cycle.
@@ -61,6 +63,9 @@ public:
     /// The instance to be running from
     static DGame instance;
 
+    /// The editor controller, resolved by reflection.d
+    Editor editor;
+
     /// Current state of the game
     EngineState currentState;
 
@@ -83,7 +88,6 @@ public:
      */
     final void run()
     {
-
         // Init tasks
         //TaskManager.initialize();
         start();
@@ -140,13 +144,14 @@ public:
             // Do the updating of the child class.
             onUpdate();
 
+            // Update the editor.
+            //if( currentState == EngineState.Editor )
+            editor.update();
+
             //////////////////////////////////////////////////////////////////////////
             // Draw
             //////////////////////////////////////////////////////////////////////////
 
-            // Begin drawing
-            Graphics.beginDraw();
-
             activeScene.draw();
 
             // Draw in child class
@@ -206,6 +211,7 @@ private:
         bench!( { Assets.initialize(); } )( "Assets init" );
         bench!( { Prefabs.initialize(); } )( "Prefabs init" );
         bench!( { UserInterface.initializeAwesomium(); } )( "UI init" );
+        bench!( { editor.initialize( this ); } )( "Editor init" );
         bench!( { DGame.instance.onInitialize(); } )( "Game init" );
 
         debug scheduleIntervaledTask( 1.seconds, { if( stateFlags.autoRefresh ) currentState = EngineState.Refresh; return false; } );
@@ -217,6 +223,7 @@ private:
     final void stop()
     {
         onShutdown();
+        editor.shutdown();
         resetTasks();
         UserInterface.shutdownAwesomium();
         Assets.shutdown();

source/dash/core/main.d

@@ -0,0 +1,45 @@
+module dash.core.main;
+import dash.core.dgame, dash.editor.editor;
+
+/**
+ * Initializes reflection things.
+ */
+static this()
+{
+    ClassInfo gameType = typeid(DGame);
+    ClassInfo editorType = typeid(Editor);
+
+    foreach( mod; ModuleInfo )
+    {
+        foreach( klass; mod.localClasses )
+        {
+            // Find the appropriate game loop.
+            if( klass.base == typeid(DGame) )
+                gameType = klass;
+            else if( klass.base == typeid(Editor) )
+                editorType = klass;
+        }
+    }
+
+    DGame.instance = cast(DGame)gameType.create();
+    DGame.instance.editor = cast(Editor)editorType.create();
+}
+
+version( unittest ) { }
+else
+{
+    import dash.core.dgame;
+    import std.stdio;
+
+    /// Does exactly what you think it does.
+    void main()
+    {
+        if( !DGame.instance )
+        {
+            writeln( "No game supplied." );
+            return;
+        }
+
+        DGame.instance.run();
+    }
+}

source/dash/core/package.d

@@ -5,4 +5,4 @@ import dash.core.gameobject;
 import dash.core.scene;
 import dash.core.prefabs;
 import dash.core.properties;
-import dash.core.reflection;
+import dash.core.main;

source/dash/core/scene.d

@@ -139,7 +139,7 @@ public:
      * Params:
      *  oldChild =            The object to remove.
      */
-    final void removechild( GameObject oldChild )
+    final void removeChild( GameObject oldChild )
     {
         _root.removeChild( oldChild );
     }