Fixed samples to work with resizing code introduced yesterday. Now the...

samples/o3d-webgl/texture.js

 /*
  * Copyright 2010, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 263 matching lines @@
  * 
  * @param {o3d.Bitmap} bitmap The bitmap to copy data from.
  */
 o3d.Texture2D.prototype.setFromBitmap =
     function(bitmap) {
   this.gl.bindTexture(this.gl.TEXTURE_2D, this.texture_);
   this.gl.texImage2D(this.gl.TEXTURE_2D,
                      0,  // Level.
                      bitmap.canvas_,
                      bitmap.defer_flip_vertically_to_texture_);
+  this.setupRepeatModes_(bitmap.canvas_.width, bitmap.canvas_.height);
   if (bitmap.defer_mipmaps_to_texture_) {
     this.generateMips();
   }
 };
 
 
 /**
+ * Sets up the repeat modes for the given width and height.
+ * Assumes the texture is already bound to the TEXTURE_2D binding point.
+ * @private
+ */
+o3d.Texture2D.prototype.setupRepeatModes_ = function(width, height) {
+  // OpenGL ES 2.0 and consequently WebGL don't support anything but
+  // CLAMP_TO_EDGE for NPOT textures.
+  if (o3d.Texture2D.isPowerOfTwo_(width) &&
+      o3d.Texture2D.isPowerOfTwo_(height)) {
+    this.gl.texParameteri(this.gl.TEXTURE_2D,
+        this.gl.TEXTURE_WRAP_S, this.gl.REPEAT);
+    this.gl.texParameteri(this.gl.TEXTURE_2D,
+        this.gl.TEXTURE_WRAP_T, this.gl.REPEAT);
+  } else {
+    this.gl.texParameteri(this.gl.TEXTURE_2D,
+        this.gl.TEXTURE_WRAP_S, this.gl.CLAMP_TO_EDGE);
+    this.gl.texParameteri(this.gl.TEXTURE_2D,
+        this.gl.TEXTURE_WRAP_T, this.gl.CLAMP_TO_EDGE);
+  }
+};
+
+/**
+ * Indicates whether the given number is a power of two.
+ * @private
+ */
+o3d.Texture2D.isPowerOfTwo_ = function(value) {
+  if (value == undefined)
+    return false;
+  return (value & (value - 1)) == 0;
+};
+
+
+/**
  * Copy pixels from source bitmap to certain mip level.
  * Scales if the width and height of source and dest do not match.
  * TODO(petersont): Takes optional arguments.
  * 
  * @param {o3d.Bitmap} source_img The source bitmap.
  * @param {number} source_mip which mip from the source to copy from.
  * @param {number} source_x x-coordinate of the starting pixel in the
  *     source image.
  * @param {number} source_y y-coordinate of the starting pixel in the
  *     source image.
@@ skipping 203 matching lines @@
  * @param {number} dest_height height of the destination image.
  */
 o3d.TextureCUBE.prototype.drawImage =
     function(source_img, source_mip, source_x, source_y, source_width,
              source_height, face, dest_mip, dest_x, dest_y, dest_width,
              dest_height) {
   o3d.notImplemented();
 };