Merge branch 'master' of github.com:nocturnal/Helium

Core/Asset/AssetClass.cpp

@@ -25,10 +25,9 @@ std::map< tstring, AssetFactory* > AssetClass::s_AssetFactories;
 REFLECT_DEFINE_ABSTRACT( AssetClass );
 void AssetClass::EnumerateClass( Reflect::Compositor<AssetClass>& comp )
 {
-    comp.AddField( &AssetClass::m_Description, "m_Description" );
-    comp.AddField( &AssetClass::m_Tags, "m_Tags" );
-
-    comp.AddField( &AssetClass::m_Path, "m_Path", Reflect::FieldFlags::Hide );
+    comp.AddField( &AssetClass::m_Description,  "m_Description" );
+    comp.AddField( &AssetClass::m_Tags,         "m_Tags" );
+    comp.AddField( &AssetClass::m_Path,         "m_Path", Reflect::FieldFlags::Hide );
 }
 
 AssetClass::AssetClass()

Core/MRUData.h

@@ -7,9 +7,11 @@
 
 namespace Helium
 {
-    class CORE_API MRUData : public Reflect::ConcreteInheritor< MRUData, Reflect::Element >
+    class CORE_API MRUData : public Reflect::Element
     {
     public:
+        REFLECT_DECLARE_CLASS( MRUData, Reflect::Element );
+
         const std::vector< Helium::Path >& GetPaths() const;
         void SetPaths( const std::vector< Helium::Path >& paths );
 

Core/Project.h

@@ -6,9 +6,11 @@
 
 namespace Helium
 {
-    class CORE_API Project : public Reflect::ConcreteInheritor< Project, Reflect::Element >
+    class CORE_API Project : public Reflect::Element
     {
     public:
+        REFLECT_DECLARE_CLASS( Project, Reflect::Element );
+
         Project( const Path& path = TXT( "" ) );
         virtual ~Project();
 

Core/SceneGraph/CameraSettings.h

@@ -51,9 +51,11 @@ namespace Helium
 
         typedef ShadingModes::ShadingMode ShadingMode;
 
-        class CORE_API CameraSettings : public Reflect::ConcreteInheritor< CameraSettings, Reflect::Element >
+        class CORE_API CameraSettings : public Reflect::Element
         {
-        public: 
+        public:
+            REFLECT_DECLARE_CLASS( CameraSettings, Reflect::Element );
+
             CameraSettings(); 
 
         public: 

Core/SceneGraph/GridSettings.h

@@ -25,9 +25,11 @@ namespace Helium
         }
         typedef GridUnits::GridUnit GridUnit;
 
-        class CORE_API GridSettings : public Reflect::ConcreteInheritor< GridSettings, Reflect::Element >
+        class CORE_API GridSettings : public Reflect::Element
         {
         public:
+            REFLECT_DECLARE_CLASS( GridSettings, Reflect::Element );
+
             GridSettings( const tstring& version = TXT( "" ),
                 GridUnit units = GridUnits::Meters,
                 u32 width = 12,

Core/SceneGraph/PropertiesManager.cpp

@@ -143,7 +143,7 @@ void PropertiesManager::GenerateProperties( PropertiesThreadArgs& args )
             M_PanelCreators currentPanels;
 
 #ifdef SCENE_DEBUG_PROPERTIES_GENERATOR
-            Log::Print("Object type %s:\n", typeid(*(*itr)).name());
+            Log::Print("Object type %s:\n", (*itr)->GetClass()->m_ShortName.c_str() );
 #endif
 
             {

Core/SceneGraph/Resource.cpp

@@ -19,15 +19,15 @@ using namespace Helium::SceneGraph;
 ResourceTracker::ResourceTracker(IDirect3DDevice9* device)
 : m_Device (device)
 {
-  if (!IndexResource::s_MemoryPool.Valid())
-  {
-    IndexResource::s_MemoryPool = Profile::Memory::CreatePool( TXT( "Direct3D Index Data" ) );
-  }
-
-  if (!VertexResource::s_MemoryPool.Valid())
-  {
-    VertexResource::s_MemoryPool = Profile::Memory::CreatePool( TXT( "Direct3D Vertex Data" ) );
-  }
+    if (!IndexResource::s_MemoryPool.Valid())
+    {
+        IndexResource::s_MemoryPool = Profile::Memory::CreatePool( TXT( "Direct3D Index Data" ) );
+    }
+
+    if (!VertexResource::s_MemoryPool.Valid())
+    {
+        VertexResource::s_MemoryPool = Profile::Memory::CreatePool( TXT( "Direct3D Vertex Data" ) );
+    }
 }
 
 ResourceTracker::~ResourceTracker()
@@ -37,115 +37,110 @@ ResourceTracker::~ResourceTracker()
 
 void ResourceTracker::ResetState()
 {
-  m_Indices = NULL;
-  m_Vertices = NULL;
-  m_VertexFormat = ElementFormats[ ElementTypes::Unknown ];
+    m_Indices = NULL;
+    m_Vertices = NULL;
+    m_VertexFormat = ElementFormats[ ElementTypes::Unknown ];
 }
 
 void ResourceTracker::Register(Resource* resource)
 {
-  Insert<S_Resource>::Result inserted = m_Resources.insert( resource );
-  HELIUM_ASSERT(inserted.second);
+    Insert<S_Resource>::Result inserted = m_Resources.insert( resource );
+    HELIUM_ASSERT(inserted.second);
 }
 
 void ResourceTracker::Release(Resource* resource)
 {
-  m_Resources.erase( resource );
+    m_Resources.erase( resource );
 }
 
 void ResourceTracker::DeviceLost()
 {
-  S_Resource::const_iterator itr = m_Resources.begin();
-  S_Resource::const_iterator end = m_Resources.end();
-  for ( ; itr != end ; ++itr )
-  {
-    if ( !(*itr)->IsManaged() )
+    S_Resource::const_iterator itr = m_Resources.begin();
+    S_Resource::const_iterator end = m_Resources.end();
+    for ( ; itr != end ; ++itr )
     {
-      (*itr)->Delete();
+        if ( !(*itr)->IsManaged() )
+        {
+            (*itr)->Delete();
+        }
     }
-  }
 }
 
 void ResourceTracker::DeviceReset()
 {
-  S_Resource::const_iterator itr = m_Resources.begin();
-  S_Resource::const_iterator end = m_Resources.end();
-  for ( ; itr != end ; ++itr )
-  {
-    if ( !(*itr)->IsManaged() )
+    S_Resource::const_iterator itr = m_Resources.begin();
+    S_Resource::const_iterator end = m_Resources.end();
+    for ( ; itr != end ; ++itr )
     {
-      (*itr)->Create();
+        if ( !(*itr)->IsManaged() )
+        {
+            (*itr)->Create();
+        }
     }
-  }
 }
 
 void Resource::Create()
 {
-  if ( !m_IsCreated )
-  {
-    m_IsCreated = true;
-
-    if (Allocate())
+    if ( !m_IsCreated )
     {
-      Populate();
+        m_IsCreated = true;
+
+        if (Allocate())
+        {
+            Populate();
+        }
     }
-  }
 }
 
 void Resource::Delete()
 {
-  if ( m_IsCreated )
-  {
-    m_IsCreated = false;
+    if ( m_IsCreated )
+    {
+        m_IsCreated = false;
 
-    Release();
-  }
+        Release();
+    }
 }
 
 void Resource::Update()
 {
-  if (m_IsCreated)
-  {
-    if (m_IsDirty || IsManaged())
+    if (m_IsCreated)
     {
-      if (!m_IsDirty && IsManaged())
-      {
-        Log::Debug( TXT( "Re-creating non-default resource '%s'...\n" ), typeid(*this).name() );
-      }
-
-      Delete();
-      Create();
+        if (m_IsDirty || IsManaged())
+        {
+            Delete();
+            Create();
+        }
+        else
+        {
+            Populate();
+        }
     }
     else
     {
-      Populate();
+        Create();
     }
-  }
-  else
-  {
-    Create();
-  }
 }
 
 void Resource::Populate()
 {
-  if (m_Populator.Valid())
-  {
-    PopulateArgs args ( m_Type, m_BaseIndex = 0, Lock() );
-
-    if (args.m_Buffer)
+    if (m_Populator.Valid())
     {
-      u32 offset = args.m_Offset;
+        PopulateArgs args ( m_Type, m_BaseIndex = 0, Lock() );
 
-      m_Populator.Invoke( &args );
+        if (args.m_Buffer)
+        {
+            u32 offset = args.m_Offset;
 
-      HELIUM_ASSERT( args.m_Offset == ( offset + ElementSizes[ m_ElementType ] * m_ElementCount ) );
+            m_Populator.Invoke( &args );
 
-      Unlock();
-    }
-    else
-    {
-      HELIUM_BREAK(); // this is BAD
+            HELIUM_ASSERT( args.m_Offset == ( offset + ElementSizes[ m_ElementType ] * m_ElementCount ) );
+
+            Unlock();
+        }
+        else
+        {
+            HELIUM_BREAK(); // this is BAD
+        }
     }
-  }
 }

Core/SceneGraph/Scene.cpp

@@ -468,6 +468,7 @@ Undo::CommandPtr Scene::ImportSceneNodes( Reflect::V_Element& elements, ImportAc
     V_SceneNodeSmartPtr::const_iterator end = createdNodes.end();
     for ( ; itr != end; ++itr )
     {
+        (*itr)->SetOwner( this );
         (*itr)->Initialize();
 
         if ( importFlags & ImportFlags::Select )

Core/SceneGraph/SceneSettings.h

@@ -9,9 +9,11 @@ namespace Helium
 {
     namespace SceneGraph
     {
-        class CORE_API SceneSettings : public Reflect::ConcreteInheritor< SceneSettings, Reflect::Element >
+        class CORE_API SceneSettings : public Reflect::Element
         {
         public:
+            REFLECT_DECLARE_CLASS( SceneSettings, Reflect::Element );
+
             SceneSettings();
 
             MRUData* GetMRU();

Core/SceneGraph/ViewportSettings.h

@@ -49,9 +49,11 @@ namespace Helium
         }
         typedef ViewColorModes::ViewColorMode ViewColorMode;
 
-        class CORE_API ViewportSettings : public Reflect::ConcreteInheritor< ViewportSettings, Reflect::Element >
+        class CORE_API ViewportSettings : public Reflect::Element
         {
         public: 
+            REFLECT_DECLARE_CLASS( ViewportSettings, Reflect::Element );
+
             ViewportSettings(); 
 
             ViewColorMode GetColorMode() const;

Core/SettingsManager.h

@@ -13,9 +13,11 @@ namespace Helium
 
     typedef std::map< Reflect::TypeID, Reflect::ElementPtr > M_Settings;
 
-    class CORE_API SettingsManager : public Reflect::ConcreteInheritor< SettingsManager, Reflect::Element >
+    class CORE_API SettingsManager : public Reflect::Element
     {
     public:
+        REFLECT_DECLARE_CLASS( SettingsManager, Reflect::Element );
+
         SettingsManager()
         {
         }

Editor/Commands/BuildCommand.cpp

@@ -228,30 +228,14 @@ void BuildCommand::Except( const Helium::Exception& ex, const Asset::AssetClassP
     // for this option if it becomes useful.
     Debug::ProcessException( ex );
 
-    tstring type;
-    try
-    {
-        type = typeid(ex).name();
-
-        size_t pos = type.find_first_of(" ");
-        if (pos != tstring::npos && pos < type.length()-1)
-        {
-            type = type.substr( pos+1 );
-        }
-    }
-    catch ( const std::exception& ) // we catch std::exception here to handle call to typeid failing above
-    {
-        type = "Exception";
-    }
-
     tostringstream message;
     if (assetClass.ReferencesObject())
     {
-        message << type << " while building '" << assetClass->GetFullName() << "': " << ex.What() << std::endl;
+        message << "Exception while building '" << assetClass->GetFullName() << "': " << ex.What() << std::endl;
     }
     else
     {
-        message << type << ": " << ex.What() << std::endl;
+        message << "Exception: " << ex.What() << std::endl;
     }
 
     Log::Error( "%s", message.str().c_str() );

Editor/Inspect/Canvas.h

@@ -17,9 +17,11 @@ namespace Helium
         typedef Helium::SmartPtr< Widget >    (*WidgetCreator)( Inspect::Control* control );
         typedef std::map< i32, WidgetCreator >  WidgetCreators;
 
-        class Canvas : public Reflect::AbstractInheritor< Canvas, Inspect::Canvas >, public wxEvtHandler
+        class Canvas : public Inspect::Canvas, public wxEvtHandler
         {
         public:
+            REFLECT_DECLARE_ABSTRACT( Canvas, Inspect::Canvas );
+
             Canvas();
             ~Canvas();
 

Editor/Inspect/StripCanvas.h

@@ -8,9 +8,11 @@ namespace Helium
 {
     namespace Editor
     {
-        class StripCanvas : public Reflect::ConcreteInheritor< StripCanvas, Canvas >
+        class StripCanvas : public Canvas
         {
         public:
+            REFLECT_DECLARE_CLASS( StripCanvas, Canvas );
+
             // this is where tree-specific wx code happens
             StripCanvas();
 

Editor/Inspect/StripCanvasWidget.h

@@ -11,9 +11,11 @@ namespace Helium
     {
         class StripCanvasWidget;
 
-        class StripCanvasWidget : public Reflect::ConcreteInheritor<StripCanvasWidget, Widget>
+        class StripCanvasWidget : public Widget
         {
         public:
+            REFLECT_DECLARE_CLASS( StripCanvasWidget, Widget );
+
             StripCanvasWidget()
                 : m_ContainerControl( NULL )
                 , m_ContainerWindow( NULL )