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.

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

Time Dynamic Point Clouds #6721

Merged
merged 41 commits into from
Jul 11, 2018
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
2dab089
Added PointCloud class
lilleyse May 29, 2018
61065d8
Added PointCloudStream class
lilleyse May 30, 2018
96cd741
Start of prefetching code
lilleyse May 31, 2018
a618a7e
Batch id uint32 fix
lilleyse Jun 7, 2018
4704934
Rename PointCloudStream to TimeDynamicPointCloud
lilleyse Jun 13, 2018
ab37223
Updates in preparation for auto-skipping frames
lilleyse Jun 13, 2018
d2df499
Merge branch 'point-clouds-draco' into point-cloud-stream-new
lilleyse Jun 18, 2018
cd219a8
More picking updates
lilleyse Jun 18, 2018
45382e7
Documentation and cleanup
lilleyse Jun 19, 2018
0e44cf8
Added Sandcastle demo
lilleyse Jun 19, 2018
1c62498
Frame skipping added
lilleyse Jun 21, 2018
23fb235
Minor wording and organization changes
lilleyse Jun 22, 2018
45f20bc
Merge branch 'point-clouds-draco' into point-cloud-stream-new
lilleyse Jun 22, 2018
59e169a
Update Sandcastle demo
lilleyse Jun 22, 2018
f505207
Move uniform map creation so it's easier to merge in mutables
lilleyse Jun 22, 2018
bd67113
Avoid skipping requested frames
lilleyse Jun 26, 2018
f30e694
Get the next interval more aggressively
lilleyse Jun 26, 2018
a4f2d21
Calculate average load time from the last N frames
lilleyse Jun 26, 2018
c4a0620
Merge branch 'point-clouds-draco' into point-cloud-stream-new
lilleyse Jun 26, 2018
178003f
Documentation updates
lilleyse Jun 26, 2018
b166766
Fix edge case where first frame is not loaded sequentially and an ave…
lilleyse Jun 27, 2018
3455dc3
Initial work for computing bounding sphere
lilleyse Jun 27, 2018
70cac08
Add PERFORMANCE_IDEA for sharing GPU resources
lilleyse Jun 27, 2018
9d6552c
Make quantizedVolumeScale consistent across Draco and 16-bit quantize…
lilleyse Jun 27, 2018
e1cf350
Make useNormals more like useColors and backFaceCulling
lilleyse Jun 27, 2018
52632b3
Updated demo
lilleyse Jun 27, 2018
8f6a975
Updated CHANGES.md
lilleyse Jun 27, 2018
ed8624c
Pass in same point cloud state to prepareFrame as renderFrame to mini…
lilleyse Jun 28, 2018
eacc367
Added tests
lilleyse Jun 28, 2018
3739e84
Rename tilesets folder to Cesium3DTiles
lilleyse Jul 2, 2018
eb1ceeb
Merge branch 'point-clouds-draco' into point-cloud-stream-new
lilleyse Jul 2, 2018
04a8797
Fix EDL test for webgl-stub
lilleyse Jul 3, 2018
a9d2be7
Rename pointCloudShading to shading
lilleyse Jul 3, 2018
e1fddc0
More description for frameFailed event
lilleyse Jul 3, 2018
f531406
Added viewer.zoomTo(timeDynamicPointCloud)
lilleyse Jul 3, 2018
dd7a59c
Merge branch 'master' into point-cloud-stream-new
lilleyse Jul 9, 2018
adf8f4e
Comment about quantized range and scale
lilleyse Jul 5, 2018
cb9ee74
frame changed event, ready promise, and other updates
lilleyse Jul 10, 2018
a7baeff
Updates
lilleyse Jul 10, 2018
b2b94f5
Fix test
lilleyse Jul 11, 2018
3294f35
Merge branch 'master' into point-cloud-stream-new
lilleyse Jul 11, 2018
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
77 changes: 77 additions & 0 deletions Apps/Sandcastle/gallery/Time Dynamic Point Cloud.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<!DOCTYPE html>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trying to run this, I get "Request has failed. Status Code: 404"

Is this because the data is only in the specs?

http://cesium-dev.s3-website-us-east-1.amazonaws.com/cesium/point-cloud-stream-new/Apps/Sandcastle/index.html?src=Time%20Dynamic%20Point%20Cloud.html

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that will be fixed.

<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="description" content="Time Dynamic Point Cloud">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The description shouldn't just repeat the name.

<meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally just semantics but technically, though it uses .pnts files, this isn't really 3D Tiles, is it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was debating this too. I'll move it out of 3D Tiles.

<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
<script type="text/javascript">
if(typeof require === "function") {
require.config({
baseUrl : '../../../Source',
waitSeconds : 120
});
}
</script>
</head>
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
<style>
@import url(../templates/bucket.css);
</style>
<div id="cesiumContainer" class="fullSize"></div>
<div id="loadingOverlay"><h1>Loading...</h1></div>
<div id="toolbar"></div>
<script id="cesium_sandcastle_script">
function startup(Cesium) {
'use strict';
//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer', {
shouldAnimate : true
});

