diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b312839bf2e..000000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/Apps/Sandcastle/CesiumSandcastle.js b/Apps/Sandcastle/CesiumSandcastle.js index 92fdba14ffdd..585947073935 100644 --- a/Apps/Sandcastle/CesiumSandcastle.js +++ b/Apps/Sandcastle/CesiumSandcastle.js @@ -1,6 +1,5 @@ /*global require,Blob,JSHINT*/ /*global gallery_demos*/// defined by gallery/gallery-index.js, created by build -/*global hello_world_index*/// defined in gallery/gallery-index.js, created by build /*global sandcastleJsHintOptions*/// defined by jsHintOptions.js, created by build require({ baseUrl : '../../Source', @@ -139,7 +138,6 @@ require({ var subtabs = {}; var docError = false; var galleryError = false; - var notFound = false; var galleryTooltipTimer; var activeGalleryTooltipDemo; var demoTileHeightRule = findCssStyle('.demoTileThumbnail'); @@ -307,7 +305,7 @@ require({ var selectedTabName = registry.byId('innerPanel').selectedChildWidget.title; var suffix = selectedTabName + 'Demos'; if (selectedTabName === 'All') { - suffix = 'all'; + suffix = ''; } else if (selectedTabName === 'Search Results') { suffix = 'searchDemo'; } @@ -695,7 +693,6 @@ require({ } function loadFromGallery(demo) { - notFound = false; document.getElementById('saveAsFile').download = demo.name + '.html'; registry.byId('description').set('value', decodeHTML(demo.description).replace(/\\n/g, '\n')); registry.byId('label').set('value', decodeHTML(demo.label).replace(/\\n/g, '\n')); @@ -806,9 +803,6 @@ require({ if (galleryError) { appendConsole('consoleError', 'Error loading gallery, please run the build script.', true); } - if (notFound) { - appendConsole('consoleLog', 'Unable to load demo named ' + queryObject.src.replace('.html', '') + '\n', true); - } } } else if (Cesium.defined(e.data.log)) { // Console log messages from the iframe display in Sandcastle. @@ -1060,15 +1054,8 @@ require({ url : 'gallery/' + name + '.html', handleAs : 'text', error : function(error) { - if (error.status === 404) { - loadFromGallery(gallery_demos[hello_world_index]) - .then(function() { - notFound = true; - }); - } else { - galleryError = true; - appendConsole('consoleError', error, true); - } + appendConsole('consoleError', error, true); + galleryError = true; } }); } diff --git a/Apps/Sandcastle/gallery/3D Models Coloring.html b/Apps/Sandcastle/gallery/3D Models Coloring.html deleted file mode 100644 index 979c9a6f955a..000000000000 --- a/Apps/Sandcastle/gallery/3D Models Coloring.html +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - Cesium Demo - - - - - - -
-

Loading...

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Model Color
Mode
Color
Alpha - - -
Mix - - -
Model Silhouette
Color
Alpha - - -
Size - - -
-
- - - diff --git a/Apps/Sandcastle/gallery/3D Models Coloring.jpg b/Apps/Sandcastle/gallery/3D Models Coloring.jpg deleted file mode 100644 index dff69552e5ca..000000000000 Binary files a/Apps/Sandcastle/gallery/3D Models Coloring.jpg and /dev/null differ diff --git a/Apps/Sandcastle/gallery/3D Models.html b/Apps/Sandcastle/gallery/3D Models.html index faa2af95ed0a..30caabdb7188 100644 --- a/Apps/Sandcastle/gallery/3D Models.html +++ b/Apps/Sandcastle/gallery/3D Models.html @@ -94,4 +94,4 @@ } - \ No newline at end of file + diff --git a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html b/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html deleted file mode 100644 index 592c3f1f3615..000000000000 --- a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - Cesium Demo - - - - - - -
-

Loading...

