Deploying to gh-pages from @ ca6bdfe 🚀

f3d-app · Jun 19, 2024 · 93b25da · 93b25da
1 parent 19c15e3
commit 93b25da
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/doc/libf3d/doxygen/_sources/api/program_listing_file_public_interactor.h.rst b/doc/libf3d/doxygen/_sources/api/program_listing_file_public_interactor.h.rst
@@ -55,7 +55,7 @@ Program Listing for File interactor.h
    
      virtual void stop() = 0;
    
-     static const std::vector<std::pair<std::string, std::string>>& getDefaultInteractionsInfo();
+     static const std::vector<std::pair<std::string, std::string> >& getDefaultInteractionsInfo();
    
    protected:
      interactor() = default;

diff --git a/doc/libf3d/doxygen/api/program_listing_file_public_interactor.h.html b/doc/libf3d/doxygen/api/program_listing_file_public_interactor.h.html
@@ -352,7 +352,7 @@ <h1>Program Listing for File interactor.h</h1>
 
 <span class="w">  </span><span class="k">virtual</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">stop</span><span class="p">()</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="mi">0</span><span class="p">;</span>
 
-<span class="w">  </span><span class="k">static</span><span class="w"> </span><span class="k">const</span><span class="w"> </span><span class="n">std</span><span class="o">::</span><span class="n">vector</span><span class="o">&lt;</span><span class="n">std</span><span class="o">::</span><span class="n">pair</span><span class="o">&lt;</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="p">,</span><span class="w"> </span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">&gt;&gt;&amp;</span><span class="w"> </span><span class="n">getDefaultInteractionsInfo</span><span class="p">();</span>
+<span class="w">  </span><span class="k">static</span><span class="w"> </span><span class="k">const</span><span class="w"> </span><span class="n">std</span><span class="o">::</span><span class="n">vector</span><span class="o">&lt;</span><span class="n">std</span><span class="o">::</span><span class="n">pair</span><span class="o">&lt;</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="p">,</span><span class="w"> </span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="o">&gt;</span><span class="w"> </span><span class="o">&gt;&amp;</span><span class="w"> </span><span class="n">getDefaultInteractionsInfo</span><span class="p">();</span>
 
 <span class="k">protected</span><span class="o">:</span>
 <span class="w">  </span><span class="n">interactor</span><span class="p">()</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">default</span><span class="p">;</span>

diff --git a/vtkext/private/module/vtkF3DGenericImporter.cxx b/vtkext/private/module/vtkF3DGenericImporter.cxx
@@ -407,10 +407,10 @@ void vtkF3DGenericImporter::UpdateTimeStep(double timestep)
 }
 
 //----------------------------------------------------------------------------
-std::vector<std::pair<vtkActor*, vtkPolyDataMapper*>>
+std::vector<std::pair<vtkActor*, vtkPolyDataMapper*> >
 vtkF3DGenericImporter::GetGeometryActorsAndMappers()
 {
-  std::vector<std::pair<vtkActor*, vtkPolyDataMapper*>> actorsAndMappers(
+  std::vector<std::pair<vtkActor*, vtkPolyDataMapper*> > actorsAndMappers(
     this->Pimpl->Readers.size());
 
   std::transform(this->Pimpl->Readers.cbegin(), this->Pimpl->Readers.cend(),
@@ -422,10 +422,10 @@ vtkF3DGenericImporter::GetGeometryActorsAndMappers()
 }
 
 //----------------------------------------------------------------------------
-std::vector<std::pair<vtkActor*, vtkPointGaussianMapper*>>
+std::vector<std::pair<vtkActor*, vtkPointGaussianMapper*> >
 vtkF3DGenericImporter::GetPointSpritesActorsAndMappers()
 {
-  std::vector<std::pair<vtkActor*, vtkPointGaussianMapper*>> actorsAndMappers(
+  std::vector<std::pair<vtkActor*, vtkPointGaussianMapper*> > actorsAndMappers(
     this->Pimpl->Readers.size());
 
   std::transform(this->Pimpl->Readers.cbegin(), this->Pimpl->Readers.cend(),
@@ -437,10 +437,10 @@ vtkF3DGenericImporter::GetPointSpritesActorsAndMappers()
 }
 
 //----------------------------------------------------------------------------
-std::vector<std::pair<vtkVolume*, vtkSmartVolumeMapper*>>
+std::vector<std::pair<vtkVolume*, vtkSmartVolumeMapper*> >
 vtkF3DGenericImporter::GetVolumePropsAndMappers()
 {
-  std::vector<std::pair<vtkVolume*, vtkSmartVolumeMapper*>> propsAndMappers(
+  std::vector<std::pair<vtkVolume*, vtkSmartVolumeMapper*> > propsAndMappers(
     this->Pimpl->Readers.size());
 
   std::transform(this->Pimpl->Readers.cbegin(), this->Pimpl->Readers.cend(),

diff --git a/vtkext/private/module/vtkF3DGenericImporter.h b/vtkext/private/module/vtkF3DGenericImporter.h
@@ -74,9 +74,9 @@ class vtkF3DGenericImporter : public vtkImporter
    * Access to actors vectors. They all have the same size, which correspond to the number
    * of added internal readers.
    */
-  std::vector<std::pair<vtkActor*, vtkPolyDataMapper*>> GetGeometryActorsAndMappers();
-  std::vector<std::pair<vtkActor*, vtkPointGaussianMapper*>> GetPointSpritesActorsAndMappers();
-  std::vector<std::pair<vtkVolume*, vtkSmartVolumeMapper*>> GetVolumePropsAndMappers();
+  std::vector<std::pair<vtkActor*, vtkPolyDataMapper*> > GetGeometryActorsAndMappers();
+  std::vector<std::pair<vtkActor*, vtkPointGaussianMapper*> > GetPointSpritesActorsAndMappers();
+  std::vector<std::pair<vtkVolume*, vtkSmartVolumeMapper*> > GetVolumePropsAndMappers();
   ///@}
 
   /**
@@ -87,7 +87,7 @@ class vtkF3DGenericImporter : public vtkImporter
     std::string Name;
     int MaximumNumberOfComponents = 0;
     std::vector<std::string> ComponentNames;
-    std::vector<std::array<double, 2>> ComponentRanges;
+    std::vector<std::array<double, 2> > ComponentRanges;
     std::array<double, 2> MagnitudeRange = { std::numeric_limits<float>::max(),
       std::numeric_limits<float>::min() };
     std::vector<vtkDataArray*> Arrays;

diff --git a/vtkext/private/module/vtkF3DWin32OutputWindow.cxx b/vtkext/private/module/vtkF3DWin32OutputWindow.cxx
@@ -90,7 +90,7 @@ void vtkF3DWin32OutputWindow::DisplayText(const char* text)
   std::string str(text);
   str = std::regex_replace(str, std::regex("\n"), "\r\n");
 
-  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t> > converter;
   std::wstring wstr = converter.from_bytes(str);
   wstr += L"\r\n";
 

diff --git a/webassembly/F3DEmscriptenBindings.cxx b/webassembly/F3DEmscriptenBindings.cxx
@@ -116,7 +116,8 @@ EMSCRIPTEN_BINDINGS(f3d)
     .function("resetCamera", &resetCamera, emscripten::allow_raw_pointers());
 
   // f3d::interactor
-  emscripten::class_<f3d::interactor>("Interactor").function("start", &f3d::interactor::start);
+  emscripten::class_<f3d::interactor>("Interactor")
+    .function("start", &f3d::interactor::start);
 
   // f3d::engine
   emscripten::class_<f3d::engine> engine("Engine");