Updates to samples generator to reflect 3D Tiles 1.0 changes #149

ggetz · 2018-07-05T15:09:43Z

Updates for 3D Tiles 1.0 - CesiumGS/cesium#6697

TODO:

Set version to 1.0
Cleanup so tilesets do not use deprecated functionality by default

lilleyse

lilleyse · 2018-07-08T15:05:28Z

samples-generator/bin/3d-tiles-samples-generator.js

@@ -252,7 +258,8 @@ var promises = [
    createCompositeOfComposite(),
    createCompositeOfInstanced(),
    // Hierarchy
-    createHierarchy(),
+    createHierarchyExtension(),
+    createLegacyHierarchy(),
    createHierarchyMultipleParents(),
    createHierarchyNoParents(),
    createHierarchyBinary(),


Just nitpicking on names. I think it's fine to drop Extension since the other hierarchy samples don't have that. And for symmetry, change createLegacyHierarchy to createHierarchyLegacy.

createHierarchyExtension createLegacyHierarchy createHierarchyMultipleParents createHierarchyNoParents createHierarchyBinary

to

createHierarchy createHierarchyLegacy createHierarchyMultipleParents createHierarchyNoParents createHierarchyBinary

lilleyse · 2018-07-08T15:09:14Z

samples-generator/bin/3d-tiles-samples-generator.js

-    });
+return fsExtra.emptyDir(outputDirectory).then(function () {
+    return Promise.all(promises);
+});


Tweak the promise style slightly:

return fsExtra.emptyDir(outputDirectory).then(function () { return Promise.all(promises); });

return fsExtra.emptyDir(outputDirectory) .then(function() { return Promise.all(promises); });

Also thanks for removing the testing code I forgot about in this branch.

lilleyse · 2018-07-08T15:11:07Z

samples-generator/bin/3d-tiles-samples-generator.js

@@ -489,6 +506,12 @@ function createBatchedWithVertexColors() {
    return saveBatchedTileset('BatchedWithVertexColors', tileOptions);
 }

