فهرست منبع

Fixed spacing to fit GG standards.

Fixed tabs to 3 spaces.
Nathan Bowhay 10 سال پیش
والد
کامیت
02f859c150
3فایلهای تغییر یافته به همراه292 افزوده شده و 292 حذف شده
  1. 187 187
      Engine/source/console/consoleFunctions.cpp
  2. 96 96
      Engine/source/core/util/str.cpp
  3. 9 9
      Engine/source/math/mConsoleFunctions.cpp

+ 187 - 187
Engine/source/console/consoleFunctions.cpp

@@ -53,129 +53,129 @@ static char scriptFilenameBuffer[1024];
 
 bool isInt(const char* str)
 {
-	int len = dStrlen(str);
-	if(len <= 0)
-		return false;
-
-	// Ingore whitespace
-	int start = 0;
-	for(int i = start; i < len; i++)
-		if(str[i] != ' ')
-		{
-			start = i;
-			break;
-		}
-
-	for(int i = start; i < len; i++)
-		switch(str[i])
-		{
-		case '+': case '-':
-			if(i != 0)
-				return false;
-			break;
-		case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case '0': 
-			break;
-		case ' ': // ignore whitespace
-			for(int j = i+1; j < len; j++)
-				if(str[j] != ' ')
-					return false;
-			return true;
-			break;
-		default:
-			return false;
-		}
-	return true;
+   int len = dStrlen(str);
+   if(len <= 0)
+      return false;
+
+   // Ignore whitespace
+   int start = 0;
+   for(int i = start; i < len; i++)
+      if(str[i] != ' ')
+      {
+         start = i;
+         break;
+      }
+
+      for(int i = start; i < len; i++)
+         switch(str[i])
+      {
+         case '+': case '-':
+            if(i != 0)
+               return false;
+            break;
+         case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case '0': 
+            break;
+         case ' ': // ignore whitespace
+            for(int j = i+1; j < len; j++)
+               if(str[j] != ' ')
+                  return false;
+            return true;
+            break;
+         default:
+            return false;
+      }
+      return true;
 }
 
 bool isFloat(const char* str, bool sciOk = false)
 {
-	int len = dStrlen(str);
-	if(len <= 0)
-		return false;
-
-	// Ingore whitespace
-	int start = 0;
-	for(int i = start; i < len; i++)
-		if(str[i] != ' ')
-		{
-			start = i;
-			break;
-		}
-
-	bool seenDot = false;
-	int eLoc = -1;
-	for(int i = 0; i < len; i++)
-		switch(str[i])
-		{
-		case '+': case '-':
-			if(sciOk)
-			{
-				//Haven't found e or scientific notation symbol
-				if(eLoc == -1)
-				{
-					//only allowed in beginning
-					if(i != 0)
-						return false;
-				}
-				else
-				{
-					//if not right after the e
-					if(i != (eLoc + 1))
-						return false;
-				}
-			}
-			else
-			{
-				//only allowed in beginning
-				if(i != 0)
-					return false;
-			}
-			break;
-		case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case '0': 
-			break;
-		case 'e': case 'E':
-			if(!sciOk)
-				return false;
-			else
-			{
-				//already saw it so can't have 2
-				if(eLoc != -1)
-					return false;
-
-				eLoc = i;
-			}
-			break;
-		case '.':
-			if(seenDot | (sciOk && eLoc != -1))
-				return false;
-			seenDot = true;
-			break;
-		case ' ': // ignore whitespace
-			for(int j = i+1; j < len; j++)
-				if(str[j] != ' ')
-					return false;
-			return true;
-			break;
-		default:
-			return false;
-		}
-	return true;
+   int len = dStrlen(str);
+   if(len <= 0)
+      return false;
+
+   // Ingore whitespace
+   int start = 0;
+   for(int i = start; i < len; i++)
+      if(str[i] != ' ')
+      {
+         start = i;
+         break;
+      }
+
+      bool seenDot = false;
+      int eLoc = -1;
+      for(int i = 0; i < len; i++)
+         switch(str[i])
+      {
+         case '+': case '-':
+            if(sciOk)
+            {
+               //Haven't found e or scientific notation symbol
+               if(eLoc == -1)
+               {
+                  //only allowed in beginning
+                  if(i != 0)
+                     return false;
+               }
+               else
+               {
+                  //if not right after the e
+                  if(i != (eLoc + 1))
+                     return false;
+               }
+            }
+            else
+            {
+               //only allowed in beginning
+               if(i != 0)
+                  return false;
+            }
+            break;
+         case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case '0': 
+            break;
+         case 'e': case 'E':
+            if(!sciOk)
+               return false;
+            else
+            {
+               //already saw it so can't have 2
+               if(eLoc != -1)
+                  return false;
+
+               eLoc = i;
+            }
+            break;
+         case '.':
+            if(seenDot | (sciOk && eLoc != -1))
+               return false;
+            seenDot = true;
+            break;
+         case ' ': // ignore whitespace
+            for(int j = i+1; j < len; j++)
+               if(str[j] != ' ')
+                  return false;
+            return true;
+            break;
+         default:
+            return false;
+      }
+      return true;
 }
 
 bool isValidIP(const char* ip)
 {
-    unsigned b1, b2, b3, b4;
-	unsigned char c;
-	int rc = dSscanf(ip, "%3u.%3u.%3u.%3u%c", &b1, &b2, &b3, &b4, &c);
-	if (rc != 4 && rc != 5) return false;
-	if ((b1 | b2 | b3 | b4) > 255) return false;
-	if (dStrspn(ip, "0123456789.") < dStrlen(ip)) return false;
-	return true;
+   unsigned b1, b2, b3, b4;
+   unsigned char c;
+   int rc = dSscanf(ip, "%3u.%3u.%3u.%3u%c", &b1, &b2, &b3, &b4, &c);
+   if (rc != 4 && rc != 5) return false;
+   if ((b1 | b2 | b3 | b4) > 255) return false;
+   if (dStrspn(ip, "0123456789.") < dStrlen(ip)) return false;
+   return true;
 }
 
 bool isValidPort(U16 port)
 {
-	return (port >= 0 && port <=65535);
+   return (port >= 0 && port <=65535);
 }
 
 //=============================================================================
