diff --git a/radiantcore/model/StaticModelSurface.cpp b/radiantcore/model/StaticModelSurface.cpp index 79d2f15d29..def1b7c0c5 100644 --- a/radiantcore/model/StaticModelSurface.cpp +++ b/radiantcore/model/StaticModelSurface.cpp @@ -34,7 +34,6 @@ StaticModelSurface::StaticModelSurface(const StaticModelSurface& other) : _defaultMaterial(other._defaultMaterial), _vertices(other._vertices), _indices(other._indices), - _nIndices(other._nIndices), _localAABB(other._localAABB), _dlRegular(0), _dlProgramVcol(0), diff --git a/radiantcore/model/StaticModelSurface.h b/radiantcore/model/StaticModelSurface.h index e474e4a1b9..aa57035394 100644 --- a/radiantcore/model/StaticModelSurface.h +++ b/radiantcore/model/StaticModelSurface.h @@ -20,13 +20,13 @@ namespace model /** * \brief - * Renderable class containing a series of polygons textured with the same - * material. + * A static surface contains a series of triangles textured with the same + * material. The number of vertices and indices of a surface never changes. * * StaticModelSurface objects are composited into a StaticModel object to * create a renderable static mesh. */ -class StaticModelSurface : +class StaticModelSurface final : public IIndexedModelSurface, public OpenGLRenderable { @@ -47,10 +47,6 @@ class StaticModelSurface : typedef std::vector Indices; Indices _indices; - // Keep track of the number of indices to iterate over, since vector::size() - // may not be fast - unsigned int _nIndices; - // The AABB containing this surface, in local object space. AABB _localAABB; @@ -71,7 +67,7 @@ class StaticModelSurface : // Move-construct this static model surface from the given vertex- and index array StaticModelSurface(std::vector&& vertices, std::vector&& indices); - // Copy-constructor. + // Copy-constructor. All vertices and indices will be copied from 'other'. StaticModelSurface(const StaticModelSurface& other); ~StaticModelSurface();