Skip to content

Commit

Permalink
Renamed folder from Points to PointCloud
Browse files Browse the repository at this point in the history
  • Loading branch information
lilleyse committed Aug 29, 2016
1 parent 6b6bf06 commit 8ff41ef
Show file tree
Hide file tree
Showing 31 changed files with 165 additions and 126 deletions.
8 changes: 4 additions & 4 deletions Apps/Sandcastle/gallery/3D Tiles.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
}, {
name : 'Composite', url : '../../../Specs/Data/Cesium3DTiles/Composite/Composite/'
}, {
name : 'Points', url : '../../../Specs/Data/Cesium3DTiles/Points/PointsRGB/'
name : 'PointCloud', url : '../../../Specs/Data/Cesium3DTiles/PointCloud/PointCloudRGB/'
}, {
name : 'PointsConstantColor', url : '../../../Specs/Data/Cesium3DTiles/Points/PointsConstantColor/'
name : 'PointCloudConstantColor', url : '../../../Specs/Data/Cesium3DTiles/PointCloud/PointCloudConstantColor/'
}, {
name : 'PointsNormals', url : '../../../Specs/Data/Cesium3DTiles/Points/PointsQuantizedOctEncoded/'
name : 'PointCloudNormals', url : '../../../Specs/Data/Cesium3DTiles/PointCloud/PointCloudQuantizedOctEncoded/'
}, {
name : 'PointsBatched', url : '../../../Specs/Data/Cesium3DTiles/Points/PointsBatched/'
name : 'PointCloudBatched', url : '../../../Specs/Data/Cesium3DTiles/PointCloud/PointCloudBatched/'
}];

