Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge remote-tracking branch 'upstream/dev' into dev

David Pritchard 5 years ago
parent
86e984f7dc b0d421ab43
commit
ab043ee07a
39 changed files with 366 additions and 474 deletions
Unified View Show Diff Stats
  1. 1 1
      build/three.js
  2. 158 399
      build/three.min.js
  3. 1 1
      build/three.module.js
  4. 7 0
      docs/api/en/materials/Material.html
  5. 7 0
      docs/api/en/renderers/WebGLRenderer.html
  6. 4 0
      docs/api/zh/materials/Material.html
  7. 2 4
      editor/index.html
  8. 7 3
      examples/js/Ocean.js
  9. 2 0
      examples/js/effects/AnaglyphEffect.js
  10. 5 9
      examples/js/loaders/GLTFLoader.js
  11. 2 4
      examples/webvr_ballshooter.html
  12. 2 4
      examples/webvr_cubes.html
  13. 2 4
      examples/webvr_dragging.html
  14. 2 4
      examples/webvr_lorenzattractor.html
  15. 2 4
      examples/webvr_paint.html
  16. 2 4
      examples/webvr_panorama.html
  17. 2 4
      examples/webvr_rollercoaster.html
  18. 2 4
      examples/webvr_sandbox.html
  19. 2 4
      examples/webvr_sculpt.html
  20. 2 4
      examples/webvr_video.html
  21. 2 4
      examples/webvr_vive_paint.html
  22. 2 4
      examples/webvr_vive_sculpt.html
  23. 12 0
      src/core/BufferGeometry.js
  24. 1 1
      src/core/Object3D.d.ts
  25. 6 0
      src/materials/Material.d.ts
  26. 1 0
      src/materials/Material.js
  27. 14 2
      src/renderers/WebGLRenderer.d.ts
  28. 10 4
      src/renderers/WebGLRenderer.js
  29. 6 0
      src/renderers/shaders/ShaderChunk/beginnormal_vertex.glsl.js
  30. 12 0
      src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl.js
  31. 14 0
      src/renderers/shaders/ShaderChunk/normal_fragment_begin.glsl.js
  32. 12 1
      src/renderers/shaders/ShaderChunk/normal_fragment_maps.glsl.js
  33. 6 0
      src/renderers/shaders/ShaderChunk/skinnormal_vertex.glsl.js
  34. 7 0
      src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js
  35. 14 0
      src/renderers/shaders/ShaderLib/meshphysical_vert.glsl.js
  36. 7 0
      src/renderers/shaders/ShaderLib/normal_frag.glsl.js
  37. 14 0
      src/renderers/shaders/ShaderLib/normal_vert.glsl.js
  38. 10 0
      src/renderers/webgl/WebGLProgram.js
  39. 2 1
      src/renderers/webgl/WebGLPrograms.js

File diff suppressed because it is too large
+ 1 - 1
build/three.js


File diff suppressed because it is too large
+ 158 - 399
build/three.min.js


File diff suppressed because it is too large
+ 1 - 1
build/three.module.js


+ 7 - 0
docs/api/en/materials/Material.html
View File 

@@ -261,6 +261,13 @@
 
 		Other options are [page:Materials THREE.VertexColors] and [page:Materials THREE.FaceColors].
 
 		Other options are [page:Materials THREE.VertexColors] and [page:Materials THREE.FaceColors].
 
 		</p>
 
 		</p>
 
 
 
+		<h3>[property:Boolean vertexTangents]</h3>
 
+		<p>
 
+		Defines whether precomputed vertex tangents, which must be provided in a vec4 "tangent" attribute,
 
+		are used. When disabled, tangents are derived automatically. Using precomputed tangents will give
 
+		more accurate normal map details in some cases, such as with mirrored UVs. Default is false.
 
+		</p>
 
+
 
 		<h3>[property:Boolean visible]</h3>
 
 		<h3>[property:Boolean visible]</h3>
 
 		<p>
 
 		<p>
 
 		Defines whether this material is visible. Default is *true*.
 
 		Defines whether this material is visible. Default is *true*.

+ 7 - 0
docs/api/en/renderers/WebGLRenderer.html
View File 

@@ -372,6 +372,13 @@
 
 		Returns the width and height of the renderer's output canvas, in pixels.
 
 		Returns the width and height of the renderer's output canvas, in pixels.
 
 		</p>
 
 		</p>
 
 
 
+		<h3>[method:Vector4 getViewport]( [param:Vector4 target] )</h3>
 
+		<p>
 
+		[page:Vector4 target] — the result will be copied into this Vector4.<br /><br />
 
+
 
+		Returns the viewport.
 
+		</p>
 
