Skip to content

Commit

Permalink
Add thee missing class keyword on the documentation for most of the c…
Browse files Browse the repository at this point in the history
…lasses. #4
  • Loading branch information
alan-wu committed Feb 26, 2018
1 parent 8ac6c88 commit e283ced
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 3 deletions.
5 changes: 3 additions & 2 deletions js/zinc/geometry.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* This is created when a valid json file containging geometry is read into a {@link Zinc.Scene}
* object.
*
* @class
* @author Alan Wu
* @return {Zinc.Geometry}
*/
Expand Down Expand Up @@ -143,7 +144,7 @@ Zinc.Geometry = function () {
/**
* Set the colour of the geometry.
*
* @param {THREE.COLOR} colour - Colour to be set for this geometry.
* @param {THREE.Color} colour - Colour to be set for this geometry.
*/
this.setColour = function(colour) {
_this.morph.material.color = colour
Expand All @@ -153,7 +154,7 @@ Zinc.Geometry = function () {
/**
* Set the material of the geometry.
*
* @param {THREE.MATERIAL} material - Material to be set for this geometry.
* @param {THREE.Material} material - Material to be set for this geometry.
*/
this.setMaterial = function(material) {
_this.morph.material = material;
Expand Down
1 change: 1 addition & 0 deletions js/zinc/glyph.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* @param {THREE.material} materialIn - Material of the glyph.
* @param {Number} idIn - Ud of the glyph.
*
* @class
* @author Alan Wu
* @return {Zinc.Glyph}
*/
Expand Down
1 change: 1 addition & 0 deletions js/zinc/glyphset.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* and group name. Please note that all glyphs in the glyphset share the same geometry
* however they may have different transformations.
*
* @class
* @author Alan Wu
* @return {Zinc.Glyphset}
*/
Expand Down
2 changes: 1 addition & 1 deletion js/zinc/renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Zinc.Renderer also allows additional scenes to be displayed.
*
* @param {Object} containerIn - Container to create the renderer on.
*
* @class
* @author Alan Wu
* @return {Zinc.Renderer}
*/
Expand Down
15 changes: 15 additions & 0 deletions js/zinc/scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* It is the main object used for controlling what is and what is not displayed
* on the renderer.
*
* @class
* @param {Object} containerIn - Container to create the renderer on.
* @author Alan Wu
* @return {Zinc.Scene}
Expand Down Expand Up @@ -406,6 +407,8 @@ Zinc.Scene = function ( containerIn, rendererIn) {
/**
* Load a legacy model(s) format with the provided URLs and parameters. This only loads the geometry
* without any of the metadata. Therefore, extra parameters should be provided.
*
* @deprecated
*/
this.loadModelsURL = function(urls, colours, opacities, timeEnabled, morphColour, finishCallback)
{
Expand Down Expand Up @@ -542,6 +545,18 @@ Zinc.Scene = function ( containerIn, rendererIn) {

/**
* Add a user provided {THREE.Geometry} into the scene as zinc geometry.
*
* @param {Three.Geometry} geometry - The threejs geometry to be added as {@link Zinc.Geometry}.
* @param {Number} modelId - The numeric ID to be given to the newly created geometry.
* @param {THREE.Color} color - Colour to be assigned to this geometry, overrided if materialIn is provided.
* @param {Number} opacity - Opacity to be set for this geometry, overrided if materialIn is provided.
* @param {Boolean} localTimeEnabled - Set this to true if morph geometry is present, overrided if materialIn is provided.
* @param {Boolean} localMorphColour - Set this to true if morph colour is present, overrided if materialIn is provided.
* @param {Boolean} external - Set this to true if morph geometry is present, overrided if materialIn is provided.
* @param {Function} finishCallback - Callback once the geometry has been added succssfully.
* @param {THREE.Material} materialIn - Material to be set for this geometry if it is present.
*
* @returns {Zinc.Geometry}
*/
this.addZincGeometry = function(geometry, modelId, colour, opacity, localTimeEnabled, localMorphColour, external, finishCallback, materialIn) {
if (external == undefined)
Expand Down
6 changes: 6 additions & 0 deletions js/zinc/zinc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/**
* Provides a global namespace for the Zinc javascript library and some default parameters for it.
*
* @namespace
* @author Alan Wu
*/
var Zinc = { REVISION: '27' };


Expand Down

0 comments on commit e283ced

Please sign in to comment.