Merge pull request #5613 from ggetz/inspector-to-tileset

Cesium3DTilesInspector attaches to first tileset on hover
CesiumGS · Jul 12, 2017 · c216514 · c216514
2 parents e019a33 + c2ead26
commit c216514
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/Apps/Sandcastle/gallery/3D Tiles Inspector.html b/Apps/Sandcastle/gallery/3D Tiles Inspector.html
@@ -34,7 +34,6 @@
 var tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
  url: 'https://beta.cesium.com/api/assets/1461?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkYWJmM2MzNS02OWM5LTQ3OWItYjEyYS0xZmNlODM5ZDNkMTYiLCJpZCI6NDQsImFzc2V0cyI6WzE0NjFdLCJpYXQiOjE0OTkyNjQ3NDN9.vuR75SqPDKcggvUrG_vpx0Av02jdiAxnnB1fNf-9f7s'
 }));
-inspectorViewModel.tileset = tileset;
 
 tileset.readyPromise.then(function() {
  var boundingSphere = tileset.boundingSphere;

diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,7 @@ Change Log
 ### 1.36 - 2017-08-01
 
 * Added ability to show tile urls in the 3D Tiles Inspector. [#5592](https:/AnalyticalGraphicsInc/cesium/pull/5592)
+* Added behavior to `Cesium3DTilesInspector` that selects the first tileset hovered over if no tilest is specified. [#5139](https:/AnalyticalGraphicsInc/cesium/issues/5139)
 
 ### 1.35.2 - 2017-07-11
 

diff --git a/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js b/Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspectorViewModel.js
@@ -38,6 +38,22 @@ define([
  };
  }
 
+ function selectTilesetOnHover (viewModel, value) {
+ if (value) {
+ viewModel._eventHandler.setInputAction(function(e) {
+ var pick = viewModel._scene.pick(e.endPosition);
+ if (defined(pick) && pick.primitive instanceof Cesium3DTileset) {
+ viewModel.tileset = pick.primitive;
+ }
+ }, ScreenSpaceEventType.MOUSE_MOVE);
+ } else {
+ viewModel._eventHandler.removeInputAction(ScreenSpaceEventType.MOUSE_MOVE);
+
+ // Restore hover-over selection to its current value
+ viewModel.picking = viewModel.picking;
+ }
+ }
+
  var stringOptions = {
  maximumFractionDigits : 3
  };
@@ -839,6 +855,10 @@ define([
  this._removePostRenderEvent = scene.postRender.addEventListener(function() {
  that._update();
  });
+
+ if (!defined(this._tileset)) {
+ selectTilesetOnHover(this, true);
+ }
  }
 
  defineProperties(Cesium3DTilesInspectorViewModel.prototype, {
@@ -972,6 +992,7 @@ define([
 
  this._statisticsText = getStatistics(tileset, false);
  this._pickStatisticsText = getStatistics(tileset, true);
+ selectTilesetOnHover(this, false);
  }
  },