Changeset 731

Timestamp:

06/07/09 15:20:42 (15 months ago)

Author:

ghoulsblade

Message:

ogrewrapper : options

Location:

trunk/lugre

Files:

• include/lugre_ogrewrapper.h (modified) (2 diffs)
• lua/lib.gui.test.lua (modified) (1 diff)
• src/lugre_ogrewrapper.cpp (modified) (3 diffs)
• src/lugre_scripting.ogre.cpp (modified) (4 diffs)

trunk/lugre/include/lugre_ogrewrapper.h

@@ -68 +68 @@
         
         // stores some render stats
+        std::string msWindowTitle;
         float   mfLastFPS;
         float   mfAvgFPS;
@@ -95 +96 @@
         Ogre::SceneManager*     GetSceneManager (const char* szSceneMgrName="main");
         
+        // config
+        std::vector<std::string>        ListRenderSystems                                       ();
+        void                                            SetRenderSystemByName                           (std::string sRenderSysName);
+        std::vector<std::string>        ListConfigOptionNames                           (std::string sRenderSysName);
+        std::vector<std::string>        ListPossibleValuesForConfigOption       (std::string sRenderSysName,std::string sConfigOptionName);
+        void                                            SetConfigOption                                         (std::string sName,std::string sValue);
+        std::string                                     GetConfigOption                                         (std::string sName);
+        
         /// returns true on success
-        bool    Init                            (const char* szWindowTitle,const char* szOgrePluginDir,const char* szOgreBaseDir); 
+        bool    Init                            (const char* szWindowTitle,const char* szOgrePluginDir,const char* szOgreBaseDir,bool bAutoCreateWindow=true); 
+        bool    CreateWindow            (bool bConfigRestoreOrDialog=true); 
         void    RenderOneFrame          ();
         void    DeInit                          ();

trunk/lugre/lua/lib.gui.test.lua

@@ -14 +14 @@
 
         --~ TestChatTabs()
-        TestIrisChatLine()
-        --~ TestConfigDialog()
+        --~ TestIrisChatLine()
+        TestConfigDialog()
         --~ TestMapDialog()
         --~ UOBookTest()

trunk/lugre/src/lugre_ogrewrapper.cpp

@@ -316 +316 @@
 
 /// only call this once at startup
