Relintai/mesh_data_resource
1
0
Fork 0
mirror of https://github.com/Relintai/mesh_data_resource.git synced 2024-11-12 10:15:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented collision shape scaling.

Browse Source
This commit is contained in:
Relintai 2020-06-29 00:16:09 +02:00
parent 95b565e2a4
commit 3fc8fa0ce2
4 changed files with 170 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
plugin_collada/editor_import_collada_mdr.cpp
View File

@ -71,6 +71,8 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String &
Node *n = _importer->import_scene(p_source_file, 0, 15);
Vector3 scale = p_options["scale"];
if (n == NULL) {
n->queue_delete();
return Error::ERR_PARSE_ERROR;
@ -104,7 +106,7 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String &
Ref<Shape> shape = m->create_trimesh_shape();
if (!shape.is_null()) {
mdr->add_collision_shape(shape);
mdr->add_collision_shape(scale_shape(shape, scale));
}
} else if (collider_type == MeshDataResource::COLLIDER_TYPE_SINGLE_CONVEX_COLLISION_SHAPE) {
Ref<ArrayMesh> m;
@ -114,7 +116,7 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String &
Ref<Shape> shape = mesh->create_convex_shape();
if (!shape.is_null()) {
mdr->add_collision_shape(shape);
mdr->add_collision_shape(scale_shape(shape, scale));
}
} else if (collider_type == MeshDataResource::COLLIDER_TYPE_MULTIPLE_CONVEX_COLLISION_SHAPES) {
Ref<ArrayMesh> m;
@ -123,6 +125,10 @@ Error EditorImportColladaMdr::import(const String &p_source_file, const String &
Vector<Ref<Shape> > shapes = mesh->convex_decompose();
for (int j = 0; j < shapes.size(); ++j) {
scale_shape(shapes[j], scale);
}
mdr->set_collision_shapes(shapes);
}
@ -188,6 +194,78 @@ Array EditorImportColladaMdr::apply_transforms(Array &array, const Map<StringNam
return array;
}
Ref<Shape> EditorImportColladaMdr::scale_shape(Ref<Shape> shape, const Vector3 &scale) {
if (shape.is_null())
return shape;
if (Object::cast_to<SphereShape>(*shape)) {
Ref<SphereShape> ss = shape;
ss->set_radius(ss->get_radius() * MAX(scale.x, MAX(scale.y, scale.z)));
}
if (Object::cast_to<BoxShape>(*shape)) {
Ref<BoxShape> bs = shape;
bs->set_extents(bs->get_extents() * scale);
}
if (Object::cast_to<CapsuleShape>(*shape)) {
Ref<CapsuleShape> cs = shape;
float sc = MAX(scale.x, MAX(scale.y, scale.z));
cs->set_radius(cs->get_radius() * sc);
cs->set_height(cs->get_height() * sc);
}
if (Object::cast_to<CylinderShape>(*shape)) {
Ref<CylinderShape> cs = shape;
float sc = MAX(scale.x, MAX(scale.y, scale.z));
cs->set_radius(cs->get_radius() * sc);
cs->set_height(cs->get_height() * sc);
}
if (Object::cast_to<ConcavePolygonShape>(*shape)) {
Ref<ConcavePolygonShape> cps = shape;
PoolVector3Array arr = cps->get_faces();
Basis b = Basis().scaled(scale);
for (int i = 0; i < arr.size(); ++i) {
arr.set(i, b.xform(arr[i]));
}
cps->set_faces(arr);
}
if (Object::cast_to<ConvexPolygonShape>(*shape)) {
Ref<ConvexPolygonShape> cps = shape;
PoolVector3Array arr = cps->get_points();
Basis b = Basis().scaled(scale);
for (int i = 0; i < arr.size(); ++i) {
arr.set(i, b.xform(arr[i]));
}
cps->set_points(arr);
}
return shape;
}
EditorImportColladaMdr::EditorImportColladaMdr() {
_importer.instance();
}

1
plugin_collada/editor_import_collada_mdr.h
View File

@ -66,6 +66,7 @@ public:
virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = NULL, Variant *r_metadata = NULL);
Array apply_transforms(Array &array, const Map<StringName, Variant> &p_options);
Ref<Shape> scale_shape(Ref<Shape> shape, const Vector3 &scale);
EditorImportColladaMdr();
~EditorImportColladaMdr();

90
plugin_gltf/editor_import_gltf_mdr.cpp
View File

