Resources: Cleanup

skyjake · Dec 4, 2013 · f78ac1e · f78ac1e
1 parent 69de139
commit f78ac1e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/doomsday/client/include/resource/resourcesystem.h b/doomsday/client/include/resource/resourcesystem.h
@@ -224,15 +224,15 @@ class ResourceSystem : public de::System
     uint materialCount() const { return allMaterials().count(); }
 
     /**
-     * Returns @c true iff a Scheme exists with the symbolic @a name.
+     * Returns @c true iff a MaterialScheme exists with the symbolic @a name.
      */
     bool knownMaterialScheme(de::String name) const;
 
     /**
-     * Lookup a subspace scheme by symbolic name.
+     * Lookup a material resource scheme by symbolic name.
      *
      * @param name  Symbolic name of the scheme.
-     * @return  Scheme associated with @a name.
+     * @return  MaterialScheme associated with @a name.
      *
      * @throws UnknownSchemeError If @a name is unknown.
      *
@@ -246,12 +246,12 @@ class ResourceSystem : public de::System
     MaterialSchemes const &allMaterialSchemes() const;
 
     /**
-     * Returns the total number of manifest schemes in the collection.
+     * Returns the total number of material manifest schemes in the collection.
      */
     inline int materialSchemeCount() const { return allMaterialSchemes().count(); }
 
     /**
-     * Clear all manifests and materials in all schemes.
+     * Clear all materials (and their manifests) in all schemes.
      *
      * @see allMaterialSchemes(), MaterialScheme::clear().
      */

diff --git a/doomsday/client/src/def_main.cpp b/doomsday/client/src/def_main.cpp
@@ -1147,7 +1147,7 @@ static void rebuildMaterialLayers(Material &material, ded_material_t const &def)
 
                         try
                         {
-                            Texture &texture = App_ResourceSystem().textureManifest(reinterpret_cast<de::Uri const &>(*gm.material)).texture();
+                            Texture &texture = App_ResourceSystem().texture(reinterpret_cast<de::Uri const &>(*gm.material));
                             layer0->addStage(Material::Layer::Stage(&texture, gm.tics, gm.randomTics / float( gm.tics )));
                         }
                         catch(TextureManifest::MissingTextureError const &)
@@ -1369,7 +1369,7 @@ static void interpretMaterialDef(ded_material_t const &def)
             {
                 try
                 {
-                    Texture &texture = App_ResourceSystem().textureManifest(*reinterpret_cast<de::Uri *>(firstLayer.stages[0].texture)).texture();
+                    Texture &texture = App_ResourceSystem().texture(*reinterpret_cast<de::Uri *>(firstLayer.stages[0].texture));
                     if(texture.isFlagged(Texture::Custom))
                     {
                         manifest->setFlags(MaterialManifest::Custom);

diff --git a/doomsday/client/src/resource/material.cpp b/doomsday/client/src/resource/material.cpp
@@ -49,7 +49,7 @@ static Texture *findTextureForLayerStage(ded_material_layer_stage_t const &def)
     {
         if(def.texture)
         {
-            return &App_ResourceSystem().textureManifest(*reinterpret_cast<de::Uri *>(def.texture)).texture();
+            return &App_ResourceSystem().texture(*reinterpret_cast<de::Uri *>(def.texture));
         }
     }
     catch(TextureManifest::MissingTextureError const &)