Remove unneeded ImageryState.

CesiumGS · Mar 11, 2013 · b8b9f7d · b8b9f7d
1 parent 45eac42
commit b8b9f7d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/Source/Scene/ImageryLayer.js b/Source/Scene/ImageryLayer.js
@@ -636,7 +636,7 @@ define([
 
         imagery.texture = texture;
         imagery.image = undefined;
-        imagery.state = ImageryState.TEXTURE_LOADED;
+        imagery.state = ImageryState.READY;
     };
 
     /**

diff --git a/Source/Scene/ImageryState.js b/Source/Scene/ImageryState.js
@@ -9,7 +9,6 @@ define(['../Core/Enumeration'], function(Enumeration) {
         UNLOADED : new Enumeration(0, 'UNLOADED'),
         TRANSITIONING : new Enumeration(1, 'TRANSITIONING'),
         RECEIVED : new Enumeration(2, 'RECEIVED'),
-        TEXTURE_LOADED : new Enumeration(3, 'TEXTURE_LOADED'),
         READY : new Enumeration(4, 'READY'),
         FAILED : new Enumeration(5, 'FAILED'),
         INVALID : new Enumeration(6, 'INVALID'),

diff --git a/Source/Scene/Tile.js b/Source/Scene/Tile.js
@@ -405,11 +405,6 @@ define([
                     imageryLayer._createTexture(context, imagery);
                 }
 
-                if (imagery.state === ImageryState.TEXTURE_LOADED) {
-                    // TODO: unnecessary extra state.
-                    imagery.state = ImageryState.READY;
-                }
-
                 if (imagery.state === ImageryState.READY && typeof tileImagery.textureTranslationAndScale === 'undefined') {
                     tileImagery.textureTranslationAndScale = imageryLayer._calculateTextureTranslationAndScale(this, tileImagery);
                 }

diff --git a/Specs/Scene/ImageryLayerSpec.js b/Specs/Scene/ImageryLayerSpec.js
@@ -150,22 +150,12 @@ defineSuite([
             layer._createTexture(context, imagery);
         });
 
-        waitsFor(function() {
-            return imagery.state === ImageryState.TEXTURE_LOADED;
-        }, 'texture to load');
-
-        var textureBeforeReprojection;
-        runs(function() {
-            textureBeforeReprojection = imagery.texture;
-            layer._reprojectTexture(context, imagery);
-        });
-
         waitsFor(function() {
             return imagery.state === ImageryState.READY;
         }, 'texture to be ready');
 
         runs(function() {
-            expect(textureBeforeReprojection).not.toEqual(imagery.texture);
+            expect(imagery.texture).toBeDefined();
             imagery.releaseReference();
         });
     });