diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-23 13:58:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 13:58:30 +0200 |
| commit | 49b6423874e8ea2bdc866f5b3abe6acba1d54b1b (patch) | |
| tree | 02cbee2a8147c3564f6f353da1ab852f13aa0563 /modules | |
| parent | 04efa598681fc4903907d160f6dc80fc8537b43f (diff) | |
| parent | 458827efc2fdcc9bdc959e4f2a9b44f56572d6de (diff) | |
Merge pull request #28328 from godotengine/revert-25543-optimize_bullet_heightfield_raycast2
Revert "Implemented terrain raycast acceleration"
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bullet/shape_bullet.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/modules/bullet/shape_bullet.cpp b/modules/bullet/shape_bullet.cpp index f15bcec914..b590d63167 100644 --- a/modules/bullet/shape_bullet.cpp +++ b/modules/bullet/shape_bullet.cpp @@ -148,13 +148,7 @@ btHeightfieldTerrainShape *ShapeBullet::create_shape_height_field(PoolVector<rea const bool flipQuadEdges = false; const void *heightsPtr = p_heights.read().ptr(); - btHeightfieldTerrainShape *heightfield = bulletnew(btHeightfieldTerrainShape(p_width, p_depth, heightsPtr, ignoredHeightScale, p_min_height, p_max_height, YAxis, PHY_FLOAT, flipQuadEdges)); - - // The shape can be created without params when you do PhysicsServer.shape_create(PhysicsServer.SHAPE_HEIGHTMAP) - if (heightsPtr) - heightfield->buildAccelerator(16); - - return heightfield; + return bulletnew(btHeightfieldTerrainShape(p_width, p_depth, heightsPtr, ignoredHeightScale, p_min_height, p_max_height, YAxis, PHY_FLOAT, flipQuadEdges)); } btRayShape *ShapeBullet::create_shape_ray(real_t p_length, bool p_slips_on_slope) { |