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

Merge pull request #16025 from AndreaCatania/raysh

Browse source 
Improved stabilization of ray shape in Bullet
This commit is contained in:
Rémi Verschelde 2018-01-24 16:25:48 +01:00 committed by GitHub
commit 44cce2bdfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/bullet/godot_ray_world_algorithm.cpp
View file

@ -35,6 +35,8 @@
#include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h> #include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
#define RAY_STABILITY_MARGIN 0.1
/** /**
@author AndreaCatania @author AndreaCatania
*/ */
@ -97,10 +99,15 @@ void GodotRayWorldAlgorithm::processCollision(const btCollisionObjectWrapper *bo
m_world->rayTestSingleInternal(ray_transform, to, other_co_wrapper, btResult); m_world->rayTestSingleInternal(ray_transform, to, other_co_wrapper, btResult);
if (btResult.hasHit()) { if (btResult.hasHit()) {
btVector3 ray_normal(to.getOrigin() - ray_transform.getOrigin());
btVector3 ray_normal(ray_transform.getOrigin() - to.getOrigin());
ray_normal.normalize(); ray_normal.normalize();
ray_normal *= -1; btScalar depth(ray_shape->getScaledLength() * (btResult.m_closestHitFraction - 1));
resultOut->addContactPoint(ray_normal, btResult.m_hitPointWorld, ray_shape->getScaledLength() * (btResult.m_closestHitFraction - 1));
if (depth >= -RAY_STABILITY_MARGIN)
depth = 0;
resultOut->addContactPoint(ray_normal, btResult.m_hitPointWorld, depth);
} }
} }