ソースを参照

Fixed spacing

Noel Austin 12 年 前
コミット
334021cb62

+ 18 - 18
tools/gameplay-encoder/src/EncoderArguments.cpp

@@ -24,7 +24,7 @@ EncoderArguments::EncoderArguments(size_t argc, const char** argv) :
     _fontPreview(false),
     _textOutput(false),
     _optimizeAnimations(false),
-	_autogroup(AUTOGROUP_NOTSET)
+    _autogroup(AUTOGROUP_NOTSET)
 {
     __instance = this;
 
@@ -163,7 +163,7 @@ const std::string EncoderArguments::getAnimationId(const std::string& nodeId) co
 
 EncoderArguments::AutoGroupOption EncoderArguments::getAutoGrouping() const
 {
-	return _autogroup;
+    return _autogroup;
 }
 
 const std::vector<EncoderArguments::HeightmapOption>& EncoderArguments::getHeightmapOptions() const
@@ -243,8 +243,8 @@ void EncoderArguments::printUsage() const
     LOG(1, "FBX file options:\n");
     LOG(1, "  -i <id>\tFilter by node ID.\n");
     LOG(1, "  -t\t\tWrite text/xml.\n");
-	LOG(1, "  -autogroup\tAutomatically group animation channels into a new animation.\n");
-	LOG(1, "  -noautogroup\tDo not prompt to group animations.\n");
+    LOG(1, "  -autogroup\tAutomatically group animation channels into a new animation.\n");
+    LOG(1, "  -noautogroup\tDo not prompt to group animations.\n");
     LOG(1, "  -g <node id> <animation id>\n" \
         "\t\tGroup all animation channels targeting the nodes into a new animation.\n");
     LOG(1, "  -tb <node id>\n" \
@@ -366,12 +366,12 @@ void EncoderArguments::readOption(const std::vector<std::string>& options, size_
     }
     switch (str[1])
     {
-	case 'a':
-		if (str.compare("-autogroup") == 0)
-		{
-			_autogroup = AUTOGROUP_YES;
-		}
-		break;
+    case 'a':
+        if (str.compare("-autogroup") == 0)
+        {
+            _autogroup = AUTOGROUP_YES;
+        }
+        break;
     case 'g':
         if (str.compare("-groupAnimations") == 0 || str.compare("-g") == 0)
         {
@@ -477,14 +477,14 @@ void EncoderArguments::readOption(const std::vector<std::string>& options, size_
         }
         break;
     case 'n':
-		if (str.compare("-noautogroup") == 0)
-		{
-			_autogroup = AUTOGROUP_NO;
-		}
-		else
-		{
-			_normalMap = true;
-		}
+        if (str.compare("-noautogroup") == 0)
+        {
+            _autogroup = AUTOGROUP_NO;
+        }
+        else
+        {
+            _normalMap = true;
+        }
         break;
     case 'w':
         {

+ 9 - 9
tools/gameplay-encoder/src/EncoderArguments.h

@@ -41,13 +41,13 @@ public:
         Vector3 worldSize;
     };
 
-	enum AutoGroupOption
-	{
-		AUTOGROUP_NOTSET,
-		AUTOGROUP_YES,
-		AUTOGROUP_NO
-	};
-
+    enum AutoGroupOption
+    {
+        AUTOGROUP_NOTSET,
+        AUTOGROUP_YES,
+        AUTOGROUP_NO
+    };
+    
     /**
      * Constructor.
      */
@@ -101,7 +101,7 @@ public:
     bool containsGroupNodeId(const std::string& nodeId) const;
     const std::string getAnimationId(const std::string& nodeId) const;
 
-	AutoGroupOption getAutoGrouping() const;
+    AutoGroupOption getAutoGrouping() const;
 
     const std::vector<HeightmapOption>& getHeightmapOptions() const;
 
@@ -201,7 +201,7 @@ private:
     bool _fontPreview;
     bool _textOutput;
     bool _optimizeAnimations;
-	AutoGroupOption _autogroup;
+    AutoGroupOption _autogroup;
 
     std::vector<std::string> _groupAnimationNodeId;
     std::vector<std::string> _groupAnimationAnimationId;

+ 2 - 2
tools/gameplay-encoder/src/FBXSceneEncoder.cpp

@@ -224,8 +224,8 @@ void FBXSceneEncoder::write(const std::string& filepath, const EncoderArguments&
     // Determine if animations should be grouped.
     if (arguments.getGroupAnimationAnimationId().empty() && isGroupAnimationPossible(fbxScene))
     {
-		if (arguments.getAutoGrouping()==EncoderArguments::AUTOGROUP_YES || 
-			(arguments.getAutoGrouping()==EncoderArguments::AUTOGROUP_NOTSET && promptUserGroupAnimations()))
+        if ( arguments.getAutoGrouping()==EncoderArguments::AUTOGROUP_YES || 
+            (arguments.getAutoGrouping()==EncoderArguments::AUTOGROUP_NOTSET && promptUserGroupAnimations()))
         {
             _autoGroupAnimations = true;
         }