From f97d63ea010af07d21855e273ac3e0e98397107b Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Wed, 8 Aug 2018 22:48:46 +0300 Subject: [PATCH 01/12] Improve jsdoc tags for tsd-jsdoc integration --- Source/Core/ApproximateTerrainHeights.js | 1 + Source/Core/BingMapsGeocoderService.js | 4 ++-- Source/Core/Intersect.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/ApproximateTerrainHeights.js b/Source/Core/ApproximateTerrainHeights.js index 2f20a806afa3..4b1330c68919 100644 --- a/Source/Core/ApproximateTerrainHeights.js +++ b/Source/Core/ApproximateTerrainHeights.js @@ -42,6 +42,7 @@ define([ /** * A collection of functions for approximating terrain height * @private + * @exports ApproximateTerrainHeights */ var ApproximateTerrainHeights = {}; diff --git a/Source/Core/BingMapsGeocoderService.js b/Source/Core/BingMapsGeocoderService.js index 1764d39e1c09..fb1d7378bdf4 100644 --- a/Source/Core/BingMapsGeocoderService.js +++ b/Source/Core/BingMapsGeocoderService.js @@ -44,7 +44,7 @@ define([ /** * The URL endpoint for the Bing geocoder service * @type {String} - * @memberof {BingMapsGeocoderService.prototype} + * @memberof BingMapsGeocoderService.prototype * @readonly */ url : { @@ -56,7 +56,7 @@ define([ /** * The key for the Bing geocoder service * @type {String} - * @memberof {BingMapsGeocoderService.prototype} + * @memberof BingMapsGeocoderService.prototype * @readonly */ key : { diff --git a/Source/Core/Intersect.js b/Source/Core/Intersect.js index 613b44efc4a4..00c8e6ea9533 100644 --- a/Source/Core/Intersect.js +++ b/Source/Core/Intersect.js @@ -11,6 +11,7 @@ define([ * outside of the frustum's 6 planes (OUTSIDE). * * @exports Intersect + * @namespace */ var Intersect = { /** From b66dde98c23527d5328cda367c191c9490467e1c Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Tue, 14 Aug 2018 18:42:09 +0300 Subject: [PATCH 02/12] Reverting Intersect chages --- Source/Core/ApproximateTerrainHeights.js | 1 - Source/Core/Intersect.js | 1 - 2 files changed, 2 deletions(-) diff --git a/Source/Core/ApproximateTerrainHeights.js b/Source/Core/ApproximateTerrainHeights.js index 4b1330c68919..2f20a806afa3 100644 --- a/Source/Core/ApproximateTerrainHeights.js +++ b/Source/Core/ApproximateTerrainHeights.js @@ -42,7 +42,6 @@ define([ /** * A collection of functions for approximating terrain height * @private - * @exports ApproximateTerrainHeights */ var ApproximateTerrainHeights = {}; diff --git a/Source/Core/Intersect.js b/Source/Core/Intersect.js index 00c8e6ea9533..613b44efc4a4 100644 --- a/Source/Core/Intersect.js +++ b/Source/Core/Intersect.js @@ -11,7 +11,6 @@ define([ * outside of the frustum's 6 planes (OUTSIDE). * * @exports Intersect - * @namespace */ var Intersect = { /** From 4f34ae3d7dcf9b70b73d8cdbe33721e8d3451a05 Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Tue, 14 Aug 2018 21:23:30 +0300 Subject: [PATCH 03/12] Fix block tags in Core folder --- Source/Core/DoublyLinkedList.js | 4 ++++ Source/Core/Fullscreen.js | 1 + Source/Core/IauOrientationAxes.js | 2 +- Source/Core/IntersectionTests.js | 1 + Source/Core/MapboxApi.js | 3 +++ Source/Core/OrientedBoundingBox.js | 2 ++ Source/Core/PeliasGeocoderService.js | 2 +- Source/Core/Simon1994PlanetaryPositions.js | 11 +++++------ Source/Core/TimeIntervalCollection.js | 2 +- Source/Core/Transforms.js | 1 + Source/Core/binarySearch.js | 2 +- Source/Core/mergeSort.js | 2 +- Source/Core/writeTextToCanvas.js | 1 + 13 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Source/Core/DoublyLinkedList.js b/Source/Core/DoublyLinkedList.js index b34cac2c25ad..3c93110d837d 100644 --- a/Source/Core/DoublyLinkedList.js +++ b/Source/Core/DoublyLinkedList.js @@ -23,6 +23,10 @@ define([ } }); + /** + * @constructor + * @alias DoublyLinkedListNode + */ function DoublyLinkedListNode(item, previous, next) { this.item = item; this.previous = previous; diff --git a/Source/Core/Fullscreen.js b/Source/Core/Fullscreen.js index 2773263ee75b..60e772f455d5 100644 --- a/Source/Core/Fullscreen.js +++ b/Source/Core/Fullscreen.js @@ -20,6 +20,7 @@ define([ * Browser-independent functions for working with the standard fullscreen API. * * @exports Fullscreen + * @namespace * * @see {@link http://dvcs.w3.org/hg/fullscreen/raw-file/tip/Overview.html|W3C Fullscreen Living Specification} */ diff --git a/Source/Core/IauOrientationAxes.js b/Source/Core/IauOrientationAxes.js index fc6bcad19433..b6c7724312e5 100644 --- a/Source/Core/IauOrientationAxes.js +++ b/Source/Core/IauOrientationAxes.js @@ -80,7 +80,7 @@ define([ * * @param {JulianDate} date The date to evaluate the matrix. * @param {Matrix3} result The object onto which to store the result. - * @returns {Matrix} The modified result parameter or a new instance of the rotation from ICRF to Fixed. + * @returns {Matrix3} The modified result parameter or a new instance of the rotation from ICRF to Fixed. */ IauOrientationAxes.prototype.evaluate = function(date, result) { if (!defined(date)) { diff --git a/Source/Core/IntersectionTests.js b/Source/Core/IntersectionTests.js index d2e00bc3da4b..07dc96e60982 100644 --- a/Source/Core/IntersectionTests.js +++ b/Source/Core/IntersectionTests.js @@ -28,6 +28,7 @@ define([ * Functions for computing the intersection between geometries such as rays, planes, triangles, and ellipsoids. * * @exports IntersectionTests + * @namespace */ var IntersectionTests = {}; diff --git a/Source/Core/MapboxApi.js b/Source/Core/MapboxApi.js index e696cc31062f..b88d549d3bf8 100644 --- a/Source/Core/MapboxApi.js +++ b/Source/Core/MapboxApi.js @@ -6,6 +6,9 @@ define([ defined) { 'use strict'; + /** + * @exports MapboxApi + */ var MapboxApi = {}; /** diff --git a/Source/Core/OrientedBoundingBox.js b/Source/Core/OrientedBoundingBox.js index ae57fe7edb56..f26259021d0a 100644 --- a/Source/Core/OrientedBoundingBox.js +++ b/Source/Core/OrientedBoundingBox.js @@ -262,6 +262,8 @@ define([ * @param {Number} maximumZ Maximum Z extent in tangent plane space. * @param {OrientedBoundingBox} [result] The object onto which to store the result. * @returns {OrientedBoundingBox} The modified result parameter or a new OrientedBoundingBox instance if one was not provided. + * + * @exports fromTangentPlaneExtents */ function fromTangentPlaneExtents(tangentPlane, minimumX, maximumX, minimumY, maximumY, minimumZ, maximumZ, result) { //>>includeStart('debug', pragmas.debug); diff --git a/Source/Core/PeliasGeocoderService.js b/Source/Core/PeliasGeocoderService.js index 42857d93feda..5631a0260e64 100644 --- a/Source/Core/PeliasGeocoderService.js +++ b/Source/Core/PeliasGeocoderService.js @@ -47,7 +47,7 @@ define([ /** * The Resource used to access the Pelias endpoint. * @type {Resource} - * @memberof {PeliasGeocoderService.prototype} + * @memberof PeliasGeocoderService.prototype * @readonly */ url: { diff --git a/Source/Core/Simon1994PlanetaryPositions.js b/Source/Core/Simon1994PlanetaryPositions.js index 22c2d2e37d5b..5946464caedd 100644 --- a/Source/Core/Simon1994PlanetaryPositions.js +++ b/Source/Core/Simon1994PlanetaryPositions.js @@ -336,8 +336,8 @@ define([ /** * Gets a point describing the motion of the Earth-Moon barycenter according to the equations * described in section 6. + * @exports computeSimonEarthMoonBarycenter */ - function computeSimonEarthMoonBarycenter(date, result) { // t is thousands of years from J2000 TDB @@ -377,6 +377,7 @@ define([ /** * Gets a point describing the position of the moon according to the equations described in section 4. + * @exports computeSimonMoon */ function computeSimonMoon(date, result) { taiToTdb(date, scratchDate); @@ -481,11 +482,9 @@ define([ longitudeOfNode, meanLongitude, result); } - /** - * Gets a point describing the motion of the Earth. This point uses the Moon point and - * the 1992 mu value (ratio between Moon and Earth masses) in Table 2 of the paper in order - * to determine the position of the Earth relative to the Earth-Moon barycenter. - */ + // Gets a point describing the motion of the Earth. This point uses the Moon point and + // the 1992 mu value (ratio between Moon and Earth masses) in Table 2 of the paper in order + // to determine the position of the Earth relative to the Earth-Moon barycenter. var moonEarthMassRatio = 0.012300034; // From 1992 mu value in Table 2 var factor = moonEarthMassRatio / (moonEarthMassRatio + 1.0) * -1; function computeSimonEarth(date, result) { diff --git a/Source/Core/TimeIntervalCollection.js b/Source/Core/TimeIntervalCollection.js index d0570400a4fc..94b2b7e13af2 100644 --- a/Source/Core/TimeIntervalCollection.js +++ b/Source/Core/TimeIntervalCollection.js @@ -462,7 +462,7 @@ define([ * The data property of the input interval is ignored. * * @param {TimeInterval} interval The interval to remove. - * @returns true if the interval was removed, false if no part of the interval was in the collection. + * @returns {Boolean} true if the interval was removed, false if no part of the interval was in the collection. */ TimeIntervalCollection.prototype.removeInterval = function(interval) { //>>includeStart('debug', pragmas.debug); diff --git a/Source/Core/Transforms.js b/Source/Core/Transforms.js index 68d9d693ccc1..e26c7a878434 100644 --- a/Source/Core/Transforms.js +++ b/Source/Core/Transforms.js @@ -46,6 +46,7 @@ define([ * Contains functions for transforming positions to various reference frames. * * @exports Transforms + * @namespace */ var Transforms = {}; diff --git a/Source/Core/binarySearch.js b/Source/Core/binarySearch.js index 724824eda10d..44f99fe7e25c 100644 --- a/Source/Core/binarySearch.js +++ b/Source/Core/binarySearch.js @@ -8,7 +8,7 @@ define([ * Finds an item in a sorted array. * * @exports binarySearch - * + * @namespace * @param {Array} array The sorted array to search. * @param {*} itemToFind The item to find in the array. * @param {binarySearch~Comparator} comparator The function to use to compare the item to diff --git a/Source/Core/mergeSort.js b/Source/Core/mergeSort.js index be2ec430420c..e4619e417043 100644 --- a/Source/Core/mergeSort.js +++ b/Source/Core/mergeSort.js @@ -57,7 +57,7 @@ define([ * A stable merge sort. * * @exports mergeSort - * + * @namespace * @param {Array} array The array to sort. * @param {mergeSort~Comparator} comparator The function to use to compare elements in the array. * @param {*} [userDefinedObject] Any item to pass as the third parameter to comparator. diff --git a/Source/Core/writeTextToCanvas.js b/Source/Core/writeTextToCanvas.js index d092f31afe84..9024097a4c7e 100644 --- a/Source/Core/writeTextToCanvas.js +++ b/Source/Core/writeTextToCanvas.js @@ -32,6 +32,7 @@ define([ * @returns {Canvas} A new canvas with the given text drawn into it. The dimensions object * from measureText will also be added to the returned canvas. If text is * blank, returns undefined. + * @exports writeTextToCanvas */ function writeTextToCanvas(text, options) { //>>includeStart('debug', pragmas.debug); From ec4f360ff23d648c6c104ab015079e413083c913 Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Fri, 17 Aug 2018 09:31:03 +0300 Subject: [PATCH 04/12] Use Promise without type for promises that when resolved, return no value --- Source/Core/EarthOrientationParameters.js | 2 +- Source/Core/Iau2006XysData.js | 2 +- Source/Core/Transforms.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/EarthOrientationParameters.js b/Source/Core/EarthOrientationParameters.js index d24a7670ba3d..1b2d58059dc3 100644 --- a/Source/Core/EarthOrientationParameters.js +++ b/Source/Core/EarthOrientationParameters.js @@ -136,7 +136,7 @@ define([ * Gets a promise that, when resolved, indicates that the EOP data has been loaded and is * ready to use. * - * @returns {Promise.} The promise. + * @returns {Promise} The promise. * * @see when */ diff --git a/Source/Core/Iau2006XysData.js b/Source/Core/Iau2006XysData.js index 1cebba46737b..2c690dd03ed6 100644 --- a/Source/Core/Iau2006XysData.js +++ b/Source/Core/Iau2006XysData.js @@ -96,7 +96,7 @@ define([ * the Terrestrial Time (TT) time standard. * @param {Number} stopSecondTT The seconds past noon of the end of the interval to preload, expressed in * the Terrestrial Time (TT) time standard. - * @returns {Promise.} A promise that, when resolved, indicates that the requested interval has been + * @returns {Promise} A promise that, when resolved, indicates that the requested interval has been * preloaded. */ Iau2006XysData.prototype.preload = function(startDayTT, startSecondTT, stopDayTT, stopSecondTT) { diff --git a/Source/Core/Transforms.js b/Source/Core/Transforms.js index e26c7a878434..5d098dc6b4f2 100644 --- a/Source/Core/Transforms.js +++ b/Source/Core/Transforms.js @@ -488,7 +488,7 @@ define([ * indicates that the preload has completed. * * @param {TimeInterval} timeInterval The interval to preload. - * @returns {Promise.} A promise that, when resolved, indicates that the preload has completed + * @returns {Promise} A promise that, when resolved, indicates that the preload has completed * and evaluation of the transformation between the fixed and ICRF axes will * no longer return undefined for a time inside the interval. * From c64a751c0a3fc648fc6e8744448b0b2b57195414 Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Thu, 23 Aug 2018 16:53:35 +0300 Subject: [PATCH 05/12] Use typedef for Intersect object --- Source/Core/Intersect.js | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/Source/Core/Intersect.js b/Source/Core/Intersect.js index 613b44efc4a4..04213869861f 100644 --- a/Source/Core/Intersect.js +++ b/Source/Core/Intersect.js @@ -10,31 +10,15 @@ define([ * partially inside the frustum and partially outside (INTERSECTING), or somwhere entirely * outside of the frustum's 6 planes (OUTSIDE). * - * @exports Intersect + * @typedef Intersect + * @type {Object} + * @property {Number} OUTSIDE Represents that an object is not contained within the frustum. + * @property {Number} INTERSECTING Represents that an object intersects one of the frustum's planes. + * @property {Number} INSIDE Represents that an object is fully within the frustum. */ var Intersect = { - /** - * Represents that an object is not contained within the frustum. - * - * @type {Number} - * @constant - */ OUTSIDE : -1, - - /** - * Represents that an object intersects one of the frustum's planes. - * - * @type {Number} - * @constant - */ INTERSECTING : 0, - - /** - * Represents that an object is fully within the frustum. - * - * @type {Number} - * @constant - */ INSIDE : 1 }; From e5e9d0755c63e2228934630480590131c37d3d8d Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Mon, 27 Aug 2018 18:24:34 +0300 Subject: [PATCH 06/12] Restore exports block tag in Intersect --- Source/Core/Intersect.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/Intersect.js b/Source/Core/Intersect.js index 04213869861f..8ac9038fc865 100644 --- a/Source/Core/Intersect.js +++ b/Source/Core/Intersect.js @@ -10,6 +10,7 @@ define([ * partially inside the frustum and partially outside (INTERSECTING), or somwhere entirely * outside of the frustum's 6 planes (OUTSIDE). * + * @exports Intersect * @typedef Intersect * @type {Object} * @property {Number} OUTSIDE Represents that an object is not contained within the frustum. From aaa7d8ad4fa71a2364a1a27ff4863f876a0f538a Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Wed, 31 Oct 2018 19:37:51 +0200 Subject: [PATCH 07/12] Reverting Intersect --- Source/Core/Intersect.js | 55 +++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/Source/Core/Intersect.js b/Source/Core/Intersect.js index 8ac9038fc865..c149470a30b9 100644 --- a/Source/Core/Intersect.js +++ b/Source/Core/Intersect.js @@ -1,27 +1,42 @@ define([ - './freezeObject' - ], function( - freezeObject) { - 'use strict'; + './freezeObject' +], function( + freezeObject) { +'use strict'; +/** + * This enumerated type is used in determining where, relative to the frustum, an + * object is located. The object can either be fully contained within the frustum (INSIDE), + * partially inside the frustum and partially outside (INTERSECTING), or somwhere entirely + * outside of the frustum's 6 planes (OUTSIDE). + * + * @exports Intersect + */ +var Intersect = { /** - * This enumerated type is used in determining where, relative to the frustum, an - * object is located. The object can either be fully contained within the frustum (INSIDE), - * partially inside the frustum and partially outside (INTERSECTING), or somwhere entirely - * outside of the frustum's 6 planes (OUTSIDE). + * Represents that an object is not contained within the frustum. * - * @exports Intersect - * @typedef Intersect - * @type {Object} - * @property {Number} OUTSIDE Represents that an object is not contained within the frustum. - * @property {Number} INTERSECTING Represents that an object intersects one of the frustum's planes. - * @property {Number} INSIDE Represents that an object is fully within the frustum. + * @type {Number} + * @constant */ - var Intersect = { - OUTSIDE : -1, - INTERSECTING : 0, - INSIDE : 1 - }; + OUTSIDE : -1, - return freezeObject(Intersect); + /** + * Represents that an object intersects one of the frustum's planes. + * + * @type {Number} + * @constant + */ + INTERSECTING : 0, + + /** + * Represents that an object is fully within the frustum. + * + * @type {Number} + * @constant + */ + INSIDE : 1 +}; + +return freezeObject(Intersect); }); From d27f5a3d4f74b75a40e36e8942b87c430e5ea552 Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Thu, 1 Nov 2018 15:06:54 +0200 Subject: [PATCH 08/12] Fix Event and Request documentation --- Source/Core/Event.js | 4 ++-- Source/Core/Request.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/Core/Event.js b/Source/Core/Event.js index 2f5b6b810add..68ae3cba6252 100644 --- a/Source/Core/Event.js +++ b/Source/Core/Event.js @@ -15,7 +15,8 @@ define([ * * @alias Event * @constructor - * + * @namespace + * @exports Event * @example * MyObject.prototype.myListener = function(arg1, arg2) { * this.myArg1Copy = arg1; @@ -38,7 +39,6 @@ define([ defineProperties(Event.prototype, { /** * The number of listeners currently subscribed to the event. - * @memberof Event.prototype * @type {Number} * @readonly */ diff --git a/Source/Core/Request.js b/Source/Core/Request.js index ba8d57f5066d..44b51c9954dd 100644 --- a/Source/Core/Request.js +++ b/Source/Core/Request.js @@ -15,9 +15,10 @@ define([ * * @alias Request * @constructor - * + * @namespace + * @exports Request * @param {Object} [options] An object with the following properties: - * @param {Boolean} [options.url] The url to request. + * @param {String} [options.url] The url to request. * @param {Request~RequestCallback} [options.requestFunction] The function that makes the actual data request. * @param {Request~CancelCallback} [options.cancelFunction] The function that is called when the request is cancelled. * @param {Request~PriorityCallback} [options.priorityFunction] The function that is called to update the request's priority, which occurs once per frame. From 12d9f34aac0154adb9926097f557a8b9b2510285 Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Wed, 7 Nov 2018 15:57:41 +0200 Subject: [PATCH 09/12] Fix for DataSources --- Source/DataSources/GroundGeometryUpdater.js | 2 +- Source/DataSources/KmlTour.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/DataSources/GroundGeometryUpdater.js b/Source/DataSources/GroundGeometryUpdater.js index 76c2c7b1810e..8ed1d244317a 100644 --- a/Source/DataSources/GroundGeometryUpdater.js +++ b/Source/DataSources/GroundGeometryUpdater.js @@ -39,7 +39,7 @@ define([ /** * An abstract class for updating ground geometry entities. * @constructor - * + * @alias GroundGeometryUpdater * @param {Object} options An object with the following properties: * @param {Entity} options.entity The entity containing the geometry to be visualized. * @param {Scene} options.scene The scene where visualization is taking place. diff --git a/Source/DataSources/KmlTour.js b/Source/DataSources/KmlTour.js index d708ed8825e9..dfbd9b87fb88 100644 --- a/Source/DataSources/KmlTour.js +++ b/Source/DataSources/KmlTour.js @@ -109,6 +109,7 @@ define([ /** * Stop all activeEntries. * @param {Array} activeEntries + * @exports cancelAllEntries */ function cancelAllEntries(activeEntries) { for(var entry = activeEntries.pop(); entry !== undefined; entry = activeEntries.pop()) { @@ -125,6 +126,8 @@ define([ * @param {Object} cameraOptions see {@link Camera#flyTo}. * @param {Function} allDone a function will be called when all entries from playlist * being played or user call {@link KmlTour#stop}. + * + * @exports playEntry */ function playEntry(viewer, cameraOptions, allDone) { var entry = this.playlist[this.playlistIndex]; @@ -161,6 +164,8 @@ define([ * @param {Function} allDone passed for recursion. * @param {Boolean} terminated true if active entry was terminated, * and the whole tour should be terminated. + * + * @exports playNext */ function playNext(viewer, cameraOptions, allDone, terminated) { var entry = this.playlist[this.playlistIndex]; From aa9dcb18a342f81b5cc4844ebadaadaff788ffb2 Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Wed, 7 Nov 2018 16:41:13 +0200 Subject: [PATCH 10/12] Fix Renderer documentation --- Source/Renderer/CubeMap.js | 4 ++ Source/Renderer/Texture.js | 4 ++ Source/Renderer/createUniform.js | 68 ++++++++++++++++++++++++--- Source/Renderer/createUniformArray.js | 68 +++++++++++++++++++++++++-- 4 files changed, 133 insertions(+), 11 deletions(-) diff --git a/Source/Renderer/CubeMap.js b/Source/Renderer/CubeMap.js index 74f96802ceac..0b692709b6a0 100644 --- a/Source/Renderer/CubeMap.js +++ b/Source/Renderer/CubeMap.js @@ -32,6 +32,10 @@ define([ TextureMinificationFilter) { 'use strict'; + /** + * @alias CubeMap + * @constructor + */ function CubeMap(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Renderer/Texture.js b/Source/Renderer/Texture.js index b89f8db0df0c..21e9e2c0395b 100644 --- a/Source/Renderer/Texture.js +++ b/Source/Renderer/Texture.js @@ -36,6 +36,10 @@ define([ TextureMinificationFilter) { 'use strict'; + /** + * @alias Texture + * @constructor + */ function Texture(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Renderer/createUniform.js b/Source/Renderer/createUniform.js index 005710712a1a..58ad17763c51 100644 --- a/Source/Renderer/createUniform.js +++ b/Source/Renderer/createUniform.js @@ -69,8 +69,13 @@ define([ } } + /** + * @alias UniformFloat + * @constructor + */ function UniformFloat(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -91,8 +96,13 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformFloatVec2 + * @constructor + */ function UniformFloatVec2(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -114,8 +124,13 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformFloatVec3 + * @constructor + */ function UniformFloatVec3(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -149,8 +164,13 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformFloatVec4 + * @constructor + */ function UniformFloatVec4(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -184,8 +204,13 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformSampler + * @constructor + */ function UniformSampler(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -214,8 +239,13 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformInt + * @constructor + */ function UniformInt(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -235,9 +265,13 @@ define([ }; /////////////////////////////////////////////////////////////////////////// - + /** + * @alias UniformIntVec2 + * @constructor + */ function UniformIntVec2(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -258,9 +292,13 @@ define([ }; /////////////////////////////////////////////////////////////////////////// - + /** + * @alias UniformIntVec3 + * @constructor + */ function UniformIntVec3(gl, activeUniform, uniformName, location) { - /** + /** + * @type {String} * @readonly */ this.name = uniformName; @@ -281,9 +319,13 @@ define([ }; /////////////////////////////////////////////////////////////////////////// - + /** + * @alias UniformIntVec4 + * @constructor + */ function UniformIntVec4(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -306,9 +348,13 @@ define([ /////////////////////////////////////////////////////////////////////////// var scratchUniformArray = new Float32Array(4); - + /** + * @alias UniformMat2 + * @constructor + */ function UniformMat2(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -332,9 +378,13 @@ define([ /////////////////////////////////////////////////////////////////////////// var scratchMat3Array = new Float32Array(9); - + /** + * @alias UniformMat3 + * @constructor + */ function UniformMat3(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; @@ -358,9 +408,13 @@ define([ /////////////////////////////////////////////////////////////////////////// var scratchMat4Array = new Float32Array(16); - + /** + * @alias UniformMat4 + * @constructor + */ function UniformMat4(gl, activeUniform, uniformName, location) { /** + * @type {String} * @readonly */ this.name = uniformName; diff --git a/Source/Renderer/createUniformArray.js b/Source/Renderer/createUniformArray.js index 002fd33ffc00..ae79b4f6e094 100644 --- a/Source/Renderer/createUniformArray.js +++ b/Source/Renderer/createUniformArray.js @@ -61,10 +61,15 @@ define([ } } + /** + * @alias UniformArrayFloat + * @constructor + */ function UniformArrayFloat(gl, activeUniform, uniformName, locations) { var length = locations.length; - /** + /** + * @type {String} * @readonly */ this.name = uniformName; @@ -98,10 +103,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayFloatVec2 + * @constructor + */ function UniformArrayFloatVec2(gl, activeUniform, uniformName, locations) { var length = locations.length; - /** + /** + * @type {String} * @readonly */ this.name = uniformName; @@ -137,10 +147,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayFloatVec3 + * @constructor + */ function UniformArrayFloatVec3(gl, activeUniform, uniformName, locations) { var length = locations.length; - /** + /** + * @type {String} * @readonly */ this.name = uniformName; @@ -193,10 +208,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayFloatVec4 + * @constructor + */ function UniformArrayFloatVec4(gl, activeUniform, uniformName, locations) { var length = locations.length; - /** + /** + * @type {String} * @readonly */ this.name = uniformName; @@ -255,10 +275,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArraySampler + * @constructor + */ function UniformArraySampler(gl, activeUniform, uniformName, locations) { var length = locations.length; /** + * @type {String} * @readonly */ this.name = uniformName; @@ -300,10 +325,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayInt + * @constructor + */ function UniformArrayInt(gl, activeUniform, uniformName, locations) { var length = locations.length; /** + * @type {String} * @readonly */ this.name = uniformName; @@ -337,10 +367,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayIntVec2 + * @constructor + */ function UniformArrayIntVec2(gl, activeUniform, uniformName, locations) { var length = locations.length; /** + * @type {String} * @readonly */ this.name = uniformName; @@ -376,10 +411,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayIntVec3 + * @constructor + */ function UniformArrayIntVec3(gl, activeUniform, uniformName, locations) { var length = locations.length; /** + * @type {String} * @readonly */ this.name = uniformName; @@ -415,10 +455,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayIntVec4 + * @constructor + */ function UniformArrayIntVec4(gl, activeUniform, uniformName, locations) { var length = locations.length; /** + * @type {String} * @readonly */ this.name = uniformName; @@ -454,10 +499,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayMat2 + * @constructor + */ function UniformArrayMat2(gl, activeUniform, uniformName, locations) { var length = locations.length; /** + * @type {String} * @readonly */ this.name = uniformName; @@ -493,10 +543,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayMat3 + * @constructor + */ function UniformArrayMat3(gl, activeUniform, uniformName, locations) { var length = locations.length; /** + * @type {String} * @readonly */ this.name = uniformName; @@ -532,10 +587,15 @@ define([ /////////////////////////////////////////////////////////////////////////// + /** + * @alias UniformArrayMat4 + * @constructor + */ function UniformArrayMat4(gl, activeUniform, uniformName, locations) { var length = locations.length; /** + * @type {String} * @readonly */ this.name = uniformName; From 5ac68ecab7ce414f7d9fae6397762e7451035e37 Mon Sep 17 00:00:00 2001 From: Aristeidis Bampakos Date: Fri, 14 Dec 2018 17:53:08 +0200 Subject: [PATCH 11/12] Revert whitespaces and missing member of Event prototype --- Source/Core/Event.js | 1 + Source/Core/Intersect.js | 66 ++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/Source/Core/Event.js b/Source/Core/Event.js index 68ae3cba6252..49b84b5d6275 100644 --- a/Source/Core/Event.js +++ b/Source/Core/Event.js @@ -39,6 +39,7 @@ define([ defineProperties(Event.prototype, { /** * The number of listeners currently subscribed to the event. + * @memberof Event.prototype * @type {Number} * @readonly */ diff --git a/Source/Core/Intersect.js b/Source/Core/Intersect.js index c149470a30b9..613b44efc4a4 100644 --- a/Source/Core/Intersect.js +++ b/Source/Core/Intersect.js @@ -1,42 +1,42 @@ define([ - './freezeObject' -], function( - freezeObject) { -'use strict'; + './freezeObject' + ], function( + freezeObject) { + 'use strict'; -/** - * This enumerated type is used in determining where, relative to the frustum, an - * object is located. The object can either be fully contained within the frustum (INSIDE), - * partially inside the frustum and partially outside (INTERSECTING), or somwhere entirely - * outside of the frustum's 6 planes (OUTSIDE). - * - * @exports Intersect - */ -var Intersect = { /** - * Represents that an object is not contained within the frustum. + * This enumerated type is used in determining where, relative to the frustum, an + * object is located. The object can either be fully contained within the frustum (INSIDE), + * partially inside the frustum and partially outside (INTERSECTING), or somwhere entirely + * outside of the frustum's 6 planes (OUTSIDE). * - * @type {Number} - * @constant + * @exports Intersect */ - OUTSIDE : -1, + var Intersect = { + /** + * Represents that an object is not contained within the frustum. + * + * @type {Number} + * @constant + */ + OUTSIDE : -1, - /** - * Represents that an object intersects one of the frustum's planes. - * - * @type {Number} - * @constant - */ - INTERSECTING : 0, + /** + * Represents that an object intersects one of the frustum's planes. + * + * @type {Number} + * @constant + */ + INTERSECTING : 0, - /** - * Represents that an object is fully within the frustum. - * - * @type {Number} - * @constant - */ - INSIDE : 1 -}; + /** + * Represents that an object is fully within the frustum. + * + * @type {Number} + * @constant + */ + INSIDE : 1 + }; -return freezeObject(Intersect); + return freezeObject(Intersect); }); From 80a94617ab2b68d5018f1ce91f659b57e74fefe2 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Fri, 14 Dec 2018 14:26:40 -0500 Subject: [PATCH 12/12] cleanup --- Source/Core/DoublyLinkedList.js | 3 +- Source/Core/Event.js | 2 - Source/Core/OrientedBoundingBox.js | 15 ----- Source/Core/Simon1994PlanetaryPositions.js | 11 +--- Source/Core/binarySearch.js | 1 - Source/Core/mergeSort.js | 1 - Source/DataSources/KmlTour.js | 33 ++-------- Source/Renderer/CubeMap.js | 5 +- Source/Renderer/Texture.js | 3 +- Source/Renderer/createUniform.js | 60 ++++++++----------- Source/Renderer/createUniformArray.js | 70 +++++++++------------- 11 files changed, 63 insertions(+), 141 deletions(-) diff --git a/Source/Core/DoublyLinkedList.js b/Source/Core/DoublyLinkedList.js index 3c93110d837d..5c28902e7f2a 100644 --- a/Source/Core/DoublyLinkedList.js +++ b/Source/Core/DoublyLinkedList.js @@ -24,8 +24,7 @@ define([ }); /** - * @constructor - * @alias DoublyLinkedListNode + * @private */ function DoublyLinkedListNode(item, previous, next) { this.item = item; diff --git a/Source/Core/Event.js b/Source/Core/Event.js index 49b84b5d6275..a6fe17432ec4 100644 --- a/Source/Core/Event.js +++ b/Source/Core/Event.js @@ -15,8 +15,6 @@ define([ * * @alias Event * @constructor - * @namespace - * @exports Event * @example * MyObject.prototype.myListener = function(arg1, arg2) { * this.myArg1Copy = arg1; diff --git a/Source/Core/OrientedBoundingBox.js b/Source/Core/OrientedBoundingBox.js index f26259021d0a..dcbad14e1e85 100644 --- a/Source/Core/OrientedBoundingBox.js +++ b/Source/Core/OrientedBoundingBox.js @@ -250,21 +250,6 @@ define([ var scratchOffset = new Cartesian3(); var scratchScale = new Cartesian3(); - /** - * Computes an OrientedBoundingBox given extents in the east-north-up space of the tangent plane. - * - * @param {Plane} tangentPlane The tangent place corresponding to east-north-up. - * @param {Number} minimumX Minimum X extent in tangent plane space. - * @param {Number} maximumX Maximum X extent in tangent plane space. - * @param {Number} minimumY Minimum Y extent in tangent plane space. - * @param {Number} maximumY Maximum Y extent in tangent plane space. - * @param {Number} minimumZ Minimum Z extent in tangent plane space. - * @param {Number} maximumZ Maximum Z extent in tangent plane space. - * @param {OrientedBoundingBox} [result] The object onto which to store the result. - * @returns {OrientedBoundingBox} The modified result parameter or a new OrientedBoundingBox instance if one was not provided. - * - * @exports fromTangentPlaneExtents - */ function fromTangentPlaneExtents(tangentPlane, minimumX, maximumX, minimumY, maximumY, minimumZ, maximumZ, result) { //>>includeStart('debug', pragmas.debug); if (!defined(minimumX) || diff --git a/Source/Core/Simon1994PlanetaryPositions.js b/Source/Core/Simon1994PlanetaryPositions.js index 5946464caedd..2dc81def2e3b 100644 --- a/Source/Core/Simon1994PlanetaryPositions.js +++ b/Source/Core/Simon1994PlanetaryPositions.js @@ -333,11 +333,7 @@ define([ var Sl8 = -80 * 1e-7; var scratchDate = new JulianDate(0, 0.0, TimeStandard.TAI); - /** - * Gets a point describing the motion of the Earth-Moon barycenter according to the equations - * described in section 6. - * @exports computeSimonEarthMoonBarycenter - */ + // Gets a point describing the motion of the Earth-Moon barycenter according to the equations described in section 6. function computeSimonEarthMoonBarycenter(date, result) { // t is thousands of years from J2000 TDB @@ -375,10 +371,7 @@ define([ longitudeOfNode, meanLongitude, result); } - /** - * Gets a point describing the position of the moon according to the equations described in section 4. - * @exports computeSimonMoon - */ + // Gets a point describing the position of the moon according to the equations described in section 4. function computeSimonMoon(date, result) { taiToTdb(date, scratchDate); var x = (scratchDate.dayNumber - epoch.dayNumber) + ((scratchDate.secondsOfDay - epoch.secondsOfDay)/TimeConstants.SECONDS_PER_DAY); diff --git a/Source/Core/binarySearch.js b/Source/Core/binarySearch.js index 44f99fe7e25c..66d099e01442 100644 --- a/Source/Core/binarySearch.js +++ b/Source/Core/binarySearch.js @@ -8,7 +8,6 @@ define([ * Finds an item in a sorted array. * * @exports binarySearch - * @namespace * @param {Array} array The sorted array to search. * @param {*} itemToFind The item to find in the array. * @param {binarySearch~Comparator} comparator The function to use to compare the item to diff --git a/Source/Core/mergeSort.js b/Source/Core/mergeSort.js index e4619e417043..0aceef2beac6 100644 --- a/Source/Core/mergeSort.js +++ b/Source/Core/mergeSort.js @@ -57,7 +57,6 @@ define([ * A stable merge sort. * * @exports mergeSort - * @namespace * @param {Array} array The array to sort. * @param {mergeSort~Comparator} comparator The function to use to compare elements in the array. * @param {*} [userDefinedObject] Any item to pass as the third parameter to comparator. diff --git a/Source/DataSources/KmlTour.js b/Source/DataSources/KmlTour.js index dfbd9b87fb88..5c5d2d7da349 100644 --- a/Source/DataSources/KmlTour.js +++ b/Source/DataSources/KmlTour.js @@ -106,29 +106,15 @@ define([ cancelAllEntries(this._activeEntries); }; - /** - * Stop all activeEntries. - * @param {Array} activeEntries - * @exports cancelAllEntries - */ + // Stop all activeEntries. function cancelAllEntries(activeEntries) { for(var entry = activeEntries.pop(); entry !== undefined; entry = activeEntries.pop()) { entry.stop(); } } - /** - * Play playlist entry. - * This function is called recursevly with playNext - * and iterates over all entries from playlist. - * - * @param {ViewerWidget} viewer Cesium viewer. - * @param {Object} cameraOptions see {@link Camera#flyTo}. - * @param {Function} allDone a function will be called when all entries from playlist - * being played or user call {@link KmlTour#stop}. - * - * @exports playEntry - */ + // Play playlist entry. + // This function is called recursevly with playNext and iterates over all entries from playlist. function playEntry(viewer, cameraOptions, allDone) { var entry = this.playlist[this.playlistIndex]; if (entry) { @@ -155,18 +141,7 @@ define([ } } - /** - * Increment playlistIndex and call playEntry - * if terminated isn't true. - * - * @param {ViewerWidget} viewer passed for recursion. - * @param {Object} cameraOptions passed for recursion. - * @param {Function} allDone passed for recursion. - * @param {Boolean} terminated true if active entry was terminated, - * and the whole tour should be terminated. - * - * @exports playNext - */ + // Increment playlistIndex and call playEntry if terminated isn't true. function playNext(viewer, cameraOptions, allDone, terminated) { var entry = this.playlist[this.playlistIndex]; this.entryEnd.raiseEvent(entry, terminated); diff --git a/Source/Renderer/CubeMap.js b/Source/Renderer/CubeMap.js index 0b692709b6a0..5da788b1d252 100644 --- a/Source/Renderer/CubeMap.js +++ b/Source/Renderer/CubeMap.js @@ -33,9 +33,8 @@ define([ 'use strict'; /** - * @alias CubeMap - * @constructor - */ + * @private + */ function CubeMap(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Renderer/Texture.js b/Source/Renderer/Texture.js index 21e9e2c0395b..73fd4e66d28b 100644 --- a/Source/Renderer/Texture.js +++ b/Source/Renderer/Texture.js @@ -37,8 +37,7 @@ define([ 'use strict'; /** - * @alias Texture - * @constructor + * @private */ function Texture(options) { options = defaultValue(options, defaultValue.EMPTY_OBJECT); diff --git a/Source/Renderer/createUniform.js b/Source/Renderer/createUniform.js index 58ad17763c51..5fb8dcf40ed8 100644 --- a/Source/Renderer/createUniform.js +++ b/Source/Renderer/createUniform.js @@ -70,9 +70,8 @@ define([ } /** - * @alias UniformFloat - * @constructor - */ + * @private + */ function UniformFloat(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -97,9 +96,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformFloatVec2 - * @constructor - */ + * @private + */ function UniformFloatVec2(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -125,9 +123,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformFloatVec3 - * @constructor - */ + * @private + */ function UniformFloatVec3(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -165,9 +162,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformFloatVec4 - * @constructor - */ + * @private + */ function UniformFloatVec4(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -205,9 +201,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformSampler - * @constructor - */ + * @private + */ function UniformSampler(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -240,9 +235,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformInt - * @constructor - */ + * @private + */ function UniformInt(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -266,9 +260,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformIntVec2 - * @constructor - */ + * @private + */ function UniformIntVec2(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -293,9 +286,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformIntVec3 - * @constructor - */ + * @private + */ function UniformIntVec3(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -320,9 +312,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformIntVec4 - * @constructor - */ + * @private + */ function UniformIntVec4(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -349,9 +340,8 @@ define([ var scratchUniformArray = new Float32Array(4); /** - * @alias UniformMat2 - * @constructor - */ + * @private + */ function UniformMat2(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -379,9 +369,8 @@ define([ var scratchMat3Array = new Float32Array(9); /** - * @alias UniformMat3 - * @constructor - */ + * @private + */ function UniformMat3(gl, activeUniform, uniformName, location) { /** * @type {String} @@ -409,9 +398,8 @@ define([ var scratchMat4Array = new Float32Array(16); /** - * @alias UniformMat4 - * @constructor - */ + * @private + */ function UniformMat4(gl, activeUniform, uniformName, location) { /** * @type {String} diff --git a/Source/Renderer/createUniformArray.js b/Source/Renderer/createUniformArray.js index ae79b4f6e094..4ace591f89dd 100644 --- a/Source/Renderer/createUniformArray.js +++ b/Source/Renderer/createUniformArray.js @@ -62,9 +62,8 @@ define([ } /** - * @alias UniformArrayFloat - * @constructor - */ + * @private + */ function UniformArrayFloat(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -104,9 +103,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformArrayFloatVec2 - * @constructor - */ + * @private + */ function UniformArrayFloatVec2(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -148,9 +146,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformArrayFloatVec3 - * @constructor - */ + * @private + */ function UniformArrayFloatVec3(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -209,9 +206,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformArrayFloatVec4 - * @constructor - */ + * @private + */ function UniformArrayFloatVec4(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -275,10 +271,9 @@ define([ /////////////////////////////////////////////////////////////////////////// - /** - * @alias UniformArraySampler - * @constructor - */ + /** + * @private + */ function UniformArraySampler(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -325,10 +320,9 @@ define([ /////////////////////////////////////////////////////////////////////////// - /** - * @alias UniformArrayInt - * @constructor - */ + /** + * @private + */ function UniformArrayInt(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -368,9 +362,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformArrayIntVec2 - * @constructor - */ + * @private + */ function UniformArrayIntVec2(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -412,9 +405,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformArrayIntVec3 - * @constructor - */ + * @private + */ function UniformArrayIntVec3(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -456,9 +448,8 @@ define([ /////////////////////////////////////////////////////////////////////////// /** - * @alias UniformArrayIntVec4 - * @constructor - */ + * @private + */ function UniformArrayIntVec4(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -499,10 +490,9 @@ define([ /////////////////////////////////////////////////////////////////////////// - /** - * @alias UniformArrayMat2 - * @constructor - */ + /** + * @private + */ function UniformArrayMat2(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -543,10 +533,9 @@ define([ /////////////////////////////////////////////////////////////////////////// - /** - * @alias UniformArrayMat3 - * @constructor - */ + /** + * @private + */ function UniformArrayMat3(gl, activeUniform, uniformName, locations) { var length = locations.length; @@ -587,10 +576,9 @@ define([ /////////////////////////////////////////////////////////////////////////// - /** - * @alias UniformArrayMat4 - * @constructor - */ + /** + * @private + */ function UniformArrayMat4(gl, activeUniform, uniformName, locations) { var length = locations.length;