Changeset 9833 in orxonox.OLD for branches/new_class_id/src/lib/gui/gl/glgui_widget.cc

Timestamp:

Sep 26, 2006, 4:59:49 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: almost killed off the old ResourceManager

File:

• branches/new_class_id/src/lib/gui/gl/glgui_widget.cc (modified) (2 diffs)

branches/new_class_id/src/lib/gui/gl/glgui_widget.cc

@@ -25 +25 @@
 
 #include "loading/load_param.h"
-
-/// TODO TAKE THIS OUT OF HERE
-#include "loading/resource_manager.h"
+#include "loading/new_resource_manager.h"
 
 namespace OrxGui
@@ -104 +102 @@
 
     if(GLGuiWidget::_defaultFont == NULL)
-      GLGuiWidget::_defaultFont = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);
+      GLGuiWidget::_defaultFont = new Font(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/final_frontier.ttf", 20);
 
     this->_font = *GLGuiWidget::_defaultFont;