From febb63d2ee21b4632b80107e30003c2afbf3f24a Mon Sep 17 00:00:00 2001 From: "gman@google.com" Date: Mon, 12 Oct 2009 21:12:38 +0000 Subject: [PATCH] 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 --- io.js | 6 ++++-- util.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/io.js b/io.js index d101373..784e5e0 100644 --- 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 index 0cc465e..88f797b 100644 --- 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