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

Side by Side 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, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « o3djs/material.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2009, Google Inc. 2 * Copyright 2009, Google Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 o3djs.pack = o3djs.pack || {}; 52 o3djs.pack = o3djs.pack || {};
53 53
54 /** 54 /**
55 * Prepares a pack for rendering. 55 * Prepares a pack for rendering.
56 * 56 *
57 * @param {!o3d.Pack} pack Pack to prepare. 57 * @param {!o3d.Pack} pack Pack to prepare.
58 * @param {!o3djs.rendergraph.ViewInfo} viewInfo as returned from 58 * @param {!o3djs.rendergraph.ViewInfo} viewInfo as returned from
59 * o3djs.rendergraph.createView. 59 * o3djs.rendergraph.createView.
60 * @param {!o3d.Pack} opt_effectPack Pack to create effects in. If this is 60 * @param {!o3d.Pack} opt_effectPack Pack to create effects in. If this is
61 * not specifed the pack to prepare above will be used. 61 * not specifed the pack to prepare above will be used.
62 * @param {Object} opt_options Extra options for effect.getStandardShader
62 * 63 *
63 * @see o3djs.material.prepareMaterials 64 * @see o3djs.material.prepareMaterials
64 * @see o3djs.shape.prepareShapes 65 * @see o3djs.shape.prepareShapes
65 */ 66 */
66 o3djs.pack.preparePack = function(pack, viewInfo, opt_effectPack) { 67 o3djs.pack.preparePack = function(pack, viewInfo, opt_effectPack, opt_options) {
67 o3djs.material.prepareMaterials(pack, viewInfo, opt_effectPack); 68 o3djs.material.prepareMaterials(pack, viewInfo, opt_effectPack, opt_options);
68 o3djs.shape.prepareShapes(pack); 69 o3djs.shape.prepareShapes(pack);
69 }; 70 };
70 71
OLDNEW
« 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