CesiumGS · bagnell · May 15, 2018 · Feb 13, 2018 · Feb 20, 2018 · Mar 2, 2018
diff --git a/Apps/Sandcastle/gallery/development/Ground Primitive Materials.html b/Apps/Sandcastle/gallery/development/Ground Primitive Materials.html
diff --git a/Apps/Sandcastle/gallery/development/Ground Primitive Materials.jpg b/Apps/Sandcastle/gallery/development/Ground Primitive Materials.jpg
diff --git a/Apps/Sandcastle/gallery/development/Terrain Entity Batching.html b/Apps/Sandcastle/gallery/development/Terrain Entity Batching.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<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="Demo for batching-by-material of non-overlapping Entities on Terrain.">
+    <meta name="cesium-sandcastle-labels" content="Development">
+    <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 worldTerrain = Cesium.createWorldTerrain({
+    requestWaterMask: true,
+    requestVertexNormals: true
+});
+
+var viewer = new Cesium.Viewer('cesiumContainer', {
+    terrainProvider: worldTerrain
+});
+
+var concavePositions = [
+    new Cesium.Cartesian3(-2353381.4891308164, -3747386.1222378365, 4577999.291515961),
+    new Cesium.Cartesian3(-2359513.937204245, -3743087.2343810294, 4578357.188560644),
+    new Cesium.Cartesian3(-2356102.0286082155, -3739921.552293276, 4582670.218770547),
+    new Cesium.Cartesian3(-2353889.0353209395, -3741183.2274413602, 4582776.909071608),
+    new Cesium.Cartesian3(-2355072.390487758, -3742865.615615464, 4580808.044684757),
+    new Cesium.Cartesian3(-2356109.6661414686, -3741994.0607898533, 4580985.489703348),
+    new Cesium.Cartesian3(-2357041.8328847606, -3743225.9693035223, 4579509.2148039425),
+    new Cesium.Cartesian3(-2354586.752280607, -3744890.9511893727, 4579411.591389144),
+    new Cesium.Cartesian3(-2353213.0268325945, -3743712.1202877173, 4581070.08828045),
+    new Cesium.Cartesian3(-2353637.930711704, -3743402.9513476435, 4581104.219550749),
+    new Cesium.Cartesian3(-2352875.095159641, -3742564.819171856, 4582173.540953957),
+    new Cesium.Cartesian3(-2350669.646050987, -3743751.6823160048, 4582334.8406995395)
+];
+
+// concave polygon
+viewer.entities.add({
+    name : 'concave polygon on surface',
+    polygon : {
+        hierarchy : concavePositions,
+        material : '../images/Cesium_Logo_Color.jpg'
+    },
+    stRotation : 1.0
+});
+
+// Randomly colored, nonoverlapping squares
+var latitude = 46.2522;
+var longitude = -122.2534;
+
+Cesium.Math.setRandomNumberSeed(133);
+
+for (var x = 0; x < 10; ++x) {
+    for (var y = 0; y < 10; ++y) {
+        var cornerLat = latitude + 0.01 * x;
+        var cornerLon = longitude + 0.01 * y;
+        viewer.entities.add({
+            id : x + ' ' + y,
+            rectangle : {
+                coordinates : Cesium.Rectangle.fromDegrees(cornerLon, cornerLat,
+                                                           cornerLon + 0.009, cornerLat + 0.009),
+                material : Cesium.Color.fromRandom().withAlpha(0.5)
+            }
+        });
+    }
+}
+
+// Checkerboard
+var checkerboard = new Cesium.CheckerboardMaterialProperty({
+    evenColor : Cesium.Color.ORANGE,
+    oddColor : Cesium.Color.YELLOW,
+    repeat : new Cesium.Cartesian2(14, 14)
+});
+
+viewer.entities.add({
+    name : 'checkerboard rectangle',
+    rectangle : {
+        coordinates : Cesium.Rectangle.fromDegrees(-122.17778, 46.36169, -120.17778, 48.36169),
+        material : checkerboard
+    }
+});
+
+// Ellipse with texture rotation and repetition
+viewer.entities.add({
+    position: Cesium.Cartesian3.fromDegrees(-121.70711316136793, 45.943757948892845, 0.0),
+    name : 'ellipse',
+    ellipse : {
+        semiMinorAxis : 15000.0,
+        semiMajorAxis : 30000.0,
+        material : '../images/Cesium_Logo_Color.jpg',
+        stRotation : Cesium.Math.toRadians(45)
+    }
+});
+
+viewer.zoomTo(viewer.entities);
+//Sandcastle_End
+    Sandcastle.finishedLoading();
+}
+if (typeof Cesium !== "undefined") {
+    startup(Cesium);
+} else if (typeof require === "function") {
+    require(["Cesium"], startup);
+}
+</script>
+</body>
+</html>
diff --git a/Apps/Sandcastle/gallery/development/Terrain Entity Batching.jpg b/Apps/Sandcastle/gallery/development/Terrain Entity Batching.jpg
diff --git a/CHANGES.md b/CHANGES.md
@@ -7,6 +7,13 @@ Change Log
 
 * Fixed a bug causing custom TilingScheme classes to not be able to use a GeographicProjection. [#6524](https://github.com/AnalyticalGraphicsInc/cesium/pull/6524)
 
+##### Breaking Changes :mega:
+* Removed `Scene.copyGlobeDepth`. Globe depth will now be copied by default when supported. [#6393](https://github.com/AnalyticalGraphicsInc/cesium/pull/6393)
+
+##### Additions :tada:
+* Added support for materials on terrain entities and `GroundPrimitives`. This functionality requires depth texture support (`WEBGL_depth_texture` or `WEBKIT_WEBGL_depth_texture`), so it is not available in Internet Explorer. Textured materials on terrain entities and `GroundPrimitives` are best suited for notational patterns and are not intended for precisely mapping textures to terrain - for that use case, use `SingleTileImageryProvider`. [#6393](https://github.com/AnalyticalGraphicsInc/cesium/pull/6393)
+* Added `GroundPrimitive.supportsMaterials` and `Entity.supportsMaterialsforEntitiesOnTerrain`, both of which can be used to check if materials on terrain entities and `GroundPrimitives` is supported. [#6393](https://github.com/AnalyticalGraphicsInc/cesium/pull/6393)
+
 ### 1.45 - 2018-05-01
 
 ##### Major Announcements :loudspeaker:

diff --git a/LICENSE.md b/LICENSE.md
@@ -509,6 +509,52 @@ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 THIS SOFTWARE.
 
+### rbush
+
+https://github.com/mourner/rbush
+
+> MIT License
+
+> Copyright (c) 2016 Vladimir Agafonkin
+
+>Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+>
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+### quickselect
+
+https://github.com/mourner/quickselect
+
+> ISC License
+
+> Copyright (c) 2018, Vladimir Agafonkin
+
+>Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+>
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
+
 ### crunch
 
 https://github.com/BinomialLLC/crunch
@@ -670,6 +716,20 @@ https://github.com/KhronosGroup/glTF-WebGL-PBR
 >CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 >OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+### ShaderFastLibs
+
+https://github.com/michaldrobot/ShaderFastLibs
+
+> The MIT License (MIT)
+>
+> Copyright (c) <2014> <Michal Drobot>
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 ### Draco
 
 https://github.com/google/draco
@@ -692,20 +752,20 @@ https://github.com/leizongmin/js-xss
 
 > Copyright (c) 2012-2017 Zongmin Lei(雷宗民) <[email protected]>
 > http://ucdok.com
-> 
+>
 > The MIT License
-> 
+>
 > Permission is hereby granted, free of charge, to any person obtaining
 > a copy of this software and associated documentation files (the
 > "Software"), to deal in the Software without restriction, including
 > without limitation the rights to use, copy, modify, merge, publish,
 > distribute, sublicense, and/or sell copies of the Software, and to
 > permit persons to whom the Software is furnished to do so, subject to
 > the following conditions:
-> 
+>
 > The above copyright notice and this permission notice shall be
 > included in all copies or substantial portions of the Software.
-> 
+>
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 > EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 > MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

diff --git a/Source/Core/CircleGeometry.js b/Source/Core/CircleGeometry.js
@@ -184,6 +184,15 @@ define([
             get : function() {
                 return this._ellipseGeometry.rectangle;
             }
+        },
+        /**
+         * For remapping texture coordinates when rendering CircleGeometries as GroundPrimitives.
+         * @private
+         */
+        textureCoordinateRotationPoints : {
+            get : function() {
+                return this._ellipseGeometry.textureCoordinateRotationPoints;
+            }
         }
     });
 

diff --git a/Source/Core/CorridorGeometry.js b/Source/Core/CorridorGeometry.js
@@ -1045,6 +1045,20 @@ define([
                 }
                 return this._rectangle;
             }
+        },
+        /**
+         * For stRotation on GroundPrimitives.
+         * Returns the rectangle part of an oriented rectangle that tightly bounds
+         * the oriented geometry in Cartographic space.
+         *
+         * Corridors don't support geometry orientation or stRotation,
+         * so just return the rectangle.
+         * @private
+         */
+        unrotatedTextureRectangle : {
+            get : function() {
+                return this.rectangle;
+            }
         }
     });
 