var tileset;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"geometricError": 0,
"content": {
"url": "pointsNoColor.pnts"
"url": "pointCloudBatched.pnts"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"asset": {
"version": "0.0"
},
"geometricError": 17.32,
"root": {
"refine": "add",
"boundingVolume": {
"sphere": [
1215012.8828876738,
-4736313.051199594,
4081605.22126042,
5
]
},
"geometricError": 0,
"content": {
"url": "pointCloudConstantColor.pnts"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"geometricError": 0,
"content": {
"url": "pointsNormals.pnts"
"url": "pointCloudNoColor.pnts"
}
}
}
21 changes: 21 additions & 0 deletions Specs/Data/Cesium3DTiles/PointCloud/PointCloudNormals/tileset.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"asset": {
"version": "0.0"
},
"geometricError": 17.32,
"root": {
"refine": "add",
"boundingVolume": {
"sphere": [
1215012.8828876738,
-4736313.051199594,
4081605.22126042,
5
]
},
"geometricError": 0,
"content": {
"url": "pointCloudNormals.pnts"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"asset": {
"version": "0.0"
},
"geometricError": 17.32,
"root": {
"refine": "add",
"boundingVolume": {
"sphere": [
1215012.8828876738,
-4736313.051199594,
4081605.22126042,
5
]
},
"geometricError": 0,
"content": {
"url": "pointCloudNormalsOctEncoded.pnts"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"geometricError": 0,
"content": {
"url": "pointsConstantColor.pnts"
"url": "pointCloudQuantized.pnts"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"asset": {
"version": "0.0"
},
"geometricError": 17.32,
"root": {
"refine": "add",
"boundingVolume": {
"sphere": [
1215012.8828876738,
-4736313.051199594,
4081605.22126042,
5
]
},
"geometricError": 0,
"content": {
"url": "pointCloudQuantizedOctEncoded.pnts"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"geometricError": 0,
"content": {
"url": "pointsBatched.pnts"
"url": "pointCloudRGB.pnts"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"geometricError": 0,
"content": {
"url": "pointsRGB.pnts"
"url": "pointCloudRGBA.pnts"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"geometricError": 0,
"content": {
"url": "pointsQuantized.pnts"
"url": "pointCloudWGS84.pnts"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"asset": {
"version": "0.0"
},
"geometricError": 17.32,
"root": {
"refine": "add",
"boundingVolume": {
"sphere": [
1215012.8828876738,
-4736313.051199594,
4081605.22126042,
5
]
},
"geometricError": 0,
"content": {
"url": "pointCloudWithPerPointProperties.pnts"
}
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"asset": {
"version": "0.0"
},
"geometricError": 17.32,
"root": {
"transform": [
0.968635634376879,
0.24848542777253735,
0,
0,
-0.15986460794399626,
0.6231776137472074,
0.7655670897127491,
0,
0.190232265775849,
-0.7415555636019701,
0.6433560687121489,
0,
1215012.8828876738,
-4736313.051199594,
4081605.22126042,
1
],
"refine": "add",
"boundingVolume": {
"sphere": [
0,
0,
0,
5
]
},
"geometricError": 0,
"content": {
"url": "pointCloudWithTransform.pnts"
}
}
}

This file was deleted.

This file was deleted.

21 changes: 0 additions & 21 deletions Specs/Data/Cesium3DTiles/Points/PointsRGBA/tileset.json

This file was deleted.

21 changes: 0 additions & 21 deletions Specs/Data/Cesium3DTiles/Points/PointsWGS84/tileset.json

This file was deleted.

This file was deleted.

22 changes: 11 additions & 11 deletions Specs/Scene/PointCloud3DTileContentSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ defineSuite([
var centerLongitude = -1.31968;
var centerLatitude = 0.698874;

var pointsRGBUrl = './Data/Cesium3DTiles/Points/PointsRGB';
var pointsRGBAUrl = './Data/Cesium3DTiles/Points/PointsRGBA';
var pointsNoColorUrl = './Data/Cesium3DTiles/Points/PointsNoColor';
var pointsConstantColorUrl = './Data/Cesium3DTiles/Points/PointsConstantColor';
var pointsNormalsUrl = './Data/Cesium3DTiles/Points/PointsNormals';
var pointsNormalsOctEncodedUrl = './Data/Cesium3DTiles/Points/PointsNormalsOctEncoded';
var pointsQuantizedUrl = './Data/Cesium3DTiles/Points/PointsQuantized';
var pointsQuantizedOctEncodedUrl = './Data/Cesium3DTiles/Points/PointsQuantizedOctEncoded';
var pointsWGS84Url = './Data/Cesium3DTiles/Points/PointsWGS84';
var pointsBatchedUrl = './Data/Cesium3DTiles/Points/PointsBatched';
var pointsWithPerPointPropertiesUrl = './Data/Cesium3DTiles/Points/PointsWithPerPointProperties';
var pointsRGBUrl = './Data/Cesium3DTiles/PointCloud/PointCloudRGB';
var pointsRGBAUrl = './Data/Cesium3DTiles/PointCloud/PointCloudRGBA';
var pointsNoColorUrl = './Data/Cesium3DTiles/PointCloud/PointCloudNoColor';
var pointsConstantColorUrl = './Data/Cesium3DTiles/PointCloud/PointCloudConstantColor';
var pointsNormalsUrl = './Data/Cesium3DTiles/PointCloud/PointCloudNormals';
var pointsNormalsOctEncodedUrl = './Data/Cesium3DTiles/PointCloud/PointCloudNormalsOctEncoded';
var pointsQuantizedUrl = './Data/Cesium3DTiles/PointCloud/PointCloudQuantized';
var pointsQuantizedOctEncodedUrl = './Data/Cesium3DTiles/PointCloud/PointCloudQuantizedOctEncoded';
var pointsWGS84Url = './Data/Cesium3DTiles/PointCloud/PointCloudWGS84';
var pointsBatchedUrl = './Data/Cesium3DTiles/PointCloud/PointCloudBatched';
var pointsWithPerPointPropertiesUrl = './Data/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties';

beforeAll(function() {
// Point tiles use RTC, which for now requires scene3DOnly to be true
Expand Down

0 comments on commit 8ff41ef

Please sign in to comment.