Resources: Cleanup

skyjake · Dec 1, 2013 · 98f69b0 · 98f69b0
1 parent 99ce12b
commit 98f69b0
Show file tree

Hide file tree

Showing 4 changed files with 1,190 additions and 1,192 deletions.
diff --git a/doomsday/client/include/gl/gl_model.h b/doomsday/client/include/gl/gl_model.h
@@ -252,7 +252,7 @@ class Model
     DetailLevels const &lods() const;
 
     /// @todo Remove me.
-    int numVertices() const;
+    int vertexCount() const;
 
 private:
     DENG2_PRIVATE(d)

diff --git a/doomsday/client/src/gl/gl_model.cpp b/doomsday/client/src/gl/gl_model.cpp
@@ -25,7 +25,6 @@
 #include "Texture"
 #include "TextureManifest"
 #include <de/Range>
-#include <de/memory.h>
 #include <QtAlgorithms>
 
 using namespace de;
@@ -181,15 +180,15 @@ Model::DetailLevel &Model::lod(int level) const
     {
         return *_lods.at(level);
     }
-    throw MissingDetailLevelError("Model::lod", "Invalid detail leve " + String::number(level) + " Valid range is " + Rangei(0, _lods.count()).asText());
+    throw MissingDetailLevelError("Model::lod", "Invalid detail level " + String::number(level) + " Valid range is " + Rangei(0, _lods.count()).asText());
 }
 
 Model::DetailLevels const &Model::lods() const
 {
     return _lods;
 }
 
-int Model::numVertices() const
+int Model::vertexCount() const
 {
     return _numVertices;
 }
diff --git a/doomsday/client/src/render/rend_model.cpp b/doomsday/client/src/render/rend_model.cpp
@@ -881,7 +881,7 @@ static void Mod_RenderSubModel(uint number, rendmodelparams_t const *parm)
     }
 
     // Determine the total number of vertices we have.
-    numVerts = mdl->numVertices();
+    numVerts = mdl->vertexCount();
 
     // Ensure our vertex render buffers can accommodate this.
     if(!Mod_ExpandVertexBuffer(numVerts))