Fixed a lot of bugs with render surfaces and bitmaps.

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 266 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_verically_to_texture_);
-
-  this.gl.texParameteri(this.gl.TEXTURE_2D, 
-      this.gl.TEXTURE_MAG_FILTER, this.gl.LINEAR);
-  this.gl.texParameteri(this.gl.TEXTURE_2D,
-      this.gl.TEXTURE_MIN_FILTER, this.gl.LINEAR);
-  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);
-
   if (bitmap.defer_mipmaps_to_texture_) {
     this.generateMips();
   }
 };
 
 
 /**
  * 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.
@@ skipping 11 matching lines @@
  *     destination texture.
  * @param {number} dest_y y-coordinate of the starting pixel in the
  *     destination texture.
  * @param {number} dest_width width of the dest image.
  * @param {number} dest_height height of the dest image.
  */
 o3d.Texture2D.prototype.drawImage =
     function(source_img, source_mip, source_x, source_y, source_width,
              source_height, dest_mip, dest_x, dest_y, dest_width,
              dest_height) {
-  o3d.notImplemented();
+  var canvas = o3d.Bitmap.getScratchCanvas_();
+  canvas.width = dest_width;
+  canvas.height = dest_height;
+
+  var context = canvas.getContext('2d');
+
+  context.translate(-source_x, -source_y);
+  context.scale(dest_width / source_width,
+                dest_height / source_height);
+
+  context.drawImage(source_img.canvas_,
+      0, 0, source_img.canvas_.width, source_img.canvas_.height);
+
+  this.gl.bindTexture(this.gl.TEXTURE_2D, this.texture_);
+  this.gl.texSubImage2D(this.gl.TEXTURE_2D, 0, 0, 0, canvas);
 };
 
 
 /**
  * TextureCUBE is a class for textures used for cube mapping.  A cube texture
  * stores bitmaps for the 6 faces of a cube and is addressed via three texture
  * coordinates.
  * 
  * @param {number} edgeLength The length of any edge of this texture
  * @constructor
@@ skipping 153 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();
 };