Changeset 7266 in orxonox.OLD

Timestamp:

Apr 2, 2006, 5:40:29 PM (18 years ago)

Author:

bensch

Message:

compile, but does not load anything… i do absolutely not get why :/

Location:

branches/shared_lib/src

Files:

• lib/util/loading/dynamic_loader.cc (modified) (2 diffs)
• lib/util/loading/resource_manager.cc (modified) (1 diff)
• orxonox.cc (modified) (3 diffs)

branches/shared_lib/src/lib/util/loading/dynamic_loader.cc

@@ -103 +103 @@
   if (ResourceManager::isDir(absSearchDir))
   {
+    //printf("ADDED %s\n", absSearchDir.c_str());
     DynamicLoader::addSearchDir(absSearchDir);
     return true;
@@ -108 +109 @@
   else
   {
+    //printf("not a directory %s\n", absSearchDir.c_str());
     return false;
   }

branches/shared_lib/src/lib/util/loading/resource_manager.cc

@@ -870 +870 @@
     return "";
   std::string retName = name;
-  if (strncmp(name.c_str(), "/", 1))
+  if (name[0] != '/')
   {
     if (name[0] == '.' && name[1] != '.')
-      retName.erase(0);
-    const std::string& absDir = ResourceManager::cwd();
-    retName = absDir + retName;
+      retName.erase(0, 1);
+    retName = ResourceManager::cwd() + retName;
   }
   return retName;

branches/shared_lib/src/orxonox.cc

@@ -341 +341 @@
   ResourceManager::getInstance()->addImageDir(imageDir);
 
+
+
   if (!DynamicLoader::addSearchDirRelative("./world_entities"))
     if (!DynamicLoader::addSearchDirRelative("./src/world_entities"))
@@ -346 +348 @@
 
   /// FIXME make this more modular (search for himself for all the libraries
-  printf("%s\n", DynamicLoader::getSearchDir());
+  PRINTF(0)("We are searching for plugins in %s\n", DynamicLoader::getSearchDir());
   DynamicLoader::loadDyLib("libORXplayables.la");
   DynamicLoader::loadDyLib("libORXweapons.la");
@@ -354 +356 @@
   DynamicLoader::loadDyLib("libORXenvironmentals.la");
 
-  DynamicLoader::loadDyLib("libORXnpcs");
-
-  DynamicLoader::loadDyLib("libORXmisc_entities");
+  DynamicLoader::loadDyLib("libORXnpcs.la");
+
+  DynamicLoader::loadDyLib("libORXmisc_entities.la");
   printf("%s\n", DynamicLoader::getSearchDir());