fix(cannon): adjust uuid to use makeId() in Constraint

nartc · Apr 15, 2022 · 385d9b9 · 385d9b9
1 parent b6b14a5
commit 385d9b9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 26 deletions.
diff --git a/libs/cannon/constraints/src/lib/constraint.ts b/libs/cannon/constraints/src/lib/constraint.ts
@@ -1,5 +1,6 @@
 import { NgtPhysicsStore } from '@angular-three/cannon';
 import {
+    makeId,
     NgtComponentStore,
     NgtStore,
     Ref,
@@ -105,32 +106,26 @@ export class NgtPhysicConstraint extends NgtComponentStore {
     ): NgtConstraintReturn<TConstraintType> {
         return this.zone.runOutsideAngular(() => {
             const physicsStore = this.physicsStore;
-            const uuid = THREE.MathUtils.generateUUID();
-
-            this.onCanvasReady(
-                this.store.ready$,
-                () => {
-                    this.effect<
-                        [CannonWorkerAPI, THREE.Object3D, THREE.Object3D]
-                    >(
-                        tapEffect(([worker, a, b]) => {
-                            worker.addConstraint({
-                                props: [a.uuid, b.uuid, opts],
-                                type,
-                                uuid,
-                            });
-                            return () => worker.removeConstraint({ uuid });
-                        })
-                    )(
-                        combineLatest([
-                            physicsStore.select((s) => s.worker),
-                            bodyA.ref$.pipe(filter((ref) => ref != undefined)),
-                            bodyB.ref$.pipe(filter((ref) => ref != undefined)),
-                        ])
-                    );
-                },
-                true
-            );
+            const uuid = makeId();
+
+            this.onCanvasReady(this.store.ready$, () => {
+                this.effect<[CannonWorkerAPI, THREE.Object3D, THREE.Object3D]>(
+                    tapEffect(([worker, a, b]) => {
+                        worker.addConstraint({
+                            props: [a.uuid, b.uuid, opts],
+                            type,
+                            uuid,
+                        });
+                        return () => worker.removeConstraint({ uuid });
+                    })
+                )(
+                    combineLatest([
+                        physicsStore.select((s) => s.worker),
+                        bodyA.ref$.pipe(filter((ref) => ref != undefined)),
+                        bodyB.ref$.pipe(filter((ref) => ref != undefined)),
+                    ])
+                );
+            });
 
             return {
                 bodyA,

diff --git a/libs/cannon/debug/src/lib/debug.ts b/libs/cannon/debug/src/lib/debug.ts
@@ -122,6 +122,7 @@ export class NgtCannonDebug extends NgtInstance<
 
     get api() {
         const { bodies, bodyMap } = this.get();
+
         return {
             add(uuid: string, props: BodyProps, type: BodyShapeType) {
                 const body = propsToBody({ uuid, props, type });
@@ -152,6 +153,7 @@ export class NgtCannonDebug extends NgtInstance<
                             q as unknown as Quaternion
                         );
                     }
+
                     cannonDebugger.update();
                 },
             });