Skip to content

Commit fce5974

Browse files
authored
update bullet, physx for debug draw (#419)
1 parent 8e329d5 commit fce5974

9 files changed

+26779
-24282
lines changed

emscripten/bullet/bullet.asm.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

emscripten/bullet/bullet.d.ts

+19-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ declare namespace Bullet {
4242
// constraints
4343

4444
TypedConstraint_getFixedBody(): ptr;
45+
TypedConstraint_getDbgDrawSize(): number;
46+
TypedConstraint_setDbgDrawSize(p: ptr, dbgDrawSize: number): void;
4547
HingeConstraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr): ptr;
4648
HingeConstraint_setFrames(ptr0: ptr, ptr1: ptr, ptr2: ptr): void;
4749
HingeConstraint_setLimit(p: ptr, low: number, upper: number, softness: number, biasFactor: number, relaxationFactor: number): void;
@@ -208,6 +210,8 @@ declare namespace Bullet {
208210
CollisionWorld_removeCollisionObject(p: ptr, body: ptr): void;
209211
CollisionWorld_rayTest(p: ptr, p0: ptr, p1: ptr, p2: ptr): void;
210212
CollisionWorld_convexSweepTest(p: ptr, castShape: ptr, from: ptr, to: ptr, resultCallback: ptr, allowedCcdPenetration: ptr): void;
213+
CollisionWorld_setDebugDrawer(p: ptr, drawer: ptr): void;
214+
CollisionWorld_debugDrawWorld(p: ptr): void;
211215

212216
ccDiscreteDynamicsWorld_new(dispatcher: ptr, pairCache: ptr, solver: ptr): ptr;
213217
ccDiscreteDynamicsWorld_setAllowSleep(p: ptr, v: boolean): void;
@@ -220,6 +224,18 @@ declare namespace Bullet {
220224
DynamicsWorld_addAction(p: ptr, action: ptr): void;
221225
DynamicsWorld_removeAction(p: ptr, action: ptr): void;
222226

227+
DebugDraw_new(): ptr;
228+
DebugDraw_setDebugMode(p: ptr, debugMode: number): void;
229+
DebugDraw_getDebugMode(p: ptr): number;
230+
DebugDraw_setActiveObjectColor(p: ptr, r: number, g: number, b: number): void;
231+
DebugDraw_setDeactiveObjectColor(p: ptr, r: number, g: number, b: number): void;
232+
DebugDraw_setWantsDeactivationObjectColor(p: ptr, r: number, g: number, b: number): void;
233+
DebugDraw_setDisabledDeactivationObjectColor(p: ptr, r: number, g: number, b: number): void;
234+
DebugDraw_setDisabledSimulationObjectColor(p: ptr, r: number, g: number, b: number): void;
235+
DebugDraw_setAABBColor(p: ptr, r: number, g: number, b: number): void;
236+
DebugDraw_setContactPointColor(p: ptr, r: number, g: number, b: number): void;
237+
DebugDraw_setConstraintLimitColor(p: ptr, r: number, g: number, b: number): void;
238+
223239
RayCallback_hasHit(p: ptr): boolean;
224240
ConvexCallback_hasHit(p: ptr): boolean;
225241

@@ -263,19 +279,19 @@ declare namespace Bullet {
263279
ControllerHit_getHitMotionLength(p: ptr): number; //CCT hit Motion length
264280
ControllerShapeHit_getHitShape(p: ptr): ptr;
265281
ControllerShapeHit_getHitCollisionObject(p: ptr): ptr;
266-
CharacterController_move(ptrCCT: ptr, ptrMovement: ptr, minDist: number, deltaTime: number):number;
282+
CharacterController_move(ptrCCT: ptr, ptrMovement: ptr, minDist: number, deltaTime: number): number;
267283
CharacterController_getPosition(ptrCCT: ptr);
268284
CharacterController_setContactOffset(ptrCCT: ptr, v: number);
269285
CharacterController_setStepOffset(ptrCCT: ptr, v: number);
270286
CharacterController_setSlopeLimit(ptrCCT: ptr, v: number);
271287
CharacterController_setCollision(ptrCCT: ptr, collision: boolean);
272288
CharacterController_setOverlapRecovery(ptrCCT: ptr, value: boolean);
273-
CapsuleCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
289+
CapsuleCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
274290
ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, radius: number, height: number): ptr;
275291
CapsuleCharacterController_new(collisionWorld: ptr, ptrBtCapsuleCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr;
276292
CapsuleCharacterController_setRadius(ptrCCT: ptr, radius: number): void;
277293
CapsuleCharacterController_setHeight(ptrCCT: ptr, height: number): void;
278-
BoxCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
294+
BoxCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
279295
ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, halfHeight: number, halfSideExtent: number, halfForwardExtent: number): ptr;
280296
BoxCharacterController_new(collisionWorld: ptr, ptrBtBoxCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr;
281297
BoxCharacterController_setHalfHeight(ptrCCT: ptr, v: number): void;

0 commit comments

Comments
 (0)