ByoungSooPark/diff-viewer-extension
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migration to three r155+ (#538)

Browse Source 
* Migration to three r155+
Fixes #497

* Broken snaps

* Trying migration rec from https://discourse.threejs.org/t/updates-to-lighting-in-three-js-r155/53733

* Add decay = 0
This commit is contained in:
Pierre Jacquier
2024-01-22 06:57:42 -05:00
committed by GitHub
parent 1afe378849
commit 3df4275365
10 changed files with 81 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@ -12,8 +12,8 @@
"@octokit/types": "^12.4.0",
"@primer/octicons-react": "^19.8.0",
"@primer/react": "^36.5.0",
"@react-three/csg": "^3.1.0",
"@react-three/drei": "^9.93.0",
"@react-three/csg": "^3.2.0",
"@react-three/drei": "^9.96.1",
"@react-three/fiber": "^8.15.14",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.2",
@ -21,7 +21,7 @@
"@types/node": "^20.4.2",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/three": "^0.154.0",
"@types/three": "^0.160.0",
"buffer": "^6.0.3",
"github-injection": "^1.1.0",
"isomorphic-fetch": "^3.0.0",
@ -29,7 +29,7 @@
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"styled-components": "^5.3.11",
"three": "^0.154.0",
"three": "^0.160.0",
"three-mesh-bvh": "^0.7.0",
"three-stdlib": "^2.29.4",
"typescript": "^4.9.5"

6
src/components/viewer/Camera.tsx
View File

@ -18,7 +18,8 @@ function CameraLighting({ boundingSphere }: { boundingSphere?: Sphere }) {
ref={ref1}
position={[20, 20, 5]}
angle={(8 * Math.PI) / 180}
intensity={4}
intensity={4 * Math.PI}
decay={0}
castShadow
shadow-mapSize={[1024, 1024]}
shadow-cameraNear={1}
@ -27,7 +28,8 @@ function CameraLighting({ boundingSphere }: { boundingSphere?: Sphere }) {
ref={ref2}
position={[0, 0, 0]}
angle={0.8}
intensity={1.8}
intensity={1.8 * Math.PI}
decay={0}
/>
</>
)

BIN
tests/extension.spec.ts-snapshots/blob-preview-with-a-step-file-1-chromium-linux.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
tests/extension.spec.ts-snapshots/blob-preview-with-an-obj-file-1-chromium-linux.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 129 KiB

BIN
tests/extension.spec.ts-snapshots/blob-preview-with-an-stl-file-1-chromium-linux.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 129 KiB

BIN
tests/extension.spec.ts-snapshots/commit-diff-within-pull-request-with-a-modified-stl-file-1-chromium-linux.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 98 KiB

BIN
tests/extension.spec.ts-snapshots/commit-diff-within-pull-request-with-a-modified-stl-file-2-chromium-linux.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
tests/extension.spec.ts-snapshots/pull-request-diff-with-a-modified-obj-file-1-chromium-linux.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 103 KiB

BIN
tests/extension.spec.ts-snapshots/pull-request-diff-with-a-modified-obj-file-2-chromium-linux.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

139
yarn.lock
View File

@ -1479,19 +1479,19 @@ __metadata:
languageName: node
linkType: hard
"@react-three/csg@npm:^3.1.0":
version: 3.1.0
resolution: "@react-three/csg@npm:3.1.0"
"@react-three/csg@npm:^3.2.0":
version: 3.2.0
resolution: "@react-three/csg@npm:3.2.0"
dependencies:
three-bvh-csg: ^0.0.10
three-mesh-bvh: ^0.6.7
checksum: 1908cb371b5e4744d4b3c80ff628f10aa7236b691ac62c126d81fd1f5cfb58013deb2473b3276c118a77bbd6e756a510ca16d81a1c251d09814bfda36198475e
three-bvh-csg: ^0.0.16
three-mesh-bvh: ^0.6.8
checksum: aadbc4283f12d91c98432006adf1df9356364632d68d3ebde77f5869ea290adfa4f8bc5f6868f207dec76f173722a7ca7e7ffa377bd4a6b50e39b86f9ca72f03
languageName: node
linkType: hard
"@react-three/drei@npm:^9.93.0":
version: 9.93.0
resolution: "@react-three/drei@npm:9.93.0"
"@react-three/drei@npm:^9.96.1":
version: 9.96.1
resolution: "@react-three/drei@npm:9.96.1"
dependencies:
"@babel/runtime": ^7.11.2
"@mediapipe/tasks-vision": 0.10.8
@ -1511,12 +1511,13 @@ __metadata:
stats-gl: ^2.0.0
stats.js: ^0.17.0
suspend-react: ^0.1.3
three-mesh-bvh: ^0.6.7
three-stdlib: ^2.28.0
three-mesh-bvh: ^0.7.0
three-stdlib: ^2.29.4
troika-three-text: ^0.47.2
tunnel-rat: ^0.1.2
utility-types: ^3.10.0
uuid: ^9.0.1
zustand: ^3.5.13
zustand: ^3.7.1
peerDependencies:
"@react-three/fiber": ">=8.0"
react: ">=18.0"
@ -1525,7 +1526,7 @@ __metadata:
peerDependenciesMeta:
react-dom:
optional: true
checksum: 2961e9a26e0182c45e3037df99d8d03fb4b19525137e97ddf7f85f309620de4114bca368f8f5fcf10138248881381a81510f3874b19e90f3b4126e719a4c4fc4
checksum: 72b05b0e9384fe250c45ec50d37790f3e7a82977b40b2b1a537ccc0a45f60f89c2fb94317334f9d6c1d6415381c0b8d219d66bd79c2132045e8141da2921b90f
languageName: node
linkType: hard
@ -1927,13 +1928,6 @@ __metadata:
languageName: node
linkType: hard
"@tweenjs/tween.js@npm:~18.6.4":
version: 18.6.4
resolution: "@tweenjs/tween.js@npm:18.6.4"
checksum: 47208db3f6c32cde80284a852d0fca016284f90c4798eb4ebb2ebfc2e379504007bf0c031c2c33044df8a0878fd1942ebc4e0b7f5b8bcccf812b532ea1ee73eb
languageName: node
linkType: hard
"@types/aria-query@npm:^5.0.1":
version: 5.0.1
resolution: "@types/aria-query@npm:5.0.1"
@ -2211,17 +2205,15 @@ __metadata:
languageName: node
linkType: hard
"@types/three@npm:^0.154.0":
version: 0.154.0
resolution: "@types/three@npm:0.154.0"
"@types/three@npm:^0.160.0":
version: 0.160.0
resolution: "@types/three@npm:0.160.0"
dependencies:
"@tweenjs/tween.js": ~18.6.4
"@types/stats.js": "*"
"@types/webxr": "*"
fflate: ~0.6.9
lil-gui: ~0.17.0
fflate: ~0.6.10
meshoptimizer: ~0.18.1
checksum: 623067f84e342afc2641b4e547a95d25882b01a108abd8987df6e3c9af5d83d710e13cc974174867c0298573c93b4e0f1b2233d9bab650a7c2ef3cbb73a5e842
checksum: feec3c36b544f495184b7fc96e79ad4e0d43cd594029de1f1f31fe0a005dd8a0d14d979ead21927bc8fc4d7d3614002fa3a5e0b3e2b642e61ee089171ed9d7d2
languageName: node
linkType: hard
@ -3655,8 +3647,8 @@ __metadata:
"@playwright/test": ^1.41.0
"@primer/octicons-react": ^19.8.0
"@primer/react": ^36.5.0
"@react-three/csg": ^3.1.0
"@react-three/drei": ^9.93.0
"@react-three/csg": ^3.2.0
"@react-three/drei": ^9.96.1
"@react-three/fiber": ^8.15.14
"@testing-library/react": ^14.1.2
"@testing-library/user-event": ^14.5.2
@ -3664,7 +3656,7 @@ __metadata:
"@types/node": ^20.4.2
"@types/react": ^18.2.48
"@types/react-dom": ^18.2.18
"@types/three": ^0.154.0
"@types/three": ^0.160.0
"@vitejs/plugin-react": ^4.2.1
buffer: ^6.0.3
dotenv: ^16.2.0
@ -3681,7 +3673,7 @@ __metadata:
react-dom: ^18.2.0
react-is: ^18.2.0
styled-components: ^5.3.11
three: ^0.154.0
three: ^0.160.0
three-mesh-bvh: ^0.7.0
three-stdlib: ^2.29.4
typescript: ^4.9.5
@ -4436,7 +4428,7 @@ __metadata:
languageName: node
linkType: hard
"fflate@npm:^0.6.9, fflate@npm:~0.6.9":
"fflate@npm:^0.6.9, fflate@npm:~0.6.10":
version: 0.6.10
resolution: "fflate@npm:0.6.10"
checksum: 96384bc4090987fe565c0de8204e3830f538144ec950576fea50aee1b42adbe9fc3ed5e7905dfa7979faaa20979def330dbebce548f3dcafc3e118cc9838526d
@ -5733,13 +5725,6 @@ __metadata:
languageName: node
linkType: hard
"lil-gui@npm:~0.17.0":
version: 0.17.0
resolution: "lil-gui@npm:0.17.0"
checksum: a6f33e90748ea98477f1f7af6d6cbdc4a1b38ce9da86d674d73f7b0bbdc7f3e947d81edee04c32f33fb28c69a108ba04c24270a8398064ffcc56ffeabc0a916e
languageName: node
linkType: hard
"local-pkg@npm:^0.5.0":
version: 0.5.0
resolution: "local-pkg@npm:0.5.0"
@ -8286,17 +8271,17 @@ __metadata:
languageName: node
linkType: hard
"three-bvh-csg@npm:^0.0.10":
version: 0.0.10
resolution: "three-bvh-csg@npm:0.0.10"
"three-bvh-csg@npm:^0.0.16":
version: 0.0.16
resolution: "three-bvh-csg@npm:0.0.16"
peerDependencies:
three: ">=0.151.0"
three-mesh-bvh: ^0.6.5
checksum: d3fe09f9bbd6e13e4ba9b2c0650fc6618c6e798f1c21f46de6aa96054aee67a13f36311fad136920237c83d175f7e352107241eee753d07695c4c6db054723ca
three-mesh-bvh: ">=0.6.6"
checksum: 8db3b7b68d446f62b596483e57e781a1db90d537be9a9fd6d72a8071fe597f0c8ec7c0531b43dbcfa351866bd94dd757315d3fa80eec77a0dbe3c6c2fa3effbd
languageName: node
linkType: hard
"three-mesh-bvh@npm:^0.6.7":
"three-mesh-bvh@npm:^0.6.8":
version: 0.6.8
resolution: "three-mesh-bvh@npm:0.6.8"
peerDependencies:
@ -8314,22 +8299,6 @@ __metadata:
languageName: node
linkType: hard
"three-stdlib@npm:^2.28.0":
version: 2.28.7
resolution: "three-stdlib@npm:2.28.7"
dependencies:
"@types/draco3d": ^1.4.0
"@types/offscreencanvas": ^2019.6.4
"@types/webxr": ^0.5.2
draco3d: ^1.4.1
fflate: ^0.6.9
potpack: ^1.0.1
peerDependencies:
three: ">=0.128.0"
checksum: 9553b6c353b5d7fe133ce715c948f1ed92d53a504b73b1219412f06a53037dff6bd224e90cafc8520f26c658a18b3eda1d74fa2eaa209f0097f99c423484572c
languageName: node
linkType: hard
"three-stdlib@npm:^2.29.4":
version: 2.29.4
resolution: "three-stdlib@npm:2.29.4"
@ -8346,10 +8315,10 @@ __metadata:
languageName: node
linkType: hard
"three@npm:^0.154.0":
version: 0.154.0
resolution: "three@npm:0.154.0"
checksum: 90ad3cafef8b866641366977ab7189d56f7352c6cdc014cbab946544e42782ec4ea7e56b959b43590433a0fcdc4bd8f8029b18a75074ba10005182c5a73bcc88
"three@npm:^0.160.0":
version: 0.160.0
resolution: "three@npm:0.160.0"
checksum: ae9aadbcdfcbf2afdfeebc376abacd980c4cbcd0177dbe56e1420305bcc3dea9115b865932937b74445d937f463623a496e9784c39e238b32f982d6a22c6311d
languageName: node
linkType: hard
@ -8530,6 +8499,15 @@ __metadata:
languageName: node
linkType: hard
"tunnel-rat@npm:^0.1.2":
version: 0.1.2
resolution: "tunnel-rat@npm:0.1.2"
dependencies:
zustand: ^4.3.2
checksum: 9d5975d589db705e7707dcfd2bdb9f1773b014179a7e56a9cd5aaa1824ee28143efcfea30e826f3fccc0a9cb7a8631b4fd490a5849a20893e37e93e122bd9430
languageName: node
linkType: hard
"type-check@npm:^0.4.0, type-check@npm:~0.4.0":
version: 0.4.0
resolution: "type-check@npm:0.4.0"
@ -8829,6 +8807,15 @@ __metadata:
languageName: node
linkType: hard
"use-sync-external-store@npm:1.2.0":
version: 1.2.0
resolution: "use-sync-external-store@npm:1.2.0"
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
checksum: 5c639e0f8da3521d605f59ce5be9e094ca772bd44a4ce7322b055a6f58eeed8dda3c94cabd90c7a41fb6fa852210092008afe48f7038792fd47501f33299116a
languageName: node
linkType: hard
"util-deprecate@npm:^1.0.1":
version: 1.0.2
resolution: "util-deprecate@npm:1.0.2"
@ -9344,7 +9331,7 @@ __metadata:
languageName: node
linkType: hard
"zustand@npm:^3.5.13, zustand@npm:^3.7.1":
"zustand@npm:^3.7.1":
version: 3.7.2
resolution: "zustand@npm:3.7.2"
peerDependencies:
@ -9355,3 +9342,23 @@ __metadata:
checksum: 18f025b1b666a311121d3855303ff58e6a21fd107920ca474307e86984c13338d6c4cfa5cdf13382a9e0f76821f2554a12d4d200a98a66b58637e729f149797b
languageName: node
linkType: hard
"zustand@npm:^4.3.2":
version: 4.5.0
resolution: "zustand@npm:4.5.0"
dependencies:
use-sync-external-store: 1.2.0
peerDependencies:
"@types/react": ">=16.8"
immer: ">=9.0.6"
react: ">=16.8"
peerDependenciesMeta:
"@types/react":
optional: true
immer:
optional: true
react:
optional: true
checksum: 91685492ab33bb656b98e07d8fff2be1794d8e68ac5dc546ec457f4ae3d709f0c19de9e93045b9ee5d6b704f64503d9e085ffe1f600f6ade0459e572d1cf5c0d
languageName: node
linkType: hard