Little Bits

-=-=-=-=-=-

-fix duplicate function bug when creating script callback in editor
-fix bug where hiding lights does not work
-fix 2D audio listener bug (romulox_x reported)
-fix exported properties with inheritance bug
-fix timer autostart (make it not work on editor)
-reactivate first camara found if viewport runs out of active camera
-option to hide gizmos in viewport
-changed skeleton gizmo because it sucks
-Make convex shapes using CollisionShape visible (use quickhull class)
-fix up menu when editing a mesh, to export collision, navmesh, convex, etc. from it.
-make a menu option to show SRGB in 3D editor views by default
-make option to edit default light direction in viewport settings
-make option to edit default ambient light in viewport settings
-make software conversion of linear->RGB if hardware support not found

12 files changed, 193 insertions, 10 deletions

diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp
index c85ad70c63..075bb94ea1 100644
--- a/scene/3d/camera.cpp
+++ b/scene/3d/camera.cpp
@@ -219,11 +219,14 @@ void Camera::_notification(int p_what) {
 
 			}
 
+			camera_group = "_vp_cameras"+itos(get_viewport()->get_instance_ID());
+			add_to_group(camera_group);
 			if (viewport_ptr)
 				viewport_ptr->cameras.insert(this);
 			if (current)
 				make_current();
 