@ -22,6 +22,14 @@ SOFTWARE.
#include "editor_import_gltf_mdr.h"
#include "scene/resources/box_shape.h"
#include "scene/resources/capsule_shape.h"
#include "scene/resources/concave_polygon_shape.h"
#include "scene/resources/convex_polygon_shape.h"
#include "scene/resources/cylinder_shape.h"
#include "scene/resources/shape.h"
#include "scene/resources/sphere_shape.h"
String EditorImportGLTFMdr::get_importer_name() const {
return "gltf_mdr";
}
@ -72,6 +80,8 @@ Error EditorImportGLTFMdr::import(const String &p_source_file, const String &p_s
Node *n = _importer->import_scene(p_source_file, 0, 15);
Vector3 scale = p_options["scale"];
if (n == NULL) {
n->queue_delete();
return Error::ERR_PARSE_ERROR;
@ -105,7 +115,7 @@ Error EditorImportGLTFMdr::import(const String &p_source_file, const String &p_s
Ref<Shape> shape = m->create_trimesh_shape();
if (!shape.is_null()) {
mdr->add_collision_shape(shape);
mdr->add_collision_shape(scale_shape(shape, scale));
}
} else if (collider_type == MeshDataResource::COLLIDER_TYPE_SINGLE_CONVEX_COLLISION_SHAPE) {
Ref<ArrayMesh> m;
@ -115,7 +125,7 @@ Error EditorImportGLTFMdr::import(const String &p_source_file, const String &p_s
Ref<Shape> shape = mesh->create_convex_shape();
if (!shape.is_null()) {
mdr->add_collision_shape(shape);
mdr->add_collision_shape(scale_shape(shape, scale));
}
} else if (collider_type == MeshDataResource::COLLIDER_TYPE_MULTIPLE_CONVEX_COLLISION_SHAPES) {
Ref<ArrayMesh> m;
@ -124,6 +134,10 @@ Error EditorImportGLTFMdr::import(const String &p_source_file, const String &p_s
Vector<Ref<Shape> > shapes = mesh->convex_decompose();
for (int j = 0; j < shapes.size(); ++j) {
scale_shape(shapes[j], scale);
}
mdr->set_collision_shapes(shapes);
}
@ -188,6 +202,78 @@ Array EditorImportGLTFMdr::apply_transforms(Array &array, const Map<StringName,
return array;
}
Ref<Shape> EditorImportGLTFMdr::scale_shape(Ref<Shape> shape, const Vector3 &scale) {
if (shape.is_null())
return shape;
if (Object::cast_to<SphereShape>(*shape)) {
Ref<SphereShape> ss = shape;
ss->set_radius(ss->get_radius() * MAX(scale.x, MAX(scale.y, scale.z)));
}
if (Object::cast_to<BoxShape>(*shape)) {
Ref<BoxShape> bs = shape;
bs->set_extents(bs->get_extents() * scale);
}
if (Object::cast_to<CapsuleShape>(*shape)) {
Ref<CapsuleShape> cs = shape;
float sc = MAX(scale.x, MAX(scale.y, scale.z));
cs->set_radius(cs->get_radius() * sc);
cs->set_height(cs->get_height() * sc);
}
if (Object::cast_to<CylinderShape>(*shape)) {
Ref<CylinderShape> cs = shape;
float sc = MAX(scale.x, MAX(scale.y, scale.z));
cs->set_radius(cs->get_radius() * sc);
cs->set_height(cs->get_height() * sc);
}
if (Object::cast_to<ConcavePolygonShape>(*shape)) {
Ref<ConcavePolygonShape> cps = shape;
PoolVector3Array arr = cps->get_faces();
Basis b = Basis().scaled(scale);
for (int i = 0; i < arr.size(); ++i) {
arr.set(i, b.xform(arr[i]));
}
cps->set_faces(arr);
}
if (Object::cast_to<ConvexPolygonShape>(*shape)) {
Ref<ConvexPolygonShape> cps = shape;
PoolVector3Array arr = cps->get_points();
Basis b = Basis().scaled(scale);
for (int i = 0; i < arr.size(); ++i) {
arr.set(i, b.xform(arr[i]));
}
cps->set_points(arr);
}
return shape;
}
EditorImportGLTFMdr::EditorImportGLTFMdr() {
_importer.instance();
}

1
plugin_gltf/editor_import_gltf_mdr.h
View File

@ -66,6 +66,7 @@ public:
virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = NULL, Variant *r_metadata = NULL);
Array apply_transforms(Array &array, const Map<StringName, Variant> &p_options);
Ref<Shape> scale_shape(Ref<Shape> shape, const Vector3 &scale);
EditorImportGLTFMdr();
~EditorImportGLTFMdr();