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

Improved trimesh stability

Browse source
This commit is contained in:
Andrea Catania 2018-10-05 15:15:54 +02:00
parent 62fc66291b
commit 5328dcb7bb
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/bullet/shape_bullet.cpp
View file

@ -34,6 +34,7 @@
#include "bullet_physics_server.h" #include "bullet_physics_server.h"
#include "bullet_types_converter.h" #include "bullet_types_converter.h"
#include "bullet_utilities.h" #include "bullet_utilities.h"
#include "core/project_settings.h"
#include "shape_owner_bullet.h" #include "shape_owner_bullet.h"
#include <BulletCollision/CollisionDispatch/btInternalEdgeUtility.h> #include <BulletCollision/CollisionDispatch/btInternalEdgeUtility.h>
@ -400,18 +401,22 @@ void ConcavePolygonShapeBullet::setup(PoolVector<Vector3> p_faces) {
btVector3 supVec_1; btVector3 supVec_1;
btVector3 supVec_2; btVector3 supVec_2;
for (int i = 0; i < src_face_count; ++i) { for (int i = 0; i < src_face_count; ++i) {
G_TO_B(facesr[i * 3], supVec_0); G_TO_B(facesr[i * 3 + 0], supVec_0);
G_TO_B(facesr[i * 3 + 1], supVec_1); G_TO_B(facesr[i * 3 + 1], supVec_1);
G_TO_B(facesr[i * 3 + 2], supVec_2); G_TO_B(facesr[i * 3 + 2], supVec_2);
shapeInterface->addTriangle(supVec_0, supVec_1, supVec_2); // Inverted from standard godot otherwise btGenerateInternalEdgeInfo generates wrong edge info
shapeInterface->addTriangle(supVec_2, supVec_1, supVec_0);
} }
const bool useQuantizedAabbCompression = true; const bool useQuantizedAabbCompression = true;
meshShape = bulletnew(btBvhTriangleMeshShape(shapeInterface, useQuantizedAabbCompression)); meshShape = bulletnew(btBvhTriangleMeshShape(shapeInterface, useQuantizedAabbCompression));
btTriangleInfoMap *triangleInfoMap = new btTriangleInfoMap();
btGenerateInternalEdgeInfo(meshShape, triangleInfoMap); if (GLOBAL_DEF("physics/3d/smooth_trimesh_collision", false)) {
btTriangleInfoMap *triangleInfoMap = new btTriangleInfoMap();
btGenerateInternalEdgeInfo(meshShape, triangleInfoMap);
}
} else { } else {
meshShape = NULL; meshShape = NULL;
ERR_PRINT("The faces count are 0, the mesh shape cannot be created"); ERR_PRINT("The faces count are 0, the mesh shape cannot be created");
@ -426,6 +431,7 @@ btCollisionShape *ConcavePolygonShapeBullet::create_bt_shape(const btVector3 &p_
cs = ShapeBullet::create_shape_empty(); cs = ShapeBullet::create_shape_empty();
cs->setLocalScaling(p_implicit_scale); cs->setLocalScaling(p_implicit_scale);
prepare(cs); prepare(cs);
cs->setMargin(0);
return cs; return cs;
} }

2
scene/resources/shape.cpp
View file

@ -101,7 +101,7 @@ void Shape::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_margin", "margin"), &Shape::set_margin); ClassDB::bind_method(D_METHOD("set_margin", "margin"), &Shape::set_margin);
ClassDB::bind_method(D_METHOD("get_margin"), &Shape::get_margin); ClassDB::bind_method(D_METHOD("get_margin"), &Shape::get_margin);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "margin", PROPERTY_HINT_RANGE, "0.04,10,0.01"), "set_margin", "get_margin"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "margin", PROPERTY_HINT_RANGE, "0.04,10,0.001"), "set_margin", "get_margin");
} }
Shape::Shape() : Shape::Shape() :