mirror of
https://github.com/glest/glest-source.git
synced 2025-09-29 17:09:02 +02:00
Fixed the god-awful indentation
This commit is contained in:
mathusummut
@@ -18,285 +18,285 @@
|
||||
using namespace Shared::Util;
|
||||
using namespace Shared::Platform;
|
||||
|
||||
namespace Shared{ namespace Graphics{
|
||||
namespace Shared {
|
||||
namespace Graphics {
|
||||
|
||||
// =====================================================
|
||||
// class Texture
|
||||
// =====================================================
|
||||
// =====================================================
|
||||
// class Texture
|
||||
// =====================================================
|
||||
|
||||
const int Texture::defaultSize = 256;
|
||||
const int Texture::defaultComponents = 4;
|
||||
bool Texture::useTextureCompression = false;
|
||||
const int Texture::defaultSize = 256;
|
||||
const int Texture::defaultComponents = 4;
|
||||
bool Texture::useTextureCompression = false;
|
||||
|
||||
// Quick utility function for texture creation
|
||||
/*
|
||||
static int powerOfTwo(int input) {
|
||||
int value = 1;
|
||||
// Quick utility function for texture creation
|
||||
/*
|
||||
static int powerOfTwo(int input) {
|
||||
int value = 1;
|
||||
|
||||
while (value < input) {
|
||||
value <<= 1;
|
||||
while (value < input) {
|
||||
value <<= 1;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
return value;
|
||||
}
|
||||
*/
|
||||
*/
|
||||
|
||||
Texture::Texture() {
|
||||
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
|
||||
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
|
||||
}
|
||||
|
||||
|
||||
mipmap= true;
|
||||
pixmapInit= true;
|
||||
wrapMode= wmRepeat;
|
||||
format= fAuto;
|
||||
textureSystemId = 0;
|
||||
|
||||
inited= false;
|
||||
forceCompressionDisabled=false;
|
||||
}
|
||||
|
||||
|
||||
// =====================================================
|
||||
// class Texture1D
|
||||
// =====================================================
|
||||
|
||||
void Texture1D::load(const string &path){
|
||||
this->path= path;
|
||||
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] this->path = [%s]\n",__FILE__,__FUNCTION__,__LINE__,this->path.c_str());
|
||||
|
||||
if (pixmap.getComponents() == -1) {
|
||||
pixmap.init(defaultComponents);
|
||||
}
|
||||
pixmap.load(path);
|
||||
this->path= path;
|
||||
}
|
||||
|
||||
string Texture1D::getPath() const {
|
||||
return (pixmap.getPath() != "" ? pixmap.getPath() : path);
|
||||
}
|
||||
|
||||
void Texture1D::deletePixels() {
|
||||
//printf("+++> Texture1D pixmap deletion for [%s]\n",getPath().c_str());
|
||||
pixmap.deletePixels();
|
||||
}
|
||||
|
||||
// =====================================================
|
||||
// class Texture2D
|
||||
// =====================================================
|
||||
|
||||
std::pair<SDL_Surface*,unsigned char*> Texture2D::CreateSDLSurface(bool newPixelData) const {
|
||||
std::pair<SDL_Surface*,unsigned char*> result;
|
||||
result.first = NULL;
|
||||
result.second = NULL;
|
||||
|
||||
unsigned char* surfData = NULL;
|
||||
if (newPixelData == true) {
|
||||
// copy pixel data
|
||||
surfData = new unsigned char[pixmap.getW() * pixmap.getH() * pixmap.getComponents()];
|
||||
memcpy(surfData, pixmap.getPixels(), pixmap.getW() * pixmap.getH() * pixmap.getComponents());
|
||||
}
|
||||
else {
|
||||
surfData = pixmap.getPixels();
|
||||
}
|
||||
|
||||
result.second = surfData;
|
||||
// This will only work with 24bit RGB and 32bit RGBA pictures
|
||||
result.first = SDL_CreateRGBSurfaceFrom(surfData, pixmap.getW(), pixmap.getH(), 8 * pixmap.getComponents(), pixmap.getW() * pixmap.getComponents(), 0x000000FF, 0x0000FF00, 0x00FF0000, (pixmap.getComponents() == 4) ? 0xFF000000 : 0);
|
||||
if ((result.first == NULL) && newPixelData == true) {
|
||||
// cleanup when we failed to the create surface
|
||||
delete[] surfData;
|
||||
result.second = NULL;
|
||||
}
|
||||
else {
|
||||
// SDL_Surface *prepGLTexture(SDL_Surface *surface, GLfloat *texCoords = NULL, const bool
|
||||
// freeSource = false) {
|
||||
/* Use the surface width and height expanded to powers of 2 */
|
||||
//int w = powerOfTwo(surface->w);
|
||||
//int h = powerOfTwo(surface->h);
|
||||
if(result.first == NULL) {
|
||||
throw megaglest_runtime_error("result.first == NULL");
|
||||
Texture::Texture() {
|
||||
if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
|
||||
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
|
||||
}
|
||||
|
||||
int w = result.first->w;
|
||||
int h = result.first->h;
|
||||
|
||||
// if (texCoords != 0) {
|
||||
// texCoords[0] = 0.0f; /* Min
|
||||
// X */
|
||||
// texCoords[1] = 0.0f; /* Min
|
||||
// Y */
|
||||
// texCoords[2] = (GLfloat)surface->w / w; /* Max X */
|
||||
// texCoords[3] = (GLfloat)surface->h / h; /* Max Y */
|
||||
// }
|
||||
mipmap = true;
|
||||
pixmapInit = true;
|
||||
wrapMode = wmRepeat;
|
||||
format = fAuto;
|
||||
textureSystemId = 0;
|
||||
|
||||
SDL_Surface *image = SDL_CreateRGBSurface(
|
||||
SDL_SWSURFACE,
|
||||
w, h,
|
||||
32,
|
||||
#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
|
||||
0x000000FF,
|
||||
0x0000FF00,
|
||||
0x00FF0000,
|
||||
0xFF000000
|
||||
#else
|
||||
0xFF000000,
|
||||
0x00FF0000,
|
||||
0x0000FF00,
|
||||
0x000000FF
|
||||
#endif
|
||||
);
|
||||
if ( image == NULL ) {
|
||||
result.first = NULL;
|
||||
return result;
|
||||
}
|
||||
|
||||
// TTSDL
|
||||
// /* Save the alpha blending attributes */
|
||||
// Uint32 savedFlags = result.first->flags&(SDL_SRCALPHA|SDL_RLEACCELOK);
|
||||
// Uint8 savedAlpha = result.first->format->alpha;
|
||||
// if ( (savedFlags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
|
||||
// SDL_SetAlpha(result.first, 0, 0);
|
||||
// }
|
||||
|
||||
SDL_Rect srcArea, destArea;
|
||||
/* Copy the surface into the GL texture image */
|
||||
srcArea.x = 0; destArea.x = 0;
|
||||
/* Copy it in at the bottom, because we're going to flip
|
||||
this image upside-down in a moment
|
||||
*/
|
||||
srcArea.y = 0; destArea.y = h - result.first->h;
|
||||
srcArea.w = result.first->w;
|
||||
srcArea.h = result.first->h;
|
||||
SDL_BlitSurface(result.first, &srcArea, image, &destArea);
|
||||
|
||||
// TTSDL
|
||||
// /* Restore the alpha blending attributes */
|
||||
// if ((savedFlags & SDL_SRCALPHA) == SDL_SRCALPHA) {
|
||||
// SDL_SetAlpha(result.first, savedFlags, savedAlpha);
|
||||
// }
|
||||
|
||||
/* Turn the image upside-down, because OpenGL textures
|
||||
start at the bottom-left, instead of the top-left
|
||||
*/
|
||||
#ifdef _MSC_VER
|
||||
Uint8 *line = new Uint8[image->pitch];
|
||||
#else
|
||||
Uint8 line[image->pitch];
|
||||
#endif
|
||||
/* These two make the following more readable */
|
||||
Uint8 *pixels = static_cast<Uint8*>(image->pixels);
|
||||
Uint16 pitch = image->pitch;
|
||||
int ybegin = 0;
|
||||
int yend = image->h - 1;
|
||||
|
||||
if (SDL_MUSTLOCK(image)) {
|
||||
SDL_LockSurface(image);
|
||||
}
|
||||
while (ybegin < yend) {
|
||||
memcpy(line, pixels + pitch*ybegin, pitch);
|
||||
memcpy(pixels + pitch*ybegin, pixels + pitch*yend, pitch);
|
||||
memcpy(pixels + pitch*yend, line, pitch);
|
||||
ybegin++;
|
||||
yend--;
|
||||
}
|
||||
if (SDL_MUSTLOCK(image)) {
|
||||
SDL_UnlockSurface(image);
|
||||
}
|
||||
|
||||
// if (freeSource) {
|
||||
// SDL_FreeSurface(surface);
|
||||
// }
|
||||
|
||||
#ifdef _MSC_VER
|
||||
delete[] line;
|
||||
#endif
|
||||
|
||||
result.first = image;
|
||||
// }
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void Texture2D::load(const string &path){
|
||||
this->path= path;
|
||||
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] this->path = [%s]\n",__FILE__,__FUNCTION__,__LINE__,this->path.c_str());
|
||||
|
||||
if (pixmap.getComponents() == -1) {
|
||||
pixmap.init(defaultComponents);
|
||||
}
|
||||
pixmap.load(path);
|
||||
this->path= path;
|
||||
}
|
||||
|
||||
string Texture2D::getPath() const {
|
||||
return (pixmap.getPath() != "" ? pixmap.getPath() : path);
|
||||
}
|
||||
|
||||
void Texture2D::deletePixels() {
|
||||
//printf("+++> Texture2D pixmap deletion for [%s]\n",getPath().c_str());
|
||||
pixmap.deletePixels();
|
||||
}
|
||||
|
||||
// =====================================================
|
||||
// class Texture3D
|
||||
// =====================================================
|
||||
|
||||
void Texture3D::loadSlice(const string &path, int slice){
|
||||
this->path= path;
|
||||
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] this->path = [%s]\n",__FILE__,__FUNCTION__,__LINE__,this->path.c_str());
|
||||
|
||||
if (pixmap.getComponents() == -1) {
|
||||
pixmap.init(defaultComponents);
|
||||
}
|
||||
pixmap.loadSlice(path, slice);
|
||||
this->path= path;
|
||||
}
|
||||
|
||||
string Texture3D::getPath() const {
|
||||
return (pixmap.getPath() != "" ? pixmap.getPath() : path);
|
||||
}
|
||||
|
||||
void Texture3D::deletePixels() {
|
||||
//printf("+++> Texture3D pixmap deletion for [%s]\n",getPath().c_str());
|
||||
pixmap.deletePixels();
|
||||
}
|
||||
|
||||
// =====================================================
|
||||
// class TextureCube
|
||||
// =====================================================
|
||||
|
||||
void TextureCube::loadFace(const string &path, int face){
|
||||
this->path= path;
|
||||
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] this->path = [%s]\n",__FILE__,__FUNCTION__,__LINE__,this->path.c_str());
|
||||
|
||||
if (pixmap.getFace(0)->getComponents() == -1) {
|
||||
pixmap.init(defaultComponents);
|
||||
}
|
||||
pixmap.loadFace(path, face);
|
||||
this->path= path;
|
||||
}
|
||||
|
||||
string TextureCube::getPath() const {
|
||||
string result = "";
|
||||
for(int i = 0; i < 6; ++i) {
|
||||
if(pixmap.getPath(i) != "") {
|
||||
if(result != "") {
|
||||
result += ",";
|
||||
}
|
||||
result += pixmap.getPath(i);
|
||||
inited = false;
|
||||
forceCompressionDisabled = false;
|
||||
}
|
||||
}
|
||||
if(result == "") {
|
||||
result = path;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
void TextureCube::deletePixels() {
|
||||
//printf("+++> TextureCube pixmap deletion for [%s]\n",getPath().c_str());
|
||||
pixmap.deletePixels();
|
||||
}
|
||||
|
||||
}}//end namespace
|
||||
// =====================================================
|
||||
// class Texture1D
|
||||
// =====================================================
|
||||
|
||||
void Texture1D::load(const string &path) {
|
||||
this->path = path;
|
||||
if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "In [%s::%s Line: %d] this->path = [%s]\n", __FILE__, __FUNCTION__, __LINE__, this->path.c_str());
|
||||
|
||||
if (pixmap.getComponents() == -1) {
|
||||
pixmap.init(defaultComponents);
|
||||
}
|
||||
pixmap.load(path);
|
||||
this->path = path;
|
||||
}
|
||||
|
||||
string Texture1D::getPath() const {
|
||||
return (pixmap.getPath() != "" ? pixmap.getPath() : path);
|
||||
}
|
||||
|
||||
void Texture1D::deletePixels() {
|
||||
//printf("+++> Texture1D pixmap deletion for [%s]\n",getPath().c_str());
|
||||
pixmap.deletePixels();
|
||||
}
|
||||
|
||||
// =====================================================
|
||||
// class Texture2D
|
||||
// =====================================================
|
||||
|
||||
std::pair<SDL_Surface*, unsigned char*> Texture2D::CreateSDLSurface(bool newPixelData) const {
|
||||
std::pair<SDL_Surface*, unsigned char*> result;
|
||||
result.first = NULL;
|
||||
result.second = NULL;
|
||||
|
||||
unsigned char* surfData = NULL;
|
||||
if (newPixelData == true) {
|
||||
// copy pixel data
|
||||
surfData = new unsigned char[pixmap.getW() * pixmap.getH() * pixmap.getComponents()];
|
||||
memcpy(surfData, pixmap.getPixels(), pixmap.getW() * pixmap.getH() * pixmap.getComponents());
|
||||
} else {
|
||||
surfData = pixmap.getPixels();
|
||||
}
|
||||
|
||||
result.second = surfData;
|
||||
// This will only work with 24bit RGB and 32bit RGBA pictures
|
||||
result.first = SDL_CreateRGBSurfaceFrom(surfData, pixmap.getW(), pixmap.getH(), 8 * pixmap.getComponents(), pixmap.getW() * pixmap.getComponents(), 0x000000FF, 0x0000FF00, 0x00FF0000, (pixmap.getComponents() == 4) ? 0xFF000000 : 0);
|
||||
if ((result.first == NULL) && newPixelData == true) {
|
||||
// cleanup when we failed to the create surface
|
||||
delete[] surfData;
|
||||
result.second = NULL;
|
||||
} else {
|
||||
// SDL_Surface *prepGLTexture(SDL_Surface *surface, GLfloat *texCoords = NULL, const bool
|
||||
// freeSource = false) {
|
||||
/* Use the surface width and height expanded to powers of 2 */
|
||||
//int w = powerOfTwo(surface->w);
|
||||
//int h = powerOfTwo(surface->h);
|
||||
if (result.first == NULL) {
|
||||
throw megaglest_runtime_error("result.first == NULL");
|
||||
}
|
||||
|
||||
int w = result.first->w;
|
||||
int h = result.first->h;
|
||||
|
||||
// if (texCoords != 0) {
|
||||
// texCoords[0] = 0.0f; /* Min
|
||||
// X */
|
||||
// texCoords[1] = 0.0f; /* Min
|
||||
// Y */
|
||||
// texCoords[2] = (GLfloat)surface->w / w; /* Max X */
|
||||
// texCoords[3] = (GLfloat)surface->h / h; /* Max Y */
|
||||
// }
|
||||
|
||||
SDL_Surface *image = SDL_CreateRGBSurface(
|
||||
SDL_SWSURFACE,
|
||||
w, h,
|
||||
32,
|
||||
#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
|
||||
0x000000FF,
|
||||
0x0000FF00,
|
||||
0x00FF0000,
|
||||
0xFF000000
|
||||
#else
|
||||
0xFF000000,
|
||||
0x00FF0000,
|
||||
0x0000FF00,
|
||||
0x000000FF
|
||||
#endif
|
||||
);
|
||||
if (image == NULL) {
|
||||
result.first = NULL;
|
||||
return result;
|
||||
}
|
||||
|
||||
// TTSDL
|
||||
// /* Save the alpha blending attributes */
|
||||
// Uint32 savedFlags = result.first->flags&(SDL_SRCALPHA|SDL_RLEACCELOK);
|
||||
// Uint8 savedAlpha = result.first->format->alpha;
|
||||
// if ( (savedFlags & SDL_SRCALPHA) == SDL_SRCALPHA ) {
|
||||
// SDL_SetAlpha(result.first, 0, 0);
|
||||
// }
|
||||
|
||||
SDL_Rect srcArea, destArea;
|
||||
/* Copy the surface into the GL texture image */
|
||||
srcArea.x = 0; destArea.x = 0;
|
||||
/* Copy it in at the bottom, because we're going to flip
|
||||
this image upside-down in a moment
|
||||
*/
|
||||
srcArea.y = 0; destArea.y = h - result.first->h;
|
||||
srcArea.w = result.first->w;
|
||||
srcArea.h = result.first->h;
|
||||
SDL_BlitSurface(result.first, &srcArea, image, &destArea);
|
||||
|
||||
// TTSDL
|
||||
// /* Restore the alpha blending attributes */
|
||||
// if ((savedFlags & SDL_SRCALPHA) == SDL_SRCALPHA) {
|
||||
// SDL_SetAlpha(result.first, savedFlags, savedAlpha);
|
||||
// }
|
||||
|
||||
/* Turn the image upside-down, because OpenGL textures
|
||||
start at the bottom-left, instead of the top-left
|
||||
*/
|
||||
#ifdef _MSC_VER
|
||||
Uint8 *line = new Uint8[image->pitch];
|
||||
#else
|
||||
Uint8 line[image->pitch];
|
||||
#endif
|
||||
/* These two make the following more readable */
|
||||
Uint8 *pixels = static_cast<Uint8*>(image->pixels);
|
||||
Uint16 pitch = image->pitch;
|
||||
int ybegin = 0;
|
||||
int yend = image->h - 1;
|
||||
|
||||
if (SDL_MUSTLOCK(image)) {
|
||||
SDL_LockSurface(image);
|
||||
}
|
||||
while (ybegin < yend) {
|
||||
memcpy(line, pixels + pitch*ybegin, pitch);
|
||||
memcpy(pixels + pitch*ybegin, pixels + pitch*yend, pitch);
|
||||
memcpy(pixels + pitch*yend, line, pitch);
|
||||
ybegin++;
|
||||
yend--;
|
||||
}
|
||||
if (SDL_MUSTLOCK(image)) {
|
||||
SDL_UnlockSurface(image);
|
||||
}
|
||||
|
||||
// if (freeSource) {
|
||||
// SDL_FreeSurface(surface);
|
||||
// }
|
||||
|
||||
#ifdef _MSC_VER
|
||||
delete[] line;
|
||||
#endif
|
||||
|
||||
result.first = image;
|
||||
// }
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void Texture2D::load(const string &path) {
|
||||
this->path = path;
|
||||
if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "In [%s::%s Line: %d] this->path = [%s]\n", __FILE__, __FUNCTION__, __LINE__, this->path.c_str());
|
||||
|
||||
if (pixmap.getComponents() == -1) {
|
||||
pixmap.init(defaultComponents);
|
||||
}
|
||||
pixmap.load(path);
|
||||
this->path = path;
|
||||
}
|
||||
|
||||
string Texture2D::getPath() const {
|
||||
return (pixmap.getPath() != "" ? pixmap.getPath() : path);
|
||||
}
|
||||
|
||||
void Texture2D::deletePixels() {
|
||||
//printf("+++> Texture2D pixmap deletion for [%s]\n",getPath().c_str());
|
||||
pixmap.deletePixels();
|
||||
}
|
||||
|
||||
// =====================================================
|
||||
// class Texture3D
|
||||
// =====================================================
|
||||
|
||||
void Texture3D::loadSlice(const string &path, int slice) {
|
||||
this->path = path;
|
||||
if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "In [%s::%s Line: %d] this->path = [%s]\n", __FILE__, __FUNCTION__, __LINE__, this->path.c_str());
|
||||
|
||||
if (pixmap.getComponents() == -1) {
|
||||
pixmap.init(defaultComponents);
|
||||
}
|
||||
pixmap.loadSlice(path, slice);
|
||||
this->path = path;
|
||||
}
|
||||
|
||||
string Texture3D::getPath() const {
|
||||
return (pixmap.getPath() != "" ? pixmap.getPath() : path);
|
||||
}
|
||||
|
||||
void Texture3D::deletePixels() {
|
||||
//printf("+++> Texture3D pixmap deletion for [%s]\n",getPath().c_str());
|
||||
pixmap.deletePixels();
|
||||
}
|
||||
|
||||
// =====================================================
|
||||
// class TextureCube
|
||||
// =====================================================
|
||||
|
||||
void TextureCube::loadFace(const string &path, int face) {
|
||||
this->path = path;
|
||||
if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem, "In [%s::%s Line: %d] this->path = [%s]\n", __FILE__, __FUNCTION__, __LINE__, this->path.c_str());
|
||||
|
||||
if (pixmap.getFace(0)->getComponents() == -1) {
|
||||
pixmap.init(defaultComponents);
|
||||
}
|
||||
pixmap.loadFace(path, face);
|
||||
this->path = path;
|
||||
}
|
||||
|
||||
string TextureCube::getPath() const {
|
||||
string result = "";
|
||||
for (int i = 0; i < 6; ++i) {
|
||||
if (pixmap.getPath(i) != "") {
|
||||
if (result != "") {
|
||||
result += ",";
|
||||
}
|
||||
result += pixmap.getPath(i);
|
||||
}
|
||||
}
|
||||
if (result == "") {
|
||||
result = path;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
void TextureCube::deletePixels() {
|
||||
//printf("+++> TextureCube pixmap deletion for [%s]\n",getPath().c_str());
|
||||
pixmap.deletePixels();
|
||||
}
|
||||
|
||||
}
|
||||
}//end namespace
|
||||
|
||||
Reference in New Issue
Block a user