Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ThreeJS #418

Merged
merged 16 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"d3-color": "^3.1.0",
"react": "^18.0.1",
"styled-components": "^5.3.6",
"three": "^0.135.0",
"three-mesh-bvh": "^0.5.17",
"three": "^0.168.0",
"three-mesh-bvh": "^0.7.8",
"uuid": "^8.3.2"
},
"devDependencies": {
Expand Down
22 changes: 0 additions & 22 deletions packages/base/src/3dview/mainview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -668,28 +668,6 @@ export class MainView extends React.Component<IProps, IStates> {
// Set the expoded view if it's enabled
this._setupExplodedView();

// Clip plane rendering
const planeGeom = new THREE.PlaneGeometry(
this._refLength! * 10, // *10 is a bit arbitrary and extreme but that does not impact performance or anything
this._refLength! * 10
);
const planeMat = new THREE.MeshPhongMaterial({
color: DEFAULT_EDGE_COLOR,
stencilWrite: true,
stencilRef: 0,
stencilFunc: THREE.NotEqualStencilFunc,
stencilFail: THREE.ReplaceStencilOp,
stencilZFail: THREE.ReplaceStencilOp,
stencilZPass: THREE.ReplaceStencilOp,
side: THREE.DoubleSide,
wireframe: this.state.wireframe
});
this._clippingPlaneMesh = new THREE.Mesh(planeGeom, planeMat);
this._clippingPlaneMesh.onAfterRender = renderer => {
renderer.clearStencil();
};

this._scene.add(this._clippingPlaneMesh);
arjxn-py marked this conversation as resolved.
Show resolved Hide resolved
this._scene.add(this._meshGroup);
if (this._loadingTimeout) {
clearTimeout(this._loadingTimeout);
Expand Down
45 changes: 34 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -901,8 +901,8 @@ __metadata:
react: ^18.0.1
rimraf: ^3.0.2
styled-components: ^5.3.6
three: ^0.135.0
three-mesh-bvh: ^0.5.17
three: ^0.168.0
three-mesh-bvh: ^0.7.8
typescript: ^5
uuid: ^8.3.2
languageName: unknown
Expand Down Expand Up @@ -11923,19 +11923,19 @@ __metadata:
languageName: node
linkType: hard

"three-mesh-bvh@npm:^0.5.17":
version: 0.5.24
resolution: "three-mesh-bvh@npm:0.5.24"
"three-mesh-bvh@npm:^0.7.8":
version: 0.7.8
resolution: "three-mesh-bvh@npm:0.7.8"
peerDependencies:
three: ">= 0.123.0"
checksum: 5a5e356111756869cfd00870bca2d881d3019b55e71142b5eee544a2e6bcc3546a340b0defa29c3ebe7ed4cfe99e7ee6addd5671bb89852841107189c0f98157
three: ">= 0.151.0"
checksum: 3023a7d1ccdf033e08eba5c6437b4c3dd31a6ec83cb54cfadfca2d6aa22c74c7895c5b0d6e943897ac411a64b86d9bf78b3f6c3a902efd8b8bfd3cf0afd9a18e
languageName: node
linkType: hard

"three@npm:^0.135.0":
version: 0.135.0
resolution: "three@npm:0.135.0"
checksum: bd7e195932587a5be0c887947adf2b3898c6fa71722800432562aed10beddb2f448d0f237d937824805eebf90e625fc22ed57054618121f47811a8e82b528507
"three@npm:^0.168.0":
version: 0.168.0
resolution: "three@npm:0.168.0"
checksum: 1f186006ad5c8df348d4a2bcdccc078f0454f196b8ccc450d405cdf8c88436ff773e545725ef1122891b5552b5cf03add8394288b58985a0c3ebe66b588cab2f
languageName: node
linkType: hard

Expand Down Expand Up @@ -13129,6 +13129,29 @@ __metadata:
languageName: node
linkType: hard

"yjs-widgets@npm:^0.3.5":
version: 0.3.6
resolution: "yjs-widgets@npm:0.3.6"
dependencies:
"@jupyter/collaboration": ^2.0.0
"@jupyter/ydoc": ^2.0.0
"@jupyterlab/application": ^4.0.0
"@jupyterlab/apputils": ^4.0.0
"@jupyterlab/console": ^4.2.4
"@jupyterlab/coreutils": ^6.0.0
"@jupyterlab/notebook": ^4.0.0
"@jupyterlab/services": ^7.0.0
"@lumino/coreutils": ^2.1.1
"@lumino/signaling": ^2.1.1
"@lumino/widgets": ^2.1.1
lib0: ^0.2.76
uuid: ^9.0.0
webpack: ^5.77.0
webpack-cli: ^5.0.1
checksum: 25d058d4c6a88ffd5f84027d972d79058bdf2043e008020034bacc77f30ad584cf5b763eaed2f8be6a052f37d4d444d4818a9b21f742640f565ed0461af5ad80
languageName: node
linkType: hard

"yjs@npm:^13.5.0, yjs@npm:^13.5.40":
version: 13.6.19
resolution: "yjs@npm:13.6.19"
Expand Down
Loading