Revert "Update three to 114.0"

This reverts commit 709dbba. Wait for fixing mrdoob/three.js#18957
epam · Mar 23, 2020 · 0c8da84 · 0c8da84
1 parent 709dbba
commit 0c8da84
Show file tree

Hide file tree

Showing 26 changed files with 45 additions and 46 deletions.
diff --git a/examples/api.html b/examples/api.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/empty.html b/examples/empty.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/events.html b/examples/events.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/fullscreen.html b/examples/fullscreen.html
@@ -39,7 +39,7 @@
 
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/grid.html b/examples/grid.html
@@ -93,7 +93,7 @@ <h2>Adverse effects</h2>
 
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
   <script>
     (function() {

diff --git a/examples/labels.html b/examples/labels.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/load_from_string.html b/examples/load_from_string.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.js"></script>
 </head>
 <body>

diff --git a/examples/miew_via_global.html b/examples/miew_via_global.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/miew_via_require.html b/examples/miew_via_require.html
@@ -16,7 +16,7 @@ <h1>Use Miew via Require.js</h1>
     require.config({
       paths: {
         'lodash': 'https://unpkg.com/lodash@^4.17.15/lodash',
-        'three': 'https://unpkg.com/three@0.114.0/build/three.min',
+        'three': 'https://unpkg.com/three@0.112.1/build/three.min',
       }
     });
     require(['../dist/Miew.min'], function(Miew) {

diff --git a/examples/multiple.html b/examples/multiple.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/options.html b/examples/options.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/options_fromAttr.html b/examples/options_fromAttr.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/options_fromURL.html b/examples/options_fromURL.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/projected.html b/examples/projected.html
@@ -27,7 +27,7 @@
 
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/sequence.html b/examples/sequence.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="../dist/Miew.min.css">
   <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
   <style>
     .miew-container {

diff --git a/examples/terminal.html b/examples/terminal.html
@@ -26,7 +26,7 @@
   <script src="https://unpkg.com/jquery@3/dist/jquery.min.js"></script>
   <script src="https://unpkg.com/jquery.terminal@1/js/jquery.terminal.min.js"></script>
   <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-  <script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+  <script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
   <script src="../dist/Miew.min.js"></script>
 </head>
 <body>

diff --git a/examples/transparent_background.html b/examples/transparent_background.html
@@ -36,7 +36,7 @@ <h1>Use transparent background</h1>
 
 <script src="https://unpkg.com/@babel/polyfill@7/dist/polyfill.min.js"></script>
 <script src="https://unpkg.com/lodash@^4.17.15/lodash.js"></script>
-<script src="https://unpkg.com/three@0.114.0/build/three.min.js"></script>
+<script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
 <script src="../dist/Miew.min.js"></script>
 <script>
   (function() {

diff --git a/package.json b/package.json
@@ -103,7 +103,7 @@
   },
   "dependencies": {
     "lodash": "^4.17.15",
-    "three": "0.114.0"
+    "three": "0.112.1"
   },
   "devDependencies": {
     "@babel/core": "^7.8.7",

diff --git a/src/Miew.js b/src/Miew.js
@@ -1618,7 +1618,7 @@ Miew.prototype._performAO = (function () {
       return;
     }
     const gfx = this._gfx;
-    const tanHalfFOV = Math.tan(THREE.MathUtils.DEG2RAD * 0.5 * gfx.camera.fov);
+    const tanHalfFOV = Math.tan(THREE.Math.DEG2RAD * 0.5 * gfx.camera.fov);
 
     _aoMaterial.uniforms.diffuseTexture.value = srcColorBuffer.texture;
     _aoMaterial.uniforms.depthTexture.value = srcDepthTexture;
@@ -3128,11 +3128,11 @@ Miew.prototype.screenshot = function (width, height) {
   const deviceHeight = gfx.renderer.domElement.height;
 
   function fov2Tan(fov) {
-    return Math.tan(THREE.MathUtils.degToRad(0.5 * fov));
+    return Math.tan(THREE.Math.degToRad(0.5 * fov));
   }
 
   function tan2Fov(tan) {
-    return THREE.MathUtils.radToDeg(Math.atan(tan)) * 2.0;
+    return THREE.Math.radToDeg(Math.atan(tan)) * 2.0;
   }
 
   function getDataURL() {

diff --git a/src/chem/AromaticLoopsMarker.js b/src/chem/AromaticLoopsMarker.js
@@ -48,7 +48,7 @@ function _anotherAtom(bond, currAtom) {
 
 function _cosBetween(v1, v2) {
   const theta = v1.dot(v2) / (Math.sqrt(v1.lengthSq() * v2.lengthSq()));
-  return THREE.MathUtils.clamp(theta, -1, 1);
+  return THREE.Math.clamp(theta, -1, 1);
 }
 
 function _markAromatic(bond) {

diff --git a/src/gfx/CSS2DRenderer.js b/src/gfx/CSS2DRenderer.js
@@ -80,7 +80,7 @@ class CSS2DRenderer {
           element.style.background = colorAsHex(object.userData.background);
         }
       } else {
-        const fogFactor = THREE.MathUtils.smoothstep(-this._vector.z, scene.fog.near, scene.fog.far);
+        const fogFactor = THREE.Math.smoothstep(-this._vector.z, scene.fog.near, scene.fog.far);
         element.style.color = lerpColorAsHex(object.userData.color, scene.fog.color, fogFactor);
         if (object.userData.background !== 'transparent') {
           element.style.background = lerpColorAsHex(object.userData.background, scene.fog.color, fogFactor);

diff --git a/src/gfx/VolumeFarPlane.js b/src/gfx/VolumeFarPlane.js
@@ -42,7 +42,7 @@ class VolumeFarPlane {
       // update material props
       material.uniforms.aspectRatio.value = camera.aspect;
       material.uniforms.farZ.value = camera.far;
-      material.uniforms.tanHalfFOV.value = Math.tan(THREE.MathUtils.DEG2RAD * 0.5 * camera.fov);
+      material.uniforms.tanHalfFOV.value = Math.tan(THREE.Math.DEG2RAD * 0.5 * camera.fov);
       material.uniforms.matWorld2Volume.value = matWorldToVolume;
     };
 

diff --git a/src/gfx/gfxutils.js b/src/gfx/gfxutils.js
@@ -154,7 +154,7 @@ THREE.PerspectiveCamera.prototype.setMinimalFov = function (angle) {
   if (this.aspect >= 1.0) {
     this.fov = angle;
   } else {
-    this.fov = THREE.MathUtils.radToDeg(2 * Math.atan(Math.tan(THREE.MathUtils.degToRad(angle) * 0.5) / this.aspect));
+    this.fov = THREE.Math.radToDeg(2 * Math.atan(Math.tan(THREE.Math.degToRad(angle) * 0.5) / this.aspect));
   }
 };
 
@@ -182,7 +182,7 @@ THREE.StereoCamera.prototype.updateHalfSized = function (camera, angle) {
  * @param {number} angle - Field of view in degrees.
  */
 THREE.PerspectiveCamera.prototype.setDistanceToFit = function (radius, angle) {
-  this.position.z = radius / Math.sin(0.5 * THREE.MathUtils.degToRad(angle));
+  this.position.z = radius / Math.sin(0.5 * THREE.Math.degToRad(angle));
 };
 
 /**
@@ -445,11 +445,11 @@ function applyTransformsToMeshes(root, mtc) {
     if (!parent) {
       continue;
     }
-    mesh.applyMatrix4(mtc[0]);
+    mesh.applyMatrix(mtc[0]);
     for (let j = 1; j < mtcCount; ++j) {
       const newMesh = new mesh.constructor(mesh.geometry, mesh.material);
       parent.add(newMesh);
-      newMesh.applyMatrix4(mtc[j]);
+      newMesh.applyMatrix(mtc[j]);
     }
   }
 }
@@ -480,7 +480,7 @@ function processTransparentMaterial(root, material) {
         prepassMesh.material[value] = false;
       });
     prepassMesh.material.needsUpdate = true;
-    prepassMesh.applyMatrix4(mesh.matrix);
+    prepassMesh.applyMatrix(mesh.matrix);
     prepassMesh.layers.set(LAYERS.PREPASS_TRANSPARENT);
     parent.add(prepassMesh);
   }
@@ -511,7 +511,7 @@ function processColFromPosMaterial(root, material) {
     });
 
     colFromPosMesh.material.needsUpdate = true;
-    colFromPosMesh.applyMatrix4(mesh.matrix);
+    colFromPosMesh.applyMatrix(mesh.matrix);
     colFromPosMesh.layers.set(LAYERS.COLOR_FROM_POSITION);
     parent.add(colFromPosMesh);
   }
@@ -549,7 +549,7 @@ function createShadowmapMaterial(root, material) {
       });
     shadowmapMesh.isShadowmapMesh = true;
     shadowmapMesh.material.needsUpdate = true;
-    shadowmapMesh.applyMatrix4(mesh.matrix);
+    shadowmapMesh.applyMatrix(mesh.matrix);
     shadowmapMesh.layers.set(LAYERS.SHADOWMAP);
     parent.add(shadowmapMesh);
   }

diff --git a/src/gfx/meshes/TransformGroup.js b/src/gfx/meshes/TransformGroup.js
@@ -74,7 +74,8 @@ class TransformGroup extends THREE.Object3D {
     const meshes = [];
     for (let i = 0, n = transforms.length; i < n; ++i) {
       const mesh = new Mesh(geometry, material);
-      mesh.applyMatrix4(transforms[i]);
+      mesh.applyMatrix(transforms[i]);
+
       meshes[i] = mesh;
     }
 

diff --git a/src/gfx/shaders/Uber.frag b/src/gfx/shaders/Uber.frag
@@ -248,16 +248,14 @@ float unpackRGBAToDepth( const in vec4 v ) {
   struct DirectionalLight {
     vec3 direction;
     vec3 color;
-  };
-  uniform DirectionalLight directionalLights[ NUM_DIR_LIGHTS ];
 
-  struct DirectionalLightShadow {
-     vec2 shadowMapSize;
-     float shadowBias;
-     float shadowRadius;
-   };
-  uniform DirectionalLightShadow directionalLightShadows[ NUM_DIR_LIGHTS ];
+    int shadow;
+    vec2 shadowMapSize;
+    float shadowBias;
+    float shadowRadius;
+  };
 
+  uniform DirectionalLight directionalLights[ NUM_DIR_LIGHTS ];
   uniform vec3 ambientLightColor;
 
   /////////////////////////////////////////// Shadowmap ////////////////////////////////////////////////
@@ -267,7 +265,7 @@ float unpackRGBAToDepth( const in vec4 v ) {
   		return step( compare, unpackRGBAToDepth( texture2D( depths, uv ) ) );
   	}
 
-    float getShadow( sampler2D shadowMap, DirectionalLightShadow dirLight, vec4 shadowCoord, vec3 vViewPosition, vec3 vNormal ) {
+    float getShadow( sampler2D shadowMap, DirectionalLight dirLight, vec4 shadowCoord, vec3 vViewPosition, vec3 vNormal ) {
    	  float shadow = 0.0;
 
       // When shadows for sprites will appear use here for them normals as it done for G-buffer
@@ -395,7 +393,7 @@ float unpackRGBAToDepth( const in vec4 v ) {
   	#pragma unroll_loop
   	  for ( int i = 0; i < NUM_DIR_LIGHTS; i ++ ) {
   	    #ifdef SHADOWMAP
-  	      shadowMask = getShadow( directionalShadowMap[ i ], directionalLightShadows[ i ], vDirectionalShadowCoord[ i ], vViewPosition, vDirectionalShadowNormal[ i ] );
+  	    if ( directionalLights[ i ].shadow > 0 ) shadowMask = getShadow( directionalShadowMap[ i ], directionalLights[ i ], vDirectionalShadowCoord[ i ], vViewPosition, vDirectionalShadowNormal[ i ] );
   	    #endif
 
   		  if ( shadowMask > 0.0 ) RE_Direct_BlinnPhong( directionalLights[ i ], geometry, material, reflectedLight, shadowMask );

diff --git a/yarn.lock b/yarn.lock
@@ -9192,10 +9192,10 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-three@0.114.0:
-  version "0.114.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.114.0.tgz#754d08467a950ddeef06a0c645a1302b130e455a"
-  integrity sha512-3av45FxJeqYm7Rl02dfGBoqTaf2a934oUB4zMNrN8xjmASoSGeeykYoAr35+UntTdJDY/STw6CY3KuXFBWETig==
+three@0.112.1:
+  version "0.112.1"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.112.1.tgz#f8d8f4d0f8e5f753dac6260491b8209457fdc131"
+  integrity sha512-8I0O74hiYtKl3LgDNcPJbBGOlpekbcJ6fJnImmW3mFdeUFJ2H9Y3/UuUSW2sBdjrIlCM0gvOkaTEFlofO900TQ==
 
 through2@^2.0.0:
   version "2.0.5"