From 7d998c3ad3c481d65b4275385c77a2a199d93ec3 Mon Sep 17 00:00:00 2001 From: Fedr Date: Fri, 9 Sep 2022 15:48:25 +0300 Subject: [PATCH] Unused IRenderObject::BufferMode deleted --- source/MRMesh/MRIRenderObject.h | 14 -------------- source/MRMesh/MRVisualObject.cpp | 14 -------------- source/MRMesh/MRVisualObject.h | 3 --- source/MRViewer/MRRenderMeshObject.cpp | 1 - 4 files changed, 32 deletions(-) diff --git a/source/MRMesh/MRIRenderObject.h b/source/MRMesh/MRIRenderObject.h index 5b6dbd46e809..679d6d39cfd5 100644 --- a/source/MRMesh/MRIRenderObject.h +++ b/source/MRMesh/MRIRenderObject.h @@ -41,20 +41,6 @@ class IRenderObject virtual size_t heapBytes() const = 0; /// returns the amount of memory this object allocated in OpenGL virtual size_t glBytes() const = 0; - /// the way the internal buffers are dealt with - enum BufferMode { - /// preserve the buffers to reduce re-allocation count - AllocationEfficient, - /// clear the buffers on every update to reduce memory consumption - MemoryEfficient, - }; - /// returns internal buffer mode - BufferMode getBufferMode() const { return bufferMode_; } - /// sets internal buffer mode - void setBufferMode( BufferMode bufferMode ) { bufferMode_ = bufferMode; } - -protected: - BufferMode bufferMode_{ AllocationEfficient }; }; MRMESH_API std::unique_ptr createRenderObject( const VisualObject& visObj, const std::type_index& type ); diff --git a/source/MRMesh/MRVisualObject.cpp b/source/MRMesh/MRVisualObject.cpp index 8fec6a4a8bbb..75cbdee6715d 100644 --- a/source/MRMesh/MRVisualObject.cpp +++ b/source/MRMesh/MRVisualObject.cpp @@ -380,18 +380,4 @@ void VisualObject::setDefaultColors_() setLabelsColor( SceneColors::get( SceneColors::Labels ) ); } -IRenderObject::BufferMode VisualObject::getRenderBufferMode() const -{ - if ( !renderObj_ ) - return IRenderObject::AllocationEfficient; - return renderObj_->getBufferMode(); -} - -void VisualObject::setRenderBufferMode( IRenderObject::BufferMode bufferMode ) -{ - if ( !renderObj_ ) - return; - renderObj_->setBufferMode( bufferMode ); -} - } //namespace MR diff --git a/source/MRMesh/MRVisualObject.h b/source/MRMesh/MRVisualObject.h index 53411c7fc28e..c9f053f0b2d9 100644 --- a/source/MRMesh/MRVisualObject.h +++ b/source/MRMesh/MRVisualObject.h @@ -167,9 +167,6 @@ class MRMESH_CLASS VisualObject : public Object /// is object has visual representation (faces, edges, etc.) virtual bool hasVisualRepresentation() const { return false; } - MRMESH_API IRenderObject::BufferMode getRenderBufferMode() const; - MRMESH_API void setRenderBufferMode( IRenderObject::BufferMode bufferMode ); - /// returns bounding box of this object in world coordinates; /// if you need bounding box in local coordinates please call getBoundingBox() MRMESH_API virtual Box3f getWorldBox( ViewportId = {} ) const override; diff --git a/source/MRViewer/MRRenderMeshObject.cpp b/source/MRViewer/MRRenderMeshObject.cpp index eeb50af06ca4..0a7b004df787 100644 --- a/source/MRViewer/MRRenderMeshObject.cpp +++ b/source/MRViewer/MRRenderMeshObject.cpp @@ -21,7 +21,6 @@ RenderMeshObject::RenderMeshObject( const VisualObject& visObj ) assert( objMesh_ ); if ( Viewer::constInstance()->isGLInitialized() ) initBuffers_(); - bufferMode_ = MemoryEfficient; } RenderMeshObject::~RenderMeshObject()