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

- bugfix for unit titles in special debug mode

Browse Source 
- added support for png format for pixmap3d (Water) textures
This commit is contained in:
Mark Vejvoda
2011-07-01 07:46:18 +00:00
parent ec15c81d12
commit d2c8cc0187
5 changed files with 122 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1209,18 +1209,21 @@ bool Pixmap2D::doDimensionsAgree(const Pixmap2D *pixmap){
// class Pixmap3D
// =====================================================
Pixmap3D::Pixmap3D(){
Pixmap3D::Pixmap3D() {
w= -1;
h= -1;
d= -1;
components= -1;
pixels = NULL;
}
Pixmap3D::Pixmap3D(int w, int h, int d, int components){
pixels = NULL;
init(w, h, d, components);
}
Pixmap3D::Pixmap3D(int d, int components){
pixels = NULL;
init(d, components);
}
@@ -1263,7 +1266,10 @@ Pixmap3D::~Pixmap3D() {
void Pixmap3D::loadSlice(const string &path, int slice) {
string extension= path.substr(path.find_last_of('.') + 1);
if(extension == "bmp") {
if(extension == "png") {
loadSlicePng(path, slice);
}
else if(extension == "bmp") {
loadSliceBmp(path, slice);
}
else if(extension == "tga") {
@@ -1275,6 +1281,48 @@ void Pixmap3D::loadSlice(const string &path, int slice) {
this->path = path;
}
void Pixmap3D::loadSlicePng(const string &path, int slice) {
this->path = path;
Pixmap3D *pixmap = FileReader<Pixmap3D>::readPath(path);
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){
this->path = path;