Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update npm packages #1724

Merged
merged 3 commits into from
Oct 13, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5,315 changes: 1,193 additions & 4,122 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
},
"homepage": "https://itowns.github.io/",
"dependencies": {
"@loaders.gl/las": "^3.0.9",
"@mapbox/mapbox-gl-style-spec": "^13.21.0",
"@loaders.gl/las": "^3.0.12",
"@mapbox/mapbox-gl-style-spec": "^13.22.0",
"@mapbox/vector-tile": "^1.3.1",
"@tmcw/togeojson": "^4.5.0",
"@tweenjs/tween.js": "^18.6.4",
Expand All @@ -61,12 +61,12 @@
},
"peerDependencies": {
"proj4": "^2.7.5",
"three": "0.131.3"
"three": "0.133.1"
},
"devDependencies": {
"@babel/cli": "^7.14.8",
"@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.15.0",
"@babel/cli": "^7.15.7",
"@babel/plugin-transform-runtime": "^7.15.8",
"@babel/preset-env": "^7.15.8",
"@babel/register": "^7.15.3",
"babel-inline-import-loader": "^1.0.1",
"babel-loader": "^8.2.2",
Expand All @@ -79,31 +79,31 @@
"compare-func": "^2.0.0",
"conventional-changelog-cli": "^2.1.1",
"copyfiles": "^2.4.1",
"core-js": "^3.16.2",
"core-js": "^3.18.3",
"cross-env": "^7.0.3",
"eslint": "^7.32.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-import-resolver-webpack": "^0.13.1",
"eslint-loader": "^4.0.2",
"eslint-plugin-import": "^2.24.1",
"eslint-plugin-import": "^2.25.2",
"github-url-from-git": "^1.5.0",
"grunt": "^1.4.1",
"grunt-bump": "^0.8.0",
"https-proxy-agent": "^5.0.0",
"jsdoc": "^3.6.7",
"marked": "^3.0.0",
"mocha": "^9.1.0",
"node-fetch": "^2.6.1",
"marked": "^3.0.7",
"mocha": "^9.1.2",
"node-fetch": "^2.6.2",
"nyc": "^15.1.0",
"proj4": "^2.7.5",
"puppeteer": "^10.2.0",
"puppeteer": "^10.4.0",
"q": "^1.5.1",
"replace-in-file": "^6.2.0",
"three": "0.131.3",
"three": "0.133.1",
"url-polyfill": "^1.1.12",
"webpack": "^5.51.1",
"webpack-cli": "^4.8.0",
"webpack-dev-server": "^4.0.0",
"webpack": "^5.58.1",
"webpack-cli": "^4.9.0",
"webpack-dev-server": "^4.3.1",
"whatwg-fetch": "^3.6.2"
}
}
2 changes: 1 addition & 1 deletion src/Renderer/Shader/Chunk/fog_fragment.glsl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if defined(USE_FOG)
float fogFactor = 1. - min( exp(-fogDepth / fogDistance), 1.);
float fogFactor = 1. - min( exp(-vFogDepth / fogDistance), 1.);
gl_FragColor.rgb = mix(gl_FragColor.rgb, fogColor, fogFactor);
#endif
2 changes: 1 addition & 1 deletion src/Renderer/Shader/Chunk/fog_pars_fragment.glsl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#if defined(USE_FOG)
uniform vec3 fogColor;
uniform float fogDistance;
varying float fogDepth;
varying float vFogDepth;
#endif
28 changes: 0 additions & 28 deletions utils/debug/OBBHelper.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import * as THREE from 'three';

// TODO regler le probleme glsl
import fontJS from './fonts/optimer_regular.json';

const font = new THREE.Font(JSON.parse(fontJS));
const matText = new THREE.MeshBasicMaterial({ color: new THREE.Color(1, 0, 0) });

class OBBHelper extends THREE.Box3Helper {
constructor(OBB, text, color) {
color = color || new THREE.Color(Math.random(), Math.random(), Math.random());
Expand All @@ -19,34 +13,12 @@ class OBBHelper extends THREE.Box3Helper {
this.matrixAutoUpdate = false;
this.rotationAutoUpdate = false;

if (text) {
const geometryText = new THREE.TextGeometry(text, { font, curveSegments: 1 });

this.textMesh = new THREE.Mesh(geometryText, matText);
this.textMesh.rotateZ(Math.PI * 0.5);
this.textMesh.scale.set(0.001, 0.001, 0.001);
this.textMesh.position.set(0.9, 0.5, 1);
this.textMesh.frustumCulled = false;
this.add(this.textMesh);
}

this.updateMatrixWorld(true);
}

removeChildren() {
this.material.dispose();
this.geometry.dispose();
if (this.textMesh) {
if (Array.isArray(this.textMesh.material)) {
for (const material of this.textMesh.material) {
material.dispose();
}
} else {
this.textMesh.material.dispose();
}
this.textMesh.geometry.dispose();
delete this.textMesh;
}
}

updateMatrixWorld(force = false) {
Expand Down
1 change: 0 additions & 1 deletion utils/debug/fonts/LICENSE

This file was deleted.

1 change: 0 additions & 1 deletion utils/debug/fonts/optimer_regular.json

This file was deleted.