From a6b59554c34bfdf65403311edcbdde2a435781cb Mon Sep 17 00:00:00 2001 From: Antoine BERNIER Date: Tue, 13 Aug 2024 00:52:43 +0200 Subject: [PATCH] "@react-three/cannon": "^6.6.0" (#67) * ^6.6.0 * fixes --- demos/arkanoid/package.json | 2 +- demos/arkanoid/src/App.jsx | 2 +- demos/pinball-in-70-lines/package.json | 2 +- demos/pinball-in-70-lines/src/App.jsx | 2 +- demos/rapier-ping-pong/package.json | 2 +- demos/simple-physics-demo/package.json | 2 +- demos/trigger-meshes/package.json | 2 +- demos/trigger-meshes/src/App.jsx | 2 +- package-lock.json | 126 +------------------------ 9 files changed, 13 insertions(+), 129 deletions(-) diff --git a/demos/arkanoid/package.json b/demos/arkanoid/package.json index fecfe2f4..b9583805 100644 --- a/demos/arkanoid/package.json +++ b/demos/arkanoid/package.json @@ -11,7 +11,7 @@ ], "dependencies": { "@react-spring/three": "^9.6.1", - "@react-three/cannon": "^1.1.0", + "@react-three/cannon": "^6.6.0", "@react-three/drei": "^9.109.5", "@react-three/fiber": "^8.17.5", "react": "^18.3.1", diff --git a/demos/arkanoid/src/App.jsx b/demos/arkanoid/src/App.jsx index da6c0070..472c18c2 100755 --- a/demos/arkanoid/src/App.jsx +++ b/demos/arkanoid/src/App.jsx @@ -37,7 +37,7 @@ function Paddle() { } function Ball() { - const [ref, api] = useSphere(() => ({ mass: 1, args: 0.4, position: [0, 3, 0], velocity: [0, 5, 0] })) + const [ref, api] = useSphere(() => ({ mass: 1, args: [0.4], position: [0, 3, 0], velocity: [0, 5, 0] })) const restart = useStore((state) => state.restart) useEffect(() => { if (restart) { diff --git a/demos/pinball-in-70-lines/package.json b/demos/pinball-in-70-lines/package.json index 9c87479e..8c77f120 100644 --- a/demos/pinball-in-70-lines/package.json +++ b/demos/pinball-in-70-lines/package.json @@ -11,7 +11,7 @@ "game" ], "dependencies": { - "@react-three/cannon": "^2.5.1", + "@react-three/cannon": "^6.6.0", "@react-three/drei": "^9.109.5", "@react-three/fiber": "^8.17.5", "react": "^18.3.1", diff --git a/demos/pinball-in-70-lines/src/App.jsx b/demos/pinball-in-70-lines/src/App.jsx index 251c9221..d92040d1 100755 --- a/demos/pinball-in-70-lines/src/App.jsx +++ b/demos/pinball-in-70-lines/src/App.jsx @@ -9,7 +9,7 @@ import bgImg from "./bg.jpg" function BallAndCollisions({ args = [1.2, 32, 32], v = new THREE.Vector3() }) { const cam = useRef() - const [ref, api] = useSphere(() => ({ args: 1.2, mass: 1, material: { restitution: 0.95 } })) + const [ref, api] = useSphere(() => ({ args: [1.2], mass: 1, material: { restitution: 0.95 } })) usePlane(() => ({ position: [0, -15, 0], rotation: [-Math.PI / 2, 0, 0], onCollide: () => (api.position.set(0, 0, 0), api.velocity.set(0, 0, 0)) })) usePlane(() => ({ position: [-15, 0, 0], rotation: [-Math.PI / 2, Math.PI / 2, 0] })) usePlane(() => ({ position: [15, 0, 0], rotation: [Math.PI / 2, -Math.PI / 2, 0] })) diff --git a/demos/rapier-ping-pong/package.json b/demos/rapier-ping-pong/package.json index a78b4b54..c33ccb48 100644 --- a/demos/rapier-ping-pong/package.json +++ b/demos/rapier-ping-pong/package.json @@ -6,7 +6,7 @@ "keywords": [], "dependencies": { "@pmndrs/branding": "^0.0.8", - "@react-three/cannon": "^4.5.0", + "@react-three/cannon": "^6.6.0", "@react-three/drei": "^9.109.5", "@react-three/fiber": "^8.17.5", "@react-three/postprocessing": "^2.16.2", diff --git a/demos/simple-physics-demo/package.json b/demos/simple-physics-demo/package.json index 83c6000c..3b1ea55c 100644 --- a/demos/simple-physics-demo/package.json +++ b/demos/simple-physics-demo/package.json @@ -9,7 +9,7 @@ "use-cannon" ], "dependencies": { - "@react-three/cannon": "^2.5.0", + "@react-three/cannon": "^6.6.0", "@react-three/fiber": "^8.17.5", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/demos/trigger-meshes/package.json b/demos/trigger-meshes/package.json index 79d1c772..a05013cc 100644 --- a/demos/trigger-meshes/package.json +++ b/demos/trigger-meshes/package.json @@ -5,7 +5,7 @@ "homepage": "https://codesandbox.io/s/h545c", "keywords": [], "dependencies": { - "@react-three/cannon": "^2.1.2", + "@react-three/cannon": "^6.6.0", "@react-three/drei": "^9.109.5", "@react-three/fiber": "^8.17.5", "react": "^18.3.1", diff --git a/demos/trigger-meshes/src/App.jsx b/demos/trigger-meshes/src/App.jsx index 501f64f6..a93185e9 100755 --- a/demos/trigger-meshes/src/App.jsx +++ b/demos/trigger-meshes/src/App.jsx @@ -17,7 +17,7 @@ function Ball() { const [ref] = useSphere(() => ({ mass: 1, position: [0, 20, 0], - args: 1 + args: [1] })) return ( diff --git a/package-lock.json b/package-lock.json index 5a89a8cf..89d3adf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -233,7 +233,7 @@ "version": "1.0.0", "dependencies": { "@react-spring/three": "^9.6.1", - "@react-three/cannon": "^1.1.0", + "@react-three/cannon": "^6.6.0", "@react-three/drei": "^9.109.5", "@react-three/fiber": "^8.17.5", "react": "^18.3.1", @@ -269,17 +269,6 @@ "vite": "^5.4.0" } }, - "demos/arkanoid/node_modules/@react-three/cannon": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@react-three/cannon/-/cannon-1.4.0.tgz", - "integrity": "sha512-cQsF5Lzjoz0S/gC1hGPeV9uc58TQOf8SO6TOU3YIxfhKFqHWiyjviQ6Q0B+AsMIyiY5mIIEDW64BmRO/j9NkJg==", - "license": "MIT", - "peerDependencies": { - "react": ">=17.0", - "react-dom": ">=17.0", - "typescript": ">=4.2" - } - }, "demos/audio-analyser": { "name": "@demo/audio-analyser", "version": "1.0.0", @@ -2638,7 +2627,7 @@ "name": "@demo/pinball-in-70-lines", "version": "1.0.0", "dependencies": { - "@react-three/cannon": "^2.5.1", + "@react-three/cannon": "^6.6.0", "@react-three/drei": "^9.109.5", "@react-three/fiber": "^8.17.5", "react": "^18.3.1", @@ -2654,36 +2643,6 @@ "vite": "^5.4.0" } }, - "demos/pinball-in-70-lines/node_modules/@react-three/cannon": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@react-three/cannon/-/cannon-2.6.1.tgz", - "integrity": "sha512-jb+3XaYexYRqYWUjA3UNdQ+HG2tVdtcaQ8y5cptsf1g+wpA11ZDfLNN+Jk6xGemD964fakAueLWj4bWOUvdu1Q==", - "license": "MIT", - "dependencies": { - "cannon-es": "^0.18.0", - "cannon-es-debugger": "^0.1.4" - }, - "peerDependencies": { - "react": ">=17.0", - "react-dom": ">=17.0" - } - }, - "demos/pinball-in-70-lines/node_modules/@react-three/cannon/node_modules/cannon-es-debugger": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/cannon-es-debugger/-/cannon-es-debugger-0.1.4.tgz", - "integrity": "sha512-RefSPWX6gDMQsx3UWoQpkGW3R03Wwn8p1JteexQUYxDC5DnOS3U3iKhns2vVpFp6Q3AKiSSmRf7NIXnGN8L0RA==", - "license": "MIT", - "peerDependencies": { - "cannon-es": "0.x.x", - "three": "0.x.x", - "typescript": ">=3.8" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "demos/pmndrs-vercel": { "name": "@demo/pmndrs-vercel", "version": "1.0.0", @@ -2898,7 +2857,7 @@ "version": "1.0.0", "dependencies": { "@pmndrs/branding": "^0.0.8", - "@react-three/cannon": "^4.5.0", + "@react-three/cannon": "^6.6.0", "@react-three/drei": "^9.109.5", "@react-three/fiber": "^8.17.5", "@react-three/postprocessing": "^2.16.2", @@ -2921,21 +2880,6 @@ "vite": "^5.4.0" } }, - "demos/rapier-ping-pong/node_modules/@react-three/cannon": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@react-three/cannon/-/cannon-4.9.0.tgz", - "integrity": "sha512-xMJ7ZTzZfZzwtBFx81QxuAfh1uUYiDKnJGzesArQHJu7qNO/qiRBJNzJZEijBG6seGn0/EdfBBfO8nccAOSHhg==", - "license": "MIT", - "dependencies": { - "cannon-es": "^0.18.0", - "cannon-es-debugger": "^1.0.0", - "events": "^3.3.0" - }, - "peerDependencies": { - "react": ">=17.0", - "react-dom": ">=17.0" - } - }, "demos/rapier-ping-pong/node_modules/zustand": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.5.4.tgz", @@ -3494,7 +3438,7 @@ "name": "@demo/simple-physics-demo", "version": "1.0.0", "dependencies": { - "@react-three/cannon": "^2.5.0", + "@react-three/cannon": "^6.6.0", "@react-three/fiber": "^8.17.5", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -3528,36 +3472,6 @@ "vite": "^5.4.0" } }, - "demos/simple-physics-demo/node_modules/@react-three/cannon": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@react-three/cannon/-/cannon-2.6.1.tgz", - "integrity": "sha512-jb+3XaYexYRqYWUjA3UNdQ+HG2tVdtcaQ8y5cptsf1g+wpA11ZDfLNN+Jk6xGemD964fakAueLWj4bWOUvdu1Q==", - "license": "MIT", - "dependencies": { - "cannon-es": "^0.18.0", - "cannon-es-debugger": "^0.1.4" - }, - "peerDependencies": { - "react": ">=17.0", - "react-dom": ">=17.0" - } - }, - "demos/simple-physics-demo/node_modules/@react-three/cannon/node_modules/cannon-es-debugger": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/cannon-es-debugger/-/cannon-es-debugger-0.1.4.tgz", - "integrity": "sha512-RefSPWX6gDMQsx3UWoQpkGW3R03Wwn8p1JteexQUYxDC5DnOS3U3iKhns2vVpFp6Q3AKiSSmRf7NIXnGN8L0RA==", - "license": "MIT", - "peerDependencies": { - "cannon-es": "0.x.x", - "three": "0.x.x", - "typescript": ">=3.8" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "demos/sky-dome-with-annotations": { "name": "@demo/sky-dome-with-annotations", "version": "1.0.0", @@ -4135,7 +4049,7 @@ "name": "@demo/trigger-meshes", "version": "1.0.0", "dependencies": { - "@react-three/cannon": "^2.1.2", + "@react-three/cannon": "^6.6.0", "@react-three/drei": "^9.109.5", "@react-three/fiber": "^8.17.5", "react": "^18.3.1", @@ -4151,36 +4065,6 @@ "vite": "^5.4.0" } }, - "demos/trigger-meshes/node_modules/@react-three/cannon": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@react-three/cannon/-/cannon-2.6.1.tgz", - "integrity": "sha512-jb+3XaYexYRqYWUjA3UNdQ+HG2tVdtcaQ8y5cptsf1g+wpA11ZDfLNN+Jk6xGemD964fakAueLWj4bWOUvdu1Q==", - "license": "MIT", - "dependencies": { - "cannon-es": "^0.18.0", - "cannon-es-debugger": "^0.1.4" - }, - "peerDependencies": { - "react": ">=17.0", - "react-dom": ">=17.0" - } - }, - "demos/trigger-meshes/node_modules/@react-three/cannon/node_modules/cannon-es-debugger": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/cannon-es-debugger/-/cannon-es-debugger-0.1.4.tgz", - "integrity": "sha512-RefSPWX6gDMQsx3UWoQpkGW3R03Wwn8p1JteexQUYxDC5DnOS3U3iKhns2vVpFp6Q3AKiSSmRf7NIXnGN8L0RA==", - "license": "MIT", - "peerDependencies": { - "cannon-es": "0.x.x", - "three": "0.x.x", - "typescript": ">=3.8" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "demos/tying-canvas-to-scroll-offset": { "name": "@demo/tying-canvas-to-scroll-offset", "version": "1.0.0",