HARP-13604 Upgrade three.js to r124

Signed-off-by: Jonathan Stichbury <2533428+nzjony@users.noreply.github.com>
heremaps · Jan 5, 2021 · 73db468 · 73db468
1 parent 748ab58
commit 73db468
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 37 deletions.
diff --git a/@here/harp-datasource-protocol/package.json b/@here/harp-datasource-protocol/package.json
@@ -37,12 +37,12 @@
         "cross-env": "^7.0.2",
         "mocha": "^7.2.0",
         "source-map-support": "^0.5.19",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "ts-json-schema-generator": "^0.68.1",
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-debug-datasource/package.json b/@here/harp-debug-datasource/package.json
@@ -40,7 +40,7 @@
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-examples/package.json b/@here/harp-examples/package.json
@@ -53,7 +53,7 @@
         "stats.js": "^0.17.0",
         "style-loader": "^1.2.1",
         "suncalc": "^1.8.0",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "ts-loader": "^8.0.7",
         "typescript": "^3.9.3",
         "webpack-cli": "^4.2.0",

diff --git a/@here/harp-features-datasource/package.json b/@here/harp-features-datasource/package.json
@@ -37,7 +37,7 @@
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-geojson-datasource/package.json b/@here/harp-geojson-datasource/package.json
@@ -37,7 +37,7 @@
         "mocha": "^7.2.0",
         "sinon": "^9.0.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "typescript": "^3.9.3"
     },
     "publishConfig": {

diff --git a/@here/harp-geometry/package.json b/@here/harp-geometry/package.json
@@ -34,11 +34,11 @@
         "mocha": "^7.2.0",
         "sinon": "^9.0.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "dependencies": {
         "@here/harp-geoutils": "^0.21.0",

diff --git a/@here/harp-geoutils/package.json b/@here/harp-geoutils/package.json
@@ -28,11 +28,11 @@
         "mocha": "^7.2.0",
         "sinon": "^9.0.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-lines/package.json b/@here/harp-lines/package.json
@@ -36,11 +36,11 @@
         "cross-env": "^7.0.2",
         "mocha": "^7.2.0",
         "source-map-support": "^0.5.19",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-map-controls/package.json b/@here/harp-map-controls/package.json
@@ -39,11 +39,11 @@
         "mocha": "^7.2.0",
         "sinon": "^9.0.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-mapview/lib/MapView.ts b/@here/harp-mapview/lib/MapView.ts
@@ -183,7 +183,8 @@ const cache = {
             yAxis: new THREE.Vector3(),
             zAxis: new THREE.Vector3()
         }
-    ]
+    ],
+    color: new THREE.Color()
 };
 
 /**
@@ -1672,7 +1673,7 @@ export class MapView extends EventDispatcher {
      * The color used to clear the view.
      */
     get clearColor() {
-        const rendererClearColor = this.m_renderer.getClearColor();
+        const rendererClearColor = this.m_renderer.getClearColor(cache.color);
         return rendererClearColor !== undefined ? rendererClearColor.getHex() : 0;
     }
 

diff --git a/@here/harp-mapview/lib/composing/MSAARenderPass.ts b/@here/harp-mapview/lib/composing/MSAARenderPass.ts
@@ -68,6 +68,8 @@ export class MSAARenderPass extends Pass {
         this.m_quadMaterial
     );
 
