Skip to content

D
deprecated-irrlicht-mac
Commit 6c7ac760 authored by hybrid's avatar hybrid
Browse files
Options

Fix some indentation and white spacing before parantheses 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4493 dfc29bdd-3216-0410-991c-e03cc46cb475
parent fa970fa9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 198 deletions
source/Irrlicht/CFileSystem.cpp
View file @ 6c7ac760
...@@ -595,11 +595,11 @@ bool CFileSystem::changeWorkingDirectoryTo(const io::path& newDirectory) ...@@ -595,11 +595,11 @@ bool CFileSystem::changeWorkingDirectoryTo(const io::path& newDirectory)
success = (_chdir(newDirectory.c_str()) == 0); success = (_chdir(newDirectory.c_str()) == 0);
#endif #endif
#else #else
#if defined(_IRR_WCHAR_FILESYSTEM) #if defined(_IRR_WCHAR_FILESYSTEM)
success = (_wchdir(newDirectory.c_str()) == 0); success = (_wchdir(newDirectory.c_str()) == 0);
#else #else
success = (chdir(newDirectory.c_str()) == 0); success = (chdir(newDirectory.c_str()) == 0);
#endif #endif
#endif #endif
} }
...@@ -975,19 +975,19 @@ bool CFileSystem::existFile(const io::path& filename) const ...@@ -975,19 +975,19 @@ bool CFileSystem::existFile(const io::path& filename) const
#else #else
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX; _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if defined(_IRR_WCHAR_FILESYSTEM) #if defined(_IRR_WCHAR_FILESYSTEM)
return (_waccess(filename.c_str(), 0) != -1); return (_waccess(filename.c_str(), 0) != -1);
#else #else
return (_access(filename.c_str(), 0) != -1); return (_access(filename.c_str(), 0) != -1);
#endif #endif
#elif defined(F_OK) #elif defined(F_OK)
#if defined(_IRR_WCHAR_FILESYSTEM) #if defined(_IRR_WCHAR_FILESYSTEM)
return (_waccess(filename.c_str(), F_OK) != -1); return (_waccess(filename.c_str(), F_OK) != -1);
#else #else
return (access(filename.c_str(), F_OK) != -1); return (access(filename.c_str(), F_OK) != -1);
#endif #endif
#else #else
return (access(filename.c_str(), 0) != -1); return (access(filename.c_str(), 0) != -1);
#endif #endif
#endif #endif
} }
......
source/Irrlicht/COpenGLDriver.cpp
View file @ 6c7ac760
This diff is collapsed.
tests/testUtils.cpp
View file @ 6c7ac760
...@@ -22,11 +22,11 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2) ...@@ -22,11 +22,11 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2)
{ {
assert(fileName1); assert(fileName1);
assert(fileName2); assert(fileName2);
if(!fileName1 || !fileName2) if (!fileName1 || !fileName2)
return false; return false;
FILE * file1 = fopen(fileName1, "rb"); FILE * file1 = fopen(fileName1, "rb");
if(!file1) if (!file1)
{ {
logTestString("binaryCompareFiles: File '%s' cannot be opened\n", fileName1); logTestString("binaryCompareFiles: File '%s' cannot be opened\n", fileName1);
assert(file1); assert(file1);
...@@ -34,7 +34,7 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2) ...@@ -34,7 +34,7 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2)
} }
FILE * file2 = fopen(fileName2, "rb"); FILE * file2 = fopen(fileName2, "rb");
if(!file2) if (!file2)
{ {
logTestString("binaryCompareFiles: File '%s' cannot be opened\n", fileName2); logTestString("binaryCompareFiles: File '%s' cannot be opened\n", fileName2);
(void)fclose(file1); (void)fclose(file1);
...@@ -47,7 +47,7 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2) ...@@ -47,7 +47,7 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2)
(void)fseek(file2, 0, SEEK_END); (void)fseek(file2, 0, SEEK_END);
const size_t file1Size = ftell(file1); const size_t file1Size = ftell(file1);
const size_t file2Size = ftell(file2); const size_t file2Size = ftell(file2);
if(file1Size != file2Size) if (file1Size != file2Size)
{ {
logTestString("binaryCompareFiles: Files are different sizes: %d vs %d\n", logTestString("binaryCompareFiles: Files are different sizes: %d vs %d\n",
file1Size, file2Size); file1Size, file2Size);
...@@ -62,9 +62,9 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2) ...@@ -62,9 +62,9 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2)
char file1Buffer[8196]; char file1Buffer[8196];
char file2Buffer[8196]; char file2Buffer[8196];
while(!feof(file1)) while (!feof(file1))
{ {
if(feof(file2) if (feof(file2)
||(fread(file1Buffer, sizeof(file1Buffer), 1, file1) != ||(fread(file1Buffer, sizeof(file1Buffer), 1, file1) !=
fread(file2Buffer, sizeof(file2Buffer), 1, file2))) fread(file2Buffer, sizeof(file2Buffer), 1, file2)))
{ {
...@@ -72,7 +72,7 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2) ...@@ -72,7 +72,7 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2)
break; break;
} }
if(memcmp(file1Buffer, file2Buffer, sizeof(file1Buffer))) if (memcmp(file1Buffer, file2Buffer, sizeof(file1Buffer)))
{ {
logTestString("binaryCompareFiles: files are different\n"); logTestString("binaryCompareFiles: files are different\n");
break; break;
...@@ -88,7 +88,7 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2) ...@@ -88,7 +88,7 @@ bool binaryCompareFiles(const char * fileName1, const char * fileName2)
bool xmlCompareFiles(irr::io::IFileSystem * fs, const char * fileName1, const char * fileName2) bool xmlCompareFiles(irr::io::IFileSystem * fs, const char * fileName1, const char * fileName2)
{ {
if(!fileName1 || !fileName2) if (!fileName1 || !fileName2)
return false; return false;
io::IXMLReaderUTF8* reader1 = fs->createXMLReaderUTF8(fileName1); io::IXMLReaderUTF8* reader1 = fs->createXMLReaderUTF8(fileName1);
...@@ -257,24 +257,24 @@ static float fuzzyCompareImages(irr::video::IImage * image1, ...@@ -257,24 +257,24 @@ static float fuzzyCompareImages(irr::video::IImage * image1,
{ {
assert(image1); assert(image1);
assert(image2); assert(image2);
if(!image1 || !image2) if (!image1 || !image2)
return 0.f; return 0.f;
if(image1->getDimension() != image2->getDimension()) if (image1->getDimension() != image2->getDimension())
{ {
logTestString("fuzzyCompareImages: images are different sizes\n"); logTestString("fuzzyCompareImages: images are different sizes\n");
return 0.f; return 0.f;
} }
video::ECOLOR_FORMAT format1 = image1->getColorFormat(); video::ECOLOR_FORMAT format1 = image1->getColorFormat();
if(video::ECF_A8R8G8B8 != format1 && video::ECF_R8G8B8 != format1) if (video::ECF_A8R8G8B8 != format1 && video::ECF_R8G8B8 != format1)
{ {
logTestString("fuzzyCompareImages: image 1 must be ECF_AR8G8B8 or ECF_R8G8B8\n"); logTestString("fuzzyCompareImages: image 1 must be ECF_AR8G8B8 or ECF_R8G8B8\n");
return 0.f; return 0.f;
} }
video::ECOLOR_FORMAT format2 = image2->getColorFormat(); video::ECOLOR_FORMAT format2 = image2->getColorFormat();
if(video::ECF_A8R8G8B8 != format2 && video::ECF_R8G8B8 != format2) if (video::ECF_A8R8G8B8 != format2 && video::ECF_R8G8B8 != format2)
{ {
logTestString("fuzzyCompareImages: image 2 must be ECF_AR8G8B8 or ECF_R8G8B8\n"); logTestString("fuzzyCompareImages: image 2 must be ECF_AR8G8B8 or ECF_R8G8B8\n");
return 0.f; return 0.f;
...@@ -287,14 +287,14 @@ static float fuzzyCompareImages(irr::video::IImage * image1, ...@@ -287,14 +287,14 @@ static float fuzzyCompareImages(irr::video::IImage * image1,
u32 mismatchedColours = 0; u32 mismatchedColours = 0;
for(u32 pixel = 0; pixel < pixels; ++pixel) for(u32 pixel = 0; pixel < pixels; ++pixel)
{ {
if(video::ECF_A8R8G8B8 == format1) if (video::ECF_A8R8G8B8 == format1)
image1Data++; image1Data++;
const u8 r1 = *(image1Data++); const u8 r1 = *(image1Data++);
const u8 g1 = *(image1Data++); const u8 g1 = *(image1Data++);
const u8 b1 = *(image1Data++); const u8 b1 = *(image1Data++);
if(video::ECF_A8R8G8B8 == format2) if (video::ECF_A8R8G8B8 == format2)
image2Data++; image2Data++;
const u8 r2 = *(image2Data++); const u8 r2 = *(image2Data++);
...@@ -342,17 +342,17 @@ void stabilizeScreenBackground(irr::video::IVideoDriver * driver, ...@@ -342,17 +342,17 @@ void stabilizeScreenBackground(irr::video::IVideoDriver * driver,
driver->endScene(); driver->endScene();
irr::video::IImage * screenshot = driver->createScreenShot(); irr::video::IImage * screenshot = driver->createScreenShot();
if(!screenshot) if (!screenshot)
return; return;
const video::ECOLOR_FORMAT format = screenshot->getColorFormat(); const video::ECOLOR_FORMAT format = screenshot->getColorFormat();
if(format != video::ECF_R8G8B8) if (format != video::ECF_R8G8B8)
{ {
irr::video::IImage * fixedScreenshot = driver->createImage(video::ECF_R8G8B8, screenshot->getDimension()); irr::video::IImage * fixedScreenshot = driver->createImage(video::ECF_R8G8B8, screenshot->getDimension());
screenshot->copyTo(fixedScreenshot); screenshot->copyTo(fixedScreenshot);
screenshot->drop(); screenshot->drop();
if(!fixedScreenshot) if (!fixedScreenshot)
return; return;
screenshot = fixedScreenshot; screenshot = fixedScreenshot;
...@@ -368,14 +368,14 @@ void stabilizeScreenBackground(irr::video::IVideoDriver * driver, ...@@ -368,14 +368,14 @@ void stabilizeScreenBackground(irr::video::IVideoDriver * driver,
const u8 g = *(image1Data++); const u8 g = *(image1Data++);
const u8 b = *(image1Data++); const u8 b = *(image1Data++);
if(r != color.getRed() || g != color.getGreen() || b != color.getBlue()) if (r != color.getRed() || g != color.getGreen() || b != color.getBlue())
{ {
status = false; status = false;
break; break;
} }
} }
if(status) if (status)
{ {
screenshot->drop(); screenshot->drop();
return; return;
...@@ -391,9 +391,9 @@ irr::core::stringc shortDriverName(irr::video::IVideoDriver * driver) ...@@ -391,9 +391,9 @@ irr::core::stringc shortDriverName(irr::video::IVideoDriver * driver)
// For OpenGL and Burning, chop the version number out. Other drivers have more stable version numbers. // For OpenGL and Burning, chop the version number out. Other drivers have more stable version numbers.
// TA: Sorry Rogerborg. burnings video also has the version number inside;-) // TA: Sorry Rogerborg. burnings video also has the version number inside;-)
// maybe you sould take the getDriverType Info for this // maybe you sould take the getDriverType Info for this
if(driverName.find("OpenGL") > -1) if (driverName.find("OpenGL") > -1)
driverName = "OpenGL"; driverName = "OpenGL";
else if(driverName.find("Burning's Video") > -1) else if (driverName.find("Burning's Video") > -1)
driverName = "Burning's Video"; driverName = "Burning's Video";
return driverName; return driverName;
...@@ -404,7 +404,7 @@ bool takeScreenshotAndCompareAgainstReference(irr::video::IVideoDriver * driver, ...@@ -404,7 +404,7 @@ bool takeScreenshotAndCompareAgainstReference(irr::video::IVideoDriver * driver,
irr::f32 requiredMatch) irr::f32 requiredMatch)
{ {
irr::video::IImage * screenshot = driver->createScreenShot(); irr::video::IImage * screenshot = driver->createScreenShot();
if(!screenshot) if (!screenshot)
{ {
logTestString("Failed to take screenshot\n"); logTestString("Failed to take screenshot\n");
assert(false); assert(false);
...@@ -412,13 +412,13 @@ bool takeScreenshotAndCompareAgainstReference(irr::video::IVideoDriver * driver, ...@@ -412,13 +412,13 @@ bool takeScreenshotAndCompareAgainstReference(irr::video::IVideoDriver * driver,
} }
const video::ECOLOR_FORMAT format = screenshot->getColorFormat(); const video::ECOLOR_FORMAT format = screenshot->getColorFormat();
if(format != video::ECF_R8G8B8) if (format != video::ECF_R8G8B8)
{ {
irr::video::IImage * fixedScreenshot = driver->createImage(video::ECF_R8G8B8, screenshot->getDimension()); irr::video::IImage * fixedScreenshot = driver->createImage(video::ECF_R8G8B8, screenshot->getDimension());
screenshot->copyTo(fixedScreenshot); screenshot->copyTo(fixedScreenshot);
screenshot->drop(); screenshot->drop();
if(!fixedScreenshot) if (!fixedScreenshot)
{ {
logTestString("Failed to convert screenshot to ECF_A8R8G8B8\n"); logTestString("Failed to convert screenshot to ECF_A8R8G8B8\n");
assert(false); assert(false);
...@@ -434,7 +434,7 @@ bool takeScreenshotAndCompareAgainstReference(irr::video::IVideoDriver * driver, ...@@ -434,7 +434,7 @@ bool takeScreenshotAndCompareAgainstReference(irr::video::IVideoDriver * driver,
referenceFilename += driverName; referenceFilename += driverName;
referenceFilename += fileName; referenceFilename += fileName;
irr::video::IImage * reference = driver->createImageFromFile(referenceFilename.c_str()); irr::video::IImage * reference = driver->createImageFromFile(referenceFilename.c_str());
if(!reference) if (!reference)
{ {
logTestString("\n*** Failed to load reference image '%s'\n*** Creating from screenshot - please check this image.\n\n", logTestString("\n*** Failed to load reference image '%s'\n*** Creating from screenshot - please check this image.\n\n",
referenceFilename.c_str()); referenceFilename.c_str());
...@@ -468,13 +468,13 @@ bool openTestLog(bool startNewLog, const char * filename) ...@@ -468,13 +468,13 @@ bool openTestLog(bool startNewLog, const char * filename)
{ {
closeTestLog(); closeTestLog();
if(startNewLog) if (startNewLog)
logFile = fopen(filename, "w"); logFile = fopen(filename, "w");
else else
logFile = fopen(filename, "a"); logFile = fopen(filename, "a");
assert(logFile); assert(logFile);
if(!logFile) if (!logFile)
logTestString("\nWARNING: unable to open the test log file %s\n", filename); logTestString("\nWARNING: unable to open the test log file %s\n", filename);
return (logFile != 0); return (logFile != 0);
...@@ -511,7 +511,7 @@ void logTestString(const char * format, ...) ...@@ -511,7 +511,7 @@ void logTestString(const char * format, ...)
#endif #endif
(void)printf(logString); (void)printf(logString);
if(logFile) if (logFile)
{ {
(void)fprintf(logFile, logString); (void)fprintf(logFile, logString);
(void)fflush(logFile); (void)fflush(logFile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment