A step in exposing Bitmap to JavaScript.

The plan is to make pack.createBitmapFromRawData
return an array of bitmaps.

1 bitmap if it's a standard 2d image
6 bitmaps if it's a cubemap
N bitmaps if it's a volume map.

The bitmaps will have a semantic so you can look at them and tell
they were from a volumemap, a cubemap or a 2d image.

On the way I'm attempting to clean up the code. Moving
stuff out of Bitmap the did not belong there and 
Refactoring Bitmap so there are less If Format =
stuff.

Review URL: http://codereview.chromium.org/164034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22583 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 54 insertions, 0 deletions

diff --git a/o3d/plugin/idl/texture.idl b/o3d/plugin/idl/texture.idl
index 763518e..54b705c 100644
--- a/o3d/plugin/idl/texture.idl
+++ b/o3d/plugin/idl/texture.idl
@@ -107,6 +107,29 @@ namespace o3d {
     True of all the alpha values in the texture are 1.0
   %]
   [getter, getter, setter] bool alpha_is_one;
+
+  %[
+    Generates Mips.
+    \param source_level the mip to use as the source.
+    \param num_levels the number of mips from the source to generate.
+  %]
+  void GenerateMips(int source_level, int num_levels);
+
+  %[
+    Sets the content of the texture to the content of the bitmap. The texture
+    and the bitmap must be the same dimensions and the same format.
+
+    \param bitmap The bitmap to copy data from.
+  %]
+  [userglue]
+  void SetFromBitmap(Bitmap bitmap);
+
+  [verbatim=cpp_glue] %{
+    void userglue_method_SetFromBitmap(o3d::Texture* self,
+                                       o3d::Bitmap* bitmap) {
+      self->SetFromBitmap(*bitmap);
+    }
+  %}
 };  // Texture
 
 %[
@@ -209,10 +232,25 @@ namespace o3d {
     \param dest_height height of the dest image.
     \param dest_mip on which mip level the sourceImg would be drawn.
   %]
+  [userglue]
   void DrawImage(Bitmap source_img, int source_x, int source_y,
                  int source_width, int source_height,
                  int dest_x, int dest_y,
                  int dest_width, int dest_height, int dest_mip);
+
+  [verbatim=cpp_glue] %{
+  void userglue_method_DrawImage(
+       o3d::Texture2D* self,
+       o3d::Bitmap* source_img, int source_x, int source_y,
+       int source_width, int source_height,
+       int dest_x, int dest_y,
+       int dest_width, int dest_height, int dest_mip) {
+    self->DrawImage(*source_img, source_x, source_y,
+                    source_width, source_height,
+                    dest_x, dest_y,
+                    dest_width, dest_height, dest_mip);
+  }
+%}
 };  // Texture2D
 
 
@@ -317,11 +355,27 @@ namespace o3d {
     \param face on which face the sourceImg would be drawn.
     \param dest_mip on which mip level the sourceImg would be drawn.
   %]
+  [userglue]
   void DrawImage(Bitmap source_img, int source_x, int source_y,
                  int source_width, int source_height,
                  int dest_x, int dest_y,
                  int dest_width, int dest_height,
                  CubeFace face, int dest_mip);
+
+  [verbatim=cpp_glue] %{
+    void userglue_method_DrawImage(
+         o3d::TextureCUBE* self,
+         o3d::Bitmap* source_img, int source_x, int source_y,
+         int source_width, int source_height,
+         int dest_x, int dest_y,
+         int dest_width, int dest_height,
+         o3d::TextureCUBE::CubeFace dest_face, int dest_mip) {
+      self->DrawImage(*source_img, source_x, source_y,
+                      source_width, source_height,
+                      dest_x, dest_y,
+                      dest_width, dest_height, dest_face, dest_mip);
+    }
+  %}
 };  // TextureCUBE
 
 }  // namespace o3d