Merge branch 'master' of https://github.com/sofa-framework/sofa

Author: SperryBot

Sofa/Component/Visual/src/sofa/component/visual/TrailRenderer.cpp

@@ -30,11 +30,15 @@ void registerTrailRenderer(sofa::core::ObjectFactory* factory)
 {
     factory->registerObjects(core::ObjectRegistrationData("Render a trail behind particles.")
         .add<TrailRenderer<defaulttype::Vec3Types>>()
+        .add<TrailRenderer<defaulttype::Vec2Types>>()
+        .add<TrailRenderer<defaulttype::Vec1Types>>()
         .add<TrailRenderer<defaulttype::Rigid3Types>>()
     );
 }
 
 template class SOFA_COMPONENT_VISUAL_API TrailRenderer<defaulttype::Vec3Types>;
+template class SOFA_COMPONENT_VISUAL_API TrailRenderer<defaulttype::Vec2Types>;
+template class SOFA_COMPONENT_VISUAL_API TrailRenderer<defaulttype::Vec1Types>;
 template class SOFA_COMPONENT_VISUAL_API TrailRenderer<defaulttype::Rigid3Types>;
 
 }

Sofa/Component/Visual/src/sofa/component/visual/TrailRenderer.h

@@ -64,6 +64,8 @@ class TrailRenderer : public core::visual::VisualModel
 
 #if !defined(SOFA_COMPONENT_VISUAL_TRAILRENDERER_CPP)
 extern template class SOFA_COMPONENT_VISUAL_API TrailRenderer<defaulttype::Vec3Types>;
+extern template class SOFA_COMPONENT_VISUAL_API TrailRenderer<defaulttype::Vec2Types>;
+extern template class SOFA_COMPONENT_VISUAL_API TrailRenderer<defaulttype::Vec1Types>;
 extern template class SOFA_COMPONENT_VISUAL_API TrailRenderer<defaulttype::Rigid3Types>;
 #endif
 

Sofa/Component/Visual/src/sofa/component/visual/TrailRenderer.inl

@@ -72,7 +72,9 @@ void TrailRenderer<DataTypes>::storeParticlePositions()
     sofa::Size i {};
     for (const auto& pos : position)
     {
-        m_trail[i++].push_back(DataTypes::getCPos(pos));
+        sofa::type::Vec3 pvec3;
+        DataTypes::get(pvec3[0], pvec3[1], pvec3[2], pos);
+        m_trail[i++].push_back(pvec3);
     }
 
     removeFirstElements();

Sofa/Component/Visual/src/sofa/component/visual/VisualPointCloud.inl

@@ -63,10 +63,30 @@ void VisualPointCloud<DataTypes>::computeBBox(const core::ExecParams* exec_param
 
     type::Vec3 pvec3;
     type::BoundingBox bbox;
-    for (const auto& p : position)
+
+    const auto drawMode = d_drawMode.getValue();
+
+    if (drawMode == DrawMode("Sphere"))
+    {
+        const auto sphereRadius = sofa::helper::getWriteAccessor(d_sphereRadius);
+
+        for (std::size_t i = 0; i < std::min(sphereRadius.size(), positionSize); ++i)
+        {
+            DataTypes::get(pvec3[0], pvec3[1], pvec3[2], position[i]);
+
+            const auto sphereRadius_i = sphereRadius[i];
+            const auto sphereRadiusVec3 = sofa::type::Vec3(sphereRadius_i, sphereRadius_i, sphereRadius_i);
+            bbox.include(pvec3 + sphereRadiusVec3);
+            bbox.include(pvec3 - sphereRadiusVec3);
+        }
+    }
+    else
     {
-        DataTypes::get(pvec3[0], pvec3[1], pvec3[2], p);
-        bbox.include(pvec3);
+        for (const auto& p : position)
+        {
+            DataTypes::get(pvec3[0], pvec3[1], pvec3[2], p);
+            bbox.include(pvec3);
+        }
     }
 
     this->f_bbox.setValue(bbox);