TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

bullet: Fix assertion when reconstructing BulletConvexHullShape from bam

Browse Source 
Fixes #1251
Closes #1252
This commit is contained in:
Stephen A. Imhoff 2022-06-29 17:06:19 +02:00 committed by rdb
parent 3fc579c7d4
commit 33691d72ec
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/bullet/bulletConvexHullShape.cxx
View File

@ -194,7 +194,7 @@ make_from_bam(const FactoryParams &params) {
void BulletConvexHullShape:: void BulletConvexHullShape::
fillin(DatagramIterator &scan, BamReader *manager) { fillin(DatagramIterator &scan, BamReader *manager) {
BulletShape::fillin(scan, manager); BulletShape::fillin(scan, manager);
nassertv(_shape == nullptr); nassertv(_shape);
_shape->setMargin(scan.get_stdfloat()); _shape->setMargin(scan.get_stdfloat());
unsigned int num_points = scan.get_uint32(); unsigned int num_points = scan.get_uint32();

20
tests/bullet/test_bullet_bam.py
View File

@ -133,6 +133,26 @@ def test_sphere_shape():
assert shape.radius == shape2.radius assert shape.radius == shape2.radius
def test_convex_shape():
shape = bullet.BulletConvexHullShape()
shape.add_array([
(-1.0, -1.0, -1.0),
(1.0, -1.0, -1.0),
(-1.0, 1.0, -1.0),
(-1.0, -1.0, 1.0),
(1.0, 1.0, -1.0),
(1.0, -1.0, 1.0),
(-1.0, 1.0, 1.0),
(1.0, 1.0, 1.0),
])
shape.margin = 0.5
shape2 = reconstruct(shape)
assert type(shape) is type(shape2)
assert shape.margin == shape2.margin
def test_ghost(): def test_ghost():
node = bullet.BulletGhostNode("some ghost node") node = bullet.BulletGhostNode("some ghost node")