+function createBatchedWithDataURI() {
+    return saveBatchedTileset('BatchedWithContentUri', undefined, {


Should the tileset name be BatchedWithContentDataUri? Just so it's clear it's a data uri.

lilleyse · 2018-07-08T15:14:49Z

samples-generator/bin/3d-tiles-samples-generator.js

+                        // TODO delete b3dm file
+                        tilesetOptions.tileName = content;
+                        return saveTilesetJson(tilesetPath, createTilesetJsonSingle(tilesetOptions), prettyJson);
+                    });


This section is a little awkward. Why not just create a data uri (synchronously) from b3dm rather than saving the file first?

Also consider renaming tilesetOptions.tileName to tilesetOptions.contentUri throughout, and update documentation in createTilesetJsonSingle.

lilleyse · 2018-07-08T15:23:06Z

samples-generator/bin/3d-tiles-samples-generator.js

@@ -1478,7 +1522,7 @@ function createTilesetRefinementMix() {
            geometricError : smallGeometricError,
            refine : 'ADD',
            content : {
-                url : 'parent.b3dm',
+                uri : 'parent.b3dm',


There are a few other samples that need to be updated like these: createTileset, createTilesetEmptyRoot, createTilesetOfTilesets, createTilesetWithExternalResources,

lilleyse · 2018-07-08T15:31:17Z

samples-generator/lib/Extensions.js

+    }
+
+    extensions[extensionName] = extension;
+};


Add newline.

lilleyse · 2018-07-08T15:32:50Z

samples-generator/lib/createBatchTableHierarchy.js

 *
 * @param {Object} options An object with the following properties:
 * @param {String} options.directory Directory in which to save the tileset.
 * @param {Boolean} [options.batchTableBinary=false] Create a batch table binary for the b3dm tile.
 * @param {Boolean} [options.noParents=false] Don't set any instance parents.
 * @param {Boolean} [options.multipleParents=false] Set multiple parents to some instances.
+ * @param {Boolean} [options.legacy=false] Generate the batch table hierarchy as part of the base tileset JSON file, now deprecated.


Tweak the description a bit: Generate the batch table hierarchy as part of the base batch table, now deprecated.

lilleyse · 2018-07-08T15:33:58Z

samples-generator/lib/Extensions.js

+ * @param {String} extensionName The name of the extension to add.
+ * @param {*} extension The contents of the extension.
+ */
+Extensions.addExtension = function(objectJson, extensionName, extension) {


Rename objectJson to tilesetJson.

lilleyse · 2018-07-08T15:37:46Z

samples-generator/lib/createBatchTableHierarchy.js

+ * @param {Object} options An option object with the following properties:
+ * @param {Boolean} [options.legacy=false] Generate the batch table hierarchy as part of the base tileset JSON file, now deprecated.
+ */
+function createBatchTableJson(instances, options) {


Since the function is internal the documentation isn't needed.

lilleyse · 2018-07-08T15:41:02Z

samples-generator/lib/createBatchTableHierarchy.js

 *
 * @param {Object} options An object with the following properties:
 * @param {String} options.directory Directory in which to save the tileset.
 * @param {Boolean} [options.batchTableBinary=false] Create a batch table binary for the b3dm tile.
 * @param {Boolean} [options.noParents=false] Don't set any instance parents.
 * @param {Boolean} [options.multipleParents=false] Set multiple parents to some instances.
+ * @param {Boolean} [options.legacy=false] Generate the batch table hierarchy as part of the base tileset JSON file, now deprecated.
 * @param {Matrix4] [options.transform=Matrix4.IDENTITY] The tile transform.


Wasn't part of this PR, but I pushed a small commit to fix this doc.

ggetz · 2018-07-09T14:40:23Z

Thanks @lilleyse, cleaned up!

lilleyse · 2018-07-09T15:17:58Z

samples-generator/bin/3d-tiles-samples-generator.js

@@ -506,7 +507,7 @@ function createBatchedWithVertexColors() {
    return saveBatchedTileset('BatchedWithVertexColors', tileOptions);
 }

-function createBatchedWithDataURI() {
+function createBatchedWithContentDataUri() {
    return saveBatchedTileset('BatchedWithContentUri', undefined, {


Make sure to fix the name of the tileset itself to BatchedWithContentDataUri as well.

lilleyse · 2018-07-09T15:31:10Z

samples-generator/bin/3d-tiles-samples-generator.js

@@ -872,7 +896,7 @@ function saveInstancedTileset(tilesetName, tileOptions, tilesetOptions) {
    tileOptions.eastNorthUp = defaultValue(tileOptions.eastNorthUp, true);

    tilesetOptions = defaultValue(tilesetOptions, {});
-    tilesetOptions.tileName = tileName;
+    tilesetOptions.contentUri = contentUri;


Also change tileName to contentUri in createBatchTableHierarchy.js

var tilesetJson = createTilesetJsonSingle({ tileName : tileName, geometricError : geometricError, box : box, transform : transform });

lilleyse · 2018-07-09T15:32:21Z

samples-generator/bin/3d-tiles-samples-generator.js

@@ -959,10 +991,20 @@ function savePointCloudTileset(tilesetName, tileOptions, tilesetOptions) {

 function createHierarchy() {
    return createBatchTableHierarchy({
-        directory : path.join(outputDirectory, 'Hierarchy', 'BatchTableHierarchy'),
+        directory: path.join(outputDirectory, 'Hierarchy', 'BatchTableHierarchyExtension'),


Change the tileset name to BatchTableHierarchy

ggetz · 2018-07-09T19:54:22Z

@lilleyse Updated!

lilleyse · 2018-07-09T20:02:20Z

Thanks!

Add RTC_CENTER tileset and tilesets with URI content

9127051

ggetz requested a review from lilleyse July 5, 2018 15:09

ggetz mentioned this pull request Jul 5, 2018

Tileset content.url to content.uri CesiumGS/cesium#6744

Merged

2 tasks

ggetz changed the title ~~Add RTC_CENTER tileset and tilesets with URI content~~ Updates to samples generator to reflect 3D Tiles 1.0 changes Jul 5, 2018

ggetz and others added 3 commits July 6, 2018 13:56

Default to batchTable extension

d71c110

Rest of urls -> uri

421afe5

Doc fix

d719e84

lilleyse reviewed Jul 8, 2018

View reviewed changes

lilleyse reviewed Jul 9, 2018

View reviewed changes

Cleanup 1.0 version changes

99b8705

ggetz force-pushed the 3d-tiles-1.0-updates branch from 086b508 to 99b8705 Compare July 9, 2018 19:53

lilleyse merged commit 7cd3634 into 2.0-samples-generator Jul 9, 2018

lilleyse deleted the 3d-tiles-1.0-updates branch July 9, 2018 20:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updates to samples generator to reflect 3D Tiles 1.0 changes #149

Updates to samples generator to reflect 3D Tiles 1.0 changes #149

ggetz commented Jul 5, 2018 •

edited

Loading

lilleyse left a comment

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

lilleyse Jul 8, 2018

ggetz commented Jul 9, 2018

lilleyse Jul 9, 2018

lilleyse Jul 9, 2018

lilleyse Jul 9, 2018 •

edited

Loading

ggetz commented Jul 9, 2018

lilleyse commented Jul 9, 2018

Updates to samples generator to reflect 3D Tiles 1.0 changes #149

Updates to samples generator to reflect 3D Tiles 1.0 changes #149

Conversation

ggetz commented Jul 5, 2018 • edited Loading

lilleyse left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ggetz commented Jul 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lilleyse Jul 9, 2018 • edited Loading

Choose a reason for hiding this comment

ggetz commented Jul 9, 2018

lilleyse commented Jul 9, 2018

ggetz commented Jul 5, 2018 •

edited

Loading

lilleyse Jul 9, 2018 •

edited

Loading