tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-24 10:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13212 from AndreaCatania/margin

Browse Source 
Removed shape margin
This commit is contained in:
Rémi Verschelde
2017-11-23 15:01:13 +01:00
committed by GitHub
parent 949871cba6 0a0800ebec
commit ee3179fc5c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/bullet/collision_object_bullet.cpp
+3 -3
View File
@@ -285,10 +285,10 @@ void RigidCollisionObjectBullet::on_shapes_changed() {
const int size = shapes.size();
for (i = 0; i < size; ++i) {
shpWrapper = &shapes[i];
if (!shpWrapper->bt_shape) {
shpWrapper->bt_shape = shpWrapper->shape->create_bt_shape();
}
if (shpWrapper->active) {
if (!shpWrapper->bt_shape) {
shpWrapper->bt_shape = shpWrapper->shape->create_bt_shape();
}
compoundShape->addChildShape(shpWrapper->transform, shpWrapper->bt_shape);
} else {
compoundShape->addChildShape(shpWrapper->transform, BulletPhysicsServer::get_empty_shape());
modules/bullet/shape_bullet.cpp
+1
View File
@@ -45,6 +45,7 @@ ShapeBullet::~ShapeBullet() {}
btCollisionShape *ShapeBullet::prepare(btCollisionShape *p_btShape) const {
p_btShape->setUserPointer(const_cast<ShapeBullet *>(this));
p_btShape->setMargin(0.);
return p_btShape;
}