Skip to content

Commit

Permalink
asset extras
Browse files Browse the repository at this point in the history
  • Loading branch information
hpinkos committed Jan 3, 2019
1 parent 0f8b7e2 commit d80e7ef
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Source/Scene/Cesium3DTileset.js
Original file line number Diff line number Diff line change
Expand Up @@ -783,14 +783,15 @@ define([
.then(function(tilesetJson) {
that._root = that.loadTileset(resource, tilesetJson);
var gltfUpAxis = defined(tilesetJson.asset.gltfUpAxis) ? Axis.fromName(tilesetJson.asset.gltfUpAxis) : Axis.Y;
that._asset = tilesetJson.asset;
var asset = tilesetJson.asset;
that._asset = asset;
that._properties = tilesetJson.properties;
that._geometricError = tilesetJson.geometricError;
that._extensionsUsed = tilesetJson.extensionsUsed;
that._gltfUpAxis = gltfUpAxis;
that._extras = tilesetJson.extras;

var extras = tilesetJson.extras;

var extras = asset.extras;
if (defined(extras) && defined(extras.cesium) && defined(extras.cesium.credits)) {
var extraCredits = extras.cesium.credits;
var credits = that._credits;
Expand All @@ -804,8 +805,6 @@ define([
}
}

that._extras = extras;

// Save the original, untransformed bounding volume position so we can apply
// the tile transform and model matrix at run time
var boundingVolume = that._root.createBoundingVolume(tilesetJson.root.boundingVolume, Matrix4.IDENTITY);
Expand Down

0 comments on commit d80e7ef

Please sign in to comment.