Merge pull request #73 from AnalyticalGraphicsInc/Issue66

Fixed Issue66 caused by undefined render state.
CesiumGS · Mar 12, 2014 · fa132e0 · fa132e0
2 parents 5aad3e7 + 9c25992
commit fa132e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/AGICHANGES.md b/AGICHANGES.md
@@ -7,6 +7,7 @@ Beta Releases
 ### b27 - 2014-04-01
 
 * Fixed crash and bug which prevented sensor dome and ellipsoid horizon surface materials from being changed after initial creation.
+* Fixed bug caused by undefined render state in sensor dome and ellipsoid horizon surface facets when the sensor definition was changed.
 
 ### b26 - 2014-03-03
 

diff --git a/Source/Scene/CustomSensorVolume.js b/Source/Scene/CustomSensorVolume.js
@@ -284,6 +284,7 @@ define([
          */
         this.ellipsoidHorizonSurfaceMaterial = defined(options.ellipsoidHorizonSurfaceMaterial) ? options.ellipsoidHorizonSurfaceMaterial : undefined;
         this._ellipsoidHorizonSurfaceMaterial = undefined;
+        this._ellipsoidHorizonSurfaceIsTranslucent = undefined;
 
         /**
          * The surface appearance of the sensor dome.  This can be one of several built-in {@link Material} objects or a custom material, scripted with
@@ -309,6 +310,7 @@ define([
          */
         this.domeSurfaceMaterial = defined(options.domeSurfaceMaterial) ? options.domeSurfaceMaterial : undefined;
         this._domeSurfaceMaterial = undefined;
+        this._domeSurfaceIsTranslucent = undefined;
 
         /**
          * The color of the polyline where the sensor outline intersects the central body.  The default is {@link Color.WHITE}.
@@ -1682,7 +1684,7 @@ define([
         var ellipsoidHorizonSurfaceIsTranslucent = ellipsoidHorizonSurfaceMaterial.isTranslucent();
 
         // Initial render state creation
-        if (showThroughEllipsoidChanged ||
+        if (definitionChanged || showThroughEllipsoidChanged ||
                 (!defined(this._ellipsoidHorizonSurfaceColorCommands)) ||
                 (this._ellipsoidHorizonSurfaceIsTranslucent !== ellipsoidHorizonSurfaceIsTranslucent)) {
 
@@ -1728,7 +1730,7 @@ define([
         var domeSurfaceIsTranslucent = domeSurfaceMaterial.isTranslucent();
 
         // Initial render state creation
-        if (showThroughEllipsoidChanged ||
+        if (definitionChanged || showThroughEllipsoidChanged ||
                 (!defined(this._domeColorCommands)) ||
                 (this._domeSurfaceIsTranslucent !== domeSurfaceIsTranslucent)) {