Fix a few bugs and add a make_monochrome() function

diff --git a/simgear/screen/texture.cxx b/simgear/screen/texture.cxx
index 67c5900e157a2ec4c8c54fc5a617b56b801fe814..4854a2c3f3686853c511d8dfabd73a78b5656bc5 100644 (file)
--- a/simgear/screen/texture.cxx
+++ b/simgear/screen/texture.cxx
@@ -447,34 +447,30 @@ SGTexture::write_texture(const char *name) {
 
 
 void
-SGTexture::set_pixel(GLuint x, GLuint y, sgVec3 &c)
+SGTexture::set_pixel(GLuint x, GLuint y, GLubyte *c)
 {
     if (!texture_data) {
         errstr = NO_TEXTURE;
         return;
     }
 
-    unsigned int pos = (x + y*texture_width)*3;
-    texture_data[pos]   = (unsigned char)(c[0] * 256);
-    texture_data[pos+1] = (unsigned char)(c[1] * 256);
-    texture_data[pos+2] = (unsigned char)(c[2] * 256);
+    unsigned int pos = (x + y*texture_width) * num_colors;
+    memcpy(texture_data+pos, c, num_colors);
 }
 
 
-float *
+GLubyte *
 SGTexture::get_pixel(GLuint x, GLuint y)
 {
-    static sgVec3 c;
+    static GLubyte c[4] = {0, 0, 0, 0};
 
-    sgSetVec3(c, 0, 0, 0);
     if (!texture_data) {
         errstr = NO_TEXTURE;
         return c;
     }
 
-    unsigned int pos = (x + y*texture_width)*3;
-
-    sgSetVec3(c, texture_data[pos], texture_data[pos+1], texture_data[pos+2]);
+    unsigned int pos = (x + y*texture_width)*num_colors;
+    memcpy(c, texture_data + pos, num_colors);
 
     return c;
 }
@@ -796,3 +792,24 @@ SGTexture::ConvertUint(unsigned *array, unsigned int length) {
     }
 }
 
+
+void
+SGTexture::make_monochrome(GLubyte r, GLubyte g, GLubyte b) {
+
+   if (num_colors != 3)
+      return;
+
+   GLubyte ap[3];
+   for (int y=0; y<texture_height; y++)
+      for (int x=0; x<texture_width; x++)
+      {
+         GLubyte *rgb = get_pixel(x,y);
+         GLubyte avg = (rgb[0] + rgb[1] + rgb[2]) / 3;
+
+         ap[0] = avg*r/255;
+         ap[1] = avg*g/255;
+         ap[2] = avg*b/255;
+
+         set_pixel(x,y,ap);
+      }
+}

diff --git a/simgear/screen/texture.hxx b/simgear/screen/texture.hxx
index 4099010bd44c9b5ae8fdb4e3a2ceeb443384385c..1f191264a125e271983e31e232e28bf96bdc67f0 100644 (file)
--- a/simgear/screen/texture.hxx
+++ b/simgear/screen/texture.hxx
@@ -111,8 +111,8 @@ public:
     void finish(unsigned int width, unsigned int height);
 
     // texture pixel manipulation functions.
-    void set_pixel(GLuint x, GLuint y, sgVec3 &c);
-    float *get_pixel(GLuint x, GLuint y);
+    void set_pixel(GLuint x, GLuint y, GLubyte *c);
+    GLubyte *get_pixel(GLuint x, GLuint y);
 
     void bind();
     inline void select(bool keep_data = false) {
@@ -137,6 +137,8 @@ public:
 
     inline const char *err_str() { return errstr; }
     inline void clear_err_str() { errstr = ""; }
+
+    void make_monochrome(GLubyte r=255, GLubyte g=255, GLubyte b=255);
 };
 
 #endif