+
 		} break;			
 		case NOTIFICATION_TRANSFORM_CHANGED: {
 		
@@ -241,6 +244,8 @@ void Camera::_notification(int p_what) {
 			if (viewport_ptr)
 				viewport_ptr->cameras.erase(this);
 			viewport_ptr=NULL;
+			remove_from_group(camera_group);
+
 
 		} break;
 		case NOTIFICATION_BECAME_CURRENT: {
@@ -314,6 +319,20 @@ void Camera::make_current() {
 	//get_scene()->call_group(SceneMainLoop::GROUP_CALL_REALTIME,camera_group,"_camera_make_current",this);
 }
 
+
+void Camera::_camera_make_next_current(Node *p_exclude) {
+
+	if (this==p_exclude)
+		return;
+	if (!is_inside_scene())
+		return;
+	if (get_viewport()->get_camera()!=NULL)
+		return;
+
+	make_current();
+}
+
+
 void Camera::clear_current() {
 
 	current=false;
@@ -321,8 +340,12 @@ void Camera::clear_current() {
 		return;
 
 	if (viewport_ptr) {
-		if (viewport_ptr->get_camera()==this)
+		if (viewport_ptr->get_camera()==this) {
 			viewport_ptr->_set_camera(NULL);
+			//a group is used beause this needs to be in order to be deterministic
+			get_scene()->call_group(SceneMainLoop::GROUP_CALL_REALTIME,camera_group,"_camera_make_next_current",this);
+
+		}
 	}
 
 }
@@ -636,6 +659,7 @@ void Camera::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_environment:Environment"),&Camera::get_environment);
 	ObjectTypeDB::bind_method(_MD("set_keep_aspect_mode","mode"),&Camera::set_keep_aspect_mode);
 	ObjectTypeDB::bind_method(_MD("get_keep_aspect_mode"),&Camera::get_keep_aspect_mode);
+	ObjectTypeDB::bind_method(_MD("_camera_make_next_current"),&Camera::_camera_make_next_current);
 	//ObjectTypeDB::bind_method( _MD("_camera_make_current"),&Camera::_camera_make_current );
 
 	BIND_CONSTANT( PROJECTION_PERSPECTIVE );
diff --git a/scene/3d/camera.h b/scene/3d/camera.h
index 014c7cb520..bac8173bb7 100644
--- a/scene/3d/camera.h
+++ b/scene/3d/camera.h
@@ -66,6 +66,8 @@ private:
 	RID camera;
 	RID scenario_id;
 
+	String camera_group;
+
 	uint32_t layers;
 
 	Viewport *viewport_ptr;
@@ -74,6 +76,7 @@ private:
 	virtual bool _can_gizmo_scale() const;
 	virtual RES _get_gizmo_geometry() const;
 
+	void _camera_make_next_current(Node *p_exclude);
 
 
 	//void _camera_make_current(Node *p_camera);
diff --git a/scene/3d/immediate_geometry.cpp b/scene/3d/immediate_geometry.cpp
index 1459f2c362..a4206894ff 100644
--- a/scene/3d/immediate_geometry.cpp
+++ b/scene/3d/immediate_geometry.cpp
@@ -72,6 +72,53 @@ DVector<Face3> ImmediateGeometry::get_faces(uint32_t p_usage_flags) const {
 	return DVector<Face3>();
 }
 
+
+
+void ImmediateGeometry::add_sphere(int p_lats,int p_lons,float p_radius) {
+
+	for(int i = 1; i <= p_lats; i++) {
+		double lat0 = Math_PI * (-0.5 + (double) (i - 1) / p_lats);
+		double z0  = Math::sin(lat0);
+		double zr0 =  Math::cos(lat0);
+
+		double lat1 = Math_PI * (-0.5 + (double) i / p_lats);
+		double z1 = Math::sin(lat1);
+		double zr1 = Math::cos(lat1);
+
+		for(int j = p_lons; j >= 1; j--) {
+
+			double lng0 = 2 * Math_PI * (double) (j - 1) / p_lons;
+			double x0 = Math::cos(lng0);
+			double y0 = Math::sin(lng0);
+
+			double lng1 = 2 * Math_PI * (double) (j) / p_lons;
+			double x1 = Math::cos(lng1);
+			double y1 = Math::sin(lng1);
+
+
+			Vector3 v[4]={
+				Vector3(x1 * zr0, z0, y1 *zr0),
+				Vector3(x1 * zr1, z1, y1 *zr1),
+				Vector3(x0 * zr1, z1, y0 *zr1),
+				Vector3(x0 * zr0, z0, y0 *zr0)
+			};
+
+#define ADD_POINT(m_idx)\
+	set_normal(v[m_idx]);\
+	add_vertex(v[m_idx]*p_radius);
+
+			ADD_POINT(0);
+			ADD_POINT(1);
+			ADD_POINT(2);
+
+			ADD_POINT(2);
+			ADD_POINT(3);
+			ADD_POINT(0);
+		}
+	}
+
+}
+
 void ImmediateGeometry::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("begin","primitive","texture:Texture"),&ImmediateGeometry::begin);
@@ -81,11 +128,14 @@ void ImmediateGeometry::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_uv","uv"),&ImmediateGeometry::set_uv);
 	ObjectTypeDB::bind_method(_MD("set_uv2","uv"),&ImmediateGeometry::set_uv2);
 	ObjectTypeDB::bind_method(_MD("add_vertex","color"),&ImmediateGeometry::add_vertex);
+	ObjectTypeDB::bind_method(_MD("add_sphere","lats","lons","radius"),&ImmediateGeometry::add_sphere);
 	ObjectTypeDB::bind_method(_MD("end"),&ImmediateGeometry::end);
 	ObjectTypeDB::bind_method(_MD("clear"),&ImmediateGeometry::clear);
 
 }
 
+
+
 ImmediateGeometry::ImmediateGeometry() {
 
 	im = VisualServer::get_singleton()->immediate_create();
diff --git a/scene/3d/immediate_geometry.h b/scene/3d/immediate_geometry.h
index 2db81134c6..beb8ea8214 100644
--- a/scene/3d/immediate_geometry.h
+++ b/scene/3d/immediate_geometry.h
@@ -31,6 +31,11 @@ public:
 	void end();
 	void clear();
 
+
+	void add_sphere(int p_lats,int p_lons,float p_radius);
+
+
+
 	virtual AABB get_aabb() const;
 	virtual DVector<Face3> get_faces(uint32_t p_usage_flags) const;
 
diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp
index 0d571b77cd..7713a262ef 100644
--- a/scene/3d/light.cpp
+++ b/scene/3d/light.cpp
@@ -429,10 +429,40 @@ void Light::approximate_opengl_attenuation(float p_constant, float p_linear, flo
 
 }
 
+
+void Light::_update_visibility() {
+
+	if (!is_inside_scene())
+		return;
+
+	bool editor_ok=true;
+	if (editor_only) {
+
+		if (!get_scene()->is_editor_hint()) {
+			editor_ok=false;
+		} else {
+			editor_ok = (get_scene()->get_edited_scene_root() && (this==get_scene()->get_edited_scene_root() || get_owner()==get_scene()->get_edited_scene_root()));
+		}
+	}
+
+
+	VS::get_singleton()->instance_light_set_enabled(get_instance(),is_visible() && enabled && editor_ok);
+	_change_notify("geometry/visible");
+
+}
+
+
+void Light::_notification(int p_what) {
+
+	if (p_what==NOTIFICATION_ENTER_SCENE || p_what==NOTIFICATION_VISIBILITY_CHANGED) {
+		_update_visibility();
+	}
+}
+
 void Light::set_enabled(bool p_enabled) {
 
 	enabled=p_enabled;
-	VS::get_singleton()->instance_light_set_enabled(get_instance(),enabled);
+	_update_visibility();
 }
 
 bool Light::is_enabled() const{
@@ -440,6 +470,17 @@ bool Light::is_enabled() const{
 	return enabled;
 }
 
+void Light::set_editor_only(bool p_editor_only) {
+
+	editor_only=p_editor_only;
+	_update_visibility();
+}
+
+bool Light::is_editor_only() const{
+
+	return editor_only;
+}
+
 
 void Light::_bind_methods() {
 
@@ -457,9 +498,12 @@ void Light::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_bake_mode"), &Light::get_bake_mode );
 	ObjectTypeDB::bind_method(_MD("set_enabled","enabled"), &Light::set_enabled );
 	ObjectTypeDB::bind_method(_MD("is_enabled"), &Light::is_enabled );
+	ObjectTypeDB::bind_method(_MD("set_editor_only","editor_only"), &Light::set_editor_only );
+	ObjectTypeDB::bind_method(_MD("is_editor_only"), &Light::is_editor_only );
 
 
 	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "params/enabled"), _SCS("set_enabled"), _SCS("is_enabled"));
+	ADD_PROPERTY( PropertyInfo( Variant::BOOL, "params/editor_only"), _SCS("set_editor_only"), _SCS("is_editor_only"));
 	ADD_PROPERTY( PropertyInfo( Variant::INT, "params/bake_mode",PROPERTY_HINT_ENUM,"Disabled,Indirect,Indirect+Shadows,Full"), _SCS("set_bake_mode"), _SCS("get_bake_mode"));
 	ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/energy", PROPERTY_HINT_EXP_RANGE, "0,64,0.01"), _SCS("set_parameter"), _SCS("get_parameter"), PARAM_ENERGY );
 	/*
@@ -531,6 +575,7 @@ Light::Light(VisualServer::LightType p_type) {
 	set_project_shadows( false );
 	set_base(light);
 	enabled=true;
+	editor_only=false;
 	bake_mode=BAKE_MODE_DISABLED;
 
 }
diff --git a/scene/3d/light.h b/scene/3d/light.h
index 8e7395fd84..6fb57a269b 100644
--- a/scene/3d/light.h
+++ b/scene/3d/light.h
@@ -92,8 +92,10 @@ private:
 	VisualServer::LightType type;
 	bool shadows;
 	bool enabled;
+	bool editor_only;
 	Operator op;
-	
+
+	void _update_visibility();
 // bind helpers
 
 protected:	
@@ -104,6 +106,7 @@ protected:
 	virtual RES _get_gizmo_geometry() const;
 	
 	static void _bind_methods();
+	void _notification(int p_what);
 
 	
 	Light(VisualServer::LightType p_type);	
@@ -132,6 +135,9 @@ public:
 	void set_enabled(bool p_enabled);
 	bool is_enabled() const;
 
+	void set_editor_only(bool p_editor_only);
+	bool is_editor_only() const;
+
 	virtual AABB get_aabb() const;
 	virtual DVector<Face3> get_faces(uint32_t p_usage_flags) const;
 
diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp
index 40981d468e..72d63fa006 100644
--- a/scene/3d/mesh_instance.cpp
+++ b/scene/3d/mesh_instance.cpp
@@ -30,7 +30,7 @@
 
 #include "skeleton.h"
 #include "physics_body.h"
-
+#include "body_shape.h"
 
 
 bool MeshInstance::_set(const StringName& p_name, const Variant& p_value) {
@@ -181,6 +181,11 @@ void MeshInstance::create_trimesh_collision() {
 	add_child(static_body);
 	if (get_owner())
 		static_body->set_owner( get_owner() );
+	CollisionShape *cshape = memnew( CollisionShape );
+	cshape->set_shape(static_body->get_shape(0));
+	static_body->add_child(cshape);
+	if (get_owner())
+		cshape->set_owner( get_owner() );
 
 }
 
@@ -210,6 +215,12 @@ void MeshInstance::create_convex_collision() {
 	add_child(static_body);
 	if (get_owner())
 		static_body->set_owner( get_owner() );
+	CollisionShape *cshape = memnew( CollisionShape );
+	cshape->set_shape(static_body->get_shape(0));
+	static_body->add_child(cshape);
+	if (get_owner())
+		cshape->set_owner( get_owner() );
+
 
 }
 
@@ -229,9 +240,9 @@ void MeshInstance::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_skeleton_path:NodePath"),&MeshInstance::get_skeleton_path);
 	ObjectTypeDB::bind_method(_MD("get_aabb"),&MeshInstance::get_aabb);
 	ObjectTypeDB::bind_method(_MD("create_trimesh_collision"),&MeshInstance::create_trimesh_collision);
-	ObjectTypeDB::set_method_flags("MeshInstance","create_trimesh_collision",METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR);
+	ObjectTypeDB::set_method_flags("MeshInstance","create_trimesh_collision",METHOD_FLAGS_DEFAULT);
 	ObjectTypeDB::bind_method(_MD("create_convex_collision"),&MeshInstance::create_convex_collision);
-	ObjectTypeDB::set_method_flags("MeshInstance","create_convex_collision",METHOD_FLAGS_DEFAULT|METHOD_FLAG_EDITOR);
+	ObjectTypeDB::set_method_flags("MeshInstance","create_convex_collision",METHOD_FLAGS_DEFAULT);
 	ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "mesh/mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh" ), _SCS("set_mesh"), _SCS("get_mesh"));
 	ADD_PROPERTY( PropertyInfo (Variant::NODE_PATH, "mesh/skeleton"), _SCS("set_skeleton_path"), _SCS("get_skeleton_path"));
 }
diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp
index bcdc50c880..cbaa76e0ca 100644
--- a/scene/main/scene_main_loop.cpp
+++ b/scene/main/scene_main_loop.cpp
@@ -968,6 +968,18 @@ void SceneMainLoop::set_screen_stretch(StretchMode p_mode,StretchAspect p_aspect
 }
 
 
+#ifdef TOOLS_ENABLED
+void SceneMainLoop::set_edited_scene_root(Node *p_node) {
+	edited_scene_root=p_node;
+}
+
+Node *SceneMainLoop::get_edited_scene_root() const {
+
+	return edited_scene_root;
+}
+#endif
+
+
 void SceneMainLoop::_bind_methods() {
 
 
@@ -983,6 +995,10 @@ void SceneMainLoop::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("set_editor_hint","enable"),&SceneMainLoop::set_editor_hint);
 	ObjectTypeDB::bind_method(_MD("is_editor_hint"),&SceneMainLoop::is_editor_hint);
+#ifdef TOOLS_ENABLED
+	ObjectTypeDB::bind_method(_MD("set_edited_scene_root","scene"),&SceneMainLoop::set_edited_scene_root);
+	ObjectTypeDB::bind_method(_MD("get_edited_scene_root"),&SceneMainLoop::get_edited_scene_root);
+#endif
 
 	ObjectTypeDB::bind_method(_MD("set_pause","enable"),&SceneMainLoop::set_pause);
 	ObjectTypeDB::bind_method(_MD("is_paused"),&SceneMainLoop::is_paused);
@@ -1069,6 +1085,8 @@ SceneMainLoop::SceneMainLoop() {
 
 	root->set_physics_object_picking(GLOBAL_DEF("physics/enable_object_picking",true));
 
+	edited_scene_root=NULL;
+
 	ADD_SIGNAL( MethodInfo("idle_frame"));
 	ADD_SIGNAL( MethodInfo("fixed_frame"));
 
diff --git a/scene/main/scene_main_loop.h b/scene/main/scene_main_loop.h
index 493644d2bc..63a6468a73 100644
--- a/scene/main/scene_main_loop.h
+++ b/scene/main/scene_main_loop.h
@@ -102,6 +102,9 @@ private:
 	int64_t current_frame;
 	int node_count;
 
+#ifdef TOOLS_ENABLED
+	Node *edited_scene_root;
+#endif
 	struct UGCall {
 
 		StringName group;
@@ -223,6 +226,10 @@ public:
 
 	void set_screen_stretch(StretchMode p_mode,StretchAspect p_aspect,const Size2 p_minsize);
 
+#ifdef TOOLS_ENABLED
+	void set_edited_scene_root(Node *p_node);
+	Node *get_edited_scene_root() const;
+#endif
 
 	SceneMainLoop();
 	~SceneMainLoop();
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp
index 25d1c8530e..deef9d5876 100644
--- a/scene/main/timer.cpp
+++ b/scene/main/timer.cpp
@@ -36,8 +36,11 @@ void Timer::_notification(int p_what) {
 
 		case NOTIFICATION_READY: {
 
-			if (autostart)
+			if (autostart) {
+				if (get_scene()->is_editor_hint() && get_scene()->get_edited_scene_root() &&  (get_scene()->get_edited_scene_root()==this || get_scene()->get_edited_scene_root()->is_a_parent_of(this)))
+					break;
 				start();
+			}
 		} break;
 		case NOTIFICATION_PROCESS: {
 
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index 4320d4c081..351d65654d 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -36,7 +36,8 @@ static const char*_flag_names[Material::FLAG_MAX]={
 	"invert_faces",
 	"unshaded",
 	"on_top",
-	"lightmap_on_uv2"
+	"lightmap_on_uv2",
+	"colarray_is_srgb"
 };
 
 
@@ -46,7 +47,8 @@ static const Material::Flag _flag_indices[Material::FLAG_MAX]={
 	Material::FLAG_INVERT_FACES,
 	Material::FLAG_UNSHADED,
 	Material::FLAG_ONTOP,
-	Material::FLAG_LIGHTMAP_ON_UV2
+	Material::FLAG_LIGHTMAP_ON_UV2,
+	Material::FLAG_COLOR_ARRAY_SRGB,
 };
 
 
@@ -132,6 +134,8 @@ void Material::_bind_methods() {
 	BIND_CONSTANT( FLAG_INVERT_FACES );
 	BIND_CONSTANT( FLAG_UNSHADED );
 	BIND_CONSTANT( FLAG_ONTOP );
+	BIND_CONSTANT( FLAG_LIGHTMAP_ON_UV2 );
+	BIND_CONSTANT( FLAG_COLOR_ARRAY_SRGB );
 	BIND_CONSTANT( FLAG_MAX );
 
 	BIND_CONSTANT( DEPTH_DRAW_ALWAYS );
@@ -156,6 +160,8 @@ Material::Material(const RID& p_material) {
 	flags[FLAG_INVERT_FACES]=false;
 	flags[FLAG_UNSHADED]=false;
 	flags[FLAG_ONTOP]=false;
+	flags[FLAG_LIGHTMAP_ON_UV2]=true;
+	flags[FLAG_COLOR_ARRAY_SRGB]=false;
 
 	depth_draw_mode=DEPTH_DRAW_OPAQUE_ONLY;
 
@@ -427,7 +433,7 @@ FixedMaterial::FixedMaterial() : Material(VS::get_singleton()->fixed_material_cr
 	param[PARAM_SHADE_PARAM]=0.5;
 	param[PARAM_DETAIL]=1.0;
 
-
+	set_flag(FLAG_COLOR_ARRAY_SRGB,true);
 
 	fixed_flags[FLAG_USE_ALPHA]=false;
 	fixed_flags[FLAG_USE_COLOR_ARRAY]=false;
@@ -589,6 +595,8 @@ ParticleSystemMaterial::ParticleSystemMaterial() :Material(VisualServer::get_sin
 	set_depth_draw_mode(DEPTH_DRAW_NEVER);
 	VisualServer::get_singleton()->fixed_material_set_flag(material,VS::FIXED_MATERIAL_FLAG_USE_ALPHA,true);
 	VisualServer::get_singleton()->fixed_material_set_flag(material,VS::FIXED_MATERIAL_FLAG_USE_COLOR_ARRAY,true);
+	set_flag(FLAG_COLOR_ARRAY_SRGB,true);
+
 }
 
 ParticleSystemMaterial::~ParticleSystemMaterial() {
@@ -659,6 +667,8 @@ UnshadedMaterial::UnshadedMaterial() :Material(VisualServer::get_singleton()->fi
 
 	set_flag(FLAG_UNSHADED,true);
 	set_use_alpha(true);
+	set_flag(FLAG_COLOR_ARRAY_SRGB,true);
+
 }
 
 UnshadedMaterial::~UnshadedMaterial() {
diff --git a/scene/resources/material.h b/scene/resources/material.h
index ad503c43c6..9c3feede08 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -54,6 +54,7 @@ public:
 		FLAG_UNSHADED = VS::MATERIAL_FLAG_UNSHADED,
 		FLAG_ONTOP = VS::MATERIAL_FLAG_ONTOP,
 		FLAG_LIGHTMAP_ON_UV2 = VS::MATERIAL_FLAG_LIGHTMAP_ON_UV2,
+		FLAG_COLOR_ARRAY_SRGB = VS::MATERIAL_FLAG_COLOR_ARRAY_SRGB,
 		FLAG_MAX = VS::MATERIAL_FLAG_MAX
 	};