FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some small updates to the saving code.

Browse Source
This commit is contained in:
ehofman
2005-01-13 18:35:56 +00:00
parent da6e1b31ea
commit 463ca207ce
1 changed files with 14 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/screen/texture.cxx
+14 -46
View File
@@ -429,50 +429,16 @@ SGTexture::read_r8_texture(const char *name)
void void
SGTexture::write_texture(const char *name) { SGTexture::write_texture(const char *name) {
SGTexture::ImageRec *image; SGTexture::ImageRec *image = ImageWriteOpen(name);
int x, y;
image=ImageWriteOpen(name); for (int c=0; c<num_colors; c++) {
GLubyte *ptr = texture_data + c;
GLubyte *ptr = texture_data; for (int y=0; y<texture_height; y++) {
for (y=0; y<texture_height; y++) { for (int x=0; x<texture_width; x++) {
for (x=0; x<texture_width; x++) { image->tmp[x]=*ptr;
image->tmp[x]=*ptr; ptr = ptr + num_colors;
ptr = ptr + num_colors;
}
fwrite(image->tmp, 1, texture_width, image->file);
}
if (num_colors > 1) {
ptr = texture_data + 1;
for (y=0; y<texture_height; y++) {
for (x=0; x<texture_width; x++) {
image->tmp[x]=*ptr;
ptr = ptr + num_colors;
}
fwrite(image->tmp, 1, texture_width, image->file);
}
if (num_colors > 2) {
ptr = texture_data + 2;
for (y=0; y<texture_height; y++) {
for (x=0; x<texture_width; x++) {
image->tmp[x]=*ptr;
ptr = ptr + num_colors;
}
fwrite(image->tmp, 1, texture_width, image->file);
}
if (num_colors > 3) {
ptr = texture_data + 3;
for (y=0; y<texture_height; y++) {
for (x=0; x<texture_width; x++) {
image->tmp[x]=*ptr;
ptr = ptr + num_colors;
}
fwrite(image->tmp, 1, texture_width, image->file);
}
} }
fwrite(image->tmp, 1, texture_width, image->file);
} }
} }
@@ -655,14 +621,14 @@ SGTexture::ImageWriteOpen(const char *fileName)
errstr = OUT_OF_MEMORY; errstr = OUT_OF_MEMORY;
return 0; return 0;
} }
if ((image->file = fopen(fileName, "w")) == 0) { if ((image->file = fopen(fileName, "wb")) == 0) {
errstr = FILE_OPEN_ERROR; errstr = FILE_OPEN_ERROR;
return 0; return 0;
} }
image->imagic = 474; image->imagic = 474;
image->type = 0x0001; image->type = 0x0001;
image->dim = 0; image->dim = (num_colors > 1) ? 3 : 2;
image->xsize = texture_width; image->xsize = texture_width;
image->ysize = texture_height; image->ysize = texture_height;
image->zsize = num_colors; image->zsize = num_colors;
@@ -670,6 +636,7 @@ SGTexture::ImageWriteOpen(const char *fileName)
fwrite(image, 1, 12, image->file); fwrite(image, 1, 12, image->file);
fseek(image->file, 512, SEEK_SET); fseek(image->file, 512, SEEK_SET);
if (swapFlag) { if (swapFlag) {
ConvertShort(&image->imagic, 6); ConvertShort(&image->imagic, 6);
} }
@@ -690,13 +657,14 @@ SGTexture::ImageWriteOpen(const char *fileName)
} }
image->rleEnd = 512 + (2 * x); image->rleEnd = 512 + (2 * x);
fseek(image->file, 512, SEEK_SET); fseek(image->file, 512, SEEK_SET);
fread(image->rowStart, 1, x, image->file); fwrite(image->rowStart, 1, x, image->file);
fread(image->rowSize, 1, x, image->file); fwrite(image->rowSize, 1, x, image->file);
if (swapFlag) { if (swapFlag) {
ConvertUint(image->rowStart, x/(int) sizeof(unsigned)); ConvertUint(image->rowStart, x/(int) sizeof(unsigned));
ConvertUint((unsigned *)image->rowSize, x/(int) sizeof(int)); ConvertUint((unsigned *)image->rowSize, x/(int) sizeof(int));
} }
} }
return image; return image;
} }