# include <windows.h>
#endif
-#include SG_GLU_H
+#include <osg/GLU>
+#include <math.h>
#include <zlib.h>
#include "texture.hxx"
SGTexture::~SGTexture()
{
- if ( texture_data ) {
- delete texture_data;
- }
+ delete[] texture_data;
if ( texture_id != 0 ) {
free_id();
SGTexture::ImageRec *image;
int y;
- if (texture_data)
- delete texture_data;
+ delete[] texture_data;
image = ImageOpen(name);
if(!image) {
SGTexture::read_rgb_texture(const char *name)
{
GLubyte *ptr;
- GLubyte *rbuf, *gbuf, *bbuf, *abuf;
+ GLubyte *rbuf, *gbuf, *bbuf;
SGTexture::ImageRec *image;
int y;
- if (texture_data)
- delete texture_data;
+ delete[] texture_data;
image = ImageOpen(name);
if(!image) {
texture_width = image->xsize;
texture_height = image->ysize;
- if (image->zsize != 3 && image->zsize != 4) {
+ if (image->zsize < 1 || image->zsize > 4) {
ImageClose(image);
errstr = WRONG_COUNT;
return;
}
- texture_data = new GLubyte[ image->xsize * image->ysize * 3 ];
num_colors = 3;
+ texture_data = new GLubyte[ image->xsize * image->ysize * num_colors ];
rbuf = new GLubyte[ image->xsize ];
gbuf = new GLubyte[ image->xsize ];
bbuf = new GLubyte[ image->xsize ];
- abuf = new GLubyte[ image->xsize ];
- if(!texture_data || !rbuf || !gbuf || !bbuf || !abuf) {
- delete texture_data;
- delete rbuf;
- delete gbuf;
- delete bbuf;
- delete abuf;
+ if(!texture_data || !rbuf || !gbuf || !bbuf) {
+ delete[] texture_data;
+ delete[] rbuf;
+ delete[] gbuf;
+ delete[] bbuf;
errstr = OUT_OF_MEMORY;
return;
}
ptr = texture_data;
for(y=0; y<image->ysize; y++) {
- if(image->zsize == 4) {
+ if(image->zsize == 4 || image->zsize == 3) {
ImageGetRow(image,rbuf,y,0);
ImageGetRow(image,gbuf,y,1);
ImageGetRow(image,bbuf,y,2);
- ImageGetRow(image,abuf,y,3); // discard
- rgbtorgb(rbuf,gbuf,bbuf,ptr,image->xsize);
- ptr += (image->xsize * 3);
} else {
ImageGetRow(image,rbuf,y,0);
- ImageGetRow(image,gbuf,y,1);
- ImageGetRow(image,bbuf,y,2);
- rgbtorgb(rbuf,gbuf,bbuf,ptr,image->xsize);
- ptr += (image->xsize * 3);
+ memcpy(gbuf,rbuf,image->xsize);
+ memcpy(bbuf,rbuf,image->xsize);
}
+ rgbtorgb(rbuf,gbuf,bbuf,ptr,image->xsize);
+ ptr += (image->xsize * num_colors);
}
ImageClose(image);
- delete rbuf;
- delete gbuf;
- delete bbuf;
- delete abuf;
+ delete[] rbuf;
+ delete[] gbuf;
+ delete[] bbuf;
}
SGTexture::ImageRec *image;
int y;
- if (texture_data)
- delete texture_data;
+ delete[] texture_data;
image = ImageOpen(name);
if(!image) {
texture_width = image->xsize;
texture_height = image->ysize;
- if (image->zsize != 3 && image->zsize != 4) {
+ if (image->zsize < 1 || image->zsize > 4) {
ImageClose(image);
errstr = WRONG_COUNT;
return;
}
- texture_data = new GLubyte[ image->xsize * image->ysize * 4 ];
num_colors = 4;
+ texture_data = new GLubyte[ image->xsize * image->ysize * num_colors ];
rbuf = new GLubyte[ image->xsize ];
gbuf = new GLubyte[ image->xsize ];
bbuf = new GLubyte[ image->xsize ];
abuf = new GLubyte[ image->xsize ];
if(!texture_data || !rbuf || !gbuf || !bbuf || !abuf) {
- delete texture_data;
- delete rbuf;
- delete gbuf;
- delete bbuf;
- delete abuf;
+ delete[] texture_data;
+ delete[] rbuf;
+ delete[] gbuf;
+ delete[] bbuf;
+ delete[] abuf;
errstr = OUT_OF_MEMORY;
return;
}
ptr = texture_data;
- memset(abuf, 255, image->xsize);
for(y=0; y<image->ysize; y++) {
if(image->zsize == 4) {
ImageGetRow(image,rbuf,y,0);
ImageGetRow(image,gbuf,y,1);
ImageGetRow(image,bbuf,y,2);
ImageGetRow(image,abuf,y,3);
- rgbatorgba(rbuf,gbuf,bbuf,abuf,ptr,image->xsize);
- ptr += (image->xsize * 4);
- } else {
+ } else if(image->zsize == 3) {
ImageGetRow(image,rbuf,y,0);
ImageGetRow(image,gbuf,y,1);
ImageGetRow(image,bbuf,y,2);
- rgbatorgba(rbuf,gbuf,bbuf,abuf,ptr,image->xsize);
- ptr += (image->xsize * 3);
+ memset(abuf, 255, image->xsize);
+ } else if(image->zsize == 2) {
+ ImageGetRow(image,rbuf,y,0);
+ memcpy(gbuf,rbuf,image->xsize);
+ memcpy(bbuf,rbuf,image->xsize);
+ ImageGetRow(image,abuf,y,1);
+ } else {
+ ImageGetRow(image,rbuf,y,0);
+ memcpy(gbuf,rbuf,image->xsize);
+ memcpy(bbuf,rbuf,image->xsize);
+ memset(abuf, 255, image->xsize);
}
+ rgbatorgba(rbuf,gbuf,bbuf,abuf,ptr,image->xsize);
+ ptr += (image->xsize * num_colors);
}
ImageClose(image);
- delete rbuf;
- delete gbuf;
- delete bbuf;
- delete abuf;
+ delete[] rbuf;
+ delete[] gbuf;
+ delete[] bbuf;
+ delete[] abuf;
}
void
SGTexture::ImageRec *image;
int y;
- if (texture_data)
- delete texture_data;
+ delete[] texture_data;
image = RawImageOpen(name);
SGTexture::ImageRec *image;
int xy;
- if (texture_data)
- delete texture_data;
+ delete[] texture_data;
//it wouldn't make sense to write a new function ...
image = RawImageOpen(name);
SGTexture::ImageClose(SGTexture::ImageRec *image) {
if (image->file) gzclose(image->file);
if (file) fclose(file);
- delete image->tmp;
+ delete[] image->tmp;
+ delete[] image->rowStart;
+ delete[] image->rowSize;
delete image;
}
//just allocate a pseudo value as I'm too lazy to change ImageClose()...
- image->tmp = new GLubyte;
+ image->tmp = new GLubyte[1];
if (image->tmp == 0) {
errstr = OUT_OF_MEMORY;
image->ysize = texture_height;
image->zsize = num_colors;
- fwrite(image, 1, 12, file);
-
- fseek(file, 512, SEEK_SET);
-
if (swapFlag) {
ConvertShort(&image->imagic, 6);
}
+ fwrite(image, 1, 12, file);
+ fseek(file, 512, SEEK_SET);
+
image->tmp = new GLubyte[ image->xsize * 256 ];
if (image->tmp == 0) {
errstr = OUT_OF_MEMORY;
}
image->rleEnd = 512 + (2 * x);
fseek(file, 512, SEEK_SET);
- fwrite(image->rowStart, 1, x, file);
- fwrite(image->rowSize, 1, x, file);
+ fread(image->rowStart, 1, x, file);
+ fread(image->rowSize, 1, x, file);
if (swapFlag) {
ConvertUint(image->rowStart, x/(int) sizeof(unsigned));
ConvertUint((unsigned *)image->rowSize, x/(int) sizeof(int));
if ((image->type & 0xFF00) == 0x0100) {
gzseek(image->file, (long) image->rowStart[y+z*image->ysize], SEEK_SET);
- gzread(image->file, image->tmp,
- (unsigned int)image->rowSize[y+z*image->ysize]);
+ int size = image->rowSize[y+z*image->ysize];
+ gzread(image->file, image->tmp, size);
iPtr = image->tmp;
oPtr = buf;
- for (;;) {
+ for (GLubyte *limit = iPtr + size; iPtr < limit;) {
pixel = *iPtr++;
count = (int)(pixel & 0x7F);
if (!count) {
return;
}
if (pixel & 0x80) {
- while (count--) {
+ while (iPtr < limit && count--) {
*oPtr++ = *iPtr++;
}
- } else {
+ } else if (iPtr < limit) {
pixel = *iPtr++;
while (count--) {
*oPtr++ = pixel;
GLubyte *rgb = get_pixel(x,y);
GLubyte avg = (rgb[0] + rgb[1] + rgb[2]) / 3;
+ if (contrast != 1.0) {
+ float pixcol = -1.0 + (avg/128);
+ avg = 128 + int(128*pow(pixcol, contrast));
+ }
+
ap[0] = avg*r/255;
ap[1] = avg*g/255;
ap[2] = avg*b/255;
void
SGTexture::make_grayscale(float contrast) {
- if (num_colors >= 3)
+ if (num_colors < 3)
return;
- GLubyte *map = (GLubyte *)malloc (texture_width * texture_height);
+ int colors = (num_colors == 3) ? 1 : 2;
+ GLubyte *map = new GLubyte[ texture_width * texture_height * colors ];
+
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;
- map[x +y*texture_height] = avg;
+ if (contrast != 1.0) {
+ float pixcol = -1.0 + (avg/128);
+ avg = 128 + int(128*pow(pixcol, contrast));
+ }
+
+ int pos = (x + y*texture_width)*colors;
+ map[pos] = avg;
+ if (colors > 1)
+ map[pos+1] = rgb[3];
}
- free (texture_data);
+ delete[] texture_data;
texture_data = map;
- num_colors = 1;
+ num_colors = colors;
+}
+
+
+void
+SGTexture::make_maxcolorwindow() {
+ GLubyte minmaxc[2] = {255, 0};
+
+ int pos = 0;
+ int max = num_colors;
+ if (num_colors == 2) max = 1;
+ if (num_colors == 4) max = 3;
+ while (pos < texture_width * texture_height * num_colors) {
+ for (int i=0; i < max; i++) {
+ GLubyte c = texture_data[pos+i];
+ if (c < minmaxc[0]) minmaxc[0] = c;
+ if (c > minmaxc[1]) minmaxc[1] = c;
+ }
+ pos += num_colors;
+ }
+
+ GLubyte offs = minmaxc[0];
+ float factor = 255.0 / float(minmaxc[1] - minmaxc[0]);
+ // printf("Min: %i, Max: %i, Factor: %f\n", offs, minmaxc[1], factor);
+
+ pos = 0;
+ while (pos < texture_width * texture_height * num_colors) {
+ for (int i=0; i < max; i++) {
+ texture_data[pos+i] -= offs;
+ texture_data[pos+i] = int(factor * texture_data[pos+i]);
+ }
+ pos += num_colors;
+ }
}
void
SGTexture::make_normalmap(float brightness, float contrast) {
make_grayscale(contrast);
+ make_maxcolorwindow();
+
+ int colors = (num_colors == 1) ? 3 : 4;
+ bool alpha = (colors > 3);
+ int tsize = texture_width * texture_height * colors;
+ GLubyte *map = new GLubyte[ tsize ];
+
+ int mpos = 0, dpos = 0;
+ for (int y=0; y<texture_height; y++) {
+ int ytw = y*texture_width;
+
+ for (int x=0; x<texture_width; x++)
+ {
+ int xp1 = (x < (texture_width-1)) ? x+1 : 0;
+ int yp1 = (y < (texture_height-1)) ? y+1 : 0;
+ int posxp1 = (xp1 + ytw)*num_colors;
+ int posyp1 = (x + yp1*texture_width)*num_colors;
+
+ GLubyte c = texture_data[dpos];
+ GLubyte cx1 = texture_data[posxp1];
+ GLubyte cy1 = texture_data[posyp1];
+
+ if (alpha) {
+ GLubyte a = texture_data[dpos+1];
+ GLubyte ax1 = texture_data[posxp1+1];
+ GLubyte ay1 = texture_data[posyp1+1];
- GLubyte *map = (GLubyte *)malloc (texture_width * texture_height * 3);
+ c = (c + a)/2;
+ cx1 = (cx1 + ax1)/2;
+ cy1 = (cy1 + ay1)/2;
+
+ map[mpos+3] = a;
+ }
+
+ map[mpos+0] = (128+(cx1-c)/2);
+ map[mpos+1] = (128+(cy1-c)/2);
+ map[mpos+2] = 127+int(brightness*128); // 255-c/2;
+
+ mpos += colors;
+ dpos += num_colors;
+ }
+ }
+
+ delete[] texture_data;
+ texture_data = map;
+ num_colors = colors;
+}
+
+
+void
+SGTexture::make_bumpmap(float brightness, float contrast) {
+ make_grayscale(contrast);
+
+ int colors = (num_colors == 1) ? 1 : 2;
+ GLubyte *map = new GLubyte[ texture_width * texture_height * colors ];
for (int y=0; y<texture_height; y++)
for (int x=0; x<texture_width; x++)
{
- int mpos = (x + y*texture_width)*3;
+ int mpos = (x + y*texture_width)*colors;
int dpos = (x + y*texture_width)*num_colors;
int xp1 = (x < (texture_width-1)) ? x+1 : 0;
int posxp1 = (xp1 + y*texture_width)*num_colors;
int posyp1 = (x + yp1*texture_width)*num_colors;
- map[mpos+0] = (128+(texture_data[posxp1]-texture_data[dpos])/2);
- map[mpos+1] = (128+(texture_data[posyp1]-texture_data[dpos])/2);
- map[mpos+2] = 127 + GLubyte(128*brightness);
+ map[mpos] = (127 - ((texture_data[dpos]-texture_data[posxp1]) -
+ ((texture_data[dpos]-texture_data[posyp1]))/4))/2;
+ if (colors > 1)
+ map[mpos+1] = texture_data[dpos+1];
}
- free (texture_data);
+ delete[] texture_data;
texture_data = map;
- num_colors = 3;
+ num_colors = colors;
}
+
projects / simgear.git / blobdiff