From 57c0ad2b99cc750d581cd5cfbbb69cd189ae503f Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 22 Sep 2024 14:43:07 -0400 Subject: [PATCH] Addons: Remove SDFGeometryGenerator. (#1236) * Update three.js * Add examples * Update patch and delete examples --- examples-testing/changes.patch | 31 ------------------- three.js | 2 +- .../jsm/geometries/SDFGeometryGenerator.d.ts | 16 ---------- 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 types/three/examples/jsm/geometries/SDFGeometryGenerator.d.ts diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch index 716e9956a..03a23dbc9 100644 --- a/examples-testing/changes.patch +++ b/examples-testing/changes.patch @@ -4108,37 +4108,6 @@ index a603710b..74676e45 100644 if (event.isPrimary === false) return; document.removeEventListener('pointermove', onPointerMove); -diff --git a/examples-testing/examples/webgl_geometry_sdf.ts b/examples-testing/examples/webgl_geometry_sdf.ts -index fa5dba10..9ce7da93 100644 ---- a/examples-testing/examples/webgl_geometry_sdf.ts -+++ b/examples-testing/examples/webgl_geometry_sdf.ts -@@ -4,7 +4,16 @@ import { SDFGeometryGenerator } from 'three/addons/geometries/SDFGeometryGenerat - import Stats from 'three/addons/libs/stats.module.js'; - import { GUI } from 'three/addons/libs/lil-gui.module.min.js'; - --let renderer, stats, meshFromSDF, scene, camera, clock, controls; -+let renderer: THREE.WebGLRenderer, -+ stats: Stats, -+ meshFromSDF: THREE.Mesh< -+ THREE.BufferGeometry, -+ THREE.MeshBasicMaterial | THREE.MeshDepthMaterial | THREE.MeshNormalMaterial -+ >, -+ scene: THREE.Scene, -+ camera: THREE.OrthographicCamera, -+ clock: THREE.Clock, -+ controls: OrbitControls; - - const settings = { - res: 4, -@@ -12,7 +21,7 @@ const settings = { - autoRotate: true, - wireframe: true, - material: 'depth', -- vertexCount: '0', -+ vertexCount: 0, - }; - - // Example SDF from https://www.shadertoy.com/view/MdXSWn --> diff --git a/examples-testing/examples/webgl_geometry_shapes.ts b/examples-testing/examples/webgl_geometry_shapes.ts index f1d00f01..2042c353 100644 --- a/examples-testing/examples/webgl_geometry_shapes.ts diff --git a/three.js b/three.js index 184a7d6d3..4650fd775 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit 184a7d6d3f5d5b409e79a715e4fcb78a73d387ed +Subproject commit 4650fd775e5f18b9ce0d06899035ff7133a20863 diff --git a/types/three/examples/jsm/geometries/SDFGeometryGenerator.d.ts b/types/three/examples/jsm/geometries/SDFGeometryGenerator.d.ts deleted file mode 100644 index d53d5801d..000000000 --- a/types/three/examples/jsm/geometries/SDFGeometryGenerator.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { BufferGeometry, WebGLRenderer, WebGLRenderTarget } from "three"; - -export class SDFGeometryGenerator { - constructor(renderer: WebGLRenderer); - - generate(res?: number, distFunc?: string, bounds?: number): BufferGeometry; - - computeSDF( - width: number, - height: number, - tilesX: number, - tilesY: number, - bounds: number, - shader: string, - ): WebGLRenderTarget; -}