diff options
author | pathorn@chromium.org <pathorn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 00:04:26 +0000 |
---|---|---|
committer | pathorn@chromium.org <pathorn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 00:04:26 +0000 |
commit | 439800fa6c6ae6f21fad0a82188ae318ecf4d1e9 (patch) | |
tree | 2df686cd7b94ec095a88fbb2bcab3279c7d38284 /o3d | |
parent | 6fdd418b9a50f24f7788e229bd3ae4acaf6ec1d4 (diff) | |
download | chromium_src-439800fa6c6ae6f21fad0a82188ae318ecf4d1e9.zip chromium_src-439800fa6c6ae6f21fad0a82188ae318ecf4d1e9.tar.gz chromium_src-439800fa6c6ae6f21fad0a82188ae318ecf4d1e9.tar.bz2 |
o3djs: Fix closure compiler errors.
Review URL: http://codereview.chromium.org/3769001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r-- | o3d/samples/o3djs/cameracontroller.js | 2 | ||||
-rw-r--r-- | o3d/samples/o3djs/effect.js | 2 | ||||
-rw-r--r-- | o3d/samples/o3djs/material.js | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/o3d/samples/o3djs/cameracontroller.js b/o3d/samples/o3djs/cameracontroller.js index 35f76ec..69dc100 100644 --- a/o3d/samples/o3djs/cameracontroller.js +++ b/o3d/samples/o3djs/cameracontroller.js @@ -82,7 +82,7 @@ o3djs.cameracontroller.DragMode = { * Dragging moves the centerPos around the plane perpendicular to * the camera view direction. */ - MOVE_CENTER_IN_VIEW_PLANE: 5, + MOVE_CENTER_IN_VIEW_PLANE: 5 }; /** diff --git a/o3d/samples/o3djs/effect.js b/o3d/samples/o3djs/effect.js index 558e1e2..dc16fd4 100644 --- a/o3d/samples/o3djs/effect.js +++ b/o3d/samples/o3djs/effect.js @@ -1399,7 +1399,7 @@ o3djs.effect.buildStandardShaderString = function(material, * @param {!o3d.Material} material Material for which to build the shader. * @param {string} effectType Type of effect to create ('phong', 'lambert', * 'constant', 'blinn'). - * @param {{lights: number}} opt_options Extra options. + * @param {Object} opt_options Extra options in the form {lights: number}. * If 'lights' is non-zero, creates an array of light params; otherwise * only a single light is supported. * @return {o3d.Effect} The created effect. diff --git a/o3d/samples/o3djs/material.js b/o3d/samples/o3djs/material.js index 4a166b8..e0f89e0 100644 --- a/o3d/samples/o3djs/material.js +++ b/o3d/samples/o3djs/material.js @@ -201,6 +201,7 @@ o3djs.material.prepareMaterials = function(pack, o3djs.material.prepareMaterial(opt_effectPack || pack, viewInfo, materials[mm], + undefined, opt_options); } }; |