Merge pull request CesiumGS#1589 from AnalyticalGraphicsInc/replaceGe…

…tSetScene Replace get/set functions with properties : Scene
yglee · Mar 31, 2014 · 700b5eb · 700b5eb
2 parents 0ef2bf8 + e614074
commit 700b5eb
Show file tree

Hide file tree

Showing 31 changed files with 724 additions and 738 deletions.
diff --git a/Apps/CesiumViewer/CesiumViewer.js b/Apps/CesiumViewer/CesiumViewer.js
@@ -90,10 +90,10 @@ define([
         var scene = viewer.scene;
         var context = scene.context;
         if (endUserOptions.debug) {
-            context.setValidateShaderProgram(true);
-            context.setValidateFramebuffer(true);
-            context.setLogShaderCompilation(true);
-            context.setThrowOnWebGLError(true);
+            context.validateShaderProgram = true;
+            context.validateFramebuffer = true;
+            context.logShaderCompilation = true;
+            context.throwOnWebGLError = true;
         }
 
         if (defined(endUserOptions.source)) {

diff --git a/Apps/Sandcastle/gallery/Imagery Adjustment.html b/Apps/Sandcastle/gallery/Imagery Adjustment.html
@@ -138,7 +138,7 @@
     }
 
     function updateSliders() {
-        if (imageryLayers.getLength() > 0) {
+        if (imageryLayers.length > 0) {
             var layer = imageryLayers.get(0);
             brightnessSlider.set('value', layer.brightness);
             contrastSlider.set('value', layer.contrast);

diff --git a/CHANGES.md b/CHANGES.md
@@ -76,6 +76,18 @@ Beta Releases
       * `getEnd` -> `end`
       * `getStartHeading` -> `startHeading`
       * `getEndHeading` -> `endHeading`
+    * `AnimationCollection`
+      * `getAll` -> `all`
+    * `CentralBodySurface`
+      * `getTerrainProvider`, `setTerrainProvider` -> `terrainProvider`
+    * `Credit`
+      * `getText` -> `text`
+      * `getImageUrl` -> `imageUrl`
+      * `getLink` -> `link`
+    * `TerrainData`, `HightmapTerrainData`, `QuanitzedMeshTerrainData`
+      * `getWaterMask` -> `waterMask`
+    * `Tile`
+      * `getChildren` -> `children`
     * `Buffer`
       * `getSizeInBytes` -> `sizeInBytes`
       * `getUsage` -> `usage`

diff --git a/Source/Renderer/AutomaticUniforms.js b/Source/Renderer/AutomaticUniforms.js
@@ -33,7 +33,7 @@ define([
     });
 
     AutomaticUniform.prototype.getDeclaration = function(name) {
-        var declaration = 'uniform ' + this.datatype.getGLSL() + ' ' + name;
+        var declaration = 'uniform ' + this.datatype.glsl + ' ' + name;
 
         var size = this.size;
         if (size === 1) {

diff --git a/Source/Renderer/CubeMap.js b/Source/Renderer/CubeMap.js
@@ -254,6 +254,12 @@ define([
             get : function() {
                 return this._flipY;
             }
+        },
+
+        _target : {
+            get : function() {
+                return this._textureTarget;
+            }
         }
     });
 
@@ -273,9 +279,9 @@ define([
      * // Generate mipmaps, and then set the sampler so mipmaps are used for
      * // minification when the cube map is sampled.
      * cubeMap.generateMipmap();
-     * cubeMap.setSampler(context.createSampler({
+     * cubeMap.sampler = context.createSampler({
      *   minificationFilter : Cesium.TextureMinificationFilter.NEAREST_MIPMAP_LINEAR
-     * }));
+     * });
      */
     CubeMap.prototype.generateMipmap = function(hint) {
         hint = defaultValue(hint, MipmapHint.DONT_CARE);
@@ -298,14 +304,6 @@ define([
         gl.bindTexture(target, null);
     };
 
-    CubeMap.prototype._getTexture = function() {
-        return this._texture;
-    };
-
-    CubeMap.prototype._getTarget = function() {
-        return this._textureTarget;
-    };
-
     /**
      * Returns true if this object was destroyed; otherwise, false.
      * <br /><br />

diff --git a/Source/Renderer/CubeMapFace.js b/Source/Renderer/CubeMapFace.js
@@ -52,6 +52,12 @@ define([
             get : function() {
                 return this._pixelDatatype;
             }
+        },
+
+        _target : {
+            get : function() {
+                return this._targetFace;
+            }
         }
     });
 
@@ -189,13 +195,5 @@ define([
         gl.bindTexture(target, null);
     };
 
-    CubeMapFace.prototype._getTexture = function() {
-        return this._texture;
-    };
-
-    CubeMapFace.prototype._getTarget = function() {
-        return this._targetFace;
-    };
-
     return CubeMapFace;
 });
diff --git a/Source/Renderer/Framebuffer.js b/Source/Renderer/Framebuffer.js
@@ -17,7 +17,7 @@ define([
 
     function attachTexture(framebuffer, attachment, texture) {
         var gl = framebuffer._gl;
-        gl.framebufferTexture2D(gl.FRAMEBUFFER, attachment, texture._getTarget(), texture._getTexture(), 0);
+        gl.framebufferTexture2D(gl.FRAMEBUFFER, attachment, texture._target, texture._texture, 0);
     }
 
     function attachRenderbuffer(framebuffer, attachment, renderbuffer) {