Changeset 9836 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/media_container.cc

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

File:

• branches/new_class_id/src/lib/graphics/importer/media_container.cc (modified) (5 diffs)

branches/new_class_id/src/lib/graphics/importer/media_container.cc

@@ -25 +25 @@
 #include "media_container.h"
 
-#include "util/loading/new_resource_manager.h"
+#include "util/loading/resource_manager.h"
 /* header for debug output */
 #include "debug.h"
@@ -91 +91 @@
     return false;
   // check whether file exists
-  if(!Resources::NewResourceManager::getInstance()->checkFileInMainPath(filename))
+  if(!Resources::ResourceManager::getInstance()->checkFileInMainPath(filename))
   {
     PRINTF(1)("Could not find %s\n", filename.c_str());
@@ -101 +101 @@
 
   // Open video file
-  if (av_open_input_file(&format_context, Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str(), NULL, 0, NULL) !=0 )
-  {
-    PRINTF(1)("Could not open %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str());
+  if (av_open_input_file(&format_context, Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str(), NULL, 0, NULL) !=0 )
+  {
+    PRINTF(1)("Could not open %s\n", Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str());
     return false;
   }
@@ -110 +110 @@
   if (av_find_stream_info(format_context) < 0)
   {
-    PRINTF(1)("Could not find stream information in %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str());
+    PRINTF(1)("Could not find stream information in %s\n", Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str());
     return false;
   }
@@ -119 +119 @@
   if(video_stream == -1)
   {
-    PRINTF(1)("Could not find a video stream in %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str());
+    PRINTF(1)("Could not find a video stream in %s\n", Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str());
     return false;
   }