Add disableDepthDistance and alwaysDisableDepth properties to billboa…

…rds/labels/points.
CesiumGS · Mar 28, 2017 · e4fee87 · e4fee87
1 parent 9db4cfb
commit e4fee87
Show file tree

Hide file tree

Showing 13 changed files with 343 additions and 50 deletions.
diff --git a/Source/DataSources/BillboardGraphics.js b/Source/DataSources/BillboardGraphics.js
@@ -89,6 +89,10 @@ define([
         this._sizeInMetersSubscription = undefined;
         this._distanceDisplayCondition = undefined;
         this._distanceDisplayConditionSubscription = undefined;
+        this._disableDepthDistance = undefined;
+        this._disableDepthDistanceSubscription = undefined;
+        this._alwaysDisableDepth = undefined;
+        this._alwaysDisableDepthSubscription = undefined;
         this._definitionChanged = new Event();
 
         this.merge(defaultValue(options, defaultValue.EMPTY_OBJECT));
@@ -316,7 +320,11 @@ define([
          * @memberof BillboardGraphics.prototype
          * @type {Property}
          */
-        distanceDisplayCondition : createPropertyDescriptor('distanceDisplayCondition')
+        distanceDisplayCondition : createPropertyDescriptor('distanceDisplayCondition'),
+
+        disableDepthDistance : createPropertyDescriptor('disableDepthDistance'),
+
+        alwaysDisableDepth : createPropertyDescriptor('alwaysDisableDepth')
     });
 
     /**
@@ -348,6 +356,8 @@ define([
         result.pixelOffsetScaleByDistance = this._pixelOffsetScaleByDistance;
         result.sizeInMeters = this._sizeInMeters;
         result.distanceDisplayCondition = this._distanceDisplayCondition;
+        result.disableDepthDistance = this._disableDepthDistance;
+        result.alwaysDisableDepth = this._alwaysDisableDepth;
         return result;
     };
 
@@ -383,6 +393,8 @@ define([
         this.pixelOffsetScaleByDistance = defaultValue(this._pixelOffsetScaleByDistance, source.pixelOffsetScaleByDistance);
         this.sizeInMeters = defaultValue(this._sizeInMeters, source.sizeInMeters);
         this.distanceDisplayCondition = defaultValue(this._distanceDisplayCondition, source.distanceDisplayCondition);
+        this.disableDepthDistance = defaultValue(this._disableDepthDistance, source.disableDepthDistance);
+        this.alwaysDisableDepth = defaultValue(this._alwaysDisableDepth, source.alwaysDisableDepth);
     };
 
     return BillboardGraphics;

diff --git a/Source/DataSources/BillboardVisualizer.js b/Source/DataSources/BillboardVisualizer.js
@@ -156,6 +156,8 @@ define([
             billboard.pixelOffsetScaleByDistance = Property.getValueOrUndefined(billboardGraphics._pixelOffsetScaleByDistance, time, pixelOffsetScaleByDistance);
             billboard.sizeInMeters = Property.getValueOrDefault(billboardGraphics._sizeInMeters, defaultSizeInMeters);
             billboard.distanceDisplayCondition = Property.getValueOrUndefined(billboardGraphics._distanceDisplayCondition, time, distanceDisplayCondition);
+            billboard.disableDepthDistance = Property.getValueOrUndefined(billboardGraphics._disableDepthDistance, time);
+            billboard.alwaysDisableDepth = Property.getValueOrUndefined(billboardGraphics._alwaysDisableDepth, time);
 
             var subRegion = Property.getValueOrUndefined(billboardGraphics._imageSubRegion, time, boundingRectangle);
             if (defined(subRegion)) {

diff --git a/Source/DataSources/LabelGraphics.js b/Source/DataSources/LabelGraphics.js
@@ -92,6 +92,10 @@ define([
         this._scaleByDistanceSubscription = undefined;
         this._distanceDisplayCondition = undefined;
         this._distanceDisplayConditionSubscription = undefined;
+        this._disableDepthDistance = undefined;
+        this._disableDepthDistanceSubscription = undefined;
+        this._alwaysDisableDepth = undefined;
+        this._alwaysDisableDepthSubscription = undefined;
         this._definitionChanged = new Event();
 
         this.merge(defaultValue(options, defaultValue.EMPTY_OBJECT));
@@ -309,7 +313,11 @@ define([
          * @memberof LabelGraphics.prototype
          * @type {Property}
          */
-        distanceDisplayCondition : createPropertyDescriptor('distanceDisplayCondition')
+        distanceDisplayCondition : createPropertyDescriptor('distanceDisplayCondition'),
+
+        disableDepthDistance : createPropertyDescriptor('disableDepthDistance'),
+
+        alwaysDisableDepthDistance : createPropertyDescriptor('alwaysDisableDepth')
     });
 
     /**
@@ -342,6 +350,8 @@ define([
         result.pixelOffsetScaleByDistance = this.pixelOffsetScaleByDistance;
         result.scaleByDistance = this.scaleByDistance;
         result.distanceDisplayCondition = this.distanceDisplayCondition;
+        result.disableDepthDistance = this.disableDepthDistance;
+        result.alwaysDisableDepth = this.alwaysDisableDepth;
         return result;
     };
 
@@ -374,10 +384,12 @@ define([
         this.eyeOffset = defaultValue(this.eyeOffset, source.eyeOffset);
         this.heightReference = defaultValue(this.heightReference, source.heightReference);
         this.pixelOffset = defaultValue(this.pixelOffset, source.pixelOffset);
-        this.translucencyByDistance = defaultValue(this._translucencyByDistance, source.translucencyByDistance);
-        this.pixelOffsetScaleByDistance = defaultValue(this._pixelOffsetScaleByDistance, source.pixelOffsetScaleByDistance);
-        this.scaleByDistance = defaultValue(this._scaleByDistance, source.scaleByDistance);
+        this.translucencyByDistance = defaultValue(this.translucencyByDistance, source.translucencyByDistance);
+        this.pixelOffsetScaleByDistance = defaultValue(this.pixelOffsetScaleByDistance, source.pixelOffsetScaleByDistance);
+        this.scaleByDistance = defaultValue(this.scaleByDistance, source.scaleByDistance);
         this.distanceDisplayCondition = defaultValue(this.distanceDisplayCondition, source.distanceDisplayCondition);
+        this.disableDepthDistance = defaultValue(this.disableDepthDistance, source.disableDepthDistance);
+        this.alwaysDisableDepth = defaultValue(this.alwaysDisableDepth, source.alwaysDisableDepth);
     };
 
     return LabelGraphics;

diff --git a/Source/DataSources/LabelVisualizer.js b/Source/DataSources/LabelVisualizer.js
@@ -164,6 +164,8 @@ define([
             label.pixelOffsetScaleByDistance = Property.getValueOrUndefined(labelGraphics._pixelOffsetScaleByDistance, time, pixelOffsetScaleByDistance);
             label.scaleByDistance = Property.getValueOrUndefined(labelGraphics._scaleByDistance, time, scaleByDistance);
             label.distanceDisplayCondition = Property.getValueOrUndefined(labelGraphics._distanceDisplayCondition, time, distanceDisplayCondition);
+            label.disableDepthDistance = Property.getValueOrUndefined(labelGraphics._disableDepthDistance, time);
+            label.alwaysDisableDepth = Property.getValueOrUndefined(labelGraphics._alwaysDisableDepth, time);
         }
         return true;
     };

diff --git a/Source/DataSources/PointGraphics.js b/Source/DataSources/PointGraphics.js
@@ -51,6 +51,10 @@ define([
         this._heightReferenceSubscription = undefined;
         this._distanceDisplayCondition = undefined;
         this._distanceDisplayConditionSubscription = undefined;
+        this._disableDepthDistance = undefined;
+        this._disableDepthDistanceSubscription = undefined;
+        this._alwaysDisableDepth = undefined;
+        this._alwaysDisableDepthSubscription = undefined;
         this._definitionChanged = new Event();
 
         this.merge(defaultValue(options, defaultValue.EMPTY_OBJECT));
@@ -142,7 +146,11 @@ define([
          * @memberof PointGraphics.prototype
          * @type {Property}
          */
