Rename 3d-tiles-generator to 3d-tiles-samples-generator

CesiumGS · Jun 27, 2017 · d0da516 · d0da516
1 parent 4100c49
commit d0da516
Show file tree

Hide file tree

Showing 76 changed files with 12 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 Upcoming tools for [3D Tiles](https://github.com/AnalyticalGraphicsInc/3d-tiles/blob/master/README.md) tilesets:
 * Manipulating tilesets, e.g., extracting glTF, gzipping, etc.  See [tools/README.md](https://github.com/AnalyticalGraphicsInc/3d-tiles-tools/blob/master/tools/README.md).
 * Validating that a tileset conforms to the specification.  See [validator/README.md](https://github.com/AnalyticalGraphicsInc/3d-tiles-tools/blob/master/validator/README.md).
-* Generating tilesets for testing.  See [generator/README.md](https://github.com/AnalyticalGraphicsInc/3d-tiles-tools/blob/master/generator/README.md).
+* Generate the sample tilesets in [3d-tiles-samples](https://github.com/AnalyticalGraphicsInc/3d-tiles-samples) and [Cesium](https://github.com/AnalyticalGraphicsInc/cesium).  See [samples-generator/README.md](https://github.com/AnalyticalGraphicsInc/3d-tiles-tools/blob/master/samples-generator/README.md).
 
 See the [roadmap](https://github.com/AnalyticalGraphicsInc/3d-tiles-tools/issues/1).
 

diff --git a/generator/.eslintrc.json → samples-generator/.eslintrc.json b/generator/.eslintrc.json → samples-generator/.eslintrc.json
diff --git a/generator/.gitignore → samples-generator/.gitignore b/generator/.gitignore → samples-generator/.gitignore
diff --git a/generator/.idea/3d-tiles-generator.iml → ...ator/.idea/3d-tiles-samples-generator.iml b/generator/.idea/3d-tiles-generator.iml → ...ator/.idea/3d-tiles-samples-generator.iml
diff --git a/generator/.idea/encodings.xml → samples-generator/.idea/encodings.xml b/generator/.idea/encodings.xml → samples-generator/.idea/encodings.xml
diff --git a/...ea/inspectionProfiles/Project_Default.xml → ...ea/inspectionProfiles/Project_Default.xml b/...ea/inspectionProfiles/Project_Default.xml → ...ea/inspectionProfiles/Project_Default.xml
diff --git a/.../inspectionProfiles/profiles_settings.xml → .../inspectionProfiles/profiles_settings.xml b/.../inspectionProfiles/profiles_settings.xml → .../inspectionProfiles/profiles_settings.xml
diff --git a/generator/.idea/jsLibraryMappings.xml → ...les-generator/.idea/jsLibraryMappings.xml b/generator/.idea/jsLibraryMappings.xml → ...les-generator/.idea/jsLibraryMappings.xml
diff --git a/generator/.idea/jsLinters/jshint.xml → samples-generator/.idea/jsLinters/jshint.xml b/generator/.idea/jsLinters/jshint.xml → samples-generator/.idea/jsLinters/jshint.xml
diff --git a/....idea/libraries/TypeScriptDefinitions.xml → ....idea/libraries/TypeScriptDefinitions.xml b/....idea/libraries/TypeScriptDefinitions.xml → ....idea/libraries/TypeScriptDefinitions.xml
diff --git a/generator/.idea/misc.xml → samples-generator/.idea/misc.xml b/generator/.idea/misc.xml → samples-generator/.idea/misc.xml
diff --git a/generator/.idea/modules.xml → samples-generator/.idea/modules.xml b/generator/.idea/modules.xml → samples-generator/.idea/modules.xml
diff --git a/generator/.idea/vcs.xml → samples-generator/.idea/vcs.xml b/generator/.idea/vcs.xml → samples-generator/.idea/vcs.xml
diff --git a/generator/.npmignore → samples-generator/.npmignore b/generator/.npmignore → samples-generator/.npmignore
diff --git a/generator/CHANGES.md → samples-generator/CHANGES.md b/generator/CHANGES.md → samples-generator/CHANGES.md
diff --git a/generator/LICENSE.md → samples-generator/LICENSE.md b/generator/LICENSE.md → samples-generator/LICENSE.md
@@ -205,7 +205,7 @@ Copyright 2016-2017 Analytical Graphics, Inc. and Contributors
 Third-Party Code
 ================
 
-3d-tiles-generator includes the following third-party code:
+3d-tiles-samples-generator includes the following third-party code:
 
 ### bluebird
 

diff --git a/generator/README.md → samples-generator/README.md b/generator/README.md → samples-generator/README.md
@@ -1,6 +1,6 @@
-# 3D Tiles Generator
+# 3D Tiles Samples Generator
 
-Tools for generating sample 3D Tiles tilesets. The tilesets generated here are included in [3d-tiles-samples](https://github.com/AnalyticalGraphicsInc/3d-tiles-samples) and [Cesium](https://github.com/AnalyticalGraphicsInc/cesium).
+The tilesets generated here are included in [3d-tiles-samples](https://github.com/AnalyticalGraphicsInc/3d-tiles-samples) and [Cesium](https://github.com/AnalyticalGraphicsInc/cesium).
 
 ## Instructions
 
@@ -9,19 +9,11 @@ Clone this repo and install [Node.js](http://nodejs.org/).  From the root direct
 ```
 npm install
 
-node bin/3d-tiles-generator.js
+node bin/3d-tiles-samples-generator.js
 ```
 
 This commands generates a set of tilesets and saves them in a folder called `output`. The `Batched`, `Composite`, `Instanced`, `PointCloud`, and `Tilesets` folders may be copied directly to Cesium's `Specs/Data/Cesium3DTiles/` folder for testing with Cesium. The tilesets in the `Samples` folder may be copied to the `tilesets` folder in `3d-tiles-samples`.
 
-For more fine-grained control, edit the following options directly in `3d-tiles-generator.js`. This includes:
-* Output directory
-* Optimize for Cesium (`default: true`)
-* Use Cesium RTC extension for b3dm tiles (`default: true`)
-* Pretty JSON (`default: true`)
-* Gzip tiles (`default: false`)
-* Longitude, Latitude, Tile Width
-
 Run the tests:
 ```
 npm run test

diff --git a/generator/bin/3d-tiles-generator.js → ...nerator/bin/3d-tiles-samples-generator.js b/generator/bin/3d-tiles-generator.js → ...nerator/bin/3d-tiles-samples-generator.js
diff --git a/generator/data/box-z-up.glb → samples-generator/data/box-z-up.glb b/generator/data/box-z-up.glb → samples-generator/data/box-z-up.glb
diff --git a/generator/data/box.glb → samples-generator/data/box.glb b/generator/data/box.glb → samples-generator/data/box.glb
diff --git a/generator/data/building.glb → samples-generator/data/building.glb b/generator/data/building.glb → samples-generator/data/building.glb
diff --git a/generator/data/dragon_high.glb → samples-generator/data/dragon_high.glb b/generator/data/dragon_high.glb → samples-generator/data/dragon_high.glb
diff --git a/generator/data/dragon_low.glb → samples-generator/data/dragon_low.glb b/generator/data/dragon_low.glb → samples-generator/data/dragon_low.glb
diff --git a/generator/data/dragon_medium.glb → samples-generator/data/dragon_medium.glb b/generator/data/dragon_medium.glb → samples-generator/data/dragon_medium.glb
diff --git a/generator/data/house/door0.gltf → samples-generator/data/house/door0.gltf b/generator/data/house/door0.gltf → samples-generator/data/house/door0.gltf
diff --git a/generator/data/house/door1.gltf → samples-generator/data/house/door1.gltf b/generator/data/house/door1.gltf → samples-generator/data/house/door1.gltf
diff --git a/generator/data/house/door2.gltf → samples-generator/data/house/door2.gltf b/generator/data/house/door2.gltf → samples-generator/data/house/door2.gltf
diff --git a/generator/data/house/door3.gltf → samples-generator/data/house/door3.gltf b/generator/data/house/door3.gltf → samples-generator/data/house/door3.gltf
diff --git a/generator/data/house/doorknob0.gltf → samples-generator/data/house/doorknob0.gltf b/generator/data/house/doorknob0.gltf → samples-generator/data/house/doorknob0.gltf
diff --git a/generator/data/house/doorknob1.gltf → samples-generator/data/house/doorknob1.gltf b/generator/data/house/doorknob1.gltf → samples-generator/data/house/doorknob1.gltf
diff --git a/generator/data/house/doorknob2.gltf → samples-generator/data/house/doorknob2.gltf b/generator/data/house/doorknob2.gltf → samples-generator/data/house/doorknob2.gltf
diff --git a/generator/data/house/doorknob3.gltf → samples-generator/data/house/doorknob3.gltf b/generator/data/house/doorknob3.gltf → samples-generator/data/house/doorknob3.gltf
diff --git a/generator/data/house/roof.gltf → samples-generator/data/house/roof.gltf b/generator/data/house/roof.gltf → samples-generator/data/house/roof.gltf
diff --git a/generator/data/house/wall.gltf → samples-generator/data/house/wall.gltf b/generator/data/house/wall.gltf → samples-generator/data/house/wall.gltf
diff --git a/generator/data/red_box.glb → samples-generator/data/red_box.glb b/generator/data/red_box.glb → samples-generator/data/red_box.glb
diff --git a/generator/data/textured_box.glb → samples-generator/data/textured_box.glb b/generator/data/textured_box.glb → samples-generator/data/textured_box.glb
diff --git a/...extured_box_separate/Cesium_Logo_Flat.png → ...extured_box_separate/Cesium_Logo_Flat.png b/...extured_box_separate/Cesium_Logo_Flat.png → ...extured_box_separate/Cesium_Logo_Flat.png
diff --git a/...extured_box_separate/fragmentShader0.glsl → ...extured_box_separate/fragmentShader0.glsl b/...extured_box_separate/fragmentShader0.glsl → ...extured_box_separate/fragmentShader0.glsl
diff --git a/...ta/textured_box_separate/textured_box.glb → ...ta/textured_box_separate/textured_box.glb b/...ta/textured_box_separate/textured_box.glb → ...ta/textured_box_separate/textured_box.glb
diff --git a/.../textured_box_separate/vertexShader0.glsl → .../textured_box_separate/vertexShader0.glsl b/.../textured_box_separate/vertexShader0.glsl → .../textured_box_separate/vertexShader0.glsl
diff --git a/generator/data/tree.glb → samples-generator/data/tree.glb b/generator/data/tree.glb → samples-generator/data/tree.glb
diff --git a/generator/data/tree_billboard.glb → samples-generator/data/tree_billboard.glb b/generator/data/tree_billboard.glb → samples-generator/data/tree_billboard.glb
diff --git a/generator/data/wood_red.png → samples-generator/data/wood_red.png b/generator/data/wood_red.png → samples-generator/data/wood_red.png
diff --git a/generator/gulpfile.js → samples-generator/gulpfile.js b/generator/gulpfile.js → samples-generator/gulpfile.js
diff --git a/generator/index.js → samples-generator/index.js b/generator/index.js → samples-generator/index.js
diff --git a/generator/lib/Material.js → samples-generator/lib/Material.js b/generator/lib/Material.js → samples-generator/lib/Material.js
diff --git a/generator/lib/Mesh.js → samples-generator/lib/Mesh.js b/generator/lib/Mesh.js → samples-generator/lib/Mesh.js
diff --git a/generator/lib/createB3dm.js → samples-generator/lib/createB3dm.js b/generator/lib/createB3dm.js → samples-generator/lib/createB3dm.js
diff --git a/generator/lib/createBatchTableHierarchy.js → ...enerator/lib/createBatchTableHierarchy.js b/generator/lib/createBatchTableHierarchy.js → ...enerator/lib/createBatchTableHierarchy.js
diff --git a/generator/lib/createBuildings.js → samples-generator/lib/createBuildings.js b/generator/lib/createBuildings.js → samples-generator/lib/createBuildings.js
diff --git a/generator/lib/createBuildingsTile.js → samples-generator/lib/createBuildingsTile.js b/generator/lib/createBuildingsTile.js → samples-generator/lib/createBuildingsTile.js
diff --git a/generator/lib/createCmpt.js → samples-generator/lib/createCmpt.js b/generator/lib/createCmpt.js → samples-generator/lib/createCmpt.js
diff --git a/generator/lib/createGltf.js → samples-generator/lib/createGltf.js b/generator/lib/createGltf.js → samples-generator/lib/createGltf.js
@@ -248,7 +248,7 @@ function createGltf(options) {
     var gltf = {
         accessors : accessors,
         asset : {
-            generator : '3d-tiles-generator',
+            generator : '3d-tiles-samples-generator',
             version : '1.0',
             profile : {
                 api : 'WebGL',

diff --git a/generator/lib/createI3dm.js → samples-generator/lib/createI3dm.js b/generator/lib/createI3dm.js → samples-generator/lib/createI3dm.js
diff --git a/generator/lib/createInstancesTile.js → samples-generator/lib/createInstancesTile.js b/generator/lib/createInstancesTile.js → samples-generator/lib/createInstancesTile.js
diff --git a/generator/lib/createPnts.js → samples-generator/lib/createPnts.js b/generator/lib/createPnts.js → samples-generator/lib/createPnts.js
diff --git a/generator/lib/createPointCloudTile.js → ...les-generator/lib/createPointCloudTile.js b/generator/lib/createPointCloudTile.js → ...les-generator/lib/createPointCloudTile.js
diff --git a/generator/lib/createTilesetJsonSingle.js → ...-generator/lib/createTilesetJsonSingle.js b/generator/lib/createTilesetJsonSingle.js → ...-generator/lib/createTilesetJsonSingle.js
diff --git a/generator/lib/getBufferPadded.js → samples-generator/lib/getBufferPadded.js b/generator/lib/getBufferPadded.js → samples-generator/lib/getBufferPadded.js
diff --git a/generator/lib/getJsonBufferPadded.js → samples-generator/lib/getJsonBufferPadded.js b/generator/lib/getJsonBufferPadded.js → samples-generator/lib/getJsonBufferPadded.js
diff --git a/generator/lib/getProperties.js → samples-generator/lib/getProperties.js b/generator/lib/getProperties.js → samples-generator/lib/getProperties.js
diff --git a/generator/lib/modifyGltfPaths.js → samples-generator/lib/modifyGltfPaths.js b/generator/lib/modifyGltfPaths.js → samples-generator/lib/modifyGltfPaths.js
diff --git a/generator/lib/optimizeGltf.js → samples-generator/lib/optimizeGltf.js b/generator/lib/optimizeGltf.js → samples-generator/lib/optimizeGltf.js
diff --git a/generator/lib/saveTile.js → samples-generator/lib/saveTile.js b/generator/lib/saveTile.js → samples-generator/lib/saveTile.js
diff --git a/generator/lib/saveTilesetJson.js → samples-generator/lib/saveTilesetJson.js b/generator/lib/saveTilesetJson.js → samples-generator/lib/saveTilesetJson.js
diff --git a/generator/lib/utility.js → samples-generator/lib/utility.js b/generator/lib/utility.js → samples-generator/lib/utility.js
diff --git a/generator/package.json → samples-generator/package.json b/generator/package.json → samples-generator/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "3d-tiles-generator",
+  "name": "3d-tiles-samples-generator",
   "version": "0.1.0",
   "license": "Apache-2.0",
   "description": "Tools for generating sample 3D Tiles tilesets.",
@@ -46,6 +46,6 @@
     "test-watch": "gulp test-watch"
   },
   "bin": {
-    "3d-tiles-generator": "./bin/3d-tiles-generator"
+    "3d-tiles-samples-generator": "./bin/3d-tiles-samples-generator"
   }
 }
diff --git a/generator/specs/.eslintrc.json → samples-generator/specs/.eslintrc.json b/generator/specs/.eslintrc.json → samples-generator/specs/.eslintrc.json
diff --git a/generator/specs/bin/generatorSpec.js → samples-generator/specs/bin/generatorSpec.js b/generator/specs/bin/generatorSpec.js → samples-generator/specs/bin/generatorSpec.js
@@ -2,9 +2,9 @@
 var child_process = require('child_process');
 var path = require('path');
 
-var scriptPath = path.join(__dirname, '../../bin/3d-tiles-generator.js');
+var scriptPath = path.join(__dirname, '../../bin/3d-tiles-samples-generator.js');
 
-describe('3d-tiles-generator', function () {
+describe('3d-tiles-samples-generator', function () {
     it('runs', function (done) {
         var command = 'node';
         var args = [scriptPath];
@@ -14,7 +14,7 @@ describe('3d-tiles-generator', function () {
         });
         child.once('exit', function (code) {
             if (code !== 0) {
-                fail('3d-tiles-generator.js exited with an error code of ' + code);
+                fail('3d-tiles-samples-generator.js exited with an error code of ' + code);
             } else {
                 done();
             }

diff --git a/generator/specs/jasmine.json → samples-generator/specs/jasmine.json b/generator/specs/jasmine.json → samples-generator/specs/jasmine.json
diff --git a/...ator/specs/matchers/addDefaultMatchers.js → ...ator/specs/matchers/addDefaultMatchers.js b/...ator/specs/matchers/addDefaultMatchers.js → ...ator/specs/matchers/addDefaultMatchers.js
diff --git a/generator/specs/matchers/customizeJasmine.js → ...erator/specs/matchers/customizeJasmine.js b/generator/specs/matchers/customizeJasmine.js → ...erator/specs/matchers/customizeJasmine.js
diff --git a/generator/specs/matchers/equals.js → samples-generator/specs/matchers/equals.js b/generator/specs/matchers/equals.js → samples-generator/specs/matchers/equals.js
diff --git a/...cs/matchers/equalsMethodEqualityTester.js → ...cs/matchers/equalsMethodEqualityTester.js b/...cs/matchers/equalsMethodEqualityTester.js → ...cs/matchers/equalsMethodEqualityTester.js
diff --git a/generator/specs/matchers/expectPromise.js → ...generator/specs/matchers/expectPromise.js b/generator/specs/matchers/expectPromise.js → ...generator/specs/matchers/expectPromise.js
diff --git a/generator/specs/matchers/nodeHelper.js → ...es-generator/specs/matchers/nodeHelper.js b/generator/specs/matchers/nodeHelper.js → ...es-generator/specs/matchers/nodeHelper.js