Changeset 546 for code/branches/FICN/src

Timestamp:

Dec 16, 2007, 10:19:03 PM (17 years ago)

Author:

bknecht

Message:

suggestion for solution of WinMain problem

Location:

code/branches/FICN/src/orxonox

Files:

• graphicsEngine.cc (modified) (1 diff)
• main.cc (modified) (2 diffs)
• orxonox.cc (modified) (4 diffs)

code/branches/FICN/src/orxonox/graphicsEngine.cc

@@ -113 +113 @@
       for (i = settings->begin(); i != settings->end(); ++i)
       {
-        typeName = i->first;
-        archName = i->second;
+        typeName = i->first; // for instance "FileSystem" or "Zip"
+        archName = i->second; // name (and location) of archive
 
         ResourceGroupManager::getSingleton().addResourceLocation(
                                            String(dataPath + archName),
-            typeName, secName);
+                                           typeName, secName);
       }
     }

code/branches/FICN/src/orxonox/main.cc

@@ -71 +71 @@
 #endif
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 
-#define WIN32_LEAN_AND_MEAN 
-#include "windows.h" 
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#define WIN32_LEAN_AND_MEAN
+#include "windows.h"
   INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
   {
+    // something like this would be less hacky
+    // maybe one can work with trailing '\0'
+    // or maybe use string based functions
+    // I was unable to test it without working windows version
+    /*char* cmd = strCmdLine;
+    int argc = 1;
+    for(int i = 0; cmd[i] != NULL; i++)
+    {
+      if(cmd[i] == ' ') argc++;
+    }
+    char* argv[argc];
+    int j = 0;
+    int k = 0;
+    for(int i = 0; cmd[i] != NULL; i++)
+    {
+      if(cmd[i] != ' ') {
+        argv[j][k];
+        k++;
+      }
+      else {
+        k = 0;
+        j++;
+      }
+    }*/
     char *argv[2];
-    argv[0] = "asdfprogramName";
+    argv[0] = "asdfProgram";
     argv[1] =  strCmdLine;
     int argc = 2;
-#else 
-  int main(int argc, char **argv) 
+#else
+  int main(int argc, char **argv)
   {
-#endif 
+#endif
     try {
       SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
@@ -96 +120 @@
     }
     catch (Ogre::Exception& e) {
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
       MessageBoxA(NULL, e.getFullDescription().c_str(),
             "An exception has occured!", MB_OK | MB_ICONERROR | MB_TASKMODAL);

code/branches/FICN/src/orxonox/orxonox.cc

@@ -193 +193 @@
   {
     ogre_ = new GraphicsEngine();
+    dataPath_ = "";
   }
 
@@ -217 +218 @@
     ArgReader ar = ArgReader(argc, argv);
     ar.checkArgument("mode", mode, false);
-//     ar.checkArgument("data-path", path, true);
+    ar.checkArgument("data", this->dataPath_, false);
     if(ar.errorHandling()) die();
 
@@ -354 +355 @@
     cf.load(macBundlePath() + "/Contents/Resources/resources.cfg");
 #else
-    cf.load("resources.cfg");
+    cf.load(dataPath_ + "resources.cfg");
 #endif
 
@@ -378 +379 @@
   void Orxonox::setupRenderSystem()
   {
-    if (!root_->restoreConfig() && !root_->showConfigDialog())
+    if (/*!root_->restoreConfig() &&*/ !root_->showConfigDialog())
       throw Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
   }