Resources: Removed resource/models.cpp; renamed resource/models.h

Also added a convenience header for ModelDef.
skyjake · Dec 3, 2013 · 789816a · 789816a
1 parent 4e59067
commit 789816a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 29 deletions.
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -161,6 +161,7 @@ DENG_CONVENIENCE_HEADERS += \
     include/MaterialVariantSpec \
     include/Mesh \
     include/Model \
+    include/ModelDef \
     include/Plane \
     include/Polyobj \
     include/ProceduralImage \
@@ -348,7 +349,7 @@ DENG_HEADERS += \
     include/resource/materialsnapshot.h \
     include/resource/materialvariantspec.h \
     include/resource/model.h \
-    include/resource/models.h \
+    include/resource/modeldef.h \
     include/resource/patch.h \
     include/resource/patchname.h \
     include/resource/pcx.h \
@@ -710,7 +711,6 @@ SOURCES += \
     src/resource/materialsnapshot.cpp \
     src/resource/materialvariant.cpp \
     src/resource/model.cpp \
-    src/resource/models.cpp \
     src/resource/patch.cpp \
     src/resource/patchname.cpp \
     src/resource/pcx.cpp \

diff --git a/doomsday/client/include/ModelDef b/doomsday/client/include/ModelDef
@@ -0,0 +1 @@
+#include "resource/modeldef.h"
diff --git a/doomsday/client/include/resource/models.h → doomsday/client/include/resource/modeldef.h b/doomsday/client/include/resource/models.h → doomsday/client/include/resource/modeldef.h
@@ -1,4 +1,4 @@
-/** @file models.h  3D model resource definition.
+/** @file modeldef.h  3D model resource definition.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
@@ -18,8 +18,8 @@
  * 02110-1301 USA</small>
  */
 
-#ifndef DENG_RESOURCE_MODELS_H
-#define DENG_RESOURCE_MODELS_H
+#ifndef DENG_RESOURCE_MODELDEF_H
+#define DENG_RESOURCE_MODELDEF_H
 
 #include <vector>
 #include <de/Vector>
@@ -107,8 +107,6 @@ struct SubmodelDef
     }
 };
 
-typedef SubmodelDef submodeldef_t;
-
 #define MODELDEF_ID_MAXLEN      32
 
 struct ModelDef
@@ -232,4 +230,4 @@ struct ModelDef
     }
 };
 
-#endif // DENG_RESOURCE_MODELS_H
+#endif // DENG_RESOURCE_MODELDEF_H
diff --git a/doomsday/client/include/resource/resourcesystem.h b/doomsday/client/include/resource/resourcesystem.h
@@ -24,10 +24,11 @@
 #include "resource/animgroup.h"
 #include "resource/colorpalette.h"
 #ifdef __CLIENT__
-#  include "resource/models.h"
 #  include "AbstractFont"
 #  include "FontScheme"
 #  include "MaterialVariantSpec"
+#  include "Model"
+#  include "ModelDef"
 #endif
 #include "Material"
 #include "MaterialScheme"

diff --git a/doomsday/client/src/resource/models.cpp b/doomsday/client/src/resource/models.cpp