chore(deps): update dependency three to v0.166.1 (#4646)

* chore(deps): update dependency three to v0.166.1 * chore: fix data texture generation (??) and material onbeforerender --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Håkon Flatval <[email protected]>
cognitedata · Jul 17, 2024 · 6569047 · 6569047
1 parent 952801d
commit 6569047
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 111 deletions.
diff --git a/examples/package.json b/examples/package.json
@@ -36,12 +36,12 @@
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "@types/stats.js": "^0.17.0",
-    "@types/three": "^0.165.0",
+    "@types/three": "^0.166.0",
     "css-loader": "^7.0.0",
     "dotenv-webpack": "^8.0.0",
     "html-webpack-plugin": "^5.5.0",
     "prettier": "^3.0.0",
-    "three": "0.165.0",
+    "three": "0.166.1",
     "ts-loader": "9.5.1",
     "typescript": "^5.0.4",
     "webpack": "^5.76.0",

diff --git a/examples/yarn.lock b/examples/yarn.lock
diff --git a/viewer/package.json b/viewer/package.json
@@ -95,7 +95,7 @@
     "@types/random-seed": "^0.3.5",
     "@types/skmeans": "^0.11.7",
     "@types/stats": "^0.16.30",
-    "@types/three": "^0.165.0",
+    "@types/three": "^0.166.0",
     "@types/tween.js": "^18.6.1",
     "@typescript-eslint/eslint-plugin": "^7.7.1",
     "@typescript-eslint/parser": "^7.7.1",
@@ -131,7 +131,7 @@
     "resize-observer-polyfill": "^1.5.1",
     "shx": "^0.3.4",
     "stats.js": "^0.17.0",
-    "three": "0.165.0",
+    "three": "0.166.1",
     "ts-jest": "^29.1.2",
     "ts-loader": "^9.5.1",
     "tsc-alias": "^1.8.8",
@@ -146,7 +146,7 @@
   },
   "peerDependencies": {
     "@cognite/sdk": "^7.16.0 || ^8.0.0",
-    "three": "0.165.0"
+    "three": "0.166.1"
   },
   "glslify": {
     "transform": [

diff --git a/viewer/packages/pointclouds/src/potree-three-loader/utils/utils.ts b/viewer/packages/pointclouds/src/potree-three-loader/utils/utils.ts
@@ -77,8 +77,9 @@ export function makeOnBeforeRender(
   node: IPointCloudTreeNode,
   pcIndex: number
 ): (renderer: WebGLRenderer, scene: Scene, camera: Camera, bufferGeometry: BufferGeometry, material: Material) => void {
-  return (_renderer: WebGLRenderer, _scene: Scene, _camera: Camera, _geometry: BufferGeometry, material: Material) => {
+  return (renderer: WebGLRenderer, _scene: Scene, _camera: Camera, _geometry: BufferGeometry, material: Material) => {
     const pointCloudMaterial = material as PointCloudMaterial;
+    pointCloudMaterial.onBeforeRender(renderer);
     const materialUniforms = pointCloudMaterial.uniforms;
 
     materialUniforms.level.value = node.level;

diff --git a/viewer/packages/rendering/src/pointcloud-rendering/PointCloudMaterial.ts b/viewer/packages/rendering/src/pointcloud-rendering/PointCloudMaterial.ts
@@ -172,7 +172,7 @@ export class PointCloudMaterial extends RawShaderMaterial {
       glslVersion: GLSL3
     });
 
-    const tex = (this.visibleNodesTexture = generateDataTexture(2048, 1, COLOR_WHITE));
+    const tex = (this.visibleNodesTexture = generateDataTexture(2048, 1, COLOR_WHITE, 0x0));
     tex.minFilter = NearestFilter;
     tex.magFilter = NearestFilter;
     this.setUniform('visibleNodes', tex);

diff --git a/viewer/packages/rendering/src/pointcloud-rendering/PointCloudObjectAppearanceTexture.ts b/viewer/packages/rendering/src/pointcloud-rendering/PointCloudObjectAppearanceTexture.ts
@@ -27,7 +27,7 @@ export class PointCloudObjectAppearanceTexture {
   private _annotationIdsToObjectId: Map<number, number> | undefined;
 
   constructor(width: number, height: number) {
-    this._objectStyleTexture = generateDataTexture(width, height, new THREE.Color(0x01000000)); // Initialize with visibility bit set
+    this._objectStyleTexture = generateDataTexture(width, height, new THREE.Color(0x0), 0x01); // Initialize with visibility bit set
 
     this._width = width;
     this._height = height;

diff --git a/viewer/packages/rendering/src/pointcloud-rendering/texture-generation.ts b/viewer/packages/rendering/src/pointcloud-rendering/texture-generation.ts
@@ -14,7 +14,7 @@ import {
 } from 'three';
 import { PointClassification, IGradient } from './types';
 
-export function generateDataTexture(width: number, height: number, color: Color): DataTexture {
+export function generateDataTexture(width: number, height: number, color: Color, alpha: number): DataTexture {
   const size = width * height;
   const data = new Uint8Array(4 * size);
 
@@ -26,6 +26,7 @@ export function generateDataTexture(width: number, height: number, color: Color)
     data[i * 4] = r;
     data[i * 4 + 1] = g;
     data[i * 4 + 2] = b;
+    data[i * 4 + 3] = alpha;
   }
 
   const texture = new DataTexture(data, width, height, RGBAFormat);

diff --git a/viewer/yarn.lock b/viewer/yarn.lock