From 617c172c5ecf820cae33d8e0b94c72d614a81aca Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 22 Sep 2024 22:40:13 -0400 Subject: [PATCH 1/5] Addons: Remove PackedPhongMaterial. --- .../jsm/utils/GeometryCompressionUtils.d.ts | 25 ++++++++++++++++--- .../jsm/utils/PackedPhongMaterial.d.ts | 10 -------- 2 files changed, 21 insertions(+), 14 deletions(-) delete mode 100644 types/three/examples/jsm/utils/PackedPhongMaterial.d.ts diff --git a/types/three/examples/jsm/utils/GeometryCompressionUtils.d.ts b/types/three/examples/jsm/utils/GeometryCompressionUtils.d.ts index 66767923f..79cf80022 100644 --- a/types/three/examples/jsm/utils/GeometryCompressionUtils.d.ts +++ b/types/three/examples/jsm/utils/GeometryCompressionUtils.d.ts @@ -1,5 +1,22 @@ -import { Mesh } from "three"; +import { BufferGeometry, Mesh } from 'three'; -export function compressNormals(mesh: Mesh, encodeMethod: string): void; -export function compressPositions(mesh: Mesh): void; -export function compressUvs(mesh: Mesh): void; +/** + * Make the input geometry's normal attribute encoded and compressed by 3 different methods. + */ +declare function compressNormals(geometry: BufferGeometry, encodeMethod: "DEFAULT" | "OCT1Byte" | "OCT2Byte" | "ANGLES"): void; + +/** + * Make the input geometry's position attribute encoded and compressed. + */ +declare function compressPositions(geometry: BufferGeometry): void; + +/** + * Make the input geometry's uv attribute encoded and compressed. + */ +declare function compressUvs(geometry: BufferGeometry): void; + +export { + compressNormals, + compressPositions, + compressUvs, +}; diff --git a/types/three/examples/jsm/utils/PackedPhongMaterial.d.ts b/types/three/examples/jsm/utils/PackedPhongMaterial.d.ts deleted file mode 100644 index 890d175f4..000000000 --- a/types/three/examples/jsm/utils/PackedPhongMaterial.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -/** - * `PackedPhongMaterial` inherited from THREE.MeshPhongMaterial - * - * @param {Object} parameters - */ -import { MeshPhongMaterial, MeshPhongMaterialParameters } from "three"; - -export class PackedPhongMaterial extends MeshPhongMaterial { - constructor(parameters: MeshPhongMaterialParameters); -} From b1db515ca274e668607e07c286a56ab5af7be4d4 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 22 Sep 2024 22:40:30 -0400 Subject: [PATCH 2/5] Update three.js --- three.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/three.js b/three.js index bac758d7f..eada853a1 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit bac758d7f80afbfc1a0a7dda91a46cbc5bf295f5 +Subproject commit eada853a193ba6d25642c47b84b0342001de0b66 From 69ad0f551f1e771402a552499bdfba775870b6ef Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 22 Sep 2024 22:41:15 -0400 Subject: [PATCH 3/5] Update --- examples-testing/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples-testing/index.js b/examples-testing/index.js index 49904f4ee..06476115b 100644 --- a/examples-testing/index.js +++ b/examples-testing/index.js @@ -43,7 +43,6 @@ const exceptionList = [ 'webgl_postprocessing_3dlut', 'webgl_postprocessing_dof', 'webgl_postprocessing_dof2', - 'webgl_buffergeometry_compression', 'webgl_rendertarget_texture2darray', 'webgl_texture2darray', 'webgl_worker_offscreencanvas', From cda9ff13d4f62e9105eb48075b3ee3cb924968f7 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 22 Sep 2024 22:42:55 -0400 Subject: [PATCH 4/5] Format --- .../jsm/utils/GeometryCompressionUtils.d.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/types/three/examples/jsm/utils/GeometryCompressionUtils.d.ts b/types/three/examples/jsm/utils/GeometryCompressionUtils.d.ts index 79cf80022..f94c652cd 100644 --- a/types/three/examples/jsm/utils/GeometryCompressionUtils.d.ts +++ b/types/three/examples/jsm/utils/GeometryCompressionUtils.d.ts @@ -1,9 +1,12 @@ -import { BufferGeometry, Mesh } from 'three'; +import { BufferGeometry, Mesh } from "three"; /** * Make the input geometry's normal attribute encoded and compressed by 3 different methods. */ -declare function compressNormals(geometry: BufferGeometry, encodeMethod: "DEFAULT" | "OCT1Byte" | "OCT2Byte" | "ANGLES"): void; +declare function compressNormals( + geometry: BufferGeometry, + encodeMethod: "DEFAULT" | "OCT1Byte" | "OCT2Byte" | "ANGLES", +): void; /** * Make the input geometry's position attribute encoded and compressed. @@ -15,8 +18,4 @@ declare function compressPositions(geometry: BufferGeometry): void; */ declare function compressUvs(geometry: BufferGeometry): void; -export { - compressNormals, - compressPositions, - compressUvs, -}; +export { compressNormals, compressPositions, compressUvs }; From ce561221f01e13ec560958d8d4a7b6729443f0c0 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 22 Sep 2024 22:43:21 -0400 Subject: [PATCH 5/5] Remove --- types/three/examples/jsm/Addons.d.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/types/three/examples/jsm/Addons.d.ts b/types/three/examples/jsm/Addons.d.ts index acbd83a88..95f777cef 100644 --- a/types/three/examples/jsm/Addons.d.ts +++ b/types/three/examples/jsm/Addons.d.ts @@ -271,7 +271,6 @@ export * as CameraUtils from "./utils/CameraUtils.js"; export * as GeometryCompressionUtils from "./utils/GeometryCompressionUtils.js"; export * as GeometryUtils from "./utils/GeometryUtils.js"; export * from "./utils/LDrawUtils.js"; -export * from "./utils/PackedPhongMaterial.js"; export * as SceneUtils from "./utils/SceneUtils.js"; export * from "./utils/ShadowMapViewer.js"; export * as SkeletonUtils from "./utils/SkeletonUtils.js";