var basePath = '../../SampleData/test/PointCloudTimeDynamic/';
var czmlPath = basePath + 'frames.czml';
var dataSource = viewer.dataSources.add(Cesium.CzmlDataSource.load(czmlPath));
dataSource.then(function(dataSource) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be a helper for this?

What if a CZML has time-dynamic point clouds and other content - looks like it all just works, right?

var entities = dataSource.entities;
var entity = entities.getById('Time Dynamic Point Cloud');
var properties = entity.properties;
var frames = properties.frames;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the CZML spec be updated?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't actually make any changes to CZML in this PR, I just use CZML to package the data for the demo. CZML conveniently creates a TimeIntervalCollection under the hood that can be passed to TimeDynamicPointCloud.

But maybe I should hardcode the time intervals and uris in the demo itself to avoid the confusion here and #6721 (comment) #6721 (comment).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hardcoding sounds OK; if CZML can now point to a .pnts file, we should update the spec for that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No CZML spec updates required.

The demo is just using CZML as a storage mechanism and helper.

There was some offline discussion that this use case is too niche to be added to core CZML, so I never built that in. But the demo shows that if you had a czml with a custom property you could get a TimeIntervalCollection and initialize a TimeDynamicPointCloud. You can do this without CZML too, which is what I plan on doing in this demo instead.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I suppose. We have someone relying on this and we need to provide them guidance on the best practice whether that be a custom CZML property or a completely separate container. They are already a CZML user as you know but that does not imply that the point clouds needs to be part of it.

var intervals = frames.intervals;

// Update uris to be absolute
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a hack?

var length = intervals.length;
for (var i = 0; i < length; ++i) {
var data = intervals.get(i).data;
data.uri = basePath + data.uri;
}

viewer.scene.primitives.add(new Cesium.TimeDynamicPointCloud({
intervals : intervals,
clock : viewer.clock,
style : new Cesium.Cesium3DTileStyle({
pointSize : 5
})
}));
});

viewer.camera.setView({
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could something like viewer.zoomTo(pointCloud, ... work here even if it just uses the first / current point cloud?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this is a good idea. Will bump when ready.

destination: new Cesium.Cartesian3(1215092.7260503182, -4736533.485206121, 4081535.746782565),
orientation: new Cesium.HeadingPitchRoll(6.207713496216043, -0.6084278199488593, 6.282880789149928),
endTransform : Cesium.Matrix4.IDENTITY
});
//Sandcastle_End
Sandcastle.finishedLoading();
}
if (typeof Cesium !== "undefined") {
startup(Cesium);
} else if (typeof require === "function") {
require(["Cesium"], startup);
}
</script>
</body>
</html>
4 changes: 2 additions & 2 deletions Source/Scene/Cesium3DTileset.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ define([
* @param {ClippingPlaneCollection} [options.clippingPlanes] The {@link ClippingPlaneCollection} used to selectively disable rendering the tileset.
* @param {ClassificationType} [options.classificationType] Determines whether terrain, 3D Tiles or both will be classified by this tileset. See {@link Cesium3DTileset#classificationType} for details about restrictions and limitations.
* @param {Ellipsoid} [options.ellipsoid=Ellipsoid.WGS84] The ellipsoid determining the size and shape of the globe.
* @param {Object} [options.pointCloudShading] Options for constructing a {@link PointCloudShading} object to control point attenuation based on geometric error and lighting.
* @param {Boolean} [options.debugFreezeFrame=false] For debugging only. Determines if only the tiles from last frame should be used for rendering.
* @param {Boolean} [options.debugColorizeTiles=false] For debugging only. When true, assigns a random color to each tile.
* @param {Boolean} [options.debugWireframe=false] For debugging only. When true, render's each tile's content as a wireframe.
Expand All @@ -120,7 +121,6 @@ define([
* @param {Boolean} [options.debugShowRenderingStatistics=false] For debugging only. When true, draws labels to indicate the number of commands, points, triangles and features for each tile.
* @param {Boolean} [options.debugShowMemoryUsage=false] For debugging only. When true, draws labels to indicate the texture and geometry memory in megabytes used by each tile.
* @param {Boolean} [options.debugShowUrl=false] For debugging only. When true, draws labels to indicate the url of each tile.
* @param {Object} [options.pointCloudShading] Options for constructing a {@link PointCloudShading} object to control point attenuation based on geometric error and lighting.
*
* @exception {DeveloperError} The tileset must be 3D Tiles version 0.0 or 1.0. See {@link https://github.com/AnalyticalGraphicsInc/3d-tiles#spec-status}
*
Expand Down Expand Up @@ -1720,7 +1720,7 @@ define([
if (tileset.pointCloudShading.attenuation &&
tileset.pointCloudShading.eyeDomeLighting &&
(addedCommandsLength > 0)) {
tileset._pointCloudEyeDomeLighting.update(frameState, numberOfInitialCommands, tileset);
tileset._pointCloudEyeDomeLighting.update(frameState, numberOfInitialCommands, tileset.pointCloudShading);
}

if (tileset.debugShowGeometricError || tileset.debugShowRenderingStatistics || tileset.debugShowMemoryUsage || tileset.debugShowUrl) {
Expand Down
2 changes: 1 addition & 1 deletion Source/Scene/Expression.js
Original file line number Diff line number Diff line change
Expand Up @@ -1748,7 +1748,7 @@ define([
throw new RuntimeError('Error generating style shader: undefined is not supported.');
case ExpressionNodeType.BUILTIN_VARIABLE:
if (value === 'tiles3d_tileset_time') {
return 'u_tilesetTime';
return 'u_time';
}
}
};
Expand Down
Loading