From 789816acaff2f32704e230e1bdacd24e85821e94 Mon Sep 17 00:00:00 2001
From: danij <danij@dengine.net>
Date: Tue, 3 Dec 2013 03:55:25 +0000
Subject: [PATCH] Resources: Removed resource/models.cpp; renamed
 resource/models.h

Also added a convenience header for ModelDef.
---
 doomsday/client/client.pro                    |  4 ++--
 doomsday/client/include/ModelDef              |  1 +
 .../include/resource/{models.h => modeldef.h} | 10 ++++------
 .../client/include/resource/resourcesystem.h  |  3 ++-
 doomsday/client/src/resource/models.cpp       | 20 -------------------
 5 files changed, 9 insertions(+), 29 deletions(-)
 create mode 100644 doomsday/client/include/ModelDef
 rename doomsday/client/include/resource/{models.h => modeldef.h} (97%)
 delete mode 100644 doomsday/client/src/resource/models.cpp

diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
index cfd516bc54..9362c63d62 100644
--- 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
new file mode 100644
index 0000000000..9f90ada1d9
--- /dev/null
+++ b/doomsday/client/include/ModelDef
@@ -0,0 +1 @@
+#include "resource/modeldef.h"
diff --git a/doomsday/client/include/resource/models.h b/doomsday/client/include/resource/modeldef.h
similarity index 97%
rename from doomsday/client/include/resource/models.h
rename to doomsday/client/include/resource/modeldef.h
index 941e5afa5b..df16df34de 100644
--- a/doomsday/client/include/resource/models.h
+++ b/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
index f53d94018b..f53e4d6dc1 100644
--- 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
deleted file mode 100644
index ec9ea486fb..0000000000
--- a/doomsday/client/src/resource/models.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/** @file models.cpp  3D model resource loading.
- *
- * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
- * @authors Copyright © 2006 Jamie Jones <jamie_jones_au@yahoo.com.au>
- *
- * @par License
- * GPL: http://www.gnu.org/licenses/gpl.html
- *
- * <small>This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version. This program is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details. You should have received a copy of the GNU
- * General Public License along with this program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA</small>
- */