Browse Source

Examples: Convert environments to ES6. (#21585)

Michael Herzog 4 years ago
parent
commit
91836311f0
2 changed files with 128 additions and 124 deletions
  1. 28 26
      examples/jsm/environments/DebugEnvironment.js
  2. 100 98
      examples/jsm/environments/RoomEnvironment.js

+ 28 - 26
examples/jsm/environments/DebugEnvironment.js

@@ -1,41 +1,43 @@
 import * as THREE from '../../../build/three.module.js';
 
-function DebugEnvironment() {
+class DebugEnvironment extends THREE.Scene {
 
-	const envScene = new THREE.Scene();
+	constructor() {
 
-	const geometry = new THREE.BoxGeometry();
-	geometry.deleteAttribute( 'uv' );
-	const roomMaterial = new THREE.MeshStandardMaterial( { metalness: 0, side: THREE.BackSide } );
-	const room = new THREE.Mesh( geometry, roomMaterial );
-	room.scale.setScalar( 10 );
-	envScene.add( room );
+		super();
 
-	const mainLight = new THREE.PointLight( 0xffffff, 50, 0, 2 );
-	envScene.add( mainLight );
+		const geometry = new THREE.BoxGeometry();
+		geometry.deleteAttribute( 'uv' );
+		const roomMaterial = new THREE.MeshStandardMaterial( { metalness: 0, side: THREE.BackSide } );
+		const room = new THREE.Mesh( geometry, roomMaterial );
+		room.scale.setScalar( 10 );
+		this.add( room );
 
-	const material1 = new THREE.MeshLambertMaterial( { color: 0xff0000, emissive: 0xffffff, emissiveIntensity: 10 } );
+		const mainLight = new THREE.PointLight( 0xffffff, 50, 0, 2 );
+		this.add( mainLight );
 
-	const light1 = new THREE.Mesh( geometry, material1 );
-	light1.position.set( - 5, 2, 0 );
-	light1.scale.set( 0.1, 1, 1 );
-	envScene.add( light1 );
+		const material1 = new THREE.MeshLambertMaterial( { color: 0xff0000, emissive: 0xffffff, emissiveIntensity: 10 } );
 
-	const material2 = new THREE.MeshLambertMaterial( { color: 0x00ff00, emissive: 0xffffff, emissiveIntensity: 10 } );
+		const light1 = new THREE.Mesh( geometry, material1 );
+		light1.position.set( - 5, 2, 0 );
+		light1.scale.set( 0.1, 1, 1 );
+		this.add( light1 );
 
-	const light2 = new THREE.Mesh( geometry, material2 );
-	light2.position.set( 0, 5, 0 );
-	light2.scale.set( 1, 0.1, 1 );
-	envScene.add( light2 );
+		const material2 = new THREE.MeshLambertMaterial( { color: 0x00ff00, emissive: 0xffffff, emissiveIntensity: 10 } );
 
-	const material3 = new THREE.MeshLambertMaterial( { color: 0x0000ff, emissive: 0xffffff, emissiveIntensity: 10 } );
+		const light2 = new THREE.Mesh( geometry, material2 );
+		light2.position.set( 0, 5, 0 );
+		light2.scale.set( 1, 0.1, 1 );
+		this.add( light2 );
 
-	const light3 = new THREE.Mesh( geometry, material3 );
-	light3.position.set( 2, 1, 5 );
-	light3.scale.set( 1.5, 2, 0.1 );
-	envScene.add( light3 );
+		const material3 = new THREE.MeshLambertMaterial( { color: 0x0000ff, emissive: 0xffffff, emissiveIntensity: 10 } );
 
-	return envScene;
+		const light3 = new THREE.Mesh( geometry, material3 );
+		light3.position.set( 2, 1, 5 );
+		light3.scale.set( 1.5, 2, 0.1 );
+		this.add( light3 );
+
+	}
 
 }
 

+ 100 - 98
examples/jsm/environments/RoomEnvironment.js

@@ -4,107 +4,109 @@
 
 import * as THREE from '../../../build/three.module.js';
 
-function RoomEnvironment() {
-
-	const scene = new THREE.Scene();
-
-	const geometry = new THREE.BoxGeometry();
-	geometry.deleteAttribute( 'uv' );
-
-	const roomMaterial = new THREE.MeshStandardMaterial( { side: THREE.BackSide } );
-	const boxMaterial = new THREE.MeshStandardMaterial();
-
-	const mainLight = new THREE.PointLight( 0xffffff, 5.0, 28, 2 );
-	mainLight.position.set( 0.418, 16.199, 0.300 );
-	scene.add( mainLight );
-
-	const room = new THREE.Mesh( geometry, roomMaterial );
-	room.position.set( - 0.757, 13.219, 0.717 );
-	room.scale.set( 31.713, 28.305, 28.591 );
-	scene.add( room );
-
-	const box1 = new THREE.Mesh( geometry, boxMaterial );
-	box1.position.set( - 10.906, 2.009, 1.846 );
-	box1.rotation.set( 0, - 0.195, 0 );
-	box1.scale.set( 2.328, 7.905, 4.651 );
-	scene.add( box1 );
-
-	const box2 = new THREE.Mesh( geometry, boxMaterial );
-	box2.position.set( - 5.607, - 0.754, - 0.758 );
-	box2.rotation.set( 0, 0.994, 0 );
-	box2.scale.set( 1.970, 1.534, 3.955 );
-	scene.add( box2 );
-
-	const box3 = new THREE.Mesh( geometry, boxMaterial );
-	box3.position.set( 6.167, 0.857, 7.803 );
-	box3.rotation.set( 0, 0.561, 0 );
-	box3.scale.set( 3.927, 6.285, 3.687 );
-	scene.add( box3 );
-
-	const box4 = new THREE.Mesh( geometry, boxMaterial );
-	box4.position.set( - 2.017, 0.018, 6.124 );
-	box4.rotation.set( 0, 0.333, 0 );
-	box4.scale.set( 2.002, 4.566, 2.064 );
-	scene.add( box4 );
-
-	const box5 = new THREE.Mesh( geometry, boxMaterial );
-	box5.position.set( 2.291, - 0.756, - 2.621 );
-	box5.rotation.set( 0, - 0.286, 0 );
-	box5.scale.set( 1.546, 1.552, 1.496 );
-	scene.add( box5 );
-
-	const box6 = new THREE.Mesh( geometry, boxMaterial );
-	box6.position.set( - 2.193, - 0.369, - 5.547 );
-	box6.rotation.set( 0, 0.516, 0 );
-	box6.scale.set( 3.875, 3.487, 2.986 );
-	scene.add( box6 );
-
-
-	// -x right
-	const light1 = new THREE.Mesh( geometry, createAreaLightMaterial( 50 ) );
-	light1.position.set( - 16.116, 14.37, 8.208 );
-	light1.scale.set( 0.1, 2.428, 2.739 );
-	scene.add( light1 );
-
-	// -x left
-	const light2 = new THREE.Mesh( geometry, createAreaLightMaterial( 50 ) );
-	light2.position.set( - 16.109, 18.021, - 8.207 );
-	light2.scale.set( 0.1, 2.425, 2.751 );
-	scene.add( light2 );
-
-	// +x
-	const light3 = new THREE.Mesh( geometry, createAreaLightMaterial( 17 ) );
-	light3.position.set( 14.904, 12.198, - 1.832 );
-	light3.scale.set( 0.15, 4.265, 6.331 );
-	scene.add( light3 );
-
-	// +z
-	const light4 = new THREE.Mesh( geometry, createAreaLightMaterial( 43 ) );
-	light4.position.set( - 0.462, 8.89, 14.520 );
-	light4.scale.set( 4.38, 5.441, 0.088 );
-	scene.add( light4 );
-
-	// -z
-	const light5 = new THREE.Mesh( geometry, createAreaLightMaterial( 20 ) );
-	light5.position.set( 3.235, 11.486, - 12.541 );
-	light5.scale.set( 2.5, 2.0, 0.1 );
-	scene.add( light5 );
-
-	// +y
-	const light6 = new THREE.Mesh( geometry, createAreaLightMaterial( 100 ) );
-	light6.position.set( 0.0, 20.0, 0.0 );
-	light6.scale.set( 1.0, 0.1, 1.0 );
-	scene.add( light6 );
-
-	function createAreaLightMaterial( intensity ) {
-
-		const material = new THREE.MeshBasicMaterial();
-		material.color.setScalar( intensity );
-		return material;
+class RoomEnvironment extends THREE.Scene {
+
+	constructor() {
+
+		super();
+
+		const geometry = new THREE.BoxGeometry();
+		geometry.deleteAttribute( 'uv' );
+
+		const roomMaterial = new THREE.MeshStandardMaterial( { side: THREE.BackSide } );
+		const boxMaterial = new THREE.MeshStandardMaterial();
+
+		const mainLight = new THREE.PointLight( 0xffffff, 5.0, 28, 2 );
+		mainLight.position.set( 0.418, 16.199, 0.300 );
+		this.add( mainLight );
+
+		const room = new THREE.Mesh( geometry, roomMaterial );
+		room.position.set( - 0.757, 13.219, 0.717 );
+		room.scale.set( 31.713, 28.305, 28.591 );
+		this.add( room );
+
+		const box1 = new THREE.Mesh( geometry, boxMaterial );
+		box1.position.set( - 10.906, 2.009, 1.846 );
+		box1.rotation.set( 0, - 0.195, 0 );
+		box1.scale.set( 2.328, 7.905, 4.651 );
+		this.add( box1 );
+
+		const box2 = new THREE.Mesh( geometry, boxMaterial );
+		box2.position.set( - 5.607, - 0.754, - 0.758 );
+		box2.rotation.set( 0, 0.994, 0 );
+		box2.scale.set( 1.970, 1.534, 3.955 );
+		this.add( box2 );
+
+		const box3 = new THREE.Mesh( geometry, boxMaterial );
+		box3.position.set( 6.167, 0.857, 7.803 );
+		box3.rotation.set( 0, 0.561, 0 );
+		box3.scale.set( 3.927, 6.285, 3.687 );
+		this.add( box3 );
+
+		const box4 = new THREE.Mesh( geometry, boxMaterial );
+		box4.position.set( - 2.017, 0.018, 6.124 );
+		box4.rotation.set( 0, 0.333, 0 );
+		box4.scale.set( 2.002, 4.566, 2.064 );
+		this.add( box4 );
+
+		const box5 = new THREE.Mesh( geometry, boxMaterial );
+		box5.position.set( 2.291, - 0.756, - 2.621 );
+		box5.rotation.set( 0, - 0.286, 0 );
+		box5.scale.set( 1.546, 1.552, 1.496 );
+		this.add( box5 );
+
+		const box6 = new THREE.Mesh( geometry, boxMaterial );
+		box6.position.set( - 2.193, - 0.369, - 5.547 );
+		box6.rotation.set( 0, 0.516, 0 );
+		box6.scale.set( 3.875, 3.487, 2.986 );
+		this.add( box6 );
+
+
+		// -x right
+		const light1 = new THREE.Mesh( geometry, createAreaLightMaterial( 50 ) );
+		light1.position.set( - 16.116, 14.37, 8.208 );
+		light1.scale.set( 0.1, 2.428, 2.739 );
+		this.add( light1 );
+
+		// -x left
+		const light2 = new THREE.Mesh( geometry, createAreaLightMaterial( 50 ) );
+		light2.position.set( - 16.109, 18.021, - 8.207 );
+		light2.scale.set( 0.1, 2.425, 2.751 );
+		this.add( light2 );
+
+		// +x
+		const light3 = new THREE.Mesh( geometry, createAreaLightMaterial( 17 ) );
+		light3.position.set( 14.904, 12.198, - 1.832 );
+		light3.scale.set( 0.15, 4.265, 6.331 );
+		this.add( light3 );
+
+		// +z
+		const light4 = new THREE.Mesh( geometry, createAreaLightMaterial( 43 ) );
+		light4.position.set( - 0.462, 8.89, 14.520 );
+		light4.scale.set( 4.38, 5.441, 0.088 );
+		this.add( light4 );
+
+		// -z
+		const light5 = new THREE.Mesh( geometry, createAreaLightMaterial( 20 ) );
+		light5.position.set( 3.235, 11.486, - 12.541 );
+		light5.scale.set( 2.5, 2.0, 0.1 );
+		this.add( light5 );
+
+		// +y
+		const light6 = new THREE.Mesh( geometry, createAreaLightMaterial( 100 ) );
+		light6.position.set( 0.0, 20.0, 0.0 );
+		light6.scale.set( 1.0, 0.1, 1.0 );
+		this.add( light6 );
 
 	}
 
-	return scene;
+}
+
+function createAreaLightMaterial( intensity ) {
+
+	const material = new THREE.MeshBasicMaterial();
+	material.color.setScalar( intensity );
+	return material;
 
 }