Clipping Planes- Terrain & optimizations, and/or option, plane primitives, edge highlighting

Source/Scene/Batched3DModel3DTileContent.js

@@ -14,10 +14,10 @@ define([
         '../Core/RequestType',
         '../Core/RuntimeError',
         '../Renderer/Pass',
-        '../Scene/ClippingPlanesCollection',
         './Cesium3DTileBatchTable',
         './Cesium3DTileFeature',
         './Cesium3DTileFeatureTable',
+        './ClippingPlanesCollection',
         './getAttributeOrUniformBySemantic',
         './Model'
     ], function(
@@ -36,10 +36,10 @@ define([
         RequestType,
         RuntimeError,
         Pass,
-        ClippingPlanesCollections,
         Cesium3DTileBatchTable,
         Cesium3DTileFeature,
         Cesium3DTileFeatureTable,
+        ClippingPlanesCollection,
         getAttributeOrUniformBySemantic,
         Model) {
     'use strict';
@@ -380,7 +380,7 @@ define([
             pickUniformMapLoaded : batchTable.getPickUniformMapCallback(),
             addBatchIdToGeneratedShaders : (batchLength > 0), // If the batch table has values in it, generated shaders will need a batchId attribute
             pickObject : pickObject,
-            clippingPlanes : new ClippingPlanesCollections({
+            clippingPlanes : new ClippingPlanesCollection({
                 enabled : false
             })
         });

Source/Scene/ClippingPlanesCollection.js

@@ -172,12 +172,20 @@ define([
         }
 
         var length = this.planes.length;
+        var i;
         if (result.planes.length !== length) {
             result.planes = new Array(length);
+
+            for (i = 0; i < length; ++i) {
+                result.planes[i] = new Plane(Cartesian3.UNIT_X, 0.0);
+            }
         }
-        for (var i = 0; i < length; ++i) {
+
+        for (i = 0; i < length; ++i) {
             var plane = this.planes[i];
-            result.planes[i] = new Plane(plane.normal, plane.distance);
+            var resultPlane = result.planes[i];
+            resultPlane.normal = plane.normal;
+            resultPlane.distance = plane.distance;
         }
 
         result.enabled = this.enabled;

Source/Scene/Instanced3DModel3DTileContent.js

@@ -26,6 +26,7 @@ define([
         './Cesium3DTileBatchTable',
         './Cesium3DTileFeature',
         './Cesium3DTileFeatureTable',
+        './ClippingPlanesCollection',
         './ModelInstanceCollection'
     ], function(
         AttributeCompression,
@@ -55,6 +56,7 @@ define([
         Cesium3DTileBatchTable,
         Cesium3DTileFeature,
         Cesium3DTileFeatureTable,
+        ClippingPlanesCollection,
         ModelInstanceCollection) {
     'use strict';
 
@@ -443,7 +445,6 @@ define([
             var modelMatrix = instanceTransform.clone();
             instances[i] = {
                 modelMatrix : modelMatrix,
-                batchId : batchId
             };
         }
 
@@ -514,6 +515,18 @@ define([
         this._modelInstanceCollection.debugWireframe = this._tileset.debugWireframe;
         this._modelInstanceCollection.update(frameState);
 
+        // Update clipping planes
+        var tilesetClippingPlanes = this._tileset.clippingPlanes;
+        if (defined(tilesetClippingPlanes)) {
+            var model = this._modelInstanceCollection._model;
+            if (!defined(model.clippingPlanes)) {
+                model.clippingPlanes = new ClippingPlanesCollection();
+            }
+
+            tilesetClippingPlanes.clone(model.clippingPlanes);
+            model.clippingPlanes.enabled = tilesetClippingPlanes.enabled && this._tile._isClipped;
+        }
+
         // If any commands were pushed, add derived commands
         var commandEnd = frameState.commandList.length;
         if ((commandStart < commandEnd) && frameState.passes.render) {