TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

bullet: Fix compilation issue with BulletHeightfieldShape

Browse Source 
Fixes #1161
This commit is contained in:
Paul m. p. P 2021-05-31 17:43:25 +02:00 committed by rdb
parent 1d2407f667
commit 70ac82d5da
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/bullet/bulletHeightfieldShape.cxx
View File

@ -44,7 +44,7 @@ BulletHeightfieldShape(const PNMImage &image, PN_stdfloat max_height, BulletUpAx
_shape = new btHeightfieldTerrainShape(_num_rows, _shape = new btHeightfieldTerrainShape(_num_rows,
_num_cols, _num_cols,
_data, (const void *)_data,
max_height, max_height,
up, up,
true, false); true, false);
@ -102,7 +102,7 @@ BulletHeightfieldShape(Texture *tex, PN_stdfloat max_height, BulletUpAxis up) :
_shape = new btHeightfieldTerrainShape(_num_rows, _shape = new btHeightfieldTerrainShape(_num_rows,
_num_cols, _num_cols,
_data, (const void *)_data,
max_height, max_height,
up, up,
true, false); true, false);
@ -127,7 +127,7 @@ BulletHeightfieldShape(const BulletHeightfieldShape &copy) {
_shape = new btHeightfieldTerrainShape(_num_rows, _shape = new btHeightfieldTerrainShape(_num_rows,
_num_cols, _num_cols,
_data, (const void *)_data,
_max_height, _max_height,
_up, _up,
true, false); true, false);
@ -208,7 +208,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
_shape = new btHeightfieldTerrainShape(_num_rows, _shape = new btHeightfieldTerrainShape(_num_rows,
_num_cols, _num_cols,
_data, (const void *)_data,
_max_height, _max_height,
_up, _up,
true, false); true, false);