summaryrefslogtreecommitdiffstats
path: root/o3d/samples/primitives.html
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/primitives.html
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/primitives.html')
-rw-r--r--o3d/samples/primitives.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/o3d/samples/primitives.html b/o3d/samples/primitives.html
index 89337a9..e61cdae 100644
--- a/o3d/samples/primitives.html
+++ b/o3d/samples/primitives.html
@@ -130,9 +130,10 @@ function initContext() {
/**
* Creates a material based on the given single color.
- * @param {Array} baseColor An array with 4 entries, the R,G,B, and A components
- * of a color.
- * @return {Material} A material whose overall pigment is baseColor.
+ * @param {!o3djs.math.Vector4} baseColor A 4-component vector with
+ * the R,G,B, and A components of a color.
+ * @return {!o3d.Material} A phong material whose overall pigment is
+ * baseColor.
*/
function createMaterial(baseColor) {
// Create a new, empty Material object.