From 063e7d3b0ab4393448e0e465d0510ff00c3c2f89 Mon Sep 17 00:00:00 2001 From: Kris Baumgartner Date: Sun, 17 Apr 2022 00:09:36 -0700 Subject: [PATCH 1/4] Add scaleOverride to useBody props --- packages/react-three-cannon/src/hooks.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-three-cannon/src/hooks.ts b/packages/react-three-cannon/src/hooks.ts index 5b0ccd74..590cc686 100644 --- a/packages/react-three-cannon/src/hooks.ts +++ b/packages/react-three-cannon/src/hooks.ts @@ -193,6 +193,7 @@ function useBody>( refs[id] = object debugApi?.add(id, props, type) setupCollision(events, props, id) + if (props.scaleOverride) scaleOverrides[uuid[i]] = new Vector3(...props.scaleOverride) return { ...props, args: argsFn(props.args) } }) : uuid.map((id, i) => { From 21650877f27cce0de7831acf0f70460b89773d94 Mon Sep 17 00:00:00 2001 From: Kris Baumgartner Date: Sun, 17 Apr 2022 00:20:54 -0700 Subject: [PATCH 2/4] Add scaleOverride to body type --- packages/cannon-worker-api/src/body.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cannon-worker-api/src/body.ts b/packages/cannon-worker-api/src/body.ts index 64c4b15f..858777f4 100644 --- a/packages/cannon-worker-api/src/body.ts +++ b/packages/cannon-worker-api/src/body.ts @@ -31,6 +31,7 @@ export type BodyProps = Partial & quaternion?: Quad rotation?: Triplet type?: 'Dynamic' | 'Static' | 'Kinematic' + scaleOverride: Triplet } export type BodyPropsArgsRequired = BodyProps & { From f51f5e11d0a5e82b794e29cb4508b39064c52e4b Mon Sep 17 00:00:00 2001 From: Kris Baumgartner Date: Sun, 17 Apr 2022 00:23:52 -0700 Subject: [PATCH 3/4] Forgot to make scaleOverride optional --- packages/cannon-worker-api/src/body.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cannon-worker-api/src/body.ts b/packages/cannon-worker-api/src/body.ts index 858777f4..d958da88 100644 --- a/packages/cannon-worker-api/src/body.ts +++ b/packages/cannon-worker-api/src/body.ts @@ -31,7 +31,7 @@ export type BodyProps = Partial & quaternion?: Quad rotation?: Triplet type?: 'Dynamic' | 'Static' | 'Kinematic' - scaleOverride: Triplet + scaleOverride?: Triplet } export type BodyPropsArgsRequired = BodyProps & { From d22e88fb5b15db6cb6a1ec5f763c4873bc6ed3e1 Mon Sep 17 00:00:00 2001 From: Kris Baumgartner Date: Sun, 17 Apr 2022 19:57:05 -0700 Subject: [PATCH 4/4] Moved type to useBody hook --- packages/cannon-worker-api/src/body.ts | 1 - packages/react-three-cannon/src/hooks.ts | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cannon-worker-api/src/body.ts b/packages/cannon-worker-api/src/body.ts index d958da88..64c4b15f 100644 --- a/packages/cannon-worker-api/src/body.ts +++ b/packages/cannon-worker-api/src/body.ts @@ -31,7 +31,6 @@ export type BodyProps = Partial & quaternion?: Quad rotation?: Triplet type?: 'Dynamic' | 'Static' | 'Kinematic' - scaleOverride?: Triplet } export type BodyPropsArgsRequired = BodyProps & { diff --git a/packages/react-three-cannon/src/hooks.ts b/packages/react-three-cannon/src/hooks.ts index 590cc686..5a1705e1 100644 --- a/packages/react-three-cannon/src/hooks.ts +++ b/packages/react-three-cannon/src/hooks.ts @@ -159,6 +159,7 @@ function useBody>( argsFn: ArgFn, fwdRef: Ref, deps: DependencyList = [], + scaleOverride?: Triplet, ): Api { const ref = useForwardedRef(fwdRef) @@ -193,7 +194,7 @@ function useBody>( refs[id] = object debugApi?.add(id, props, type) setupCollision(events, props, id) - if (props.scaleOverride) scaleOverrides[uuid[i]] = new Vector3(...props.scaleOverride) + if (scaleOverride) scaleOverrides[uuid[i]] = new Vector3(...scaleOverride) return { ...props, args: argsFn(props.args) } }) : uuid.map((id, i) => {