summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 00:08:29 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 00:08:29 +0000
commit390d94e6d41312cf24bf17593321d27ea32e1692 (patch)
treeee7b49b5d23bf765cb0e17e4b2fbd4acabc9d2a2 /o3d
parent8653167fd370f88b3bcc2be052a9aa26873dbe44 (diff)
downloadchromium_src-390d94e6d41312cf24bf17593321d27ea32e1692.zip
chromium_src-390d94e6d41312cf24bf17593321d27ea32e1692.tar.gz
chromium_src-390d94e6d41312cf24bf17593321d27ea32e1692.tar.bz2
A bunch more docs fixes
Review URL: http://codereview.chromium.org/171070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/documentation/jsdoc-toolkit-templates/class.tmpl3
-rw-r--r--o3d/documentation/jsdoc-toolkit-templates/publish.js17
-rw-r--r--o3d/documentation/jsdoc-toolkit-templates/static/stylesheet.css3
-rw-r--r--o3d/plugin/idl/canvas.idl3
-rw-r--r--o3d/plugin/idl/curve.idl2
-rw-r--r--o3d/plugin/idl/pack.idl2
-rw-r--r--o3d/samples/o3djs/base.js4
-rw-r--r--o3d/samples/o3djs/debug.js6
-rw-r--r--o3d/samples/o3djs/dump.js26
-rw-r--r--o3d/samples/o3djs/event.js4
-rw-r--r--o3d/samples/o3djs/particles.js6
-rw-r--r--o3d/samples/o3djs/picking.js2
-rw-r--r--o3d/samples/o3djs/quaternions.js116
-rw-r--r--o3d/samples/o3djs/rendergraph.js2
-rw-r--r--o3d/samples/o3djs/simple.js13
15 files changed, 99 insertions, 110 deletions
diff --git a/o3d/documentation/jsdoc-toolkit-templates/class.tmpl b/o3d/documentation/jsdoc-toolkit-templates/class.tmpl
index 2ebc03a..8a3766c 100644
--- a/o3d/documentation/jsdoc-toolkit-templates/class.tmpl
+++ b/o3d/documentation/jsdoc-toolkit-templates/class.tmpl
@@ -285,6 +285,9 @@ thisClass = data;
<td>{+tempInherited+}</td>
</tr>
</if>
+ <if test="isDeprecated(member)">
+ <td colspan="6" class="deprecated">[[]**DEPRECATED**]</td>
+ </if>
</table>
</div>
diff --git a/o3d/documentation/jsdoc-toolkit-templates/publish.js b/o3d/documentation/jsdoc-toolkit-templates/publish.js
index 75937ba..cf1800c 100644
--- a/o3d/documentation/jsdoc-toolkit-templates/publish.js
+++ b/o3d/documentation/jsdoc-toolkit-templates/publish.js
@@ -200,7 +200,7 @@ function publishInternal(symbolSet) {
filteredClasses.push(symbol);
// Comment these lines in to see what data is available to the templates.
- //if (symbol.name == 'Client' || symbol.name == 'particles') {
+ //if (symbol.name == 'Canvas') {
// print('------[' + symbol.name + ']-----------------------------------');
// dumpObject(symbol, 5);
//}
@@ -542,6 +542,18 @@ function getParameters(symbol) {
}
/**
+ * Returns whether or not the symbol is deprecated. Apparently jsdoctoolkit is
+ * supposed to extract this info for us but it's not so we have to do it
+ * manually.
+ * @param {!Symbol} symbol The symbol to check.
+ * @return {boolean} True if the symbol is deprecated.
+ */
+function isDeprecated(symbol) {
+ var tags = symbol.comment.getTag('deprecated');
+ return tags.length > 0;
+}
+
+/**
* Converts [ to [[] for ezt files.
* Also converts '\n\n' to <br/></br>
* @param {string} str to sanitize.
@@ -795,8 +807,9 @@ function linkifySingleType(place, type) {
var period = type.lastIndexOf('.');
if (period >= 0 && type != '...') {
var subType = type.substring(0, period);
+ var member = type.substring(period + 1);
symbol = getSymbol(subType);
- if (symbol) {
+ if (symbol && symbol.hasMember(member)) {
var field = type.substring(period + 1);
link = '<a class="el" href="' + getLinkToSymbol(symbol) + '#' +
field + '">' + type + '</a>';
diff --git a/o3d/documentation/jsdoc-toolkit-templates/static/stylesheet.css b/o3d/documentation/jsdoc-toolkit-templates/static/stylesheet.css
index 3a4f825..5202687 100644
--- a/o3d/documentation/jsdoc-toolkit-templates/static/stylesheet.css
+++ b/o3d/documentation/jsdoc-toolkit-templates/static/stylesheet.css
@@ -118,6 +118,9 @@ TD.mdname1 {
font-weight: bold;
-moz-border-radius: 8px 8px 8px 8px;
}
+.memproto .deprecated {
+ color: red;
+}
.paramkey {
text-align: right;
}
diff --git a/o3d/plugin/idl/canvas.idl b/o3d/plugin/idl/canvas.idl
index a9b61fe..446d5b7 100644
--- a/o3d/plugin/idl/canvas.idl
+++ b/o3d/plugin/idl/canvas.idl
@@ -112,6 +112,7 @@ class Canvas : ParamObject {
\param texture The Texture2D object where the bitmap is extracted from.
\param left The position of the left side of the bitmap.
\param bottom The position of the bottom side of the bitmap.
+ @deprecated
%]
void DrawBitmap(Texture2D texture, float left, float bottom);
@@ -157,6 +158,8 @@ class Canvas : ParamObject {
texture must match exactly the size of the Canvas set by the setSize() method.
The format of the texture must be set to either ARGB8 or XRGB8.
\param texture Texture to copy to.
+ @deprecated
+ \sa o3d.Texture2D.drawImage
%]
void CopyToTexture(Texture2D texture);
diff --git a/o3d/plugin/idl/curve.idl b/o3d/plugin/idl/curve.idl
index 2caf91d..eacb901 100644
--- a/o3d/plugin/idl/curve.idl
+++ b/o3d/plugin/idl/curve.idl
@@ -155,7 +155,7 @@ class Curve : Function {
%[
Whether or not a cache is used to speed up evaluation of this Curve
Default = true.
- \sa o3d.Curve.setSampleRate
+ \sa o3d.Curve.sampleRate
%]
[getter, setter] bool use_cache;
diff --git a/o3d/plugin/idl/pack.idl b/o3d/plugin/idl/pack.idl
index 6880aed..3d63f6b 100644
--- a/o3d/plugin/idl/pack.idl
+++ b/o3d/plugin/idl/pack.idl
@@ -308,6 +308,8 @@ typedef Bitmap[] BitmapArray;
\param generate_mips True if you want O3D to generate mip maps for the
texture.
\return the Texture
+ \sa o3d.Pack.createBitmapsFromRawData
+ @deprecated
%]
Texture? CreateTextureFromRawData(RawData raw_data,
bool generate_mips);
diff --git a/o3d/samples/o3djs/base.js b/o3d/samples/o3djs/base.js
index 9b93ba4..30657bb 100644
--- a/o3d/samples/o3djs/base.js
+++ b/o3d/samples/o3djs/base.js
@@ -528,7 +528,7 @@ o3djs.base = o3djs.base || {};
/**
* The a Javascript copy of the o3d namespace object. (holds constants, enums,
* etc...)
- * @type {o3d.o3d}
+ * @type {o3d}
*/
o3djs.base.o3d = null;
@@ -557,7 +557,7 @@ o3djs.base.snapshotProvidedNamespaces = function() {
* Initializes the o3djs.sample library in a v8 instance. This should be called
* for every V8 instance that uses the sample library. It is automatically
* called by o3djs.util.makeClients.
- * @param {!o3d.plugin} clientObject O3D.Plugin Object.
+ * @param {!Element} clientObject O3D.Plugin Object.
*/
o3djs.base.initV8 = function(clientObject) {
var v8Init = function(initializer, args) {
diff --git a/o3d/samples/o3djs/debug.js b/o3d/samples/o3djs/debug.js
index 2f4be54..77dab97 100644
--- a/o3d/samples/o3djs/debug.js
+++ b/o3d/samples/o3djs/debug.js
@@ -738,7 +738,7 @@ o3djs.debug.DebugLineGroup.prototype.getLine_ = function() {
* @param {!o3djs.math.Vector3} opt_start Start position for line.
* @param {!o3djs.math.Vector3} opt_end End position for line.
* @param {!o3djs.math.Vector4} opt_color Color for line.
- * @return {!o3djs.debug.debugLine} The DebugLine.
+ * @return {!o3djs.debug.DebugLine} The DebugLine.
*/
o3djs.debug.DebugLineGroup.prototype.addLine = function(opt_start,
opt_end,
@@ -795,7 +795,7 @@ o3djs.debug.DebugLineGroup.prototype.remove = function(line) {
* @constructor
* @param {!o3d.Pack} pack Pack for this debug object to use to manage
* its resources.
- * @param {!o3djs.rendergraph.viewInfo} viewInfo ViewInfo for debug
+ * @param {!o3djs.rendergraph.ViewInfo} viewInfo ViewInfo for debug
* visuals.
*/
o3djs.debug.DebugHelper = function(pack, viewInfo) {
@@ -1330,7 +1330,7 @@ o3djs.debug.DebugHelper.prototype.createDebugLineGroup =
*
* @param {!o3d.Pack} pack Pack for DebugHelper to manage its resources
* with.
- * @param {!o3djs.rendergraph.viewInfo} viewInfo ViewInfo for debug
+ * @param {!o3djs.rendergraph.ViewInfo} viewInfo ViewInfo for debug
* visuals.
* @return {!o3djs.debug.DebugHelper} the DebugHelper object.
*/
diff --git a/o3d/samples/o3djs/dump.js b/o3d/samples/o3djs/dump.js
index c484fc0..2486f51 100644
--- a/o3d/samples/o3djs/dump.js
+++ b/o3d/samples/o3djs/dump.js
@@ -175,17 +175,6 @@ o3djs.dump.getMatrixAsString = function(matrix, opt_prefix) {
};
/**
- * Dumps a point3
- * @param {string} label Label to put in front of dump.
- * @param {!o3d.Point3} point3 Point3 to dump.
- * @param {string} opt_prefix optional prefix for indenting.
- */
-o3djs.dump.dumpPoint3 = function(label, point3, opt_prefix) {
- opt_prefix = opt_prefix || '';
- o3djs.dump.dumpXYZ_(label, point3, opt_prefix);
-};
-
-/**
* Dumps a float3
* @param {string} label Label to put in front of dump.
* @param {!o3d.Float3} float3 Float3 to dump.
@@ -197,17 +186,6 @@ o3djs.dump.dumpFloat3 = function(label, float3, opt_prefix) {
};
/**
- * Dumps a vector3
- * @param {string} label Label to put in front of dump.
- * @param {!o3d.Vector3} vector3 Vector3 to dump.
- * @param {string} opt_prefix optional prefix for indenting.
- */
-o3djs.dump.dumpVector3 = function(label, vector3, opt_prefix) {
- opt_prefix = opt_prefix || '';
- o3djs.dump.dumpXYZ_(label, vector3, opt_prefix);
-};
-
-/**
* Dumps a float4
* @param {string} label Label to put in front of dump.
* @param {!o3d.Float4} float4 Float4 to dump.
@@ -254,10 +232,10 @@ o3djs.dump.dumpBoundingBox = function(label,
opt_prefix) {
opt_prefix = opt_prefix || '';
o3djs.dump.dump(opt_prefix + label + ' :\n');
- o3djs.dump.dumpPoint3('min : ',
+ o3djs.dump.dumpFloat3('min : ',
boundingBox.minExtent,
opt_prefix + ' ');
- o3djs.dump.dumpPoint3('max : ',
+ o3djs.dump.dumpFloat3('max : ',
boundingBox.maxExtent,
opt_prefix + ' ');
};
diff --git a/o3d/samples/o3djs/event.js b/o3d/samples/o3djs/event.js
index 00898aa..75fe45c 100644
--- a/o3d/samples/o3djs/event.js
+++ b/o3d/samples/o3djs/event.js
@@ -204,8 +204,8 @@ o3djs.event.startKeyboardEventSynthesis = function(pluginObject) {
* see http://www.w3.org/TR/DOM-Level-3-Events/events.html
* #Events-KeyboardEvents-Interfaces
* see http://developer.mozilla.org/en/DOM/event.initKeyEvent
- * @param {!Element} event an O3D event object.
- * @param {!o3d.Plugin} pluginObject the plugin object on the page.
+ * @param {!Event} event an O3D event object.
+ * @param {!Element} pluginObject the plugin object on the page.
*/
o3djs.event.onKey = function(event, pluginObject) {
var k_evt = o3djs.event.createKeyEvent(event.type, event.charCode,
diff --git a/o3d/samples/o3djs/particles.js b/o3d/samples/o3djs/particles.js
index afd4661..2d71b14 100644
--- a/o3d/samples/o3djs/particles.js
+++ b/o3d/samples/o3djs/particles.js
@@ -287,7 +287,7 @@ o3djs.particles.CORNERS_ = [
* You only need one of these to run multiple emitters of different types
* of particles.
* @param {!o3d.Pack} pack The pack for the particle system to manage resources.
- * @param {!o3djs.rendergraph.viewInfo} viewInfo A viewInfo so the particle
+ * @param {!o3djs.rendergraph.ViewInfo} viewInfo A viewInfo so the particle
* system can do the default setup. The only thing used from viewInfo
* is the zOrderedDrawList. If that is not where you want your particles,
* after you create the particleEmitter use
@@ -674,7 +674,7 @@ o3djs.particles.ParticleSpec = function() {
/**
* The orientation of a particle. This is only used if billboard is false.
- * @type {!o3djs.quaternions.Quaterinion}
+ * @type {!o3djs.quaternions.Quaternion}
*/
this.orientation = [0, 0, 0, 1];
};
@@ -830,7 +830,7 @@ o3djs.particles.ParticleEmitter = function(particleSystem,
/**
* The material used by this emitter.
- * @type {!o3d.Matrerial}
+ * @type {!o3d.Material}
*/
this.material = material;
diff --git a/o3d/samples/o3djs/picking.js b/o3d/samples/o3djs/picking.js
index 06e3765..225d79f 100644
--- a/o3d/samples/o3djs/picking.js
+++ b/o3d/samples/o3djs/picking.js
@@ -246,7 +246,7 @@ o3djs.picking.PickInfo = function(element,
/**
* Information about the pick.
- * @type {!o3d.RayInterstionInfo}
+ * @type {!o3d.RayIntersectionInfo}
*/
this.rayIntersectionInfo = rayIntersectionInfo;
diff --git a/o3d/samples/o3djs/quaternions.js b/o3d/samples/o3djs/quaternions.js
index 73c099c..6d97e05 100644
--- a/o3d/samples/o3djs/quaternions.js
+++ b/o3d/samples/o3djs/quaternions.js
@@ -55,13 +55,13 @@ o3djs.quaternions = o3djs.quaternions || {};
* A Quaternion.
* @type {!Array.<number>}
*/
-o3djs.quaternions.Quaterion = goog.typedef;
+o3djs.quaternions.Quaternion = goog.typedef;
/**
* Quickly determines if the object a is a scalar or a quaternion;
* assumes that the argument is either a number (scalar), or an array of
* numbers.
- * @param {(number|!o3djs.quaternions.Quaterion)} a A number or array the type
+ * @param {(number|!o3djs.quaternions.Quaternion)} a A number or array the type
* of which is in question.
* @return {string} Either the string 'Scalar' or 'Quaternion'.
*/
@@ -73,8 +73,8 @@ o3djs.quaternions.mathType = function(a) {
/**
* Copies a quaternion.
- * @param {!o3djs.quaternions.Quaterion} q The quaternion.
- * @return {!o3djs.quaternions.Quaterion} A new quaternion identical to q.
+ * @param {!o3djs.quaternions.Quaternion} q The quaternion.
+ * @return {!o3djs.quaternions.Quaternion} A new quaternion identical to q.
*/
o3djs.quaternions.copy = function(q) {
return q.slice();
@@ -82,8 +82,8 @@ o3djs.quaternions.copy = function(q) {
/**
* Negates a quaternion.
- * @param {!o3djs.quaternions.Quaterion} q The quaternion.
- * @return {!o3djs.quaternions.Quaterion} -q.
+ * @param {!o3djs.quaternions.Quaternion} q The quaternion.
+ * @return {!o3djs.quaternions.Quaternion} -q.
*/
o3djs.quaternions.negative = function(q) {
return [-q[0], -q[1], -q[2], -q[3]];
@@ -91,9 +91,9 @@ o3djs.quaternions.negative = function(q) {
/**
* Adds two Quaternions.
- * @param {!o3djs.quaternions.Quaterion} a Operand Quaternion.
- * @param {!o3djs.quaternions.Quaterion} b Operand Quaternion.
- * @return {!o3djs.quaternions.Quaterion} The sum of a and b.
+ * @param {!o3djs.quaternions.Quaternion} a Operand Quaternion.
+ * @param {!o3djs.quaternions.Quaternion} b Operand Quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The sum of a and b.
*/
o3djs.quaternions.addQuaternionQuaternion = function(a, b) {
return [a[0] + b[0],
@@ -104,9 +104,9 @@ o3djs.quaternions.addQuaternionQuaternion = function(a, b) {
/**
* Adds a quaternion to a scalar.
- * @param {!o3djs.quaternions.Quaterion} a Operand Quaternion.
+ * @param {!o3djs.quaternions.Quaternion} a Operand Quaternion.
* @param {number} b Operand Scalar.
- * @return {!o3djs.quaternions.Quaterion} The sum of a and b.
+ * @return {!o3djs.quaternions.Quaternion} The sum of a and b.
*/
o3djs.quaternions.addQuaternionScalar = function(a, b) {
return a.slice(0, 3).concat(a[3] + b);
@@ -115,8 +115,8 @@ o3djs.quaternions.addQuaternionScalar = function(a, b) {
/**
* Adds a scalar to a quaternion.
* @param {number} a Operand scalar.
- * @param {!o3djs.quaternions.Quaterion} b Operand quaternion.
- * @return {!o3djs.quaternions.Quaterion} The sum of a and b.
+ * @param {!o3djs.quaternions.Quaternion} b Operand quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The sum of a and b.
*/
o3djs.quaternions.addScalarQuaternion = function(a, b) {
return b.slice(0, 3).concat(a + b[3]);
@@ -124,9 +124,9 @@ o3djs.quaternions.addScalarQuaternion = function(a, b) {
/**
* Subtracts two quaternions.
- * @param {!o3djs.quaternions.Quaterion} a Operand quaternion.
- * @param {!o3djs.quaternions.Quaterion} b Operand quaternion.
- * @return {!o3djs.quaternions.Quaterion} The difference a - b.
+ * @param {!o3djs.quaternions.Quaternion} a Operand quaternion.
+ * @param {!o3djs.quaternions.Quaternion} b Operand quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The difference a - b.
*/
o3djs.quaternions.subQuaternionQuaternion = function(a, b) {
return [a[0] - b[0],
@@ -137,9 +137,9 @@ o3djs.quaternions.subQuaternionQuaternion = function(a, b) {
/**
* Subtracts a scalar from a quaternion.
- * @param {!o3djs.quaternions.Quaterion} a Operand quaternion.
+ * @param {!o3djs.quaternions.Quaternion} a Operand quaternion.
* @param {number} b Operand scalar.
- * @return {!o3djs.quaternions.Quaterion} The difference a - b.
+ * @return {!o3djs.quaternions.Quaternion} The difference a - b.
*/
o3djs.quaternions.subQuaternionScalar = function(a, b) {
return a.slice(0, 3).concat(a[3] - b);
@@ -148,8 +148,8 @@ o3djs.quaternions.subQuaternionScalar = function(a, b) {
/**
* Subtracts a quaternion from a scalar.
* @param {number} a Operand scalar.
- * @param {!o3djs.quaternions.Quaterion} b Operand quaternion.
- * @return {!o3djs.quaternions.Quaterion} The difference a - b.
+ * @param {!o3djs.quaternions.Quaternion} b Operand quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The difference a - b.
*/
o3djs.quaternions.subScalarQuaternion = function(a, b) {
return [-b[0], -b[1], -b[2], a - b[3]];
@@ -167,9 +167,9 @@ o3djs.quaternions.mulScalarQuaternion = function(k, q) {
/**
* Multiplies a quaternion by a scalar.
- * @param {!o3djs.quaternions.Quaterion} q The Quaternion.
+ * @param {!o3djs.quaternions.Quaternion} q The Quaternion.
* @param {number} k The scalar.
- * @return {!o3djs.quaternions.Quaterion} The product of k and v.
+ * @return {!o3djs.quaternions.Quaternion} The product of k and v.
*/
o3djs.quaternions.mulQuaternionScalar = function(q, k) {
return [k * q[0], k * q[1], k * q[2], k * q[3]];
@@ -177,9 +177,9 @@ o3djs.quaternions.mulQuaternionScalar = function(q, k) {
/**
* Multiplies two quaternions.
- * @param {!o3djs.quaternions.Quaterion} a Operand quaternion.
- * @param {!o3djs.quaternions.Quaterion} b Operand quaternion.
- * @return {!o3djs.quaternions.Quaterion} The quaternion product a * b.
+ * @param {!o3djs.quaternions.Quaternion} a Operand quaternion.
+ * @param {!o3djs.quaternions.Quaternion} b Operand quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The quaternion product a * b.
*/
o3djs.quaternions.mulQuaternionQuaternion = function(a, b) {
var aX = a[0];
@@ -200,9 +200,9 @@ o3djs.quaternions.mulQuaternionQuaternion = function(a, b) {
/**
* Divides two quaternions; assumes the convention that a/b = a*(1/b).
- * @param {!o3djs.quaternions.Quaterion} a Operand quaternion.
- * @param {!o3djs.quaternions.Quaterion} b Operand quaternion.
- * @return {!o3djs.quaternions.Quaterion} The quaternion quotient a / b.
+ * @param {!o3djs.quaternions.Quaternion} a Operand quaternion.
+ * @param {!o3djs.quaternions.Quaternion} b Operand quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The quaternion quotient a / b.
*/
o3djs.quaternions.divQuaternionQuaternion = function(a, b) {
var aX = a[0];
@@ -224,9 +224,9 @@ o3djs.quaternions.divQuaternionQuaternion = function(a, b) {
/**
* Divides a Quaternion by a scalar.
- * @param {!o3djs.quaternions.Quaterion} q The quaternion.
+ * @param {!o3djs.quaternions.Quaternion} q The quaternion.
* @param {number} k The scalar.
- * @return {!o3djs.quaternions.Quaterion} q The quaternion q divided by k.
+ * @return {!o3djs.quaternions.Quaternion} q The quaternion q divided by k.
*/
o3djs.quaternions.divQuaternionScalar = function(q, k) {
return [q[0] / k, q[1] / k, q[2] / k, q[3] / k];
@@ -235,8 +235,8 @@ o3djs.quaternions.divQuaternionScalar = function(q, k) {
/**
* Divides a scalar by a quaternion.
* @param {number} a Operand scalar.
- * @param {!o3djs.quaternions.Quaterion} b Operand quaternion.
- * @return {!o3djs.quaternions.Quaterion} The quaternion product.
+ * @param {!o3djs.quaternions.Quaternion} b Operand quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The quaternion product.
*/
o3djs.quaternions.divScalarQuaternion = function(a, b) {
var b0 = b[0];
@@ -250,8 +250,8 @@ o3djs.quaternions.divScalarQuaternion = function(a, b) {
/**
* Computes the multiplicative inverse of a quaternion.
- * @param {!o3djs.quaternions.Quaterion} q The quaternion.
- * @return {!o3djs.quaternions.Quaterion} The multiplicative inverse of q.
+ * @param {!o3djs.quaternions.Quaternion} q The quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The multiplicative inverse of q.
*/
o3djs.quaternions.inverse = function(q) {
var q0 = q[0];
@@ -265,9 +265,9 @@ o3djs.quaternions.inverse = function(q) {
/**
* Multiplies two objects which are either scalars or quaternions.
- * @param {(!o3djs.quaternions.Quaterion|number)} a Operand.
- * @param {(!o3djs.quaternions.Quaterion|number)} b Operand.
- * @return {(!o3djs.quaternions.Quaterion|number)} The product of a and b.
+ * @param {(!o3djs.quaternions.Quaternion|number)} a Operand.
+ * @param {(!o3djs.quaternions.Quaternion|number)} b Operand.
+ * @return {(!o3djs.quaternions.Quaternion|number)} The product of a and b.
*/
o3djs.quaternions.mul = function(a, b) {
return o3djs.quaternions['mul' + o3djs.quaternions.mathType(a) +
@@ -276,9 +276,9 @@ o3djs.quaternions.mul = function(a, b) {
/**
* Divides two objects which are either scalars or quaternions.
- * @param {(!o3djs.quaternions.Quaterion|number)} a Operand.
- * @param {(!o3djs.quaternions.Quaterion|number)} b Operand.
- * @return {(!o3djs.quaternions.Quaterion|number)} The quotient of a and b.
+ * @param {(!o3djs.quaternions.Quaternion|number)} a Operand.
+ * @param {(!o3djs.quaternions.Quaternion|number)} b Operand.
+ * @return {(!o3djs.quaternions.Quaternion|number)} The quotient of a and b.
*/
o3djs.quaternions.div = function(a, b) {
return o3djs.quaternions['div' + o3djs.quaternions.mathType(a) +
@@ -287,9 +287,9 @@ o3djs.quaternions.div = function(a, b) {
/**
* Adds two objects which are either scalars or quaternions.
- * @param {(!o3djs.quaternions.Quaterion|number)} a Operand.
- * @param {(!o3djs.quaternions.Quaterion|number)} b Operand.
- * @return {(!o3djs.quaternions.Quaterion|number)} The sum of a and b.
+ * @param {(!o3djs.quaternions.Quaternion|number)} a Operand.
+ * @param {(!o3djs.quaternions.Quaternion|number)} b Operand.
+ * @return {(!o3djs.quaternions.Quaternion|number)} The sum of a and b.
*/
o3djs.quaternions.add = function(a, b) {
return o3djs.quaternions['add' + o3djs.quaternions.mathType(a) +
@@ -298,9 +298,9 @@ o3djs.quaternions.add = function(a, b) {
/**
* Subtracts two objects which are either scalars or quaternions.
- * @param {(!o3djs.quaternions.Quaterion|number)} a Operand.
- * @param {(!o3djs.quaternions.Quaterion|number)} b Operand.
- * @return {(!o3djs.quaternions.Quaterion|number)} The difference of a and b.
+ * @param {(!o3djs.quaternions.Quaternion|number)} a Operand.
+ * @param {(!o3djs.quaternions.Quaternion|number)} b Operand.
+ * @return {(!o3djs.quaternions.Quaternion|number)} The difference of a and b.
*/
o3djs.quaternions.sub = function(a, b) {
return o3djs.quaternions['sub' + o3djs.quaternions.mathType(a) +
@@ -310,7 +310,7 @@ o3djs.quaternions.sub = function(a, b) {
/**
* Computes the length of a Quaternion, i.e. the square root of the
* sum of the squares of the coefficients.
- * @param {!o3djs.quaternions.Quaterion} a The Quaternion.
+ * @param {!o3djs.quaternions.Quaternion} a The Quaternion.
* @return {number} The length of a.
*/
o3djs.quaternions.length = function(a) {
@@ -320,7 +320,7 @@ o3djs.quaternions.length = function(a) {
/**
* Computes the square of the length of a quaternion, i.e. the sum of the
* squares of the coefficients.
- * @param {!o3djs.quaternions.Quaterion} a The quaternion.
+ * @param {!o3djs.quaternions.Quaternion} a The quaternion.
* @return {number} The square of the length of a.
*/
o3djs.quaternions.lengthSquared = function(a) {
@@ -329,8 +329,8 @@ o3djs.quaternions.lengthSquared = function(a) {
/**
* Divides a Quaternion by its length and returns the quotient.
- * @param {!o3djs.quaternions.Quaterion} a The Quaternion.
- * @return {!o3djs.quaternions.Quaterion} A unit length quaternion pointing in
+ * @param {!o3djs.quaternions.Quaternion} a The Quaternion.
+ * @return {!o3djs.quaternions.Quaternion} A unit length quaternion pointing in
* the same direction as a.
*/
o3djs.quaternions.normalize = function(a) {
@@ -340,8 +340,8 @@ o3djs.quaternions.normalize = function(a) {
/**
* Computes the conjugate of the given quaternion.
- * @param {!o3djs.quaternions.Quaterion} q The quaternion.
- * @return {!o3djs.quaternions.Quaterion} The conjugate of q.
+ * @param {!o3djs.quaternions.Quaternion} q The quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The conjugate of q.
*/
o3djs.quaternions.conjugate = function(q) {
return [-q[0], -q[1], -q[2], q[3]];
@@ -351,7 +351,7 @@ o3djs.quaternions.conjugate = function(q) {
/**
* Creates a quaternion which rotates around the x-axis by the given angle.
* @param {number} angle The angle by which to rotate (in radians).
- * @return {!o3djs.quaternions.Quaterion} The quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The quaternion.
*/
o3djs.quaternions.rotationX = function(angle) {
return [Math.sin(angle / 2), 0, 0, Math.cos(angle / 2)];
@@ -360,7 +360,7 @@ o3djs.quaternions.rotationX = function(angle) {
/**
* Creates a quaternion which rotates around the y-axis by the given angle.
* @param {number} angle The angle by which to rotate (in radians).
- * @return {!o3djs.quaternions.Quaterion} The quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The quaternion.
*/
o3djs.quaternions.rotationY = function(angle) {
return [0, Math.sin(angle / 2), 0, Math.cos(angle / 2)];
@@ -369,7 +369,7 @@ o3djs.quaternions.rotationY = function(angle) {
/**
* Creates a quaternion which rotates around the z-axis by the given angle.
* @param {number} angle The angle by which to rotate (in radians).
- * @return {!o3djs.quaternions.Quaterion} The quaternion.
+ * @return {!o3djs.quaternions.Quaternion} The quaternion.
*/
o3djs.quaternions.rotationZ = function(angle) {
return [0, 0, Math.sin(angle / 2), Math.cos(angle / 2)];
@@ -380,7 +380,7 @@ o3djs.quaternions.rotationZ = function(angle) {
* angle.
* @param {!o3djs.math.Vector3} axis The axis about which to rotate.
* @param {number} angle The angle by which to rotate (in radians).
- * @return {!o3djs.quaternions.Quaterion} A quaternion which rotates angle
+ * @return {!o3djs.quaternions.Quaternion} A quaternion which rotates angle
* radians around the axis.
*/
o3djs.quaternions.axisRotation = function(axis, angle) {
@@ -398,7 +398,7 @@ o3djs.quaternions.axisRotation = function(axis, angle) {
* a quaternion r means to express that vector as a quaternion q by letting
* q = [v[0], v[1], v[2], 0] and then obtain the rotated vector by evaluating
* the expression (r * q) / r.
- * @param {!o3djs.quaternions.Quaterion} q The quaternion.
+ * @param {!o3djs.quaternions.Quaternion} q The quaternion.
* @return {!o3djs.math.Matrix4} A 4-by-4 rotation matrix.
*/
o3djs.quaternions.quaternionToRotation = function(q) {
@@ -443,7 +443,7 @@ o3djs.quaternions.quaternionToRotation = function(q) {
* Computes a quaternion whose rotation is equivalent to the given matrix.
* @param {(!o3djs.math.Matrix4|!o3djs.math.Matrix3)} m A 3-by-3 or 4-by-4
* rotation matrix.
- * @return {!o3djs.quaternions.Quaterion} A quaternion q such that
+ * @return {!o3djs.quaternions.Quaternion} A quaternion q such that
* quaternions.quaternionToRotation(q) is m.
*/
o3djs.quaternions.rotationToQuaternion = function(m) {
diff --git a/o3d/samples/o3djs/rendergraph.js b/o3d/samples/o3djs/rendergraph.js
index be38dedc..72a1c7c 100644
--- a/o3d/samples/o3djs/rendergraph.js
+++ b/o3d/samples/o3djs/rendergraph.js
@@ -223,7 +223,7 @@ o3djs.rendergraph.ViewInfo = function(pack,
* <pre>
* viewInfo.root.priority = desiredPriority;
* </pre>
- * @type {!o3d.RenderGraph}
+ * @type {!o3d.RenderNode}
*/
this.root = viewport;
diff --git a/o3d/samples/o3djs/simple.js b/o3d/samples/o3djs/simple.js
index 8bb729b..369e126 100644
--- a/o3d/samples/o3djs/simple.js
+++ b/o3d/samples/o3djs/simple.js
@@ -418,19 +418,6 @@ o3djs.simple.SimpleInfo.prototype.createSphere = function(radius,
};
/**
- * Loads a scene from a URL.
- * TODO: Implement
- * @param {string} url Url of scene to load.
- * @return {!o3djs.simple.Scene} A Javascript object to manage the scene.
- */
-o3djs.simple.SimpleInfo.prototype.loadScene = function(url) {
- if (true) {
- throw('not implemented');
- }
- return null;
-};
-
-/**
* Moves the camera so everything in the current scene is visible.
*/
o3djs.simple.SimpleInfo.prototype.viewAll = function() {