summaryrefslogtreecommitdiffstats
path: root/o3d/samples/o3djs/primitives.js
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-02 04:34:35 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-02 04:34:35 +0000
commit3782c85ed2f6f2183e3eb90fae339745f981b73a (patch)
tree272add5e3a7020b03d3182624bf6446241942d51 /o3d/samples/o3djs/primitives.js
parentfa17362aa4fc2cb24a3d907738425d19e5decacb (diff)
downloadchromium_src-3782c85ed2f6f2183e3eb90fae339745f981b73a.zip
chromium_src-3782c85ed2f6f2183e3eb90fae339745f981b73a.tar.gz
chromium_src-3782c85ed2f6f2183e3eb90fae339745f981b73a.tar.bz2
Beginnings of direct manipulator support in o3djs library. Added
Translate1 manipulator, which implements dragging along a line, and helper and base classes. This is a work in progress; feedback appreciated. Fixed problem in recently changed documentation in primitives.js. Minor documentation cleanup in primitives.html. Review URL: http://codereview.chromium.org/178044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/o3djs/primitives.js')
-rw-r--r--o3d/samples/o3djs/primitives.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/o3d/samples/o3djs/primitives.js b/o3d/samples/o3djs/primitives.js
index 54c9cfd..0a062f8 100644
--- a/o3d/samples/o3djs/primitives.js
+++ b/o3d/samples/o3djs/primitives.js
@@ -1208,7 +1208,7 @@ o3djs.primitives.createDisc = function(pack, material,
* cylinder.
* @param {!o3djs.math.Matrix4} opt_matrix A matrix by which to multiply
* all the vertices.
- * @return {o3djs.primitives.VertexInfo} The created cylinder vertices.
+ * @return {!o3djs.primitives.VertexInfo} The created cylinder vertices.
*/
o3djs.primitives.createCylinderVertices = function(radius,
height,
@@ -1273,7 +1273,7 @@ o3djs.primitives.createCylinder = function(pack,
* truncated cone.
* @param {!o3djs.math.Matrix4} opt_matrix A matrix by which to multiply
* all the vertices.
- * @return {o3djs.primitives.VertexInfo} The created truncated cone vertices.
+ * @return {!o3djs.primitives.VertexInfo} The created truncated cone vertices.
*/
o3djs.primitives.createTruncatedConeVertices = function(bottomRadius,
topRadius,