Incremental progress toward archive loading in o3d-webgl. Implemented...

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 358 matching lines @@
 o3d.TextureCUBE.FACE_POSITIVE_Y = 2;
 o3d.TextureCUBE.FACE_NEGATIVE_Y = 3;
 o3d.TextureCUBE.FACE_POSITIVE_Z = 4;
 o3d.TextureCUBE.FACE_NEGATIVE_Z = 5;
 
 
 /**
  * The length of each edge of the cube, in texels.
  * @type {number}
  */
-o3d.TextureCUBE.prototype.edge_length = 0;
+o3d.TextureCUBE.prototype.edgeLength = 0;
 
 
 /**
  * Returns a RenderSurface object associated with a given cube face and
  * mip_level of a texture.
  * 
  * @param {o3d.TextureCUBE.CubeFace} face The cube face from which to extract
  *     the surface.
  * @param {o3d.Pack} pack This parameter is no longer used. The surface exists
  *     as long as the texture it came from exists.
@@ skipping 72 matching lines @@
 
 /**
  * Sets the content of a face of the texture to the content of the bitmap. The
  * texture and the bitmap must be the same dimensions and the same format.
  * 
  * @param {o3d.TextureCUBE.CubeFace} face The face to set.
  * @param {o3d.Bitmap} bitmap The bitmap to copy data from.
  */
 o3d.TextureCUBE.prototype.setFromBitmap =
     function(face, bitmap) {
-  o3d.notImplemented();
+  this.gl.bindTexture(this.gl.TEXTURE_CUBE_MAP, this.texture_);
+  this.gl.texImage2D(this.gl.TEXTURE_CUBE_MAP_POSITIVE_X + face,
+                     0,  // Level.
+                     bitmap.canvas_,
+                     false); // Do not flip cube maps' faces.
+  // TODO(petersont): figure out when we should call generateMipmaps.
+  // TODO(petersont): move generateMips to Texture2D / TextureCUBE
+  // classes because the target needs to differ.
+  //  if (bitmap.defer_mipmaps_to_texture_) {
+  //    this.generateMips();
+  //  }
 };
 
 
 /**
  * Copy pixels from source bitmap to certain face and mip level.
  * Scales if the width and height of source and dest do not match.
  * TODO(petersont): Should take optional arguments.
  * 
  * @param {o3d.Bitmap} source_img The source bitmap.
  * @param {number} source_mip which mip of the source to copy from.
@@ skipping 13 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();
 };