Merge lp:~unity-team/nux/nux.save-base-texture into lp:nux

[Eleni Maria Stea]

moved the debug function that saves textures to disk to the IOpenGLBaseTexture class

[Eleni Maria Stea (hikiko)]

review: Approve

[Mirco Müller (macslow)]

Look good to me.

review: Approve

=== modified file 'NuxGraphics/IOpenGLBaseTexture.cpp'
--- NuxGraphics/IOpenGLBaseTexture.cpp	2012-11-17 14:22:27 +0000
+++ NuxGraphics/IOpenGLBaseTexture.cpp	2013-02-13 12:32:21 +0000
@@ -264,6 +264,62 @@
     return 0;
   }
 
+  void IOpenGLBaseTexture::Save(const char* filename)
+  {
+    GLuint tex_id = GetOpenGLID();
+    glBindTexture(GL_TEXTURE_2D, tex_id);
+
+    int width, height;
+
+#ifndef NUX_OPENGLES_20
+      glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
+      glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height);
+#else
+      width = GetWidth();
+      height = GetHeight();
+#endif
+
+      if(!width || !height)
+        return;
+
+      uint32_t* pixels = new uint32_t[width * height];
+      uint32_t* tmp = pixels;
+
+#ifndef NUX_OPENGLES_20
+      glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+#else
+      GLuint fbo;
+      glGenFramebuffers(1, &fbo);
+      glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+      glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex_id, 0);
+      glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+      glBindFramebuffer(GL_FRAMEBUFFER, 0);
+      glDeleteFramebuffers(1, &fbo);
+#endif
+
+      FILE* fp;
+      if(!(fp = fopen(filename, "wb"))) {
+        fprintf(stderr, "Cannot open file: %s\n", filename);
+        return;
+      }
+
+      fprintf(fp, "P6\n%d %d\n255\n", width, height);
+
+      int sz = width * height;
+      for(int i=0; i<sz; i++) {
+        uint32_t pix = *tmp++;
+        int r = (pix >> 16) & 0xff;
+        int g = (pix >> 8) & 0xff;
+        int b = pix & 0xff;
+
+        fputc(r, fp);
+        fputc(g, fp);
+        fputc(b, fp);
+      }
+
+      fclose(fp);
+      delete [] pixels;
+  }
 
   int GetTextureSize(IOpenGLBaseTexture *pTexture)
   {

=== modified file 'NuxGraphics/IOpenGLBaseTexture.h'
--- NuxGraphics/IOpenGLBaseTexture.h	2012-01-17 03:57:31 +0000
+++ NuxGraphics/IOpenGLBaseTexture.h	2013-02-13 12:32:21 +0000
@@ -151,6 +151,8 @@
     */
     virtual unsigned char* GetSurfaceData(int level, int &width, int &height, int &stride);
 
+    void Save(const char* filename);
+
   protected:
     GLTextureStates _TextureStates;
     bool            _IsPOT;             // is power of two?

=== modified file 'NuxGraphics/IOpenGLTexture2D.cpp'
--- NuxGraphics/IOpenGLTexture2D.cpp	2013-02-08 17:40:29 +0000
+++ NuxGraphics/IOpenGLTexture2D.cpp	2013-02-13 12:32:21 +0000
@@ -87,63 +87,6 @@
 
   }
 
-  void IOpenGLTexture2D::Save(const char* filename)
-  {
-    GLuint tex_id = GetOpenGLID();
-    glBindTexture(GL_TEXTURE_2D, tex_id);
-
-    int width, height;
-
-#ifndef NUX_OPENGLES_20
-    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
-    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height);
-#else
-    width = GetWidth();
-    height = GetHeight();
-#endif
-
-    if(!width || !height)
-      return;
-
-    uint32_t* pixels = new uint32_t[width * height];
-    uint32_t* tmp = pixels;
-
-#ifndef NUX_OPENGLES_20
-    glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
-#else
-    GLuint fbo;
-    glGenFramebuffers(1, &fbo);
-    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex_id, 0);
-    glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
-    glBindFramebuffer(GL_FRAMEBUFFER, 0);
-    glDeleteFramebuffers(1, &fbo);
-#endif
-
-    FILE* fp;
-    if(!(fp = fopen(filename, "wb"))) {
-      fprintf(stderr, "Cannot open file: %s\n", filename);
-      return;
-    }
-
-    fprintf(fp, "P6\n%d %d\n255\n", width, height);
-
-    int sz = width * height;
-    for(int i=0; i<sz; i++) {
-      uint32_t pix = *tmp++;
-      int r = (pix >> 16) & 0xff;
-      int g = (pix >> 8) & 0xff;
-      int b = pix & 0xff;
-
-      fputc(r, fp);
-      fputc(g, fp);
-      fputc(b, fp);
-    }
-
-    fclose(fp);
-    delete [] pixels;
-}
-
   ObjectPtr<IOpenGLSurface> IOpenGLTexture2D::GetSurfaceLevel(int Level)
   {
     if ((Level >= 0) && (Level < _NumMipLevel))

=== modified file 'NuxGraphics/IOpenGLTexture2D.h'
--- NuxGraphics/IOpenGLTexture2D.h	2013-02-08 15:13:55 +0000
+++ NuxGraphics/IOpenGLTexture2D.h	2013-02-13 12:32:21 +0000
@@ -33,8 +33,6 @@
   public:
     virtual ~IOpenGLTexture2D();
 
-    void Save(const char* filename);
-
     void GetSurfaceLevel(int Level, ObjectPtr<IOpenGLSurface>& surface);
     ObjectPtr<IOpenGLSurface> GetSurfaceLevel(int Level);