-        distanceDisplayCondition : createPropertyDescriptor('distanceDisplayCondition')
+        distanceDisplayCondition : createPropertyDescriptor('distanceDisplayCondition'),
+
+        disableDepthDistance : createPropertyDescriptor('disableDepthDistance'),
+
+        alwaysDisableDepth : createPropertyDescriptor('alwaysDisableDepth')
     });
 
     /**
@@ -164,6 +172,8 @@ define([
         result.translucencyByDistance = this._translucencyByDistance;
         result.heightReference = this.heightReference;
         result.distanceDisplayCondition = this.distanceDisplayCondition;
+        result.disableDepthDistance = this.disableDepthDistance;
+        result.alwaysDisableDepth = this.alwaysDisableDepth;
         return result;
     };
 
@@ -189,6 +199,8 @@ define([
         this.translucencyByDistance = defaultValue(this._translucencyByDistance, source.translucencyByDistance);
         this.heightReference = defaultValue(this.heightReference, source.heightReference);
         this.distanceDisplayCondition = defaultValue(this.distanceDisplayCondition, source.distanceDisplayCondition);
+        this.disableDepthDistance = defaultValue(this.disableDepthDistance, source.disableDepthDistance);
+        this.alwaysDisableDepth = defaultValue(this.alwaysDisableDepth, source.alwaysDisableDepth);
     };
 
     return PointGraphics;

diff --git a/Source/DataSources/PointVisualizer.js b/Source/DataSources/PointVisualizer.js
@@ -143,12 +143,16 @@ define([
                 pointPrimitive.outlineWidth = Property.getValueOrDefault(pointGraphics._outlineWidth, time, defaultOutlineWidth);
                 pointPrimitive.pixelSize = Property.getValueOrDefault(pointGraphics._pixelSize, time, defaultPixelSize);
                 pointPrimitive.distanceDisplayCondition = Property.getValueOrUndefined(pointGraphics._distanceDisplayCondition, time, distanceDisplayCondition);
+                pointPrimitive.disableDepthDistance = Property.getValueOrUndefined(pointGraphics._disableDepthDistance, time);
+                pointPrimitive.alwaysDisableDepth = Property.getValueOrUndefined(pointGraphics._alwaysDisableDepth, time);
             } else { // billboard
                 billboard.show = true;
                 billboard.position = position;
                 billboard.scaleByDistance = Property.getValueOrUndefined(pointGraphics._scaleByDistance, time, scaleByDistance);
                 billboard.translucencyByDistance = Property.getValueOrUndefined(pointGraphics._translucencyByDistance, time, translucencyByDistance);
                 billboard.distanceDisplayCondition = Property.getValueOrUndefined(pointGraphics._distanceDisplayCondition, time, distanceDisplayCondition);
+                billboard.disableDepthDistance = Property.getValueOrUndefined(pointGraphics._disableDepthDistance, time);
+                billboard.alwaysDisableDepth = Property.getValueOrUndefined(pointGraphics._alwaysDisableDepth, time);
                 billboard.heightReference = heightReference;
 
                 var newColor = Property.getValueOrDefault(pointGraphics._color, time, defaultColor, color);

diff --git a/Source/Scene/Billboard.js b/Source/Scene/Billboard.js
@@ -111,6 +111,8 @@ define([
         this._pixelOffsetScaleByDistance = options.pixelOffsetScaleByDistance;
         this._sizeInMeters = defaultValue(options.sizeInMeters, false);
         this._distanceDisplayCondition = options.distanceDisplayCondition;
+        this._disableDepthDistance = options.disableDepthDistance;
+        this._alwaysDisableDepth = options.alwaysDisableDepth;
         this._id = options.id;
         this._collection = defaultValue(options.collection, billboardCollection);
 
@@ -178,7 +180,9 @@ define([
     var TRANSLUCENCY_BY_DISTANCE_INDEX = Billboard.TRANSLUCENCY_BY_DISTANCE_INDEX = 12;
     var PIXEL_OFFSET_SCALE_BY_DISTANCE_INDEX = Billboard.PIXEL_OFFSET_SCALE_BY_DISTANCE_INDEX = 13;
     var DISTANCE_DISPLAY_CONDITION = Billboard.DISTANCE_DISPLAY_CONDITION = 14;
-    Billboard.NUMBER_OF_PROPERTIES = 15;
+    var DISABLE_DEPTH_DISTANCE = Billboard.DISABLE_DEPTH_DISTANCE = 15;
+    var ALWAYS_DISABLE_DEPTH = Billboard.ALWAYS_DISABLE_DEPTH = 16;
+    Billboard.NUMBER_OF_PROPERTIES = 17;
 
     function makeDirty(billboard, propertyChanged) {
         var billboardCollection = billboard._billboardCollection;
@@ -748,6 +752,35 @@ define([
             }
         },
 
+        disableDepthDistance : {
+            get : function() {
+                return this._disableDepthDistance;
+            },
+            set : function(value) {
+                if (this._disableDepthDistance !== value) {
+                    //>>includeStart('debug', pragmas.debug);
+                    if (defined(value) && value <= 0.0) {
+                        throw new DeveloperError('disableDepthDistance must be greater than 0.0.');
+                    }
+                    //>>includeEnd('debug');
+                    this._disableDepthDistance = value;
+                    makeDirty(this, DISABLE_DEPTH_DISTANCE);
+                }
+            }
+        },
+
+        alwaysDisableDepth : {
+            get : function() {
+                return this._alwaysDisableDepth;
+            },
+            set : function(value) {
+                if (this._alwaysDisableDepth !== value) {
+                    this._alwaysDisableDepth = value;
+                    makeDirty(this, ALWAYS_DISABLE_DEPTH);
+                }
+            }
+        },
+
         /**
          * Gets or sets the user-defined object returned when the billboard is picked.
          * @memberof Billboard.prototype