An option to skip caches invalidation in setDirtyFlags() (#1501)

MeshInspector · Aug 3, 2023 · 269c93e · 269c93e
1 parent 1be7c13
commit 269c93e
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 30 deletions.
diff --git a/source/MRMesh/MRObjectGcode.cpp b/source/MRMesh/MRObjectGcode.cpp
@@ -48,9 +48,9 @@ void ObjectGcode::setGcodeSource( const std::shared_ptr<GcodeSource>& gcodeSourc
     updateAll_();
 }
 
-void ObjectGcode::setDirtyFlags( uint32_t mask )
+void ObjectGcode::setDirtyFlags( uint32_t mask, bool invalidateCaches )
 {
-    ObjectLinesHolder::setDirtyFlags( mask );
+    ObjectLinesHolder::setDirtyFlags( mask, invalidateCaches );
 
     if ( mask & DIRTY_POSITION || mask & DIRTY_PRIMITIVES )
     {

diff --git a/source/MRMesh/MRObjectGcode.h b/source/MRMesh/MRObjectGcode.h
@@ -33,7 +33,7 @@ class MRMESH_CLASS ObjectGcode : public ObjectLinesHolder
     // get mapping of tool path polyline segment id to source line number of g-code source
     virtual const std::vector<int>& segmentToSourceLineMap() const { return segmentToSourceLineMap_; }
 
-    MRMESH_API virtual void setDirtyFlags( uint32_t mask ) override;
+    MRMESH_API virtual void setDirtyFlags( uint32_t mask, bool invalidateCaches = true ) override;
 
     /// \note this ctor is public only for std::make_shared used inside clone()
     ObjectGcode( ProtectedStruct, const ObjectGcode& obj ) : ObjectGcode( obj ) {}

diff --git a/source/MRMesh/MRObjectLines.cpp b/source/MRMesh/MRObjectLines.cpp
@@ -43,9 +43,9 @@ std::shared_ptr< Polyline3 > ObjectLines::updatePolyline( std::shared_ptr< Polyl
     return polyline;
 }
 
-void ObjectLines::setDirtyFlags( uint32_t mask )
+void ObjectLines::setDirtyFlags( uint32_t mask, bool invalidateCaches )
 {
-    ObjectLinesHolder::setDirtyFlags( mask );
+    ObjectLinesHolder::setDirtyFlags( mask, invalidateCaches );
 
     if ( mask & DIRTY_POSITION || mask & DIRTY_PRIMITIVES )
     {

diff --git a/source/MRMesh/MRObjectLines.h b/source/MRMesh/MRObjectLines.h
@@ -26,7 +26,7 @@ class MRMESH_CLASS ObjectLines : public ObjectLinesHolder
 
     virtual const std::shared_ptr<Polyline3>& varPolyline() { return polyline_; }
 
-    MRMESH_API virtual void setDirtyFlags( uint32_t mask ) override;
+    MRMESH_API virtual void setDirtyFlags( uint32_t mask, bool invalidateCaches = true ) override;
 
     /// \note this ctor is public only for std::make_shared used inside clone()
     ObjectLines( ProtectedStruct, const ObjectLines& obj ) : ObjectLines( obj ) {}

diff --git a/source/MRMesh/MRObjectLinesHolder.cpp b/source/MRMesh/MRObjectLinesHolder.cpp
@@ -52,9 +52,9 @@ std::shared_ptr<Object> ObjectLinesHolder::shallowClone() const
     return res;
 }
 
-void ObjectLinesHolder::setDirtyFlags( uint32_t mask )
+void ObjectLinesHolder::setDirtyFlags( uint32_t mask, bool invalidateCaches )
 {
-    VisualObject::setDirtyFlags( mask );
+    VisualObject::setDirtyFlags( mask, invalidateCaches );
 
     if ( mask & DIRTY_PRIMITIVES )
     {
@@ -66,7 +66,7 @@ void ObjectLinesHolder::setDirtyFlags( uint32_t mask )
         totalLength_.reset();
         worldBox_.reset();
         worldBox_.get().reset();
-        if ( polyline_ )
+        if ( invalidateCaches && polyline_ )
             polyline_->invalidateCaches();
     }
 }

diff --git a/source/MRMesh/MRObjectLinesHolder.h b/source/MRMesh/MRObjectLinesHolder.h
@@ -42,7 +42,7 @@ class MRMESH_CLASS ObjectLinesHolder : public VisualObject
     const std::shared_ptr<const Polyline3>& polyline() const
     { return reinterpret_cast< const std::shared_ptr<const Polyline3>& >( polyline_ ); } // reinterpret_cast to avoid making a copy of shared_ptr
 
-    MRMESH_API virtual void setDirtyFlags( uint32_t mask ) override;
+    MRMESH_API virtual void setDirtyFlags( uint32_t mask, bool invalidateCaches = true ) override;
 
     MRMESH_API virtual void setLineWidth( float width );
     float getLineWidth() const { return lineWidth_; }

diff --git a/source/MRMesh/MRObjectMesh.cpp b/source/MRMesh/MRObjectMesh.cpp
@@ -137,9 +137,9 @@ std::shared_ptr<Object> ObjectMesh::shallowClone() const
     return res;
 }
 
-void ObjectMesh::setDirtyFlags( uint32_t mask )
+void ObjectMesh::setDirtyFlags( uint32_t mask, bool invalidateCaches )
 {
-    ObjectMeshHolder::setDirtyFlags( mask );
+    ObjectMeshHolder::setDirtyFlags( mask, invalidateCaches );
     if ( mask & DIRTY_POSITION || mask & DIRTY_FACE)
     {
         if ( mesh_ )

diff --git a/source/MRMesh/MRObjectMesh.h b/source/MRMesh/MRObjectMesh.h
@@ -33,7 +33,7 @@ class MRMESH_CLASS ObjectMesh : public ObjectMeshHolder
     MRMESH_API virtual std::shared_ptr<Object> clone() const override;
     MRMESH_API virtual std::shared_ptr<Object> shallowClone() const override;
 
-    MRMESH_API virtual void setDirtyFlags( uint32_t mask ) override;
+    MRMESH_API virtual void setDirtyFlags( uint32_t mask, bool invalidateCaches = true ) override;
 
     /// \note this ctor is public only for std::make_shared used inside clone()
     ObjectMesh( ProtectedStruct, const ObjectMesh& obj ) : ObjectMesh( obj ) {}

diff --git a/source/MRMesh/MRObjectMeshHolder.cpp b/source/MRMesh/MRObjectMeshHolder.cpp
@@ -531,13 +531,13 @@ size_t ObjectMeshHolder::numHandles() const
     return meshStat_->numComponents - EulerCharacteristic / 2;
 }
 
-void ObjectMeshHolder::setDirtyFlags( uint32_t mask )
+void ObjectMeshHolder::setDirtyFlags( uint32_t mask, bool invalidateCaches )
 {
     // selected faces and edges can be changed only by the methods of this class, 
     // which set dirty flags appropriately
     mask &= ~( DIRTY_SELECTION | DIRTY_EDGES_SELECTION );
 
-    VisualObject::setDirtyFlags( mask );
+    VisualObject::setDirtyFlags( mask, invalidateCaches );
 
     if ( mask & DIRTY_FACE )
     {
@@ -552,7 +552,7 @@ void ObjectMeshHolder::setDirtyFlags( uint32_t mask )
         totalArea_.reset();
         selectedArea_.reset();
         avgEdgeLen_.reset();
-        if ( mesh_ )
+        if ( invalidateCaches && mesh_ )
             mesh_->invalidateCaches();
     }
 }

diff --git a/source/MRMesh/MRObjectMeshHolder.h b/source/MRMesh/MRObjectMeshHolder.h
@@ -52,7 +52,7 @@ class MRMESH_CLASS ObjectMeshHolder : public VisualObject
     MRMESH_API virtual std::shared_ptr<Object> clone() const override;
     MRMESH_API virtual std::shared_ptr<Object> shallowClone() const override;
 
-    MRMESH_API virtual void setDirtyFlags( uint32_t mask ) override;
+    MRMESH_API virtual void setDirtyFlags( uint32_t mask, bool invalidateCaches = true ) override;
 
     const FaceBitSet& getSelectedFaces() const { return selectedTriangles_; }
     MRMESH_API virtual void selectFaces( FaceBitSet newSelection );

diff --git a/source/MRMesh/MRObjectPoints.cpp b/source/MRMesh/MRObjectPoints.cpp
@@ -50,9 +50,9 @@ std::vector<std::string> ObjectPoints::getInfoLines() const
     return res;
 }
 
-void ObjectPoints::setDirtyFlags( uint32_t mask )
+void ObjectPoints::setDirtyFlags( uint32_t mask, bool invalidateCaches )
 {
-    ObjectPointsHolder::setDirtyFlags( mask );
+    ObjectPointsHolder::setDirtyFlags( mask, invalidateCaches );
     if ( mask & DIRTY_POSITION || mask & DIRTY_FACE )
     {
         if ( points_ )

diff --git a/source/MRMesh/MRObjectPoints.h b/source/MRMesh/MRObjectPoints.h
@@ -35,7 +35,7 @@ class MRMESH_CLASS ObjectPoints : public ObjectPointsHolder
     MRMESH_API virtual std::vector<std::string> getInfoLines() const override;
     virtual std::string getClassName() const override { return "Points"; }
 
-    MRMESH_API virtual void setDirtyFlags( uint32_t mask ) override;
+    MRMESH_API virtual void setDirtyFlags( uint32_t mask, bool invalidateCaches = true ) override;
 
     /// signal about points changing, triggered in setDirtyFlag
     using PointsChangedSignal = Signal<void( uint32_t mask )>;

diff --git a/source/MRMesh/MRObjectPointsHolder.cpp b/source/MRMesh/MRObjectPointsHolder.cpp
@@ -61,9 +61,9 @@ std::shared_ptr<MR::Object> ObjectPointsHolder::shallowClone() const
     return res;
 }
 
-void ObjectPointsHolder::setDirtyFlags( uint32_t mask )
+void ObjectPointsHolder::setDirtyFlags( uint32_t mask, bool invalidateCaches )
 {
-    VisualObject::setDirtyFlags( mask );
+    VisualObject::setDirtyFlags( mask, invalidateCaches );
 
     if ( mask & DIRTY_FACE )
         numValidPoints_.reset();
@@ -72,7 +72,7 @@ void ObjectPointsHolder::setDirtyFlags( uint32_t mask )
     {
         worldBox_.reset();
         worldBox_.get().reset();
-        if ( points_ )
+        if ( invalidateCaches && points_ )
             points_->invalidateCaches();
     }
 }

diff --git a/source/MRMesh/MRObjectPointsHolder.h b/source/MRMesh/MRObjectPointsHolder.h
@@ -38,7 +38,7 @@ class MRMESH_CLASS ObjectPointsHolder : public VisualObject
     MRMESH_API virtual std::shared_ptr<Object> clone() const override;
     MRMESH_API virtual std::shared_ptr<Object> shallowClone() const override;
 
-    MRMESH_API virtual void setDirtyFlags( uint32_t mask ) override;
+    MRMESH_API virtual void setDirtyFlags( uint32_t mask, bool invalidateCaches = true ) override;
 
     const VertBitSet& getSelectedPoints() const { return selectedPoints_; }
     MRMESH_API virtual void selectPoints( VertBitSet newSelection );

diff --git a/source/MRMesh/MRObjectVoxels.cpp b/source/MRMesh/MRObjectVoxels.cpp
@@ -372,11 +372,11 @@ std::shared_ptr<Object> ObjectVoxels::shallowClone() const
     return res;
 }
 
-void ObjectVoxels::setDirtyFlags( uint32_t mask )
+void ObjectVoxels::setDirtyFlags( uint32_t mask, bool invalidateCaches )
 {
-    ObjectMeshHolder::setDirtyFlags( mask );
+    ObjectMeshHolder::setDirtyFlags( mask, invalidateCaches );
 
-    if ( ( mask & DIRTY_POSITION || mask & DIRTY_FACE ) && mesh_ )
+    if ( invalidateCaches && ( mask & DIRTY_POSITION || mask & DIRTY_FACE ) && mesh_ )
         mesh_->invalidateCaches();
 }
 

diff --git a/source/MRMesh/MRObjectVoxels.h b/source/MRMesh/MRObjectVoxels.h
@@ -153,7 +153,7 @@ class MRMESH_CLASS ObjectVoxels : public ObjectMeshHolder
     MRMESH_API virtual std::shared_ptr<Object> clone() const override;
     MRMESH_API virtual std::shared_ptr<Object> shallowClone() const override;
 
-    MRMESH_API virtual void setDirtyFlags( uint32_t mask ) override;
+    MRMESH_API virtual void setDirtyFlags( uint32_t mask, bool invalidateCaches = true ) override;
 
     /// \note this ctor is public only for std::make_shared used inside clone()
     ObjectVoxels( ProtectedStruct, const ObjectVoxels& obj ) : ObjectVoxels( obj ) {}

diff --git a/source/MRMesh/MRVisualObject.cpp b/source/MRMesh/MRVisualObject.cpp
@@ -158,7 +158,7 @@ void VisualObject::setLabelsColorsForAllViewports( ViewportProperty<Color> val )
     labelsColor_ = val;
 }
 
-void VisualObject::setDirtyFlags( uint32_t mask )
+void VisualObject::setDirtyFlags( uint32_t mask, bool )
 {
     if ( mask & DIRTY_FACE ) // first to also activate all flags due to DIRTY_POSITION later
         mask |= DIRTY_POSITION | DIRTY_UV | DIRTY_VERTS_COLORMAP;

diff --git a/source/MRMesh/MRVisualObject.h b/source/MRMesh/MRVisualObject.h
@@ -169,7 +169,8 @@ class MRMESH_CLASS VisualObject : public Object
 
     /// sets some dirty flags for the object (to force its visual update)
     /// \param mask is a union of DirtyFlags flags
-    MRMESH_API virtual void setDirtyFlags( uint32_t mask );
+    /// \param invalidateCaches whether to automatically invalidate model caches (pass false here if you manually update the caches)
+    MRMESH_API virtual void setDirtyFlags( uint32_t mask, bool invalidateCaches = true );
     /// returns current dirty flags for the object
     MRMESH_API uint32_t getDirtyFlags() const { return dirty_; }
     /// resets all dirty flags (except for cache flags that will be reset automatically on cache update)