From 8cab401d08f8e25aa9b2dc710204785858ff3dbb Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 15 Sep 2014 11:33:30 -0300 Subject: 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. --- tools/editor/io_plugins/editor_import_collada.cpp | 4 ++++ tools/editor/io_plugins/editor_scene_import_plugin.cpp | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'tools/editor/io_plugins') 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;isarray[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 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; } -- cgit v1.2.3