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.

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

B3dm external textures #4376

Merged
merged 5 commits into from
Oct 3, 2016
Merged

B3dm external textures #4376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3878d11
fixed external textures error
sumitshyamsukha Sep 28, 2016
fcd4f82
Merge branch '3d-tiles' into b3dm-external-textures
sumitshyamsukha Sep 29, 2016
373d314
removed false for query string
sumitshyamsukha Sep 30, 2016
a16e917
merged 3d-tiles
sumitshyamsukha Oct 3, 2016
10ac4d4
fixed merge conflicts
sumitshyamsukha Oct 3, 2016
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
4 changes: 3 additions & 1 deletion Source/Scene/Batched3DModel3DTileContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ define([
'../Core/deprecationWarning',
'../Core/destroyObject',
'../Core/DeveloperError',
'../Core/getBaseUri',
'../Core/getMagic',
'../Core/getStringFromTypedArray',
'../Core/loadArrayBuffer',
Expand All @@ -26,6 +27,7 @@ define([
deprecationWarning,
destroyObject,
DeveloperError,
getBaseUri,
getMagic,
getStringFromTypedArray,
loadArrayBuffer,
Expand Down Expand Up @@ -258,7 +260,7 @@ define([
gltf : gltfView,
cull : false, // The model is already culled by the 3D tiles
releaseGltfJson : true, // Models are unique and will not benefit from caching so save memory
basePath : this._url,
basePath : getBaseUri(this._url),
modelMatrix : this._tile.computedTransform,
shadows: this._tileset.shadows,
incrementallyLoadTextures : false,
Expand Down
4 changes: 3 additions & 1 deletion Source/Scene/Instanced3DModel3DTileContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ define([
'../Core/destroyObject',
'../Core/DeveloperError',
'../Core/Ellipsoid',
'../Core/getBaseUri',
'../Core/getMagic',
'../Core/getStringFromTypedArray',
'../Core/joinUrls',
Expand Down Expand Up @@ -43,6 +44,7 @@ define([
destroyObject,
DeveloperError,
Ellipsoid,
getBaseUri,
getMagic,
getStringFromTypedArray,
joinUrls,
Expand Down Expand Up @@ -315,7 +317,7 @@ define([
collectionOptions.url = joinUrls(baseUrl, gltfUrl);
} else {
collectionOptions.gltf = gltfView;
collectionOptions.basePath = this._url;
collectionOptions.basePath = getBaseUri(this._url);
}

var eastNorthUp = featureTable.getGlobalProperty('EAST_NORTH_UP');
Expand Down