summaryrefslogtreecommitdiffstats
path: root/o3d/samples/o3djs/io.js
diff options
context:
space:
mode:
Diffstat (limited to 'o3d/samples/o3djs/io.js')
-rw-r--r--o3d/samples/o3djs/io.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/o3d/samples/o3djs/io.js b/o3d/samples/o3djs/io.js
index d101373..784e5e0 100644
--- a/o3d/samples/o3djs/io.js
+++ b/o3d/samples/o3djs/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);