diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch index 005fdbc7b..58caef265 100644 --- a/examples-testing/changes.patch +++ b/examples-testing/changes.patch @@ -15985,11 +15985,11 @@ index 4afa5d2d0..715c323a2 100644 render(); diff --git a/examples-testing/examples/webgpu_gaussian_splat.ts b/examples-testing/examples/webgpu_gaussian_splat.ts -index 59f413c2f..947a60694 100644 +index 555853fda..b29a09f2a 100644 --- a/examples-testing/examples/webgpu_gaussian_splat.ts +++ b/examples-testing/examples/webgpu_gaussian_splat.ts @@ -6,12 +6,35 @@ import { SPZLoader } from 'three/addons/loaders/SPZLoader.js'; - import { GaussianSplatMesh } from 'three/addons/objects/GaussianSplatMesh.js'; + import { GaussianSplat } from 'three/addons/objects/GaussianSplat.js'; import { Inspector } from 'three/addons/inspector/Inspector.js'; -let camera, scene, renderer, controls, splats, splatRoot; @@ -15997,8 +15997,8 @@ index 59f413c2f..947a60694 100644 + scene: THREE.Scene, + renderer: THREE.WebGPURenderer, + controls: OrbitControls, -+ splats: GaussianSplatMesh | undefined, -+ splatRoot: GaussianSplatMesh | undefined; ++ splats: GaussianSplat | undefined, ++ splatRoot: GaussianSplat | undefined; THREE.ColorManagement.workingColorSpace = THREE.SRGBColorSpace; const zeroVector = new THREE.Vector3(); @@ -16078,7 +16078,7 @@ index 59f413c2f..947a60694 100644 } -function fitCameraToSplats(mesh, source) { -+function fitCameraToSplats(mesh: GaussianSplatMesh, source: SplatSource) { ++function fitCameraToSplats(mesh: GaussianSplat, source: SplatSource) { mesh.updateWorldMatrix(true, false); - const sphere = mesh.splatGeometry.boundingSphere.clone().applyMatrix4(mesh.matrixWorld); diff --git a/three.js b/three.js index 2e1894fdf..5d5ebcff9 160000 --- a/three.js +++ b/three.js @@ -1 +1 @@ -Subproject commit 2e1894fdfa181e762a83358b3219622ccdf1ee47 +Subproject commit 5d5ebcff9f94e660934bd7741e26492d53e33d0c diff --git a/types/three/examples/jsm/Addons.d.ts b/types/three/examples/jsm/Addons.d.ts index 09185c471..5f258a947 100644 --- a/types/three/examples/jsm/Addons.d.ts +++ b/types/three/examples/jsm/Addons.d.ts @@ -161,7 +161,7 @@ export * from "./modifiers/EdgeSplitModifier.js"; export * from "./modifiers/SimplifyModifier.js"; export * from "./modifiers/TessellateModifier.js"; -export * from "./objects/GaussianSplatMesh.js"; +export * from "./objects/GaussianSplat.js"; export * from "./objects/GroundedSkybox.js"; export * from "./objects/Lensflare.js"; export * from "./objects/MarchingCubes.js"; diff --git a/types/three/examples/jsm/loaders/GLTFGaussianSplatLoaderExtension.d.ts b/types/three/examples/jsm/loaders/GLTFGaussianSplatLoaderExtension.d.ts index 565d343ae..31f4d8d5d 100644 --- a/types/three/examples/jsm/loaders/GLTFGaussianSplatLoaderExtension.d.ts +++ b/types/three/examples/jsm/loaders/GLTFGaussianSplatLoaderExtension.d.ts @@ -1,5 +1,5 @@ import { Group } from "three"; -import { GaussianSplatMesh } from "../objects/GaussianSplatMesh.js"; +import { GaussianSplat } from "../objects/GaussianSplat.js"; import { GLTFParser } from "./GLTFLoader.js"; declare class GLTFGaussianSplatLoaderExtension { @@ -8,7 +8,7 @@ declare class GLTFGaussianSplatLoaderExtension { name: string; parser: GLTFParser; - loadMesh(meshIndex: number): Promise | null; + loadMesh(meshIndex: number): Promise | null; } export { GLTFGaussianSplatLoaderExtension }; diff --git a/types/three/examples/jsm/objects/GaussianSplatMesh.d.ts b/types/three/examples/jsm/objects/GaussianSplat.d.ts similarity index 73% rename from types/three/examples/jsm/objects/GaussianSplatMesh.d.ts rename to types/three/examples/jsm/objects/GaussianSplat.d.ts index 4cca59a37..d4a5b7550 100644 --- a/types/three/examples/jsm/objects/GaussianSplatMesh.d.ts +++ b/types/three/examples/jsm/objects/GaussianSplat.d.ts @@ -9,14 +9,14 @@ import { Sphere, } from "three/webgpu"; -export interface GaussianSplatMeshOptions { +export interface GaussianSplatOptions { autoSort?: boolean | undefined; } -declare class GaussianSplatMesh extends Mesh { - constructor(splatGeometry: BufferGeometry, options?: GaussianSplatMeshOptions); +declare class GaussianSplat extends Mesh { + constructor(splatGeometry: BufferGeometry, options?: GaussianSplatOptions); - readonly isGaussianSplatMesh: true; + readonly isGaussianSplat: true; splatGeometry: BufferGeometry; boundingBox: Box3 | null; @@ -32,4 +32,4 @@ declare class GaussianSplatMesh extends Mesh