Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: o3djs/pack.js

Issue 3358020: o3djs: Multiple simple lights, and a new demo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/o3d/samples/
Patch Set: added var declarations Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « o3djs/material.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: o3djs/pack.js
===================================================================
--- o3djs/pack.js (revision 60893)
+++ o3djs/pack.js (working copy)
@@ -59,12 +59,13 @@
* o3djs.rendergraph.createView.
* @param {!o3d.Pack} opt_effectPack Pack to create effects in. If this is
* not specifed the pack to prepare above will be used.
+ * @param {Object} opt_options Extra options for effect.getStandardShader
*
* @see o3djs.material.prepareMaterials
* @see o3djs.shape.prepareShapes
*/
-o3djs.pack.preparePack = function(pack, viewInfo, opt_effectPack) {
- o3djs.material.prepareMaterials(pack, viewInfo, opt_effectPack);
+o3djs.pack.preparePack = function(pack, viewInfo, opt_effectPack, opt_options) {
+ o3djs.material.prepareMaterials(pack, viewInfo, opt_effectPack, opt_options);
o3djs.shape.prepareShapes(pack);
};
« no previous file with comments | « o3djs/material.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698