@@ -380,29 +380,29 @@ DefineConsoleFunction( strlenskip, S32, ( const char* str, const char* first, co
    "@return The length of the given string skipping blocks of text between characters.\n"
    "@ingroup Strings" )
 {
-	const UTF8* pos = str;
-	U32 size = 0;
-	U32 length = dStrlen(str);
-	bool count = true;
+   const UTF8* pos = str;
+   U32 size = 0;
+   U32 length = dStrlen(str);
+   bool count = true;
 
-	//loop through each character counting each character, skipping tags (anything with < followed by >)
-	for(U32 i = 0; i < length; i++, pos++)
-	{
-		if(count)
-		{
-			if(*pos == first[0])
-				count = false;
-			else
-				size++;
-		}
-		else
-		{
-			if(*pos == last[0])
-				count = true;
-		}
-	}
+   //loop through each character counting each character, skipping tags (anything with < followed by >)
+   for(U32 i = 0; i < length; i++, pos++)
+   {
+      if(count)
+      {
+         if(*pos == first[0])
+            count = false;
+         else
+            size++;
+      }
+      else
+      {
+         if(*pos == last[0])
+            count = true;
+      }
+   }
 
-	return S32(size);
+   return S32(size);
 }
 
 //-----------------------------------------------------------------------------
@@ -831,9 +831,9 @@ DefineConsoleFunction( getFirstNumber, String, ( const char* str ),,
    "@param str The string from which to read out the first number.\n"
    "@return String representation of the number or "" if no number.\n\n")
 {
-	U32 start;
-	U32 end;
-	return String::GetFirstNumber(str, start, end);
+   U32 start;
+   U32 end;
+   return String::GetFirstNumber(str, start, end);
 }
 
 //----------------------------------------------------------------
@@ -1031,17 +1031,17 @@ DefineConsoleFunction( strToggleCaseToWords, const char*, ( const char* str ),,
    "@endtsexample\n"
    "@ingroup Strings" )
 {
-	String newStr;
-	for(S32 i = 0; str[i]; i++)
-	{
-		//If capitol add a space
-		if(i != 0 && str[i] >= 65 && str[i] <= 90)
-			newStr += " "; 
+   String newStr;
+   for(S32 i = 0; str[i]; i++)
+   {
+      //If capitol add a space
+      if(i != 0 && str[i] >= 65 && str[i] <= 90)
+         newStr += " "; 
 
-		newStr += str[i]; 
-	}
+      newStr += str[i]; 
+   }
 
-	return Con::getReturnBuffer(newStr);
+   return Con::getReturnBuffer(newStr);
 }
 
 //----------------------------------------------------------------
@@ -1056,7 +1056,7 @@ DefineConsoleFunction( isInt, bool, ( const char* str),,
    "@endtsexample\n"
    "@ingroup Strings" )
 {
-	return isInt(str);
+   return isInt(str);
 }
 
 //----------------------------------------------------------------
@@ -1071,7 +1071,7 @@ DefineConsoleFunction( isFloat, bool, ( const char* str, bool sciOk), (false),
    "@endtsexample\n"
    "@ingroup Strings" )
 {
-	return isFloat(str, sciOk);
+   return isFloat(str, sciOk);
 }
 
 //----------------------------------------------------------------
@@ -1085,13 +1085,13 @@ DefineConsoleFunction( isValidPort, bool, ( const char* str),,
    "@endtsexample\n"
    "@ingroup Strings" )
 {
-	if(isInt(str))
-	{
-		U16 port = dAtous(str);
-		return isValidPort(port);
-	}
-	else
-		return false;
+   if(isInt(str))
+   {
+      U16 port = dAtous(str);
+      return isValidPort(port);
+   }
+   else
+      return false;
 }
 
 //----------------------------------------------------------------
@@ -1105,12 +1105,12 @@ DefineConsoleFunction( isValidIP, bool, ( const char* str),,
    "@endtsexample\n"
    "@ingroup Strings" )
 {
-	if(dStrcmp(str, "localhost") == 0)
-	{
-		return true;
-	}
-	else
-		return isValidIP(str);
+   if(dStrcmp(str, "localhost") == 0)
+   {
+      return true;
+   }
+   else
+      return isValidIP(str);
 }
 
 //----------------------------------------------------------------
@@ -1244,22 +1244,22 @@ DefineEngineFunction( monthNumToStr, String, ( S32 num, bool abbreviate ), (fals
    "@return month as a word given a number or \"\" if number is bad"
    "@ingroup FileSystem")
 {
-	switch(num)
-	{
-		case 1: return abbreviate ? "Jan" : "January"; break;
-		case 2: return abbreviate ? "Feb" : "February"; break;
-		case 3: return abbreviate ? "Mar" : "March"; break;
-		case 4: return abbreviate ? "Apr" : "April"; break;
-		case 5: return "May"; break;
-		case 6: return abbreviate ? "Jun" : "June"; break;
-		case 7: return abbreviate ? "Jul" : "July"; break;
-		case 8: return abbreviate ? "Aug" : "August"; break;
-		case 9: return abbreviate ? "Sep" : "September"; break;
-		case 10: return abbreviate ? "Oct" : "October"; break;
-		case 11: return abbreviate ? "Nov" : "November"; break;
-		case 12: return abbreviate ? "Dec" : "December"; break;
-		default: return "";
-	}
+   switch(num)
+   {
+      case 1: return abbreviate ? "Jan" : "January"; break;
+      case 2: return abbreviate ? "Feb" : "February"; break;
+      case 3: return abbreviate ? "Mar" : "March"; break;
+      case 4: return abbreviate ? "Apr" : "April"; break;
+      case 5: return "May"; break;
+      case 6: return abbreviate ? "Jun" : "June"; break;
+      case 7: return abbreviate ? "Jul" : "July"; break;
+      case 8: return abbreviate ? "Aug" : "August"; break;
+      case 9: return abbreviate ? "Sep" : "September"; break;
+      case 10: return abbreviate ? "Oct" : "October"; break;
+      case 11: return abbreviate ? "Nov" : "November"; break;
+      case 12: return abbreviate ? "Dec" : "December"; break;
+      default: return "";
+   }
 }
 
 DefineEngineFunction( weekdayNumToStr, String, ( S32 num, bool abbreviate ), (false),
@@ -1267,17 +1267,17 @@ DefineEngineFunction( weekdayNumToStr, String, ( S32 num, bool abbreviate ), (fa
    "@return weekday as a word given a number or \"\" if number is bad"
    "@ingroup FileSystem")
 {
-	switch(num)
-	{
-		case 0: return abbreviate ? "Sun" : "Sunday"; break;
-		case 1: return abbreviate ? "Mon" : "Monday"; break;
-		case 2: return abbreviate ? "Tue" : "Tuesday"; break;
-		case 3: return abbreviate ? "Wed" : "Wednesday"; break;
-		case 4: return abbreviate ? "Thu" : "Thursday"; break;
-		case 5: return abbreviate ? "Fri" : "Friday"; break;
-		case 6: return abbreviate ? "Sat" : "Saturday"; break;
-		default: return "";
-	}
+   switch(num)
+   {
+      case 0: return abbreviate ? "Sun" : "Sunday"; break;
+      case 1: return abbreviate ? "Mon" : "Monday"; break;
+      case 2: return abbreviate ? "Tue" : "Tuesday"; break;
+      case 3: return abbreviate ? "Wed" : "Wednesday"; break;
+      case 4: return abbreviate ? "Thu" : "Thursday"; break;
+      case 5: return abbreviate ? "Fri" : "Friday"; break;
+      case 6: return abbreviate ? "Sat" : "Saturday"; break;
+      default: return "";
+   }
 }
 
 //-----------------------------------------------------------------------------
@@ -3071,5 +3071,5 @@ DefineEngineFunction( getMaxDynamicVerts, S32, (),,
 	"Get max number of allowable dynamic vertices in a single vertex buffer.\n\n"
 	"@return the max number of allowable dynamic vertices in a single vertex buffer" )
 {
-	return MAX_DYNAMIC_VERTS / 2;
+   return MAX_DYNAMIC_VERTS / 2;
 }

+ 96 - 96
Engine/source/core/util/str.cpp

@@ -1627,100 +1627,100 @@ String String::GetTrailingNumber(const char* str, S32& number)
 
 String String::GetFirstNumber(const char* str, U32& startPos, U32& endPos)
 {
-	// Check for trivial strings
-	if (!str || !str[0])
-		return String::EmptyString;
-
-	// Find the number at the end of the string
-	String base(str);
-	const char* p = base.c_str();
-	const char* end = base.c_str() + base.length() - 1;
-	bool dec = false;
-	startPos = 0;
-
-	//Check if we are just a digit
-	if(p == end && isdigit(*p))
-		return base;
-
-	//Look for the first digit
-	while ((p != end) && (dIsspace(*p) || !isdigit(*p)))
-	{
-		p++;
-		startPos++;
-	}
-
-	//Handle if we are at the end and found nothing
-	if(p == end && !isdigit(*p))
-		return "";
-
-	//update our end position at least to the start of our number
-	endPos = startPos;
-
-	//Backup our ptr
-	const char* backup = p;
-
-	//Check for any negative or decimal values
-	if(startPos > 0)
-	{
-		p--;
-		startPos--;
-		if(*p == '.')
-		{
-			dec = true;
-
-			//ignore any duplicate periods
-			while ((p != base.c_str()) && (*p == '.'))
-			{
-				p--;
-				startPos--;
-			}
-
-			//Found a decimal lets still check for negative sign
-			if(startPos > 0)
-			{
-				p--;
-				startPos--;
-				if((*p != '-') && (*p != '_'))
-				{
-					startPos++;
-					p++;
-				}
-			}
-		}
-		else if((*p != '-') && (*p != '_'))
-		{
-			//go back to where we where cause no decimal or negative sign found
-			startPos++;
-			p++;
-		}
-	}
-
-	//Restore where we were
-	p = backup;
-
-	//look for the end of the digits
-	bool justFoundDec = false;
-	while (p != end)
-	{
-		if(*p == '.')
-		{
-			if(dec && !justFoundDec)
-				break;
-			else
-			{
-				dec = true;
-				justFoundDec = true;
-			}
-		}
-		else if(!isdigit(*p))
-			break;
-		else if(justFoundDec)
-			justFoundDec = false;
-
-		p++;
-		endPos++;
-	}
-
-	U32 len = (!isdigit(*p)) ? endPos - startPos : (endPos + 1) - startPos;
-	return base.substr(startPos, len);
+   // Check for trivial strings
+   if (!str || !str[0])
+      return String::EmptyString;
+
+   // Find the number at the end of the string
+   String base(str);
+   const char* p = base.c_str();
+   const char* end = base.c_str() + base.length() - 1;
+   bool dec = false;
+   startPos = 0;
+
+   //Check if we are just a digit
+   if(p == end && isdigit(*p))
+      return base;
+
+   //Look for the first digit
+   while ((p != end) && (dIsspace(*p) || !isdigit(*p)))
+   {
+      p++;
+      startPos++;
+   }
+
+   //Handle if we are at the end and found nothing
+   if(p == end && !isdigit(*p))
+      return "";
+
+   //update our end position at least to the start of our number
+   endPos = startPos;
+
+   //Backup our ptr
+   const char* backup = p;
+
+   //Check for any negative or decimal values
+   if(startPos > 0)
+   {
+      p--;
+      startPos--;
+      if(*p == '.')
+      {
+         dec = true;
+
+         //ignore any duplicate periods
+         while ((p != base.c_str()) && (*p == '.'))
+         {
+            p--;
+            startPos--;
+         }
+
+         //Found a decimal lets still check for negative sign
+         if(startPos > 0)
+         {
+            p--;
+            startPos--;
+            if((*p != '-') && (*p != '_'))
+            {
+               startPos++;
+               p++;
+            }
+         }
+      }
+      else if((*p != '-') && (*p != '_'))
+      {
+         //go back to where we where cause no decimal or negative sign found
+         startPos++;
+         p++;
+      }
+   }
+
+   //Restore where we were
+   p = backup;
+
+   //look for the end of the digits
+   bool justFoundDec = false;
+   while (p != end)
+   {
+      if(*p == '.')
+      {
+         if(dec && !justFoundDec)
+            break;
+         else
+         {
+            dec = true;
+            justFoundDec = true;
+         }
+      }
+      else if(!isdigit(*p))
+         break;
+      else if(justFoundDec)
+         justFoundDec = false;
+
+      p++;
+      endPos++;
+   }
+
+   U32 len = (!isdigit(*p)) ? endPos - startPos : (endPos + 1) - startPos;
+   return base.substr(startPos, len);
 }

+ 9 - 9
Engine/source/math/mConsoleFunctions.cpp

@@ -96,16 +96,16 @@ DefineConsoleFunction( mFloor, S32, ( F32 v ),,
 
 
 DefineConsoleFunction( mRound, F32, ( F32 v, S32 n ), (0),
-				"Round v to the nth decimal place or the nearest whole number by default."
-				"@param v Value to round\n"
-				"@param n Number of decimal places to round to, 0 by default\n"
-				"@return The rounded value as a S32."
-				"@ingroup Math" )
+    "Round v to the nth decimal place or the nearest whole number by default."
+    "@param v Value to round\n"
+    "@param n Number of decimal places to round to, 0 by default\n"
+    "@return The rounded value as a S32."
+    "@ingroup Math" )
 {
-	if(n <= 0)
-		return mRound(v);
-	else
-		return mRound(v, n);
+   if(n <= 0)
+      return mRound(v);
+   else
+      return mRound(v, n);
 }
 
 DefineConsoleFunction( mCeil, S32, ( F32 v ),,