X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTGALoader.cpp;h=c68cfb5c9725c53711311d3633c75be5351bc63b;hb=efadab206c3103525a243756e388560260b4757c;hp=172ed5f1218f7c5b03efa9c06a3405cf37f7967d;hpb=c44a844d9305c4f1f7dd0479e4a3af3e90b96a1b;p=lugaru.git

diff --git a/Source/TGALoader.cpp b/Source/TGALoader.cpp
index 172ed5f..c68cfb5 100644
--- a/Source/TGALoader.cpp
+++ b/Source/TGALoader.cpp
@@ -10,7 +10,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -33,146 +33,146 @@ extern bool LoadImage(const char * fname, TGAImageRec & tex);
 /********************> LoadTGA() <*****/
 bool upload_image(const unsigned char* filePath, bool hasalpha)
 {
-	if(visibleloading) 
-		Game::LoadingScreen();
+    if (visibleloading)
+        Game::LoadingScreen();
 
 #if !PLATFORM_MACOSX
 
-	// for Windows, just use TGA loader for now
-	char fileName[256];
-	CopyPascalStringToC( filePath, fileName);
-/*
-	// change extension to .TGA
-	int len = strlen( fileName);
-	if (len > 3)
-	{
-		fileName[ len - 3] = 't';
-		fileName[ len - 2] = 'g';
-		fileName[ len - 1] = 'a';
-	}
-*/
-//	return (LoadTGA( fileName) != NULL);
-	return (LoadImage(fileName, texture));
+    // for Windows, just use TGA loader for now
+    char fileName[256];
+    CopyPascalStringToC( filePath, fileName);
+    /*
+        // change extension to .TGA
+        int len = strlen( fileName);
+        if (len > 3)
+        {
+            fileName[ len - 3] = 't';
+            fileName[ len - 2] = 'g';
+            fileName[ len - 1] = 'a';
+        }
+    */
+//return (LoadTGA( fileName) != NULL);
+    return (LoadImage(fileName, texture));
 
 #else
 
-	OSStatus err;
-	ComponentResult cr;
-
-	/*FSRef fsref;
-	Boolean isdir;
-	err = FSPathMakeRef((const UInt8*)filePath, &fsref, &isdir);
-	if(err)return;
-
-	FSSpec fsspec;
-	err = FSGetCatalogInfo(&fsref, kFSCatInfoNone, NULL, NULL, &fsspec, NULL);
-	if(err)return;
-	*/
-
-	//Boolean isdir;
-	FSSpec fsspec;
-	//err = FSMakeFSSpec (0, 0, (const unsigned char*)filePath, &fsspec);
-	err = FSMakeFSSpec (0, 0, filePath, &fsspec);
-	//err=FSPathMakeFSSpec((const UInt8*)filePath,&fsspec,&isdir);*/
-	if(err)return;
-
-	GraphicsImportComponent gi;
-	err = GetGraphicsImporterForFile(&fsspec, &gi);
-	if(err)return;
-
-	Rect natbounds;
-	cr = GraphicsImportGetNaturalBounds(gi, &natbounds);
-
-	//~ size_t buffersize = 4 * natbounds.bottom * natbounds.right;
-	//void* buf = malloc(buffersize);
-	texture.sizeX=natbounds.right;
-	texture.sizeY=natbounds.bottom;
-	/*if(hasalpha)*/texture.bpp = 32;
-	//if(!hasalpha)texture.bpp = 24;
-
-	GWorldPtr gw;
-	err = QTNewGWorldFromPtr(&gw, k32ARGBPixelFormat, &natbounds, NULL, NULL,
-		0, texture.data, 4 * natbounds.right);
-	if(err)return;
-
-	cr = GraphicsImportSetGWorld(gi, gw, NULL);
-
-	natbounds.top = natbounds.bottom;
-	natbounds.bottom = 0;
-
-	cr = GraphicsImportSetBoundsRect(gi, &natbounds);
-
-	cr = GraphicsImportDraw(gi);
-
-	err = CloseComponent(gi);
-	if(err)return;
-
-	/*glTexImage2D(textureTarget, 0, GL_RGBA, natbounds.right, natbounds.top, 0,
-	GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buf);
-	*/
-
-	//free(buf);
-	DisposeGWorld(gw);
-
-	// Loop Through The Image Data
-	GLuint			imageSize;									// Used To Store The Image Size When Setting Aside Ram
-	GLuint			temp;										// Temporary Variable
-	GLuint			bytesPerPixel;										// Temporary Variable
-	bytesPerPixel=texture.bpp/8;
-	imageSize = texture.sizeX * texture.sizeY * bytesPerPixel;
-	//~ int alltrans=10;
-
-	for( GLuint i = 0; i < int( imageSize ); i += 4 )
-	{
-		// Swaps The 1st And 3rd Bytes ('R'ed and 'B'lue)
-		temp = texture.data[i];					// Temporarily Store The Value At Image Data 'i'
-		texture.data[i] = texture.data[i + 1];	// Set The 1st Byte To The Value Of The 3rd Byte
-		texture.data[i + 1] = texture.data[i + 2];				// Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
-		texture.data[i + 2] = texture.data[i + 3];
-		texture.data[i + 3] = temp;
-	}
-
-	//~ int tempplace;
-	//~ tempplace=0;
-	if(!hasalpha){
-		for( GLuint i = 0; i < int( imageSize ); i += 4 )
-		{
-			texture.data[i + 3] = 255;
-			/*texture.data[tempplace] = texture.data[i];	// Set The 1st Byte To The Value Of The 3rd Byte
-			texture.data[tempplace + 1] = texture.data[i + 1];				// Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
-			texture.data[tempplace + 2] = texture.data[i + 2];
-			tempplace+=3;*/
-		}
-	}
-
-	if(texdetail>1){
-		int which=0;
-		float temp;
-		float howmany;
-		for( GLuint k = 0; k < int( imageSize); k += bytesPerPixel*texture.sizeX*texdetail )
-		{
-			for( GLuint i = 0; i < int( imageSize/texture.sizeY ); i += bytesPerPixel*texdetail )
-			{
-				for( GLuint b = 0; b < bytesPerPixel ; b ++ ){	
-					temp=0;
-					howmany=0;
-					for( GLuint l = 0; l < texdetail*texture.sizeX ; l +=texture.sizeX ){
-						for( GLuint j = 0; j < texdetail ; j ++ )
-						{
-							temp += (int)texture.data[k+i+j*bytesPerPixel+l*bytesPerPixel+b];	// Set The 1st Byte To The Value Of The 3rd Byte
-							howmany++;
-						}
-					}
-					texture.data[which+b]=GLubyte(temp/howmany);
-				}
-				which+=bytesPerPixel;
-			}
-		}
-		texture.sizeX/=texdetail;
-		texture.sizeY/=texdetail;
-	}
-
-	return true;
+    OSStatus err;
+    ComponentResult cr;
+
+    /*FSRef fsref;
+    Boolean isdir;
+    err = FSPathMakeRef((const UInt8*)filePath, &fsref, &isdir);
+    if(err)return;
+
+    FSSpec fsspec;
+    err = FSGetCatalogInfo(&fsref, kFSCatInfoNone, NULL, NULL, &fsspec, NULL);
+    if(err)return;
+    */
+
+    //Boolean isdir;
+    FSSpec fsspec;
+    //err = FSMakeFSSpec (0, 0, (const unsigned char*)filePath, &fsspec);
+    err = FSMakeFSSpec (0, 0, filePath, &fsspec);
+    //err=FSPathMakeFSSpec((const UInt8*)filePath,&fsspec,&isdir);*/
+    if (err)
+        return;
+
+    GraphicsImportComponent gi;
+    err = GetGraphicsImporterForFile(&fsspec, &gi);
+    if (err)
+        return;
+
+    Rect natbounds;
+    cr = GraphicsImportGetNaturalBounds(gi, &natbounds);
+
+    //~ size_t buffersize = 4 * natbounds.bottom * natbounds.right;
+    //void* buf = malloc(buffersize);
+    texture.sizeX = natbounds.right;
+    texture.sizeY = natbounds.bottom;
+    /*if(hasalpha)*/
+    texture.bpp = 32;
+    //if(!hasalpha)texture.bpp = 24;
+
+    GWorldPtr gw;
+    err = QTNewGWorldFromPtr(&gw, k32ARGBPixelFormat, &natbounds, NULL, NULL,
+                             0, texture.data, 4 * natbounds.right);
+    if (err)
+        return;
+
+    cr = GraphicsImportSetGWorld(gi, gw, NULL);
+
+    natbounds.top = natbounds.bottom;
+    natbounds.bottom = 0;
+
+    cr = GraphicsImportSetBoundsRect(gi, &natbounds);
+
+    cr = GraphicsImportDraw(gi);
+
+    err = CloseComponent(gi);
+    if (err)
+        return;
+
+    /*glTexImage2D(textureTarget, 0, GL_RGBA, natbounds.right, natbounds.top, 0,
+    GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buf);
+    */
+
+    //free(buf);
+    DisposeGWorld(gw);
+
+    // Loop Through The Image Data
+    GLuint imageSize; // Used To Store The Image Size When Setting Aside Ram
+    GLuint temp; // Temporary Variable
+    GLuint bytesPerPixel; // Temporary Variable
+    bytesPerPixel = texture.bpp / 8;
+    imageSize = texture.sizeX * texture.sizeY * bytesPerPixel;
+    //~ int alltrans=10;
+
+    for ( GLuint i = 0; i < int( imageSize ); i += 4 ) {
+        // Swaps The 1st And 3rd Bytes ('R'ed and 'B'lue)
+        temp = texture.data[i]; // Temporarily Store The Value At Image Data 'i'
+        texture.data[i] = texture.data[i + 1]; // Set The 1st Byte To The Value Of The 3rd Byte
+        texture.data[i + 1] = texture.data[i + 2]; // Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
+        texture.data[i + 2] = texture.data[i + 3];
+        texture.data[i + 3] = temp;
+    }
+
+    //~ int tempplace;
+    //~ tempplace=0;
+    if (!hasalpha) {
+        for ( GLuint i = 0; i < int( imageSize ); i += 4 ) {
+            texture.data[i + 3] = 255;
+            /*texture.data[tempplace] = texture.data[i]; // Set The 1st Byte To The Value Of The 3rd Byte
+            texture.data[tempplace + 1] = texture.data[i + 1]; // Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
+            texture.data[tempplace + 2] = texture.data[i + 2];
+            tempplace+=3;*/
+        }
+    }
+
+    if (texdetail > 1) {
+        int which = 0;
+        float temp;
+        float howmany;
+        for ( GLuint k = 0; k < int( imageSize); k += bytesPerPixel * texture.sizeX * texdetail ) {
+            for ( GLuint i = 0; i < int( imageSize / texture.sizeY ); i += bytesPerPixel * texdetail ) {
+                for ( GLuint b = 0; b < bytesPerPixel ; b ++ ) {
+                    temp = 0;
+                    howmany = 0;
+                    for ( GLuint l = 0; l < texdetail * texture.sizeX ; l += texture.sizeX ) {
+                        for ( GLuint j = 0; j < texdetail ; j ++ ) {
+                            temp += (int)texture.data[k + i + j * bytesPerPixel + l * bytesPerPixel + b]; // Set The 1st Byte To The Value Of The 3rd Byte
+                            howmany++;
+                        }
+                    }
+                    texture.data[which + b] = GLubyte(temp / howmany);
+                }
+                which += bytesPerPixel;
+            }
+        }
+        texture.sizeX /= texdetail;
+        texture.sizeY /= texdetail;
+    }
+
+    return true;
 
 #endif
 }