Skip to content

Commit

Permalink
feat(core): unify tilelayer in globeViewer, planarViewer and panorama…
Browse files Browse the repository at this point in the history 
…Viewer
  • Loading branch information
@gchoqueux
gchoqueux committed Aug 27, 2018
1 parent 01b7ff4 commit 1e08030
Show file tree
Hide file tree
Showing 18 changed files with 170 additions and 280 deletions.
2 changes: 1 addition & 1 deletion examples/3dtiles.html
View file
Expand Up @@ -55,7 +55,7 @@

// Add the UI Debug
var d = new debug.Debug(view, menuGlobe.gui);
debug.createTileDebugUI(menuGlobe.gui, view, view.wgs84TileLayer, d);
debug.createTileDebugUI(menuGlobe.gui, view, view.tileLayer, d);
debug.create3dTilesDebugUI(menuGlobe.gui, view, $3dTilesLayerDiscreteLOD, d);
debug.create3dTilesDebugUI(menuGlobe.gui, view, $3dTilesLayerRequestVolume, d);
d.zoom = function() {
Expand Down
2 changes: 1 addition & 1 deletion examples/globe_vector_tiles.html
View file
Expand Up @@ -31,7 +31,7 @@
var view = new itowns.GlobeView(viewerDiv, positionOnGlobe, { maxSubdivisionLevel: 13 });

// define pole texture
view.wgs84TileLayer.noTextureColor = new itowns.THREE.Color(0x95c1e1);
view.tileLayer.noTextureColor = new itowns.THREE.Color(0x95c1e1);

view.atmosphere.visible = false;

Expand Down
2 changes: 1 addition & 1 deletion examples/globe_wfs_color.html
View file
Expand Up @@ -90,7 +90,7 @@
console.info('Globe initialized');
itowns.ColorLayersOrdering.moveLayerToIndex(globeView, 'Ortho', 0);
});
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.wgs84TileLayer, d);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.tileLayer, d);
</script>
</body>
</html>
6 changes: 3 additions & 3 deletions examples/globe_wfs_extruded.html
View file
Expand Up @@ -60,7 +60,7 @@
var i = 0;
var result;
var tile;
var layer = globeView.wgs84TileLayer;
var layer = globeView.tileLayer;
if (contour.length && contour.length > 0) {
for (; i < contour.length; i++) {
result = itowns.DEMUtils.getElevationValueAt(layer, contour[i], 0, tile);
Expand Down Expand Up @@ -210,7 +210,7 @@
var result;
var z = 0;
if (contour.length && contour.length > 0) {
result = itowns.DEMUtils.getElevationValueAt(globeView.wgs84TileLayer, contour[0]);
result = itowns.DEMUtils.getElevationValueAt(globeView.tileLayer, contour[0]);
if (result) {
z = result.z;
}
Expand Down Expand Up @@ -255,7 +255,7 @@
globeView.controls.setTilt(45, true);
});
var d = new debug.Debug(globeView, menuGlobe.gui);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.wgs84TileLayer, d);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.tileLayer, d);

function picking(event) {
var htmlInfo = document.getElementById('info');
Expand Down
32 changes: 16 additions & 16 deletions examples/orientation_utils.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="js/ThreeLoader.js"></script>
<script src="../dist/debug.js"></script>
<script type="text/javascript">

// Define initial camera position
// Coordinate can be found on https://www.geoportail.gouv.fr/carte
// setting is "coordonnée geographiques en degres decimaux"
Expand Down Expand Up @@ -46,7 +46,7 @@
// Add elevation layer.
var promises = [];
promises.push(itowns.Fetcher.json('./layers/JSONLayers/IGN_MNT_HIGHRES.json').then(addLayerCb));

// Input data : a geoJson file, with point features, with orientation specific properties
var panoramics = 'https://raw.githubusercontent.com/iTowns/iTowns2-sample-data/master/immersive/exampleParis1/panoramicsMetaDataParis.geojson';
var layer = {
Expand All @@ -63,7 +63,7 @@
// then get geographic informations (coordinates) using GeoJson parser
.then(function parseGeoJSON(orientations) { return itowns.GeoJsonParser.parse(orientations, layer);})
);

// load collada model of a renault trafic
promises.push(ThreeLoader.load('Collada',
'https://raw.githubusercontent.com/iTowns/iTowns2-sample-data/master/models/collada/renault_trafic_no_texture.dae')
Expand All @@ -75,48 +75,48 @@
// put the model in a group, to allow user to do other transformation (rotation..)
var group = new itowns.THREE.Group();
group.add(colladaModel);
return group;
return group;
}));

