Renamed variables and methods to be more appropriate

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)
+    _animationGrouping(ANIMATIONGROUP_PROMPT)
 {
     __instance = this;
 
@@ -161,9 +161,9 @@ const std::string EncoderArguments::getAnimationId(const std::string& nodeId) co
     return "";
 }
 
-EncoderArguments::AutoGroupOption EncoderArguments::getAutoGrouping() const
+EncoderArguments::AnimationGroupOption EncoderArguments::getAnimationGrouping() const
 {
-    return _autogroup;
+    return _animationGrouping;
 }
 
 const std::vector<EncoderArguments::HeightmapOption>& EncoderArguments::getHeightmapOptions() const
@@ -369,11 +369,11 @@ void EncoderArguments::readOption(const std::vector<std::string>& options, size_
     case 'g':
         if (str.compare("-groupAnimations:auto") == 0 || str.compare("-g:auto") == 0)
         {
-            _autogroup = AUTOGROUP_YES;
+            _animationGrouping = ANIMATIONGROUP_AUTO;
         }
         else if (str.compare("-groupAnimations:off") == 0 || str.compare("-g:off") == 0)
         {
-            _autogroup = AUTOGROUP_NO;
+            _animationGrouping = ANIMATIONGROUP_OFF;
         }
         else if (str.compare("-groupAnimations") == 0 || str.compare("-g") == 0)
         {

tools/gameplay-encoder/src/EncoderArguments.h

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

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.getAnimationGrouping()==EncoderArguments::ANIMATIONGROUP_AUTO || 
+            (arguments.getAnimationGrouping()==EncoderArguments::ANIMATIONGROUP_PROMPT && promptUserGroupAnimations()))
         {
             _autoGroupAnimations = true;
         }