-bool    cOgreWrapper::Init                      (const char* szWindowTitle,const char* szOgrePluginDir,const char* szOgreBaseDir) {PROFILE
+bool    cOgreWrapper::Init                      (const char* szWindowTitle,const char* szOgrePluginDir,const char* szOgreBaseDir,bool bAutoCreateWindow) { PROFILE
+        msWindowTitle = szWindowTitle;
         static bool bInitialised = false;
         if (bInitialised) return false;
@@ -379 +380 @@
 #endif
         
+        if (!bAutoCreateWindow) return true;
+        return CreateWindow();
+}
+
+/*
+
+ConfigOption
+        String  name
+        String  currentValue
+        StringVector    possibleValues
+        bool    immutable
+
+
+void Ogre::Root::setRenderSystem        (       RenderSystem *           system          )   
+
+*/
+
+std::vector<std::string>        cOgreWrapper::ListRenderSystems                 () {
+        std::vector<std::string> res;
+        if (mRoot) {
+                Ogre::RenderSystemList* l = mRoot->getAvailableRenderers();
+                if (l) for (int i=0;i<l->size();++i) {
+                        Ogre::RenderSystem* rs = (*l)[i];
+                        if (rs) res.push_back(rs->getName());
+                }
+        }
+        return res;
+}
+
+void                                            cOgreWrapper::SetRenderSystemByName             (std::string sRenderSysName) {
+        if (mRoot) {
+                Ogre::RenderSystem* rs = mRoot->getRenderSystemByName(sRenderSysName);
+                if (rs) mRoot->setRenderSystem(rs);
+        }
+}
+
+std::vector<std::string>        cOgreWrapper::ListConfigOptionNames             (std::string sRenderSysName) {
+        std::vector<std::string> res;
+        if (mRoot) {
+                Ogre::RenderSystem* rs = (sRenderSysName == "") ? mRoot->getRenderSystem() : mRoot->getRenderSystemByName(sRenderSysName);
+                if (rs) {
+                        Ogre::ConfigOptionMap& o = rs->getConfigOptions(); // std::map< String, ConfigOption >
+                        for (Ogre::ConfigOptionMap::iterator itor=o.begin();itor!=o.end();++itor) res.push_back((*itor).first);
+                }
+        }
+        return res;
+}
+
+std::vector<std::string>        cOgreWrapper::ListPossibleValuesForConfigOption (std::string sRenderSysName,std::string sConfigOptionName) {
+        std::vector<std::string> res;
+        if (mRoot) {
+                Ogre::RenderSystem* rs = (sRenderSysName == "") ? mRoot->getRenderSystem() : mRoot->getRenderSystemByName(sRenderSysName);
+                if (rs && rs->getConfigOptions().count(sConfigOptionName) > 0) {
+                        Ogre::ConfigOption& o = rs->getConfigOptions()[sConfigOptionName]; // StringVector      possibleValues
+                        for (int i=0;i<o.possibleValues.size();++i) res.push_back(o.possibleValues[i]);
+                }
+        }
+        return res;
+}
+
+void                                            cOgreWrapper::SetConfigOption                                           (std::string sName,std::string sValue) {
+        if (mRoot) {
+                Ogre::RenderSystem* rs = mRoot->getRenderSystem();
+                if (rs) rs->setConfigOption(sName,sValue);
+        }
+}
+
+std::string                                             cOgreWrapper::GetConfigOption                                           (std::string sName) {
+        if (mRoot) {
+                Ogre::RenderSystem* rs = mRoot->getRenderSystem();
+                if (rs) return rs->getConfigOptions()[sName].currentValue;
+        }
+        return "";
+}
+
+
+
+bool    cOgreWrapper::CreateWindow              (bool bConfigRestoreOrDialog) { 
         bool bWinDebug = false;
         //bool carryOn = configure();
         //if (!carryOn) return false;
-        if (!mRoot->restoreConfig() && !mRoot->showConfigDialog()) return false;
+        if (bConfigRestoreOrDialog && !mRoot->restoreConfig() && !mRoot->showConfigDialog()) return false;
         //mRoot->getRenderSystem()->setConfigOption("RTT Preferred Mode","Copy"); // todo : set via lua ?
         if (bWinDebug) printf("windebug safepoint -2\n"); 
@@ -391 +470 @@
         //if (!mRoot->showConfigDialog()) return false;
 
-        mWindow = mRoot->initialise(true,szWindowTitle);
+        mWindow = mRoot->initialise(true,msWindowTitle.c_str());
         if (bWinDebug) printf("windebug safepoint -1\n"); 
         

trunk/lugre/src/lugre_scripting.ogre.cpp

@@ -278 +278 @@
 
 
+/// bool        OgreCreateWindow        (bConfigRestoreOrDialog)
+/// only call this once at startup
+static int l_OgreCreateWindow (lua_State *L) { PROFILE
+        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);
+                lua_pushboolean(L,res);
+                return 1;
+    } catch( Ogre::Exception& e ) {
+                printf("warning, OgreWrapper::CreateWindow failed with exception\n");
+                PrintOgreExceptionAndTipps(e);
+        }
+        return 0;
+}
+
 
 /// only call this once at startup
@@ -284 +299 @@
         std::string sOgrePluginPath     = (lua_gettop(L) >= 2 && !lua_isnil(L,2)) ? luaL_checkstring(L,2) : "/usr/local/lib/OGRE";
         std::string sOgreBaseDir        = (lua_gettop(L) >= 3 && !lua_isnil(L,3)) ? luaL_checkstring(L,3) : "./";
+        bool bAutoCreateWindow          = (lua_gettop(L) >= 4 && !lua_isnil(L,4)) ? (lua_isboolean(L,4) ? lua_toboolean(L,4) : luaL_checkint(L,4)) : true;
         
     try {
-                bool res = cOgreWrapper::GetSingleton().Init(sWindowTitle.c_str(),sOgrePluginPath.c_str(),sOgreBaseDir.c_str());
+                bool res = cOgreWrapper::GetSingleton().Init(sWindowTitle.c_str(),sOgrePluginPath.c_str(),sOgreBaseDir.c_str(),bAutoCreateWindow);
                 lua_pushboolean(L,res);
                 return 1;
@@ -295 +311 @@
         return 0;
 }
