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

HARP-12776 Upgrade three.js to r122 #1948

Merged
merged 1 commit into from
Nov 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.120.1",
"three": "^0.122.0",
"ts-json-schema-generator": "^0.68.1",
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-debug-datasource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"stats.js": "^0.17.0",
"style-loader": "^1.2.1",
"suncalc": "^1.8.0",
"three": "^0.120.1",
"three": "^0.122.0",
"ts-loader": "^7.0.5",
"typescript": "^3.9.3",
"webpack": "^4.43.0",
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-features-datasource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-geojson-datasource/package.json
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.120.1",
"three": "^0.122.0",
"typescript": "^3.9.3"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-geometry/package.json
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.120.1",
"three": "^0.122.0",
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"dependencies": {
"@here/harp-geoutils": "^0.21.0",
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-geoutils/package.json
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.120.1",
"three": "^0.122.0",
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-lines/package.json
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.120.1",
"three": "^0.122.0",
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-map-controls/package.json
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.120.1",
"three": "^0.122.0",
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-mapview/lib/composing/Outline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ export class OutlineEffect {

// Copy available fading params to the outline material.
if (
material.defines.USE_FADING !== undefined &&
material.defines?.USE_FADING !== undefined &&
originalUniforms.fadeNear !== undefined &&
originalUniforms.fadeFar !== undefined &&
originalUniforms.fadeFar.value >= 0.0
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-mapview/package.json
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.120.1",
"three": "^0.122.0",
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 2 additions & 1 deletion @here/harp-mapview/test/stubElevationProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export function stubElevationProvider(sandbox: sinon.SinonSandbox): ElevationPro
return stub;
}

const dummyTexture = new THREE.Texture();
const empty: Float32Array = new Float32Array();
const dummyTexture = new THREE.DataTexture(empty, 32, 32);
const dummyDisplacementMap: DisplacementMap = {
xCountVertices: 32,
yCountVertices: 32,
Expand Down
4 changes: 2 additions & 2 deletions @here/harp-materials/package.json
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.120.1",
"three": "^0.122.0",
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-omv-datasource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-test-utils/package.json
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.120.1",
"three": "^0.122.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
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.120.1",
"three": "^0.122.0",
"ts-node": "^8.10.1",
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-vectortile-datasource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp-webtile-datasource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"typescript": "^3.9.3"
},
"peerDependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion @here/harp.gl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"three": "^0.120.1"
"three": "^0.122.0"
},
"devDependencies": {
"@here/harp-datasource-protocol": "^0.21.1",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"nyc": "^15.0.1",
"prettier": "^1.19.1",
"semver": "^7.3.2",
"three": "^0.120.1",
"three": "^0.122.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
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.120.1"
"three": "^0.122.0"
},
"license": "Apache-2.0"
}
2 changes: 1 addition & 1 deletion test/rendering/package.json
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.120.1"
"three": "^0.122.0"
},
"license": "Apache-2.0"
}
2 changes: 1 addition & 1 deletion www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"mini-css-extract-plugin": "^0.9.0",
"node-fetch": "^2.6.1",
"script-ext-html-webpack-plugin": "^2.1.4",
"three": "^0.120.1",
"three": "^0.122.0",
"ts-loader": "^7.0.5",
"typescript": "^3.9.3",
"webpack": "^4.43.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8567,10 +8567,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.120.1:
version "0.120.1"
resolved "https://registry.yarnpkg.com/three/-/three-0.120.1.tgz#dbd8894f8ab87c109f1602933e7c740c98137377"
integrity sha512-ktaCRFUR7JUZcKec+cBRz+oBex5pOVaJhrtxvFF2T7on53o9UkEux+/Nh1g/4zeb4t/pbxIFcADbn/ACu3LC1g==
three@^0.122.0:
version "0.122.0"
resolved "https://registry.yarnpkg.com/three/-/three-0.122.0.tgz#bd9ed8a8820074856e8ba7b63fe0a65176e01aeb"
integrity sha512-bgYMo0WdaQhf7DhLE8OSNN/rVFO5J4K1A2VeeKqoV4MjjuHjfCP6xLpg8Xedhns7NlEnN3sZ6VJROq19Qyl6Sg==

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