Materials: Observe MaterialManifest deletion

To ensure the manifest groups are always valid.
skyjake · Mar 3, 2013 · bf3305e · bf3305e
1 parent bce1f5a
commit bf3305e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/doomsday/client/include/resource/materialmanifest.h b/doomsday/client/include/resource/materialmanifest.h
@@ -47,6 +47,8 @@ class MaterialManifest : public PathTree::Node,
     /// Required material instance is missing. @ingroup errors
     DENG2_ERROR(MissingMaterialError);
 
+    DENG2_DEFINE_AUDIENCE(Deletion, void manifestBeingDeleted(MaterialManifest const &manifest))
+
     DENG2_DEFINE_AUDIENCE(MaterialDerived, void manifestMaterialDerived(MaterialManifest &manifest, Material &material))
 
     enum Flag

diff --git a/doomsday/client/include/resource/materials.h b/doomsday/client/include/resource/materials.h
@@ -53,6 +53,7 @@ namespace de {
  */
 class Materials : DENG2_OBSERVES(MaterialScheme, ManifestDefined),
                   DENG2_OBSERVES(MaterialManifest, MaterialDerived),
+                  DENG2_OBSERVES(MaterialManifest, Deletion),
                   DENG2_OBSERVES(Material, Deletion)
 {
     /// Internal typedefs for brevity/cleanliness.
@@ -165,7 +166,8 @@ class Materials : DENG2_OBSERVES(MaterialScheme, ManifestDefined),
     inline int schemeCount() const { return allSchemes().count(); }
 
     /**
-     * Clear all materials in all schemes.
+     * Clear all manifests and materials in all schemes.
+     *
      * @see allSchemes(), Scheme::clear().
      */
     inline void clearAllSchemes()
@@ -287,10 +289,13 @@ class Materials : DENG2_OBSERVES(MaterialScheme, ManifestDefined),
 
 protected:
     // Observes Scheme ManifestDefined.
-    void schemeManifestDefined(MaterialScheme &scheme, MaterialManifest &manifest);
+    void schemeManifestDefined(Scheme &scheme, Manifest &manifest);
+
+    // Observes Manifest Deletion.
+    void manifestBeingDeleted(Manifest const &manifest);
 
     // Observes Manifest MaterialDerived.
-    void manifestMaterialDerived(MaterialManifest &manifest, Material &material);
+    void manifestMaterialDerived(Manifest &manifest, Material &material);
 
     // Observes Material Deletion.
     void materialBeingDeleted(Material const &material);

diff --git a/doomsday/client/src/resource/materialmanifest.cpp b/doomsday/client/src/resource/materialmanifest.cpp
@@ -47,6 +47,8 @@ MaterialManifest::MaterialManifest(PathTree::NodeArgs const &args)
 
 MaterialManifest::~MaterialManifest()
 {
+    DENG2_FOR_AUDIENCE(Deletion, i) i->manifestBeingDeleted(*this);
+
     delete d;
 }
 

diff --git a/doomsday/client/src/resource/materials.cpp b/doomsday/client/src/resource/materials.cpp
@@ -327,6 +327,9 @@ void Materials::schemeManifestDefined(MaterialScheme &scheme, MaterialManifest &
     // We want notification when the manifest is derived to produce a material.
     manifest.audienceForMaterialDerived += this;
 
+    // We want notification when the manifest is about to be deleted.
+    manifest.audienceForDeletion += this;
+
     // Acquire a new unique identifier for the manifest.
     materialid_t const id = ++d->manifestCount; // 1-based.
     manifest.setId(id);
@@ -352,6 +355,14 @@ void Materials::manifestMaterialDerived(MaterialManifest &manifest, Material &ma
     material.audienceForDeletion += this;
 }
 
+void Materials::manifestBeingDeleted(MaterialManifest const &manifest)
+{
+    foreach(ManifestGroup *group, d->groups)
+    {
+        group->remove(const_cast<Manifest *>(&manifest));
+    }
+}
+
 void Materials::materialBeingDeleted(Material const &material)
 {
     d->materials.removeOne(const_cast<Material *>(&material));