Merge pull request #37340 from reduz/rename-3d-nodes

Make 2D and 3D node names more explicit

8 files changed, 1994 insertions, 90 deletions

diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
new file mode 100644
index 0000000000..7a0fc3352b
--- /dev/null
+++ b/scene/main/canvas_item.cpp
@@ -0,0 +1,1491 @@
+/*************************************************************************/
+/*  canvas_item.cpp                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* 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.                */
+/*************************************************************************/
+
+#include "canvas_item.h"
+
+#include "core/input/input_filter.h"
+#include "core/message_queue.h"
+#include "core/method_bind_ext.gen.inc"
+#include "scene/main/canvas_layer.h"
+#include "scene/main/viewport.h"
+#include "scene/main/window.h"
+#include "scene/resources/font.h"
+#include "scene/resources/style_box.h"
+#include "scene/resources/texture.h"
+#include "scene/scene_string_names.h"
+#include "servers/visual/visual_server_raster.h"
+#include "servers/visual_server.h"
+
+Mutex CanvasItemMaterial::material_mutex;
+SelfList<CanvasItemMaterial>::List *CanvasItemMaterial::dirty_materials = NULL;
+Map<CanvasItemMaterial::MaterialKey, CanvasItemMaterial::ShaderData> CanvasItemMaterial::shader_map;
+CanvasItemMaterial::ShaderNames *CanvasItemMaterial::shader_names = NULL;
+
+void CanvasItemMaterial::init_shaders() {
+
+	dirty_materials = memnew(SelfList<CanvasItemMaterial>::List);
+
+	shader_names = memnew(ShaderNames);
+
+	shader_names->particles_anim_h_frames = "particles_anim_h_frames";
+	shader_names->particles_anim_v_frames = "particles_anim_v_frames";
+	shader_names->particles_anim_loop = "particles_anim_loop";
+}
+
+void CanvasItemMaterial::finish_shaders() {
+
+	memdelete(dirty_materials);
+	memdelete(shader_names);
+	dirty_materials = NULL;
+}
+
+void CanvasItemMaterial::_update_shader() {
+
+	dirty_materials->remove(&element);
+
+	MaterialKey mk = _compute_key();
+	if (mk.key == current_key.key)
+		return; //no update required in the end
+
+	if (shader_map.has(current_key)) {
+		shader_map[current_key].users--;
+		if (shader_map[current_key].users == 0) {
+			//deallocate shader, as it's no longer in use
+			VS::get_singleton()->free(shader_map[current_key].shader);
+			shader_map.erase(current_key);
+		}
+	}
+
+	current_key = mk;
+
+	if (shader_map.has(mk)) {
+
+		VS::get_singleton()->material_set_shader(_get_material(), shader_map[mk].shader);
+		shader_map[mk].users++;
+		return;
+	}
+
+	//must create a shader!
+
+	String code = "shader_type canvas_item;\nrender_mode ";
+	switch (blend_mode) {
+		case BLEND_MODE_MIX: code += "blend_mix"; break;
+		case BLEND_MODE_ADD: code += "blend_add"; break;
+		case BLEND_MODE_SUB: code += "blend_sub"; break;
+		case BLEND_MODE_MUL: code += "blend_mul"; break;
+		case BLEND_MODE_PREMULT_ALPHA: code += "blend_premul_alpha"; break;
+		case BLEND_MODE_DISABLED: code += "blend_disabled"; break;
+	}
+
+	switch (light_mode) {
+		case LIGHT_MODE_NORMAL: break;
+		case LIGHT_MODE_UNSHADED: code += ",unshaded"; break;
+		case LIGHT_MODE_LIGHT_ONLY: code += ",light_only"; break;
+	}
+
+	code += ";\n";
+
+	if (particles_animation) {
+
+		code += "uniform int particles_anim_h_frames;\n";
+		code += "uniform int particles_anim_v_frames;\n";
+		code += "uniform bool particles_anim_loop;\n";
+
+		code += "void vertex() {\n";
+
+		code += "\tfloat h_frames = float(particles_anim_h_frames);\n";
+		code += "\tfloat v_frames = float(particles_anim_v_frames);\n";
+
+		code += "\tVERTEX.xy /= vec2(h_frames, v_frames);\n";
+
+		code += "\tfloat particle_total_frames = float(particles_anim_h_frames * particles_anim_v_frames);\n";
+		code += "\tfloat particle_frame = floor(INSTANCE_CUSTOM.z * float(particle_total_frames));\n";
+		code += "\tif (!particles_anim_loop) {\n";
+		code += "\t\tparticle_frame = clamp(particle_frame, 0.0, particle_total_frames - 1.0);\n";
+		code += "\t} else {\n";
+		code += "\t\tparticle_frame = mod(particle_frame, particle_total_frames);\n";
+		code += "\t}";
+		code += "\tUV /= vec2(h_frames, v_frames);\n";
+		code += "\tUV += vec2(mod(particle_frame, h_frames) / h_frames, floor(particle_frame / h_frames) / v_frames);\n";
+		code += "}\n";
+	}
+
+	ShaderData shader_data;
+	shader_data.shader = VS::get_singleton()->shader_create();
+	shader_data.users = 1;
+
+	VS::get_singleton()->shader_set_code(shader_data.shader, code);
+
+	shader_map[mk] = shader_data;
+
+	VS::get_singleton()->material_set_shader(_get_material(), shader_data.shader);
+}
+
+void CanvasItemMaterial::flush_changes() {
+
+	MutexLock lock(material_mutex);
+
+	while (dirty_materials->first()) {
+
+		dirty_materials->first()->self()->_update_shader();
+	}
+}
+
+void CanvasItemMaterial::_queue_shader_change() {
+
+	MutexLock lock(material_mutex);
+
+	if (!element.in_list()) {
+		dirty_materials->add(&element);
+	}
+}
+
+bool CanvasItemMaterial::_is_shader_dirty() const {
+
+	MutexLock lock(material_mutex);
+
+	return element.in_list();
+}
+void CanvasItemMaterial::set_blend_mode(BlendMode p_blend_mode) {
+
+	blend_mode = p_blend_mode;
+	_queue_shader_change();
+}
+
+CanvasItemMaterial::BlendMode CanvasItemMaterial::get_blend_mode() const {
+	return blend_mode;
+}
+
+void CanvasItemMaterial::set_light_mode(LightMode p_light_mode) {
+
+	light_mode = p_light_mode;
+	_queue_shader_change();
+}
+
+CanvasItemMaterial::LightMode CanvasItemMaterial::get_light_mode() const {
+
+	return light_mode;
+}
+
+void CanvasItemMaterial::set_particles_animation(bool p_particles_anim) {
+	particles_animation = p_particles_anim;
+	_queue_shader_change();
+	_change_notify();
+}
+
+bool CanvasItemMaterial::get_particles_animation() const {
+	return particles_animation;
+}
+
+void CanvasItemMaterial::set_particles_anim_h_frames(int p_frames) {
+
+	particles_anim_h_frames = p_frames;
+	VS::get_singleton()->material_set_param(_get_material(), shader_names->particles_anim_h_frames, p_frames);
+}
+
+int CanvasItemMaterial::get_particles_anim_h_frames() const {
+
+	return particles_anim_h_frames;
+}
+void CanvasItemMaterial::set_particles_anim_v_frames(int p_frames) {
+
+	particles_anim_v_frames = p_frames;
+	VS::get_singleton()->material_set_param(_get_material(), shader_names->particles_anim_v_frames, p_frames);
+}
+
+int CanvasItemMaterial::get_particles_anim_v_frames() const {
+
+	return particles_anim_v_frames;
+}
+
+void CanvasItemMaterial::set_particles_anim_loop(bool p_loop) {
+
+	particles_anim_loop = p_loop;
+	VS::get_singleton()->material_set_param(_get_material(), shader_names->particles_anim_loop, particles_anim_loop);
+}
+
+bool CanvasItemMaterial::get_particles_anim_loop() const {
+
+	return particles_anim_loop;
+}
+
+void CanvasItemMaterial::_validate_property(PropertyInfo &property) const {
+	if (property.name.begins_with("particles_anim_") && !particles_animation) {
+		property.usage = 0;
+	}
+}
+
+RID CanvasItemMaterial::get_shader_rid() const {
+
+	ERR_FAIL_COND_V(!shader_map.has(current_key), RID());
+	return shader_map[current_key].shader;
+}
+
+Shader::Mode CanvasItemMaterial::get_shader_mode() const {
+
+	return Shader::MODE_CANVAS_ITEM;
+}
+
+void CanvasItemMaterial::_bind_methods() {
+
+	ClassDB::bind_method(D_METHOD("set_blend_mode", "blend_mode"), &CanvasItemMaterial::set_blend_mode);
+	ClassDB::bind_method(D_METHOD("get_blend_mode"), &CanvasItemMaterial::get_blend_mode);
+
+	ClassDB::bind_method(D_METHOD("set_light_mode", "light_mode"), &CanvasItemMaterial::set_light_mode);
+	ClassDB::bind_method(D_METHOD("get_light_mode"), &CanvasItemMaterial::get_light_mode);
+
+	ClassDB::bind_method(D_METHOD("set_particles_animation", "particles_anim"), &CanvasItemMaterial::set_particles_animation);
+	ClassDB::bind_method(D_METHOD("get_particles_animation"), &CanvasItemMaterial::get_particles_animation);
+
+	ClassDB::bind_method(D_METHOD("set_particles_anim_h_frames", "frames"), &CanvasItemMaterial::set_particles_anim_h_frames);
+	ClassDB::bind_method(D_METHOD("get_particles_anim_h_frames"), &CanvasItemMaterial::get_particles_anim_h_frames);
+
+	ClassDB::bind_method(D_METHOD("set_particles_anim_v_frames", "frames"), &CanvasItemMaterial::set_particles_anim_v_frames);
+	ClassDB::bind_method(D_METHOD("get_particles_anim_v_frames"), &CanvasItemMaterial::get_particles_anim_v_frames);
+
+	ClassDB::bind_method(D_METHOD("set_particles_anim_loop", "loop"), &CanvasItemMaterial::set_particles_anim_loop);
+	ClassDB::bind_method(D_METHOD("get_particles_anim_loop"), &CanvasItemMaterial::get_particles_anim_loop);
+
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "blend_mode", PROPERTY_HINT_ENUM, "Mix,Add,Sub,Mul,Premult Alpha"), "set_blend_mode", "get_blend_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "light_mode", PROPERTY_HINT_ENUM, "Normal,Unshaded,Light Only"), "set_light_mode", "get_light_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "particles_animation"), "set_particles_animation", "get_particles_animation");
+
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "particles_anim_h_frames", PROPERTY_HINT_RANGE, "1,128,1"), "set_particles_anim_h_frames", "get_particles_anim_h_frames");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "particles_anim_v_frames", PROPERTY_HINT_RANGE, "1,128,1"), "set_particles_anim_v_frames", "get_particles_anim_v_frames");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "particles_anim_loop"), "set_particles_anim_loop", "get_particles_anim_loop");
+
+	BIND_ENUM_CONSTANT(BLEND_MODE_MIX);
+	BIND_ENUM_CONSTANT(BLEND_MODE_ADD);
+	BIND_ENUM_CONSTANT(BLEND_MODE_SUB);
+	BIND_ENUM_CONSTANT(BLEND_MODE_MUL);
+	BIND_ENUM_CONSTANT(BLEND_MODE_PREMULT_ALPHA);
+
+	BIND_ENUM_CONSTANT(LIGHT_MODE_NORMAL);
+	BIND_ENUM_CONSTANT(LIGHT_MODE_UNSHADED);
+	BIND_ENUM_CONSTANT(LIGHT_MODE_LIGHT_ONLY);
+}
+
+CanvasItemMaterial::CanvasItemMaterial() :
+		element(this) {
+
+	blend_mode = BLEND_MODE_MIX;
+	light_mode = LIGHT_MODE_NORMAL;
+	particles_animation = false;
+
+	set_particles_anim_h_frames(1);
+	set_particles_anim_v_frames(1);
+	set_particles_anim_loop(false);
+
+	current_key.key = 0;
+	current_key.invalid_key = 1;
+	_queue_shader_change();
+}
+
+CanvasItemMaterial::~CanvasItemMaterial() {
+
+	MutexLock lock(material_mutex);
+
+	if (shader_map.has(current_key)) {
+		shader_map[current_key].users--;
+		if (shader_map[current_key].users == 0) {
+			//deallocate shader, as it's no longer in use
+			VS::get_singleton()->free(shader_map[current_key].shader);
+			shader_map.erase(current_key);
+		}
+
+		VS::get_singleton()->material_set_shader(_get_material(), RID());
+	}
+}
+
+///////////////////////////////////////////////////////////////////
+#ifdef TOOLS_ENABLED
+bool CanvasItem::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
+	if (_edit_use_rect()) {
+		return _edit_get_rect().has_point(p_point);
+	} else {
+		return p_point.length() < p_tolerance;
+	}
+}
+
+Transform2D CanvasItem::_edit_get_transform() const {
+	return Transform2D(_edit_get_rotation(), _edit_get_position() + _edit_get_pivot());
+}
+#endif
+
+bool CanvasItem::is_visible_in_tree() const {
+
+	if (!is_inside_tree())
+		return false;
+
+	const CanvasItem *p = this;
+
+	while (p) {
+		if (!p->visible)
+			return false;
+		if (p->window && !p->window->is_visible()) {
+			return false;
+		}
+		p = p->get_parent_item();
+	}
+
+	return true;
+}
+
+void CanvasItem::_propagate_visibility_changed(bool p_visible) {
+
+	if (p_visible && first_draw) { //avoid propagating it twice
+		first_draw = false;
+	}
+	notification(NOTIFICATION_VISIBILITY_CHANGED);
+
+	if (p_visible)
+		update(); //todo optimize
+	else
+		emit_signal(SceneStringNames::get_singleton()->hide);
+	_block();
+
+	for (int i = 0; i < get_child_count(); i++) {
+
+		CanvasItem *c = Object::cast_to<CanvasItem>(get_child(i));
+
+		if (c && c->visible) //should the toplevels stop propagation? i think so but..
+			c->_propagate_visibility_changed(p_visible);
+	}
+
+	_unblock();
+}
+
+void CanvasItem::show() {
+
+	if (visible)
+		return;
+
+	visible = true;
+	VisualServer::get_singleton()->canvas_item_set_visible(canvas_item, true);
+
+	if (!is_inside_tree())
+		return;
+
+	_propagate_visibility_changed(true);
+	_change_notify("visible");
+}
+
+void CanvasItem::hide() {
+
+	if (!visible)
+		return;
+
+	visible = false;
+	VisualServer::get_singleton()->canvas_item_set_visible(canvas_item, false);
+
+	if (!is_inside_tree())
+		return;
+
+	_propagate_visibility_changed(false);
+	_change_notify("visible");
+}
+
+CanvasItem *CanvasItem::current_item_drawn = NULL;
+CanvasItem *CanvasItem::get_current_item_drawn() {
+	return current_item_drawn;
+}
+
+void CanvasItem::_update_callback() {
+
+	if (!is_inside_tree()) {
+		pending_update = false;
+		return;
+	}
+
+	VisualServer::get_singleton()->canvas_item_clear(get_canvas_item());
+	//todo updating = true - only allow drawing here
+	if (is_visible_in_tree()) { //todo optimize this!!
+		if (first_draw) {
+			notification(NOTIFICATION_VISIBILITY_CHANGED);
+			first_draw = false;
+		}
+		drawing = true;
+		current_item_drawn = this;
+		notification(NOTIFICATION_DRAW);
+		emit_signal(SceneStringNames::get_singleton()->draw);
+		if (get_script_instance()) {
+			get_script_instance()->call_multilevel_reversed(SceneStringNames::get_singleton()->_draw, NULL, 0);
+		}
+		current_item_drawn = NULL;
+		drawing = false;
+	}
+	//todo updating = false
+	pending_update = false; // don't change to false until finished drawing (avoid recursive update)
+}
+
+Transform2D CanvasItem::get_global_transform_with_canvas() const {
+
+	if (canvas_layer)
+		return canvas_layer->get_transform() * get_global_transform();
+	else if (is_inside_tree())
+		return get_viewport()->get_canvas_transform() * get_global_transform();
+	else
+		return get_global_transform();
+}
+
+Transform2D CanvasItem::get_screen_transform() const {
+	ERR_FAIL_COND_V(!is_inside_tree(), Transform2D());
+	Transform2D xform = get_global_transform_with_canvas();
+
+	Window *w = Object::cast_to<Window>(get_viewport());
+	if (w && !w->is_embedding_subwindows()) {
+		Transform2D s;
+		s.set_origin(w->get_position());
+
+		xform = s * xform;
+	}
+
+	return xform;
+}
+
+Transform2D CanvasItem::get_global_transform() const {
+#ifdef DEBUG_ENABLED
+	ERR_FAIL_COND_V(!is_inside_tree(), get_transform());
+#endif
+	if (global_invalid) {
+
+		const CanvasItem *pi = get_parent_item();
+		if (pi)
+			global_transform = pi->get_global_transform() * get_transform();
+		else
+			global_transform = get_transform();
+
+		global_invalid = false;
+	}
+
+	return global_transform;
+}
+
+void CanvasItem::_toplevel_raise_self() {
+
+	if (!is_inside_tree())
+		return;
+
+	if (canvas_layer)
+		VisualServer::get_singleton()->canvas_item_set_draw_index(canvas_item, canvas_layer->get_sort_index());
+	else
+		VisualServer::get_singleton()->canvas_item_set_draw_index(canvas_item, get_viewport()->gui_get_canvas_sort_index());
+}
+
+void CanvasItem::_enter_canvas() {
+
+	if ((!Object::cast_to<CanvasItem>(get_parent())) || toplevel) {
+
+		Node *n = this;
+
+		canvas_layer = NULL;
+
+		while (n) {
+
+			canvas_layer = Object::cast_to<CanvasLayer>(n);
+			if (canvas_layer) {
+				break;
+			}
+			if (Object::cast_to<Viewport>(n)) {
+				break;
+			}
+			n = n->get_parent();
+		}
+
+		RID canvas;
+		if (canvas_layer)
+			canvas = canvas_layer->get_canvas();
+		else
+			canvas = get_viewport()->find_world_2d()->get_canvas();
+
+		VisualServer::get_singleton()->canvas_item_set_parent(canvas_item, canvas);
+
+		group = "root_canvas" + itos(canvas.get_id());
+
+		add_to_group(group);
+		if (canvas_layer)
+			canvas_layer->reset_sort_index();
+		else
+			get_viewport()->gui_reset_canvas_sort_index();
+
+		get_tree()->call_group_flags(SceneTree::GROUP_CALL_UNIQUE, group, "_toplevel_raise_self");
+
+	} else {
+
+		CanvasItem *parent = get_parent_item();
+		canvas_layer = parent->canvas_layer;
+		VisualServer::get_singleton()->canvas_item_set_parent(canvas_item, parent->get_canvas_item());
+		VisualServer::get_singleton()->canvas_item_set_draw_index(canvas_item, get_index());
+	}
+
+	pending_update = false;
+	update();
+
+	notification(NOTIFICATION_ENTER_CANVAS);
+}
+
+void CanvasItem::_exit_canvas() {
+
+	notification(NOTIFICATION_EXIT_CANVAS, true); //reverse the notification
+	VisualServer::get_singleton()->canvas_item_set_parent(canvas_item, RID());
+	canvas_layer = NULL;
+	group = "";
+}
+
+void CanvasItem::_notification(int p_what) {
+
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE: {
+
+			_update_texture_filter_changed(false);
+			_update_texture_repeat_changed(false);
+
+			first_draw = true;
+			Node *parent = get_parent();
+			if (parent) {
+				CanvasItem *ci = Object::cast_to<CanvasItem>(parent);
+				if (ci)
+					C = ci->children_items.push_back(this);
+				if (!ci) {
+					//look for a window
+					Viewport *viewport = nullptr;
+
+					while (parent) {
+						viewport = Object::cast_to<Viewport>(parent);
+						if (viewport) {
+							break;
+						}
+						parent = parent->get_parent();
+					}
+
+					ERR_FAIL_COND(!viewport);
+
+					window = Object::cast_to<Window>(viewport);
+					if (window) {
+						window->connect(SceneStringNames::get_singleton()->visibility_changed, callable_mp(this, &CanvasItem::_window_visibility_changed));
+					}
+				}
+			}
+			_enter_canvas();
+			if (!block_transform_notify && !xform_change.in_list()) {
+				get_tree()->xform_change_list.add(&xform_change);
+			}
+		} break;
+		case NOTIFICATION_MOVED_IN_PARENT: {
+
+			if (!is_inside_tree())
+				break;
+
+			if (group != "") {
+				get_tree()->call_group_flags(SceneTree::GROUP_CALL_UNIQUE, group, "_toplevel_raise_self");
+			} else {
+				CanvasItem *p = get_parent_item();
+				ERR_FAIL_COND(!p);
+				VisualServer::get_singleton()->canvas_item_set_draw_index(canvas_item, get_index());
+			}
+
+		} break;
+		case NOTIFICATION_EXIT_TREE: {
+			if (xform_change.in_list())
+				get_tree()->xform_change_list.remove(&xform_change);
+			_exit_canvas();
+			if (C) {
+				Object::cast_to<CanvasItem>(get_parent())->children_items.erase(C);
+				C = NULL;
+			}
+			if (window) {
+				window->disconnect(SceneStringNames::get_singleton()->visibility_changed, callable_mp(this, &CanvasItem::_window_visibility_changed));
+			}
+			global_invalid = true;
+		} break;
+		case NOTIFICATION_DRAW:
+		case NOTIFICATION_TRANSFORM_CHANGED: {
+
+		} break;
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+
+			emit_signal(SceneStringNames::get_singleton()->visibility_changed);
+		} break;
+	}
+}
+
+void CanvasItem::set_visible(bool p_visible) {
+
+	if (p_visible)
+		show();
+	else
+		hide();
+}
+
+void CanvasItem::_window_visibility_changed() {
+
+	if (visible) {
+		_propagate_visibility_changed(window->is_visible());
+	}
+}
+
+bool CanvasItem::is_visible() const {
+
+	return visible;
+}
+
+void CanvasItem::update() {
+
+	if (!is_inside_tree())
+		return;
+	if (pending_update)
+		return;
+
+	pending_update = true;
+
+	MessageQueue::get_singleton()->push_call(this, "_update_callback");
+}
+
+void CanvasItem::set_modulate(const Color &p_modulate) {
+
+	if (modulate == p_modulate)
+		return;
+
+	modulate = p_modulate;
+	VisualServer::get_singleton()->canvas_item_set_modulate(canvas_item, modulate);
+}
+Color CanvasItem::get_modulate() const {
+
+	return modulate;
+}
+
+void CanvasItem::set_as_toplevel(bool p_toplevel) {
+
+	if (toplevel == p_toplevel)
+		return;
+
+	if (!is_inside_tree()) {
+		toplevel = p_toplevel;
+		return;
+	}
+
+	_exit_canvas();
+	toplevel = p_toplevel;
+	_enter_canvas();
+}
+
+bool CanvasItem::is_set_as_toplevel() const {
+
+	return toplevel;
+}
+
+CanvasItem *CanvasItem::get_parent_item() const {
+
+	if (toplevel)
+		return NULL;
+
+	return Object::cast_to<CanvasItem>(get_parent());
+}
+
+void CanvasItem::set_self_modulate(const Color &p_self_modulate) {
+
+	if (self_modulate == p_self_modulate)
+		return;
+
+	self_modulate = p_self_modulate;
+	VisualServer::get_singleton()->canvas_item_set_self_modulate(canvas_item, self_modulate);
+}
+Color CanvasItem::get_self_modulate() const {
+
+	return self_modulate;
+}
+
+void CanvasItem::set_light_mask(int p_light_mask) {
+
+	if (light_mask == p_light_mask)
+		return;
+
+	light_mask = p_light_mask;
+	VS::get_singleton()->canvas_item_set_light_mask(canvas_item, p_light_mask);
+}
+
+int CanvasItem::get_light_mask() const {
+
+	return light_mask;
+}
+
+void CanvasItem::item_rect_changed(bool p_size_changed) {
+
+	if (p_size_changed)
+		update();
+	emit_signal(SceneStringNames::get_singleton()->item_rect_changed);
+}
+
+void CanvasItem::draw_line(const Point2 &p_from, const Point2 &p_to, const Color &p_color, float p_width) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	VisualServer::get_singleton()->canvas_item_add_line(canvas_item, p_from, p_to, p_color, p_width);
+}
+
+void CanvasItem::draw_polyline(const Vector<Point2> &p_points, const Color &p_color, float p_width) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	Vector<Color> colors;
+	colors.push_back(p_color);
+	VisualServer::get_singleton()->canvas_item_add_polyline(canvas_item, p_points, colors, p_width);
+}
+
+void CanvasItem::draw_polyline_colors(const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	VisualServer::get_singleton()->canvas_item_add_polyline(canvas_item, p_points, p_colors, p_width);
+}
+
+void CanvasItem::draw_arc(const Vector2 &p_center, float p_radius, float p_start_angle, float p_end_angle, int p_point_count, const Color &p_color, float p_width) {
+
+	Vector<Point2> points;
+	points.resize(p_point_count);
+	const float delta_angle = p_end_angle - p_start_angle;
+	for (int i = 0; i < p_point_count; i++) {
+		float theta = (i / (p_point_count - 1.0f)) * delta_angle + p_start_angle;
+		points.set(i, p_center + Vector2(Math::cos(theta), Math::sin(theta)) * p_radius);
+	}
+
+	draw_polyline(points, p_color, p_width);
+}
+
+void CanvasItem::draw_multiline(const Vector<Point2> &p_points, const Color &p_color, float p_width) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	Vector<Color> colors;
+	colors.push_back(p_color);
+	VisualServer::get_singleton()->canvas_item_add_multiline(canvas_item, p_points, colors, p_width);
+}
+
+void CanvasItem::draw_multiline_colors(const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	VisualServer::get_singleton()->canvas_item_add_multiline(canvas_item, p_points, p_colors, p_width);
+}
+
+void CanvasItem::draw_rect(const Rect2 &p_rect, const Color &p_color, bool p_filled, float p_width) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	if (p_filled) {
+		if (p_width != 1.0) {
+			WARN_PRINT("The draw_rect() \"width\" argument has no effect when \"filled\" is \"true\".");
+		}
+
+		VisualServer::get_singleton()->canvas_item_add_rect(canvas_item, p_rect, p_color);
+	} else {
+		// Thick lines are offset depending on their width to avoid partial overlapping.
+		// Thin lines don't require an offset, so don't apply one in this case
+		float offset;
+		if (p_width >= 2) {
+			offset = p_width / 2.0;
+		} else {
+			offset = 0.0;
+		}
+
+		VisualServer::get_singleton()->canvas_item_add_line(
+				canvas_item,
+				p_rect.position + Size2(-offset, 0),
+				p_rect.position + Size2(p_rect.size.width + offset, 0),
+				p_color,
+				p_width);
+		VisualServer::get_singleton()->canvas_item_add_line(
+				canvas_item,
+				p_rect.position + Size2(p_rect.size.width, offset),
+				p_rect.position + Size2(p_rect.size.width, p_rect.size.height - offset),
+				p_color,
+				p_width);
+		VisualServer::get_singleton()->canvas_item_add_line(
+				canvas_item,
+				p_rect.position + Size2(p_rect.size.width + offset, p_rect.size.height),
+				p_rect.position + Size2(-offset, p_rect.size.height),
+				p_color,
+				p_width);
+		VisualServer::get_singleton()->canvas_item_add_line(
+				canvas_item,
+				p_rect.position + Size2(0, p_rect.size.height - offset),
+				p_rect.position + Size2(0, offset),
+				p_color,
+				p_width);
+	}
+}
+
+void CanvasItem::draw_circle(const Point2 &p_pos, float p_radius, const Color &p_color) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	VisualServer::get_singleton()->canvas_item_add_circle(canvas_item, p_pos, p_radius, p_color);
+}
+
+void CanvasItem::draw_texture(const Ref<Texture2D> &p_texture, const Point2 &p_pos, const Color &p_modulate, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	ERR_FAIL_COND(p_texture.is_null());
+
+	p_texture->draw(canvas_item, p_pos, p_modulate, false, p_normal_map, p_specular_map, p_specular_color_shininess, VS::CanvasItemTextureFilter(p_texture_filter), VS::CanvasItemTextureRepeat(p_texture_repeat));
+}
+
+void CanvasItem::draw_texture_rect(const Ref<Texture2D> &p_texture, const Rect2 &p_rect, bool p_tile, const Color &p_modulate, bool p_transpose, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	ERR_FAIL_COND(p_texture.is_null());
+	p_texture->draw_rect(canvas_item, p_rect, p_tile, p_modulate, p_transpose, p_normal_map, p_specular_map, p_specular_color_shininess, VS::CanvasItemTextureFilter(p_texture_filter), VS::CanvasItemTextureRepeat(p_texture_repeat));
+}
+void CanvasItem::draw_texture_rect_region(const Ref<Texture2D> &p_texture, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate, bool p_transpose, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, bool p_clip_uv, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+	ERR_FAIL_COND(p_texture.is_null());
+	p_texture->draw_rect_region(canvas_item, p_rect, p_src_rect, p_modulate, p_transpose, p_normal_map, p_specular_map, p_specular_color_shininess, VS::CanvasItemTextureFilter(p_texture_filter), VS::CanvasItemTextureRepeat(p_texture_repeat), p_clip_uv);
+}
+
+void CanvasItem::draw_style_box(const Ref<StyleBox> &p_style_box, const Rect2 &p_rect) {
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	ERR_FAIL_COND(p_style_box.is_null());
+
+	p_style_box->draw(canvas_item, p_rect);
+}
+void CanvasItem::draw_primitive(const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs, Ref<Texture2D> p_texture, float p_width, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	RID rid = p_texture.is_valid() ? p_texture->get_rid() : RID();
+	RID rid_normal = p_normal_map.is_valid() ? p_normal_map->get_rid() : RID();
+	RID rid_specular = p_specular_map.is_valid() ? p_specular_map->get_rid() : RID();
+
+	VisualServer::get_singleton()->canvas_item_add_primitive(canvas_item, p_points, p_colors, p_uvs, rid, p_width, rid_normal, rid_specular, p_specular_color_shininess, VS::CanvasItemTextureFilter(p_texture_filter), VS::CanvasItemTextureRepeat(p_texture_repeat));
+}
+void CanvasItem::draw_set_transform(const Point2 &p_offset, float p_rot, const Size2 &p_scale) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	Transform2D xform(p_rot, p_offset);
+	xform.scale_basis(p_scale);
+	VisualServer::get_singleton()->canvas_item_add_set_transform(canvas_item, xform);
+}
+
+void CanvasItem::draw_set_transform_matrix(const Transform2D &p_matrix) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	VisualServer::get_singleton()->canvas_item_add_set_transform(canvas_item, p_matrix);
+}
+
+void CanvasItem::draw_polygon(const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs, Ref<Texture2D> p_texture, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	RID rid = p_texture.is_valid() ? p_texture->get_rid() : RID();
+	RID rid_normal = p_normal_map.is_valid() ? p_normal_map->get_rid() : RID();
+	RID rid_specular = p_specular_map.is_valid() ? p_specular_map->get_rid() : RID();
+
+	VisualServer::get_singleton()->canvas_item_add_polygon(canvas_item, p_points, p_colors, p_uvs, rid, rid_normal, rid_specular, p_specular_color_shininess, VS::CanvasItemTextureFilter(p_texture_filter), VS::CanvasItemTextureRepeat(p_texture_repeat));
+}
+
+void CanvasItem::draw_colored_polygon(const Vector<Point2> &p_points, const Color &p_color, const Vector<Point2> &p_uvs, Ref<Texture2D> p_texture, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	Vector<Color> colors;
+	colors.push_back(p_color);
+	RID rid = p_texture.is_valid() ? p_texture->get_rid() : RID();
+	RID rid_normal = p_normal_map.is_valid() ? p_normal_map->get_rid() : RID();
+	RID rid_specular = p_specular_map.is_valid() ? p_specular_map->get_rid() : RID();
+
+	VisualServer::get_singleton()->canvas_item_add_polygon(canvas_item, p_points, colors, p_uvs, rid, rid_normal, rid_specular, p_specular_color_shininess, VS::CanvasItemTextureFilter(p_texture_filter), VS::CanvasItemTextureRepeat(p_texture_repeat));
+}
+
+void CanvasItem::draw_mesh(const Ref<Mesh> &p_mesh, const Ref<Texture2D> &p_texture, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, const Transform2D &p_transform, const Color &p_modulate, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
+
+	ERR_FAIL_COND(p_mesh.is_null());
+	RID texture_rid = p_texture.is_valid() ? p_texture->get_rid() : RID();
+	RID normal_map_rid = p_normal_map.is_valid() ? p_normal_map->get_rid() : RID();
+	RID specular_map_rid = p_specular_map.is_valid() ? p_specular_map->get_rid() : RID();
+
+	VisualServer::get_singleton()->canvas_item_add_mesh(canvas_item, p_mesh->get_rid(), p_transform, p_modulate, texture_rid, normal_map_rid, specular_map_rid, p_specular_color_shininess, VS::CanvasItemTextureFilter(p_texture_filter), VS::CanvasItemTextureRepeat(p_texture_repeat));
+}
+void CanvasItem::draw_multimesh(const Ref<MultiMesh> &p_multimesh, const Ref<Texture2D> &p_texture, const Ref<Texture2D> &p_normal_map, const Ref<Texture2D> &p_specular_map, const Color &p_specular_color_shininess, TextureFilter p_texture_filter, TextureRepeat p_texture_repeat) {
+
+	ERR_FAIL_COND(p_multimesh.is_null());
+	RID texture_rid = p_texture.is_valid() ? p_texture->get_rid() : RID();
+	RID normal_map_rid = p_normal_map.is_valid() ? p_normal_map->get_rid() : RID();
+	RID specular_map_rid = p_specular_map.is_valid() ? p_specular_map->get_rid() : RID();
+
+	VisualServer::get_singleton()->canvas_item_add_multimesh(canvas_item, p_multimesh->get_rid(), texture_rid, normal_map_rid, specular_map_rid, p_specular_color_shininess, VS::CanvasItemTextureFilter(p_texture_filter), VS::CanvasItemTextureRepeat(p_texture_repeat));
+}
+
+void CanvasItem::draw_string(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, const Color &p_modulate, int p_clip_w) {
+
+	ERR_FAIL_COND_MSG(!drawing, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	ERR_FAIL_COND(p_font.is_null());
+	p_font->draw(canvas_item, p_pos, p_text, p_modulate, p_clip_w);
+}
+
+float CanvasItem::draw_char(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_char, const String &p_next, const Color &p_modulate) {
+
+	ERR_FAIL_COND_V_MSG(!drawing, 0, "Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+
+	ERR_FAIL_COND_V(p_char.length() != 1, 0);
+	ERR_FAIL_COND_V(p_font.is_null(), 0);
+
+	if (p_font->has_outline()) {
+		p_font->draw_char(canvas_item, p_pos, p_char[0], p_next.c_str()[0], Color(1, 1, 1), true);
+	}
+	return p_font->draw_char(canvas_item, p_pos, p_char[0], p_next.c_str()[0], p_modulate);
+}
+
+void CanvasItem::_notify_transform(CanvasItem *p_node) {
+
+	/* This check exists to avoid re-propagating the transform
+	 * notification down the tree on dirty nodes. It provides
+	 * optimization by avoiding redundancy (nodes are dirty, will get the
+	 * notification anyway).
+	 */
+
+	if (/*p_node->xform_change.in_list() &&*/ p_node->global_invalid) {
+		return; //nothing to do
+	}
+
+	p_node->global_invalid = true;
+
+	if (p_node->notify_transform && !p_node->xform_change.in_list()) {
+		if (!p_node->block_transform_notify) {
+			if (p_node->is_inside_tree())
+				get_tree()->xform_change_list.add(&p_node->xform_change);
+		}
+	}
+
+	for (List<CanvasItem *>::Element *E = p_node->children_items.front(); E; E = E->next()) {
+
+		CanvasItem *ci = E->get();
+		if (ci->toplevel)
+			continue;
+		_notify_transform(ci);
+	}
+}
+
+Rect2 CanvasItem::get_viewport_rect() const {
+
+	ERR_FAIL_COND_V(!is_inside_tree(), Rect2());
+	return get_viewport()->get_visible_rect();
+}
+
+RID CanvasItem::get_canvas() const {
+
+	ERR_FAIL_COND_V(!is_inside_tree(), RID());
+
+	if (canvas_layer)
+		return canvas_layer->get_canvas();
+	else
+		return get_viewport()->find_world_2d()->get_canvas();
+}
+
+ObjectID CanvasItem::get_canvas_layer_instance_id() const {
+
+	if (canvas_layer) {
+		return canvas_layer->get_instance_id();
+	} else {
+		return ObjectID();
+	}
+}
+
+CanvasItem *CanvasItem::get_toplevel() const {
+
+	CanvasItem *ci = const_cast<CanvasItem *>(this);
+	while (!ci->toplevel && Object::cast_to<CanvasItem>(ci->get_parent())) {
+		ci = Object::cast_to<CanvasItem>(ci->get_parent());
+	}
+
+	return ci;
+}
+
+Ref<World2D> CanvasItem::get_world_2d() const {
+
+	ERR_FAIL_COND_V(!is_inside_tree(), Ref<World2D>());
+
+	CanvasItem *tl = get_toplevel();
+
+	if (tl->get_viewport()) {
+		return tl->get_viewport()->find_world_2d();
+	} else {
+		return Ref<World2D>();
+	}
+}
+
+RID CanvasItem::get_viewport_rid() const {
+
+	ERR_FAIL_COND_V(!is_inside_tree(), RID());
+	return get_viewport()->get_viewport_rid();
+}
+
+void CanvasItem::set_block_transform_notify(bool p_enable) {
+	block_transform_notify = p_enable;
+}
+
+bool CanvasItem::is_block_transform_notify_enabled() const {
+
+	return block_transform_notify;
+}
+
+void CanvasItem::set_draw_behind_parent(bool p_enable) {
+
+	if (behind == p_enable)
+		return;
+	behind = p_enable;
+	VisualServer::get_singleton()->canvas_item_set_draw_behind_parent(canvas_item, behind);
+}
+
+bool CanvasItem::is_draw_behind_parent_enabled() const {
+
+	return behind;
+}
+
+void CanvasItem::set_material(const Ref<Material> &p_material) {
+
+	material = p_material;
+	RID rid;
+	if (material.is_valid())
+		rid = material->get_rid();
+	VS::get_singleton()->canvas_item_set_material(canvas_item, rid);
+	_change_notify(); //properties for material exposed
+}
+
+void CanvasItem::set_use_parent_material(bool p_use_parent_material) {
+
+	use_parent_material = p_use_parent_material;
+	VS::get_singleton()->canvas_item_set_use_parent_material(canvas_item, p_use_parent_material);
+}
+
+bool CanvasItem::get_use_parent_material() const {
+
+	return use_parent_material;
+}
+
+Ref<Material> CanvasItem::get_material() const {
+
+	return material;
+}
+
+Vector2 CanvasItem::make_canvas_position_local(const Vector2 &screen_point) const {
+
+	ERR_FAIL_COND_V(!is_inside_tree(), screen_point);
+
+	Transform2D local_matrix = (get_canvas_transform() * get_global_transform()).affine_inverse();
+
+	return local_matrix.xform(screen_point);
+}
+
+Ref<InputEvent> CanvasItem::make_input_local(const Ref<InputEvent> &p_event) const {
+
+	ERR_FAIL_COND_V(p_event.is_null(), p_event);
+	ERR_FAIL_COND_V(!is_inside_tree(), p_event);
+
+	return p_event->xformed_by((get_canvas_transform() * get_global_transform()).affine_inverse());
+}
+
+Vector2 CanvasItem::get_global_mouse_position() const {
+
+	ERR_FAIL_COND_V(!get_viewport(), Vector2());
+	return get_canvas_transform().affine_inverse().xform(get_viewport()->get_mouse_position());
+}
+
+Vector2 CanvasItem::get_local_mouse_position() const {
+
+	ERR_FAIL_COND_V(!get_viewport(), Vector2());
+
+	return get_global_transform().affine_inverse().xform(get_global_mouse_position());
+}
+
+void CanvasItem::force_update_transform() {
+	ERR_FAIL_COND(!is_inside_tree());
+	if (!xform_change.in_list()) {
+		return;
+	}
+
+	get_tree()->xform_change_list.remove(&xform_change);
+
+	notification(NOTIFICATION_TRANSFORM_CHANGED);
+}
+
+void CanvasItem::_bind_methods() {
+
+	ClassDB::bind_method(D_METHOD("_toplevel_raise_self"), &CanvasItem::_toplevel_raise_self);
+	ClassDB::bind_method(D_METHOD("_update_callback"), &CanvasItem::_update_callback);
+
+#ifdef TOOLS_ENABLED
+	ClassDB::bind_method(D_METHOD("_edit_set_state", "state"), &CanvasItem::_edit_set_state);
+	ClassDB::bind_method(D_METHOD("_edit_get_state"), &CanvasItem::_edit_get_state);
+	ClassDB::bind_method(D_METHOD("_edit_set_position", "position"), &CanvasItem::_edit_set_position);
+	ClassDB::bind_method(D_METHOD("_edit_get_position"), &CanvasItem::_edit_get_position);
+	ClassDB::bind_method(D_METHOD("_edit_set_scale", "scale"), &CanvasItem::_edit_set_scale);
+	ClassDB::bind_method(D_METHOD("_edit_get_scale"), &CanvasItem::_edit_get_scale);
+	ClassDB::bind_method(D_METHOD("_edit_set_rect", "rect"), &CanvasItem::_edit_set_rect);
+	ClassDB::bind_method(D_METHOD("_edit_get_rect"), &CanvasItem::_edit_get_rect);
+	ClassDB::bind_method(D_METHOD("_edit_use_rect"), &CanvasItem::_edit_use_rect);
+	ClassDB::bind_method(D_METHOD("_edit_set_rotation", "degrees"), &CanvasItem::_edit_set_rotation);
+	ClassDB::bind_method(D_METHOD("_edit_get_rotation"), &CanvasItem::_edit_get_rotation);
+	ClassDB::bind_method(D_METHOD("_edit_use_rotation"), &CanvasItem::_edit_use_rotation);
+	ClassDB::bind_method(D_METHOD("_edit_set_pivot", "pivot"), &CanvasItem::_edit_set_pivot);
+	ClassDB::bind_method(D_METHOD("_edit_get_pivot"), &CanvasItem::_edit_get_pivot);
+	ClassDB::bind_method(D_METHOD("_edit_use_pivot"), &CanvasItem::_edit_use_pivot);
+	ClassDB::bind_method(D_METHOD("_edit_get_transform"), &CanvasItem::_edit_get_transform);
+#endif
+
+	ClassDB::bind_method(D_METHOD("get_canvas_item"), &CanvasItem::get_canvas_item);
+
+	ClassDB::bind_method(D_METHOD("set_visible", "visible"), &CanvasItem::set_visible);
+	ClassDB::bind_method(D_METHOD("is_visible"), &CanvasItem::is_visible);
+	ClassDB::bind_method(D_METHOD("is_visible_in_tree"), &CanvasItem::is_visible_in_tree);
+	ClassDB::bind_method(D_METHOD("show"), &CanvasItem::show);
+	ClassDB::bind_method(D_METHOD("hide"), &CanvasItem::hide);
+
+	ClassDB::bind_method(D_METHOD("update"), &CanvasItem::update);
+
+	ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &CanvasItem::set_as_toplevel);
+	ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &CanvasItem::is_set_as_toplevel);
+
+	ClassDB::bind_method(D_METHOD("set_light_mask", "light_mask"), &CanvasItem::set_light_mask);
+	ClassDB::bind_method(D_METHOD("get_light_mask"), &CanvasItem::get_light_mask);
+
+	ClassDB::bind_method(D_METHOD("set_modulate", "modulate"), &CanvasItem::set_modulate);
+	ClassDB::bind_method(D_METHOD("get_modulate"), &CanvasItem::get_modulate);
+	ClassDB::bind_method(D_METHOD("set_self_modulate", "self_modulate"), &CanvasItem::set_self_modulate);
+	ClassDB::bind_method(D_METHOD("get_self_modulate"), &CanvasItem::get_self_modulate);
+
+	ClassDB::bind_method(D_METHOD("set_draw_behind_parent", "enable"), &CanvasItem::set_draw_behind_parent);
+	ClassDB::bind_method(D_METHOD("is_draw_behind_parent_enabled"), &CanvasItem::is_draw_behind_parent_enabled);
+
+	ClassDB::bind_method(D_METHOD("_set_on_top", "on_top"), &CanvasItem::_set_on_top);
+	ClassDB::bind_method(D_METHOD("_is_on_top"), &CanvasItem::_is_on_top);
+	//ClassDB::bind_method(D_METHOD("get_transform"),&CanvasItem::get_transform);
+
+	ClassDB::bind_method(D_METHOD("draw_line", "from", "to", "color", "width"), &CanvasItem::draw_line, DEFVAL(1.0));
+	ClassDB::bind_method(D_METHOD("draw_polyline", "points", "color", "width"), &CanvasItem::draw_polyline, DEFVAL(1.0));
+	ClassDB::bind_method(D_METHOD("draw_polyline_colors", "points", "colors", "width"), &CanvasItem::draw_polyline_colors, DEFVAL(1.0));
+	ClassDB::bind_method(D_METHOD("draw_arc", "center", "radius", "start_angle", "end_angle", "point_count", "color", "width"), &CanvasItem::draw_arc, DEFVAL(1.0));
+	ClassDB::bind_method(D_METHOD("draw_multiline", "points", "color", "width"), &CanvasItem::draw_multiline, DEFVAL(1.0));
+	ClassDB::bind_method(D_METHOD("draw_multiline_colors", "points", "colors", "width"), &CanvasItem::draw_multiline_colors, DEFVAL(1.0));
+	ClassDB::bind_method(D_METHOD("draw_rect", "rect", "color", "filled", "width"), &CanvasItem::draw_rect, DEFVAL(true), DEFVAL(1.0));
+	ClassDB::bind_method(D_METHOD("draw_circle", "position", "radius", "color"), &CanvasItem::draw_circle);
+	ClassDB::bind_method(D_METHOD("draw_texture", "texture", "position", "modulate", "normal_map", "specular_map", "specular_shininess", "texture_filter", "texture_repeat"), &CanvasItem::draw_texture, DEFVAL(Color(1, 1, 1, 1)), DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(TEXTURE_FILTER_PARENT_NODE), DEFVAL(TEXTURE_REPEAT_PARENT_NODE));
+	ClassDB::bind_method(D_METHOD("draw_texture_rect", "texture", "rect", "tile", "modulate", "transpose", "normal_map", "specular_map", "specular_shininess", "texture_filter", "texture_repeat"), &CanvasItem::draw_texture_rect, DEFVAL(Color(1, 1, 1, 1)), DEFVAL(false), DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(TEXTURE_FILTER_PARENT_NODE), DEFVAL(TEXTURE_REPEAT_PARENT_NODE));
+	ClassDB::bind_method(D_METHOD("draw_texture_rect_region", "texture", "rect", "src_rect", "modulate", "transpose", "normal_map", "specular_map", "specular_shininess", "clip_uv", "texture_filter", "texture_repeat"), &CanvasItem::draw_texture_rect_region, DEFVAL(Color(1, 1, 1, 1)), DEFVAL(false), DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(true), DEFVAL(TEXTURE_FILTER_PARENT_NODE), DEFVAL(TEXTURE_REPEAT_PARENT_NODE));
+	ClassDB::bind_method(D_METHOD("draw_style_box", "style_box", "rect"), &CanvasItem::draw_style_box);
+	ClassDB::bind_method(D_METHOD("draw_primitive", "points", "colors", "uvs", "texture", "width", "normal_map", "specular_map", "specular_shininess", "texture_filter", "texture_repeat"), &CanvasItem::draw_primitive, DEFVAL(Ref<Texture2D>()), DEFVAL(1.0), DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(TEXTURE_FILTER_PARENT_NODE), DEFVAL(TEXTURE_REPEAT_PARENT_NODE));
+	ClassDB::bind_method(D_METHOD("draw_polygon", "points", "colors", "uvs", "texture", "normal_map", "specular_map", "specular_shininess", "texture_filter", "texture_repeat"), &CanvasItem::draw_polygon, DEFVAL(PackedVector2Array()), DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(TEXTURE_FILTER_PARENT_NODE), DEFVAL(TEXTURE_REPEAT_PARENT_NODE));
+	ClassDB::bind_method(D_METHOD("draw_colored_polygon", "points", "color", "uvs", "texture", "normal_map", "specular_map", "specular_shininess", "texture_filter", "texture_repeat"), &CanvasItem::draw_colored_polygon, DEFVAL(PackedVector2Array()), DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(TEXTURE_FILTER_PARENT_NODE), DEFVAL(TEXTURE_REPEAT_PARENT_NODE));
+	ClassDB::bind_method(D_METHOD("draw_string", "font", "position", "text", "modulate", "clip_w"), &CanvasItem::draw_string, DEFVAL(Color(1, 1, 1, 1)), DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("draw_char", "font", "position", "char", "next", "modulate"), &CanvasItem::draw_char, DEFVAL(Color(1, 1, 1, 1)));
+	ClassDB::bind_method(D_METHOD("draw_mesh", "mesh", "texture", "normal_map", "specular_map", "specular_shininess", "transform", "modulate", "texture_filter", "texture_repeat"), &CanvasItem::draw_mesh, DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(Transform2D()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(TEXTURE_FILTER_PARENT_NODE), DEFVAL(TEXTURE_REPEAT_PARENT_NODE));
+	ClassDB::bind_method(D_METHOD("draw_multimesh", "multimesh", "texture", "normal_map", "specular_map", "specular_shininess", "texture_filter", "texture_repeat"), &CanvasItem::draw_multimesh, DEFVAL(Ref<Texture2D>()), DEFVAL(Ref<Texture2D>()), DEFVAL(Color(1, 1, 1, 1)), DEFVAL(TEXTURE_FILTER_PARENT_NODE), DEFVAL(TEXTURE_REPEAT_PARENT_NODE));
+
+	ClassDB::bind_method(D_METHOD("draw_set_transform", "position", "rotation", "scale"), &CanvasItem::draw_set_transform);
+	ClassDB::bind_method(D_METHOD("draw_set_transform_matrix", "xform"), &CanvasItem::draw_set_transform_matrix);
+	ClassDB::bind_method(D_METHOD("get_transform"), &CanvasItem::get_transform);
+	ClassDB::bind_method(D_METHOD("get_global_transform"), &CanvasItem::get_global_transform);
+	ClassDB::bind_method(D_METHOD("get_global_transform_with_canvas"), &CanvasItem::get_global_transform_with_canvas);
+	ClassDB::bind_method(D_METHOD("get_viewport_transform"), &CanvasItem::get_viewport_transform);
+	ClassDB::bind_method(D_METHOD("get_viewport_rect"), &CanvasItem::get_viewport_rect);
+	ClassDB::bind_method(D_METHOD("get_canvas_transform"), &CanvasItem::get_canvas_transform);
+	ClassDB::bind_method(D_METHOD("get_local_mouse_position"), &CanvasItem::get_local_mouse_position);
+	ClassDB::bind_method(D_METHOD("get_global_mouse_position"), &CanvasItem::get_global_mouse_position);
+	ClassDB::bind_method(D_METHOD("get_canvas"), &CanvasItem::get_canvas);
+	ClassDB::bind_method(D_METHOD("get_world_2d"), &CanvasItem::get_world_2d);
+	//ClassDB::bind_method(D_METHOD("get_viewport"),&CanvasItem::get_viewport);
+
+	ClassDB::bind_method(D_METHOD("set_material", "material"), &CanvasItem::set_material);
+	ClassDB::bind_method(D_METHOD("get_material"), &CanvasItem::get_material);
+
+	ClassDB::bind_method(D_METHOD("set_use_parent_material", "enable"), &CanvasItem::set_use_parent_material);
+	ClassDB::bind_method(D_METHOD("get_use_parent_material"), &CanvasItem::get_use_parent_material);
+
+	ClassDB::bind_method(D_METHOD("set_notify_local_transform", "enable"), &CanvasItem::set_notify_local_transform);
+	ClassDB::bind_method(D_METHOD("is_local_transform_notification_enabled"), &CanvasItem::is_local_transform_notification_enabled);
+
+	ClassDB::bind_method(D_METHOD("set_notify_transform", "enable"), &CanvasItem::set_notify_transform);
+	ClassDB::bind_method(D_METHOD("is_transform_notification_enabled"), &CanvasItem::is_transform_notification_enabled);
+
+	ClassDB::bind_method(D_METHOD("force_update_transform"), &CanvasItem::force_update_transform);
+
+	ClassDB::bind_method(D_METHOD("make_canvas_position_local", "screen_point"), &CanvasItem::make_canvas_position_local);
+	ClassDB::bind_method(D_METHOD("make_input_local", "event"), &CanvasItem::make_input_local);
+
+	ClassDB::bind_method(D_METHOD("set_texture_filter", "mode"), &CanvasItem::set_texture_filter);
+	ClassDB::bind_method(D_METHOD("get_texture_filter"), &CanvasItem::get_texture_filter);
+
+	ClassDB::bind_method(D_METHOD("set_texture_repeat", "mode"), &CanvasItem::set_texture_repeat);
+	ClassDB::bind_method(D_METHOD("get_texture_repeat"), &CanvasItem::get_texture_repeat);
+
+	BIND_VMETHOD(MethodInfo("_draw"));
+
+	ADD_GROUP("Visibility", "");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "visible"), "set_visible", "is_visible");
+	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "modulate"), "set_modulate", "get_modulate");
+	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "self_modulate"), "set_self_modulate", "get_self_modulate");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_behind_parent"), "set_draw_behind_parent", "is_draw_behind_parent_enabled");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_on_top", PROPERTY_HINT_NONE, "", 0), "_set_on_top", "_is_on_top"); //compatibility
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "light_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_light_mask", "get_light_mask");
+
+	ADD_GROUP("Texture", "texture_");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_filter", PROPERTY_HINT_ENUM, "ParentNode,Nearest,Linear,MipmapNearest,MipmapLinear,MipmapNearestAniso,MipmapLinearAniso"), "set_texture_filter", "get_texture_filter");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_repeat", PROPERTY_HINT_ENUM, "ParentNode,Disabled,Enabled,Mirror"), "set_texture_repeat", "get_texture_repeat");
+
+	ADD_GROUP("Material", "");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial,CanvasItemMaterial"), "set_material", "get_material");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_parent_material"), "set_use_parent_material", "get_use_parent_material");
+	//exporting these things doesn't really make much sense i think
+	// ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toplevel", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_as_toplevel", "is_set_as_toplevel");
+	// ADD_PROPERTY(PropertyInfo(Variant::BOOL,"transform/notify"),"set_transform_notify","is_transform_notify_enabled");
+
+	ADD_SIGNAL(MethodInfo("draw"));
+	ADD_SIGNAL(MethodInfo("visibility_changed"));
+	ADD_SIGNAL(MethodInfo("hide"));
+	ADD_SIGNAL(MethodInfo("item_rect_changed"));
+
+	BIND_CONSTANT(NOTIFICATION_TRANSFORM_CHANGED);
+	BIND_CONSTANT(NOTIFICATION_DRAW);
+	BIND_CONSTANT(NOTIFICATION_VISIBILITY_CHANGED);
+	BIND_CONSTANT(NOTIFICATION_ENTER_CANVAS);
+	BIND_CONSTANT(NOTIFICATION_EXIT_CANVAS);
+
+	BIND_ENUM_CONSTANT(TEXTURE_FILTER_PARENT_NODE);
+	BIND_ENUM_CONSTANT(TEXTURE_FILTER_NEAREST);
+	BIND_ENUM_CONSTANT(TEXTURE_FILTER_LINEAR);
+	BIND_ENUM_CONSTANT(TEXTURE_FILTER_NEAREST_WITH_MIPMAPS);
+	BIND_ENUM_CONSTANT(TEXTURE_FILTER_LINEAR_WITH_MIPMAPS);
+	BIND_ENUM_CONSTANT(TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC);
+	BIND_ENUM_CONSTANT(TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC);
+	BIND_ENUM_CONSTANT(TEXTURE_FILTER_MAX);
+
+	BIND_ENUM_CONSTANT(TEXTURE_REPEAT_PARENT_NODE);
+	BIND_ENUM_CONSTANT(TEXTURE_REPEAT_DISABLED);
+	BIND_ENUM_CONSTANT(TEXTURE_REPEAT_ENABLED);
+	BIND_ENUM_CONSTANT(TEXTURE_REPEAT_MIRROR);
+	BIND_ENUM_CONSTANT(TEXTURE_REPEAT_MAX);
+}
+
+Transform2D CanvasItem::get_canvas_transform() const {
+
+	ERR_FAIL_COND_V(!is_inside_tree(), Transform2D());
+
+	if (canvas_layer)
+		return canvas_layer->get_transform();
+	else if (Object::cast_to<CanvasItem>(get_parent()))
+		return Object::cast_to<CanvasItem>(get_parent())->get_canvas_transform();
+	else
+		return get_viewport()->get_canvas_transform();
+}
+
+Transform2D CanvasItem::get_viewport_transform() const {
+
+	ERR_FAIL_COND_V(!is_inside_tree(), Transform2D());
+
+	if (canvas_layer) {
+
+		if (get_viewport()) {
+			return get_viewport()->get_final_transform() * canvas_layer->get_transform();
+		} else {
+			return canvas_layer->get_transform();
+		}
+
+	} else {
+		return get_viewport()->get_final_transform() * get_viewport()->get_canvas_transform();
+	}
+}
+
+void CanvasItem::set_notify_local_transform(bool p_enable) {
+	notify_local_transform = p_enable;
+}
+
+bool CanvasItem::is_local_transform_notification_enabled() const {
+	return notify_local_transform;
+}
+
+void CanvasItem::set_notify_transform(bool p_enable) {
+	if (notify_transform == p_enable)
+		return;
+
+	notify_transform = p_enable;
+
+	if (notify_transform && is_inside_tree()) {
+		//this ensures that invalid globals get resolved, so notifications can be received
+		get_global_transform();
+	}
+}
+
+bool CanvasItem::is_transform_notification_enabled() const {
+	return notify_transform;
+}
+
+int CanvasItem::get_canvas_layer() const {
+
+	if (canvas_layer)
+		return canvas_layer->get_layer();
+	else
+		return 0;
+}
+
+void CanvasItem::_update_texture_filter_changed(bool p_propagate) {
+
+	if (!is_inside_tree()) {
+		return;
+	}
+
+	if (texture_filter == TEXTURE_FILTER_PARENT_NODE) {
+		CanvasItem *parent_item = get_parent_item();
+		if (parent_item) {
+			texture_filter_cache = parent_item->texture_filter_cache;
+		} else {
+			//from viewport
+			switch (get_viewport()->get_default_canvas_item_texture_filter()) {
+				case Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST: texture_filter_cache = VS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST; break;
+				case Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR: texture_filter_cache = VS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR; break;
+				case Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS: texture_filter_cache = VS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR_WITH_MIPMAPS; break;
+				case Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS: texture_filter_cache = VS::CANVAS_ITEM_TEXTURE_FILTER_NEAREST_WITH_MIPMAPS; break;
+				default: {
+				}
+			}
+		}
+	} else {
+		texture_filter_cache = VS::CanvasItemTextureFilter(texture_filter);
+	}
+	VS::get_singleton()->canvas_item_set_default_texture_filter(get_canvas_item(), texture_filter_cache);
+	update();
+
+	if (p_propagate) {
+		for (List<CanvasItem *>::Element *E = children_items.front(); E; E = E->next()) {
+			if (!E->get()->toplevel && E->get()->texture_filter == TEXTURE_FILTER_PARENT_NODE) {
+				E->get()->_update_texture_filter_changed(true);
+			}
+		}
+	}
+}
+
+void CanvasItem::set_texture_filter(TextureFilter p_texture_filter) {
+	ERR_FAIL_INDEX(p_texture_filter, TEXTURE_FILTER_MAX);
+	if (texture_filter == p_texture_filter) {
+		return;
+	}
+	texture_filter = p_texture_filter;
+	_update_texture_filter_changed(true);
+}
+
+CanvasItem::TextureFilter CanvasItem::get_texture_filter() const {
+	return texture_filter;
+}
+
+void CanvasItem::_update_texture_repeat_changed(bool p_propagate) {
+
+	if (!is_inside_tree()) {
+		return;
+	}
+
+	if (texture_repeat == TEXTURE_REPEAT_PARENT_NODE) {
+		CanvasItem *parent_item = get_parent_item();
+		if (parent_item) {
+			texture_repeat_cache = parent_item->texture_repeat_cache;
+		} else {
+			//from viewport
+			switch (get_viewport()->get_default_canvas_item_texture_repeat()) {
+				case Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_DISABLED: texture_repeat_cache = VS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED; break;
+				case Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_ENABLED: texture_repeat_cache = VS::CANVAS_ITEM_TEXTURE_REPEAT_ENABLED; break;
+				case Viewport::DEFAULT_CANVAS_ITEM_TEXTURE_REPEAT_MIRROR: texture_repeat_cache = VS::CANVAS_ITEM_TEXTURE_REPEAT_MIRROR; break;
+				default: {
+				}
+			}
+		}
+	} else {
+		texture_repeat_cache = VS::CanvasItemTextureRepeat(texture_repeat);
+	}
+	VS::get_singleton()->canvas_item_set_default_texture_repeat(get_canvas_item(), texture_repeat_cache);
+	update();
+	if (p_propagate) {
+		for (List<CanvasItem *>::Element *E = children_items.front(); E; E = E->next()) {
+			if (!E->get()->toplevel && E->get()->texture_repeat == TEXTURE_REPEAT_PARENT_NODE) {
+				E->get()->_update_texture_repeat_changed(true);
+			}
+		}
+	}
+}
+
+void CanvasItem::set_texture_repeat(TextureRepeat p_texture_repeat) {
+	ERR_FAIL_INDEX(p_texture_repeat, TEXTURE_REPEAT_MAX);
+	if (texture_repeat == p_texture_repeat) {
+		return;
+	}
+	texture_repeat = p_texture_repeat;
+	_update_texture_repeat_changed(true);
+}
+
+CanvasItem::TextureRepeat CanvasItem::get_texture_repeat() const {
+	return texture_repeat;
+}
+
+CanvasItem::CanvasItem() :
+		xform_change(this) {
+
+	window = nullptr;
+	canvas_item = VisualServer::get_singleton()->canvas_item_create();
+	visible = true;
+	pending_update = false;
+	modulate = Color(1, 1, 1, 1);
+	self_modulate = Color(1, 1, 1, 1);
+	toplevel = false;
+	first_draw = false;
+	drawing = false;
+	behind = false;
+	block_transform_notify = false;
+	//viewport=NULL;
+	canvas_layer = NULL;
+	use_parent_material = false;
+	global_invalid = true;
+	notify_local_transform = false;
+	notify_transform = false;
+	light_mask = 1;
+	texture_repeat = TEXTURE_REPEAT_PARENT_NODE;
+	texture_filter = TEXTURE_FILTER_PARENT_NODE;
+	texture_filter_cache = VS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR;
+	texture_repeat_cache = VS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED;
+
+	C = NULL;
+}
+
+CanvasItem::~CanvasItem() {
+
+	VisualServer::get_singleton()->free(canvas_item);
+}
diff --git a/scene/main/canvas_item.h b/scene/main/canvas_item.h
new file mode 100644
index 0000000000..3f176e5f60
--- /dev/null
+++ b/scene/main/canvas_item.h
@@ -0,0 +1,426 @@
+/*************************************************************************/
+/*  canvas_item.h                                                        */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* 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.                */
+/*************************************************************************/
+
+#ifndef CANVAS_ITEM_H
+#define CANVAS_ITEM_H
+
+#include "scene/main/node.h"
+#include "scene/main/scene_tree.h"
+#include "scene/resources/material.h"
+#include "scene/resources/multimesh.h"
+#include "scene/resources/shader.h"
+#include "scene/resources/texture.h"
+
+class CanvasLayer;
+class Viewport;
+class Font;
+
+class StyleBox;
+
+class CanvasItemMaterial : public Material {
+
+	GDCLASS(CanvasItemMaterial, Material);
+
+public:
+	enum BlendMode {
+		BLEND_MODE_MIX,
+		BLEND_MODE_ADD,
+		BLEND_MODE_SUB,
+		BLEND_MODE_MUL,
+		BLEND_MODE_PREMULT_ALPHA,
+		BLEND_MODE_DISABLED
+	};
+
+	enum LightMode {
+		LIGHT_MODE_NORMAL,
+		LIGHT_MODE_UNSHADED,
+		LIGHT_MODE_LIGHT_ONLY
+	};
+
+private:
+	union MaterialKey {
+
+		struct {
+			uint32_t blend_mode : 4;
+			uint32_t light_mode : 4;
+			uint32_t particles_animation : 1;
+			uint32_t invalid_key : 1;
+		};
+
+		uint32_t key;
+
+		bool operator<(const MaterialKey &p_key) const {
+			return key < p_key.key;
+		}
+	};
+
+	struct ShaderNames {
+		StringName particles_anim_h_frames;
+		StringName particles_anim_v_frames;
+		StringName particles_anim_loop;
+	};
+
+	static ShaderNames *shader_names;
+
+	struct ShaderData {
+		RID shader;
+		int users;
+	};
+
+	static Map<MaterialKey, ShaderData> shader_map;
+
+	MaterialKey current_key;
+
+	_FORCE_INLINE_ MaterialKey _compute_key() const {
+
+		MaterialKey mk;
+		mk.key = 0;
+		mk.blend_mode = blend_mode;
+		mk.light_mode = light_mode;
+		mk.particles_animation = particles_animation;
+		return mk;
+	}
+
+	static Mutex material_mutex;
+	static SelfList<CanvasItemMaterial>::List *dirty_materials;
+	SelfList<CanvasItemMaterial> element;
+
+	void _update_shader();
+	_FORCE_INLINE_ void _queue_shader_change();
+	_FORCE_INLINE_ bool _is_shader_dirty() const;
+
+	BlendMode blend_mode;
+	LightMode light_mode;
+	bool particles_animation;
+
+	int particles_anim_h_frames;
+	int particles_anim_v_frames;
+	bool particles_anim_loop;
+
+protected:
+	static void _bind_methods();
+	void _validate_property(PropertyInfo &property) const;
+
+public:
+	void set_blend_mode(BlendMode p_blend_mode);
+	BlendMode get_blend_mode() const;
+
+	void set_light_mode(LightMode p_light_mode);
+	LightMode get_light_mode() const;
+
+	void set_particles_animation(bool p_particles_anim);
+	bool get_particles_animation() const;
+
+	void set_particles_anim_h_frames(int p_frames);
+	int get_particles_anim_h_frames() const;
+	void set_particles_anim_v_frames(int p_frames);
+	int get_particles_anim_v_frames() const;
+
+	void set_particles_anim_loop(bool p_loop);
+	bool get_particles_anim_loop() const;
+
+	static void init_shaders();
+	static void finish_shaders();
+	static void flush_changes();
+
+	RID get_shader_rid() const;
+
+	virtual Shader::Mode get_shader_mode() const;
+
+	CanvasItemMaterial();
+	virtual ~CanvasItemMaterial();
+};
+
+VARIANT_ENUM_CAST(CanvasItemMaterial::BlendMode)
+VARIANT_ENUM_CAST(CanvasItemMaterial::LightMode)
+
+class CanvasItem : public Node {
+
+	GDCLASS(CanvasItem, Node);
+
+public:
+	enum TextureFilter {
+		TEXTURE_FILTER_PARENT_NODE,
+		TEXTURE_FILTER_NEAREST,
+		TEXTURE_FILTER_LINEAR,
+		TEXTURE_FILTER_NEAREST_WITH_MIPMAPS,
+		TEXTURE_FILTER_LINEAR_WITH_MIPMAPS,
+		TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC,
+		TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC,
+		TEXTURE_FILTER_MAX
+	};
+
+	enum TextureRepeat {
+		TEXTURE_REPEAT_PARENT_NODE,
+		TEXTURE_REPEAT_DISABLED,
+		TEXTURE_REPEAT_ENABLED,
+		TEXTURE_REPEAT_MIRROR,
+		TEXTURE_REPEAT_MAX,
+	};
+
+private:
+	mutable SelfList<Node> xform_change;
+
+	RID canvas_item;
+	String group;
+
+	CanvasLayer *canvas_layer;
+
+	Color modulate;
+	Color self_modulate;
+
+	List<CanvasItem *> children_items;
+	List<CanvasItem *>::Element *C;
+
+	int light_mask;
+
+	Window *window;
+	bool first_draw;
+	bool visible;
+	bool pending_update;
+	bool toplevel;
+	bool drawing;
+	bool block_transform_notify;
+	bool behind;
+	bool use_parent_material;
+	bool notify_local_transform;
+	bool notify_transform;
+
+	VS::CanvasItemTextureFilter texture_filter_cache;
+	VS::CanvasItemTextureRepeat texture_repeat_cache;
+
+	TextureFilter texture_filter;
+	TextureRepeat texture_repeat;
+
+	Ref<Material> material;
+
+	mutable Transform2D global_transform;
+	mutable bool global_invalid;
+
+	void _toplevel_raise_self();
+
+	void _propagate_visibility_changed(bool p_visible);
+
+	void _update_callback();
+
+	void _enter_canvas();
+	void _exit_canvas();
+
+	void _window_visibility_changed();
+
+	void _notify_transform(CanvasItem *p_node);
+
+	void _set_on_top(bool p_on_top) { set_draw_behind_parent(!p_on_top); }
+	bool _is_on_top() const { return !is_draw_behind_parent_enabled(); }
+
+	static CanvasItem *current_item_drawn;
+	friend class Viewport;
+	void _update_texture_repeat_changed(bool p_propagate);
+	void _update_texture_filter_changed(bool p_propagate);
+
+protected:
+	_FORCE_INLINE_ void _notify_transform() {
+		if (!is_inside_tree()) return;
+		_notify_transform(this);
+		if (!block_transform_notify && notify_local_transform) notification(NOTIFICATION_LOCAL_TRANSFORM_CHANGED);
+	}
+
+	void item_rect_changed(bool p_size_changed = true);
+
+	void _notification(int p_what);
+	static void _bind_methods();
+
+public:
+	enum {
+		NOTIFICATION_TRANSFORM_CHANGED = SceneTree::NOTIFICATION_TRANSFORM_CHANGED, //unique
+		NOTIFICATION_DRAW = 30,
+		NOTIFICATION_VISIBILITY_CHANGED = 31,
+		NOTIFICATION_ENTER_CANVAS = 32,
+		NOTIFICATION_EXIT_CANVAS = 33,
+		NOTIFICATION_LOCAL_TRANSFORM_CHANGED = 35,
+		NOTIFICATION_WORLD_2D_CHANGED = 36,
+
+	};
+
+	/* EDITOR */
+#ifdef TOOLS_ENABLED
+	// Select the node
+	virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
+
+	// Save and restore a CanvasItem state
+	virtual void _edit_set_state(const Dictionary &p_state){};
+	virtual Dictionary _edit_get_state() const { return Dictionary(); };
+
+	// Used to move the node
+	virtual void _edit_set_position(const Point2 &p_position) = 0;
+	virtual Point2 _edit_get_position() const = 0;
+
+	// Used to scale the node
+	virtual void _edit_set_scale(const Size2 &p_scale) = 0;
+	virtual Size2 _edit_get_scale() const = 0;
+
+	// Used to rotate the node
+	virtual bool _edit_use_rotation() const { return false; };
+	virtual void _edit_set_rotation(float p_rotation){};
+	virtual float _edit_get_rotation() const { return 0.0; };
+
+	// Used to resize/move the node
+	virtual bool _edit_use_rect() const { return false; }; // MAYBE REPLACE BY A _edit_get_editmode()
+	virtual void _edit_set_rect(const Rect2 &p_rect){};
+	virtual Rect2 _edit_get_rect() const { return Rect2(0, 0, 0, 0); };
+	virtual Size2 _edit_get_minimum_size() const { return Size2(-1, -1); }; // LOOKS WEIRD
+
+	// Used to set a pivot
+	virtual bool _edit_use_pivot() const { return false; };
+	virtual void _edit_set_pivot(const Point2 &p_pivot){};
+	virtual Point2 _edit_get_pivot() const { return Point2(); };
+
+	virtual Transform2D _edit_get_transform() const;
+#endif
+
+	/* VISIBILITY */
+
+	void set_visible(bool p_visible);
+	bool is_visible() const;
+	bool is_visible_in_tree() const;
+	void show();
+	void hide();
+
+	void update();
+
+	virtual void set_light_mask(int p_light_mask);
+	int get_light_mask() const;
+
+	void set_modulate(const Color &p_modulate);
+	Color get_modulate() const;
+
+	void set_self_modulate(const Color &p_self_modulate);
+	Color get_self_modulate() const;
+
+	/* DRAWING API */
+
+	void draw_line(const Point2 &p_from, const Point2 &p_to, const Color &p_color, float p_width = 1.0);
+	void draw_polyline(const Vector<Point2> &p_points, const Color &p_color, float p_width = 1.0);
+	void draw_polyline_colors(const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width = 1.0);
+	void draw_arc(const Vector2 &p_center, float p_radius, float p_start_angle, float p_end_angle, int p_point_count, const Color &p_color, float p_width = 1.0);
+	void draw_multiline(const Vector<Point2> &p_points, const Color &p_color, float p_width = 1.0);
+	void draw_multiline_colors(const Vector<Point2> &p_points, const Vector<Color> &p_colors, float p_width = 1.0);
+	void draw_rect(const Rect2 &p_rect, const Color &p_color, bool p_filled = true, float p_width = 1.0);
+	void draw_circle(const Point2 &p_pos, float p_radius, const Color &p_color);
+	void draw_texture(const Ref<Texture2D> &p_texture, const Point2 &p_pos, const Color &p_modulate = Color(1, 1, 1, 1), const Ref<Texture2D> &p_normal_map = Ref<Texture2D>(), const Ref<Texture2D> &p_specular_map = Ref<Texture2D>(), const Color &p_specular_color_shininess = Color(1, 1, 1, 1), TextureFilter p_texture_filter = TEXTURE_FILTER_PARENT_NODE, TextureRepeat p_texture_repeat = TEXTURE_REPEAT_PARENT_NODE);
+	void draw_texture_rect(const Ref<Texture2D> &p_texture, const Rect2 &p_rect, bool p_tile = false, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, const Ref<Texture2D> &p_normal_map = Ref<Texture2D>(), const Ref<Texture2D> &p_specular_map = Ref<Texture2D>(), const Color &p_specular_color_shininess = Color(1, 1, 1, 1), TextureFilter p_texture_filter = TEXTURE_FILTER_PARENT_NODE, TextureRepeat p_texture_repeat = TEXTURE_REPEAT_PARENT_NODE);
+	void draw_texture_rect_region(const Ref<Texture2D> &p_texture, const Rect2 &p_rect, const Rect2 &p_src_rect, const Color &p_modulate = Color(1, 1, 1), bool p_transpose = false, const Ref<Texture2D> &p_normal_map = Ref<Texture2D>(), const Ref<Texture2D> &p_specular_map = Ref<Texture2D>(), const Color &p_specular_color_shininess = Color(1, 1, 1, 1), bool p_clip_uv = false, TextureFilter p_texture_filter = TEXTURE_FILTER_PARENT_NODE, TextureRepeat p_texture_repeat = TEXTURE_REPEAT_PARENT_NODE);
+	void draw_style_box(const Ref<StyleBox> &p_style_box, const Rect2 &p_rect);
+	void draw_primitive(const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs, Ref<Texture2D> p_texture = Ref<Texture2D>(), float p_width = 1, const Ref<Texture2D> &p_normal_map = Ref<Texture2D>(), const Ref<Texture2D> &p_specular_map = Ref<Texture2D>(), const Color &p_specular_color_shininess = Color(1, 1, 1, 1), TextureFilter p_texture_filter = TEXTURE_FILTER_PARENT_NODE, TextureRepeat p_texture_repeat = TEXTURE_REPEAT_PARENT_NODE);
+	void draw_polygon(const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs = Vector<Point2>(), Ref<Texture2D> p_texture = Ref<Texture2D>(), const Ref<Texture2D> &p_normal_map = Ref<Texture2D>(), const Ref<Texture2D> &p_specular_map = Ref<Texture2D>(), const Color &p_specular_color_shininess = Color(1, 1, 1, 1), TextureFilter p_texture_filter = TEXTURE_FILTER_PARENT_NODE, TextureRepeat p_texture_repeat = TEXTURE_REPEAT_PARENT_NODE);
+	void draw_colored_polygon(const Vector<Point2> &p_points, const Color &p_color, const Vector<Point2> &p_uvs = Vector<Point2>(), Ref<Texture2D> p_texture = Ref<Texture2D>(), const Ref<Texture2D> &p_normal_map = Ref<Texture2D>(), const Ref<Texture2D> &p_specular_map = Ref<Texture2D>(), const Color &p_specular_color_shininess = Color(1, 1, 1, 1), TextureFilter p_texture_filter = TEXTURE_FILTER_PARENT_NODE, TextureRepeat p_texture_repeat = TEXTURE_REPEAT_PARENT_NODE);
+
+	void draw_mesh(const Ref<Mesh> &p_mesh, const Ref<Texture2D> &p_texture, const Ref<Texture2D> &p_normal_map = Ref<Texture2D>(), const Ref<Texture2D> &p_specular_map = Ref<Texture2D>(), const Color &p_specular_color_shininess = Color(1, 1, 1, 1), const Transform2D &p_transform = Transform2D(), const Color &p_modulate = Color(1, 1, 1), TextureFilter p_texture_filter = TEXTURE_FILTER_PARENT_NODE, TextureRepeat p_texture_repeat = TEXTURE_REPEAT_PARENT_NODE);
+	void draw_multimesh(const Ref<MultiMesh> &p_multimesh, const Ref<Texture2D> &p_texture, const Ref<Texture2D> &p_normal_map = Ref<Texture2D>(), const Ref<Texture2D> &p_specular_map = Ref<Texture2D>(), const Color &p_specular_color_shininess = Color(1, 1, 1, 1), TextureFilter p_texture_filter = TEXTURE_FILTER_PARENT_NODE, TextureRepeat p_texture_repeat = TEXTURE_REPEAT_PARENT_NODE);
+
+	void draw_string(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_text, const Color &p_modulate = Color(1, 1, 1), int p_clip_w = -1);
+	float draw_char(const Ref<Font> &p_font, const Point2 &p_pos, const String &p_char, const String &p_next = "", const Color &p_modulate = Color(1, 1, 1));
+
+	void draw_set_transform(const Point2 &p_offset, float p_rot, const Size2 &p_scale);
+	void draw_set_transform_matrix(const Transform2D &p_matrix);
+
+	static CanvasItem *get_current_item_drawn();
+
+	/* RECT / TRANSFORM */
+
+	void set_as_toplevel(bool p_toplevel);
+	bool is_set_as_toplevel() const;
+
+	void set_draw_behind_parent(bool p_enable);
+	bool is_draw_behind_parent_enabled() const;
+
+	CanvasItem *get_parent_item() const;
+
+	virtual Transform2D get_transform() const = 0;
+
+	virtual Transform2D get_global_transform() const;
+	virtual Transform2D get_global_transform_with_canvas() const;
+	virtual Transform2D get_screen_transform() const;
+
+	CanvasItem *get_toplevel() const;
+	_FORCE_INLINE_ RID get_canvas_item() const {
+		return canvas_item;
+	}
+
+	void set_block_transform_notify(bool p_enable);
+	bool is_block_transform_notify_enabled() const;
+
+	Transform2D get_canvas_transform() const;
+	Transform2D get_viewport_transform() const;
+	Rect2 get_viewport_rect() const;
+	RID get_viewport_rid() const;
+	RID get_canvas() const;
+	ObjectID get_canvas_layer_instance_id() const;
+	Ref<World2D> get_world_2d() const;
+
+	virtual void set_material(const Ref<Material> &p_material);
+	Ref<Material> get_material() const;
+
+	virtual void set_use_parent_material(bool p_use_parent_material);
+	bool get_use_parent_material() const;
+
+	Ref<InputEvent> make_input_local(const Ref<InputEvent> &p_event) const;
+	Vector2 make_canvas_position_local(const Vector2 &screen_point) const;
+
+	Vector2 get_global_mouse_position() const;
+	Vector2 get_local_mouse_position() const;
+
+	void set_notify_local_transform(bool p_enable);
+	bool is_local_transform_notification_enabled() const;
+
+	void set_notify_transform(bool p_enable);
+	bool is_transform_notification_enabled() const;
+
+	void force_update_transform();
+
+	void set_texture_filter(TextureFilter p_texture_filter);
+	TextureFilter get_texture_filter() const;
+
+	void set_texture_repeat(TextureRepeat p_texture_repeat);
+	TextureRepeat get_texture_repeat() const;
+
+	// Used by control nodes to retrieve the parent's anchorable area
+	virtual Rect2 get_anchorable_rect() const { return Rect2(0, 0, 0, 0); };
+
+	int get_canvas_layer() const;
+
+	CanvasItem();
+	~CanvasItem();
+};
+
+VARIANT_ENUM_CAST(CanvasItem::TextureFilter)
+VARIANT_ENUM_CAST(CanvasItem::TextureRepeat)
+
+#endif // CANVAS_ITEM_H
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index fad10524b9..d6c0323f25 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -1410,7 +1410,7 @@ SceneTree::SceneTree() {
 	root = memnew(Window);
 	root->set_name("root");
 	if (!root->get_world().is_valid())
-		root->set_world(Ref<World>(memnew(World)));
+		root->set_world(Ref<World3D>(memnew(World3D)));
 
 	// Initialize network state
 	multiplayer_poll = true;
diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h
index e6b2575f98..319b5a7e74 100644
--- a/scene/main/scene_tree.h
+++ b/scene/main/scene_tree.h
@@ -36,8 +36,8 @@
 #include "core/os/thread_safe.h"
 #include "core/self_list.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/world.h"
 #include "scene/resources/world_2d.h"
+#include "scene/resources/world_3d.h"
 
 #undef Window
 
@@ -189,7 +189,7 @@ private:
 	void _flush_delete_queue();
 	//optimization
 	friend class CanvasItem;
-	friend class Spatial;
+	friend class Node3D;
 	friend class Viewport;
 
 	SelfList<Node>::List xform_change_list;
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp
index 7c847095e1..7c847095e1 100755..100644
--- a/scene/main/timer.cpp
+++ b/scene/main/timer.cpp
diff --git a/scene/main/timer.h b/scene/main/timer.h
index 044566738e..044566738e 100755..100644
--- a/scene/main/timer.h
+++ b/scene/main/timer.h
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index e49674663a..d293a3cd32 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -36,10 +36,10 @@
 #include "core/os/os.h"
 #include "core/project_settings.h"
 #include "scene/2d/collision_object_2d.h"
-#include "scene/3d/camera.h"
-#include "scene/3d/collision_object.h"
-#include "scene/3d/listener.h"
-#include "scene/3d/spatial.h"
+#include "scene/3d/camera_3d.h"
+#include "scene/3d/collision_object_3d.h"
+#include "scene/3d/listener_3d.h"
+#include "scene/3d/node_3d.h"
 #include "scene/3d/world_environment.h"
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
@@ -218,7 +218,7 @@ void Viewport::update_worlds() {
 	find_world()->_update(get_tree()->get_frame());
 }
 
-void Viewport::_collision_object_input_event(CollisionObject *p_object, Camera *p_camera, const Ref<InputEvent> &p_input_event, const Vector3 &p_pos, const Vector3 &p_normal, int p_shape) {
+void Viewport::_collision_object_input_event(CollisionObject3D *p_object, Camera3D *p_camera, const Ref<InputEvent> &p_input_event, const Vector3 &p_pos, const Vector3 &p_normal, int p_shape) {
 
 	Transform object_transform = p_object->get_global_transform();
 	Transform camera_transform = p_camera->get_global_transform();
@@ -489,8 +489,8 @@ void Viewport::_notification(int p_what) {
 		case NOTIFICATION_READY: {
 #ifndef _3D_DISABLED
 			if (listeners.size() && !listener) {
-				Listener *first = NULL;
-				for (Set<Listener *>::Element *E = listeners.front(); E; E = E->next()) {
+				Listener3D *first = NULL;
+				for (Set<Listener3D *>::Element *E = listeners.front(); E; E = E->next()) {
 
 					if (first == NULL || first->is_greater_than(E->get())) {
 						first = E->get();
@@ -503,8 +503,8 @@ void Viewport::_notification(int p_what) {
 
 			if (cameras.size() && !camera) {
 				//there are cameras but no current camera, pick first in tree and make it current
-				Camera *first = NULL;
-				for (Set<Camera *>::Element *E = cameras.front(); E; E = E->next()) {
+				Camera3D *first = NULL;
+				for (Set<Camera3D *>::Element *E = cameras.front(); E; E = E->next()) {
 
 					if (first == NULL || first->is_greater_than(E->get())) {
 						first = E->get();
@@ -528,7 +528,6 @@ void Viewport::_notification(int p_what) {
 				world_2d->_remove_viewport(this);
 
 			VisualServer::get_singleton()->viewport_set_scenario(viewport, RID());
-			//			SpatialSoundServer::get_singleton()->listener_set_space(internal_listener, RID());
 			VisualServer::get_singleton()->viewport_remove_canvas(viewport, current_canvas);
 			if (contact_2d_debug.is_valid()) {
 				VisualServer::get_singleton()->free(contact_2d_debug);
@@ -587,7 +586,7 @@ void Viewport::_notification(int p_what) {
 
 #ifndef _3D_DISABLED
 				Vector2 last_pos(1e20, 1e20);
-				CollisionObject *last_object = NULL;
+				CollisionObject3D *last_object = NULL;
 				ObjectID last_id;
 #endif
 				PhysicsDirectSpaceState::RayResult result;
@@ -773,7 +772,7 @@ void Viewport::_notification(int p_what) {
 
 					if (physics_object_capture.is_valid()) {
 
-						CollisionObject *co = Object::cast_to<CollisionObject>(ObjectDB::get_instance(physics_object_capture));
+						CollisionObject3D *co = Object::cast_to<CollisionObject3D>(ObjectDB::get_instance(physics_object_capture));
 						if (co && camera) {
 							_collision_object_input_event(co, camera, ev, Vector3(), Vector3(), 0);
 							captured = true;
@@ -813,7 +812,7 @@ void Viewport::_notification(int p_what) {
 								ObjectID new_collider;
 								if (col) {
 
-									CollisionObject *co = Object::cast_to<CollisionObject>(result.collider);
+									CollisionObject3D *co = Object::cast_to<CollisionObject3D>(result.collider);
 									if (co) {
 
 										_collision_object_input_event(co, camera, ev, result.position, result.normal, result.shape);
@@ -830,7 +829,7 @@ void Viewport::_notification(int p_what) {
 
 									if (physics_object_over.is_valid()) {
 
-										CollisionObject *co = Object::cast_to<CollisionObject>(ObjectDB::get_instance(physics_object_over));
+										CollisionObject3D *co = Object::cast_to<CollisionObject3D>(ObjectDB::get_instance(physics_object_over));
 										if (co) {
 											co->_mouse_exit();
 										}
@@ -838,7 +837,7 @@ void Viewport::_notification(int p_what) {
 
 									if (new_collider.is_valid()) {
 
-										CollisionObject *co = Object::cast_to<CollisionObject>(ObjectDB::get_instance(new_collider));
+										CollisionObject3D *co = Object::cast_to<CollisionObject3D>(ObjectDB::get_instance(new_collider));
 										if (co) {
 											co->_mouse_enter();
 										}
@@ -927,13 +926,6 @@ Rect2 Viewport::get_visible_rect() const {
 }
 
 void Viewport::_update_listener() {
-	/*
-	if (is_inside_tree() && audio_listener && (camera || listener) && (!get_parent() || (Object::cast_to<Control>(get_parent()) && Object::cast_to<Control>(get_parent())->is_visible_in_tree())))  {
-		SpatialSoundServer::get_singleton()->listener_set_space(internal_listener, find_world()->get_sound_space());
-	} else {
-		SpatialSoundServer::get_singleton()->listener_set_space(internal_listener, RID());
-	}
-*/
 }
 
 void Viewport::_update_listener_2d() {
@@ -1041,14 +1033,9 @@ Transform2D Viewport::get_global_canvas_transform() const {
 }
 
 void Viewport::_listener_transform_changed_notify() {
-
-#ifndef _3D_DISABLED
-//if (listener)
-//		SpatialSoundServer::get_singleton()->listener_set_transform(internal_listener, listener->get_listener_transform());
-#endif
 }
 
-void Viewport::_listener_set(Listener *p_listener) {
+void Viewport::_listener_set(Listener3D *p_listener) {
 
 #ifndef _3D_DISABLED
 
@@ -1062,13 +1049,13 @@ void Viewport::_listener_set(Listener *p_listener) {
 #endif
 }
 
-bool Viewport::_listener_add(Listener *p_listener) {
+bool Viewport::_listener_add(Listener3D *p_listener) {
 
 	listeners.insert(p_listener);
 	return listeners.size() == 1;
 }
 
-void Viewport::_listener_remove(Listener *p_listener) {
+void Viewport::_listener_remove(Listener3D *p_listener) {
 
 	listeners.erase(p_listener);
 	if (listener == p_listener) {
@@ -1077,10 +1064,10 @@ void Viewport::_listener_remove(Listener *p_listener) {
 }
 
 #ifndef _3D_DISABLED
-void Viewport::_listener_make_next_current(Listener *p_exclude) {
+void Viewport::_listener_make_next_current(Listener3D *p_exclude) {
 
 	if (listeners.size() > 0) {
-		for (Set<Listener *>::Element *E = listeners.front(); E; E = E->next()) {
+		for (Set<Listener3D *>::Element *E = listeners.front(); E; E = E->next()) {
 
 			if (p_exclude == E->get())
 				continue;
@@ -1104,13 +1091,10 @@ void Viewport::_listener_make_next_current(Listener *p_exclude) {
 void Viewport::_camera_transform_changed_notify() {
 
 #ifndef _3D_DISABLED
-// If there is an active listener in the scene, it takes priority over the camera
-//	if (camera && !listener)
-//		SpatialSoundServer::get_singleton()->listener_set_transform(internal_listener, camera->get_camera_transform());
 #endif
 }
 
-void Viewport::_camera_set(Camera *p_camera) {
+void Viewport::_camera_set(Camera3D *p_camera) {
 
 #ifndef _3D_DISABLED
 
@@ -1118,7 +1102,7 @@ void Viewport::_camera_set(Camera *p_camera) {
 		return;
 
 	if (camera) {
-		camera->notification(Camera::NOTIFICATION_LOST_CURRENT);
+		camera->notification(Camera3D::NOTIFICATION_LOST_CURRENT);
 	}
 
 	camera = p_camera;
@@ -1131,7 +1115,7 @@ void Viewport::_camera_set(Camera *p_camera) {
 	}
 
 	if (camera) {
-		camera->notification(Camera::NOTIFICATION_BECAME_CURRENT);
+		camera->notification(Camera3D::NOTIFICATION_BECAME_CURRENT);
 	}
 
 	_update_listener();
@@ -1139,25 +1123,25 @@ void Viewport::_camera_set(Camera *p_camera) {
 #endif
 }
 
-bool Viewport::_camera_add(Camera *p_camera) {
+bool Viewport::_camera_add(Camera3D *p_camera) {
 
 	cameras.insert(p_camera);
 	return cameras.size() == 1;
 }
 
-void Viewport::_camera_remove(Camera *p_camera) {
+void Viewport::_camera_remove(Camera3D *p_camera) {
 
 	cameras.erase(p_camera);
 	if (camera == p_camera) {
-		camera->notification(Camera::NOTIFICATION_LOST_CURRENT);
+		camera->notification(Camera3D::NOTIFICATION_LOST_CURRENT);
 		camera = NULL;
 	}
 }
 
 #ifndef _3D_DISABLED
-void Viewport::_camera_make_next_current(Camera *p_exclude) {
+void Viewport::_camera_make_next_current(Camera3D *p_exclude) {
 
-	for (Set<Camera *>::Element *E = cameras.front(); E; E = E->next()) {
+	for (Set<Camera3D *>::Element *E = cameras.front(); E; E = E->next()) {
 
 		if (p_exclude == E->get())
 			continue;
@@ -1239,17 +1223,20 @@ void Viewport::_propagate_enter_world(Node *p_node) {
 		if (!p_node->is_inside_tree()) //may not have entered scene yet
 			return;
 
-		if (Object::cast_to<Spatial>(p_node) || Object::cast_to<WorldEnvironment>(p_node)) {
-
-			p_node->notification(Spatial::NOTIFICATION_ENTER_WORLD);
+#ifndef _3D_DISABLED
+		if (Object::cast_to<Node3D>(p_node) || Object::cast_to<WorldEnvironment>(p_node)) {
+			p_node->notification(Node3D::NOTIFICATION_ENTER_WORLD);
 		} else {
+#endif
 			Viewport *v = Object::cast_to<Viewport>(p_node);
 			if (v) {
 
 				if (v->world.is_valid() || v->own_world.is_valid())
 					return;
 			}
+#ifndef _3D_DISABLED
 		}
+#endif
 	}
 
 	for (int i = 0; i < p_node->get_child_count(); i++) {
@@ -1276,17 +1263,20 @@ void Viewport::_propagate_exit_world(Node *p_node) {
 		if (!p_node->is_inside_tree()) //may have exited scene already
 			return;
 
-		if (Object::cast_to<Spatial>(p_node) || Object::cast_to<WorldEnvironment>(p_node)) {
-
-			p_node->notification(Spatial::NOTIFICATION_EXIT_WORLD);
+#ifndef _3D_DISABLED
+		if (Object::cast_to<Node3D>(p_node) || Object::cast_to<WorldEnvironment>(p_node)) {
+			p_node->notification(Node3D::NOTIFICATION_EXIT_WORLD);
 		} else {
+#endif
 			Viewport *v = Object::cast_to<Viewport>(p_node);
 			if (v) {
 
 				if (v->world.is_valid() || v->own_world.is_valid())
 					return;
 			}
+#ifndef _3D_DISABLED
 		}
+#endif
 	}
 
 	for (int i = 0; i < p_node->get_child_count(); i++) {
@@ -1295,7 +1285,7 @@ void Viewport::_propagate_exit_world(Node *p_node) {
 	}
 }
 
-void Viewport::set_world(const Ref<World> &p_world) {
+void Viewport::set_world(const Ref<World3D> &p_world) {
 
 	if (world == p_world)
 		return;
@@ -1314,7 +1304,7 @@ void Viewport::set_world(const Ref<World> &p_world) {
 			own_world = world->duplicate();
 			world->connect(CoreStringNames::get_singleton()->changed, callable_mp(this, &Viewport::_own_world_changed));
 		} else {
-			own_world = Ref<World>(memnew(World));
+			own_world = Ref<World3D>(memnew(World3D));
 		}
 	}
 
@@ -1328,7 +1318,7 @@ void Viewport::set_world(const Ref<World> &p_world) {
 	_update_listener();
 }
 
-Ref<World> Viewport::get_world() const {
+Ref<World3D> Viewport::get_world() const {
 
 	return world;
 }
@@ -1338,7 +1328,7 @@ Ref<World2D> Viewport::get_world_2d() const {
 	return world_2d;
 }
 
-Ref<World> Viewport::find_world() const {
+Ref<World3D> Viewport::find_world() const {
 
 	if (own_world.is_valid())
 		return own_world;
@@ -1347,15 +1337,15 @@ Ref<World> Viewport::find_world() const {
 	else if (parent)
 		return parent->find_world();
 	else
-		return Ref<World>();
+		return Ref<World3D>();
 }
 
-Listener *Viewport::get_listener() const {
+Listener3D *Viewport::get_listener() const {
 
 	return listener;
 }
 
-Camera *Viewport::get_camera() const {
+Camera3D *Viewport::get_camera() const {
 	return camera;
 }
 
@@ -2626,7 +2616,7 @@ void Viewport::_drop_physics_mouseover() {
 
 #ifndef _3D_DISABLED
 	if (physics_object_over.is_valid()) {
-		CollisionObject *co = Object::cast_to<CollisionObject>(ObjectDB::get_instance(physics_object_over));
+		CollisionObject3D *co = Object::cast_to<CollisionObject3D>(ObjectDB::get_instance(physics_object_over));
 		if (co) {
 			co->_mouse_exit();
 		}
@@ -3102,7 +3092,7 @@ void Viewport::set_use_own_world(bool p_world) {
 		_propagate_exit_world(this);
 
 	if (!p_world) {
-		own_world = Ref<World>();
+		own_world = Ref<World3D>();
 		if (world.is_valid()) {
 			world->disconnect(CoreStringNames::get_singleton()->changed, callable_mp(this, &Viewport::_own_world_changed));
 		}
@@ -3111,7 +3101,7 @@ void Viewport::set_use_own_world(bool p_world) {
 			own_world = world->duplicate();
 			world->connect(CoreStringNames::get_singleton()->changed, callable_mp(this, &Viewport::_own_world_changed));
 		} else {
-			own_world = Ref<World>(memnew(World));
+			own_world = Ref<World3D>(memnew(World3D));
 		}
 	}
 
@@ -3545,7 +3535,6 @@ Viewport::Viewport() {
 	viewport_textures.insert(default_texture.ptr());
 	default_texture->proxy = VS::get_singleton()->texture_proxy_create(texture_rid);
 
-	//internal_listener = SpatialSoundServer::get_singleton()->listener_create();
 	audio_listener = false;
 	//internal_listener_2d = SpatialSound2DServer::get_singleton()->listener_create();
 	audio_listener_2d = false;
@@ -3626,8 +3615,6 @@ Viewport::~Viewport() {
 		E->get()->vp = NULL;
 	}
 	VisualServer::get_singleton()->free(viewport);
-	//SpatialSoundServer::get_singleton()->free(internal_listener);
-	//SpatialSound2DServer::get_singleton()->free(internal_listener_2d);
 }
 
 /////////////////////////////////
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 6b68bc0c94..8a56caea52 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -38,9 +38,9 @@
 #include "servers/display_server.h"
 #include "servers/visual_server.h"
 
-class Camera;
+class Camera3D;
 class Camera2D;
-class Listener;
+class Listener3D;
 class Control;
 class CanvasItem;
 class CanvasLayer;
@@ -48,7 +48,7 @@ class Panel;
 class Label;
 class Timer;
 class Viewport;
-class CollisionObject;
+class CollisionObject3D;
 
 class ViewportTexture : public Texture2D {
 
@@ -160,8 +160,8 @@ private:
 
 	Viewport *parent;
 
-	Listener *listener;
-	Set<Listener *> listeners;
+	Listener3D *listener;
+	Set<Listener3D *> listeners;
 
 	struct CameraOverrideData {
 		Transform transform;
@@ -181,8 +181,8 @@ private:
 		}
 	} camera_override;
 
-	Camera *camera;
-	Set<Camera *> cameras;
+	Camera3D *camera;
+	Set<Camera3D *> cameras;
 	Set<CanvasLayer *> canvas_layers;
 
 	RID viewport;
@@ -237,7 +237,7 @@ private:
 
 	} physics_last_mouse_state;
 
-	void _collision_object_input_event(CollisionObject *p_object, Camera *p_camera, const Ref<InputEvent> &p_input_event, const Vector3 &p_pos, const Vector3 &p_normal, int p_shape);
+	void _collision_object_input_event(CollisionObject3D *p_object, Camera3D *p_camera, const Ref<InputEvent> &p_input_event, const Vector3 &p_pos, const Vector3 &p_normal, int p_shape);
 
 	bool handle_input_locally;
 	bool local_input_handled;
@@ -245,8 +245,8 @@ private:
 	Map<ObjectID, uint64_t> physics_2d_mouseover;
 
 	Ref<World2D> world_2d;
-	Ref<World> world;
-	Ref<World> own_world;
+	Ref<World3D> world;
+	Ref<World3D> own_world;
 
 	Rect2i to_screen_rect;
 	StringName input_group;
@@ -396,19 +396,19 @@ private:
 
 	bool _gui_drop(Control *p_at_control, Point2 p_at_pos, bool p_just_check);
 
-	friend class Listener;
+	friend class Listener3D;
 	void _listener_transform_changed_notify();
-	void _listener_set(Listener *p_listener);
-	bool _listener_add(Listener *p_listener); //true if first
-	void _listener_remove(Listener *p_listener);
-	void _listener_make_next_current(Listener *p_exclude);
+	void _listener_set(Listener3D *p_listener);
+	bool _listener_add(Listener3D *p_listener); //true if first
+	void _listener_remove(Listener3D *p_listener);
+	void _listener_make_next_current(Listener3D *p_exclude);
 
-	friend class Camera;
+	friend class Camera3D;
 	void _camera_transform_changed_notify();
-	void _camera_set(Camera *p_camera);
-	bool _camera_add(Camera *p_camera); //true if first
-	void _camera_remove(Camera *p_camera);
-	void _camera_make_next_current(Camera *p_exclude);
+	void _camera_set(Camera3D *p_camera);
+	bool _camera_add(Camera3D *p_camera); //true if first
+	void _camera_remove(Camera3D *p_camera);
+	void _camera_make_next_current(Camera3D *p_exclude);
 
 	friend class CanvasLayer;
 	void _canvas_layer_add(CanvasLayer *p_canvas_layer);
@@ -444,8 +444,8 @@ protected:
 	virtual void _validate_property(PropertyInfo &property) const;
 
 public:
-	Listener *get_listener() const;
-	Camera *get_camera() const;
+	Listener3D *get_listener() const;
+	Camera3D *get_camera() const;
 
 	void enable_camera_override(bool p_enable);
 	bool is_camera_override_enabled() const;
@@ -467,10 +467,10 @@ public:
 	Rect2 get_visible_rect() const;
 	RID get_viewport_rid() const;
 
-	void set_world(const Ref<World> &p_world);
+	void set_world(const Ref<World3D> &p_world);
 	void set_world_2d(const Ref<World2D> &p_world_2d);
-	Ref<World> get_world() const;
-	Ref<World> find_world() const;
+	Ref<World3D> get_world() const;
+	Ref<World3D> find_world() const;
 
 	Ref<World2D> get_world_2d() const;
 	Ref<World2D> find_world_2d() const;