+
 
 		<h3>[method:null resetGLState]( )</h3>
 
 		<h3>[method:null resetGLState]( )</h3>
 
 		<p>Reset the GL state to default. Called internally if the WebGL context is lost.</p>
 
 		<p>Reset the GL state to default. Called internally if the WebGL context is lost.</p>

+ 4 - 0
docs/api/zh/materials/Material.html
View File 

@@ -217,6 +217,10 @@
 
     其他选项有[page:Materials THREE.VertexColors] 和 [page:Materials THREE.FaceColors]。
 
     其他选项有[page:Materials THREE.VertexColors] 和 [page:Materials THREE.FaceColors]。
 
 </p>
 
 </p>
 
 
 
+<h3>[property:Boolean vertexTangents]</h3>
 
+<p> TODO.
 
+</p>
 
+
 
 <h3>[property:Boolean visible]</h3>
 
 <h3>[property:Boolean visible]</h3>
 
 <p> 此材质是否可见。默认为*true*。
 
 <p> 此材质是否可见。默认为*true*。
 
 </p>
 
 </p>

+ 2 - 4
editor/index.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js / editor</title>
 
 		<title>three.js / editor</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
 		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 	</head>
 
 	</head>
 
 	<body ontouchstart="">
 
 	<body ontouchstart="">
 
 		<link href="css/main.css" rel="stylesheet" />
 
 		<link href="css/main.css" rel="stylesheet" />

+ 7 - 3
examples/js/Ocean.js
View File 