var onGround = false;

// wait for all layer to be loaded, we need for elevation layer
globeView.addEventListener(itowns.GLOBE_VIEW_EVENTS.GLOBE_INITIALIZED, function init() {

// wait for all the promises
Promise.all(promises).then(function loadFeaturesModel(res) { loadFeatures(res[1], res[2]);});

globeView.controls.setTilt(20, true);
})


// place a 3d model oriented for each feature
function loadFeatures(points, colladaModel) {

for (const feature of points.features) {

// clone the collada model
var model = colladaModel.clone();

// get coordinate from point feature
var coord = feature.vertices[0];

// set model position
model.position.copy(coord.xyz());

// set model orientation (using target parameter)
itowns.OrientationUtils.quaternionFromAttitude(feature.properties, coord, true, model.quaternion);

// store base position
// store base position
model.positionBase = model.position.clone();

// compute position on the ground
var coord = feature.vertices[0];
result = itowns.DEMUtils.getElevationValueAt(globeView.wgs84TileLayer, coord, 1, undefined);
var coord = feature.vertices[0];
result = itowns.DEMUtils.getElevationValueAt(globeView.tileLayer, coord, 1, undefined);
coord = coord.as('EPSG:4326');
coord.setAltitude(result.z);
model.positionOnGround = coord.as(globeView.referenceCrs).xyz();

// update matrix world and add the model
model.updateMatrixWorld();
globeView.scene.add(model);
Expand All @@ -132,7 +132,7 @@

// add debug GUI
var d = new debug.Debug(globeView, menuGlobe.gui);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.wgs84TileLayer, d);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.tileLayer, d);

// Add a checkbox to put the cars on the ground.
folder = menuGlobe.gui.addFolder('Cars Layer');
Expand Down
2 changes: 1 addition & 1 deletion examples/oriented_images.html
View file
Expand Up @@ -150,7 +150,7 @@
setupPictureUI(menuGlobe, pictureInfos, plane, updatePlaneDistance, globeView, 3000, 15000);

var d = new debug.Debug(globeView, menuGlobe.gui);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.wgs84TileLayer, d);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.tileLayer, d);

</script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions examples/panorama.html
View file
Expand Up @@ -71,8 +71,8 @@
// Setup debug menu
var gui = new dat.GUI();
var ddd = new debug.Debug(view, gui);
debug.createTileDebugUI(gui, view, view.baseLayer, ddd);
gui.add(view.baseLayer.options, 'quality').min(0.1).max(1.0).onChange(
debug.createTileDebugUI(gui, view, view.tileLayer, ddd);
gui.add(view.tileLayer.options, 'quality').min(0.1).max(1.0).onChange(
function () { view.notifyChange(); });

// Add controls
Expand Down
2 changes: 1 addition & 1 deletion examples/stereo.html
View file
Expand Up @@ -164,7 +164,7 @@
var divScaleWidget = document.querySelectorAll('.divScaleWidget')[0];

var d = new debug.Debug(globeView, menuGlobe.gui);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.wgs84TileLayer, d);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.tileLayer, d);

function updateScaleWidget() {
var value = globeView.controls.pixelsToMeters(200);
Expand Down
2 changes: 1 addition & 1 deletion examples/syncCameras.html
View file
Expand Up @@ -149,7 +149,7 @@
},
});
var d = new debug.Debug(globeView, menuGlobe.gui);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.wgs84TileLayer, d);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.tileLayer, d);
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion index.html
View file
Expand Up @@ -69,7 +69,7 @@
});

const d = new debug.Debug(globeView, menuGlobe.gui);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.wgs84TileLayer, d);
debug.createTileDebugUI(menuGlobe.gui, globeView, globeView.tileLayer, d);
window.globeView = globeView;
</script>
</body>
Expand Down

0 comments on commit 1e08030

Please sign in to comment.