Report 0 for end and current in animation params/frame if appropriate; fix #312

brayns/Brayns.cpp

@@ -878,9 +878,6 @@ struct Brayns::Impl
         _keyboardHandler.registerKeyboardShortcut(
             'r', "Set animation frame to 0",
             std::bind(&Brayns::Impl::_resetAnimationFrame, this));
-        _keyboardHandler.registerKeyboardShortcut(
-            'R', "Set animation frame to infinity",
-            std::bind(&Brayns::Impl::_infiniteAnimationFrame, this));
         _keyboardHandler.registerKeyboardShortcut(
             'u', "Enable/Disable shadows",
             std::bind(&Brayns::Impl::_toggleShadows, this));
@@ -1070,12 +1067,6 @@ struct Brayns::Impl
         animParams.setFrame(0);
     }
 
-    void _infiniteAnimationFrame()
-    {
-        auto& animParams = _parametersManager.getAnimationParameters();
-        animParams.setFrame(std::numeric_limits<uint32_t>::max());
-    }
-
     void _toggleShadows()
     {
         RenderingParameters& renderParams =

brayns/common/volume/VolumeHandler.cpp

@@ -38,7 +38,6 @@ namespace brayns
 VolumeHandler::VolumeHandler(const VolumeParameters& volumeParameters,
                              const IndexMode indexMode)
     : _volumeParameters(volumeParameters)
-    , _currentIndex(std::numeric_limits<uint32_t>::max())
     , _indexMode(indexMode)
 {
 }

brayns/common/volume/VolumeHandler.h

@@ -208,10 +208,10 @@ class VolumeHandler
 
     const VolumeParameters& _volumeParameters;
     std::map<uint32_t, VolumeDescriptorPtr> _volumeDescriptors;
-    uint32_t _currentIndex;
+    uint32_t _currentIndex{std::numeric_limits<uint32_t>::max()};
     IndexMode _indexMode;
     std::map<float, Histogram> _histograms;
-    uint64_t _nbFrames = 0;
+    uint64_t _nbFrames{0};
 };
 }
 

brayns/io/simulation/CADiffusionSimulationHandler.cpp

@@ -36,8 +36,6 @@ namespace brayns
 {
 CADiffusionSimulationHandler::CADiffusionSimulationHandler(
     const std::string& simulationFolder)
-    : _currentFrame(std::numeric_limits<size_t>::max())
-    , _spheresCreated(false)
 {
     BRAYNS_DEBUG << "Loading Calcium simulation from " << simulationFolder
                  << std::endl;

brayns/io/simulation/CADiffusionSimulationHandler.h

@@ -61,8 +61,8 @@ class CADiffusionSimulationHandler
 
     std::map<size_t, std::string> _simulationFiles;
     Vector3fs _calciumPositions;
-    size_t _currentFrame;
-    bool _spheresCreated;
+    size_t _currentFrame{std::numeric_limits<size_t>::max()};
+    bool _spheresCreated{false};
 };
 }
 #endif // CADIFFUSIONSIMULATIONHANDLER_H

brayns/parameters/AnimationParameters.h

@@ -52,8 +52,8 @@ class AnimationParameters final : public AbstractParameters
     uint32_t getEnd() const { return _end; }
     void reset()
     {
-        _updateValue(_end, std::numeric_limits<uint32_t>::max());
-        _updateValue(_current, std::numeric_limits<uint32_t>::max());
+        _updateValue(_end, 0u);
+        _updateValue(_current, 0u);
         _updateValue(_unit, std::string());
         _updateValue(_dt, 0.);
     }
@@ -66,13 +66,12 @@ class AnimationParameters final : public AbstractParameters
     uint32_t adjustCurrent(const uint32_t newCurrent) const
     {
         const auto nbFrames = _end - _start;
-        return nbFrames == 0 ? std::numeric_limits<uint32_t>::max()
-                             : _start + (newCurrent % nbFrames);
+        return nbFrames == 0 ? 0 : _start + (newCurrent % nbFrames);
     }
 
     uint32_t _start{0};
-    uint32_t _end{std::numeric_limits<uint32_t>::max()};
-    uint32_t _current{std::numeric_limits<uint32_t>::max()};
+    uint32_t _end{0};
+    uint32_t _current{0};
     int32_t _delta{0};
     double _dt{0};
     std::string _unit;

plugins/engines/ospray/ispc/geometry/ExtendedCones.ispc

@@ -92,7 +92,7 @@ void ExtendedCones_intersect(uniform ExtendedCones *uniform geometry,
     uniform float timestamp =
         *((uniform float *)(conePtr + geometry->offset_timestamp));
 
-    if (timestamp > ray.time)
+    if (ray.time > 0 && timestamp > ray.time)
         return;
 
     uniform vec3f v0 = *((uniform vec3f *)(conePtr + geometry->offset_center));

plugins/engines/ospray/ispc/geometry/ExtendedCylinders.ispc

@@ -75,7 +75,7 @@ void ExtendedCylinders_intersect(uniform ExtendedCylinders *uniform geometry,
     uniform float timestamp =
         *((uniform float *)(cylinderPtr + geometry->offset_timestamp));
 
-    if (timestamp > ray.time)
+    if (ray.time > 0 && timestamp > ray.time)
         return;
 
     if (geometry->offset_radius >= 0)

plugins/engines/ospray/ispc/geometry/ExtendedSpheres.ispc

@@ -149,7 +149,7 @@ void ExtendedSpheres_intersect(uniform ExtendedSpheres *uniform geometry,
     uniform float timestamp =
         *((uniform float *)(spherePtr + geometry->offset_timestamp));
 
-    if (timestamp > ray.time)
+    if (ray.time > 0 && timestamp > ray.time)
         return;
 
     uniform float radius = geometry->radius;

tests/brayns.cpp

@@ -123,8 +123,7 @@ BOOST_AUTO_TEST_CASE(defaults)
                       std::numeric_limits<float>::min());
 
     const auto& animParams = pm.getAnimationParameters();
-    BOOST_CHECK_EQUAL(animParams.getFrame(),
-                      std::numeric_limits<uint32_t>::max());
+    BOOST_CHECK_EQUAL(animParams.getFrame(), 0);
 
     const auto& volumeParams = pm.getVolumeParameters();
     BOOST_CHECK_EQUAL(volumeParams.getDimensions(), brayns::Vector3ui(0, 0, 0));