@@ -212,6 +212,8 @@ THREE.Ocean.prototype.generateMesh = function () {
 
 
 
 THREE.Ocean.prototype.render = function () {
 
 THREE.Ocean.prototype.render = function () {
 
 
 
+	var currentRenderTarget = this.renderer.getRenderTarget();
 
+
 
 	this.scene.overrideMaterial = null;
 
 	this.scene.overrideMaterial = null;
 
 
 
 	if ( this.changed )
 
 	if ( this.changed )
 
@@ -223,9 +225,11 @@ THREE.Ocean.prototype.render = function () {
 
 	this.renderNormalMap();
 
 	this.renderNormalMap();
 
 	this.scene.overrideMaterial = null;
 
 	this.scene.overrideMaterial = null;
 
 
 
+	this.renderer.setRenderTarget( currentRenderTarget );
 
+
 
 };
 
 };
 
 
 
-THREE.Ocean.prototype.generateSeedPhaseTexture = function() {
 
+THREE.Ocean.prototype.generateSeedPhaseTexture = function () {
 
 
 
 	// Setup the seed texture
 
 	// Setup the seed texture
 
 	this.pingPhase = true;
 
 	this.pingPhase = true;
 
@@ -234,7 +238,7 @@ THREE.Ocean.prototype.generateSeedPhaseTexture = function() {
 
 
 
 		for ( var j = 0; j < this.resolution; j ++ ) {
 
 		for ( var j = 0; j < this.resolution; j ++ ) {
 
 
 
-			phaseArray[ i * this.resolution * 4 + j * 4 ] =  Math.random() * 2.0 * Math.PI;
 
+			phaseArray[ i * this.resolution * 4 + j * 4 ] = Math.random() * 2.0 * Math.PI;
 
 			phaseArray[ i * this.resolution * 4 + j * 4 + 1 ] = 0.0;
 
 			phaseArray[ i * this.resolution * 4 + j * 4 + 1 ] = 0.0;
 
 			phaseArray[ i * this.resolution * 4 + j * 4 + 2 ] = 0.0;
 
 			phaseArray[ i * this.resolution * 4 + j * 4 + 2 ] = 0.0;
 
 			phaseArray[ i * this.resolution * 4 + j * 4 + 3 ] = 0.0;
 
 			phaseArray[ i * this.resolution * 4 + j * 4 + 3 ] = 0.0;
 
@@ -298,7 +302,7 @@ THREE.Ocean.prototype.renderSpectrum = function () {
 
 
 
 };
 
 };
 
 
 
-THREE.Ocean.prototype.renderSpectrumFFT = function() {
 
+THREE.Ocean.prototype.renderSpectrumFFT = function () {
 
 
 
 	// GPU FFT using Stockham formulation
 
 	// GPU FFT using Stockham formulation
 
 	var iterations = Math.log( this.resolution ) / Math.log( 2 ); // log2
 
 	var iterations = Math.log( this.resolution ) / Math.log( 2 ); // log2

+ 2 - 0
examples/js/effects/AnaglyphEffect.js
View File 

@@ -145,6 +145,8 @@ THREE.AnaglyphEffect = function ( renderer, width, height ) {
 
 		renderer.setRenderTarget( _renderTargetR );
 
 		renderer.setRenderTarget( _renderTargetR );
 
 		renderer.clear();
 
 		renderer.clear();
 
 		renderer.render( scene, _stereo.cameraR );
 
 		renderer.render( scene, _stereo.cameraR );
 
+
 
+		renderer.setRenderTarget( null );
 
 		renderer.render( _scene, _camera );
 
 		renderer.render( _scene, _camera );
 
 
 
 		renderer.setRenderTarget( currentRenderTarget );
 
 		renderer.setRenderTarget( currentRenderTarget );

+ 5 - 9
examples/js/loaders/GLTFLoader.js
View File 

@@ -1202,6 +1202,7 @@ THREE.GLTFLoader = ( function () {
 
 	var ATTRIBUTES = {
 
 	var ATTRIBUTES = {
 
 		POSITION: 'position',
 
 		POSITION: 'position',
 
 		NORMAL: 'normal',
 
 		NORMAL: 'normal',
 
+		TANGENT: 'tangent',
 
 		TEXCOORD_0: 'uv',
 
 		TEXCOORD_0: 'uv',
 
 		TEXCOORD_1: 'uv2',
 
 		TEXCOORD_1: 'uv2',
 
 		COLOR_0: 'color',
 
 		COLOR_0: 'color',
 
@@ -2409,14 +2410,6 @@ THREE.GLTFLoader = ( function () {
 
 
 
 			if ( materialDef.name !== undefined ) material.name = materialDef.name;
 
 			if ( materialDef.name !== undefined ) material.name = materialDef.name;
 
 
 
-			// Normal map textures use OpenGL conventions:
 
-			// https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#materialnormaltexture
 
-			if ( material.normalScale ) {
 
-
 
-				material.normalScale.y = - material.normalScale.y;
 
-
 
-			}
 
-
 
 			// baseColorTexture, emissiveTexture, and specularGlossinessTexture use sRGB encoding.
 
 			// baseColorTexture, emissiveTexture, and specularGlossinessTexture use sRGB encoding.
 
 			if ( material.map ) material.map.encoding = THREE.sRGBEncoding;
 
 			if ( material.map ) material.map.encoding = THREE.sRGBEncoding;
 
 			if ( material.emissiveMap ) material.emissiveMap.encoding = THREE.sRGBEncoding;
 
 			if ( material.emissiveMap ) material.emissiveMap.encoding = THREE.sRGBEncoding;
 
@@ -2774,6 +2767,7 @@ THREE.GLTFLoader = ( function () {
 
 
 
 					var materials = isMultiMaterial ? mesh.material : [ mesh.material ];
 
 					var materials = isMultiMaterial ? mesh.material : [ mesh.material ];
 
 
 
+					var useVertexTangents = geometry.attributes.tangent !== undefined;
 
 					var useVertexColors = geometry.attributes.color !== undefined;
 
 					var useVertexColors = geometry.attributes.color !== undefined;
 
 					var useFlatShading = geometry.attributes.normal === undefined;
 
 					var useFlatShading = geometry.attributes.normal === undefined;
 
 					var useSkinning = mesh.isSkinnedMesh === true;
 
 					var useSkinning = mesh.isSkinnedMesh === true;
 
@@ -2826,12 +2820,13 @@ THREE.GLTFLoader = ( function () {
 
 						}
 
 						}
 
 
 
 						// Clone the material if it will be modified
 
 						// Clone the material if it will be modified
 
-						if ( useVertexColors || useFlatShading || useSkinning || useMorphTargets ) {
 
+						if ( useVertexTangents || useVertexColors || useFlatShading || useSkinning || useMorphTargets ) {
 
 
 
 							var cacheKey = 'ClonedMaterial:' + material.uuid + ':';
 
 							var cacheKey = 'ClonedMaterial:' + material.uuid + ':';
 
 
 
 							if ( material.isGLTFSpecularGlossinessMaterial ) cacheKey += 'specular-glossiness:';
 
 							if ( material.isGLTFSpecularGlossinessMaterial ) cacheKey += 'specular-glossiness:';
 
 							if ( useSkinning ) cacheKey += 'skinning:';
 
 							if ( useSkinning ) cacheKey += 'skinning:';
 
+							if ( useVertexTangents ) cacheKey += 'vertex-tangents:';
 
 							if ( useVertexColors ) cacheKey += 'vertex-colors:';
 
 							if ( useVertexColors ) cacheKey += 'vertex-colors:';
 
 							if ( useFlatShading ) cacheKey += 'flat-shading:';
 
 							if ( useFlatShading ) cacheKey += 'flat-shading:';
 
 							if ( useMorphTargets ) cacheKey += 'morph-targets:';
 
 							if ( useMorphTargets ) cacheKey += 'morph-targets:';
 
@@ -2846,6 +2841,7 @@ THREE.GLTFLoader = ( function () {
 
 									: material.clone();
 
 									: material.clone();
 
 
 
 								if ( useSkinning ) cachedMaterial.skinning = true;
 
 								if ( useSkinning ) cachedMaterial.skinning = true;
 
+								if ( useVertexTangents ) cachedMaterial.vertexTangents = true;
 
 								if ( useVertexColors ) cachedMaterial.vertexColors = THREE.VertexColors;
 
 								if ( useVertexColors ) cachedMaterial.vertexColors = THREE.VertexColors;
 
 								if ( useFlatShading ) cachedMaterial.flatShading = true;
 
 								if ( useFlatShading ) cachedMaterial.flatShading = true;
 
 								if ( useMorphTargets ) cachedMaterial.morphTargets = true;
 
 								if ( useMorphTargets ) cachedMaterial.morphTargets = true;

+ 2 - 4
examples/webvr_ballshooter.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - ball shooter</title>
 
 		<title>three.js webvr - ball shooter</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				font-family: Monospace;
 
 				font-family: Monospace;

+ 2 - 4
examples/webvr_cubes.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - cubes</title>
 
 		<title>three.js webvr - cubes</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				font-family: Monospace;
 
 				font-family: Monospace;

+ 2 - 4
examples/webvr_dragging.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - dragging</title>
 
 		<title>three.js webvr - dragging</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				font-family: Monospace;
 
 				font-family: Monospace;

+ 2 - 4
examples/webvr_lorenzattractor.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - lorenz attractor</title>
 
 		<title>three.js webvr - lorenz attractor</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				margin: 0px;
 
 				margin: 0px;

+ 2 - 4
examples/webvr_paint.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - paint</title>
 
 		<title>three.js webvr - paint</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				font-family: Monospace;
 
 				font-family: Monospace;

+ 2 - 4
examples/webvr_panorama.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - panorama</title>
 
 		<title>three.js webvr - panorama</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			html, body {
 
 			html, body {
 
 				background-color: #000;
 
 				background-color: #000;

+ 2 - 4
examples/webvr_rollercoaster.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - roller coaster</title>
 
 		<title>three.js webvr - roller coaster</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				margin: 0px;
 
 				margin: 0px;

+ 2 - 4
examples/webvr_sandbox.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - sandbox</title>
 
 		<title>three.js webvr - sandbox</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				margin: 0px;
 
 				margin: 0px;

+ 2 - 4
examples/webvr_sculpt.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - sculpt</title>
 
 		<title>three.js webvr - sculpt</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				font-family: Monospace;
 
 				font-family: Monospace;

+ 2 - 4
examples/webvr_video.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - 360 stereo video</title>
 
 		<title>three.js webvr - 360 stereo video</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				font-family: Monospace;
 
 				font-family: Monospace;

+ 2 - 4
examples/webvr_vive_paint.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - htc vive - paint</title>
 
 		<title>three.js webvr - htc vive - paint</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				font-family: Monospace;
 
 				font-family: Monospace;

+ 2 - 4
examples/webvr_vive_sculpt.html
View File 

@@ -4,10 +4,8 @@
 
 		<title>three.js webvr - htc vive - sculpt</title>
 
 		<title>three.js webvr - htc vive - sculpt</title>
 
 		<meta charset="utf-8">
 
 		<meta charset="utf-8">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 
-		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-01-23" content="ApibcCZfaeEIkwpe6CSIKZXC8ODly5nYX+QlUSgwhUUlMN1/Ko7dr5XUwZDFl9SiEGtOFFe2csLwnNg33ZBh+QMAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU0ODIwMTU5OX0=">
 
-		<!-- Origin Trial Token, feature = WebXR Gamepad Support, origin = https://threejs.org, expires = 2019-01-23 -->
 
-		<meta http-equiv="origin-trial" data-feature="WebXR Gamepad Support" data-expires="2019-01-23" content="Agt5pp1xG96NMH+7RdcD7jvbkJiJTagqfKtC+28x/TBeQSh4tF7ad7uXL9Clqbts0vivamPTTkRkNdyfJtEezQ4AAABYeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkdhbWVwYWRTdXBwb3J0IiwiZXhwaXJ5IjoxNTQ4MjAxNTk5fQ==">
 
+		<!-- Origin Trial Token, feature = WebXR Device API (For Chrome M69+), origin = https://threejs.org, expires = 2019-03-06 -->
 
+		<meta http-equiv="origin-trial" data-feature="WebXR Device API (For Chrome M69+)" data-expires="2019-03-06" content="AvDjbxYpoTgOL1PS0JEra7KFCehfTlKnXpU/ORSwNdCQ35cX70cTUkXOnQ26A5XJi3eXHSKpBPchdt5lbcxDuAIAAABTeyJvcmlnaW4iOiJodHRwczovL3RocmVlanMub3JnOjQ0MyIsImZlYXR1cmUiOiJXZWJYUkRldmljZU02OSIsImV4cGlyeSI6MTU1MTgzMDM5OX0=">
 
 		<style>
 
 		<style>
 
 			body {
 
 			body {
 
 				font-family: Monospace;
 
 				font-family: Monospace;

+ 12 - 0
src/core/BufferGeometry.js
View File 

@@ -154,6 +154,18 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
 
 
 
 		}
 
 		}
 
 
 
+		var tangent = this.attributes.tangent;
 
+
 
+		if ( tangent !== undefined ) {
 
+
 
+			var normalMatrix = new Matrix3().getNormalMatrix( matrix );
 
+
 
+			// Tangent is vec4, but the '.w' component is a sign value (+1/-1).
 
+			normalMatrix.applyToBufferAttribute( tangent );
 
+			tangent.needsUpdate = true;
 
+
 
+		}
 
+
 
 		if ( this.boundingBox !== null ) {
 
 		if ( this.boundingBox !== null ) {
 
 
 
 			this.computeBoundingBox();
 
 			this.computeBoundingBox();

+ 1 - 1
src/core/Object3D.d.ts
View File 

@@ -306,7 +306,7 @@ export class Object3D extends EventDispatcher {
 
   /**
 
   /**
 
    * Updates global transform of the object and its children.
 
    * Updates global transform of the object and its children.
 
    */
 
    */
 
-  updateMatrixWorld(force: boolean): void;
 
+  updateMatrixWorld(force?: boolean): void;
 
 
 
   updateWorldMatrix(updateParents: boolean, updateChildren: boolean): void;
 
   updateWorldMatrix(updateParents: boolean, updateChildren: boolean): void;

+ 6 - 0
src/materials/Material.d.ts
View File 

@@ -44,6 +44,7 @@ export interface MaterialParameters {
 
   side?: Side;
 
   side?: Side;
 
   transparent?: boolean;
 
   transparent?: boolean;
 
   vertexColors?: Colors;
 
   vertexColors?: Colors;
 
+  vertexTangents?: boolean;
 
   visible?: boolean;
 
   visible?: boolean;
 
 }
 
 }
 
 
 
@@ -234,6 +235,11 @@ export class Material extends EventDispatcher {
 
    */
 
    */
 
   vertexColors: Colors;
 
   vertexColors: Colors;
 
 
 
+  /**
 
+   * Defines whether precomputed vertex tangents are used. Default is false.
 
+   */
 
+  vertexTangents: boolean;
 
+
 
   /**
 
   /**
 
    * Defines whether this material is visible. Default is true.
 
    * Defines whether this material is visible. Default is true.
 
    */
 
    */

+ 1 - 0
src/materials/Material.js
View File 

@@ -24,6 +24,7 @@ function Material() {
 
 	this.blending = NormalBlending;
 
 	this.blending = NormalBlending;
 
 	this.side = FrontSide;
 
 	this.side = FrontSide;
 
 	this.flatShading = false;
 
 	this.flatShading = false;
 
+	this.vertexTangents = false;
 
 	this.vertexColors = NoColors; // THREE.NoColors, THREE.VertexColors, THREE.FaceColors
 
 	this.vertexColors = NoColors; // THREE.NoColors, THREE.VertexColors, THREE.FaceColors
 
 
 
 	this.opacity = 1;
 
 	this.opacity = 1;

+ 14 - 2
src/renderers/WebGLRenderer.d.ts
View File 

@@ -215,6 +215,12 @@ export class WebGLRenderer implements Renderer {
 
   setSize(width: number, height: number, updateStyle?: boolean): void;
 
   setSize(width: number, height: number, updateStyle?: boolean): void;
 
 
 
   getCurrentViewport(target: Vector4): Vector4;
 
   getCurrentViewport(target: Vector4): Vector4;
 
+
 
+  /**
 
+   * Copies the viewport into target.
 
+   */
 
+  getViewport(target: Vector4): Vector4;
 
+
 
   /**
 
   /**
 
    * Sets the viewport to render from (x, y) to (x + width, y + height).
 
    * Sets the viewport to render from (x, y) to (x + width, y + height).
 
    */
 
    */
 
@@ -304,8 +310,14 @@ export class WebGLRenderer implements Renderer {
 
 
 
   /**
 
   /**
 
    * Render a scene using a camera.
 
    * Render a scene using a camera.
 
-   * The render is done to the renderTarget (if specified) or to the canvas as usual.
 
-   * If forceClear is true, the canvas will be cleared before rendering, even if the renderer's autoClear property is false.
 
+   * The render is done to a previously specified {@link WebGLRenderTarget#renderTarget .renderTarget} set by calling 
+   * {@link WebGLRenderer#setRenderTarget .setRenderTarget} or to the canvas as usual.
 
+   * 
+   * By default render buffers are cleared before rendering but you can prevent this by setting the property 
+   * {@link WebGLRenderer#autoClear autoClear} to false. If you want to prevent only certain buffers being cleared 
+   * you can set either the {@link WebGLRenderer#autoClearColor autoClearColor}, 
+   * {@link WebGLRenderer#autoClearStencil autoClearStencil} or {@link WebGLRenderer#autoClearDepth autoClearDepth} 
+   * properties to false. To forcibly clear one ore more buffers call {@link WebGLRenderer#clear .clear}.
 
    */
 
    */
 
   render(
 
   render(
 
     scene: Scene,
 
     scene: Scene,

+ 10 - 4
src/renderers/WebGLRenderer.js
View File 

@@ -444,6 +444,12 @@ function WebGLRenderer( parameters ) {
 
 
 
 	};
 
 	};
 
 
 
+	this.getViewport = function ( target ) {
 
+
 
+		return target.copy( _viewport );
 
+
 
+	};
 
+
 
 	this.setViewport = function ( x, y, width, height ) {
 
 	this.setViewport = function ( x, y, width, height ) {
 
 
 
 		_viewport.set( x, y, width, height );
 
 		_viewport.set( x, y, width, height );
 
@@ -1098,7 +1104,7 @@ function WebGLRenderer( parameters ) {
 
 		currentRenderState = renderStates.get( scene, camera );
 
 		currentRenderState = renderStates.get( scene, camera );
 
 		currentRenderState.init();
 
 		currentRenderState.init();
 
 
 
-		scene.onBeforeRender( _this, scene, camera, renderTarget );
 
+		scene.onBeforeRender( _this, scene, camera, renderTarget || _currentRenderTarget );
 
 
 
 		_projScreenMatrix.multiplyMatrices( camera.projectionMatrix, camera.matrixWorldInverse );
 
 		_projScreenMatrix.multiplyMatrices( camera.projectionMatrix, camera.matrixWorldInverse );
 
 		_frustum.setFromMatrix( _projScreenMatrix );
 
 		_frustum.setFromMatrix( _projScreenMatrix );
 
@@ -1169,15 +1175,15 @@ function WebGLRenderer( parameters ) {
 
 
 
 		//
 
 		//
 
 
 
-		if ( renderTarget !== undefined ) {
 
+		if ( _currentRenderTarget !== null ) {
 
 
 
 			// Generate mipmap if we're using any kind of mipmap filtering
 
 			// Generate mipmap if we're using any kind of mipmap filtering
 
 
 
-			textures.updateRenderTargetMipmap( renderTarget );
 
+			textures.updateRenderTargetMipmap( _currentRenderTarget );
 
 
 
 			// resolve multisample renderbuffers to a single-sample texture if necessary
 
 			// resolve multisample renderbuffers to a single-sample texture if necessary
 
 
 
-			textures.updateMultisampleRenderTarget( renderTarget );
 
+			textures.updateMultisampleRenderTarget( _currentRenderTarget );
 
 
 
 		}
 
 		}

+ 6 - 0
src/renderers/shaders/ShaderChunk/beginnormal_vertex.glsl.js
View File 

@@ -1,3 +1,9 @@
 
 export default /* glsl */`
 
 export default /* glsl */`
 
 vec3 objectNormal = vec3( normal );
 
 vec3 objectNormal = vec3( normal );
 
+
 
+#ifdef USE_TANGENT
 
+
 
+	vec3 objectTangent = vec3( tangent.xyz );
 
+
 
+#endif
 
 `;
 
 `;

+ 12 - 0
src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl.js
View File 

@@ -5,5 +5,17 @@ vec3 transformedNormal = normalMatrix * objectNormal;
 
 
 
 	transformedNormal = - transformedNormal;
 
 	transformedNormal = - transformedNormal;
 
 
 
+#endif
 
+
 
+#ifdef USE_TANGENT
 
+
 
+	vec3 transformedTangent = normalMatrix * objectTangent;
 
+
 
+	#ifdef FLIP_SIDED
 
+
 
+		transformedTangent = - transformedTangent;
 
+
 
+	#endif
 
+
 
 #endif
 
 #endif
 
 `;
 
 `;

+ 14 - 0
src/renderers/shaders/ShaderChunk/normal_fragment_begin.glsl.js
View File 

@@ -17,5 +17,19 @@ export default /* glsl */`
 
 
 
 	#endif
 
 	#endif
 
 
 
+	#ifdef USE_TANGENT
 
+
 
+		vec3 tangent = normalize( vTangent );
 
+		vec3 bitangent = normalize( vBitangent );
 
+
 
+		#ifdef DOUBLE_SIDED
 
+
 
+			tangent = tangent * ( float( gl_FrontFacing ) * 2.0 - 1.0 );
 
+			bitangent = bitangent * ( float( gl_FrontFacing ) * 2.0 - 1.0 );
 
+
 
+		#endif
 
+
 
+	#endif
 
+
 
 #endif
 
 #endif
 
 `;
 
 `;

+ 12 - 1
src/renderers/shaders/ShaderChunk/normal_fragment_maps.glsl.js
View File 

@@ -21,7 +21,18 @@ export default /* glsl */`
 
 
 
 	#else // tangent-space normal map
 
 	#else // tangent-space normal map
 
 
 
-		normal = perturbNormal2Arb( -vViewPosition, normal );
 
+		#ifdef USE_TANGENT
 
+
 
+			mat3 vTBN = mat3( tangent, bitangent, normal );
 
+			vec3 mapN = texture2D( normalMap, vUv ).xyz * 2.0 - 1.0;
 
+			mapN.xy = normalScale * mapN.xy;
 
+			normal = normalize( vTBN * mapN );
 
+
 
+		#else
 
+
 
+			normal = perturbNormal2Arb( -vViewPosition, normal );
 
+
 
+		#endif
 
 
 
 	#endif
 
 	#endif

+ 6 - 0
src/renderers/shaders/ShaderChunk/skinnormal_vertex.glsl.js
View File 

@@ -10,5 +10,11 @@ export default /* glsl */`
 
 
 
 	objectNormal = vec4( skinMatrix * vec4( objectNormal, 0.0 ) ).xyz;
 
 	objectNormal = vec4( skinMatrix * vec4( objectNormal, 0.0 ) ).xyz;
 
 
 
+	#ifdef USE_TANGENT
 
+
 
+		objectTangent = vec4( skinMatrix * vec4( objectTangent, 0.0 ) ).xyz;
 
+
 
+	#endif
 
+
 
 #endif
 
 #endif
 
 `;
 
 `;

+ 7 - 0
src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js
View File 

@@ -18,6 +18,13 @@ varying vec3 vViewPosition;
 
 
 
 	varying vec3 vNormal;
 
 	varying vec3 vNormal;
 
 
 
+	#ifdef USE_TANGENT
 
+
 
+		varying vec3 vTangent;
 
+		varying vec3 vBitangent;
 
+
 
+	#endif
 
+
 
 #endif
 
 #endif
 
 
 
 #include <common>
 
 #include <common>

+ 14 - 0
src/renderers/shaders/ShaderLib/meshphysical_vert.glsl.js
View File 

@@ -7,6 +7,13 @@ varying vec3 vViewPosition;
 
 
 
 	varying vec3 vNormal;
 
 	varying vec3 vNormal;
 
 
 
+	#ifdef USE_TANGENT
 
+
 
+		varying vec3 vTangent;
 
+		varying vec3 vBitangent;
 
+
 
+	#endif
 
+
 
 #endif
 
 #endif
 
 
 
 #include <common>
 
 #include <common>
 
@@ -37,6 +44,13 @@ void main() {
 
 
 
 	vNormal = normalize( transformedNormal );
 
 	vNormal = normalize( transformedNormal );
 
 
 
+	#ifdef USE_TANGENT
 
+
 
+		vTangent = normalize( transformedTangent );
 
+		vBitangent = normalize( cross( vNormal, vTangent ) * tangent.w );
 
+
 
+	#endif
 
+
 
 #endif
 
 #endif
 
 
 
 	#include <begin_vertex>
 
 	#include <begin_vertex>

+ 7 - 0
src/renderers/shaders/ShaderLib/normal_frag.glsl.js
View File 

@@ -13,6 +13,13 @@ uniform float opacity;
 
 
 
 	varying vec3 vNormal;
 
 	varying vec3 vNormal;
 
 
 
+	#ifdef USE_TANGENT
 
+
 
+		varying vec3 vTangent;
 
+		varying vec3 vBitangent;
 
+
 
+	#endif
 
+
 
 #endif
 
 #endif
 
 
 
 #include <packing>
 
 #include <packing>

+ 14 - 0
src/renderers/shaders/ShaderLib/normal_vert.glsl.js
View File 

@@ -11,6 +11,13 @@ export default /* glsl */`
 
 
 
 	varying vec3 vNormal;
 
 	varying vec3 vNormal;
 
 
 
+	#ifdef USE_TANGENT
 
+
 
+		varying vec3 vTangent;
 
+		varying vec3 vBitangent;
 
+
 
+	#endif
 
+
 
 #endif
 
 #endif
 
 
 
 #include <uv_pars_vertex>
 
 #include <uv_pars_vertex>
 
@@ -33,6 +40,13 @@ void main() {
 
 
 
 	vNormal = normalize( transformedNormal );
 
 	vNormal = normalize( transformedNormal );
 
 
 
+	#ifdef USE_TANGENT
 
+
 
+		vTangent = normalize( transformedTangent );
 
+		vBitangent = normalize( cross( vNormal, vTangent ) * tangent.w );
 
+
 
+	#endif
 
+
 
 #endif
 
 #endif
 
 
 
 	#include <begin_vertex>
 
 	#include <begin_vertex>

+ 10 - 0
src/renderers/webgl/WebGLProgram.js
View File 

@@ -359,6 +359,8 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
 
 			parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '',
 
 			parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '',
 
 			parameters.metalnessMap ? '#define USE_METALNESSMAP' : '',
 
 			parameters.metalnessMap ? '#define USE_METALNESSMAP' : '',
 
 			parameters.alphaMap ? '#define USE_ALPHAMAP' : '',
 
 			parameters.alphaMap ? '#define USE_ALPHAMAP' : '',
 
+
 
+			parameters.vertexTangents ? '#define USE_TANGENT' : '',
 
 			parameters.vertexColors ? '#define USE_COLOR' : '',
 
 			parameters.vertexColors ? '#define USE_COLOR' : '',
 
 
 
 			parameters.flatShading ? '#define FLAT_SHADED' : '',
 
 			parameters.flatShading ? '#define FLAT_SHADED' : '',
 
@@ -390,6 +392,12 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
 
 			'attribute vec3 normal;',
 
 			'attribute vec3 normal;',
 
 			'attribute vec2 uv;',
 
 			'attribute vec2 uv;',
 
 
 
+			'#ifdef USE_TANGENT',
 
+
 
+			'	attribute vec4 tangent;',
 
+
 
+			'#endif',
 
+
 
 			'#ifdef USE_COLOR',
 
 			'#ifdef USE_COLOR',
 
 
 
 			'	attribute vec3 color;',
 
 			'	attribute vec3 color;',
 
@@ -466,6 +474,8 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
 
 			parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '',
 
 			parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '',
 
 			parameters.metalnessMap ? '#define USE_METALNESSMAP' : '',
 
 			parameters.metalnessMap ? '#define USE_METALNESSMAP' : '',
 
 			parameters.alphaMap ? '#define USE_ALPHAMAP' : '',
 
 			parameters.alphaMap ? '#define USE_ALPHAMAP' : '',
 
+
 
+			parameters.vertexTangents ? '#define USE_TANGENT' : '',
 
 			parameters.vertexColors ? '#define USE_COLOR' : '',
 
 			parameters.vertexColors ? '#define USE_COLOR' : '',
 
 
 
 			parameters.gradientMap ? '#define USE_GRADIENTMAP' : '',
 
 			parameters.gradientMap ? '#define USE_GRADIENTMAP' : '',

+ 2 - 1
src/renderers/webgl/WebGLPrograms.js
View File 

@@ -31,7 +31,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 		"precision", "supportsVertexTextures", "map", "mapEncoding", "matcap", "matcapEncoding", "envMap", "envMapMode", "envMapEncoding",
 
 		"precision", "supportsVertexTextures", "map", "mapEncoding", "matcap", "matcapEncoding", "envMap", "envMapMode", "envMapEncoding",
 
 		"lightMap", "aoMap", "emissiveMap", "emissiveMapEncoding", "bumpMap", "normalMap", "objectSpaceNormalMap", "displacementMap", "specularMap",
 
 		"lightMap", "aoMap", "emissiveMap", "emissiveMapEncoding", "bumpMap", "normalMap", "objectSpaceNormalMap", "displacementMap", "specularMap",
 
 		"roughnessMap", "metalnessMap", "gradientMap",
 
 		"roughnessMap", "metalnessMap", "gradientMap",
 
-		"alphaMap", "combine", "vertexColors", "fog", "useFog", "fogExp",
 
+		"alphaMap", "combine", "vertexColors", "vertexTangents", "fog", "useFog", "fogExp",
 
 		"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
 
 		"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
 
 		"maxBones", "useVertexTexture", "morphTargets", "morphNormals",
 
 		"maxBones", "useVertexTexture", "morphTargets", "morphNormals",
 
 		"maxMorphTargets", "maxMorphNormals", "premultipliedAlpha",
 
 		"maxMorphTargets", "maxMorphNormals", "premultipliedAlpha",
 
@@ -163,6 +163,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
 
 
 
 			combine: material.combine,
 
 			combine: material.combine,
 
 
 
+			vertexTangents: material.vertexTangents,
 
 			vertexColors: material.vertexColors,
 
 			vertexColors: material.vertexColors,
 
 
 
 			fog: !! fog,
 
 			fog: !! fog,

Some files were not shown because too many files changed in this diff