Skip to content
This repository has been archived by the owner on Mar 8, 2023. It is now read-only.

HARP-13604 Upgrade three.js to r124 #2027

Merged
merged 1 commit into from
Jan 6, 2021
Merged

HARP-13604 Upgrade three.js to r124 #2027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions @here/harp-datasource-protocol/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-debug-datasource/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.123.0"
"three": "^0.124.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-features-datasource/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.123.0"
"three": "^0.124.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-geojson-datasource/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-geometry/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-geoutils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-lines/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-map-controls/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions @here/harp-mapview/lib/MapView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ const cache = {
yAxis: new THREE.Vector3(),
zAxis: new THREE.Vector3()
}
]
],
color: new THREE.Color()
};

/**
Expand Down Expand Up @@ -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;
}

Expand Down
4 changes: 3 additions & 1 deletion @here/harp-mapview/lib/composing/MSAARenderPass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-mapview/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-materials/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-omv-datasource/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.123.0"
"three": "^0.124.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-test-utils/lib/WebGLStub.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-text-canvas/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-vectortile-datasource/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.123.0"
"three": "^0.124.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-webtile-datasource/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.123.0"
"three": "^0.124.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp.gl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/performance/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion test/rendering/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion www/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://registry.yarnpkg.com/three/-/three-0.124.0.tgz#14ab1a26ba6c56e51190e1b55695cd3c1e69ea55"
integrity sha512-ROXp1Ly7YyF+jC910DQyAWj++Qlw2lQv0qwYLNQwdDbjk4bsOXAfGO92wYTMPNei1GMJUmCxSxc3MjGBTS09Rg==

through2@^2.0.1, through2@~2.0.0:
version "2.0.5"
Expand Down