Skip to content

Commit

Permalink
Merge pull request CesiumGS#83 from AnalyticalGraphicsInc/version-upg…
Browse files Browse the repository at this point in the history
…rade

Upgrade version to 1.0
  • Loading branch information
likangning93 authored Mar 29, 2018
2 parents afb9dec + 73bb641 commit f96bcbb
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 35 deletions.
44 changes: 22 additions & 22 deletions samples-generator/bin/3d-tiles-samples-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ function createTileset() {

var tilesetJson = {
asset : {
version : '0.0',
version : '1.0',
tilesetVersion : '1.2.3'
},
properties : undefined,
Expand Down Expand Up @@ -1117,7 +1117,7 @@ function createTilesetEmptyRoot() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : smallGeometricError,
Expand Down Expand Up @@ -1184,7 +1184,7 @@ function createTilesetOfTilesets() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : largeGeometricError,
Expand All @@ -1202,7 +1202,7 @@ function createTilesetOfTilesets() {

var tileset2Json = {
asset : {
version : '0.0'
version : '1.0'
},
geometricError : smallGeometricError,
root : {
Expand Down Expand Up @@ -1257,7 +1257,7 @@ function createTilesetOfTilesets() {

var tileset3Json = {
asset : {
version : '0.0'
version : '1.0'
},
geometricError : 0.0,
root : {
Expand Down Expand Up @@ -1312,7 +1312,7 @@ function createTilesetWithExternalResources() {

var tilesetJson = {
asset : {
version : '0.0',
version : '1.0',
tilesetVersion : '1.2.3'
},
geometricError : smallGeometricError,
Expand Down Expand Up @@ -1372,7 +1372,7 @@ function createTilesetWithExternalResources() {

var tileset2Json = {
asset : {
version : '0.0'
version : '1.0'
},
geometricError : smallGeometricError,
root : {
Expand Down Expand Up @@ -1486,7 +1486,7 @@ function createTilesetRefinementMix() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : largeGeometricError,
Expand Down Expand Up @@ -1589,7 +1589,7 @@ function createTilesetReplacement1() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : largeGeometricError,
Expand Down Expand Up @@ -1681,7 +1681,7 @@ function createTilesetReplacement2() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : largeGeometricError,
Expand Down Expand Up @@ -1755,7 +1755,7 @@ function createTilesetReplacement3() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : largeGeometricError,
Expand Down Expand Up @@ -1788,7 +1788,7 @@ function createTilesetReplacement3() {

var tileset2Json = {
asset : {
version : '0.0'
version : '1.0'
},
geometricError : smallGeometricError,
root : {
Expand Down Expand Up @@ -1879,7 +1879,7 @@ function createTilesetWithTransforms() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : smallGeometricError,
Expand Down Expand Up @@ -1951,7 +1951,7 @@ function createTilesetWithViewerRequestVolume() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
geometricError : largeGeometricError,
root : {
Expand Down Expand Up @@ -2034,7 +2034,7 @@ function createTilesetReplacementWithViewerRequestVolume() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : largeGeometricError,
Expand Down Expand Up @@ -2125,7 +2125,7 @@ function createTilesetSubtreeExpiration() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : largeGeometricError,
Expand Down Expand Up @@ -2160,7 +2160,7 @@ function createTilesetSubtreeExpiration() {

var subtreeJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : smallGeometricError,
Expand Down Expand Up @@ -2344,7 +2344,7 @@ function createDiscreteLOD() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
geometricError : dragonLowGeometricError,
root : {
Expand Down Expand Up @@ -2435,7 +2435,7 @@ function createTreeBillboards() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
geometricError : treeBillboardGeometricError,
root : {
Expand Down Expand Up @@ -2530,7 +2530,7 @@ function createRequestVolume() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
geometricError : buildingGeometricError,
root : {
Expand Down Expand Up @@ -2578,7 +2578,7 @@ function createRequestVolume() {

var cityTilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
properties : undefined,
geometricError : smallGeometricError,
Expand Down Expand Up @@ -2698,7 +2698,7 @@ function createExpireTileset() {

var tilesetJson = {
asset : {
version : '0.0'
version : '1.0'
},
geometricError : pointCloudGeometricError,
root : {
Expand Down
2 changes: 1 addition & 1 deletion samples-generator/lib/createTilesetJsonSingle.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function createTilesetJsonSingle(options) {

var tilesetJson = {
asset : {
version : '0.0',
version : '1.0',
gltfUpAxis : options.gltfUpAxis // If undefined, implicitly 'Y'
},
properties : options.properties,
Expand Down
4 changes: 2 additions & 2 deletions tools/specs/data/BatchedDeprecated1/tileset.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"asset": {
"version": "0.0"
"version": "1.0"
},
"properties": {
"id": {
Expand All @@ -22,7 +22,7 @@
},
"geometricError": 70,
"root": {
"refine": "add",
"refine": "ADD",
"boundingVolume": {
"region": [
-1.3197004795898053,
Expand Down
4 changes: 2 additions & 2 deletions tools/specs/data/BatchedDeprecated2/tileset.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"asset": {
"version": "0.0"
"version": "1.0"
},
"properties": {
"id": {
Expand All @@ -22,7 +22,7 @@
},
"geometricError": 70,
"root": {
"refine": "add",
"refine": "ADD",
"boundingVolume": {
"region": [
-1.3197004795898053,
Expand Down
4 changes: 2 additions & 2 deletions tools/specs/data/TilesetOfTilesets/tileset.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"asset": {
"version": "0.0"
"version": "1.0"
},
"properties": {
"id": {
Expand Down Expand Up @@ -33,7 +33,7 @@
]
},
"geometricError": 70,
"refine": "add",
"refine": "ADD",
"content": {
"url": "tileset2.json"
}
Expand Down
4 changes: 2 additions & 2 deletions tools/specs/data/TilesetOfTilesets/tileset2.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"asset": {
"version": "0.0"
"version": "1.0"
},
"geometricError": 70,
"root": {
Expand All @@ -15,7 +15,7 @@
]
},
"geometricError": 70,
"refine": "add",
"refine": "ADD",
"content": {
"url": "parent.b3dm"
},
Expand Down
4 changes: 2 additions & 2 deletions tools/specs/data/TilesetOfTilesets/tileset3/tileset3.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"asset": {
"version": "0.0"
"version": "1.0"
},
"geometricError": 0,
"root": {
Expand All @@ -15,7 +15,7 @@
]
},
"geometricError": 0,
"refine": "add",
"refine": "ADD",
"content": {
"url": "ll.b3dm"
}
Expand Down
4 changes: 2 additions & 2 deletions validator/specs/data/Tileset/tileset.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"asset": {
"version": "0.0",
"version": "1.0",
"tilesetVersion": "1.2.3"
},
"properties": {
Expand Down Expand Up @@ -34,7 +34,7 @@
]
},
"geometricError": 70,
"refine": "add",
"refine": "ADD",
"content": {
"url": "parent.b3dm",
"boundingVolume": {
Expand Down

0 comments on commit f96bcbb

Please sign in to comment.