Skip to content

Commit 00face2

Browse files
gberaudogberaudo
committed
Merge pull request CesiumGS#12 from oterral/c2c_patches
Cesium 1.19
2 parents e9d3a04 + e4e5190 commit 00face2

File tree

1,048 files changed

+6085
-2196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,048 files changed

+6085
-2196
lines changed

‎.idea/runConfigurations/Run_tests.xml

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ node_js:
33
- "0.12"
44
sudo: false
55
script:
6-
- travis_wait npm run jsHint && npm run release
6+
- npm run jsHint
7+
- npm run makeZipFile

‎Apps/CesiumViewer/CesiumViewer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ define([
4646
Viewer,
4747
viewerCesiumInspectorMixin,
4848
viewerDragDropMixin) {
49-
"use strict";
49+
'use strict';
5050

5151
/*
5252
* 'debug' : true/false, // Full WebGL error reporting at substantial performance cost.

‎Apps/Sandcastle/CesiumSandcastle.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ require({
8080
when,
8181
LinkButton,
8282
Cesium) {
83-
"use strict";
83+
'use strict';
8484

8585
//In order for CodeMirror auto-complete to work, Cesium needs to be defined as a global.
8686
window.Cesium = Cesium;
@@ -441,7 +441,7 @@ require({
441441
});
442442

443443
function registerScroll(demoContainer) {
444-
if (defined(document.onmousewheel)) {
444+
if (document.onmousewheel !== undefined) {
445445
demoContainer.addEventListener('mousewheel', function(e) {
446446
if (defined(e.wheelDelta) && e.wheelDelta) {
447447
demoContainer.scrollLeft -= e.wheelDelta * 70 / 120;
@@ -513,7 +513,7 @@ require({
513513

514514
function getScriptFromEditor(addExtraLine) {
515515
return 'function startup(Cesium) {\n' +
516-
' "use strict";\n' +
516+
' \'use strict\';\n' +
517517
'//Sandcastle_Begin\n' +
518518
(addExtraLine ? '\n' : '') +
519519
jsEditor.getValue() +

‎Apps/Sandcastle/LinkButton.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ define([
1313
declare,
1414
domClass,
1515
template) {
16-
"use strict";
16+
'use strict';
1717

1818
return declare('Sandcastle.LinkButton', [_WidgetBase, _TemplatedMixin, _CssStateMixin], {
1919
baseClass : "dijitButton",

‎Apps/Sandcastle/Sandcastle-client.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(function() {
2-
"use strict";
2+
'use strict';
33
/*global console,Sandcastle,window*/
44

55
window.parent.postMessage('reload', '*');

‎Apps/Sandcastle/Sandcastle-header.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(function() {
2-
"use strict";
2+
'use strict';
33

44
var defaultAction;
55
var bucket = window.location.href;

‎Apps/Sandcastle/gallery/3D Models.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
<div id="toolbar"></div>
2626
<script id="cesium_sandcastle_script">
2727
function startup(Cesium) {
28-
"use strict";
28+
'use strict';
2929
//Sandcastle_Begin
3030
var viewer = new Cesium.Viewer('cesiumContainer', {
31+
scene3DOnly: true,
3132
infoBox : false,
3233
selectionIndicator : false
3334
});

‎Apps/Sandcastle/gallery/ArcGIS MapServer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div id="toolbar"></div>
2626
<script id="cesium_sandcastle_script">
2727
function startup(Cesium) {
28-
"use strict";
28+
'use strict';
2929
//Sandcastle_Begin
3030
var viewer = new Cesium.Viewer('cesiumContainer');
3131

‎Apps/Sandcastle/gallery/Billboards.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div id="toolbar"></div>
2626
<script id="cesium_sandcastle_script">
2727
function startup(Cesium) {
28-
"use strict";
28+
'use strict';
2929
//Sandcastle_Begin
3030
var viewer = new Cesium.Viewer('cesiumContainer');
3131

@@ -278,6 +278,7 @@
278278
}]);
279279

280280
Sandcastle.reset = function () {
281+
viewer.camera.flyHome(0);
281282
viewer.entities.removeAll();
282283
};
283284
//Sandcastle_End

‎Apps/Sandcastle/gallery/Box.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div id="toolbar"></div>
2626
<script id="cesium_sandcastle_script">
2727
function startup(Cesium) {
28-
"use strict";
28+
'use strict';
2929
//Sandcastle_Begin
3030
var viewer = new Cesium.Viewer('cesiumContainer');
3131

‎Apps/Sandcastle/gallery/CZML Billboard and Label.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Circles and Ellipses.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Colors.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Model - Node Transformations.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Model.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Path.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Point - Time Dynamic.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<script id="cesium_sandcastle_script">
2828

2929
function startup(Cesium) {
30-
"use strict";
30+
'use strict';
3131
//Sandcastle_Begin
3232
var czml = [
3333
{

‎Apps/Sandcastle/gallery/CZML Point.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Polygon - Interpolating References.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Polygon - Intervals, Availability.html

+7-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,18 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{
3333
"id" : "document",
3434
"name" : "CZML Polygon - Intervals and Availability",
35-
"version" : "1.0"
35+
"version" : "1.0",
36+
"clock": {
37+
"interval": "2012-08-04T16:00:00Z/2012-08-04T17:00:00Z",
38+
"currentTime": "2012-08-04T16:00:00Z",
39+
"multiplier": 900
40+
}
3641
}, {
3742
"id" : "dynamicPolygon",
3843
"name": "Dynamic Polygon with Intervals",

‎Apps/Sandcastle/gallery/CZML Polygon.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Polyline.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Position Definitions.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Rectangle.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Reference Properties.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Spheres and Ellipsoids.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [
3232
{

‎Apps/Sandcastle/gallery/CZML Wall.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var czml = [ {
3232
"id" : "document",

‎Apps/Sandcastle/gallery/CZML.html

+11-2
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,30 @@
2626

2727
<script id="cesium_sandcastle_script">
2828
function startup(Cesium) {
29-
"use strict";
29+
'use strict';
3030
//Sandcastle_Begin
3131
var viewer = new Cesium.Viewer('cesiumContainer');
3232

3333
Sandcastle.addDefaultToolbarButton('Satellites', function() {
3434
viewer.dataSources.add(Cesium.CzmlDataSource.load('../../SampleData/simple.czml'));
35+
36+
viewer.camera.flyHome(0);
3537
});
3638

3739
Sandcastle.addToolbarButton('Vehicle', function() {
3840
viewer.dataSources.add(Cesium.CzmlDataSource.load('../../SampleData/Vehicle.czml'));
41+
42+
viewer.scene.camera.setView({
43+
destination: Cesium.Cartesian3.fromDegrees(-116.52, 35.02, 95000),
44+
orientation: {
45+
heading: 6,
46+
picth: -Cesium.Math.PI_OVER_TWO
47+
}
48+
});
3949
});
4050

4151
Sandcastle.reset = function() {
4252
viewer.dataSources.removeAll();
43-
viewer.homeButton.viewModel.command();
4453
};
4554
//Sandcastle_End
4655
Sandcastle.finishedLoading();

‎Apps/Sandcastle/gallery/Camera Tutorial.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</div>
3232
<script id="cesium_sandcastle_script">
3333
function startup(Cesium) {
34-
"use strict";
34+
'use strict';
3535
//Sandcastle_Begin
3636
var viewer = new Cesium.Viewer('cesiumContainer');
3737

‎Apps/Sandcastle/gallery/Camera.html

+6-9
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<div id="loadingOverlay"><h1>Loading...</h1></div>
3131
<div id="toolbar"><div id="viewChanged">View Changed</div></div><script id="cesium_sandcastle_script">
3232
function startup(Cesium) {
33-
"use strict";
33+
'use strict';
3434
//Sandcastle_Begin
3535
var viewer = new Cesium.Viewer('cesiumContainer');
3636
var scene = viewer.scene;
@@ -140,7 +140,7 @@
140140

141141
var camera = viewer.camera;
142142
camera.setView({
143-
position : Cesium.Cartesian3.fromDegrees(-75.5847, 40.0397, 1000.0),
143+
destination : Cesium.Cartesian3.fromDegrees(-75.5847, 40.0397, 1000.0),
144144
orientation: {
145145
heading : -Cesium.Math.PI_OVER_TWO,
146146
pitch : -Cesium.Math.PI_OVER_FOUR,
@@ -166,11 +166,8 @@
166166
function viewInICRF() {
167167
Sandcastle.declare(viewInICRF);
168168

169-
var vm = viewer.homeButton.viewModel;
170-
vm.duration = 0.0;
171-
vm.command();
172-
vm.duration = 3.0;
173-
169+
viewer.camera.flyHome(0);
170+
174171
clock.multiplier = 3 * 60 * 60;
175172
scene.preRender.addEventListener(icrf);
176173
scene.globe.enableLighting = true;
@@ -209,7 +206,7 @@
209206
},
210207
easingFunction : Cesium.EasingFunction.LINEAR_NONE
211208
});
212-
}, 3000);
209+
}, 1000);
213210
}
214211
});
215212
}
@@ -313,4 +310,4 @@
313310
}
314311
</script>
315312
</body>
316-
</html>
313+
</html>

‎Apps/Sandcastle/gallery/Cardboard.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<div id="toolbar"></div>
2626
<script id="cesium_sandcastle_script">
2727
function startup(Cesium) {
28-
"use strict";
28+
'use strict';
2929
//Sandcastle_Begin
3030
var viewer = new Cesium.Viewer('cesiumContainer', {
3131
vrButton : true

‎Apps/Sandcastle/gallery/Cesium Inspector.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</div>
3030
<script id="cesium_sandcastle_script">
3131
function startup(Cesium) {
32-
"use strict";
32+
'use strict';
3333
//Sandcastle_Begin
3434
var viewer = new Cesium.Viewer('cesiumContainer');
3535
var scene = viewer.scene;

0 commit comments

Comments
 (0)