Skip to content

Olcs warmup #129

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 2, 2014
Merged

Olcs warmup #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 28 additions & 2 deletions src/ol3cesium.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ olcs.OLCesium = function(map, opt_target) {
this.cesiumRenderingDelay_ = new goog.async.AnimationDelay(function(time) {
this.scene_.initializeFrame();
this.scene_.render();
this.camera_.checkCameraChange();

this.enabled_ && this.camera_.checkCameraChange();
this.cesiumRenderingDelay_.start();
}, undefined, this);
};
Expand Down Expand Up @@ -244,3 +243,30 @@ olcs.OLCesium.prototype.setEnabled = function(opt_enable) {
this.cesiumRenderingDelay_.stop();
}
};


/**
* Preload Cesium so that it is ready when transitioning from 2D to 3D.
* @param {number} height Target height of the camera
* @param {number} timeout Milliseconds after which the warming will stop
* @api
*/
olcs.OLCesium.prototype.warmUp = function(height, timeout) {
if (this.enabled_) {
// already enabled
return;
}
this.camera_.readFromView();
var ellipsoid = this.globe_.ellipsoid;
var csCamera = this.scene_.camera;
var position = ellipsoid.cartesianToCartographic(csCamera.position);
if (position.height < height) {
position.height = height;
csCamera.position = ellipsoid.cartographicToCartesian(position);
}
this.cesiumRenderingDelay_.start();
var that = this;
setTimeout(
function() { !that.enabled_ && that.cesiumRenderingDelay_.stop(); },
timeout);
};