[Python-ogre-commit] SF.net SVN: python-ogre:[847] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2009-01-25 12:22:24
|
Revision: 847 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=847&view=rev Author: andy_miller Date: 2009-01-25 11:35:21 +0000 (Sun, 25 Jan 2009) Log Message: ----------- Further QuickGui updates Fixes to OgreBulletD generation due to newer C++ source Modified Paths: -------------- trunk/python-ogre/PythonOgreConfig_posix.py trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h trunk/python-ogre/code_generators/navi/generate_code.py trunk/python-ogre/code_generators/navi/python_navi_aliases.h trunk/python-ogre/code_generators/ogrebulletd/generate_code.py trunk/python-ogre/code_generators/quickgui/generate_code.py trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h trunk/python-ogre/environment.py trunk/python-ogre/scripts/UpdateDLLs.bat Modified: trunk/python-ogre/PythonOgreConfig_posix.py =================================================================== --- trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-25 11:35:21 UTC (rev 847) @@ -5,22 +5,22 @@ ## lets assume that the base development directory is one level higher BASE_DIR,ignore = os.path.split(module_dir) ## r'/home/andy/development' -FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac -MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon' -MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE' -MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"' + +SDK = False + + # the base of the /usr/... dircetory structure that we are using ROOT_DIR = os.path.join(BASE_DIR,'root') LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib') LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include') ## path to the root of your boost dir, should have 'libs', 'boost' subdirectories -PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_36') +PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_37') ## Path to your boost_pythonxxxx lib file PATH_LIB_Boost = LOCAL_LIB ## and the name of the boost python library -LIB_Boost = 'libboost_python-gcc42-mt-1_36' +LIB_Boost = 'libboost_python-gcc42-mt-1_37' # in Linux we need to code in the Relative path for the library RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\'' @@ -31,16 +31,22 @@ # and the Py++ directory as sometimes we need access to the code repository there pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml') -SDK = False + if os.sys.platform == 'darwin': # we use the pre built sdk for OSX - SDK = True + SDK = True + FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac + MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon' + MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE' + MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"' + + # # ## Parent directories of the libraries PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' ) PATH_Ogre = os.path.join(BASE_DIR,'ogre') PATH_OgreAddons = os.path.join(BASE_DIR, 'ogreaddons') -PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.1' ) -PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1') +PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.2' ) +PATH_OIS = os.path.join(BASE_DIR, 'ois') if SDK: PATH_CEGUI = os.path.join(BASE_DIR, 'ogre','Dependencies') Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp =================================================================== --- trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp 2009-01-25 11:35:21 UTC (rev 847) @@ -2,7 +2,9 @@ #include "QuickGUIText.h" namespace QuickGUI -{ +{ + Character::Character( ) {} ; + Character::Character(Ogre::UTFString::code_point cp, Ogre::FontPtr fp, Ogre::ColourValue cv) : codePoint(cp), fontPtr(fp), Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h =================================================================== --- trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h 2009-01-25 11:35:21 UTC (rev 847) @@ -56,7 +56,7 @@ /// UV coords of glyph, retreived from Font texture generated by Ogre::Font class. UVRect uvCoords; - protected: +// protected: Character(); bool mHighlighted; Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h =================================================================== --- trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h 2009-01-25 11:35:21 UTC (rev 847) @@ -31,7 +31,7 @@ public: template<typename BaseClassType> friend class Factory; - protected: +// protected: WidgetDesc(const Ogre::String& id); virtual ~WidgetDesc() {} public: @@ -494,7 +494,7 @@ */ virtual void updateTexturePosition(); - protected: +// protected: Widget(const Ogre::String& widget_name); virtual ~Widget(); Modified: trunk/python-ogre/code_generators/navi/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-25 11:35:21 UTC (rev 847) @@ -121,8 +121,8 @@ # cls.variable("StaticFunction").exclude() # - excludes = ['::NaviLibrary::Singleton<NaviLibrary::NaviMouse>::instance' - ,'::NaviLibrary::Singleton<NaviLibrary::NaviManager>::instance' + excludes = [ # '::NaviLibrary::Singleton<NaviLibrary::NaviMouse>::instance', + '::NaviLibrary::Singleton<NaviLibrary::NaviManager>::instance' ] for e in excludes: print "Excluding Var", e Modified: trunk/python-ogre/code_generators/navi/python_navi_aliases.h =================================================================== --- trunk/python-ogre/code_generators/navi/python_navi_aliases.h 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/code_generators/navi/python_navi_aliases.h 2009-01-25 11:35:21 UTC (rev 847) @@ -7,5 +7,5 @@ // typedef NaviLibrary::NaviUtilities::InlineVector<std::string> InlineVectorStrings; typedef NaviLibrary::NaviUtilities::InlineVector<NaviLibrary::NaviUtilities::MultiValue> InlineVectorArgs; typedef NaviLibrary::Singleton< NaviLibrary::NaviManager > SingletonManager; -typedef NaviLibrary::Singleton< NaviLibrary::NaviMouse > SingletonMouse; -typedef NaviLibrary::FastDelegate1< NaviLibrary::NaviData const&, void > FastDelegateNaviData; \ No newline at end of file +// typedef NaviLibrary::Singleton< NaviLibrary::NaviMouse > SingletonMouse; +// typedef NaviLibrary::FastDelegate1< NaviLibrary::NaviData const&, void > FastDelegateNaviData; \ No newline at end of file Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2009-01-25 11:35:21 UTC (rev 847) @@ -64,6 +64,20 @@ for e in excludes: print "excluding class", e global_ns.class_(e).exclude() + + ## these are not yet implemented... + excludes = ['::OgreBulletDynamics::RagDoll::rigidityEnable', + '::OgreBulletDynamics::RagDoll::ragdollEnable', + '::OgreBulletDynamics::RagDoll::isRigidityEnable', + '::OgreBulletDynamics::RagDoll::isRagdollEnabled', + '::OgreBulletDynamics::RagDoll::isConstraintEnabled', + '::OgreBulletDynamics::RagDoll::isCollisionEnabled', + '::OgreBulletDynamics::RagDoll::constraintEnable', + '::OgreBulletDynamics::RagDoll::collisionEnable' + ] + for e in excludes: + global_ns.member_functions(e).exclude() + # for c in global_ns.classes(): # #if not c.ignore: # print c Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py =================================================================== --- trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-25 11:35:21 UTC (rev 847) @@ -120,7 +120,9 @@ ,'::QuickGUI::Widget::getChildWidget' ,'::QuickGUI::Quad::_update' ,'::QuickGUI::Window::getTitleBarText' - ,'::QuickGUI::Tab::getPadding' + ,'::QuickGUI::Tab::getPadding' + ,'::QuickGUI::ComboBox::_clearSelection' ## not implemented + ,'::QuickGUI::ComboBox::addComboBoxEventHandler' ## TODO: needs to be wrapped ] for e in excludes: print "excluding function", e Modified: trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h =================================================================== --- trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h 2009-01-25 11:35:21 UTC (rev 847) @@ -6,13 +6,12 @@ typedef QuickGUI::Factory<QuickGUI::WidgetDesc> FactoryWidgetDesc; typedef QuickGUI::WidgetFactory<QuickGUI::Widget> WidgetFactoryWidget; -// typedef std::list<QuickGUI::DefinitionProperty*> ListDefinitionProperty; -// typedef std::list<QuickGUI::ListItem*> ListListItem; -// typedef std::list<QuickGUI::ScriptDefinition*> ListScriptDefinition; -// typedef std::vector<QuickGUI::TextSegment> VectorTextSegment; +typedef std::list<QuickGUI::DefinitionProperty*> ListDefinitionProperty; +typedef std::list<QuickGUI::ListItem*> ListListItem; +typedef std::list<QuickGUI::ScriptDefinition*> ListScriptDefinition; +typedef std::vector<QuickGUI::TextSegment> VectorTextSegment; - //typedef std::vector<Ogre::Image> VectorImage; //typedef std::list<QuickGUI::RenderObject*, std::allocator<QuickGUI::RenderObject*> > ListRenderObject; Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/environment.py 2009-01-25 11:35:21 UTC (rev 847) @@ -1111,15 +1111,15 @@ include_dirs = [ Config.PATH_Boost ,Config.PATH_INCLUDE_Ogre ,Config.PATH_INCLUDE_navi - ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','astral','include') + ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','include') ] lib_dirs = [boost.PATH_LIB, Config.PATH_LIB_Ogre_OgreMain ,Config.PATH_LIB_navi - ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','astral','lib') + ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','lib') ] CheckIncludes=[] - libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Astral', 'user32', + libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Awesomium', 'user32', 'kernel32.lib', 'gdi32.lib', 'winspool.lib', 'comdlg32.lib', 'advapi32.lib', 'shell32.lib','ole32.lib','oleaut32.lib','uuid.lib' ] ModuleName="navi" Modified: trunk/python-ogre/scripts/UpdateDLLs.bat =================================================================== --- trunk/python-ogre/scripts/UpdateDLLs.bat 2009-01-25 10:08:11 UTC (rev 846) +++ trunk/python-ogre/scripts/UpdateDLLs.bat 2009-01-25 11:35:21 UTC (rev 847) @@ -22,8 +22,8 @@ set physx="c:\program files\NVIDIA Corporation\NVIDIA PhysX SDK\v2.8.1\bin\win32" set theora=%root%\ogreaddons\videoplugin\TheoraVideo\bin\Release set ffmpeg=%root%\ffmpeg -set naviextra=%root%\navi\Dependencies\win32\astral\runtime\Release -set navi=%root%\navi\lib +set naviextra=%root%\navi\Dependencies\win32\awesomium\bin\release +set navi=%root%\navi\navi\lib set boost=%root%\boost_1_37_0\bin.v2\libs\python\build\msvc-9.0\release\threading-multi set boostlib=%boost%\boost_python-vc90-mt-1_37.dll set particleuniverse=%root%\ogre\lib @@ -99,6 +99,8 @@ rem navi copy /y %navi%\*.dll %package%\gui\navi +copy /y %naviextra%\*.dll %package%\gui\navi + rem plib copy /y %boostlib% %package%\addons\plib \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |