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

Commit

Permalink
HARP-8333: Update Three.js to 0.112
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Black <craig.black@here.com>
  • Loading branch information
CraigBerlin committed Jan 9, 2020
1 parent 26ee799 commit 0a6fb72
Show file tree
Hide file tree
Showing 23 changed files with 37 additions and 34 deletions.
4 changes: 2 additions & 2 deletions @here/harp-datasource-protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
"cross-env": "^6.0.3",
"mocha": "^6.1.4",
"source-map-support": "^0.5.2",
"three": "^0.111.0",
"three": "^0.112.1",
"ts-json-schema-generator": "^0.56.0",
"typescript": "^3.7.2",
"typestring": "^2.9.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"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.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"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 @@
"ncp": "^2.0.0",
"stats.js": "^0.17.0",
"style-loader": "^1.0.0",
"three": "^0.111.0",
"three": "^0.112.1",
"ts-loader": "^6.0.3",
"typescript": "^3.7.2",
"webpack": "^4.34.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.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"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 @@ -47,7 +47,7 @@
"mocha": "^6.1.4",
"sinon": "^7.2.3",
"source-map-support": "^0.5.2",
"three": "^0.111.0",
"three": "^0.112.1",
"typescript": "^3.7.2"
},
"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 @@ -32,11 +32,11 @@
"mocha": "^6.1.4",
"sinon": "^7.1.1",
"source-map-support": "^0.5.2",
"three": "^0.111.0",
"three": "^0.112.1",
"typescript": "^3.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"dependencies": {
"@here/harp-geoutils": "^0.11.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe("SphericalGeometrySubdivisionModifier", function() {
const a = new THREE.Vector3();
const b = new THREE.Vector3();
const c = new THREE.Vector3();
const idxBuffer = geometry.getIndex().array;
const idxBuffer = geometry.getIndex()!.array;
for (let i = 0; i < idxBuffer.length; i += 3) {
a.set(
posAttr.array[idxBuffer[i] * 3],
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": "^6.1.4",
"sinon": "^7.1.1",
"source-map-support": "^0.5.2",
"three": "^0.111.0",
"three": "^0.112.1",
"typescript": "^3.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"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 @@ -35,11 +35,11 @@
"cross-env": "^6.0.3",
"mocha": "^6.1.4",
"source-map-support": "^0.5.2",
"three": "^0.111.0",
"three": "^0.112.1",
"typescript": "^3.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"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": "^6.1.4",
"sinon": "^7.1.1",
"source-map-support": "^0.5.2",
"three": "^0.111.0",
"three": "^0.112.1",
"typescript": "^3.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"publishConfig": {
"access": "public"
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 @@ -56,11 +56,11 @@
"mocha": "^6.1.4",
"sinon": "^7.1.1",
"source-map-support": "^0.5.2",
"three": "^0.111.0",
"three": "^0.112.1",
"typescript": "^3.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"publishConfig": {
"access": "public"
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": "^6.0.3",
"mocha": "^6.1.4",
"source-map-support": "^0.5.2",
"three": "^0.111.0",
"three": "^0.112.1",
"typescript": "^3.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"publishConfig": {
"access": "public"
Expand Down
5 changes: 4 additions & 1 deletion @here/harp-omv-datasource/lib/OmvDecodedTileEmitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1249,7 +1249,10 @@ export class OmvDecodedTileEmitter implements IOmvEmitter {
vertices.push(wallAttr.array[i / 3]);
}

triangles.push(...(geom.getIndex().array as Float32Array));
const geomIndex = geom.getIndex();
if (geomIndex !== null) {
triangles.push(...(geomIndex.array as Float32Array));
}
}

// Add the footprint/roof vertices to the position buffer.
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 @@ -61,7 +61,7 @@
"typescript": "^3.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"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 @@ -29,7 +29,7 @@
"glob": "^7.1.3",
"ua-parser-js": "^0.7.20",
"xml2js": "^0.4.22",
"three": "^0.111.0",
"three": "^0.112.1",
"pixelmatch": "^4.0.0"
},
"devDependencies": {
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": "^6.1.4",
"sinon": "^7.3.2",
"source-map-support": "^0.5.2",
"three": "^0.111.0",
"three": "^0.112.1",
"ts-node": "^8.3.0",
"typescript": "^3.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"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.7.2"
},
"peerDependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"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 @@ -28,7 +28,7 @@
},
"license": "Apache-2.0",
"dependencies": {
"three": "^0.111.0"
"three": "^0.112.1"
},
"devDependencies": {
"@here/harp-datasource-protocol": "^0.11.1",
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="css/index.css">
<link rel="shortcut icon" href="resources/favicon.ico">
<script src="js/credentials.js"></script>
<script src="https://unpkg.com/three@0.111.0/build/three.min.js"></script>
<script src="https://unpkg.com/three@0.112.1/build/three.min.js"></script>
<script src="https://unpkg.com/@here/harp.gl/dist/harp.js"></script>

<meta name="twitter:card" content="summary" />
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"node-fetch": "^2.2.0",
"nyc": "^14.1.1",
"prettier": "^1.19.1",
"three": "^0.111.0",
"three": "^0.112.1",
"ts-mocha": "^6.0.0",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0",
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-test-utils": "^0.11.0",
"@types/chai": "^4.2.2",
"chai": "^4.2.0",
"three": "^0.111.0"
"three": "^0.112.1"
},
"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 @@ -15,7 +15,7 @@
"@here/harp-geoutils": "^0.11.0",
"@here/harp-geojson-datasource": "^0.11.0",
"@here/harp-datasource-protocol": "^0.11.0",
"three": "^0.111.0"
"three": "^0.112.1"
},
"license": "Apache-2.0"
}
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7332,10 +7332,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.111.0:
version "0.111.0"
resolved "https://registry.yarnpkg.com/three/-/three-0.111.0.tgz#9cedb73e79b7f6bf2440cb67a273f883faa923b6"
integrity sha512-AcTqyGJ3H75AIusOuADy0LsP958QKQwm/YhABHFMzd6RFXPNVay1rlSbbG6WYv7KM72G2THMMwqbjQd4dVHMkQ==
three@^0.112.1:
version "0.112.1"
resolved "https://registry.yarnpkg.com/three/-/three-0.112.1.tgz#f8d8f4d0f8e5f753dac6260491b8209457fdc131"
integrity sha512-8I0O74hiYtKl3LgDNcPJbBGOlpekbcJ6fJnImmW3mFdeUFJ2H9Y3/UuUSW2sBdjrIlCM0gvOkaTEFlofO900TQ==

throttleit@^1.0.0:
version "1.0.0"
Expand Down

0 comments on commit 0a6fb72

Please sign in to comment.