瀏覽代碼

Examples: Clean up.

Mr.doob 3 年之前
父節點
當前提交
ab21bee590

+ 2 - 2
docs/manual/ar/introduction/WebGL-compatibility-check.html

@@ -18,14 +18,14 @@
 		</p>
 
 		<code>
-		if ( WEBGL.isWebGLAvailable() ) {
+		if ( WebGL.isWebGLAvailable() ) {
 
 			// Initiate function or other initializations here
 			animate();
 
 		} else {
 
-			const warning = WEBGL.getWebGLErrorMessage();
+			const warning = WebGL.getWebGLErrorMessage();
 			document.getElementById( 'container' ).appendChild( warning );
 
 		}

+ 2 - 2
docs/manual/en/introduction/WebGL-compatibility-check.html

@@ -19,14 +19,14 @@
 		</p>
 
 		<code>
-		if ( WEBGL.isWebGLAvailable() ) {
+		if ( WebGL.isWebGLAvailable() ) {
 
 			// Initiate function or other initializations here
 			animate();
 
 		} else {
 
-			const warning = WEBGL.getWebGLErrorMessage();
+			const warning = WebGL.getWebGLErrorMessage();
 			document.getElementById( 'container' ).appendChild( warning );
 
 		}

+ 2 - 2
docs/manual/ja/introduction/WebGL-compatibility-check.html

@@ -17,14 +17,14 @@
 		</p>
 
 		<code>
-		if ( WEBGL.isWebGLAvailable() ) {
+		if ( WebGL.isWebGLAvailable() ) {
 
 			// Initiate function or other initializations here
 			animate();
 
 		} else {
 
-			const warning = WEBGL.getWebGLErrorMessage();
+			const warning = WebGL.getWebGLErrorMessage();
 			document.getElementById( 'container' ).appendChild( warning );
 
 		}

+ 2 - 2
docs/manual/ko/introduction/WebGL-compatibility-check.html

@@ -18,14 +18,14 @@
 		</p>
 
 		<code>
-		if ( WEBGL.isWebGLAvailable() ) {
+		if ( WebGL.isWebGLAvailable() ) {
 
 			// Initiate function or other initializations here
 			animate();
 
 		} else {
 
-			const warning = WEBGL.getWebGLErrorMessage();
+			const warning = WebGL.getWebGLErrorMessage();
 			document.getElementById( 'container' ).appendChild( warning );
 
 		}

+ 2 - 2
docs/manual/zh/introduction/WebGL-compatibility-check.html

@@ -17,11 +17,11 @@
         	</p>
 
 <code>
-if (WEBGL.isWebGLAvailable()) {
+if (WebGL.isWebGLAvailable()) {
     // Initiate function or other initializations here
     animate();
 } else {
-    const warning = WEBGL.getWebGLErrorMessage();
+    const warning = WebGL.getWebGLErrorMessage();
     document.getElementById('container').appendChild(warning);
 }
 </code>

+ 0 - 26
examples/js/capabilities/ImportMaps.js

@@ -1,26 +0,0 @@
-( function () {
-class ImportMaps {
-  static isAvailable() {
-    return 'supports' in HTMLScriptElement && HTMLScriptElement.supports('importmap');
-  }
-
-  static getErrorMessage() {
-    const message = 'Your browser does not support <a href="https://wicg.github.io/import-maps/" style="color:blue">Import Maps</a>';
-    const element = document.createElement('div');
-    element.style.fontFamily = 'monospace';
-    element.style.fontSize = '13px';
-    element.style.fontWeight = 'normal';
-    element.style.textAlign = 'center';
-    element.style.background = '#fff';
-    element.style.color = '#000';
-    element.style.padding = '1.5em';
-    element.style.width = '400px';
-    element.style.margin = '5em auto 0';
-    element.innerHTML = message;
-    return element;
-  }
-
-}
-
-THREE.ImportMaps as default = ImportMaps as default;
-} )();

+ 0 - 90
examples/js/capabilities/WebGL.js

@@ -1,90 +0,0 @@
-( function () {
-
-	class WEBGL {
-
-		static isWebGLAvailable() {
-
-			try {
-
-				const canvas = document.createElement( 'canvas' );
-				return !! ( window.WebGLRenderingContext && ( canvas.getContext( 'webgl' ) || canvas.getContext( 'experimental-webgl' ) ) );
-
-			} catch ( e ) {
-
-				return false;
-
-			}
-
-		}
-
-		static isWebGL2Available() {
-
-			try {
-
-				const canvas = document.createElement( 'canvas' );
-				return !! ( window.WebGL2RenderingContext && canvas.getContext( 'webgl2' ) );
-
-			} catch ( e ) {
-
-				return false;
-
-			}
-
-		}
-
-		static getWebGLErrorMessage() {
-
-			return this.getErrorMessage( 1 );
-
-		}
-
-		static getWebGL2ErrorMessage() {
-
-			return this.getErrorMessage( 2 );
-
-		}
-
-		static getErrorMessage( version ) {
-
-			const names = {
-				1: 'WebGL',
-				2: 'WebGL 2'
-			};
-			const contexts = {
-				1: window.WebGLRenderingContext,
-				2: window.WebGL2RenderingContext
-			};
-			let message = 'Your $0 does not seem to support <a href="http://khronos.org/webgl/wiki/Getting_a_WebGL_Implementation" style="color:#000">$1</a>';
-			const element = document.createElement( 'div' );
-			element.id = 'webglmessage';
-			element.style.fontFamily = 'monospace';
-			element.style.fontSize = '13px';
-			element.style.fontWeight = 'normal';
-			element.style.textAlign = 'center';
-			element.style.background = '#fff';
-			element.style.color = '#000';
-			element.style.padding = '1.5em';
-			element.style.width = '400px';
-			element.style.margin = '5em auto 0';
-
-			if ( contexts[ version ] ) {
-
-				message = message.replace( '$0', 'graphics card' );
-
-			} else {
-
-				message = message.replace( '$0', 'browser' );
-
-			}
-
-			message = message.replace( '$1', names[ version ] );
-			element.innerHTML = message;
-			return element;
-
-		}
-
-	}
-
-	THREE.WEBGL = WEBGL;
-
-} )();

+ 0 - 27
examples/js/capabilities/WebGPU.js

@@ -1,27 +0,0 @@
-( function () {
-class WebGPU {
-  static isAvailable() {
-    return navigator.gpu !== undefined;
-  }
-
-  static getErrorMessage() {
-    const message = 'Your browser does not support <a href="https://gpuweb.github.io/gpuweb/" style="color:blue">WebGPU</a>';
-    const element = document.createElement('div');
-    element.id = 'webgpumessage';
-    element.style.fontFamily = 'monospace';
-    element.style.fontSize = '13px';
-    element.style.fontWeight = 'normal';
-    element.style.textAlign = 'center';
-    element.style.background = '#fff';
-    element.style.color = '#000';
-    element.style.padding = '1.5em';
-    element.style.width = '400px';
-    element.style.margin = '5em auto 0';
-    element.innerHTML = message;
-    return element;
-  }
-
-}
-
-THREE.WebGPU as default = WebGPU as default;
-} )();

+ 2 - 2
examples/jsm/capabilities/WebGL.js

@@ -1,4 +1,4 @@
-class WEBGL {
+class WebGL {
 
 	static isWebGLAvailable() {
 
@@ -88,4 +88,4 @@ class WEBGL {
 
 }
 
-export { WEBGL };
+export default WebGL;

+ 3 - 3
examples/webgl2_buffergeometry_attributes_integer.html

@@ -48,11 +48,11 @@
 
 			import * as THREE from '../build/three.module.js';
 
-			import { WEBGL } from './jsm/capabilities/WebGL.js';
+			import WebGL from './jsm/capabilities/WebGL.js';
 
-			if ( WEBGL.isWebGL2Available() === false ) {
+			if ( WebGL.isWebGL2Available() === false ) {
 
-				document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+				document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 
 			}
 

+ 3 - 3
examples/webgl2_materials_texture2darray.html

@@ -58,11 +58,11 @@
 			import Stats from './jsm/libs/stats.module.js';
 			import { unzipSync } from './jsm/libs/fflate.module.js';
 
-			import { WEBGL } from './jsm/capabilities/WebGL.js';
+			import WebGL from './jsm/capabilities/WebGL.js';
 
-			if ( WEBGL.isWebGL2Available() === false ) {
+			if ( WebGL.isWebGL2Available() === false ) {
 
-				document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+				document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 
 			}
 

+ 3 - 3
examples/webgl2_materials_texture3d.html

@@ -20,11 +20,11 @@
 		import { OrbitControls } from './jsm/controls/OrbitControls.js';
 		import { NRRDLoader } from './jsm/loaders/NRRDLoader.js';
 		import { VolumeRenderShader1 } from './jsm/shaders/VolumeShader.js';
-		import { WEBGL } from './jsm/capabilities/WebGL.js';
+		import WebGL from './jsm/capabilities/WebGL.js';
 
-		if ( WEBGL.isWebGL2Available() === false ) {
+		if ( WebGL.isWebGL2Available() === false ) {
 
-			document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+			document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 
 		}
 

+ 3 - 3
examples/webgl2_materials_texture3d_partialupdate.html

@@ -18,11 +18,11 @@
 			import { ImprovedNoise } from './jsm/math/ImprovedNoise.js';
 
 			import { GUI } from './jsm/libs/lil-gui.module.min.js';
-			import { WEBGL } from './jsm/capabilities/WebGL.js';
+			import WebGL from './jsm/capabilities/WebGL.js';
 
-			if ( WEBGL.isWebGL2Available() === false ) {
+			if ( WebGL.isWebGL2Available() === false ) {
 
-				document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+				document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 
 			}
 

+ 3 - 3
examples/webgl2_multiple_rendertargets.html

@@ -109,7 +109,7 @@
 
 			import * as THREE from '../build/three.module.js';
 
-			import { WEBGL } from './jsm/capabilities/WebGL.js';
+			import WebGL from './jsm/capabilities/WebGL.js';
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
 
 			let camera, scene, renderer, controls;
@@ -120,9 +120,9 @@
 
 			function init() {
 
-				if ( WEBGL.isWebGL2Available() === false ) {
+				if ( WebGL.isWebGL2Available() === false ) {
 
-					document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+					document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 					return;
 
 				}

+ 3 - 3
examples/webgl2_multisampled_renderbuffers.html

@@ -41,7 +41,7 @@
 			import { RenderPass } from './jsm/postprocessing/RenderPass.js';
 			import { ShaderPass } from './jsm/postprocessing/ShaderPass.js';
 			import { CopyShader } from './jsm/shaders/CopyShader.js';
-			import { WEBGL } from './jsm/capabilities/WebGL.js';
+			import WebGL from './jsm/capabilities/WebGL.js';
 
 			let camera, renderer, clock, group, container;
 
@@ -51,9 +51,9 @@
 
 			function init() {
 
-				if ( WEBGL.isWebGL2Available() === false ) {
+				if ( WebGL.isWebGL2Available() === false ) {
 
-					document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+					document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 					return;
 
 				}

+ 3 - 3
examples/webgl2_rendertarget_texture2darray.html

@@ -103,11 +103,11 @@
 			import { unzipSync } from './jsm/libs/fflate.module.js';
 			import { GUI } from './jsm/libs/lil-gui.module.min.js';
 
-			import { WEBGL } from './jsm/capabilities/WebGL.js';
+			import WebGL from './jsm/capabilities/WebGL.js';
 
-			if ( WEBGL.isWebGL2Available() === false ) {
+			if ( WebGL.isWebGL2Available() === false ) {
 
-				document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+				document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 
 			}
 

+ 3 - 3
examples/webgl2_volume_cloud.html

@@ -18,11 +18,11 @@
 			import { ImprovedNoise } from './jsm/math/ImprovedNoise.js';
 
 			import { GUI } from './jsm/libs/lil-gui.module.min.js';
-			import { WEBGL } from './jsm/capabilities/WebGL.js';
+			import WebGL from './jsm/capabilities/WebGL.js';
 
-			if ( WEBGL.isWebGL2Available() === false ) {
+			if ( WebGL.isWebGL2Available() === false ) {
 
-				document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+				document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 
 			}
 

+ 3 - 3
examples/webgl2_volume_instancing.html

@@ -17,11 +17,11 @@
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
 			import { VOXLoader, VOXDataTexture3D } from './jsm/loaders/VOXLoader.js';
 
-			import { WEBGL } from './jsm/capabilities/WebGL.js';
+			import WebGL from './jsm/capabilities/WebGL.js';
 
-			if ( WEBGL.isWebGL2Available() === false ) {
+			if ( WebGL.isWebGL2Available() === false ) {
 
-				document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+				document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 
 			}
 

+ 3 - 3
examples/webgl2_volume_perlin.html

@@ -18,11 +18,11 @@
 			import { ImprovedNoise } from './jsm/math/ImprovedNoise.js';
 
 			import { GUI } from './jsm/libs/lil-gui.module.min.js';
-			import { WEBGL } from './jsm/capabilities/WebGL.js';
+			import WebGL from './jsm/capabilities/WebGL.js';
 
-			if ( WEBGL.isWebGL2Available() === false ) {
+			if ( WebGL.isWebGL2Available() === false ) {
 
-				document.body.appendChild( WEBGL.getWebGL2ErrorMessage() );
+				document.body.appendChild( WebGL.getWebGL2ErrorMessage() );
 
 			}
 

+ 1 - 0
utils/build/rollup.examples.config.js

@@ -170,6 +170,7 @@ const jsmFolder = path.resolve( __dirname, '../../examples/jsm' );
 // list of all .js file nested in the examples/jsm folder
 const files = glob.sync( '**/*.js', { cwd: jsmFolder, ignore: [
 	// don't convert libs
+	'capabilities/*',
 	'libs/**/*',
 	'loaders/ifc/**/*',