Merge branch 'develop'

Author: PxlBuzzard

source/dash/components/component.d

@@ -359,8 +359,8 @@ private:
                     if( mixin( field.name ) != mixin( "new SerializationDescription()." ~ field.name ) )
                     {
                         // Deserialize it for the component
-                        mixin( "auto ser = "~field.serializer~".deserialize(this."~field.name~");" );
-                        // Copy the new value to the component
+                        mixin( "auto rep = cast("~field.serializer~".Rep)this."~field.name~";" );
+                        mixin( "auto ser = "~field.serializer~".deserialize(rep);" );
                         mixin( "comp."~field.name~" = ser;" );
                     }
                 }
@@ -408,9 +408,17 @@ private:
                         return attrs.join( ", " ).to!string;
                     }
 
+                    template SerializedType( T )
+                    {
+                        static if( is( T U : U[] ) )
+                            alias SerializedType = SerializedType!U;
+                        else
+                            alias SerializedType = T;
+                    }
+
                     // Get required module import name
-                    static if( __traits( compiles, moduleName!( typeof( member ) ) ) )
-                        enum modName = moduleName!(typeof(member));
+                    static if( __traits( compiles, moduleName!( SerializedType!memberType ) ) )
+                        enum modName = moduleName!( SerializedType!memberType );
                     else
                         enum modName = null;
 

source/dash/core/gameobject.d

@@ -528,7 +528,7 @@ public:
  * and can generate a World matrix, worldPosition/Rotation (based on parents' transforms)
  * as well as forward, up, and right axes based on rotation
  */
-private struct Transform
+struct Transform
 {
 private:
     vec3f _prevPos;
@@ -543,12 +543,6 @@ private:
         scale = vec3f( desc.scale[] );
     }
 
-    void refresh( Description desc )
-    {
-        // TODO: Track if the transform actually changed.
-        this = desc;
-    }
-
     /**
      * Default constructor, most often created by GameObjects.
      *
@@ -582,6 +576,12 @@ public:
         float[3] scale = [ 1.0f, 1.0f, 1.0f ];
     }
 
+    void refresh( Description desc )
+    {
+        // TODO: Track if the transform actually changed.
+        this = desc;
+    }
+
     /**
      * Create a description from a Transform.
      *

source/dash/editor/events.d

@@ -54,4 +54,21 @@ void registerObjectEvents( Editor ed, DGame game )
             throw new Exception( "Object " ~ req.objectName ~ " not found." );
         }
     } );
+
+    // Refresh a transform
+    static struct TransformRefreshRequest
+    {
+        string objectName;
+        Transform.Description description;
+    }
+    ed.registerEventHandler( "object:transform:refresh", ( TransformRefreshRequest req ) {
+        if( auto obj = game.activeScene[ req.objectName ] )
+        {
+            obj.transform.refresh( req.description );
+        }
+        else
+        {
+            throw new Exception( "Object " ~ req.objectName ~ " not found." );
+        }
+    } );
 }

source/dash/utility/data/serialization.d

@@ -209,8 +209,8 @@ template serializeToFile( bool prettyPrint = true )
 /// Supported serialization formats.
 enum serializationFormats = tuple( "Json", "Bson", "Yaml" );
 
-/// Type to use when defining custom 
-struct CustomSerializer( _T, _Rep, alias _ser, alias _deser, alias _check = (_) => true )
+/// Type to use when defining custom
+struct CustomSerializer( _T, _Rep, alias _ser, alias _deser, alias _check )
     if( is( typeof( _ser( _T.init ) ) == _Rep ) &&
         is( typeof( _deser( _Rep.init ) ) == _T ) &&
         is( typeof( _check( _Rep.init ) ) == bool ) )
@@ -245,15 +245,8 @@ enum hasSerializer( T ) = anySatisfy!( isSerializerFor!T, customSerializers );
 /// Get the serializer for a type
 template serializerFor( T )
 {
-    import dash.components.component;
-
     static if( hasSerializer!T )
         alias serializerFor = Filter!( isSerializerFor!T, customSerializers )[ 0 ];
-    else static if( is( T : Component ) )
-        alias serializerFor = CustomSerializer!( T, ComponentReference,
-                                                 t => ComponentReference( componentMetadata!T.name, t.id ),
-                                                 r => getComponent( r.id ),
-                                                 r => !r.id.empty && t.name );
     else
         alias serializerFor = defaultSerializer!T;
 }

source/dash/utility/output.d

@@ -146,8 +146,6 @@ final class DashEditorLogger : Logger
 {
     this()
     {
-        import std.stdio: stdout;
-
         // File not actually used for anything, but required by FileLogger
         super( LogLevel.all );
     }

source/dash/utility/time.d

@@ -53,13 +53,16 @@ public:
         assert( onMainThread, "Must call Time.update from main thread." );
 
         updateTime();
+
+        import dash.core.dgame: DGame;
+        DGame.instance.editor.send( "dash:perf:frametime", deltaTime );
     }
 
 private:
     this()
-	{
-		delta = total = Duration.zero;
-	}
+    {
+        delta = total = Duration.zero;
+    }
 }
 
 private:
@@ -93,14 +96,14 @@ void updateTime()
     }
 
     delta = cast(Duration)( cur - prev );
-    
+
     prev = cur;
     cur = sw.peek();
 
     // Pass to values
     Time.total = cast(Duration)cur;
     Time.delta = delta;
-    
+
     // Update framerate
     ++frameCount;
     second += delta;