Refactored the clean up of MipmapLayout etc.

Author: robertosfield

include/vsg/core/Array.h

@@ -373,7 +373,7 @@ namespace vsg
                     vsg::deallocate(_data);
             }
 
-            removeMipmapLayout();
+            Data::_delete();
         }
 
     private:

include/vsg/core/Array2D.h

@@ -369,7 +369,7 @@ namespace vsg
                     vsg::deallocate(_data);
             }
 
-            removeMipmapLayout();
+            Data::_delete();
         }
 
     private:

include/vsg/core/Array3D.h

@@ -385,7 +385,7 @@ namespace vsg
                     vsg::deallocate(_data);
             }
 
-            removeMipmapLayout();
+            Data::_delete();
         }
 
     private:

include/vsg/core/Auxiliary.h

@@ -39,6 +39,12 @@ namespace vsg
 
         virtual int compare(const Auxiliary& rhs) const;
 
+        using ObjectMap = std::map<std::string, vsg::ref_ptr<Object>>;
+
+        /// container for all user objects
+        ObjectMap userObjects;
+
+
         void setObject(const std::string& key, ref_ptr<Object> object)
         {
             userObjects[key] = object;
@@ -76,10 +82,11 @@ namespace vsg
                 return {};
         }
 
-        using ObjectMap = std::map<std::string, vsg::ref_ptr<Object>>;
+        void clear()
+        {
+            userObjects.clear();
+        }
 
-        /// container for all user objects
-        ObjectMap userObjects;
 
     protected:
         explicit Auxiliary(Object* object);

include/vsg/core/Data.h

@@ -217,16 +217,17 @@ namespace vsg
         /// return true if Data's ModifiedCount is different from the specified ModifiedCount
         bool differentModifiedCount(const ModifiedCount& mc) const { return _modifiedCount != mc; }
 
+        /// set the MipmapLayout, only required when the data contains mipmaps that use block compressed formats and the pixels size doesn't fit exactly to the block size.
         void setMipmapLayout(MipmapLayout* mipmapData);
 
+        /// get the MipmapLayout if assigned.
         const MipmapLayout* getMipmapLayout() const;
 
-        void removeMipmapLayout();
-
     protected:
         virtual ~Data() {}
 
         void _copy(const Data& rhs);
+        void _delete();
 
         ModifiedCount _modifiedCount;
 

src/vsg/core/Data.cpp

@@ -128,24 +128,23 @@ void Data::_copy(const Data& rhs)
     }
 }
 
+void Data::_delete()
+{
+    if (getAuxiliary()) getAuxiliary()->clear();
+}
+
 void Data::setMipmapLayout(MipmapLayout* mipmapLayout)
 {
     if (mipmapLayout)
         setObject("mipmapLayout", ref_ptr<MipmapLayout>(mipmapLayout));
-    else
-        removeMipmapLayout();
+    else if (getAuxiliary()) removeObject("mipmapLayout");
 }
 
 const MipmapLayout* Data::getMipmapLayout() const
 {
     return getObject<MipmapLayout>("mipmapLayout");
 }
 
-void Data::removeMipmapLayout()
-{
-    if (getAuxiliary()) removeObject("mipmapLayout");
-}
-
 std::size_t Data::computeValueCountIncludingMipmaps() const
 {
     std::size_t count = 0;