Changeset 732

Timestamp:

06/07/09 16:55:45 (9 months ago)

Author:

hagish

Message:

Renamed CreateWindow (plattform issues)

Location:

trunk/lugre

Files:

• include/lugre_ogrewrapper.h (modified) (1 diff)
• src/lugre_ogrewrapper.cpp (modified) (3 diffs)
• src/lugre_scripting.ogre.cpp (modified) (1 diff)

trunk/lugre/include/lugre_ogrewrapper.h

@@ -106 +106 @@
         /// returns true on success
         bool    Init                            (const char* szWindowTitle,const char* szOgrePluginDir,const char* szOgreBaseDir,bool bAutoCreateWindow=true); 
-        bool    CreateWindow            (bool bConfigRestoreOrDialog=true); 
+        bool    CreateOgreWindow        (bool bConfigRestoreOrDialog=true); 
         void    RenderOneFrame          ();
         void    DeInit                          ();

trunk/lugre/src/lugre_ogrewrapper.cpp

@@ -350 +350 @@
         MacSetupResources(mResourcePath);
 #else
+        printf("OGRE_BASE_DIR %s\n",sLugreOgreBaseDir.c_str());
+        printf("OGRE_PLUGIN_DIR %s\n",sLugreOgrePluginDir.c_str());
+
         mRoot = new Root(PATH_PLUGIN_CFG);
         lugre_loadOgrePlugins_linux(mRoot,PATH_PLUGIN_CFG_TEMPLATE,sLugreOgrePluginDir.c_str());
@@ -381 +384 @@
         
         if (!bAutoCreateWindow) return true;
-        return CreateWindow();
+        return CreateOgreWindow();
 }
 
@@ -457 +460 @@
 
 
-bool    cOgreWrapper::CreateWindow              (bool bConfigRestoreOrDialog) { 
+bool    cOgreWrapper::CreateOgreWindow          (bool bConfigRestoreOrDialog) { 
         bool bWinDebug = false;
         //bool carryOn = configure();

trunk/lugre/src/lugre_scripting.ogre.cpp

@@ -283 +283 @@
         bool bConfigRestoreOrDialog = (lua_gettop(L) >= 1 && !lua_isnil(L,1)) ? (lua_isboolean(L,1) ? lua_toboolean(L,1) : luaL_checkint(L,1)) : true;
     try {
-                bool res = cOgreWrapper::GetSingleton().CreateWindow(bConfigRestoreOrDialog);
+                bool res = cOgreWrapper::GetSingleton().CreateOgreWindow(bConfigRestoreOrDialog);
                 lua_pushboolean(L,res);
                 return 1;