Add baseTypeName argument to OBJECT macro.

Source/Samples/01_HelloWorld/HelloWorld.h

@@ -31,7 +31,7 @@
 ///     - Subscribing to and handling of update events
 class HelloWorld : public Sample
 {
-    OBJECT(HelloWorld);
+    OBJECT(HelloWorld, Sample);
 
 public:
     /// Construct.

Source/Samples/02_HelloGUI/HelloGUI.h

@@ -42,7 +42,7 @@ class Window;
 ///     - Accessing available Events data (eventData)
 class HelloGUI : public Sample
 {
-    OBJECT(HelloGUI);
+    OBJECT(HelloGUI, Sample);
 
 public:
     /// Construct.

Source/Samples/03_Sprites/Sprites.h

@@ -32,7 +32,7 @@
 class Sprites : public Sample
 {
     // Enable type information.
-    OBJECT(Sprites);
+    OBJECT(Sprites, Sample);
 
 public:
     /// Construct.

Source/Samples/04_StaticScene/StaticScene.h

@@ -39,7 +39,7 @@ class Scene;
 ///     - Handling keyboard and mouse input to move a freelook camera
 class StaticScene : public Sample
 {
-    OBJECT(StaticScene);
+    OBJECT(StaticScene, Sample);
 
 public:
     /// Construct.

Source/Samples/05_AnimatingScene/AnimatingScene.h

@@ -39,7 +39,7 @@ class Scene;
 ///     - Attaching a light to an object (the camera)
 class AnimatingScene : public Sample
 {
-    OBJECT(AnimatingScene);
+    OBJECT(AnimatingScene, Sample);
 
 public:
     /// Construct.

Source/Samples/05_AnimatingScene/Rotator.h

@@ -30,7 +30,7 @@ using namespace Urho3D;
 /// Custom logic component for rotating a scene node.
 class Rotator : public LogicComponent
 {
-    OBJECT(Rotator);
+    OBJECT(Rotator, LogicComponent);
     
 public:
     /// Construct.

Source/Samples/06_SkeletalAnimation/Mover.h

@@ -29,7 +29,7 @@ using namespace Urho3D;
 /// Custom logic component for moving the animated model and rotating at area edges.
 class Mover : public LogicComponent
 {
-    OBJECT(Mover);
+    OBJECT(Mover, LogicComponent);
     
 public:
     /// Construct.

Source/Samples/06_SkeletalAnimation/SkeletalAnimation.h

@@ -41,7 +41,7 @@ class Scene;
 ///     - Displaying renderer debug geometry
 class SkeletalAnimation : public Sample
 {
-    OBJECT(SkeletalAnimation);
+    OBJECT(SkeletalAnimation, Sample);
 
 public:
     /// Construct.

Source/Samples/07_Billboards/Billboards.h

@@ -39,7 +39,7 @@ class Scene;
 ///     - Examining rendering performance with a somewhat large object and light count
 class Billboards : public Sample
 {
-    OBJECT(Billboards);
+    OBJECT(Billboards, Sample);
 
 public:
     /// Construct.

Source/Samples/08_Decals/Decals.h

@@ -41,7 +41,7 @@ class Scene;
 ///     - Displaying renderer debug geometry to see the effect of occlusion
 class Decals : public Sample
 {
-    OBJECT(Decals);
+    OBJECT(Decals, Sample);
 
 public:
     /// Construct.

Source/Samples/09_MultipleViewports/MultipleViewports.h

@@ -38,7 +38,7 @@ class Scene;
 ///     - Adding post processing effects to a viewport's render path and toggling them
 class MultipleViewports : public Sample
 {
-    OBJECT(MultipleViewports);
+    OBJECT(MultipleViewports, Sample);
 
 public:
     /// Construct.

Source/Samples/10_RenderToTexture/RenderToTexture.h

@@ -38,7 +38,7 @@ class Scene;
 ///     - Creating rendertarget texture and material programmatically
 class RenderToTexture : public Sample
 {
-    OBJECT(RenderToTexture);
+    OBJECT(RenderToTexture, Sample);
 
 public:
     /// Construct.

Source/Samples/10_RenderToTexture/Rotator.h

@@ -30,7 +30,7 @@ using namespace Urho3D;
 /// Custom logic component for rotating a scene node.
 class Rotator : public LogicComponent
 {
-    OBJECT(Rotator);
+    OBJECT(Rotator, LogicComponent);
     
 public:
     /// Construct.

Source/Samples/11_Physics/Physics.h

@@ -40,7 +40,7 @@ class Scene;
 ///     - Saving a scene to a file and loading it to restore a previous state
 class Physics : public Sample
 {
-    OBJECT(Physics);
+    OBJECT(Physics, Sample);
 
 public:
     /// Construct.

Source/Samples/12_PhysicsStressTest/PhysicsStressTest.h

@@ -39,7 +39,7 @@ class Scene;
 ///     - Optimizing physics simulation by leaving out collision event signaling
 class PhysicsStressTest : public Sample
 {
-    OBJECT(PhysicsStressTest);
+    OBJECT(PhysicsStressTest, Sample);
 
 public:
     /// Construct.

Source/Samples/13_Ragdolls/CreateRagdoll.h

@@ -30,7 +30,7 @@ using namespace Urho3D;
 /// Custom component that creates a ragdoll upon collision.
 class CreateRagdoll : public Component
 {
-    OBJECT(CreateRagdoll);
+    OBJECT(CreateRagdoll, Component);
     
 public:
     /// Construct.

Source/Samples/13_Ragdolls/Ragdolls.h

@@ -39,7 +39,7 @@ class Scene;
 ///     - Using rolling friction to stop rolling objects from moving infinitely
 class Ragdolls : public Sample
 {
-    OBJECT(Ragdolls);
+    OBJECT(Ragdolls, Sample);
 
 public:
     /// Construct.

Source/Samples/14_SoundEffects/SoundEffects.h

@@ -39,7 +39,7 @@ class Slider;
 ///     - Controlling sound and music master volume
 class SoundEffects : public Sample
 {
-    OBJECT(SoundEffects);
+    OBJECT(SoundEffects, Sample);
 
 public:
     /// Construct.

Source/Samples/15_Navigation/Navigation.h

@@ -43,7 +43,7 @@ class Scene;
 ///     - Making a node follow the Detour path
 class Navigation : public Sample
 {
-    OBJECT(Navigation);
+    OBJECT(Navigation, Sample);
 
 public:
     /// Construct.

Source/Samples/16_Chat/Chat.h

@@ -40,7 +40,7 @@ class UIElement;
 ///     - Implementing simple chat functionality with network messages
 class Chat : public Sample
 {
-    OBJECT(Chat);
+    OBJECT(Chat, Sample);
 
 public:
     /// Construct.

Source/Samples/17_SceneReplication/SceneReplication.h

@@ -43,7 +43,7 @@ class UIElement;
 ///     - Controlling a physics object's movement by applying forces
 class SceneReplication : public Sample
 {
-    OBJECT(SceneReplication);
+    OBJECT(SceneReplication, Sample);
 
 public:
     /// Construct.

Source/Samples/18_CharacterDemo/Character.h

@@ -43,7 +43,7 @@ const float INAIR_THRESHOLD_TIME = 0.1f;
 /// Character component, responsible for physical movement according to controls, as well as animation.
 class Character : public LogicComponent
 {
-    OBJECT(Character)
+    OBJECT(Character, LogicComponent);
 
 public:
     /// Construct.

Source/Samples/18_CharacterDemo/CharacterDemo.h

@@ -45,7 +45,7 @@ class Touch;
 ///     - Using touch inputs/gyroscope for iOS/Android (implemented through an external file)
 class CharacterDemo : public Sample
 {
-    OBJECT(CharacterDemo);
+    OBJECT(CharacterDemo, Sample);
 
 public:
     /// Construct.

Source/Samples/18_CharacterDemo/Touch.h

@@ -46,7 +46,7 @@ const float CAMERA_MAX_DIST = 20.0f;
 /// - Call the update function 'UpdateTouches()' from HandleUpdate or equivalent update handler function
 class Touch : public Object
 {
-    OBJECT(Touch);
+    OBJECT(Touch, Object);
 
 public:
     /// Construct.

Source/Samples/19_VehicleDemo/Vehicle.h

@@ -49,7 +49,7 @@ const float MAX_WHEEL_ANGLE = 22.5f;
 /// Vehicle component, responsible for physical movement according to controls.
 class Vehicle : public LogicComponent
 {
-    OBJECT(Vehicle)
+    OBJECT(Vehicle, LogicComponent)
 
 public:
     /// Construct.

Source/Samples/19_VehicleDemo/VehicleDemo.h

@@ -41,7 +41,7 @@ class Vehicle;
 ///     - Defining attributes (including node and component references) of a custom component so that it can be saved and loaded
 class VehicleDemo : public Sample
 {
-    OBJECT(VehicleDemo);
+    OBJECT(VehicleDemo, Sample);
 
 public:
     /// Construct.

Source/Samples/20_HugeObjectCount/HugeObjectCount.h

@@ -41,7 +41,7 @@ class Scene;
 ///     - Optionally speeding up rendering by grouping objects with the StaticModelGroup component
 class HugeObjectCount : public Sample
 {
-    OBJECT(HugeObjectCount);
+    OBJECT(HugeObjectCount, Sample);
 
 public:
     /// Construct.

Source/Samples/21_AngelScriptIntegration/AngelScriptIntegration.h

@@ -38,7 +38,7 @@ class Scene;
 ///     - Creating a 3D scene and using a script object to animate the objects
 class AngelScriptIntegration : public Sample
 {
-    OBJECT(AngelScriptIntegration);
+    OBJECT(AngelScriptIntegration, Sample);
 
 public:
     /// Construct.

Source/Samples/22_LuaIntegration/LuaIntegration.h

@@ -38,7 +38,7 @@ class Scene;
 ///     - Creating a 3D scene and using a script object to animate the objects
 class LuaIntegration : public Sample
 {
-    OBJECT(LuaIntegration);
+    OBJECT(LuaIntegration, Sample);
 
 public:
     /// Construct.

Source/Samples/23_Water/Water.h

@@ -40,7 +40,7 @@ class Scene;
 ///     - Setting up a second camera to render reflections on the water surface
 class Water : public Sample
 {
-    OBJECT(Water);
+    OBJECT(Water, Sample);
 
 public:
     /// Construct.

Source/Samples/24_Urho2DSprite/Urho2DSprite.h

@@ -37,7 +37,7 @@ namespace Urho3D
 ///     - Handling keyboard to move and zoom 2D camera
 class Urho2DSprite : public Sample
 {
-    OBJECT(Urho2DSprite);
+    OBJECT(Urho2DSprite, Sample);
 
 public:
     /// Construct.

Source/Samples/25_Urho2DParticle/Urho2DParticle.h

@@ -37,7 +37,7 @@ namespace Urho3D
 //     - Handling mouse move to move particle
 class Urho2DParticle : public Sample
 {
-    OBJECT(Urho2DParticle);
+    OBJECT(Urho2DParticle, Sample);
 
 public:
     /// Construct.

Source/Samples/26_ConsoleInput/ConsoleInput.h

@@ -30,7 +30,7 @@
 ///       and standard input.
 class ConsoleInput : public Sample
 {
-    OBJECT(ConsoleInput);
+    OBJECT(ConsoleInput, Sample);
 
 public:
     /// Construct.

Source/Samples/27_Urho2DPhysics/Urho2DPhysics.h

@@ -36,7 +36,7 @@ namespace Urho3D
 ///     - Displaying physics debug geometry
 class Urho2DPhysics : public Sample
 {
-    OBJECT(Urho2DPhysics);
+    OBJECT(Urho2DPhysics, Sample);
 
 public:
     /// Construct.

Source/Samples/28_Urho2DPhysicsRope/Urho2DPhysicsRope.h

@@ -38,7 +38,7 @@ namespace Urho3D
 ///     - Displaying physics debug geometry
 class Urho2DPhysicsRope : public Sample
 {
-    OBJECT(Urho2DPhysicsRope);
+    OBJECT(Urho2DPhysicsRope, Sample);
 
 public:
     /// Construct.

Source/Samples/29_SoundSynthesis/SoundSynthesis.h

@@ -37,7 +37,7 @@ class BufferedSoundStream;
 ///     - Playing back a sound stream produced on-the-fly by a simple CPU synthesis algorithm
 class SoundSynthesis : public Sample
 {
-    OBJECT(SoundSynthesis);
+    OBJECT(SoundSynthesis, Sample);
 
 public:
     /// Construct.

Source/Samples/30_LightAnimation/LightAnimation.h

@@ -37,7 +37,7 @@ class Scene;
 ///     - Usage of attribute animation for light color animation
 class LightAnimation : public Sample
 {
-    OBJECT(LightAnimation);
+    OBJECT(LightAnimation, Sample);
 
 public:
     /// Construct.

Source/Samples/31_MaterialAnimation/MaterialAnimation.h

@@ -37,7 +37,7 @@ class Scene;
 ///     - Usage of material shader animation for mush room material
 class MaterialAnimation : public Sample
 {
-    OBJECT(MaterialAnimation);
+    OBJECT(MaterialAnimation, Sample);
 
 public:
     /// Construct.

Source/Samples/32_Urho2DConstraints/Urho2DConstraints.h

@@ -52,7 +52,7 @@ namespace Urho3D
 ///     - Setting the background color for the scene
 class Urho2DConstraints : public Sample
 {
-    OBJECT(Urho2DConstraints);
+    OBJECT(Urho2DConstraints, Sample);
 
 public:
     /// Construct.

Source/Samples/33_Urho2DSpriterAnimation/Urho2DSpriterAnimation.h

@@ -37,7 +37,7 @@ namespace Urho3D
 ///     - Handling keyboard to move and zoom 2D camera
 class Urho2DSpriterAnimation : public Sample
 {
-    OBJECT(Urho2DSpriterAnimation);
+    OBJECT(Urho2DSpriterAnimation, Sample);
 
 public:
     /// Construct.

Source/Samples/34_DynamicGeometry/DynamicGeometry.h

@@ -39,7 +39,7 @@ class Scene;
 ///     - Creating a Model resource and its buffer data from scratch
 class DynamicGeometry : public Sample
 {
-    OBJECT(DynamicGeometry);
+    OBJECT(DynamicGeometry, Sample);
 
 public:
     /// Construct.

Source/Samples/35_SignedDistanceFieldText/SignedDistanceFieldText.h

@@ -40,7 +40,7 @@ class Scene;
 ///     - Handling keyboard and mouse input to move a freelook camera
 class SignedDistanceFieldText : public Sample
 {
-    OBJECT(SignedDistanceFieldText);
+    OBJECT(SignedDistanceFieldText, Sample);
 
 public:
     /// Construct.

Source/Samples/36_Urho2DTileMap/Urho2DTileMap.h

@@ -37,7 +37,7 @@ namespace Urho3D
 ///     - Handling keyboard to move and zoom 2D camera
 class Urho2DTileMap : public Sample
 {
-    OBJECT(Urho2DTileMap);
+    OBJECT(Urho2DTileMap, Sample);
 
 public:
     /// Construct.

Source/Samples/37_UIDrag/UIDrag.h

@@ -37,7 +37,7 @@ namespace Urho3D
 ///     - Subscribing to GUI drag events and handling them.
 class UIDrag : public Sample
 {
-    OBJECT(UIDrag);
+    OBJECT(UIDrag, Sample);
 
 public:
     /// Construct.

Source/Samples/38_SceneAndUILoad/SceneAndUILoad.h

@@ -40,7 +40,7 @@ class Scene;
 ///      - Subscribing to the UI layout's events
 class SceneAndUILoad : public Sample
 {
-    OBJECT(SceneAndUILoad);
+    OBJECT(SceneAndUILoad, Sample);
 
 public:
     /// Construct.

Source/Samples/39_CrowdNavigation/CrowdNavigation.h

@@ -45,7 +45,7 @@ class Scene;
 ///     - Using agents to simulate moving obstacles
 class CrowdNavigation : public Sample
 {
-    OBJECT(CrowdNavigation);
+    OBJECT(CrowdNavigation, Sample);
 
 public:
     /// Construct.

Source/Samples/40_Localization/L10n.h

@@ -31,7 +31,7 @@
 ///     - The manually reaction to change language
 class L10n : public Sample
 {
-    OBJECT(L10n);
+    OBJECT(L10n, Sample);
 
 public:
     /// Construct.

Source/Samples/41_DatabaseDemo/DatabaseDemo.h

@@ -27,7 +27,7 @@
 /// Database demo. This sample demonstrates how to use database subsystem to connect to a database and execute adhoc SQL statements.
 class DatabaseDemo : public Sample
 {
-    OBJECT(DatabaseDemo)
+    OBJECT(DatabaseDemo, Sample)
 
 public:
     /// Construct.

Source/Samples/Sample.h

@@ -51,7 +51,7 @@ const float TOUCH_SENSITIVITY = 2.0f;
 class Sample : public Application
 {
     // Enable type information.
-    OBJECT(Sample);
+    OBJECT(Sample, Application);
 
 public:
     /// Construct.

Source/Tools/Urho3DPlayer/Urho3DPlayer.h

@@ -1,60 +1,60 @@
-//
-// Copyright (c) 2008-2015 the Urho3D project.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-#pragma once
-
-#include <Urho3D/Engine/Application.h>
-
-using namespace Urho3D;
-
-/// Urho3DPlayer application runs a script specified on the command line.
-class Urho3DPlayer : public Application
-{
-    OBJECT(Urho3DPlayer);
-
-public:
-    /// Construct.
-    Urho3DPlayer(Context* context);
-
-    /// Setup before engine initialization. Verify that a script file has been specified.
-    virtual void Setup();
-    /// Setup after engine initialization. Load the script and execute its start function.
-    virtual void Start();
-    /// Cleanup after the main loop. Run the script's stop function if it exists.
-    virtual void Stop();
-
-private:
-    /// Handle reload start of the script file.
-    void HandleScriptReloadStarted(StringHash eventType, VariantMap& eventData);
-    /// Handle reload success of the script file.
-    void HandleScriptReloadFinished(StringHash eventType, VariantMap& eventData);
-    /// Handle reload failure of the script file.
-    void HandleScriptReloadFailed(StringHash eventType, VariantMap& eventData);
-
-    /// Script file name.
-    String scriptFileName_;
+//
+// Copyright (c) 2008-2015 the Urho3D project.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+#pragma once
+
+#include <Urho3D/Engine/Application.h>
+
+using namespace Urho3D;
+
+/// Urho3DPlayer application runs a script specified on the command line.
+class Urho3DPlayer : public Application
+{
+    OBJECT(Urho3DPlayer, Application);
+
+public:
+    /// Construct.
+    Urho3DPlayer(Context* context);
+
+    /// Setup before engine initialization. Verify that a script file has been specified.
+    virtual void Setup();
+    /// Setup after engine initialization. Load the script and execute its start function.
+    virtual void Start();
+    /// Cleanup after the main loop. Run the script's stop function if it exists.
+    virtual void Stop();
+
+private:
+    /// Handle reload start of the script file.
+    void HandleScriptReloadStarted(StringHash eventType, VariantMap& eventData);
+    /// Handle reload success of the script file.
+    void HandleScriptReloadFinished(StringHash eventType, VariantMap& eventData);
+    /// Handle reload failure of the script file.
+    void HandleScriptReloadFailed(StringHash eventType, VariantMap& eventData);
+
+    /// Script file name.
+    String scriptFileName_;
     
 #ifdef URHO3D_ANGELSCRIPT
-    /// Script file.
-    SharedPtr<ScriptFile> scriptFile_;
+    /// Script file.
+    SharedPtr<ScriptFile> scriptFile_;
 #endif
-};
+};

Source/Urho3D/AngelScript/Script.cpp

@@ -41,7 +41,7 @@ namespace Urho3D
 
 class ScriptResourceRouter : public ResourceRouter
 {
-    OBJECT(ScriptResourceRouter);
+    OBJECT(ScriptResourceRouter, ResourceRouter);
 
     /// Construct.
     ScriptResourceRouter(Context* context) :

Source/Urho3D/AngelScript/Script.h

@@ -53,7 +53,7 @@ enum DumpMode
 /// Scripting subsystem. Allows execution of AngelScript.
 class URHO3D_API Script : public Object
 {
-    OBJECT(Script);
+    OBJECT(Script, Object);
 
     friend class ScriptFile;
 

Source/Urho3D/AngelScript/ScriptFile.h

@@ -45,7 +45,7 @@ class Variant;
 /// %Script file resource.
 class URHO3D_API ScriptFile : public Resource, public ScriptEventListener
 {
-    OBJECT(ScriptFile);
+    OBJECT(ScriptEventInvoker, Object);
 
 public:
     /// Construct.
@@ -150,7 +150,7 @@ private:
 /// Helper class for forwarding events to script objects that are not part of a scene.
 class URHO3D_API ScriptEventInvoker : public Object
 {
-    OBJECT(ScriptEventInvoker);
+    OBJECT(ScriptEventInvoker, Object);
 
 public:
     /// Constructor, will create the asILockableSharedBool if a ScriptObject is passed in.

Source/Urho3D/AngelScript/ScriptInstance.h

@@ -56,7 +56,7 @@ enum ScriptInstanceMethod
 /// %Script object component.
 class URHO3D_API ScriptInstance : public Component, public ScriptEventListener
 {
-    OBJECT(ScriptInstance);
+    OBJECT(ScriptInstance, Component);
 
 public:
     /// Construct.

Source/Urho3D/Audio/Audio.h

@@ -38,7 +38,7 @@ class SoundSource;
 /// %Audio subsystem.
 class URHO3D_API Audio : public Object
 {
-    OBJECT(Audio);
+    OBJECT(Audio, Object);
 
 public:
     /// Construct.

Source/Urho3D/Audio/Sound.h

@@ -33,7 +33,7 @@ class SoundStream;
 /// %Sound resource.
 class URHO3D_API Sound : public Resource
 {
-    OBJECT(Sound);
+    OBJECT(Sound, Resource);
 
 public:
     /// Construct.

Source/Urho3D/Audio/SoundListener.h

@@ -30,7 +30,7 @@ namespace Urho3D
 /// %Sound listener component
 class URHO3D_API SoundListener : public Component
 {
-    OBJECT(SoundListener);
+    OBJECT(SoundListener, Component);
 
 public:
     /// Construct.

Source/Urho3D/Audio/SoundSource.h

@@ -38,7 +38,7 @@ static const int STREAM_BUFFER_LENGTH = 100;
 /// %Sound source component with stereo position.
 class URHO3D_API SoundSource : public Component
 {
-    OBJECT(SoundSource);
+    OBJECT(SoundSource, Component);
 
 public:
     /// Construct.

Source/Urho3D/Audio/SoundSource3D.h

@@ -32,7 +32,7 @@ class Audio;
 /// %Sound source component with three-dimensional position.
 class URHO3D_API SoundSource3D : public SoundSource
 {
-    OBJECT(SoundSource3D);
+    OBJECT(SoundSource3D, SoundSource);
 
 public:
     /// Construct.

Source/Urho3D/Core/Object.h

@@ -31,7 +31,7 @@ namespace Urho3D
 class Context;
 class EventHandler;
 
-#define OBJECT(typeName) \
+#define OBJECT(typeName, baseTypeName) \
     public: \
         typedef typeName ClassName; \
         virtual Urho3D::StringHash GetType() const { return GetTypeStatic(); } \

Source/Urho3D/Core/Profiler.h

@@ -171,7 +171,7 @@ public:
 /// Hierarchical performance profiler subsystem.
 class URHO3D_API Profiler : public Object
 {
-    OBJECT(Profiler);
+    OBJECT(Profiler, Object);
     
 public:
     /// Construct.

Source/Urho3D/Core/Timer.h

@@ -77,7 +77,7 @@ private:
 /// %Time and frame counter subsystem.
 class URHO3D_API Time : public Object
 {
-    OBJECT(Time);
+    OBJECT(Time, Object);
 
 public:
     /// Construct.

Source/Urho3D/Core/WorkQueue.h

@@ -74,7 +74,7 @@ private:
 /// Work queue subsystem for multithreading.
 class URHO3D_API WorkQueue : public Object
 {
-    OBJECT(WorkQueue);
+    OBJECT(WorkQueue, Object);
 
     friend class WorkerThread;
 

Source/Urho3D/Database/Database.h

@@ -40,7 +40,7 @@ class DbConnection;
 /// %Database subsystem. Manage database connections.
 class URHO3D_API Database : public Object
 {
-    OBJECT(Database);
+    OBJECT(Database, Object);
 
 public:
     /// Construct.

Source/Urho3D/Database/ODBC/ODBCConnection.h

@@ -33,7 +33,7 @@ namespace Urho3D
 /// %Database connection.
 class URHO3D_API DbConnection : public Object
 {
-    OBJECT(DbConnection);
+    OBJECT(DbConnection, Object);
 
 public:
     /// Construct.

Source/Urho3D/Database/SQLite/SQLiteConnection.h

@@ -33,7 +33,7 @@ namespace Urho3D
 /// %Database connection.
 class URHO3D_API DbConnection : public Object
 {
-    OBJECT(DbConnection);
+    OBJECT(DbConnection, Object);
 
 public:
     /// Construct.

Source/Urho3D/Engine/Application.h

@@ -34,7 +34,7 @@ class Engine;
 /// Base class for creating applications which initialize the Urho3D engine and run a main loop until exited.
 class URHO3D_API Application : public Object
 {
-    OBJECT(Application);
+    OBJECT(Application, Object);
 
 public:
     /// Construct. Parse default engine parameters from the command line, and create the engine in an uninitialized state.

Source/Urho3D/Engine/Console.h

@@ -41,7 +41,7 @@ class XMLFile;
 /// %Console window with log history and command line prompt.
 class URHO3D_API Console : public Object
 {
-    OBJECT(Console);
+    OBJECT(Console, Object);
 
 public:
     /// Construct.

Source/Urho3D/Engine/DebugHud.h

@@ -42,7 +42,7 @@ static const unsigned DEBUGHUD_SHOW_ALL = 0x7;
 /// Displays rendering stats and profiling information.
 class URHO3D_API DebugHud : public Object
 {
-    OBJECT(DebugHud);
+    OBJECT(DebugHud, Object);
 
 public:
     /// Construct.

Source/Urho3D/Engine/Engine.h

@@ -34,7 +34,7 @@ class DebugHud;
 /// Urho3D engine. Creates the other subsystems.
 class URHO3D_API Engine : public Object
 {
-    OBJECT(Engine);
+    OBJECT(Engine, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/AnimatedModel.h

@@ -35,7 +35,7 @@ class AnimationState;
 /// Animated model component.
 class URHO3D_API AnimatedModel : public StaticModel
 {
-    OBJECT(AnimatedModel);
+    OBJECT(AnimatedModel, StaticModel);
 
     friend class AnimationState;
 

Source/Urho3D/Graphics/Animation.h

@@ -109,7 +109,7 @@ static const unsigned char CHANNEL_SCALE = 0x4;
 /// Skeletal animation resource.
 class URHO3D_API Animation : public Resource
 {
-    OBJECT(Animation);
+    OBJECT(Animation, Resource);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/AnimationController.h

@@ -83,7 +83,7 @@ struct AnimationControl
 /// %Component that drives an AnimatedModel's animations.
 class URHO3D_API AnimationController : public Component
 {
-    OBJECT(AnimationController);
+    OBJECT(AnimationController, Component);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/BillboardSet.h

@@ -58,7 +58,7 @@ static const unsigned MAX_BILLBOARDS = 65536 / 4;
 /// %Billboard component.
 class URHO3D_API BillboardSet : public Drawable
 {
-    OBJECT(BillboardSet);
+    OBJECT(BillboardSet, Drawable);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Camera.h

@@ -43,7 +43,7 @@ static const unsigned VO_DISABLE_OCCLUSION = 0x4;
 /// %Camera component.
 class URHO3D_API Camera : public Component
 {
-    OBJECT(Camera);
+    OBJECT(Camera, Component);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/CustomGeometry.h

@@ -47,7 +47,7 @@ class VertexBuffer;
 /// Custom geometry component.
 class URHO3D_API CustomGeometry : public Drawable
 {
-    OBJECT(CustomGeometry);
+    OBJECT(CustomGeometry, Drawable);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/DebugRenderer.h

@@ -94,7 +94,7 @@ struct DebugTriangle
 /// Debug geometry rendering component. Should be added only to the root scene node.
 class URHO3D_API DebugRenderer : public Component
 {
-    OBJECT(DebugRenderer);
+    OBJECT(DebugRenderer, Component);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/DecalSet.h

@@ -104,7 +104,7 @@ struct Decal
 /// %Decal renderer component.
 class URHO3D_API DecalSet : public Drawable
 {
-    OBJECT(DecalSet);
+    OBJECT(DecalSet, Drawable);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D11/D3D11ConstantBuffer.h

@@ -33,7 +33,7 @@ namespace Urho3D
 /// Hardware constant buffer.
 class URHO3D_API ConstantBuffer : public Object, public GPUObject
 {
-    OBJECT(ConstantBuffer);
+    OBJECT(ConstantBuffer, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D11/D3D11Graphics.h

@@ -79,7 +79,7 @@ typedef HashMap<Pair<ShaderVariation*, ShaderVariation*>, SharedPtr<ShaderProgra
 /// %Graphics subsystem. Manages the application window, rendering state and GPU resources.
 class URHO3D_API Graphics : public Object
 {
-    OBJECT(Graphics);
+    OBJECT(Graphics, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D11/D3D11IndexBuffer.h

@@ -33,7 +33,7 @@ namespace Urho3D
 /// Hardware index buffer.
 class URHO3D_API IndexBuffer : public Object, public GPUObject
 {
-    OBJECT(IndexBuffer);
+    OBJECT(IndexBuffer, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D11/D3D11Texture2D.h

@@ -35,7 +35,7 @@ class XMLFile;
 /// 2D texture resource.
 class URHO3D_API Texture2D : public Texture
 {
-    OBJECT(Texture2D);
+    OBJECT(Texture2D, Texture);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D11/D3D11Texture3D.h

@@ -34,7 +34,7 @@ class Image;
 /// 3D texture resource.
 class URHO3D_API Texture3D : public Texture
 {
-    OBJECT(Texture3D);
+    OBJECT(Texture3D, Texture);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D11/D3D11TextureCube.h

@@ -35,7 +35,7 @@ class Image;
 /// Cube texture resource.
 class URHO3D_API TextureCube : public Texture
 {
-    OBJECT(TextureCube);
+    OBJECT(TextureCube, Texture);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D11/D3D11VertexBuffer.h

@@ -32,7 +32,7 @@ namespace Urho3D
 /// Hardware vertex buffer.
 class URHO3D_API VertexBuffer : public Object, public GPUObject
 {
-    OBJECT(VertexBuffer);
+    OBJECT(VertexBuffer, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D9/D3D9Graphics.h

@@ -77,7 +77,7 @@ struct ScratchBuffer
 /// %Graphics subsystem. Manages the application window, rendering state and GPU resources.
 class URHO3D_API Graphics : public Object
 {
-    OBJECT(Graphics);
+    OBJECT(Graphics, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D9/D3D9IndexBuffer.h

@@ -33,7 +33,7 @@ namespace Urho3D
 /// Hardware index buffer.
 class URHO3D_API IndexBuffer : public Object, public GPUObject
 {
-    OBJECT(IndexBuffer);
+    OBJECT(IndexBuffer, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D9/D3D9Texture2D.h

@@ -35,7 +35,7 @@ class XMLFile;
 /// 2D texture resource.
 class URHO3D_API Texture2D : public Texture
 {
-    OBJECT(Texture2D);
+    OBJECT(Texture2D, Texture);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D9/D3D9Texture3D.h

@@ -34,7 +34,7 @@ class Image;
 /// 3D texture resource.
 class URHO3D_API Texture3D : public Texture
 {
-    OBJECT(Texture3D);
+    OBJECT(Texture3D, Texture);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D9/D3D9TextureCube.h

@@ -35,7 +35,7 @@ class Image;
 /// Cube texture resource.
 class URHO3D_API TextureCube : public Texture
 {
-    OBJECT(TextureCube);
+    OBJECT(TextureCube, Texture);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Direct3D9/D3D9VertexBuffer.h

@@ -32,7 +32,7 @@ namespace Urho3D
 /// Hardware vertex buffer.
 class URHO3D_API VertexBuffer : public Object, public GPUObject
 {
-    OBJECT(VertexBuffer);
+    OBJECT(VertexBuffer, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Drawable.h

@@ -99,7 +99,7 @@ struct SourceBatch
 /// Base class for visible components.
 class URHO3D_API Drawable : public Component
 {
-    OBJECT(Drawable);
+    OBJECT(Drawable, Component);
 
     friend class Octant;
     friend class Octree;

Source/Urho3D/Graphics/Geometry.h

@@ -37,7 +37,7 @@ class VertexBuffer;
 /// Defines one or more vertex buffers, an index buffer and a draw range.
 class URHO3D_API Geometry : public Object
 {
-    OBJECT(Geometry);
+    OBJECT(Geometry, Object);
 
 public:
     /// Construct with one empty vertex buffer.

Source/Urho3D/Graphics/Light.h

@@ -150,7 +150,7 @@ struct URHO3D_API FocusParameters
 /// %Light component.
 class URHO3D_API Light : public Drawable
 {
-    OBJECT(Light);
+    OBJECT(Light, Drawable);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Material.h

@@ -102,7 +102,7 @@ template <> inline unsigned MakeHash(const TextureUnit& value)
 /// Describes how to render 3D geometries.
 class URHO3D_API Material : public Resource
 {
-    OBJECT(Material);
+    OBJECT(Material, Resource);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Model.h

@@ -107,7 +107,7 @@ struct GeometryDesc
 /// 3D model resource.
 class URHO3D_API Model : public Resource
 {
-    OBJECT(Model);
+    OBJECT(Model, Resource);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/OcclusionBuffer.h

@@ -58,7 +58,7 @@ static const float OCCLUSION_Z_SCALE = 16777216.0f;
 /// Software renderer for occlusion.
 class URHO3D_API OcclusionBuffer : public Object
 {
-    OBJECT(OcclusionBuffer);
+    OBJECT(OcclusionBuffer, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/Octree.h

@@ -161,7 +161,7 @@ class URHO3D_API Octree : public Component, public Octant
 {
     friend void RaycastDrawablesWork(const WorkItem* item, unsigned threadIndex);
 
-    OBJECT(Octree);
+    OBJECT(Octree, Component);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/OpenGL/OGLConstantBuffer.h

@@ -33,7 +33,7 @@ namespace Urho3D
 /// Hardware constant buffer.
 class URHO3D_API ConstantBuffer : public Object, public GPUObject
 {
-    OBJECT(ConstantBuffer);
+    OBJECT(ConstantBuffer, Object);
 
 public:
     /// Construct.

Source/Urho3D/Graphics/OpenGL/OGLGraphics.h

@@ -76,7 +76,7 @@ struct ScratchBuffer
 /// %Graphics subsystem. Manages the application window, rendering state and GPU resources.
 class URHO3D_API Graphics : public Object
 {
-    OBJECT(Graphics);
+    OBJECT(Graphics, Object);
 
 public:
     /// Construct.