ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant.

All usages of "type" to refer to classes were renamed to "class"
ClassDB has been exposed to GDScript.
OBJ_TYPE() macro is now GDCLASS()

1 files changed, 268 insertions, 275 deletions

diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 5cc71d5203..063c2ec56c 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -298,103 +298,102 @@ void register_scene_types() {
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_type<Object>();
+	ClassDB::register_class<Object>();
 
-	ObjectTypeDB::register_type<Node>();
-	ObjectTypeDB::register_virtual_type<InstancePlaceholder>();
+	ClassDB::register_class<Node>();
+	ClassDB::register_virtual_class<InstancePlaceholder>();
 
-	ObjectTypeDB::register_type<Viewport>();
-	ObjectTypeDB::register_type<ViewportTexture>();
-	ObjectTypeDB::register_type<HTTPRequest>();
-	ObjectTypeDB::register_type<Timer>();
-	ObjectTypeDB::register_type<CanvasLayer>();
-	ObjectTypeDB::register_type<CanvasModulate>();
-	ObjectTypeDB::register_type<ResourcePreloader>();
+	ClassDB::register_class<Viewport>();
+	ClassDB::register_class<ViewportTexture>();
+	ClassDB::register_class<HTTPRequest>();
+	ClassDB::register_class<Timer>();
+	ClassDB::register_class<CanvasLayer>();
+	ClassDB::register_class<CanvasModulate>();
+	ClassDB::register_class<ResourcePreloader>();
 
 	/* REGISTER GUI */
-	ObjectTypeDB::register_type<ButtonGroup>();
-	ObjectTypeDB::register_virtual_type<BaseButton>();
+	ClassDB::register_class<ButtonGroup>();
+	ClassDB::register_virtual_class<BaseButton>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_type<ShortCut>();
-	ObjectTypeDB::register_type<Control>();
-//	ObjectTypeDB::register_type<EmptyControl>();
-	ObjectTypeDB::add_compatibility_type("EmptyControl","Control");
-	ObjectTypeDB::register_type<Button>();
-	ObjectTypeDB::register_type<Label>();
-	ObjectTypeDB::register_type<HScrollBar>();
-	ObjectTypeDB::register_type<VScrollBar>();
-	ObjectTypeDB::register_type<ProgressBar>();
-	ObjectTypeDB::register_type<HSlider>();
-	ObjectTypeDB::register_type<VSlider>();
-	ObjectTypeDB::register_type<Popup>();
-	ObjectTypeDB::register_type<PopupPanel>();
-	ObjectTypeDB::register_type<MenuButton>();
-	ObjectTypeDB::register_type<CheckBox>();
-	ObjectTypeDB::register_type<CheckButton>();
-	ObjectTypeDB::register_type<ToolButton>();
-	ObjectTypeDB::register_type<LinkButton>();
-	ObjectTypeDB::register_type<Panel>();
-	ObjectTypeDB::register_type<Range>();
+	ClassDB::register_class<ShortCut>();
+	ClassDB::register_class<Control>();
+//	ClassDB::register_type<EmptyControl>();
+	ClassDB::register_class<Button>();
+	ClassDB::register_class<Label>();
+	ClassDB::register_class<HScrollBar>();
+	ClassDB::register_class<VScrollBar>();
+	ClassDB::register_class<ProgressBar>();
+	ClassDB::register_class<HSlider>();
+	ClassDB::register_class<VSlider>();
+	ClassDB::register_class<Popup>();
+	ClassDB::register_class<PopupPanel>();
+	ClassDB::register_class<MenuButton>();
+	ClassDB::register_class<CheckBox>();
+	ClassDB::register_class<CheckButton>();
+	ClassDB::register_class<ToolButton>();
+	ClassDB::register_class<LinkButton>();
+	ClassDB::register_class<Panel>();
+	ClassDB::register_class<Range>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_type<TextureFrame>();
-	ObjectTypeDB::register_type<ColorFrame>();
-	ObjectTypeDB::register_type<Patch9Frame>();
-	ObjectTypeDB::register_type<TabContainer>();
-	ObjectTypeDB::register_type<Tabs>();
-	ObjectTypeDB::register_virtual_type<Separator>();
-	ObjectTypeDB::register_type<HSeparator>();
-	ObjectTypeDB::register_type<VSeparator>();
-	ObjectTypeDB::register_type<TextureButton>();
-	ObjectTypeDB::register_type<Container>();
-	ObjectTypeDB::register_virtual_type<BoxContainer>();
-	ObjectTypeDB::register_type<HBoxContainer>();
-	ObjectTypeDB::register_type<VBoxContainer>();
-	ObjectTypeDB::register_type<GridContainer>();
-	ObjectTypeDB::register_type<CenterContainer>();
-	ObjectTypeDB::register_type<ScrollContainer>();
-	ObjectTypeDB::register_type<PanelContainer>();
-	ObjectTypeDB::register_virtual_type<SplitContainer>();
-	ObjectTypeDB::register_type<HSplitContainer>();
-	ObjectTypeDB::register_type<VSplitContainer>();
-	ObjectTypeDB::register_type<GraphNode>();
-	ObjectTypeDB::register_type<GraphEdit>();
+	ClassDB::register_class<TextureFrame>();
+	ClassDB::register_class<ColorFrame>();
+	ClassDB::register_class<Patch9Frame>();
+	ClassDB::register_class<TabContainer>();
+	ClassDB::register_class<Tabs>();
+	ClassDB::register_virtual_class<Separator>();
+	ClassDB::register_class<HSeparator>();
+	ClassDB::register_class<VSeparator>();
+	ClassDB::register_class<TextureButton>();
+	ClassDB::register_class<Container>();
+	ClassDB::register_virtual_class<BoxContainer>();
+	ClassDB::register_class<HBoxContainer>();
+	ClassDB::register_class<VBoxContainer>();
+	ClassDB::register_class<GridContainer>();
+	ClassDB::register_class<CenterContainer>();
+	ClassDB::register_class<ScrollContainer>();
+	ClassDB::register_class<PanelContainer>();
+	ClassDB::register_virtual_class<SplitContainer>();
+	ClassDB::register_class<HSplitContainer>();
+	ClassDB::register_class<VSplitContainer>();
+	ClassDB::register_class<GraphNode>();
+	ClassDB::register_class<GraphEdit>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
 
-	ObjectTypeDB::register_virtual_type<ButtonArray>();
-	ObjectTypeDB::register_type<HButtonArray>();
-	ObjectTypeDB::register_type<VButtonArray>();
-	ObjectTypeDB::register_type<TextureProgress>();
-	ObjectTypeDB::register_type<ItemList>();
+	ClassDB::register_virtual_class<ButtonArray>();
+	ClassDB::register_class<HButtonArray>();
+	ClassDB::register_class<VButtonArray>();
+	ClassDB::register_class<TextureProgress>();
+	ClassDB::register_class<ItemList>();
 
 #ifndef	ADVANCED_GUI_DISABLED
 
-	ObjectTypeDB::register_type<FileDialog>();
-	ObjectTypeDB::register_type<LineEdit>();
-	ObjectTypeDB::register_type<PopupMenu>();
-	ObjectTypeDB::register_type<Tree>();
-
-	ObjectTypeDB::register_type<TextEdit>();
-
-	ObjectTypeDB::register_virtual_type<TreeItem>();
-	ObjectTypeDB::register_type<OptionButton>();
-	ObjectTypeDB::register_type<SpinBox>();
-	ObjectTypeDB::register_type<ReferenceFrame>();
-	ObjectTypeDB::register_type<ColorPicker>();
-	ObjectTypeDB::register_type<ColorPickerButton>();
-	ObjectTypeDB::register_type<RichTextLabel>();
-	ObjectTypeDB::register_type<PopupDialog>();
-	ObjectTypeDB::register_type<WindowDialog>();
-	ObjectTypeDB::register_type<AcceptDialog>();
-	ObjectTypeDB::register_type<ConfirmationDialog>();
-	ObjectTypeDB::register_type<VideoPlayer>();
-	ObjectTypeDB::register_type<MarginContainer>();
-	ObjectTypeDB::register_type<ViewportContainer>();
+	ClassDB::register_class<FileDialog>();
+	ClassDB::register_class<LineEdit>();
+	ClassDB::register_class<PopupMenu>();
+	ClassDB::register_class<Tree>();
+
+	ClassDB::register_class<TextEdit>();
+
+	ClassDB::register_virtual_class<TreeItem>();
+	ClassDB::register_class<OptionButton>();
+	ClassDB::register_class<SpinBox>();
+	ClassDB::register_class<ReferenceFrame>();
+	ClassDB::register_class<ColorPicker>();
+	ClassDB::register_class<ColorPickerButton>();
+	ClassDB::register_class<RichTextLabel>();
+	ClassDB::register_class<PopupDialog>();
+	ClassDB::register_class<WindowDialog>();
+	ClassDB::register_class<AcceptDialog>();
+	ClassDB::register_class<ConfirmationDialog>();
+	ClassDB::register_class<VideoPlayer>();
+	ClassDB::register_class<MarginContainer>();
+	ClassDB::register_class<ViewportContainer>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
@@ -402,251 +401,245 @@ void register_scene_types() {
 
 	/* REGISTER 3D */
 
-	ObjectTypeDB::register_type<Spatial>();
-	ObjectTypeDB::register_virtual_type<SpatialGizmo>();
-	ObjectTypeDB::register_type<Skeleton>();
-	ObjectTypeDB::register_type<AnimationPlayer>();
-	ObjectTypeDB::register_type<Tween>();
+	ClassDB::register_class<Spatial>();
+	ClassDB::register_virtual_class<SpatialGizmo>();
+	ClassDB::register_class<Skeleton>();
+	ClassDB::register_class<AnimationPlayer>();
+	ClassDB::register_class<Tween>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
 #ifndef _3D_DISABLED
-	ObjectTypeDB::register_type<BoneAttachment>();
-	ObjectTypeDB::register_virtual_type<VisualInstance>();
-	ObjectTypeDB::register_type<Camera>();
-	ObjectTypeDB::register_type<Listener>();
-	ObjectTypeDB::register_type<InterpolatedCamera>();
-	ObjectTypeDB::register_type<TestCube>();
-	ObjectTypeDB::register_type<MeshInstance>();
-	ObjectTypeDB::register_type<ImmediateGeometry>();
-	ObjectTypeDB::register_type<Sprite3D>();
-	ObjectTypeDB::register_type<AnimatedSprite3D>();
-	ObjectTypeDB::register_virtual_type<Light>();
-	ObjectTypeDB::register_type<DirectionalLight>();
-	ObjectTypeDB::register_type<OmniLight>();
-	ObjectTypeDB::register_type<SpotLight>();
-	ObjectTypeDB::register_type<ReflectionProbe>();
-	ObjectTypeDB::register_type<GIProbe>();
-	ObjectTypeDB::register_type<GIProbeData>();
-	ObjectTypeDB::register_type<AnimationTreePlayer>();
-	ObjectTypeDB::register_type<Portal>();
-	//ObjectTypeDB::register_type<Particles>();
-	ObjectTypeDB::register_type<Position3D>();
-	ObjectTypeDB::register_type<Quad>();
-	ObjectTypeDB::register_type<NavigationMeshInstance>();
-	ObjectTypeDB::register_type<NavigationMesh>();
-	ObjectTypeDB::register_type<Navigation>();
+	ClassDB::register_class<BoneAttachment>();
+	ClassDB::register_virtual_class<VisualInstance>();
+	ClassDB::register_class<Camera>();
+	ClassDB::register_class<Listener>();
+	ClassDB::register_class<InterpolatedCamera>();
+	ClassDB::register_class<TestCube>();
+	ClassDB::register_class<MeshInstance>();
+	ClassDB::register_class<ImmediateGeometry>();
+	ClassDB::register_class<Sprite3D>();
+	ClassDB::register_class<AnimatedSprite3D>();
+	ClassDB::register_virtual_class<Light>();
+	ClassDB::register_class<DirectionalLight>();
+	ClassDB::register_class<OmniLight>();
+	ClassDB::register_class<SpotLight>();
+	ClassDB::register_class<ReflectionProbe>();
+	ClassDB::register_class<GIProbe>();
+	ClassDB::register_class<GIProbeData>();
+	ClassDB::register_class<AnimationTreePlayer>();
+	ClassDB::register_class<Portal>();
+	//ClassDB::register_type<Particles>();
+	ClassDB::register_class<Position3D>();
+	ClassDB::register_class<Quad>();
+	ClassDB::register_class<NavigationMeshInstance>();
+	ClassDB::register_class<NavigationMesh>();
+	ClassDB::register_class<Navigation>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_virtual_type<CollisionObject>();
-	ObjectTypeDB::register_type<StaticBody>();
-	ObjectTypeDB::register_type<RigidBody>();
-	ObjectTypeDB::register_type<KinematicBody>();
-
-
-	ObjectTypeDB::register_type<VehicleBody>();
-	ObjectTypeDB::register_type<VehicleWheel>();
-	ObjectTypeDB::register_type<Area>();
-	ObjectTypeDB::register_type<ProximityGroup>();
-	ObjectTypeDB::register_type<CollisionShape>();
-	ObjectTypeDB::register_type<CollisionPolygon>();
-	ObjectTypeDB::register_type<RayCast>();
-	ObjectTypeDB::register_type<MultiMeshInstance>();
-	ObjectTypeDB::register_type<Room>();
-	ObjectTypeDB::register_type<Curve3D>();
-	ObjectTypeDB::register_type<Path>();
-	ObjectTypeDB::register_type<PathFollow>();
-	ObjectTypeDB::register_type<VisibilityNotifier>();
-	ObjectTypeDB::register_type<VisibilityEnabler>();
-	ObjectTypeDB::register_type<BakedLight>();
-	//ObjectTypeDB::register_type<BakedLightSampler>();
-	ObjectTypeDB::register_type<WorldEnvironment>();
-	ObjectTypeDB::register_type<RemoteTransform>();
-
-	ObjectTypeDB::register_virtual_type<Joint>();
-	ObjectTypeDB::register_type<PinJoint>();
-	ObjectTypeDB::register_type<HingeJoint>();
-	ObjectTypeDB::register_type<SliderJoint>();
-	ObjectTypeDB::register_type<ConeTwistJoint>();
-	ObjectTypeDB::register_type<Generic6DOFJoint>();
+	ClassDB::register_virtual_class<CollisionObject>();
+	ClassDB::register_class<StaticBody>();
+	ClassDB::register_class<RigidBody>();
+	ClassDB::register_class<KinematicBody>();
+
+
+	ClassDB::register_class<VehicleBody>();
+	ClassDB::register_class<VehicleWheel>();
+	ClassDB::register_class<Area>();
+	ClassDB::register_class<ProximityGroup>();
+	ClassDB::register_class<CollisionShape>();
+	ClassDB::register_class<CollisionPolygon>();
+	ClassDB::register_class<RayCast>();
+	ClassDB::register_class<MultiMeshInstance>();
+	ClassDB::register_class<Room>();
+	ClassDB::register_class<Curve3D>();
+	ClassDB::register_class<Path>();
+	ClassDB::register_class<PathFollow>();
+	ClassDB::register_class<VisibilityNotifier>();
+	ClassDB::register_class<VisibilityEnabler>();
+	ClassDB::register_class<BakedLight>();
+	//ClassDB::register_type<BakedLightSampler>();
+	ClassDB::register_class<WorldEnvironment>();
+	ClassDB::register_class<RemoteTransform>();
+
+	ClassDB::register_virtual_class<Joint>();
+	ClassDB::register_class<PinJoint>();
+	ClassDB::register_class<HingeJoint>();
+	ClassDB::register_class<SliderJoint>();
+	ClassDB::register_class<ConeTwistJoint>();
+	ClassDB::register_class<Generic6DOFJoint>();
 
 	//scenariofx
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_type<SpatialSamplePlayer>();
-	ObjectTypeDB::register_type<SpatialStreamPlayer>();
-	ObjectTypeDB::register_type<SoundRoomParams>();
+	ClassDB::register_class<SpatialSamplePlayer>();
+	ClassDB::register_class<SpatialStreamPlayer>();
+	ClassDB::register_class<SoundRoomParams>();
 
 
 #endif
-	ObjectTypeDB::register_type<MeshLibrary>();
+	ClassDB::register_class<MeshLibrary>();
 	AcceptDialog::set_swap_ok_cancel( GLOBAL_DEF("display/swap_ok_cancel",bool(OS::get_singleton()->get_swap_ok_cancel())) );
 
-	ObjectTypeDB::register_type<SamplePlayer>();
-	ObjectTypeDB::register_type<StreamPlayer>();
-	ObjectTypeDB::register_type<EventPlayer>();
-
-
-	ObjectTypeDB::register_type<CanvasItemMaterial>();
-	ObjectTypeDB::register_virtual_type<CanvasItem>();
-	ObjectTypeDB::register_type<Node2D>();
-	ObjectTypeDB::register_type<Particles2D>();
-	ObjectTypeDB::register_type<ParticleAttractor2D>();
-	ObjectTypeDB::register_type<Sprite>();
-//	ObjectTypeDB::register_type<ViewportSprite>();
-	ObjectTypeDB::register_type<SpriteFrames>();
-	ObjectTypeDB::register_type<AnimatedSprite>();
-	ObjectTypeDB::register_type<Position2D>();
-	ObjectTypeDB::register_virtual_type<CollisionObject2D>();
-	ObjectTypeDB::register_virtual_type<PhysicsBody2D>();
-	ObjectTypeDB::register_type<StaticBody2D>();
-	ObjectTypeDB::register_type<RigidBody2D>();
-	ObjectTypeDB::register_type<KinematicBody2D>();
-	ObjectTypeDB::register_type<Area2D>();
-	ObjectTypeDB::register_type<CollisionShape2D>();
-	ObjectTypeDB::register_type<CollisionPolygon2D>();
-	ObjectTypeDB::register_type<RayCast2D>();
-	ObjectTypeDB::register_type<VisibilityNotifier2D>();
-	ObjectTypeDB::register_type<VisibilityEnabler2D>();
-	ObjectTypeDB::register_type<Polygon2D>();
-	ObjectTypeDB::register_type<Light2D>();
-	ObjectTypeDB::register_type<LightOccluder2D>();
-	ObjectTypeDB::register_type<OccluderPolygon2D>();
-	ObjectTypeDB::register_type<YSort>();
-	ObjectTypeDB::register_type<BackBufferCopy>();
+	ClassDB::register_class<SamplePlayer>();
+	ClassDB::register_class<StreamPlayer>();
+	ClassDB::register_class<EventPlayer>();
+
+
+	ClassDB::register_class<CanvasItemMaterial>();
+	ClassDB::register_virtual_class<CanvasItem>();
+	ClassDB::register_class<Node2D>();
+	ClassDB::register_class<Particles2D>();
+	ClassDB::register_class<ParticleAttractor2D>();
+	ClassDB::register_class<Sprite>();
+//	ClassDB::register_type<ViewportSprite>();
+	ClassDB::register_class<SpriteFrames>();
+	ClassDB::register_class<AnimatedSprite>();
+	ClassDB::register_class<Position2D>();
+	ClassDB::register_virtual_class<CollisionObject2D>();
+	ClassDB::register_virtual_class<PhysicsBody2D>();
+	ClassDB::register_class<StaticBody2D>();
+	ClassDB::register_class<RigidBody2D>();
+	ClassDB::register_class<KinematicBody2D>();
+	ClassDB::register_class<Area2D>();
+	ClassDB::register_class<CollisionShape2D>();
+	ClassDB::register_class<CollisionPolygon2D>();
+	ClassDB::register_class<RayCast2D>();
+	ClassDB::register_class<VisibilityNotifier2D>();
+	ClassDB::register_class<VisibilityEnabler2D>();
+	ClassDB::register_class<Polygon2D>();
+	ClassDB::register_class<Light2D>();
+	ClassDB::register_class<LightOccluder2D>();
+	ClassDB::register_class<OccluderPolygon2D>();
+	ClassDB::register_class<YSort>();
+	ClassDB::register_class<BackBufferCopy>();
 	if (bool(GLOBAL_DEF("physics/remove_collision_helpers_at_runtime",false))) {
-		ObjectTypeDB::set_type_enabled("CollisionShape2D",false);
-		ObjectTypeDB::set_type_enabled("CollisionPolygon2D",false);
-		ObjectTypeDB::set_type_enabled("CollisionShape",false);
-		ObjectTypeDB::set_type_enabled("CollisionPolygon",false);
+		ClassDB::set_class_enabled("CollisionShape2D",false);
+		ClassDB::set_class_enabled("CollisionPolygon2D",false);
+		ClassDB::set_class_enabled("CollisionShape",false);
+		ClassDB::set_class_enabled("CollisionPolygon",false);
 	}
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_type<Camera2D>();
-	ObjectTypeDB::register_virtual_type<Joint2D>();
-	ObjectTypeDB::register_type<PinJoint2D>();
-	ObjectTypeDB::register_type<GrooveJoint2D>();
-	ObjectTypeDB::register_type<DampedSpringJoint2D>();
-	ObjectTypeDB::register_type<TileSet>();
-	ObjectTypeDB::register_type<TileMap>();
-	ObjectTypeDB::register_type<ParallaxBackground>();
-	ObjectTypeDB::register_type<ParallaxLayer>();
-	ObjectTypeDB::register_virtual_type<SoundPlayer2D>();
-	ObjectTypeDB::register_type<SamplePlayer2D>();
-	ObjectTypeDB::register_type<TouchScreenButton>();
-	ObjectTypeDB::register_type<RemoteTransform2D>();
+	ClassDB::register_class<Camera2D>();
+	ClassDB::register_virtual_class<Joint2D>();
+	ClassDB::register_class<PinJoint2D>();
+	ClassDB::register_class<GrooveJoint2D>();
+	ClassDB::register_class<DampedSpringJoint2D>();
+	ClassDB::register_class<TileSet>();
+	ClassDB::register_class<TileMap>();
+	ClassDB::register_class<ParallaxBackground>();
+	ClassDB::register_class<ParallaxLayer>();
+	ClassDB::register_virtual_class<SoundPlayer2D>();
+	ClassDB::register_class<SamplePlayer2D>();
+	ClassDB::register_class<TouchScreenButton>();
+	ClassDB::register_class<RemoteTransform2D>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
 	/* REGISTER RESOURCES */
 
-	ObjectTypeDB::register_virtual_type<Shader>();
-//	ObjectTypeDB::register_virtual_type<ShaderGraph>();
-	ObjectTypeDB::register_type<CanvasItemShader>();
-//	ObjectTypeDB::register_type<CanvasItemShaderGraph>();
+	ClassDB::register_virtual_class<Shader>();
+//	ClassDB::register_virtual_type<ShaderGraph>();
+	ClassDB::register_class<CanvasItemShader>();
+//	ClassDB::register_type<CanvasItemShaderGraph>();
 
 #ifndef _3D_DISABLED
-	ObjectTypeDB::register_type<Mesh>();
-	ObjectTypeDB::register_virtual_type<Material>();
-	ObjectTypeDB::register_type<FixedSpatialMaterial>();
+	ClassDB::register_class<Mesh>();
+	ClassDB::register_virtual_class<Material>();
+	ClassDB::register_class<FixedSpatialMaterial>();
 	SceneTree::add_idle_callback(FixedSpatialMaterial::flush_changes);
 	FixedSpatialMaterial::init_shaders();
-//	ObjectTypeDB::register_type<ShaderMaterial>();
-	ObjectTypeDB::register_type<RoomBounds>();
-//	ObjectTypeDB::register_type<MaterialShaderGraph>();
-	ObjectTypeDB::register_type<SpatialShader>();
-	ObjectTypeDB::register_type<ParticlesShader>();
-	ObjectTypeDB::add_compatibility_type("Shader","MaterialShader");
-	ObjectTypeDB::add_compatibility_type("ParticleSystemMaterial","FixedSpatialMaterial");
-	ObjectTypeDB::add_compatibility_type("UnshadedMaterial","FixedSpatialMaterial");
-	ObjectTypeDB::register_type<MultiMesh>();
-	ObjectTypeDB::register_type<MeshLibrary>();
+//	ClassDB::register_type<ShaderMaterial>();
+	ClassDB::register_class<RoomBounds>();
+//	ClassDB::register_type<MaterialShaderGraph>();
+	ClassDB::register_class<SpatialShader>();
+	ClassDB::register_class<ParticlesShader>();
+	ClassDB::register_class<MultiMesh>();
+	ClassDB::register_class<MeshLibrary>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_type<RayShape>();
-	ObjectTypeDB::register_type<SphereShape>();
-	ObjectTypeDB::register_type<BoxShape>();
-	ObjectTypeDB::register_type<CapsuleShape>();
-	ObjectTypeDB::register_type<PlaneShape>();
-	ObjectTypeDB::register_type<ConvexPolygonShape>();
-	ObjectTypeDB::register_type<ConcavePolygonShape>();
+	ClassDB::register_class<RayShape>();
+	ClassDB::register_class<SphereShape>();
+	ClassDB::register_class<BoxShape>();
+	ClassDB::register_class<CapsuleShape>();
+	ClassDB::register_class<PlaneShape>();
+	ClassDB::register_class<ConvexPolygonShape>();
+	ClassDB::register_class<ConcavePolygonShape>();
 
-	ObjectTypeDB::register_type<SurfaceTool>();
-	ObjectTypeDB::register_type<MeshDataTool>();
-	//ObjectTypeDB::register_type<BakedLight>();
+	ClassDB::register_class<SurfaceTool>();
+	ClassDB::register_class<MeshDataTool>();
+	//ClassDB::register_type<BakedLight>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
 #endif
-	ObjectTypeDB::register_type<World>();
-	ObjectTypeDB::register_type<Environment>();
-	ObjectTypeDB::register_type<World2D>();
-	ObjectTypeDB::register_virtual_type<Texture>();
-	ObjectTypeDB::register_virtual_type<SkyBox>();
-	ObjectTypeDB::register_type<ImageSkyBox>();
-	ObjectTypeDB::register_type<ImageTexture>();
-	ObjectTypeDB::register_type<AtlasTexture>();
-	ObjectTypeDB::register_type<LargeTexture>();
-	ObjectTypeDB::register_type<CubeMap>();
-	ObjectTypeDB::register_type<Animation>();
-	ObjectTypeDB::register_virtual_type<Font>();
-	ObjectTypeDB::register_type<BitmapFont>();
-
-	ObjectTypeDB::register_type<DynamicFontData>();
-	ObjectTypeDB::register_type<DynamicFont>();
-
-	ObjectTypeDB::register_type<StyleBoxEmpty>();
-	ObjectTypeDB::register_type<StyleBoxTexture>();
-	ObjectTypeDB::register_type<StyleBoxFlat>();	
-	ObjectTypeDB::register_type<Theme>();
-
-	ObjectTypeDB::add_compatibility_type("Font","BitmapFont");
-
-
-	ObjectTypeDB::register_type<PolygonPathFinder>();
-	ObjectTypeDB::register_type<BitMap>();
-	ObjectTypeDB::register_type<ColorRamp>();
+	ClassDB::register_class<World>();
+	ClassDB::register_class<Environment>();
+	ClassDB::register_class<World2D>();
+	ClassDB::register_virtual_class<Texture>();
+	ClassDB::register_virtual_class<SkyBox>();
+	ClassDB::register_class<ImageSkyBox>();
+	ClassDB::register_class<ImageTexture>();
+	ClassDB::register_class<AtlasTexture>();
+	ClassDB::register_class<LargeTexture>();
+	ClassDB::register_class<CubeMap>();
+	ClassDB::register_class<Animation>();
+	ClassDB::register_virtual_class<Font>();
+	ClassDB::register_class<BitmapFont>();
+
+	ClassDB::register_class<DynamicFontData>();
+	ClassDB::register_class<DynamicFont>();
+
+	ClassDB::register_class<StyleBoxEmpty>();
+	ClassDB::register_class<StyleBoxTexture>();
+	ClassDB::register_class<StyleBoxFlat>();	
+	ClassDB::register_class<Theme>();
+
+	ClassDB::register_class<PolygonPathFinder>();
+	ClassDB::register_class<BitMap>();
+	ClassDB::register_class<ColorRamp>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_type<Sample>();
-	ObjectTypeDB::register_type<SampleLibrary>();
-	ObjectTypeDB::register_virtual_type<AudioStream>();
-	ObjectTypeDB::register_virtual_type<AudioStreamPlayback>();
+	ClassDB::register_class<Sample>();
+	ClassDB::register_class<SampleLibrary>();
+	ClassDB::register_virtual_class<AudioStream>();
+	ClassDB::register_virtual_class<AudioStreamPlayback>();
 //TODO: Adapt to the new AudioStream API or drop (GH-3307)
-//	ObjectTypeDB::register_type<AudioStreamGibberish>();
-	ObjectTypeDB::register_virtual_type<VideoStream>();
+//	ClassDB::register_type<AudioStreamGibberish>();
+	ClassDB::register_virtual_class<VideoStream>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_virtual_type<Shape2D>();
-	ObjectTypeDB::register_type<LineShape2D>();
-	ObjectTypeDB::register_type<SegmentShape2D>();
-	ObjectTypeDB::register_type<RayShape2D>();
-	ObjectTypeDB::register_type<CircleShape2D>();
-	ObjectTypeDB::register_type<RectangleShape2D>();
-	ObjectTypeDB::register_type<CapsuleShape2D>();
-	ObjectTypeDB::register_type<ConvexPolygonShape2D>();
-	ObjectTypeDB::register_type<ConcavePolygonShape2D>();
-	ObjectTypeDB::register_type<Curve2D>();
-	ObjectTypeDB::register_type<Path2D>();
-	ObjectTypeDB::register_type<PathFollow2D>();
-
-	ObjectTypeDB::register_type<Navigation2D>();
-	ObjectTypeDB::register_type<NavigationPolygon>();
-	ObjectTypeDB::register_type<NavigationPolygonInstance>();
+	ClassDB::register_virtual_class<Shape2D>();
+	ClassDB::register_class<LineShape2D>();
+	ClassDB::register_class<SegmentShape2D>();
+	ClassDB::register_class<RayShape2D>();
+	ClassDB::register_class<CircleShape2D>();
+	ClassDB::register_class<RectangleShape2D>();
+	ClassDB::register_class<CapsuleShape2D>();
+	ClassDB::register_class<ConvexPolygonShape2D>();
+	ClassDB::register_class<ConcavePolygonShape2D>();
+	ClassDB::register_class<Curve2D>();
+	ClassDB::register_class<Path2D>();
+	ClassDB::register_class<PathFollow2D>();
+
+	ClassDB::register_class<Navigation2D>();
+	ClassDB::register_class<NavigationPolygon>();
+	ClassDB::register_class<NavigationPolygonInstance>();
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ObjectTypeDB::register_virtual_type<SceneState>();
-	ObjectTypeDB::register_type<PackedScene>();
+	ClassDB::register_virtual_class<SceneState>();
+	ClassDB::register_class<PackedScene>();
 
-	ObjectTypeDB::register_type<SceneTree>();
-	ObjectTypeDB::register_virtual_type<SceneTreeTimer>(); //sorry, you can't create it
+	ClassDB::register_class<SceneTree>();
+	ClassDB::register_virtual_class<SceneTreeTimer>(); //sorry, you can't create it
 
 	OS::get_singleton()->yield(); //may take time to init