Skip to content

Commit 1a551ab

Browse files
authored
Revert "update bullet, physx for debug draw (#419)" (#421)
This reverts commit fce5974.
1 parent ab01b1e commit 1a551ab

9 files changed

+24282
-26779
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

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

4444
TypedConstraint_getFixedBody(): ptr;
45-
TypedConstraint_getDbgDrawSize(): number;
46-
TypedConstraint_setDbgDrawSize(p: ptr, dbgDrawSize: number): void;
4745
HingeConstraint_new(ptr0: ptr, ptr1: ptr, ptr2: ptr, ptr3: ptr): ptr;
4846
HingeConstraint_setFrames(ptr0: ptr, ptr1: ptr, ptr2: ptr): void;
4947
HingeConstraint_setLimit(p: ptr, low: number, upper: number, softness: number, biasFactor: number, relaxationFactor: number): void;
@@ -210,8 +208,6 @@ declare namespace Bullet {
210208
CollisionWorld_removeCollisionObject(p: ptr, body: ptr): void;
211209
CollisionWorld_rayTest(p: ptr, p0: ptr, p1: ptr, p2: ptr): void;
212210
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;
215211

216212
ccDiscreteDynamicsWorld_new(dispatcher: ptr, pairCache: ptr, solver: ptr): ptr;
217213
ccDiscreteDynamicsWorld_setAllowSleep(p: ptr, v: boolean): void;
@@ -224,18 +220,6 @@ declare namespace Bullet {
224220
DynamicsWorld_addAction(p: ptr, action: ptr): void;
225221
DynamicsWorld_removeAction(p: ptr, action: ptr): void;
226222

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-
239223
RayCallback_hasHit(p: ptr): boolean;
240224
ConvexCallback_hasHit(p: ptr): boolean;
241225

@@ -279,19 +263,19 @@ declare namespace Bullet {
279263
ControllerHit_getHitMotionLength(p: ptr): number; //CCT hit Motion length
280264
ControllerShapeHit_getHitShape(p: ptr): ptr;
281265
ControllerShapeHit_getHitCollisionObject(p: ptr): ptr;
282-
CharacterController_move(ptrCCT: ptr, ptrMovement: ptr, minDist: number, deltaTime: number): number;
266+
CharacterController_move(ptrCCT: ptr, ptrMovement: ptr, minDist: number, deltaTime: number):number;
283267
CharacterController_getPosition(ptrCCT: ptr);
284268
CharacterController_setContactOffset(ptrCCT: ptr, v: number);
285269
CharacterController_setStepOffset(ptrCCT: ptr, v: number);
286270
CharacterController_setSlopeLimit(ptrCCT: ptr, v: number);
287271
CharacterController_setCollision(ptrCCT: ptr, collision: boolean);
288272
CharacterController_setOverlapRecovery(ptrCCT: ptr, value: boolean);
289-
CapsuleCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
273+
CapsuleCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
290274
ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, radius: number, height: number): ptr;
291275
CapsuleCharacterController_new(collisionWorld: ptr, ptrBtCapsuleCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr;
292276
CapsuleCharacterController_setRadius(ptrCCT: ptr, radius: number): void;
293277
CapsuleCharacterController_setHeight(ptrCCT: ptr, height: number): void;
294-
BoxCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
278+
BoxCharacterControllerDesc_new(maxSlopeRadians: number, stepHeight: number, contactOffset: number,
295279
ptrUpAxis: ptr, ptrInitPos: ptr, ptruUserControllerHitReport: ptr, halfHeight: number, halfSideExtent: number, halfForwardExtent: number): ptr;
296280
BoxCharacterController_new(collisionWorld: ptr, ptrBtBoxCharacterControllerDesc: ptr, userObjectPointer: ptr): ptr;
297281
BoxCharacterController_setHalfHeight(ptrCCT: ptr, v: number): void;

0 commit comments

Comments
 (0)