+    private readonly m_tmpColor = new THREE.Color();
+
     /**
      * The constructor for `MSAARenderPass`. It builds an internal scene with a camera looking at a
      * quad.
@@ -139,7 +141,7 @@ export class MSAARenderPass extends Pass {
 
         const offsets = MSAARenderPass.OffsetVectors[this.samplingLevel];
 
-        const rendererClearColor = renderer.getClearColor();
+        const rendererClearColor = renderer.getClearColor(this.m_tmpColor);
         const oldClearColor = rendererClearColor !== undefined ? rendererClearColor.getHex() : 0;
 
         // The method `camera.setViewOffset` will be called in the next loop. In order to maintain

diff --git a/@here/harp-mapview/package.json b/@here/harp-mapview/package.json
@@ -58,11 +58,11 @@
         "mocha": "^7.2.0",
         "sinon": "^9.0.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-materials/package.json b/@here/harp-materials/package.json
@@ -30,11 +30,11 @@
         "cross-env": "^7.0.2",
         "mocha": "^7.2.0",
         "source-map-support": "^0.5.19",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-omv-datasource/package.json b/@here/harp-omv-datasource/package.json
@@ -47,7 +47,7 @@
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-test-utils/lib/WebGLStub.ts b/@here/harp-test-utils/lib/WebGLStub.ts
@@ -26,7 +26,7 @@ function getSize(): { width: number; height: number } {
  */
 export function getWebGLRendererStub(sandbox: sinon.SinonSandbox, clearColorStub: sinon.SinonStub) {
     return {
-        getClearColor: () => undefined,
+        getClearColor: (target: THREE.Color) => undefined,
         setClearColor: clearColorStub,
         setSize,
         getSize,

diff --git a/@here/harp-test-utils/package.json b/@here/harp-test-utils/package.json
@@ -28,7 +28,7 @@
         "glob": "^7.1.3",
         "pixelmatch": "^5.2.0",
         "sinon": "^9.0.2",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "ua-parser-js": "^0.7.21",
         "xml2js": "^0.4.23"
     },

diff --git a/@here/harp-text-canvas/package.json b/@here/harp-text-canvas/package.json
@@ -33,12 +33,12 @@
         "mocha": "^7.2.0",
         "sinon": "^9.0.2",
         "source-map-support": "^0.5.19",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "ts-node": "^8.10.1",
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-vectortile-datasource/package.json b/@here/harp-vectortile-datasource/package.json
@@ -61,7 +61,7 @@
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp-webtile-datasource/package.json b/@here/harp-webtile-datasource/package.json
@@ -41,7 +41,7 @@
         "typescript": "^3.9.3"
     },
     "peerDependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "publishConfig": {
         "access": "public"

diff --git a/@here/harp.gl/package.json b/@here/harp.gl/package.json
@@ -31,7 +31,7 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "devDependencies": {
         "@here/harp-datasource-protocol": "^0.21.1",

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
         "nyc": "^15.0.1",
         "prettier": "^1.19.1",
         "semver": "^7.3.2",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "ts-mocha": "^7.0.0",
         "typedoc": "^0.17.7",
         "typescript": "^3.9.3",

diff --git a/test/performance/package.json b/test/performance/package.json
@@ -16,7 +16,7 @@
         "@here/harp-vectortile-datasource": "^0.21.1",
         "@types/chai": "^4.2.11",
         "chai": "^4.2.0",
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "license": "Apache-2.0"
 }
diff --git a/test/rendering/package.json b/test/rendering/package.json
@@ -19,7 +19,7 @@
         "@here/harp-vectortile-datasource": "^0.21.1",
         "@types/chai": "^4.2.11",
         "chai": "^4.2.0",
-        "three": "^0.123.0"
+        "three": "^0.124.0"
     },
     "license": "Apache-2.0"
 }
diff --git a/www/package.json b/www/package.json
@@ -29,7 +29,7 @@
         "mini-css-extract-plugin": "^1.3.2",
         "node-fetch": "^2.6.1",
         "script-ext-html-webpack-plugin": "^2.1.4",
-        "three": "^0.123.0",
+        "three": "^0.124.0",
         "ts-loader": "^8.0.7",
         "typescript": "^3.9.3",
         "webpack": "^5.9.0",

diff --git a/yarn.lock b/yarn.lock
@@ -9601,10 +9601,10 @@ textextensions@^2.5.0:
   resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
   integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
 
-three@^0.123.0:
-  version "0.123.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.123.0.tgz#3bb6d8f908a432eb7cd450f7eab6dd40fde53085"
-  integrity sha512-KNnx/IbilvoHRkxOtL0ouozoDoElyuvAXhFB21RK7F5IPWSmqyFelICK6x3hJerLNSlAdHxR0hkuvMMhH9pqXg==
+three@^0.124.0:
+  version "0.124.0"
+  resolved "https://artifactory.in.here.com/artifactory/api/npm/here-node/three/-/three-0.124.0.tgz#14ab1a26ba6c56e51190e1b55695cd3c1e69ea55"
+  integrity sha1-FKsaJrpsVuURkOG1VpXNPB5p6lU=
 
 through2@^2.0.1, through2@~2.0.0:
   version "2.0.5"