Refactor|ResourceSystem|Client|Server: ResourceSystem has ownership o…

…f the Fonts collection
skyjake · Nov 9, 2013 · f0f3d5d · f0f3d5d
1 parent cd98111
commit f0f3d5d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -128,6 +128,7 @@ DENG_CONVENIENCE_HEADERS += \
     include/EntityDatabase \
     include/Face \
     include/FontLineWrapping \
+    include/Fonts \
     include/Game \
     include/Games \
     include/GLTextComposer \

diff --git a/doomsday/client/include/Fonts b/doomsday/client/include/Fonts
@@ -0,0 +1 @@
+#include "resource/fonts.h"
diff --git a/doomsday/client/include/resource/resourcesystem.h b/doomsday/client/include/resource/resourcesystem.h
@@ -23,6 +23,7 @@
 #include <de/Error>
 #include "resourceclass.h"
 #include "Textures"
+#include "Fonts"
 
 /**
  * Logical resources; materials, packages, textures, etc... @ingroup resource
@@ -76,6 +77,11 @@ class ResourceSystem : public de::System
 
     patchid_t declarePatch(char const *encodedName);
 
+    /**
+     * Provides access to the Fonts collection.
+     */
+    de::Fonts &fonts();
+
 public: /// @todo Should be private:
     void initCompositeTextures();
     void initFlatTextures();

diff --git a/doomsday/client/src/resource/resourcesystem.cpp b/doomsday/client/src/resource/resourcesystem.cpp
@@ -74,6 +74,8 @@ DENG2_PIMPL(ResourceSystem)
     QList<PatchName> patchNames;
     Textures textures;
 
+    Fonts fonts;
+
     Instance(Public *i) : Base(i)
     {
         LOG_AS("ResourceSystem");
@@ -99,6 +101,8 @@ DENG2_PIMPL(ResourceSystem)
         textures.createScheme("ModelReflectionSkins");
         textures.createScheme("Lightmaps");
         textures.createScheme("Flaremaps");
+
+        /// @todo Initialize font resource schemes here.
     }
 
     ~Instance()
@@ -958,3 +962,8 @@ patchid_t ResourceSystem::declarePatch(char const *encodedName)
     }
     return 0;
 }
+
+Fonts &ResourceSystem::fonts()
+{
+    return d->fonts;
+}