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

Now MeshDataResource also calculates, and stores it's mesh's AABB.

Browse Source
This commit is contained in:
Relintai 2020-08-16 11:33:55 +02:00
parent a9bab9896d
commit 81343fa839
3 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mesh_data_resource.cpp
View File

@ -33,6 +33,15 @@ void MeshDataResource::set_array(const Array &p_arrays) {
_arrays.clear();
_arrays = p_arrays.duplicate(true);
recompute_aabb();
}
AABB MeshDataResource::get_aabb() {
return _aabb;
}
void MeshDataResource::set_aabb(const AABB &aabb) {
_aabb = aabb;
}
void MeshDataResource::add_collision_shape(const Transform &transform, const Ref<Shape> &shape) {
@ -84,6 +93,27 @@ void MeshDataResource::set_collision_shapes(const Vector<Variant> &p_arrays) {
}
}
void MeshDataResource::recompute_aabb() {
Variant arr = _arrays[Mesh::ARRAY_VERTEX];
PoolVector<Vector3> vertices = arr;
int len = vertices.size();
ERR_FAIL_COND(len == 0);
PoolVector<Vector3>::Read r = vertices.read();
const Vector3 *vtx = r.ptr();
AABB aabb;
for (int i = 0; i < len; i++) {
if (i == 0)
aabb.position = vtx[i];
else
aabb.expand_to(vtx[i]);
}
_aabb = aabb;
}
MeshDataResource::MeshDataResource() {
}
@ -97,6 +127,10 @@ void MeshDataResource::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_array", "array"), &MeshDataResource::set_array);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "array"), "set_array", "get_array");
ClassDB::bind_method(D_METHOD("get_aabb"), &MeshDataResource::get_aabb);
ClassDB::bind_method(D_METHOD("set_aabb", "array"), &MeshDataResource::set_aabb);
ADD_PROPERTY(PropertyInfo(Variant::AABB, "aabb"), "set_aabb", "get_aabb");
ClassDB::bind_method(D_METHOD("get_collision_shapes"), &MeshDataResource::get_collision_shapes);
ClassDB::bind_method(D_METHOD("set_collision_shapes", "array"), &MeshDataResource::set_collision_shapes);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "collision_shapes"), "set_collision_shapes", "get_collision_shapes");
@ -104,4 +138,6 @@ void MeshDataResource::_bind_methods() {
ClassDB::bind_method(D_METHOD("add_collision_shape", "shape"), &MeshDataResource::add_collision_shape);
ClassDB::bind_method(D_METHOD("get_collision_shape", "index"), &MeshDataResource::get_collision_shape);
ClassDB::bind_method(D_METHOD("get_collision_shape_count"), &MeshDataResource::get_collision_shape_count);
ClassDB::bind_method(D_METHOD("recompute_aabb"), &MeshDataResource::recompute_aabb);
}

6
mesh_data_resource.h
View File

@ -58,6 +58,9 @@ public:
Array get_array();
void set_array(const Array &p_arrays);
AABB get_aabb();
void set_aabb(const AABB &aabb);
void add_collision_shape(const Transform &transform, const Ref<Shape> &shape);
Ref<Shape> get_collision_shape(const int index);
Transform get_collision_shape_offset(const int index);
@ -66,6 +69,8 @@ public:
Vector<Variant> get_collision_shapes();
void set_collision_shapes(const Vector<Variant> &p_arrays);
void recompute_aabb();
MeshDataResource();
~MeshDataResource();
@ -80,6 +85,7 @@ protected:
private:
Array _arrays;
AABB _aabb;
Vector<MDRData> _collision_shapes;
};

4
plugin/mdr_import_plugin_base.cpp
View File

@ -281,7 +281,7 @@ Ref<MeshDataResource> MDRImportPluginBase::get_mesh(MeshInstance *mi, const Map<
m.instance();
m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, mdr->get_array());
Vector<Ref<Shape>> shapes = mesh->convex_decompose();
Vector<Ref<Shape> > shapes = mesh->convex_decompose();
for (int j = 0; j < shapes.size(); ++j) {
scale_shape(shapes[j], scale);
@ -420,7 +420,7 @@ Ref<MeshDataResource> MDRImportPluginBase::get_mesh_arrays(Array &arrs, const Ma
m.instance();
m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, mdr->get_array());
Vector<Ref<Shape>> shapes = mesh->convex_decompose();
Vector<Ref<Shape> > shapes = mesh->convex_decompose();
for (int j = 0; j < shapes.size(); ++j) {
scale_shape(shapes[j], scale);