Examples: Improved webgl_loader_gltf_compressed.

mrdoob · Jan 22, 2021 · 067cf15 · 067cf15
1 parent 3c87cc7
commit 067cf15
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 39 deletions.
diff --git a/examples/screenshots/webgl_loader_gltf_compressed.jpg b/examples/screenshots/webgl_loader_gltf_compressed.jpg
diff --git a/examples/webgl_loader_gltf_compressed.html b/examples/webgl_loader_gltf_compressed.html
@@ -11,8 +11,7 @@
 		<div id="info">
 			<a href="https://threejs.org" target="_blank" rel="noopener">three.js</a> - GLTFLoader + compression extensions<br />
 			<a href="https://sketchfab.com/3d-models/coffeemat-7fb196a40a6e4697aad9ca2f75c8b33d" target="_blank" rel="noopener">Coffeemat</a> by
-			<a href="https://sketchfab.com/OFFcours1" target="_blank" rel="noopener">Roman Red</a><br />
-			<a href="https://hdrihaven.com/hdri/?h=royal_esplanade" target="_blank" rel="noopener">Royal Esplanade</a> by <a href="https://hdrihaven.com/" target="_blank" rel="noopener">HDRI Haven</a>
+			<a href="https://sketchfab.com/OFFcours1" target="_blank" rel="noopener">Roman Red</a>
 		</div>
 
 		<script src="./js/libs/basis/msc_basis_transcoder.js"></script>
@@ -21,9 +20,9 @@
 
 			import * as THREE from '../build/three.module.js';
 
+			import { RoomEnvironment } from './jsm/environments/RoomEnvironment.js';
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
 			import { GLTFLoader } from './jsm/loaders/GLTFLoader.js';
-			import { RGBELoader } from './jsm/loaders/RGBELoader.js';
 
 			import { KTX2Loader } from './jsm/loaders/KTX2Loader.js';
 			import { MeshoptDecoder } from './jsm/libs/meshopt_decoder.module.js';
@@ -47,55 +46,43 @@
 				container.appendChild( renderer.domElement );
 
 				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 2000 );
-				camera.position.set( 0, 90, 0 );
+				camera.position.set( 0, 100, 0 );
 
-				scene = new THREE.Scene();
-
-				const ktx2Loader = new KTX2Loader().detectSupport( renderer );
-
-				new RGBELoader()
-					.setDataType( THREE.UnsignedByteType )
-					.setPath( 'textures/equirectangular/' )
-					.load( 'royal_esplanade_1k.hdr', function ( texture ) {
-
-						const envMap = pmremGenerator.fromEquirectangular( texture ).texture;
-
-						scene.background = envMap;
-						scene.environment = envMap;
-
-						texture.dispose();
-						pmremGenerator.dispose();
-
-						render();
-
-						// model
+				const environment = new RoomEnvironment();
+				const pmremGenerator = new THREE.PMREMGenerator( renderer );
 
-						const loader = new GLTFLoader().setPath( 'models/gltf/' );
-						loader.setKTX2Loader( ktx2Loader );
-						loader.setMeshoptDecoder( MeshoptDecoder );
+				scene = new THREE.Scene();
+				scene.background = new THREE.Color( 0xbbbbbb );
+				scene.environment = pmremGenerator.fromScene( environment ).texture;
 
-						// coffeemat.glb was produced from the source scene using gltfpack:
-						// gltfpack -i coffeemat/scene.gltf -o coffeemat.glb -cc -tc
-						// The resulting model uses EXT_meshopt_compression (for geometry) and KHR_texture_basisu (for texture compression using ETC1S/BasisLZ)
+				const grid = new THREE.GridHelper( 500, 10, 0xffffff, 0xffffff );
+				grid.material.opacity = 0.5;
+				grid.material.depthWrite = false;
+				grid.material.transparent = true;
+				scene.add( grid );
 
-						loader.load( 'coffeemat.glb', function ( gltf ) {
+				const loader = new GLTFLoader().setPath( 'models/gltf/' );
+				loader.setKTX2Loader( new KTX2Loader().detectSupport( renderer ) );
+				loader.setMeshoptDecoder( MeshoptDecoder );
+				loader.load( 'coffeemat.glb', function ( gltf ) {
 
-							scene.add( gltf.scene );
+					// coffeemat.glb was produced from the source scene using gltfpack:
+					// gltfpack -i coffeemat/scene.gltf -o coffeemat.glb -cc -tc
+					// The resulting model uses EXT_meshopt_compression (for geometry) and KHR_texture_basisu (for texture compression using ETC1S/BasisLZ)
 
-							render();
+					gltf.scene.position.y = 8;
 
-						} );
+					scene.add( gltf.scene );
 
-					} );
+					render();
 
-				const pmremGenerator = new THREE.PMREMGenerator( renderer );
-				pmremGenerator.compileEquirectangularShader();
+				} );
 
 				const controls = new OrbitControls( camera, renderer.domElement );
 				controls.addEventListener( 'change', render ); // use if there is no animation loop
-				controls.minDistance = 500;
+				controls.minDistance = 400;
 				controls.maxDistance = 1000;
-				controls.target.set( 10, 76, -16 );
+				controls.target.set( 10, 90, - 16 );
 				controls.update();
 
 				window.addEventListener( 'resize', onWindowResize, false );