Fix for canvas.drawBitmap

Review URL: http://codereview.chromium.org/269055 git-svn-id: http://src.chromium.org/svn/trunk/src/o3d/samples/o3djs@28741 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
sirikata · Oct 12, 2009 · febb63d · febb63d
1 parent ab481d3
commit febb63d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/io.js b/io.js
@@ -633,16 +633,18 @@ o3djs.io.loadBitmaps = function(pack, url, callback, opt_generateMips) {
  *     texture is loaded. It will be passed the texture and an exception on
  *     error or null on success.
  * @param {boolean} opt_generateMips Generate Mips. Default = true.
+ * @param {boolean} opt_flip Flip texture. Default = true.
  * @return {!o3djs.io.LoadInfo} A LoadInfo to track progress.
  * @see o3djs.io.loadBitmaps
  * @see o3djs.loader.createLoader
  */
-o3djs.io.loadTexture = function(pack, url, callback, opt_generateMips) {
+o3djs.io.loadTexture = function(
+    pack, url, callback, opt_generateMips, opt_flip) {
   function onLoaded(request, rawData, exception) {
     var texture = null;
     if (!exception) {
       texture = o3djs.texture.createTextureFromRawData(
-          pack, rawData, opt_generateMips);
+          pack, rawData, opt_generateMips, opt_flip);
       pack.removeObject(request);
     }
     callback(texture, exception);

diff --git a/util.js b/util.js
@@ -60,7 +60,7 @@ o3djs.util.PLUGIN_NAME = 'O3D Plugin';
  * utility libraries.
  * @type {string}
  */
-o3djs.util.REQUIRED_VERSION = '0.1.42.0';
+o3djs.util.REQUIRED_VERSION = '0.1.42.4';
 
 /**
  * The width an O3D must be to put a failure message inside