+
+int MyLuaReturnStringList (lua_State *L,std::vector<std::string> l) {
+        if (!lua_checkstack(L,l.size())) return 0;
+        for (int i=0;i<l.size();++i) lua_pushstring(L,l[i].c_str());
+        return l.size();
+}
+
+/// slist        Ogre_ListRenderSystems ()
+static int l_Ogre_ListRenderSystems (lua_State *L) { PROFILE return MyLuaReturnStringList(L,cOgreWrapper::GetSingleton().ListRenderSystems()); }
+
+/// void         Ogre_SetRenderSystemByName     (sRenderSysName)
+static int l_Ogre_SetRenderSystemByName (lua_State *L) { PROFILE
+        std::string sRenderSysName = luaL_checkstring(L,1);
+        cOgreWrapper::GetSingleton().SetRenderSystemByName(sRenderSysName);
+        return 0;
+}
+
+/// void         Ogre_SetConfigOption   (sName,sValue)
+static int l_Ogre_SetConfigOption       (lua_State *L) { PROFILE
+        std::string sName = luaL_checkstring(L,1);
+        std::string sValue = luaL_checkstring(L,2);
+        cOgreWrapper::GetSingleton().SetConfigOption(sName,sValue);
+        return 0;
+}
+/// sValue       Ogre_GetConfigOption   (sName)
+static int l_Ogre_GetConfigOption       (lua_State *L) { PROFILE
+        std::string sName = luaL_checkstring(L,1);
+        lua_pushstring(L,cOgreWrapper::GetSingleton().GetConfigOption(sName).c_str());
+        return 1;
+}
+
+/// slist        Ogre_ListConfigOptionNames     (sRenderSysName)
+static int l_Ogre_ListConfigOptionNames (lua_State *L) { PROFILE
+        std::string sRenderSysName = luaL_checkstring(L,1);
+        return MyLuaReturnStringList(L,cOgreWrapper::GetSingleton().ListConfigOptionNames(sRenderSysName));
+}
+
+/// slist        Ogre_ListPossibleValuesForConfigOption (sRenderSysName,sConfigOptionName)
+static int l_Ogre_ListPossibleValuesForConfigOption     (lua_State *L) { PROFILE
+        std::string sRenderSysName              = luaL_checkstring(L,1);
+        std::string sConfigOptionName   = luaL_checkstring(L,2);
+        return MyLuaReturnStringList(L,cOgreWrapper::GetSingleton().ListPossibleValuesForConfigOption(sRenderSysName,sConfigOptionName));
+}
+
 
 /// for lua :   ang,x,y,z         QuaternionToAngleAxis (qw,qx,qy,qz)
@@ -1635 +1695 @@
         lua_register(L,"MouseHide",                                                                     l_MouseHide);
         lua_register(L,"InitOgre",                                                                      l_InitOgre);
+        
+        lua_register(L,"Ogre_ListRenderSystems",                                        l_Ogre_ListRenderSystems);
+        lua_register(L,"Ogre_SetRenderSystemByName",                            l_Ogre_SetRenderSystemByName);
+        lua_register(L,"Ogre_SetConfigOption",                                          l_Ogre_SetConfigOption);
+        lua_register(L,"Ogre_GetConfigOption",                                          l_Ogre_GetConfigOption);
+        lua_register(L,"Ogre_ListConfigOptionNames",                            l_Ogre_ListConfigOptionNames);
+        lua_register(L,"Ogre_ListPossibleValuesForConfigOption",        l_Ogre_ListPossibleValuesForConfigOption);
+        
+        lua_register(L,"OgreCreateWindow",                                                      l_OgreCreateWindow);
         lua_register(L,"ExportOgreFont",                                                        l_ExportOgreFont);
         lua_register(L,"CloneMesh",                                                                     l_CloneMesh);