Introducing f3d::options (f3d-app#191)

In the context of f3d-app#52 , Introduce a first element, f3d::options and start using it when possible without refactoring the whole of F3D for now.

TODO in other PRs:
- doc
- F3DLoader refacto
- options names f3d-app#32

src/library/CMakeLists.txt

@@ -73,6 +73,7 @@ set(F3D_SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/F3DLog.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/F3DOffscreenRender.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/F3DOptions.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/f3d_options.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/readers/F3DReader.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/readers/F3DReaderFactory.cxx
   ${CMAKE_CURRENT_BINARY_DIR}/F3DIcon.cxx

src/library/F3DAnimationManager.cxx

@@ -1,6 +1,7 @@
 #include "F3DAnimationManager.h"
 
 #include "F3DLog.h"
+#include "f3d_options.h"
 #include "vtkF3DRenderer.h"
 
 #include <vtkCallbackCommand.h>
@@ -13,7 +14,7 @@
 #include <vtkVersion.h>
 
 //----------------------------------------------------------------------------
-void F3DAnimationManager::Initialize(const F3DOptions& options, vtkImporter* importer, vtkRenderWindow* renWin, vtkF3DRenderer* renderer)
+void F3DAnimationManager::Initialize(const f3d::options& options, vtkImporter* importer, vtkRenderWindow* renWin, vtkF3DRenderer* renderer)
 {
   this->Importer = importer;
   if (!this->Importer)
@@ -68,7 +69,7 @@ void F3DAnimationManager::Initialize(const F3DOptions& options, vtkImporter* imp
     this->ProgressWidget = nullptr;
   }
 
-  if (options.Verbose || options.NoRender)
+  if (options.get<bool>("verbose") || options.get<bool>("no-render"))
   {
     if (availAnimations <= 0)
     {
@@ -85,19 +86,20 @@ void F3DAnimationManager::Initialize(const F3DOptions& options, vtkImporter* imp
     F3DLog::Print(F3DLog::Severity::Info, "\n");
   }
 
-  if (options.AnimationIndex != 0 && availAnimations <= 0)
+  int animationIndex = options.get<int>("animation-index");
+  if (animationIndex != 0 && availAnimations <= 0)
   {
     F3DLog::Print(F3DLog::Severity::Warning,
       "An animation index has been specified but there are no animation available.");
   }
-  else if (options.AnimationIndex > 0 && options.AnimationIndex >= availAnimations)
+  else if (animationIndex > 0 && animationIndex >= availAnimations)
   {
     F3DLog::Print(F3DLog::Severity::Warning,
       "Specified animation index is greater than the highest possible animation index, enabling the first animation.");
 
     this->Importer->EnableAnimation(0);
   }
-  else if (options.AnimationIndex <= -1)
+  else if (animationIndex <= -1)
   {
     for (int i = 0; i < availAnimations; i++)
     {
@@ -106,7 +108,7 @@ void F3DAnimationManager::Initialize(const F3DOptions& options, vtkImporter* imp
   }
   else
   {
-    this->Importer->EnableAnimation(options.AnimationIndex);
+    this->Importer->EnableAnimation(animationIndex);
   }
 
   this->TimeSteps.clear();

src/library/F3DAnimationManager.h

@@ -7,14 +7,13 @@
 #ifndef F3DAnimationManager_h
 #define F3DAnimationManager_h
 
-#include "F3DOptions.h"
-
 #include <vtkNew.h>
 #include <vtkProgressBarWidget.h>
 #include <vtkSmartPointer.h>
 
 #include <set>
 
+namespace f3d{class options;}
 class vtkF3DRenderer;
 class vtkImporter;
 class vtkRenderWindow;
@@ -28,7 +27,7 @@ class F3DAnimationManager
   /**
    * Initialize the animation manager, required before playing the animation
    */
-  void Initialize(const F3DOptions& options, vtkImporter* importer, vtkRenderWindow* renWin, vtkF3DRenderer* renderer);
+  void Initialize(const f3d::options& options, vtkImporter* importer, vtkRenderWindow* renWin, vtkF3DRenderer* renderer);
 
   /**
    * Start/Stop playing the animation