-
- - - diff --git a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.jpg b/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.jpg deleted file mode 100644 index 22d9d9be59b9..000000000000 Binary files a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.jpg and /dev/null differ diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html index 7d2a15bae834..79d7e169438b 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html +++ b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html @@ -134,6 +134,11 @@ pointSize : "5" }); +addStyle('Clamp and Mix', { + color : "clamp(color(), 0.0, 100.0)", + pointSize : "mix(0.0, 2.0, 0.5) * 5" +}); + addStyle('Secondary Color', { color : { expression : "[${secondaryColor}[0], ${secondaryColor}[1], ${secondaryColor}[2], 1.0]", diff --git a/Apps/Sandcastle/gallery/CZML Billboard and Label.html b/Apps/Sandcastle/gallery/CZML Billboard and Label.html index 37889f6d28ca..dc6e1521d663 100644 --- a/Apps/Sandcastle/gallery/CZML Billboard and Label.html +++ b/Apps/Sandcastle/gallery/CZML Billboard and Label.html @@ -42,19 +42,19 @@ }, "label" : { "fillColor" : { - "rgba" : [255, 255, 255, 255] + "rgba" : [0, 255, 255, 255] }, - "font" : "12pt Lucida Console", + "font" : "11pt Lucida Console", "horizontalOrigin" : "LEFT", + "outlineColor" : { + "rgba":[0, 0, 0, 255] + }, + "outlineWidth" : 2, "pixelOffset" : { - "cartesian2" : [8, 0] + "cartesian2" : [12, 0] }, - "style" : "FILL", - "text" : "AGI", - "showBackground" : true, - "backgroundColor" : { - "rgba" : [112, 89, 57, 200] - } + "style" : "FILL_AND_OUTLINE", + "text" : "AGI" }, "position" : { "cartesian":[ @@ -65,7 +65,7 @@ var viewer = new Cesium.Viewer('cesiumContainer'); viewer.dataSources.add(Cesium.CzmlDataSource.load(czml)); -//Sandcastle_End + //Sandcastle_End Sandcastle.finishedLoading(); } if (typeof Cesium !== "undefined") { diff --git a/Apps/Sandcastle/gallery/Ground Clamping.html b/Apps/Sandcastle/gallery/Ground Clamping.html index 81c1d41a123b..d4081e1d8b1f 100644 --- a/Apps/Sandcastle/gallery/Ground Clamping.html +++ b/Apps/Sandcastle/gallery/Ground Clamping.html @@ -10,10 +10,10 @@ @@ -29,8 +29,8 @@
diff --git a/Apps/Sandcastle/gallery/Labels.html b/Apps/Sandcastle/gallery/Labels.html index 2c4b4b4b7f96..0cbe6839a575 100644 --- a/Apps/Sandcastle/gallery/Labels.html +++ b/Apps/Sandcastle/gallery/Labels.html @@ -64,7 +64,6 @@ }); entity.label.scale = 2.0; - entity.label.showBackground = true; } function offsetByDistance() { @@ -81,7 +80,6 @@ label : { text : 'Label on top of scaling billboard', font : '20px sans-serif', - showBackground : true, horizontalOrigin : Cesium.HorizontalOrigin.CENTER, pixelOffset : new Cesium.Cartesian2(0.0, -image.height), pixelOffsetScaleByDistance : new Cesium.NearFarScalar(1.5e2, 3.0, 1.5e7, 0.5) diff --git a/Apps/Sandcastle/gallery/Picking.html b/Apps/Sandcastle/gallery/Picking.html index 6ae7162463fe..22c7c73ff95a 100644 --- a/Apps/Sandcastle/gallery/Picking.html +++ b/Apps/Sandcastle/gallery/Picking.html @@ -38,12 +38,7 @@ Sandcastle.addDefaultToolbarButton('Show Cartographic Position on Mouse Over', function() { var entity = viewer.entities.add({ label : { - show : false, - showBackground : true, - font : '14px monospace', - horizontalOrigin : Cesium.HorizontalOrigin.LEFT, - verticalOrigin : Cesium.VerticalOrigin.TOP, - pixelOffset : new Cesium.Cartesian2(15, 0) + show : false } }); @@ -58,9 +53,7 @@ entity.position = cartesian; entity.label.show = true; - entity.label.text = - 'Lon: ' + (' ' + longitudeString).slice(-7) + '\u00B0' + - '\nLat: ' + (' ' + latitudeString).slice(-7) + '\u00B0'; + entity.label.text = '(' + longitudeString + ', ' + latitudeString + ')'; } else { entity.label.show = false; } @@ -166,11 +159,7 @@ var labelEntity = viewer.entities.add({ label : { show : false, - showBackground : true, - font : '14px monospace', - horizontalOrigin : Cesium.HorizontalOrigin.LEFT, - verticalOrigin : Cesium.VerticalOrigin.TOP, - pixelOffset : new Cesium.Cartesian2(15, 0) + horizontalOrigin : Cesium.HorizontalOrigin.LEFT } }); @@ -192,11 +181,8 @@ labelEntity.position = cartesian; labelEntity.label.show = true; - labelEntity.label.text = - 'Lon: ' + (' ' + longitudeString).slice(-7) + '\u00B0' + - '\nLat: ' + (' ' + latitudeString).slice(-7) + '\u00B0' + - '\nAlt: ' + (' ' + heightString).slice(-7) + 'm'; - + labelEntity.label.text = '(' + longitudeString + ', ' + latitudeString + ', ' + heightString + ')'; + var camera = scene.camera; labelEntity.label.eyeOffset = new Cesium.Cartesian3(0.0, 0.0, camera.frustum.near * 1.5 - Cesium.Cartesian3.distance(cartesian, camera.position)); @@ -215,7 +201,7 @@ handler = handler && handler.destroy(); }; //Sandcastle_End - Sandcastle.finishedLoading(); +Sandcastle.finishedLoading(); } if (typeof Cesium !== "undefined") { startup(Cesium); diff --git a/Apps/Sandcastle/gallery/Rectangle.html b/Apps/Sandcastle/gallery/Rectangle.html index 7861a1cc0262..02f20c1c8229 100644 --- a/Apps/Sandcastle/gallery/Rectangle.html +++ b/Apps/Sandcastle/gallery/Rectangle.html @@ -42,7 +42,7 @@ var greenRectangle = viewer.entities.add({ name : 'Green translucent, rotated, and extruded rectangle at height with outline', rectangle : { - coordinates : Cesium.Rectangle.fromDegrees(-110.0, 30.0, -100.0, 40.0), + coordinates : Cesium.Rectangle.fromDegrees(-100.0, 30.0, -90.0, 40.0), material : Cesium.Color.GREEN.withAlpha(0.5), rotation : Cesium.Math.toRadians(45), extrudedHeight : 300000.0, @@ -52,22 +52,6 @@ } }); -var rotation = Cesium.Math.toRadians(30); - -function getRotationValue() { - rotation += 0.005; - return rotation; -} -viewer.entities.add({ - name: 'Rotating rectangle with rotating texture coordinate', - rectangle: { - coordinates: Cesium.Rectangle.fromDegrees(-92.0, 30.0, -76.0, 40.0), - material: '../images/Cesium_Logo_Color.jpg', - rotation: new Cesium.CallbackProperty(getRotationValue, false), - stRotation: new Cesium.CallbackProperty(getRotationValue, false) - } -}); - viewer.zoomTo(viewer.entities); //Sandcastle_End Sandcastle.finishedLoading(); diff --git a/Apps/Sandcastle/gallery/Rectangle.jpg b/Apps/Sandcastle/gallery/Rectangle.jpg index eac9a0ba48f4..3aa5238d6ea8 100644 Binary files a/Apps/Sandcastle/gallery/Rectangle.jpg and b/Apps/Sandcastle/gallery/Rectangle.jpg differ diff --git a/Apps/Sandcastle/gallery/Terrain.html b/Apps/Sandcastle/gallery/Terrain.html index 09eedd03e1c4..6346ceb11117 100644 --- a/Apps/Sandcastle/gallery/Terrain.html +++ b/Apps/Sandcastle/gallery/Terrain.html @@ -148,14 +148,11 @@ }, label : { text : position.height.toFixed(1), - font : '10pt monospace', horizontalOrigin : Cesium.HorizontalOrigin.CENTER, + scale : 0.3, pixelOffset : new Cesium.Cartesian2(0, -14), - fillColor : Cesium.Color.BLACK, - outlineColor : Cesium.Color.BLACK, - showBackground : true, - backgroundColor : new Cesium.Color(0.9, 0.9, 0.9, 0.7), - backgroundPadding : new Cesium.Cartesian2(4, 3) + fillColor : Cesium.Color.RED, + outlineColor : Cesium.Color.WHITE } }); } diff --git a/Apps/Sandcastle/gallery/development/3D Models.html b/Apps/Sandcastle/gallery/development/3D Models.html index ffc969e4dc54..0504f5af2a7b 100644 --- a/Apps/Sandcastle/gallery/development/3D Models.html +++ b/Apps/Sandcastle/gallery/development/3D Models.html @@ -19,107 +19,16 @@

Loading...

-
- - - - - - - - - - - - - - - - - -
Mode
Color
Alpha - - -
Mix - - -
-
+