Merge remote-tracking branch 'origin/master' into gltf-8

CesiumGS · Jul 25, 2014 · 2d1383d · 2d1383d
2 parents 1fa8264 + 29ffe69
commit 2d1383d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/Source/Core/IauOrientationParameters.js b/Source/Core/IauOrientationParameters.js
@@ -20,26 +20,34 @@ define(function() {
          * The right ascension of the north pole of the body with respect to
          * the International Celestial Reference Frame, in radians.
          * @type {Number}
+         *
+         * @private
          */
         this.rightAscension = rightAscension;
 
         /**
          * The declination of the north pole of the body with respect to
          * the International Celestial Reference Frame, in radians.
          * @type {Number}
+         *
+         * @private
          */
         this.declination = declination;
 
         /**
          * The rotation about the north pole used to align a set of axes with
          * the meridian defined by the IAU report, in radians.
          * @type {Number}
+         *
+         * @private
          */
         this.rotation = rotation;
 
         /**
          * The instantaneous rotation rate about the north pole, in radians per second.
          * @type {Number}
+         *
+         * @private
          */
         this.rotationRate = rotationRate;
     };

diff --git a/Source/Core/TerrainProvider.js b/Source/Core/TerrainProvider.js
@@ -72,6 +72,7 @@ define([
          * indicates which areas of the globe are water rather than land, so they can be rendered
          * as a reflective surface with animated waves.  This function should not be
          * called before {@link TerrainProvider#ready} returns true.
+         * @memberof TerrainProvider.prototype
          * @type {Boolean}
          */
         hasWaterMask : {

diff --git a/Source/Scene/PerspectiveFrustum.js b/Source/Scene/PerspectiveFrustum.js
@@ -139,6 +139,7 @@ define([
 
         /**
          * Gets the angle of the vertical field of view, in radians.
+         * @memberof PerspectiveFrustum.prototype
          * @type {Number}
          * @default undefined
          */