Skip to content

update component to support three-loader-3dtiles v1.2.3 #49

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.

Sign up for GitHub

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

Open
Algorush wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

update component to support three-loader-3dtiles v1.2.3 #49

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
46 changes: 31 additions & 15 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Loader3DTiles, PointCloudColoring, GeoTransform } from 'three-loader-3dtiles';
import { Loader3DTiles, PointCloudColoring } from 'three-loader-3dtiles';
import './textarea';
import { Vector3 } from 'three';
import { Vector2, Vector3 } from 'three';

if (typeof AFRAME === 'undefined') {
throw new Error('Component attempted to register before AFRAME was available.');
Expand Down Expand Up @@ -33,35 +33,39 @@ AFRAME.registerComponent('loader-3dtiles', {
lat: { type: 'number' },
long: { type: 'number' },
height: { type: 'number' },
geoTransform: { type: 'string', default: 'Reset' }
copyrightEl: { type: 'selector' }
},
init: async function () {
this.camera = this.data.cameraEl?.object3D.children[0] ?? document.querySelector('a-scene').camera;
const sceneEl = this.el.sceneEl;
const data = this.data;

this.camera = data.cameraEl?.object3D.children[0] ?? document.querySelector('a-scene').camera;
if (!this.camera) {
throw new Error('3D Tiles: Please add an active camera or specify the target camera via the cameraEl property');
}

const { model, runtime } = await this._initTileset();

this.el.setObject3D('tileset', model);

this.originalCamera = this.camera;

this.el.sceneEl.addEventListener('camera-set-active', (e) => {
sceneEl.addEventListener('camera-set-active', (e) => {
// TODO: For some reason after closing the inspector this event is fired with an empty camera,
// so revert to the original camera used.
//
// TODO: Does not provide the right Inspector perspective camera
this.camera = e.detail.cameraEl.object3D.children[0] ?? this.originalCamera;
});

this.el.sceneEl.addEventListener('enter-vr', (e) => {
sceneEl.addEventListener('enter-vr', (e) => {
this.originalCamera = this.camera;
try {
this.camera = this.el.sceneEl.renderer.xr.getCamera(this.camera);
this.camera = sceneEl.renderer.xr.getCamera(this.camera);

// FOV Code from https://github.com/mrdoob/three.js/issues/21869
this.el.sceneEl.renderer.xr.getSession().requestAnimationFrame((time, frame) => {
const ref = this.el.sceneEl.renderer.xr.getReferenceSpace();
sceneEl.renderer.xr.getSession().requestAnimationFrame((time, frame) => {
const ref = sceneEl.renderer.xr.getReferenceSpace();
const pose = frame.getViewerPose(ref);
if (pose) {
const fovi = pose.views[0].projectionMatrix[5];
Expand All @@ -72,11 +76,11 @@ AFRAME.registerComponent('loader-3dtiles', {
console.warn('Could not get VR camera');
}
});
this.el.sceneEl.addEventListener('exit-vr', (e) => {
sceneEl.addEventListener('exit-vr', (e) => {
this.camera = this.originalCamera;
});

if (this.data.showStats) {
if (data.showStats) {
this.stats = this._initStats();
}
if (THREE.Cache.enabled) {
Expand All @@ -85,7 +89,17 @@ AFRAME.registerComponent('loader-3dtiles', {
}
await this._nextFrame();
this.runtime = runtime;
this.runtime.setElevationRange(this.data.pointcloudElevationRange.map(n => Number(n)));
this.runtime.setElevationRange(data.pointcloudElevationRange.map(n => Number(n)));

this.viewportSize = new Vector2(sceneEl.clientWidth, sceneEl.clientHeight);
window.addEventListener('resize', this.onWindowResize.bind(this));

},
onWindowResize: function () {
const sceneEl = this.el.sceneEl;
this.viewportSize.set(sceneEl.clientWidth, sceneEl.clientHeight);
this.camera.aspect = sceneEl.clientWidth / sceneEl.clientHeight;
this.camera.updateProjectionMatrix();
},
update: async function (oldData) {
if (oldData.url !== this.data.url) {
Expand Down Expand Up @@ -130,7 +144,7 @@ AFRAME.registerComponent('loader-3dtiles', {
},
tick: function (t, dt) {
if (this.runtime) {
this.runtime.update(dt, this.el.sceneEl.clientHeight, this.camera);
this.runtime.update(dt, this.viewportSize, this.camera);
if (this.stats) {
const worldPos = new Vector3();
this.camera.getWorldPosition(worldPos);
Expand All @@ -145,6 +159,9 @@ AFRAME.registerComponent('loader-3dtiles', {
newPos.z -= 2;
this.stats.setAttribute('position', newPos);
}
if (this.data.copyrightEl) {
this.data.copyrightEl.innerHTML = this.runtime.getDataAttributions() ?? '';
}
}
},
remove: function () {
Expand Down Expand Up @@ -177,8 +194,7 @@ AFRAME.registerComponent('loader-3dtiles', {
pointCloudColoring: pointCloudColoring,
viewDistanceScale: this.data.distanceScale,
wireframe: this.data.wireframe,
updateTransforms: true,
geoTransform: GeoTransform[this.data.geoTransform]
updateTransforms: true
}
});
},
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 @@ -78,7 +78,7 @@
"snazzy": "^5.0.0",
"superagent": "^3.8.2",
"three": "^0.160.1",
"three-loader-3dtiles": "^1.2.1",
"three-loader-3dtiles": "^1.2.3",
"webpack": "^5.64.1",
"webpack-cli": "^4.7.0",
"webpack-dev-server": "^4.5.0"
Expand Down