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

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/network

Files:

• monitor/network_stats_widget.cc (modified) (2 diffs)
• network_stream.cc (modified) (2 diffs)
• proxy/network_settings.cc (modified) (2 diffs)
• zip.cc (modified) (2 diffs)

branches/new_class_id/src/lib/network/monitor/network_stats_widget.cc

@@ -20 +20 @@
 #include "peer_info.h"
 
-#include "loading/new_resource_manager.h"
+#include "loading/resource_manager.h"
 
 #include "multi_type.h"
@@ -56 +56 @@
 {
   if(_font == NULL)
-    _font = new Font(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/arial.ttf", 20);
+    _font = new Font(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/arial.ttf", 20);
 
   //this->_name.setFont(*_font);

branches/new_class_id/src/lib/network/network_stream.cc

@@ -41 +41 @@
 
 #include "loading/factory.h"
-#include "loading/new_resource_manager.h"
+#include "loading/resource_manager.h"
 
 #include "debug.h"
@@ -1299 +1299 @@
     length = remainingBytesToWriteToDict;
 
-  std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   fileName += "/dicts/newdict";
 

branches/new_class_id/src/lib/network/proxy/network_settings.cc

@@ -22 +22 @@
 
 #include "loading/load_param.h"
-#include "loading/new_resource_manager.h"
+#include "loading/resource_manager.h"
 #include "debug.h"
 
@@ -64 +64 @@
 void NetworkSettings::loadData()
 {
-  std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   fileName += "configs/network_settings.conf";
 

branches/new_class_id/src/lib/network/zip.cc

@@ -15 +15 @@
 
 #include "zip.h"
-#include "loading/new_resource_manager.h"
+#include "loading/resource_manager.h"
 #include "debug.h"
 
@@ -50 +50 @@
 int Zip::loadDictionary( std::string name )
 {
-  std::string fileName = Resources::NewResourceManager::getInstance()->mainGlobalPath().name();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   //PRINTF(0)("datadir: %s\n", fileName.c_str());
   fileName = fileName + "/dicts/" + name;