3D Physics Rework, Other Stuff

-=-=-=-=-=-=-=-=-=-=-=-=-=-

3D Physics:
-Fixed "Bounce" parameter in 3D
-Fixed bug affecting Area (sometims it would not detect properly)
-Vehicle Body has seen heavy work
-Added Query API for doing space queries in 3D. Needs some docs though.
-Added JOINTS! Adapted Bullet Joints: and created easy gizmos for setting them up:
   -PinJoint
   -HingeJoint (with motor)
   -SliderJoint
   -ConeTwistJoint
   -Generic6DOFJoint
-Added OBJECT PICKING! based on the new query API. Any physics object now (Area or Body) has the following signals and virtual functions:
    -input_event (mouse or multitouch input over the body)
    -mouse_enter (mouse entered the body area)
    -mouse_exit (mouse exited body area)
   For Area it needs to be activated manually, as it isn't by default (ray goes thru).

Other:

-Begun working on Windows 8 (RT) port. Compiles but does not work yet.
-Added TheoraPlayer library for improved to-texture and portable video support.
-Fixed a few bugs in the renderer, collada importer, collada exporter, etc.

7 files changed, 717 insertions, 8 deletions

diff --git a/tools/collada/collada.cpp b/tools/collada/collada.cpp
index c416286c19..e29888b433 100644
--- a/tools/collada/collada.cpp
+++ b/tools/collada/collada.cpp
@@ -322,7 +322,7 @@ void Collada::_parse_image(XMLParser& parser) {
 		String path = parser.get_attribute_value("source").strip_edges();
 		if (path.find("://")==-1 && path.is_rel_path()) {
 			// path is relative to file being loaded, so convert to a resource path
-			image.path=Globals::get_singleton()->localize_path(state.local_path.get_base_dir()+"/"+path);
+			image.path=Globals::get_singleton()->localize_path(state.local_path.get_base_dir()+"/"+path.percent_decode());
 
 		}
 	} else {
@@ -338,7 +338,7 @@ void Collada::_parse_image(XMLParser& parser) {
 				if (name=="init_from") {
 
 					parser.read();
-					String path = parser.get_node_data().strip_edges();
+					String path = parser.get_node_data().strip_edges().percent_decode();
 
 					if (path.find("://")==-1 && path.is_rel_path()) {
 						// path is relative to file being loaded, so convert to a resource path
@@ -1683,6 +1683,10 @@ Collada::Node* Collada::_parse_visual_scene_node(XMLParser& parser) {
 		} else if (state.idref_joints.has(name))
 			joint->sid=name; //kind of a cheat but..
 
+		if (joint->sid!="") {
+			state.sid_to_node_map[joint->sid]=id;
+		}
+
 		node=joint;
 
 
@@ -2243,6 +2247,8 @@ void Collada::_create_skeletons(Collada::Node **p_node) {
 
 	Node *node = *p_node;
 
+
+
 	if (node->type==Node::TYPE_JOINT) {
 
 		// ohohohoohoo it's a joint node, time to work!
@@ -2349,6 +2355,79 @@ void Collada::_merge_skeletons(VisualScene *p_vscene,Node *p_node) {
 
 }
 
+
+void Collada::_merge_skeletons2(VisualScene *p_vscene) {
+
+	for (Map<String,SkinControllerData>::Element *E=state.skin_controller_data_map.front();E;E=E->next()) {
+
+		SkinControllerData &cd=E->get();
+
+		NodeSkeleton *skeleton=NULL;
+
+		for (Map<String,Transform>::Element *F=cd.bone_rest_map.front();F;F=F->next()) {
+
+			String name;
+
+			if (!state.sid_to_node_map.has(F->key())) {
+				continue;
+			}
+
+			name = state.sid_to_node_map[F->key()];
+
+			if (!state.scene_map.has(name)) {
+				print_line("no foundie node for: "+name);
+			}
+
+			ERR_CONTINUE( !state.scene_map.has(name) );
+
+			Node *node=state.scene_map[name];
+			ERR_CONTINUE( node->type!=Node::TYPE_JOINT );
+			if (node->type!=Node::TYPE_JOINT)
+				continue;
+			NodeSkeleton *sk=NULL;
+
+			while(node && !sk) {
+
+				if (node->type==Node::TYPE_SKELETON) {
+					sk=static_cast<NodeSkeleton*>(node);
+				}
+				node=node->parent;
+			}
+			ERR_CONTINUE( !sk );
+
+			if (!sk)
+				continue; //bleh
+
+			if (!skeleton) {
+				skeleton=sk;
+				continue;
+			}
+
+			if (skeleton!=sk) {
+				//whoa.. wtf, merge.
+				print_line("MERGED BONES!!");
+
+				//NodeSkeleton *merged = E->get();
+				_remove_node(p_vscene,sk);
+				for(int i=0;i<sk->children.size();i++) {
+
+					_joint_set_owner(sk->children[i],skeleton);
+					skeleton->children.push_back( sk->children[i] );
+					sk->children[i]->parent=skeleton;
+
+
+				}
+
+				sk->children.clear(); //take children from it
+				memdelete( sk );
+			}
+		}
+	}
+
+
+
+}
+
 bool Collada::_optimize_skeletons(VisualScene *p_vscene,Node *p_node) {
 
 	Node *node=p_node;
@@ -2540,6 +2619,9 @@ void Collada::_optimize() {
 			_merge_skeletons(&vs,vs.root_nodes[i]);
 		}
 
+		_merge_skeletons2(&vs);
+
+
 		for(int i=0;i<vs.root_nodes.size();i++) {
 			_optimize_skeletons(&vs,vs.root_nodes[i]);
 		}
diff --git a/tools/collada/collada.h b/tools/collada/collada.h
index 69ed05beba..360f54ec05 100644
--- a/tools/collada/collada.h
+++ b/tools/collada/collada.h
@@ -544,6 +544,7 @@ public:
 		Map<String,VisualScene> visual_scene_map;
 		Map<String,Node*> scene_map;
 		Set<String> idref_joints;
+		Map<String,String> sid_to_node_map;
 		//Map<String,NodeJoint*> bone_map;
 
 		Map<String,Transform> bone_rest_map;
@@ -616,6 +617,7 @@ private: // private stuff
 	void _find_morph_nodes(VisualScene *p_vscene,Node *p_node);
 	bool _remove_node(Node *p_parent,Node *p_node);
 	void _remove_node(VisualScene *p_vscene,Node *p_node);
+	void _merge_skeletons2(VisualScene *p_vscene);
 	void _merge_skeletons(VisualScene *p_vscene,Node *p_node);
 	bool _optimize_skeletons(VisualScene *p_vscene,Node *p_node);
 
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp
index 2dce3fa8f5..9bee47ca66 100644
--- a/tools/editor/io_plugins/editor_import_collada.cpp
+++ b/tools/editor/io_plugins/editor_import_collada.cpp
@@ -1528,6 +1528,10 @@ Error ColladaImport::_create_resources(Collada::Node *p_node) {
 					for(int i=0;i<bone_remap.size();i++) {
 
 						String str = joint_src->sarray[i];
+						if (!bone_remap_map.has(str)) {
+							print_line("bone not found for remap: "+str);
+							print_line("in skeleton: "+skname);
+						}
 						ERR_FAIL_COND_V( !bone_remap_map.has(str), ERR_INVALID_DATA );
 						bone_remap[i]=bone_remap_map[str];
 					}
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
index 170598291a..4a52f4914f 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -418,7 +418,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) {
 	List<String> missing;
 	Error err = plugin->import1(rim,&scene,&missing);
 
-	if (err) {
+	if (err || !scene) {
 
 		error_dialog->set_text("Error importing scene.");
 		error_dialog->popup_centered(Size2(200,100));
@@ -878,6 +878,8 @@ static bool _teststr(const String& p_what,const String& p_str) {
 		return true;
 	if (p_what.to_lower().ends_with("-"+p_str)) //collada only supports "_" and "-" besides letters
 		return true;
+	if (p_what.to_lower().ends_with("_"+p_str)) //collada only supports "_" and "-" besides letters
+		return true;
 	return false;
 }
 
@@ -887,6 +889,8 @@ static String _fixstr(const String& p_what,const String& p_str) {
 		return p_what.replace("$"+p_str,"");
 	if (p_what.to_lower().ends_with("-"+p_str)) //collada only supports "_" and "-" besides letters
 		return p_what.substr(0,p_what.length()-(p_str.length()+1));
+	if (p_what.to_lower().ends_with("_"+p_str)) //collada only supports "_" and "-" besides letters
+		return p_what.substr(0,p_what.length()-(p_str.length()+1));
 	return p_what;
 }
 
diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp
index c2acfed8ff..ddd27af2fb 100644
--- a/tools/editor/spatial_editor_gizmos.cpp
+++ b/tools/editor/spatial_editor_gizmos.cpp
@@ -2260,8 +2260,518 @@ NavigationMeshSpatialGizmo::NavigationMeshSpatialGizmo(NavigationMeshInstance *p
 	navmesh=p_navmesh;

 }

 

+//////

+///

+///

+

+

+

+void PinJointSpatialGizmo::redraw() {

+

+	clear();

+	Vector<Vector3> cursor_points;

+	float cs = 0.25;

+	cursor_points.push_back(Vector3(+cs,0,0));

+	cursor_points.push_back(Vector3(-cs,0,0));

+	cursor_points.push_back(Vector3(0,+cs,0));

+	cursor_points.push_back(Vector3(0,-cs,0));

+	cursor_points.push_back(Vector3(0,0,+cs));

+	cursor_points.push_back(Vector3(0,0,-cs));

+	add_collision_segments(cursor_points);

+	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);

+

+}

+

+

+PinJointSpatialGizmo::PinJointSpatialGizmo(PinJoint* p_p3d) {

+

+	p3d=p_p3d;

+	set_spatial_node(p3d);

+}

+

+////

+

+void HingeJointSpatialGizmo::redraw() {

+

+	clear();

+	Vector<Vector3> cursor_points;

+	float cs = 0.25;

+	/*cursor_points.push_back(Vector3(+cs,0,0));

+	cursor_points.push_back(Vector3(-cs,0,0));

+	cursor_points.push_back(Vector3(0,+cs,0));

+	cursor_points.push_back(Vector3(0,-cs,0));*/

+	cursor_points.push_back(Vector3(0,0,+cs*2));

+	cursor_points.push_back(Vector3(0,0,-cs*2));

+

+	float ll = p3d->get_param(HingeJoint::PARAM_LIMIT_LOWER);

+	float ul = p3d->get_param(HingeJoint::PARAM_LIMIT_UPPER);

+

+	if (p3d->get_flag(HingeJoint::FLAG_USE_LIMIT) && ll<ul) {

+

+		const int points = 32;

+		float step = (ul-ll)/points;

+

+

+		for(int i=0;i<points;i++) {

+

+			float s = ll+i*(ul-ll)/points;

+			float n = ll+(i+1)*(ul-ll)/points;

+

+			Vector3 from=Vector3( -Math::sin(s),Math::cos(s), 0 )*cs;

+			Vector3 to=Vector3( -Math::sin(n),Math::cos(n), 0 )*cs;

+

+			if (i==points-1) {

+				cursor_points.push_back(to);

+				cursor_points.push_back(Vector3());

+			}

+			if (i==0) {

+				cursor_points.push_back(from);

+				cursor_points.push_back(Vector3());

+			}

+

+

+			cursor_points.push_back(from);

+			cursor_points.push_back(to);

+

+

+		}

+

+		cursor_points.push_back(Vector3(0,cs*1.5,0));

+		cursor_points.push_back(Vector3());

+

+	} else {

+

+

+		const int points = 32;

+

+		for(int i=0;i<points;i++) {

+

+			float s = ll+i*(Math_PI*2.0)/points;

+			float n = ll+(i+1)*(Math_PI*2.0)/points;

+

+			Vector3 from=Vector3( -Math::sin(s),Math::cos(s), 0 )*cs;

+			Vector3 to=Vector3( -Math::sin(n),Math::cos(n), 0 )*cs;

+

+			cursor_points.push_back(from);

+			cursor_points.push_back(to);

+

+		}

+

+	}

+	add_collision_segments(cursor_points);

+	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);

+

+}

+

+

+HingeJointSpatialGizmo::HingeJointSpatialGizmo(HingeJoint* p_p3d) {

+

+	p3d=p_p3d;

+	set_spatial_node(p3d);

+}

+

+///////

+///

+////

+

+void SliderJointSpatialGizmo::redraw() {

+

+	clear();

+	Vector<Vector3> cursor_points;

+	float cs = 0.25;

+	/*cursor_points.push_back(Vector3(+cs,0,0));

+	cursor_points.push_back(Vector3(-cs,0,0));

+	cursor_points.push_back(Vector3(0,+cs,0));

+	cursor_points.push_back(Vector3(0,-cs,0));*/

+	cursor_points.push_back(Vector3(0,0,+cs*2));

+	cursor_points.push_back(Vector3(0,0,-cs*2));

+

+	float ll = p3d->get_param(SliderJoint::PARAM_ANGULAR_LIMIT_LOWER);

+	float ul = p3d->get_param(SliderJoint::PARAM_ANGULAR_LIMIT_UPPER);

+	float lll = -p3d->get_param(SliderJoint::PARAM_LINEAR_LIMIT_LOWER);

+	float lul = -p3d->get_param(SliderJoint::PARAM_LINEAR_LIMIT_UPPER);

+

+	if (lll>lul) {

+

+		cursor_points.push_back(Vector3(lul,0,0));

+		cursor_points.push_back(Vector3(lll,0,0));

+

+		cursor_points.push_back(Vector3(lul,-cs,-cs));

+		cursor_points.push_back(Vector3(lul,-cs,cs));

+		cursor_points.push_back(Vector3(lul,-cs,cs));

+		cursor_points.push_back(Vector3(lul,cs,cs));

+		cursor_points.push_back(Vector3(lul,cs,cs));

+		cursor_points.push_back(Vector3(lul,cs,-cs));

+		cursor_points.push_back(Vector3(lul,cs,-cs));

+		cursor_points.push_back(Vector3(lul,-cs,-cs));

+

+

+		cursor_points.push_back(Vector3(lll,-cs,-cs));

+		cursor_points.push_back(Vector3(lll,-cs,cs));

+		cursor_points.push_back(Vector3(lll,-cs,cs));

+		cursor_points.push_back(Vector3(lll,cs,cs));

+		cursor_points.push_back(Vector3(lll,cs,cs));

+		cursor_points.push_back(Vector3(lll,cs,-cs));

+		cursor_points.push_back(Vector3(lll,cs,-cs));

+		cursor_points.push_back(Vector3(lll,-cs,-cs));

+

+

+	} else {

+

+		cursor_points.push_back(Vector3(+cs*2,0,0));

+		cursor_points.push_back(Vector3(-cs*2,0,0));

+

+	}

+

+	if (ll<ul) {

+

+		const int points = 32;

+		float step = (ul-ll)/points;

+

+

+		for(int i=0;i<points;i++) {

+

+			float s = ll+i*(ul-ll)/points;

+			float n = ll+(i+1)*(ul-ll)/points;

+

+			Vector3 from=Vector3(0, Math::cos(s), -Math::sin(s) )*cs;

+			Vector3 to=Vector3(0,Math::cos(n),  -Math::sin(n) )*cs;

+

+			if (i==points-1) {

+				cursor_points.push_back(to);

+				cursor_points.push_back(Vector3());

+			}

+			if (i==0) {

+				cursor_points.push_back(from);

+				cursor_points.push_back(Vector3());

+			}

+

+

+			cursor_points.push_back(from);

+			cursor_points.push_back(to);

+

+

+		}

+

+		cursor_points.push_back(Vector3(0,cs*1.5,0));

+		cursor_points.push_back(Vector3());

+

+	} else {

+

+

+		const int points = 32;

+

+		for(int i=0;i<points;i++) {

+

+			float s = ll+i*(Math_PI*2.0)/points;

+			float n = ll+(i+1)*(Math_PI*2.0)/points;

+

+			Vector3 from=Vector3(0,Math::cos(s),-Math::sin(s) )*cs;

+			Vector3 to=Vector3( 0,Math::cos(n),-Math::sin(n) )*cs;

+

+			cursor_points.push_back(from);

+			cursor_points.push_back(to);

+

+		}

+

+	}

+	add_collision_segments(cursor_points);

+	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);

+

+}

+

+

+SliderJointSpatialGizmo::SliderJointSpatialGizmo(SliderJoint* p_p3d) {

+

+	p3d=p_p3d;

+	set_spatial_node(p3d);

+}

+

+///////

+///

+////

+

+void ConeTwistJointSpatialGizmo::redraw() {

+

+	clear();

+	float cs = 0.25;

+	Vector<Vector3> points;

+

+	float r = 1.0;

+	float w = r*Math::sin(p3d->get_param(ConeTwistJoint::PARAM_SWING_SPAN));

+	float d = r*Math::cos(p3d->get_param(ConeTwistJoint::PARAM_SWING_SPAN));

+

+

+	//swing

+	for(int i=0;i<360;i+=10) {

+

+		float ra=Math::deg2rad(i);

+		float rb=Math::deg2rad(i+10);

+		Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w;

+		Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w;

+

+		/*points.push_back(Vector3(a.x,0,a.y));

+		points.push_back(Vector3(b.x,0,b.y));

+		points.push_back(Vector3(0,a.x,a.y));

+		points.push_back(Vector3(0,b.x,b.y));*/

+		points.push_back(Vector3(d,a.x,a.y));

+		points.push_back(Vector3(d,b.x,b.y));

+

+		if (i%90==0) {

+

+			points.push_back(Vector3(d,a.x,a.y));

+			points.push_back(Vector3());

+

+		}

+	}

+

+	points.push_back(Vector3());

+	points.push_back(Vector3(1,0,0));

+

+	//twist

+	/*

+	 */

+	float ts=Math::rad2deg(p3d->get_param(ConeTwistJoint::PARAM_TWIST_SPAN));

+	ts=MIN(ts,720);

+

+

+	for(int i=0;i<int(ts);i+=5) {

+

+		float ra=Math::deg2rad(i);

+		float rb=Math::deg2rad(i+5);

+		float c = i/720.0;

+		float cn = (i+5)/720.0;

+		Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w*c;

+		Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w*cn;

+

+		/*points.push_back(Vector3(a.x,0,a.y));

+		points.push_back(Vector3(b.x,0,b.y));

+		points.push_back(Vector3(0,a.x,a.y));

+		points.push_back(Vector3(0,b.x,b.y));*/

+

+		points.push_back(Vector3(c,a.x,a.y));

+		points.push_back(Vector3(cn,b.x,b.y));

+

+	}

+

+

+	add_collision_segments(points);

+	add_lines(points,SpatialEditorGizmos::singleton->joint_material);

+

+}

+

+

+ConeTwistJointSpatialGizmo::ConeTwistJointSpatialGizmo(ConeTwistJoint* p_p3d) {

+

+	p3d=p_p3d;

+	set_spatial_node(p3d);

+}

 

 ////////

+/// \brief SpatialEditorGizmos::singleton

+///

+///////

+///

+////

+

+void Generic6DOFJointSpatialGizmo::redraw() {

+

+	clear();

+	Vector<Vector3> cursor_points;

+	float cs = 0.25;

+

+	for(int ax=0;ax<3;ax++) {

+		/*cursor_points.push_back(Vector3(+cs,0,0));

+		cursor_points.push_back(Vector3(-cs,0,0));

+		cursor_points.push_back(Vector3(0,+cs,0));

+		cursor_points.push_back(Vector3(0,-cs,0));

+		cursor_points.push_back(Vector3(0,0,+cs*2));

+		cursor_points.push_back(Vector3(0,0,-cs*2)); */

+

+		float ll;

+		float ul;

+		float lll;

+		float lul;

+

+		int a1,a2,a3;

+		bool enable_ang;

+		bool enable_lin;

+

+		switch(ax) {

+			case 0:

+				ll = p3d->get_param_x(Generic6DOFJoint::PARAM_ANGULAR_LOWER_LIMIT);

+				ul = p3d->get_param_x(Generic6DOFJoint::PARAM_ANGULAR_UPPER_LIMIT);

+				lll = -p3d->get_param_x(Generic6DOFJoint::PARAM_LINEAR_LOWER_LIMIT);

+				lul = -p3d->get_param_x(Generic6DOFJoint::PARAM_LINEAR_UPPER_LIMIT);

+				enable_ang = p3d->get_flag_x(Generic6DOFJoint::FLAG_ENABLE_ANGULAR_LIMIT);

+				enable_lin = p3d->get_flag_x(Generic6DOFJoint::FLAG_ENABLE_LINEAR_LIMIT);

+				a1=0;

+				a2=1;

+				a3=2;

+			break;

+			case 1:

+				ll = p3d->get_param_y(Generic6DOFJoint::PARAM_ANGULAR_LOWER_LIMIT);

+				ul = p3d->get_param_y(Generic6DOFJoint::PARAM_ANGULAR_UPPER_LIMIT);

+				lll = -p3d->get_param_y(Generic6DOFJoint::PARAM_LINEAR_LOWER_LIMIT);

+				lul = -p3d->get_param_y(Generic6DOFJoint::PARAM_LINEAR_UPPER_LIMIT);

+				enable_ang = p3d->get_flag_y(Generic6DOFJoint::FLAG_ENABLE_ANGULAR_LIMIT);

+				enable_lin = p3d->get_flag_y(Generic6DOFJoint::FLAG_ENABLE_LINEAR_LIMIT);

+				a1=2;

+				a2=0;

+				a3=1;

+			break;

+			case 2:

+				ll = p3d->get_param_z(Generic6DOFJoint::PARAM_ANGULAR_LOWER_LIMIT);

+				ul = p3d->get_param_z(Generic6DOFJoint::PARAM_ANGULAR_UPPER_LIMIT);

+				lll = -p3d->get_param_z(Generic6DOFJoint::PARAM_LINEAR_LOWER_LIMIT);

+				lul = -p3d->get_param_z(Generic6DOFJoint::PARAM_LINEAR_UPPER_LIMIT);

+				enable_ang = p3d->get_flag_z(Generic6DOFJoint::FLAG_ENABLE_ANGULAR_LIMIT);

+				enable_lin = p3d->get_flag_z(Generic6DOFJoint::FLAG_ENABLE_LINEAR_LIMIT);

+

+				a1=1;

+				a2=2;

+				a3=0;

+			break;

+		}

+

+#define ADD_VTX(x,y,z)\

+		{\

+			Vector3 v;\

+			v[a1]=(x);\

+			v[a2]=(y);\

+			v[a3]=(z);\

+			cursor_points.push_back(v);\

+		}

+

+#define SET_VTX(what,x,y,z)\

+		{\

+			Vector3 v;\

+			v[a1]=(x);\

+			v[a2]=(y);\

+			v[a3]=(z);\

+			what=v;\

+		}

+

+

+

+

+		if (enable_lin && lll>=lul) {

+

+			ADD_VTX(lul,0,0);

+			ADD_VTX(lll,0,0);

+

+			ADD_VTX(lul,-cs,-cs);

+			ADD_VTX(lul,-cs,cs);

+			ADD_VTX(lul,-cs,cs);

+			ADD_VTX(lul,cs,cs);

+			ADD_VTX(lul,cs,cs);

+			ADD_VTX(lul,cs,-cs);

+			ADD_VTX(lul,cs,-cs);

+			ADD_VTX(lul,-cs,-cs);

+

+

+			ADD_VTX(lll,-cs,-cs);

+			ADD_VTX(lll,-cs,cs);

+			ADD_VTX(lll,-cs,cs);

+			ADD_VTX(lll,cs,cs);

+			ADD_VTX(lll,cs,cs);

+			ADD_VTX(lll,cs,-cs);

+			ADD_VTX(lll,cs,-cs);

+			ADD_VTX(lll,-cs,-cs);

+

+

+		} else {

+

+			ADD_VTX(+cs*2,0,0);

+			ADD_VTX(-cs*2,0,0);

+

+		}

+

+		if (enable_ang && ll<=ul) {

+

+			const int points = 32;

+			float step = (ul-ll)/points;

+

+

+			for(int i=0;i<points;i++) {

+

+				float s = ll+i*(ul-ll)/points;

+				float n = ll+(i+1)*(ul-ll)/points;

+

+				Vector3 from;

+				SET_VTX(from,0, Math::cos(s), -Math::sin(s) );

+				from*=cs;

+				Vector3 to;

+				SET_VTX(to,0,Math::cos(n),  -Math::sin(n));

+				to*=cs;

+

+				if (i==points-1) {

+					cursor_points.push_back(to);

+					cursor_points.push_back(Vector3());

+				}

+				if (i==0) {

+					cursor_points.push_back(from);

+					cursor_points.push_back(Vector3());

+				}

+

+

+				cursor_points.push_back(from);

+				cursor_points.push_back(to);

+

+

+			}

+

+			ADD_VTX(0,cs*1.5,0);

+			cursor_points.push_back(Vector3());

+

+		} else {

+

+

+			const int points = 32;

+

+			for(int i=0;i<points;i++) {

+

+				float s = ll+i*(Math_PI*2.0)/points;

+				float n = ll+(i+1)*(Math_PI*2.0)/points;

+

+//				Vector3 from=Vector3(0,Math::cos(s),-Math::sin(s) )*cs;

+//				Vector3 to=Vector3( 0,Math::cos(n),-Math::sin(n) )*cs;

+

+				Vector3 from;

+				SET_VTX(from,0, Math::cos(s), -Math::sin(s) );

+				from*=cs;

+				Vector3 to;

+				SET_VTX(to,0,Math::cos(n),  -Math::sin(n));

+				to*=cs;

+

+				cursor_points.push_back(from);

+				cursor_points.push_back(to);

+

+			}

+

+		}

+	}

+

+#undef ADD_VTX

+#undef SET_VTX

+

+	add_collision_segments(cursor_points);

+	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);

+

+}

+

+

+Generic6DOFJointSpatialGizmo::Generic6DOFJointSpatialGizmo(Generic6DOFJoint* p_p3d) {

+

+	p3d=p_p3d;

+	set_spatial_node(p3d);

+}

+

+///////

+///

+////

+

+

 SpatialEditorGizmos *SpatialEditorGizmos::singleton=NULL;

 

 Ref<SpatialEditorGizmo> SpatialEditorGizmos::get_gizmo(Spatial *p_spatial) {

@@ -2361,6 +2871,35 @@ Ref<SpatialEditorGizmo> SpatialEditorGizmos::get_gizmo(Spatial *p_spatial) {
 		Ref<VehicleWheelSpatialGizmo> misg = memnew( VehicleWheelSpatialGizmo(p_spatial->cast_to<VehicleWheel>()) );

 		return misg;

 	}

+	if (p_spatial->cast_to<PinJoint>()) {

+

+		Ref<PinJointSpatialGizmo> misg = memnew( PinJointSpatialGizmo(p_spatial->cast_to<PinJoint>()) );

+		return misg;

+	}

+

+	if (p_spatial->cast_to<HingeJoint>()) {

+

+		Ref<HingeJointSpatialGizmo> misg = memnew( HingeJointSpatialGizmo(p_spatial->cast_to<HingeJoint>()) );

+		return misg;

+	}

+

+	if (p_spatial->cast_to<SliderJoint>()) {

+

+		Ref<SliderJointSpatialGizmo> misg = memnew( SliderJointSpatialGizmo(p_spatial->cast_to<SliderJoint>()) );

+		return misg;

+	}

+

+	if (p_spatial->cast_to<ConeTwistJoint>()) {

+

+		Ref<ConeTwistJointSpatialGizmo> misg = memnew( ConeTwistJointSpatialGizmo(p_spatial->cast_to<ConeTwistJoint>()) );

+		return misg;

+	}

+

+	if (p_spatial->cast_to<Generic6DOFJoint>()) {

+

+		Ref<Generic6DOFJointSpatialGizmo> misg = memnew( Generic6DOFJointSpatialGizmo(p_spatial->cast_to<Generic6DOFJoint>()) );

+		return misg;

+	}

 

 	return Ref<SpatialEditorGizmo>();

 }

@@ -2494,6 +3033,7 @@ SpatialEditorGizmos::SpatialEditorGizmos() {
 	raycast_material = create_line_material(Color(1.0,0.8,0.6));

 	car_wheel_material = create_line_material(Color(0.6,0.8,1.0));

 	visibility_notifier_material = create_line_material(Color(1.0,0.5,1.0));

+	joint_material = create_line_material(Color(0.6,0.8,1.0));

 

 	stream_player_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));

 	stream_player_icon->set_flag(Material::FLAG_UNSHADED, true);

diff --git a/tools/editor/spatial_editor_gizmos.h b/tools/editor/spatial_editor_gizmos.h
index f519b84a29..c2aeeaf7a2 100644
--- a/tools/editor/spatial_editor_gizmos.h
+++ b/tools/editor/spatial_editor_gizmos.h
@@ -46,6 +46,7 @@
 #include "scene/3d/navigation_mesh.h"

 #include "scene/3d/car_body.h"

 #include "scene/3d/vehicle_body.h"

+#include "scene/3d/physics_joint.h"

 

 

 class Camera;

@@ -368,6 +369,74 @@ public:
 };

 

 

+class PinJointSpatialGizmo  : public SpatialGizmoTool {

+

+	OBJ_TYPE(PinJointSpatialGizmo,SpatialGizmoTool);

+

+	PinJoint* p3d;

+

+public:

+

+	void redraw();

+	PinJointSpatialGizmo(PinJoint* p_p3d=NULL);

+

+};

+

+

+class HingeJointSpatialGizmo  : public SpatialGizmoTool {

+

+	OBJ_TYPE(HingeJointSpatialGizmo,SpatialGizmoTool);

+

+	HingeJoint* p3d;

+

+public:

+

+	void redraw();

+	HingeJointSpatialGizmo(HingeJoint* p_p3d=NULL);

+

+};

+

+class SliderJointSpatialGizmo  : public SpatialGizmoTool {

+

+	OBJ_TYPE(SliderJointSpatialGizmo,SpatialGizmoTool);

+

+	SliderJoint* p3d;

+

+public:

+

+	void redraw();

+	SliderJointSpatialGizmo(SliderJoint* p_p3d=NULL);

+

+};

+

+class ConeTwistJointSpatialGizmo  : public SpatialGizmoTool {

+

+	OBJ_TYPE(ConeTwistJointSpatialGizmo,SpatialGizmoTool);

+

+	ConeTwistJoint* p3d;

+

+public:

+

+	void redraw();

+	ConeTwistJointSpatialGizmo(ConeTwistJoint* p_p3d=NULL);

+

+};

+

+

+class Generic6DOFJointSpatialGizmo  : public SpatialGizmoTool {

+

+	OBJ_TYPE(Generic6DOFJointSpatialGizmo,SpatialGizmoTool);

+

+	Generic6DOFJoint* p3d;

+

+public:

+

+	void redraw();

+	Generic6DOFJointSpatialGizmo(Generic6DOFJoint* p_p3d=NULL);

+

+};

+

+

 class SpatialEditorGizmos  {

 public:

 

@@ -385,6 +454,7 @@ public:
 	Ref<FixedMaterial> raycast_material;

 	Ref<FixedMaterial> visibility_notifier_material;

 	Ref<FixedMaterial> car_wheel_material;

+	Ref<FixedMaterial> joint_material;

 

 	Ref<FixedMaterial> navmesh_edge_material;

 	Ref<FixedMaterial> navmesh_solid_material;

diff --git a/tools/export/blender25/io_scene_dae/export_dae.py b/tools/export/blender25/io_scene_dae/export_dae.py
index ec907a998d..cd785fca40 100644
--- a/tools/export/blender25/io_scene_dae/export_dae.py
+++ b/tools/export/blender25/io_scene_dae/export_dae.py
@@ -317,14 +317,14 @@ class DaeExporter:
 
 	def export_mesh(self,node,armature=None):
 
+		if (node.data in self.mesh_cache):
+			return self.mesh_cache[mesh]
+
 		if (len(node.modifiers) and self.config["use_mesh_modifiers"]):
 			mesh=node.to_mesh(self.scene,True,"RENDER") #is this allright?
 		else:
 			mesh=node.data
 
-		if (mesh in self.mesh_cache):
-			return self.mesh_cache[mesh]
-
 		mesh.update(calc_tessface=True)
 		vertices=[]
 		vertex_map={}
@@ -519,7 +519,7 @@ class DaeExporter:
 		meshdata={}
 		meshdata["id"]=meshid
 		meshdata["material_assign"]=mat_assign
-		self.mesh_cache[mesh]=meshdata
+		self.mesh_cache[node.data]=meshdata
 
 
 		# Export armature data (if armature exists)
@@ -1094,7 +1094,14 @@ class DaeExporter:
 						mtx = posebone.matrix.copy()
 						if (bone.parent):
 							parent_posebone=node.pose.bones[bone.parent.name]
-							mtx = parent_posebone.matrix.inverted() * mtx
+							parent_invisible=False
+
+							for i in range(3):
+								if (parent_posebone.scale[i]==0.0):
+								    parent_invisible=True
+
+							if (not parent_invisible):
+								mtx = parent_posebone.matrix.inverted() * mtx
 
 
 						xform_cache[bone_name].append( (key,mtx) )