Merge pull request #627 from gkjohnson/remove-exports

Remove unneeded exports
gkjohnson · Apr 16, 2024 · fdf3437 · fdf3437
2 parents ed24864 + c2220a2
commit fdf3437
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 289 deletions.
diff --git a/example/graphing.js b/example/graphing.js
@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import GUI from 'three/examples/jsm/libs/lil-gui.module.min.js';
-import { GraphMaterial } from '../src/index.js';
+import { GraphMaterial } from '../src/materials/debug/GraphMaterial.js';
 import * as BSDFGLSL from '../src/shader/bsdf/index.js';
 import * as CommonGLSL from '../src/shader/common/index.js';
 

diff --git a/example/index.js b/example/index.js
@@ -24,7 +24,7 @@ import { LDrawUtils } from 'three/examples/jsm/utils/LDrawUtils.js';
 import { GUI } from 'three/examples/jsm/libs/lil-gui.module.min.js';
 import Stats from 'three/examples/jsm/libs/stats.module.js';
 import { generateRadialFloorTexture } from './utils/generateRadialFloorTexture.js';
-import { MaterialReducer, GradientEquirectTexture, WebGLPathTracer } from '../src/index.js';
+import { GradientEquirectTexture, WebGLPathTracer } from '../src/index.js';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
 import { getScaledSettings } from './utils/getScaledSettings.js';
 import { LoaderElement } from './utils/LoaderElement.js';
@@ -615,8 +615,6 @@ async function updateModel() {
 	box.setFromObject( model );
 	floorPlane.position.y = box.min.y;
 
-	const reducer = new MaterialReducer();
-	reducer.process( model );
 	scene.add( model );
 
 	await pathTracer.setSceneAsync( scene, activeCamera, {

diff --git a/example/lkg.js b/example/lkg.js
@@ -24,10 +24,11 @@ import { GUI } from 'three/examples/jsm/libs/lil-gui.module.min.js';
 import Stats from 'three/examples/jsm/libs/stats.module.js';
 import { generateRadialFloorTexture } from './utils/generateRadialFloorTexture.js';
 import { PathTracingSceneGenerator } from '../src/core/PathTracingSceneGenerator.js';
-import { PhysicalPathTracingMaterial, QuiltPathTracingRenderer, MaterialReducer, PhysicalCamera } from '../src/index.js';
+import { PhysicalCamera } from '../src/index.js';
 import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass.js';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
 import { QuiltPreviewMaterial } from './materials/QuiltPreviewMaterial.js';
+import { QuiltPathTracingRenderer } from '../src/core/QuiltPathTracingRenderer.js';
 
 import { LookingGlassWebXRPolyfill, LookingGlassConfig } from '@lookingglass/webxr/dist/@lookingglass/webxr.js';
 import { VRButton } from 'three/examples/jsm/webxr/VRButton.js';
@@ -135,7 +136,6 @@ async function init() {
 
 	// initialize the quilt renderer
 	ptRenderer = new QuiltPathTracingRenderer( renderer );
-	ptRenderer.material = new PhysicalPathTracingMaterial();
 	ptRenderer.tiles.set( params.tiles, params.tiles );
 	ptRenderer.camera = camera;
 
@@ -273,10 +273,6 @@ async function init() {
 			group.add( model, floorPlane );
 			group.updateMatrixWorld( true );
 
-			// dedupe materials
-			const reducer = new MaterialReducer();
-			reducer.process( group );
-
 			generator = new PathTracingSceneGenerator();
 			return generator.generate( group, { onProgress: v => {
 

diff --git a/example/materials/QuiltPreviewMaterial.js b/example/materials/QuiltPreviewMaterial.js
@@ -1,5 +1,5 @@
 import { Vector2, CustomBlending } from 'three';
-import { MaterialBase } from '../../src/index.js';
+import { MaterialBase } from '../../src/materials/MaterialBase.js';
 
 export class QuiltPreviewMaterial extends MaterialBase {
 

diff --git a/example/viewerTest.js b/example/viewerTest.js
@@ -15,7 +15,7 @@ import { MeshoptDecoder } from 'three/examples/jsm/libs/meshopt_decoder.module.j
 import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader.js';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 import { GUI } from 'three/examples/jsm/libs/lil-gui.module.min.js';
-import { MaterialReducer, WebGLPathTracer } from '../src/index.js';
+import { WebGLPathTracer } from '../src/index.js';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
 import { ParallelMeshBVHWorker } from 'three-mesh-bvh/src/workers/ParallelMeshBVHWorker.js';
 import { LoaderElement } from './utils/LoaderElement.js';
@@ -362,10 +362,6 @@ async function updateModel() {
 
 	model = gltf.scene;
 
-	// reduce the used materials
-	const reducer = new MaterialReducer();
-	reducer.process( model );
-
 	const targetsToDisconnect = [];
 	model.traverse( c => {
 

diff --git a/src/core/MaterialReducer.js b/src/core/MaterialReducer.js
diff --git a/src/index.js b/src/index.js
@@ -1,8 +1,5 @@
 // core
-export * from './core/PathTracingRenderer.js';
-export * from './core/QuiltPathTracingRenderer.js';
 export * from './core/PathTracingSceneGenerator.js';
-export * from './core/MaterialReducer.js';
 export * from './core/WebGLPathTracer.js';
 
 // objects
@@ -15,24 +12,14 @@ export * from './objects/ShapedAreaLight.js';
 export * from './textures/ProceduralEquirectTexture.js';
 export * from './textures/GradientEquirectTexture.js';
 
-// uniforms
-export * from './uniforms/MaterialsTexture.js';
-export * from './uniforms/RenderTarget2DArray.js';
-export * from './uniforms/EquirectHdrInfoUniform.js';
-export * from './uniforms/PhysicalCameraUniform.js';
-export * from './uniforms/LightsInfoUniformStruct.js';
-
 // utils
 export * from './utils/BlurredEnvMapGenerator.js';
-export * from './utils/IESLoader.js';
 
 // materials
 export * from './materials/fullscreen/DenoiseMaterial.js';
-export * from './materials/fullscreen/GradientMapMaterial.js';
-export * from './materials/debug/GraphMaterial.js';
-export * from './materials/MaterialBase.js';
-export * from './materials/pathtracing/PhysicalPathTracingMaterial.js';
 export * from './materials/surface/FogVolumeMaterial.js';
 
-// detectors
-export * from './detectors/CompatibilityDetector.js';
+// deprecated
+export * from './utils/IESLoader.js';
+export * from './materials/pathtracing/PhysicalPathTracingMaterial.js';
+export * from './core/PathTracingRenderer.js';