Changeset 9836 in orxonox.OLD for branches/new_class_id/src/lib/gui

Timestamp:

Sep 26, 2006, 5:16:10 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: Taken out the old ResourceManager.
On the way, i had to desintegrate the old MD3-model loading process (via ResourceManager) MD3 is untouched, but also not loaded anymore neither from ResourceMangers nor from the WorldEntity

@patrick: MD3-ModelLoading class must be implemented… this should be quite easy, with the way MD3 is, and the new Resource-paradigm
cheers

Location:

branches/new_class_id/src/lib/gui/gl

Files:

• glgui_handler.cc (modified) (2 diffs)
• glgui_widget.cc (modified) (2 diffs)

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

@@ -23 +23 @@
 #include "glgui_cursor.h"
 
-#include "loading/new_resource_manager.h"
+#include "loading/resource_manager.h"
 
 #include <cassert>
@@ -77 +77 @@
     this->_cursor->setMaxBorders(Vector2D(GraphicsEngine::getInstance()->getResolutionX(), GraphicsEngine::getInstance()->getResolutionY()));
 
-    _cursor->loadTextureSequence(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);
+    _cursor->loadTextureSequence(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);
 
   }

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

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