asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added 'convcol' flag for importing meshes as convex collision and completed code

Browse source 
for parsing collision flags to mesh data.
This commit is contained in:
Saracen 2017-11-16 13:06:30 +00:00
parent 35e7f99299
commit f8a95499bd
1 changed files with 68 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
editor/import/resource_importer_scene.cpp
View file

@ -232,16 +232,26 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Array
}
}
if (_teststr(name, "colonly")) {
if (_teststr(name, "colonly") || _teststr(name, "convcolonly")) {
if (isroot)
return p_node;
MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
if (mi) {
Node *col = mi->create_trimesh_collision_node();
ERR_FAIL_COND_V(!col, NULL);
Node *col;
if (_teststr(name, "colonly")) {
col = mi->create_trimesh_collision_node();
ERR_FAIL_COND_V(!col, NULL);
col->set_name(_fixstr(name, "colonly"));
} else {
col = mi->create_convex_collision_node();
ERR_FAIL_COND_V(!col, NULL);
col->set_name(_fixstr(name, "convcolonly"));
}
col->set_name(_fixstr(name, "colonly"));
Object::cast_to<Spatial>(col)->set_transform(mi->get_transform());
p_node->replace_by(col);
memdelete(p_node);
@ -328,15 +338,25 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Array
rb->add_child(colshape);
colshape->set_owner(p_node->get_owner());
} else if (_teststr(name, "col") && Object::cast_to<MeshInstance>(p_node)) {
} else if ((_teststr(name, "col") || (_teststr(name, "convcol"))) && Object::cast_to<MeshInstance>(p_node)) {
MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
Node *col;
mi->set_name(_fixstr(name, "col"));
Node *col = mi->create_trimesh_collision_node();
ERR_FAIL_COND_V(!col, NULL);
if (_teststr(name, "col")) {
mi->set_name(_fixstr(name, "col"));
col = mi->create_trimesh_collision_node();
ERR_FAIL_COND_V(!col, NULL);
col->set_name("col");
} else {
mi->set_name(_fixstr(name, "convcol"));
col = mi->create_convex_collision_node();
ERR_FAIL_COND_V(!col, NULL);
col->set_name("convcol");
}
col->set_name("col");
p_node->add_child(col);
StaticBody *sb = Object::cast_to<StaticBody>(col);
@ -527,26 +547,55 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Array
#endif
} else if (Object::cast_to<MeshInstance>(p_node)) {
//last attempt, maybe collision insde the mesh data
//last attempt, maybe collision inside the mesh data
MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
Ref<ArrayMesh> mesh = mi->get_mesh();
if (!mesh.is_null()) {
if (_teststr(mesh->get_name(), "col")) {
mesh->set_name(_fixstr(mesh->get_name(), "col"));
if (_teststr(mesh->get_name(), "col") || _teststr(mesh->get_name(), "convcol")) {
Ref<Shape> shape;
if (_teststr(mesh->get_name(), "col")) {
mesh->set_name(_fixstr(mesh->get_name(), "col"));
if (collision_map.has(mesh)) {
shape = collision_map[mesh];
if (collision_map.has(mesh)) {
shape = collision_map[mesh];
} else {
} else {
shape = mesh->create_trimesh_shape();
if (!shape.is_null())
collision_map[mesh] = shape;
shape = mesh->create_trimesh_shape();
if (!shape.is_null())
collision_map[mesh] = shape;
}
} else if (_teststr(mesh->get_name(), "convcol")) {
mesh->set_name(_fixstr(mesh->get_name(), "convcol"));
if (collision_map.has(mesh)) {
shape = collision_map[mesh];
} else {
shape = mesh->create_convex_shape();
if (!shape.is_null())
collision_map[mesh] = shape;
}
}
if (!shape.is_null()) {
StaticBody *col = memnew(StaticBody);
CollisionShape *cshape = memnew(CollisionShape);
cshape->set_shape(shape);
col->add_child(cshape);
col->set_transform(mi->get_transform());
col->set_name(mi->get_name());
p_node->replace_by(col);
memdelete(p_node);
p_node = col;
cshape->set_name("shape");
cshape->set_owner(p_node->get_owner());
}
}
}