diff --git a/Source/Core/EllipseGeometry.js b/Source/Core/EllipseGeometry.js
@@ -755,6 +755,7 @@ define([
         this._workerName = 'createEllipseGeometry';
 
         this._rectangle = undefined;
+        this._unrotatedTextureRectangle = undefined;
     }
 
     /**
@@ -953,6 +954,31 @@ define([
         });
     };
 
+    function textureCoordinateRotationPoints(ellipseGeometry) {
+        var stRotation = -ellipseGeometry._stRotation;
+        if (stRotation === 0.0) {
+            return [0, 0, 0, 1, 1, 0];
+        }
+
+        var cep = EllipseGeometryLibrary.computeEllipsePositions({
+            center : ellipseGeometry._center,
+            semiMajorAxis : ellipseGeometry._semiMajorAxis,
+            semiMinorAxis : ellipseGeometry._semiMinorAxis,
+            rotation : ellipseGeometry._rotation,
+            granularity : ellipseGeometry._granularity
+        }, false, true);
+        var positionsFlat = cep.outerPositions;
+        var positionsCount = positionsFlat.length / 3;
+        var positions = new Array(positionsCount);
+        for (var i = 0; i < positionsCount; ++i) {
+            positions[i] = Cartesian3.fromArray(positionsFlat, i * 3);
+        }
+
+        var ellipsoid = ellipseGeometry._ellipsoid;
+        var boundingRectangle = ellipseGeometry.rectangle;
+        return Geometry._textureCoordinateRotationPoints(positions, stRotation, ellipsoid, boundingRectangle);
+    }
+
     defineProperties(EllipseGeometry.prototype, {
         /**
          * @private
@@ -964,6 +990,15 @@ define([
                 }
                 return this._rectangle;
             }
+        },
+        /**
+         * For remapping texture coordinates when rendering EllipseGeometries as GroundPrimitives.
+         * @private
+         */
+        textureCoordinateRotationPoints : {
+            get : function() {
+                return textureCoordinateRotationPoints(this);
+            }
         }
     });