mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-30 01:18:58 +02:00
Code Issues Projects Releases Wiki Activity

- another small bugfix for water texture loading

Browse Source
This commit is contained in:
Mark Vejvoda
2011-07-02 07:15:23 +00:00
parent f9ad27f655
commit 1a5c70c76e
3 changed files with 22 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
source/shared_lib/sources/graphics/pixmap.cpp
View File

@@ -1288,47 +1288,9 @@ void Pixmap3D::loadSlice(const string &path, int slice) {
void Pixmap3D::loadSlicePng(const string &path, int slice) {
this->path = path;
deletePixels();
//deletePixels();
Pixmap3D *pixmap = FileReader<Pixmap3D>::readPath(path,this);
//printf("Loading 3D pixmap PNG [%s] pixmap [%p] this [%p]\n",path.c_str(),pixmap, this);
// if(pixmap != NULL) {
// this->path = path;
//
// w= pixmap->getW();
// h= pixmap->getH();
// if(components==-1){
// components= pixmap->getComponents();
// }
//
// if(pixels==NULL) {
// pixels= new uint8[(std::size_t)pixmap->getPixelByteCount()];
// }
//
// for(unsigned int i = 0; i < pixmap->getPixelByteCount(); ++i) {
// pixels[i] = pixmap->getPixels()[i];
// }
// }
// PixmapIoP plt;
// plt.openRead(path);
//
// //header
// int fileComponents= plt.getComponents();
//
// //init
// w= plt.getW();
// h= plt.getH();
// if(components==-1){
// components= fileComponents;
// }
// if(pixels==NULL){
// pixels= new uint8[(std::size_t)getPixelByteCount()];
// }
//
// //read data
// plt.read(&pixels[slice*w*h*components], components);
}
void Pixmap3D::loadSliceBmp(const string &path, int slice){
@@ -1354,37 +1316,10 @@ void Pixmap3D::loadSliceBmp(const string &path, int slice){
void Pixmap3D::loadSliceTga(const string &path, int slice){
this->path = path;
deletePixels();
//deletePixels();
FileReader<Pixmap3D>::readPath(path,this);
//printf("Loading 3D pixmap TGA [%s] this [%p]\n",path.c_str(),this);
// Pixmap3D *pixmap = new Pixmap3D();
// pixmap->h = this->h;
// pixmap->w = this->w;
// pixmap->d = this->d;
// pixmap->components = this->components;
// pixmap->slice = this->slice;
// FileReader<Pixmap3D>::readPath(path,pixmap);
// printf("Loading 3D pixmap TGA [%s] pixmap [%p] this [%p]\n",path.c_str(),pixmap, this);
//
// //init
// w= pixmap->getW();
// h= pixmap->getH();
// if(components==-1){
// components= pixmap->getComponents();
// }
// if(pixels==NULL){
// pixels= new uint8[(std::size_t)getPixelByteCount()];
// }
//
// //read data
// for(unsigned int i = slice*w*h*components; i < h*w*components; ++i) {
// pixels[i] = pixmap->getPixels()[i];
// }
//
// delete pixmap;
/*
PixmapIoTga plt;
plt.openRead(path);