You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(30) |
Oct
(60) |
Nov
(17) |
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(33) |
Feb
(18) |
Mar
(3) |
Apr
(5) |
May
(6) |
Jun
(34) |
Jul
(54) |
Aug
(33) |
Sep
(36) |
Oct
(33) |
Nov
(40) |
Dec
(6) |
| 2009 |
Jan
(37) |
Feb
(38) |
Mar
(31) |
Apr
(23) |
May
(24) |
Jun
(2) |
Jul
(6) |
Aug
(5) |
Sep
(1) |
Oct
(14) |
Nov
(12) |
Dec
(26) |
| 2010 |
Jan
(23) |
Feb
(17) |
Mar
(17) |
Apr
(2) |
May
(10) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
| 2011 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
|
From: <and...@us...> - 2007-11-14 05:48:11
|
Revision: 480
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=480&view=rev
Author: andy_miller
Date: 2007-11-13 21:48:13 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Added watermesh and ofusion
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/PythonOgreInstallCreator.iss
trunk/python-ogre/code_generators/cleanIncrementalbuild.bat
trunk/python-ogre/code_generators/common_utils/__init__.py
trunk/python-ogre/docs/Python-Ogre.chm
Added Paths:
-----------
trunk/python-ogre/PythonOgreInstallCreator.nsi
trunk/python-ogre/ThirdParty/ofusion/
trunk/python-ogre/ThirdParty/ofusion/IOSMSceneCallbacks.h
trunk/python-ogre/ThirdParty/ofusion/OSMAnimSerializer.h
trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.cpp
trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.h
trunk/python-ogre/ThirdParty/ofusion/tinystr.cpp
trunk/python-ogre/ThirdParty/ofusion/tinystr.h
trunk/python-ogre/ThirdParty/ofusion/tinyxml.cpp
trunk/python-ogre/ThirdParty/ofusion/tinyxml.h
trunk/python-ogre/ThirdParty/ofusion/tinyxmlerror.cpp
trunk/python-ogre/ThirdParty/ofusion/tinyxmlparser.cpp
trunk/python-ogre/ThirdParty/watermesh/
trunk/python-ogre/ThirdParty/watermesh/WaterMesh.cpp
trunk/python-ogre/ThirdParty/watermesh/WaterMesh.h
trunk/python-ogre/code_generators/bullet/generate_code_1.py
trunk/python-ogre/code_generators/ofusion/
trunk/python-ogre/code_generators/ofusion/customization_data.py
trunk/python-ogre/code_generators/ofusion/generate_code.py
trunk/python-ogre/code_generators/ofusion/hand_made_wrappers.py
trunk/python-ogre/code_generators/ofusion/python_ofusion.h
trunk/python-ogre/code_generators/ofusion/python_ofusion_aliases.h
trunk/python-ogre/code_generators/ofusion/python_ofusion_sizeof.h
trunk/python-ogre/code_generators/ogrevideoffmpeg/SConstruct
trunk/python-ogre/code_generators/watermesh/
trunk/python-ogre/code_generators/watermesh/customization_data.py
trunk/python-ogre/code_generators/watermesh/generate_code.py
trunk/python-ogre/code_generators/watermesh/hand_made_wrappers.py
trunk/python-ogre/code_generators/watermesh/python_watermesh.h
trunk/python-ogre/code_generators/watermesh/python_watermesh_aliases.h
trunk/python-ogre/code_generators/watermesh/python_watermesh_sizeof.h
trunk/python-ogre/config.ini
trunk/python-ogre/convertonew.sed
trunk/python-ogre/makehelp.bat
trunk/python-ogre/ogre_cvs.sh
trunk/python-ogre/setup.py.dist
trunk/python-ogre/test.nsi
trunk/python-ogre/test.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2007-11-14 03:30:52 UTC (rev 479)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2007-11-14 05:48:13 UTC (rev 480)
@@ -55,7 +55,7 @@
PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
-PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.62')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.64')
PATH_PhysX= "c:/program files/AGEIA Technologies/SDK/v2.7.2/SDKs"
PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
@@ -148,7 +148,7 @@
PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
,os.path.join(BASE_DIR, 'vorbis', 'include')
,os.path.join(PATH_OgreAddons,'videoplugin','theora','include')
- ,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-1.8.3','include')
+ ,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-2.1.1','include')
]
PATH_INCLUDE_PhysX= [ os.path.join(PATH_PhysX, 'Physics','include')
Modified: trunk/python-ogre/PythonOgreInstallCreator.iss
===================================================================
--- trunk/python-ogre/PythonOgreInstallCreator.iss 2007-11-14 03:30:52 UTC (rev 479)
+++ trunk/python-ogre/PythonOgreInstallCreator.iss 2007-11-14 05:48:13 UTC (rev 480)
@@ -40,7 +40,10 @@
; the python modules - in the event we find python
Source: packages_2.5\*; DestDir: {code:GetPythonSiteDir}; Flags: recursesubdirs; Check: SelectedPython('2.5')
; the python modules again - if we don't find python we install both versions in the app directory
-Source: packages_2.5\*; DestDir: {app}\packages_2.5; Flags: recursesubdirs; Check: NoPythonFound
+;Source: packages_2.5\*; DestDir: {app}\packages_2.5; Flags: recursesubdirs; Check: NoPythonFound
+
+; I'm going to install here anyway to make updates easier...
+Source: packages_2.5\*; DestDir: {app}\packages_2.5; Flags: recursesubdirs
;
; we need to remove the .pyc files when we uninstall
;
@@ -196,11 +199,11 @@
Name: {group}\Ogre Demos\Transparency; Filename: {code:GetPythonExe}; Parameters: Demo_Transparency.py; WorkingDir: {app}\Demos\Ogre
Name: {group}\Ogre Demos\WX Gui; Filename: {code:GetPythonExe}; Parameters: Demo_WX.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\GUI\CEGUI - Basic; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_Gui.py; WorkingDir: {app}\Demos\gui
-Name: {group}\GUI\CEGUI Drag and Drop; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_DragnDrop.py; WorkingDir: {app}\Demos\gui
-Name: {group}\GUI\CEGUI - Nice; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_NewGui.py; WorkingDir: {app}\Demos\gui
-Name: {group}\GUI\QuickGUI-01; Filename: {code:GetPythonExe}; Parameters: Demo_QuickGUI01.py; WorkingDir: {app}\Demos\gui
-Name: {group}\GUI\Navi; Filename: {code:GetPythonExe}; Parameters: Demo_Navi.py; WorkingDir: {app}\Demos\gui
+Name: {group}\GUI\CEGUI - Basic; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_Gui.py; WorkingDir: {app}\Demos\cegui
+Name: {group}\GUI\CEGUI Drag and Drop; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_DragnDrop.py; WorkingDir: {app}\Demos\cegui
+Name: {group}\GUI\CEGUI - Nice; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_NewGui.py; WorkingDir: {app}\Demos\cegui
+Name: {group}\GUI\QuickGUI-01; Filename: {code:GetPythonExe}; Parameters: Demo_QuickGUI01.py; WorkingDir: {app}\Demos\qgui
+Name: {group}\GUI\Navi; Filename: {code:GetPythonExe}; Parameters: Demo_Navi.py; WorkingDir: {app}\Demos\navi
Name: {group}\ODE Demos\Multiple Scenes; Filename: {code:GetPythonExe}; Parameters: Demo_Scenes.py; WorkingDir: {app}\Demos\OgreOde
Name: {group}\ODE Demos\Gran Turism; Filename: {code:GetPythonExe}; Parameters: GranTurismOgre.py; WorkingDir: {app}\Demos\OgreOde
@@ -228,9 +231,10 @@
Name: {group}\Plib Demos\Networking - Server; Filename: {code:GetPythonExe}; Parameters: Demo_Server.py; WorkingDir: {app}\Demos\plib
Name: {group}\Plib Demos\Networking - Client; Filename: {code:GetPythonExe}; Parameters: Demo_Client.py; WorkingDir: {app}\Demos\plib
-Name: {group}\Plib Demos\Sound; Filename: {code:GetPythonExe}; Parameters: Demo_Sound.py; WorkingDir: {app}\Demos\plib
+;Name: {group}\Plib Demos\Sound; Filename: {code:GetPythonExe}; Parameters: Demo_Sound.py; WorkingDir: {app}\Demos\plib
-Name: {group}\OgreForests Demos\ogreoforests; Filename: {code:GetPythonExe}; Parameters: Demo_Forests.py; WorkingDir: {app}\Demos\ogreforests
+Name: {group}\OgreForests Demos\ogreforests; Filename: {code:GetPythonExe}; Parameters: Demo_Forest.py; WorkingDir: {app}\Demos\ogreforests
+Name: {group}\Editable Terrain Demo\Editable Terrain; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_ET.py; WorkingDir: {app}\Demos\et
Name: {group}\Uninstall Python-Ogre; Filename: {uninstallexe}
Name: {group}\Python-Ogre API Documenatation; Filename: {app}\docs\Python-Ogre.chm
@@ -449,7 +453,8 @@
DisplayedPythonWarning := False;
PythonVersion := '';
- SupportedVersions := ['2.4', '2.5'];
+ SupportedVersions := [ '2.5'];
+
Debug := False;
NumPythonVersions := GetInstalledPythonVersions();
Added: trunk/python-ogre/PythonOgreInstallCreator.nsi
===================================================================
--- trunk/python-ogre/PythonOgreInstallCreator.nsi (rev 0)
+++ trunk/python-ogre/PythonOgreInstallCreator.nsi 2007-11-14 05:48:13 UTC (rev 480)
@@ -0,0 +1,323 @@
+; Script generated by the ISS2NSI program.
+; Generated from: C:\Development\pywork\PythonOgreInstallCreator.iss
+
+!cd "C:\Development\PythonOgreRelease\"
+
+; MUI 1.66 compatible
+!include "MUI.nsh"
+
+!define MUI_ABORTWARNING
+!define MUI_SPECIALBITMAP "compiler:WizModernImage-IS.bmp"
+!insertmacro MUI_PAGE_WELCOME
+!define MUI_LICENSEPAGE_RADIOBUTTONS
+!insertmacro MUI_PAGE_LICENSE "LICENSE.GPL"
+!define MUI_PAGE_HEADER_TEXT "Information"
+!define MUI_PAGE_HEADER_SUBTEXT "Please read the following important information before continuing."
+!define MUI_LICENSEPAGE_TEXT_TOP "When you are ready to continue with Setup, click Next."
+!define MUI_LICENSEPAGE_TEXT "' ' '&Next'"
+!insertmacro MUI_PAGE_LICENSE "InstallWarning.rtf"
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Python-Ogre"
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\%sPython-Ogre"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "NSIS:StartMenuDir"
+!insertmacro MUI_PAGE_STARTMENU
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!define MUI_PAGE_HEADER_TEXT "Information"
+!define MUI_PAGE_HEADER_SUBTEXT "Please read the following important information before continuing."
+!define MUI_LICENSEPAGE_TEXT_TOP "When you are ready to continue with Setup, click Next."
+!define MUI_LICENSEPAGE_TEXT "' ' '&Next'"
+!insertmacro MUI_PAGE_LICENSE "postinstall.rtf"
+!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_LANGUAGE "English"
+
+Name "Python-Ogre 1.0.2.3"
+BrandingText "LPGL"
+OutFile "C:\temp\PythonOgreInstaller.exe"
+InstallDir "C:\PythonOgre"
+ShowInstDetails show
+ShowUnInstDetails show
+
+Function .onInit
+ MessageBox MB_YESNO|MB_ICONQUESTION "This will install $(^Name). Do you wish to continue?" IDYES +2
+ Abort
+FunctionEnd
+
+Section -InstallDelete
+ Delete "{code:GetPythonSiteDir}\Ogre\*.pyd"
+ Delete "{code:GetPythonSiteDir}\OIS\*.pyd"
+ Delete "{code:GetPythonSiteDir}\GUI\*.pyd"
+ Delete "{code:GetPythonSiteDir}\OgreOde\*.pyd"
+ Delete "{code:GetPythonSiteDir}\OgreNewt\*.pyd"
+ Delete "{code:GetPythonSiteDir}\OgreAL\*.pyd"
+ Delete "{code:GetPythonSiteDir}\OgreRefApp\*.pyd"
+ Delete "{code:GetPythonSiteDir}\ODE\*.pyd"
+ Delete "{code:GetPythonSiteDir}\FMOD\*.pyd"
+ Delete "{code:GetPythonSiteDir}\Ogre\*.dll"
+ Delete "{code:GetPythonSiteDir}\OIS\*.dll"
+ Delete "{code:GetPythonSiteDir}\GUI\*.dll"
+ Delete "{code:GetPythonSiteDir}\OgreOde\*.dll"
+ Delete "{code:GetPythonSiteDir}\OgreNewt\*.dll"
+ Delete "{code:GetPythonSiteDir}\OgreAL\*.dll"
+ Delete "{code:GetPythonSiteDir}\OgreRefApp\*.dll"
+ Delete "{code:GetPythonSiteDir}\ODE\*.dll"
+ Delete "{code:GetPythonSiteDir}\FMOD\*.dll"
+ Delete "{code:GetPythonSiteDir}\Ogre\_*.p*"
+ Delete "{code:GetPythonSiteDir}\OIS\_*.p*"
+ Delete "{code:GetPythonSiteDir}\GUI\_*.p*"
+ Delete "{code:GetPythonSiteDir}\OgreOde\_*.p*"
+ Delete "{code:GetPythonSiteDir}\OgreNewt\_*.p*"
+ Delete "{code:GetPythonSiteDir}\OgreAL\_*.p*"
+ Delete "{code:GetPythonSiteDir}\OgreRefApp\_*.p*"
+ Delete "{code:GetPythonSiteDir}\ODE\_*.p*"
+ Delete "{code:GetPythonSiteDir}\FMOD\_*.p*"
+ Delete "{code:GetPythonSiteDir}\Ogre\sf_*.*"
+ Delete "{code:GetPythonSiteDir}\Ogre"
+ Delete "{code:GetPythonSiteDir}\OIS"
+ Delete "{code:GetPythonSiteDir}\GUI"
+ Delete "{code:GetPythonSiteDir}\OgreOde"
+ Delete "{code:GetPythonSiteDir}\OgreNewt"
+ Delete "{code:GetPythonSiteDir}\OgreAL"
+ Delete "{code:GetPythonSiteDir}\OgreRefApp"
+ Delete "{code:GetPythonSiteDir}\ODE"
+ Delete "{code:GetPythonSiteDir}\FMOD"
+ RMDir "{code:GetPythonSiteDir}\Ogre"
+ RMDir "{code:GetPythonSiteDir}\OIS"
+ RMDir "{code:GetPythonSiteDir}\GUI"
+ RMDir "{code:GetPythonSiteDir}\OgreOde"
+ RMDir "{code:GetPythonSiteDir}\OgreNewt"
+ RMDir "{code:GetPythonSiteDir}\OgreAL"
+ RMDir "{code:GetPythonSiteDir}\OgreRefApp"
+ RMDir "{code:GetPythonSiteDir}\ODE"
+SectionEnd
+
+Section -Files
+ SetOutPath "$INSTDIR"
+ File "*"
+ SetOutPath "$INSTDIR\plugins"
+ File "plugins\*"
+ SetOutPath "$INSTDIR\tools"
+ File "tools\*"
+ SetOutPath "$INSTDIR\demos"
+ File "demos\*"
+ SetOutPath "$INSTDIR\docs"
+ File "docs\*"
+ SetOutPath "{code:GetPythonSiteDir}"
+ File "packages_2.5\*"
+ File "packages_2.4\*"
+ SetOutPath "$INSTDIR\packages_2.5"
+ File "packages_2.5\*"
+ SetOutPath "$INSTDIR\packages_2.4"
+ File "packages_2.4\*"
+ SetOutPath "$INSTDIR\ThirdParty"
+ File "ThirdParty\dxwebsetup.exe"
+ File "ThirdParty\vcredist_x86.exe"
+SectionEnd
+
+Section -Icons
+!insertmacro MUI_STARTMENU_WRITE_BEGIN
+ CreateDirectory "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos"
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Bezier.lnk" "{code:GetPythonExe}" "Demo_Bezier.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\BSP.lnk" "{code:GetPythonExe}" "Demo_BSP.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\BSP_Collision.lnk" "{code:GetPythonExe}" "Demo_BspCollision.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Camera Tracking.lnk" "{code:GetPythonExe}" "Demo_CameraTracking.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\CEL Shading.lnk" "{code:GetPythonExe}" "Demo_CelShading.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Compositor.lnk" "{code:GetPythonExe}" "Demo_Compositor.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\ENV Map.lnk" "{code:GetPythonExe}" "Demo_EnvMap.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Facial.lnk" "{code:GetPythonExe}" "Demo_Facial.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Fish.lnk" "{code:GetPythonExe}" "Demo_OneFish.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Fresnel.lnk" "{code:GetPythonExe}" "Demo_Fresnel.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Grass.lnk" "{code:GetPythonExe}" "Demo_Grass.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Lighting.lnk" "{code:GetPythonExe}" "Demo_Lighting.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Particles.lnk" "{code:GetPythonExe}" "Demo_ParticleFX.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Render to Texture.lnk" "{code:GetPythonExe}" "Demo_RenderToTexture.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Shadows.lnk" "{code:GetPythonExe}" "Demo_Shadows_Org.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Animation 1.lnk" "{code:GetPythonExe}" "Demo_SkeletalAnimation.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Animation 2.lnk" "{code:GetPythonExe}" "Demo_SkeletonAnimation.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Sky Box.lnk" "{code:GetPythonExe}" "Demo_SkyBox.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Sky Dome.lnk" "{code:GetPythonExe}" "Demo_SkyDome.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Sky Plane.lnk" "{code:GetPythonExe}" "Demo_SkyPlane.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Smoke.lnk" "{code:GetPythonExe}" "Demo_Smoke.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Terrain.lnk" "{code:GetPythonExe}" "Demo_Terrain.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Textures.lnk" "{code:GetPythonExe}" "Demo_TextureFX.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Transparency.lnk" "{code:GetPythonExe}" "Demo_Transparency.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\WX Gui.lnk" "{code:GetPythonExe}" "Demo_WX.py" "" "" "" "" ""
+ CreateDirectory "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI"
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI\CEGUI - Basic.lnk" "{code:GetPythonExe}" "Demo_CEGUI_Gui.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI\CEGUI Drag and Drop.lnk" "{code:GetPythonExe}" "Demo_CEGUI_DragnDrop.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI\CEGUI - Nice.lnk" "{code:GetPythonExe}" "Demo_CEGUI_NewGui.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI\QuickGUI-01.lnk" "{code:GetPythonExe}" "Demo_QuickGUI01.py" "" "" "" "" ""
+ CreateDirectory "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\ODE Demos"
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\ODE Demos\Multiple Scenes.lnk" "{code:GetPythonExe}" "Demo_Scenes.py" "" "" "" "" ""
+ CreateDirectory "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreAL Demos"
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreAL Demos\Basic Sound.lnk" "{code:GetPythonExe}" "Demo_RenderToTexture.py" "" "" "" "" ""
+ CreateDirectory "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos"
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Basics.lnk" "{code:GetPythonExe}" "Demo01_TheBasics.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Joints.lnk" "{code:GetPythonExe}" "Demo02_Joints.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Collision Callbacks.lnk" "{code:GetPythonExe}" "Demo03_CollisionCallbacks.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Ray Casting.lnk" "{code:GetPythonExe}" "Demo04_RayCasting.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Simple Vehicle.lnk" "{code:GetPythonExe}" "Demo05_SimpleVehicle.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Simple Buoyancy.lnk" "{code:GetPythonExe}" "Demo06_SimpleBuoyancy.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Custom Joints.lnk" "{code:GetPythonExe}" "Demo07_CustomJoints.py" "" "" "" "" ""
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Ragdoll.lnk" "{code:GetPythonExe}" "Demo08_ragdoll.py" "" "" "" "" ""
+ CreateDirectory "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}"
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Uninstall Python-Ogre.lnk" "$INSTDIR\uninstall.exe"
+ CreateShortCut "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Python-Ogre API Documenatation.lnk" "$INSTDIR\docs\Python-Ogre.chm"
+!insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd
+
+Section -PostInstall
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Python-Ogre" "DisplayName" "PythonOgre"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Python-Ogre" "UninstallString" "$INSTDIR\uninstall.exe"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Python-Ogre" "Publisher" "OpenSource"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Python-Ogre" "URLInfoAbout" "http://www.python-ogre.org"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Python-Ogre" "HelpLink" "http://www.python-ogre.org"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Python-Ogre" "URLUpdateInfo" "http://www.python-ogre.org"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Python-Ogre" "DisplayVersion" "1.0.2.3"
+ WriteUninstaller "$INSTDIR\uninstall.exe"
+SectionEnd
+
+Section -Run
+ ExecWait "$INSTDIR\ThirdParty\vcredist_x86.exe"
+ DetailPrint "You probably NEED to update your Directx Drivers"
+ ExecWait "$INSTDIR\ThirdParty\dxwebsetup.exe"
+SectionEnd
+
+
+#### Uninstaller code ####
+
+Function un.onInit
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+ Abort
+FunctionEnd
+
+Function un.onUninstSuccess
+ HideWindow
+ MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+FunctionEnd
+
+Section Uninstall
+ ReadRegStr ${MUI_STARTMENUPAGE_VARIABLE} ${MUI_STARTMENUPAGE_REGISTRY_ROOT} "${MUI_STARTMENUPAGE_REGISTRY_KEY}" "${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
+
+ RMDir /r "{code:GetPythonSiteDir}\ogre\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\renderer\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\renderer\OGRE\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\io\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\io\OIS\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\gui\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\gui\CEGUI\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\gui\QuickGUI\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\sound\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\sound\OgreAL\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\physics\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\physics\OgreRefApp\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\physics\ODE\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\physics\OgreOde\*.pyc"
+ RMDir /r "{code:GetPythonSiteDir}\ogre\physics\OgreNewt\*.pyc"
+ Delete "$INSTDIR\demos\CEGUI\*.pyc"
+ Delete "$INSTDIR\demos\CEGUI\*.log"
+ Delete "$INSTDIR\demos\GUI\*.pyc"
+ Delete "$INSTDIR\demos\GUI\*.log"
+ Delete "$INSTDIR\demos\ogre\*.pyc"
+ Delete "$INSTDIR\demos\ogre\*.log"
+ Delete "$INSTDIR\demos\ogreode\*.pyc"
+ Delete "$INSTDIR\demos\ogreode\*.log"
+ Delete "$INSTDIR\demos\ogrenewt\*.pyc"
+ Delete "$INSTDIR\demos\ogrenewt\*.log"
+ Delete "$INSTDIR\demos\ogreal\*.pyc"
+ Delete "$INSTDIR\demos\ogreal\*.log"
+ Delete "$INSTDIR\demos\ode\*.pyc"
+ Delete "$INSTDIR\demos\ode\*.log"
+ Delete "$INSTDIR\demos\CEGUI\*.cfg"
+ Delete "$INSTDIR\demos\GUI\*.cfg"
+ Delete "$INSTDIR\demos\ogre\*.cfg"
+ Delete "$INSTDIR\demos\ogreode\*.cfg"
+ Delete "$INSTDIR\demos\ogrenewt\*.cfg"
+ Delete "$INSTDIR\demos\ogreal\*.cfg"
+ Delete "$INSTDIR\demos\ode\*.cfg"
+ RMDir "$INSTDIR\demos\CEGUI"
+ RMDir "$INSTDIR\demos\GUI"
+ RMDir "$INSTDIR\demos\ogre"
+ RMDir "$INSTDIR\demos\ogreode"
+ RMDir "$INSTDIR\demos\ogrenewt"
+ RMDir "$INSTDIR\demos\ogreal"
+ RMDir "$INSTDIR\demos\ode"
+ RMDir "$INSTDIR\demos"
+ RMDir "$INSTDIR"
+
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Python-Ogre"
+ DeleteRegValue ${MUI_STARTMENUPAGE_REGISTRY_ROOT} "${MUI_STARTMENUPAGE_REGISTRY_KEY}" "${MUI_STARTMENUPAGE_REGISTRY_VALUENAME}"
+
+ Delete "$INSTDIR\uninstall.exe"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Python-Ogre API Documenatation.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Uninstall Python-Ogre.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Ragdoll.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Custom Joints.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Simple Buoyancy.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Simple Vehicle.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Ray Casting.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Collision Callbacks.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Joints.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos\Basics.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreAL Demos\Basic Sound.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\ODE Demos\Multiple Scenes.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI\QuickGUI-01.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI\CEGUI - Nice.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI\CEGUI Drag and Drop.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI\CEGUI - Basic.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\WX Gui.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Transparency.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Textures.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Terrain.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Smoke.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Sky Plane.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Sky Dome.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Sky Box.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Animation 2.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Animation 1.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Shadows.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Render to Texture.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Particles.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Lighting.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Grass.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Fresnel.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Fish.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Facial.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\ENV Map.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Compositor.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\CEL Shading.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Camera Tracking.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\BSP_Collision.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\BSP.lnk"
+ Delete "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos\Bezier.lnk"
+ Delete "$INSTDIR\ThirdParty\vcredist_x86.exe"
+ Delete "$INSTDIR\ThirdParty\dxwebsetup.exe"
+ Delete "$INSTDIR\packages_2.4\*"
+ Delete "$INSTDIR\packages_2.5\*"
+ Delete "{code:GetPythonSiteDir}\*"
+ Delete "$INSTDIR\docs\*"
+ Delete "$INSTDIR\demos\*"
+ Delete "$INSTDIR\tools\*"
+ Delete "$INSTDIR\plugins\*"
+ Delete "$INSTDIR\*"
+
+ RMDir "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}"
+ RMDir "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreNewt Demos"
+ RMDir "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\OgreAL Demos"
+ RMDir "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\ODE Demos"
+ RMDir "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\GUI"
+ RMDir "$SMPROGRAMS\${MUI_STARTMENUPAGE_VARIABLE}\Ogre Demos"
+ RMDir "$INSTDIR\ThirdParty"
+ RMDir "$INSTDIR\packages_2.4"
+ RMDir "$INSTDIR\packages_2.5"
+ RMDir "{code:GetPythonSiteDir}"
+ RMDir "$INSTDIR\docs"
+ RMDir "$INSTDIR\demos"
+ RMDir "$INSTDIR\tools"
+ RMDir "$INSTDIR\plugins"
+ RMDir "$INSTDIR"
+
+ SetAutoClose true
+SectionEnd
+
Added: trunk/python-ogre/ThirdParty/ofusion/IOSMSceneCallbacks.h
===================================================================
--- trunk/python-ogre/ThirdParty/ofusion/IOSMSceneCallbacks.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ofusion/IOSMSceneCallbacks.h 2007-11-14 05:48:13 UTC (rev 480)
@@ -0,0 +1,63 @@
+/**********************************************************************
+ *<
+ oFusion Scene Loader CE (see License.txt)
+
+ FILE: ogreAnimationCompiler.h
+
+ DESCRIPTION: OE_XMLScene callbacks interface
+
+ IMPLEMENTED BY: Andres Carrera
+
+ HISTORY:
+
+ Original implementation by Lasse Tassing (Channex)
+ 2005 ITE ApS, Lasse Tassing
+
+ *> Copyright (c) 2006, All Rights Reserved.
+ **********************************************************************/
+
+
+#ifndef __XML_SCENE_CALLBACKS__
+#define __XML_SCENE_CALLBACKS__
+
+typedef std::deque<Ogre::SceneNode*> NodeList;
+
+// Callback interface. Use this if you want to set special properties on the
+// objects during creation (and/or read custom attribute values).
+class OSMSceneCallbacks
+{
+public:
+ virtual ~OSMSceneCallbacks() {};
+
+ // Called when a node has been created
+ virtual void OnNodeCreate(Ogre::SceneNode *pNode, TiXmlElement* pNodeDesc) {};
+
+ // Called when an entity has been created
+ virtual void OnEntityCreate(Ogre::Entity *pEntity, TiXmlElement* pEntityDesc) {};
+
+ // Called when a camera has been created
+ virtual void OnCameraCreate(Ogre::Camera *pCamera, TiXmlElement* pCameraDesc) {};
+
+ // Called when a light has been created
+ virtual void OnLightCreate(Ogre::Light *pLight, TiXmlElement* pLightDesc) {};
+
+ // Called when a helper has been created
+ virtual void OnHelperCreated(Ogre::SceneNode* pHelper, TiXmlElement* pHelperDesc) {};
+
+ // Called when a shape has been loaded
+ virtual void OnShapeLoaded(const Ogre::SimpleSpline& spline) {
+ // The client should copy and store the "spline" contents in order to use it
+ // Dont store a pointer to it, the "spline" object is destroyed at function return
+ };
+
+ // Called when a static geometry has been created
+ virtual bool OnStaticGeometryCreated(Ogre::StaticGeometry* pStatic, const NodeList& nodeList)
+ {
+ // Return true to keep the added nodes (will be hidden)
+ // Return false to delete the added nodes from the scene manager
+
+ return false;
+ }
+};
+
+#endif
\ No newline at end of file
Added: trunk/python-ogre/ThirdParty/ofusion/OSMAnimSerializer.h
===================================================================
--- trunk/python-ogre/ThirdParty/ofusion/OSMAnimSerializer.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ofusion/OSMAnimSerializer.h 2007-11-14 05:48:13 UTC (rev 480)
@@ -0,0 +1,31 @@
+/**********************************************************************
+ *<
+ oFusion Scene Loader CE (see License.txt)
+
+ FILE: OSMAnimSerializer.h
+
+ DESCRIPTION: External Animation serializer include header
+
+ IMPLEMENTED BY: Andres Carrera
+
+ HISTORY:
+
+ Original implementation by Lasse Tassing (Channex)
+ 2005 ITE ApS, Lasse Tassing
+
+ *> Copyright (c) 2006, All Rights Reserved.
+ **********************************************************************/
+
+#ifndef _OSMANIMSERIALIZER_H_
+#define _OSMANIMSERIALIZER_H_
+
+class OSMAnimSerializer {
+public:
+
+ OSMAnimSerializer();
+
+ void addAnimation(Ogre::SkeletonPtr skel, const Ogre::String& filename);
+
+};
+
+#endif // _OSMANIMSERIALIZER_H_
\ No newline at end of file
Added: trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.cpp 2007-11-14 05:48:13 UTC (rev 480)
@@ -0,0 +1,956 @@
+/**********************************************************************
+ *<
+ oFusion Scene Loader CE (see License.txt)
+
+ FILE: OgreOSMScene.cpp
+
+ DESCRIPTION: Contains the OE_XMLScene reader (oe_scene)
+
+ IMPLEMENTED BY: Andres Carrera
+
+ HISTORY:
+
+ Original implementation by Lasse Tassing (Channex)
+ 2005 ITE ApS, Lasse Tassing
+
+ *> Copyright (c) 2006, All Rights Reserved.
+ **********************************************************************/
+
+#include "OgreOSMScene.h"
+
+using namespace Ogre;
+
+enum {
+ SCENE_SKYPLANE = 1,
+ SCENE_SKYBOX,
+ SCENE_SKYDOME,
+};
+
+#define ENABLE_LOGMANAGER LogManager::getSingleton().setLogDetail(LL_NORMAL);
+#define DISABLE_LOGMANAGER LogManager::getSingleton().setLogDetail(static_cast<LoggingLevel>(0));
+
+
+OSMScene::OSMScene(SceneManager* pSceneMgr, RenderWindow* win)
+{
+ mSceneMgr = pSceneMgr;
+
+ if(win)
+ mWindow = win;
+ else
+ mWindow = Ogre::Root::getSingleton().getAutoCreatedWindow();
+
+ mCallbacks = 0;
+}
+
+OSMScene::~OSMScene(void)
+{
+
+}
+
+// Init overloads - use either of them
+bool OSMScene::initialise(const char* pszXMLFile, OSMSceneCallbacks* pCallbacks)
+{
+ // Hook up callback interface
+ mCallbacks = pCallbacks;
+
+ LogManager::getSingleton().logMessage("********************************");
+ LogManager::getSingleton().logMessage("** oScene Loader Lib **");
+ LogManager::getSingleton().logMessage("********************************");
+
+ String msg("oSceneLoader: Loading '");
+ msg += pszXMLFile;
+ msg += "' file";
+ LogManager::getSingleton().logMessage(msg);
+
+ // Create new XML document
+ mXMLDoc = TiXmlDocumentPtr(new TiXmlDocument());
+
+ DataStreamPtr pStream = ResourceGroupManager::getSingleton().openResource(pszXMLFile);
+ if(!pStream->size())
+ {
+ mXMLDoc.setNull();
+
+ OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND,
+ "oSceneLoader: Empty scene file",
+ "OSMScene::initialise");
+
+ }
+
+ size_t iSize = pStream->size();
+ char *pBuf = new char[iSize+1];
+ memset(pBuf, 0, iSize+1);
+ pStream->read(pBuf, iSize);
+ pStream.setNull();
+ mXMLDoc->Parse(pBuf);
+ delete[] pBuf;
+
+ // check for errors
+ if(mXMLDoc->Error())
+ {
+ mXMLDoc.setNull();
+
+ String errDesc = "oSceneLoader: Failed to load scene file, ";
+ msg += mXMLDoc->ErrorDesc();
+
+ OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS,
+ errDesc.c_str(),
+ "OSMScene::initialise");
+ }
+
+
+ TiXmlElement* locations = mXMLDoc->RootElement()->FirstChildElement("locations");
+
+ if(locations)
+ {
+
+ FileInfoListPtr fileInfo = ResourceGroupManager::getSingleton().findResourceFileInfo(ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, pszXMLFile);
+
+ String strPath = (*fileInfo)[0].archive->getName();
+
+ strPath = StringUtil::standardisePath(strPath);
+
+ for (TiXmlElement* pLocationElem = locations->FirstChildElement();
+ pLocationElem != 0; pLocationElem = pLocationElem->NextSiblingElement())
+ {
+ // Ogre could cast an exception, in which case we just try to
+ // continue reading the other location paths
+ try
+ {
+ const char *pszName = pLocationElem->Attribute("path");
+ String strDir = strPath + pszName;
+
+ ResourceGroupManager::getSingleton().addResourceLocation(strDir, "FileSystem");
+
+
+ }
+ catch(...) {
+ }
+ }
+ }
+
+
+
+ return true;
+}
+
+// Declare all resources used in the scene
+void OSMScene::declareResources(void)
+{
+ if(!mXMLDoc.isNull())
+ {
+
+ TiXmlElement* rootElem = mXMLDoc->RootElement();
+
+ try
+ {
+ // Get mesh filename from entities
+ TiXmlElement *pMeshNode = rootElem->FirstChildElement("entities");
+ if(pMeshNode)
+ {
+ // Iterate all meshes, creating them.
+ for (TiXmlElement* pMeshElem = pMeshNode->FirstChildElement();
+ pMeshElem != 0; pMeshElem = pMeshElem->NextSiblingElement())
+ {
+ // Declare mesh resource
+ const char *pszFileName = pMeshElem->Attribute("filename");
+ ResourceGroupManager::getSingleton().declareResource(pszFileName, "Mesh");
+ }
+ }
+ } catch(...)
+ {
+ }
+
+ }
+}
+
+// Create scene, optionally attaching it to a parent node
+bool OSMScene::createScene(Ogre::SceneNode* pParent)
+{
+ if(!mXMLDoc.isNull())
+ {
+ String msg("oSceneLoader: Creating scene on '");
+ msg += pParent ? pParent->getName() : "Root";
+ msg += "' node";
+ LogManager::getSingleton().logMessage(msg);
+
+ BOOL bHandled = FALSE;
+
+ TiXmlElement* rootElem = mXMLDoc->RootElement();
+
+ if(mSceneMgr == NULL)
+ {
+ if(rootElem->FirstChildElement("sceneManager"))
+ pParent = createSceneManager(rootElem, bHandled);
+ else
+ mSceneMgr = Root::getSingleton().createSceneManager(ST_GENERIC);
+ }
+
+ if(pParent==NULL)
+ pParent=mSceneMgr->getRootSceneNode()->createChildSceneNode();
+
+ assert(pParent);
+
+ TiXmlElement* list;
+
+ try {
+ // Entities
+ list = rootElem->FirstChildElement("entities");
+ if(list)
+ createEntities(list, pParent);
+ } catch(...)
+ {
+ LogManager::getSingleton().logMessage("Error while loading entities");
+
+ OGRE_EXCEPT(Exception::ERR_RT_ASSERTION_FAILED,
+ "oSceneLoader: Error while loading entities",
+ "OSMScene::createScene");
+ }
+
+ try {
+ // lights
+ list = rootElem->FirstChildElement("lights");
+ if(list)
+ createLights(list, pParent);
+ } catch(...)
+ {
+ LogManager::getSingleton().logMessage("Error while loading lights");
+
+ OGRE_EXCEPT(Exception::ERR_RT_ASSERTION_FAILED,
+ "oSceneLoader: Error while loading lights",
+ "OSMScene::createScene");
+ }
+
+ if(!bHandled) {
+ try {
+ // cameras
+ list = rootElem->FirstChildElement("cameras");
+ if(list)
+ createCameras(list, pParent);
+ } catch(...)
+ {
+ LogManager::getSingleton().logMessage("Error while loading cameras");
+
+ OGRE_EXCEPT(Exception::ERR_RT_ASSERTION_FAILED,
+ "oSceneLoader: Error while loading cameras",
+ "OSMScene::createScene");
+ }
+ }
+
+ /*
+ try {
+ // helpers
+ list = rootElem->FirstChildElement("helpers");
+ if(list)
+ createHelpers(list, pParent);
+ } catch(...)
+ {
+ LogManager::getSingleton().logMessage("Error while loading helpers");
+
+ OGRE_EXCEPT(Exception::ERR_RT_ASSERTION_FAILED,
+ "oSceneLoader: Error while loading helpers",
+ "OSMScene::createScene");
+ }
+
+ try {
+ // shapes
+ list = rootElem->FirstChildElement("shapes");
+ if(list)
+ createShapes(list);
+ } catch(...)
+ {
+ LogManager::getSingleton().logMessage("Error while loading shapes");
+
+ OGRE_EXCEPT(Exception::ERR_RT_ASSERTION_FAILED,
+ "oSceneLoader: Error while loading shapes",
+ "OSMScene::createScene");
+ }
+
+ try {
+ // External skeletal animation files
+ list = rootElem->FirstChildElement("skeletal_animations");
+ if(list)
+ {
+ SkeletonHandles skelHandles;
+ loadAnimations(list, skelHandles);
+ }
+ }catch(...)
+ {
+ LogManager::getSingleton().logMessage("Error while loading external animations");
+
+ OGRE_EXCEPT(Exception::ERR_RT_ASSERTION_FAILED,
+ "oSceneLoader: Error while loading external animations",
+ "OSMScene::createScene");
+ }
+ */
+
+ // Set scene properties
+ setSceneProperties(rootElem);
+
+ // Static Geometry
+ list = rootElem->FirstChildElement("staticGeometry");
+ if(list)
+ createStaticGeometry(list);
+
+ LogManager::getSingleton().logMessage("********************************");
+ LogManager::getSingleton().logMessage("** oSceneLoader: Scene loaded **");
+ LogManager::getSingleton().logMessage("********************************");
+
+ return true;
+ }
+
+ return false;
+
+
+}
+
+// Get list of cameras in this scene
+OSMScene::CameraList& OSMScene::getCameraList(void)
+{
+ return mCameras;
+}
+
+// Get list of lights in this scene
+OSMScene::LightList& OSMScene::getLightList(void)
+{
+ return mLights;
+}
+
+// Get list of lights in this scene
+OSMScene::EntityList& OSMScene::getEntityList(void)
+{
+ return mEntities;
+}
+
+Ogre::SceneNode* OSMScene::createNode(TiXmlElement* pElem, Ogre::SceneNode* pSceneRoot)
+{
+ SceneNode *pNode=0;
+
+ // Try to find the parent node
+ const char *pszName = pElem->Attribute("name");
+ if(pszName == NULL) return NULL;
+
+ // Check if this node has a parent
+ const char *pszParent = pElem->Attribute("parent");
+ if(pszParent == NULL)
+ {
+ // Check if the scene node has already been created by a child
+ DISABLE_LOGMANAGER
+
+ try
+ {
+ pNode = mSceneMgr->getSceneNode(pszName);
+ } catch(...)
+ {
+ pNode = pSceneRoot->createChildSceneNode(pszName);
+ }
+
+ ENABLE_LOGMANAGER
+
+ } else
+ {
+ SceneNode *pParent=0;
+ DISABLE_LOGMANAGER
+
+ try
+ {
+ // Try to find parent scenenode
+ pParent=mSceneMgr->getSceneNode(pszParent);
+ } catch(...)
+ {
+ // We try to create the parent node as child of root node.
+ // Later when the parent (hopefully) is created, we can adjust it,
+ // if it is child of another node.
+ pParent=pSceneRoot->createChildSceneNode(pszParent);
+ }
+
+
+ try
+ {
+ // Check if the scene node has already been created by a child
+ // In this case we would have to change the parent.
+ pNode = mSceneMgr->getSceneNode(pszName);
+
+ // Get old parent (probably scene root)
+ SceneNode *pOldParent=pNode->getParentSceneNode();
+
+ // Remove this node
+ pOldParent->removeChild(pNode);
+
+ // Insert us as child on the "real" parent
+ pParent->addChild(pNode);
+ } catch(...)
+ {
+ pNode = pParent->createChildSceneNode(pszName);
+ }
+
+ ENABLE_LOGMANAGER
+ }
+
+ // Position
+ TiXmlElement* posElem = pElem->FirstChildElement("position");
+ if(posElem)
+ {
+ Vector3 pos;
+ pos.x = StringConverter::parseReal(posElem->Attribute("x"));
+ pos.y = StringConverter::parseReal(posElem->Attribute("y"));
+ pos.z = StringConverter::parseReal(posElem->Attribute("z"));
+ pNode->setPosition(pos);
+ }
+
+ // Rotation
+ TiXmlElement* rotElem = pElem->FirstChildElement("rotation");
+ if(rotElem)
+ {
+ pNode->setOrientation(
+ StringConverter::parseReal(rotElem->Attribute("w")),
+ StringConverter::parseReal(rotElem->Attribute("x")),
+ StringConverter::parseReal(rotElem->Attribute("y")),
+ StringConverter::parseReal(rotElem->Attribute("z")));
+
+ }
+
+ // Scale
+ TiXmlElement* scaleElem = pElem->FirstChildElement("scale");
+ if(scaleElem)
+ {
+ Vector3 scale;
+ scale.x = StringConverter::parseReal(scaleElem->Attribute("x"));
+ scale.y = StringConverter::parseReal(scaleElem->Attribute("y"));
+ scale.z = StringConverter::parseReal(scaleElem->Attribute("z"));
+ pNode->setScale(scale);
+ }
+
+ // Notify
+ if(mCallbacks)
+ mCallbacks->OnNodeCreate(pNode, pElem);
+
+ // Animation
+ TiXmlElement* animList = pElem->FirstChildElement("animations");
+ if(animList)
+ {
+ //
+ for (TiXmlElement* animElem = animList->FirstChildElement();
+ animElem != 0; animElem = animElem->NextSiblingElement())
+ {
+ // Get name of animation
+ const char *pszName = animElem->Attribute("name");
+
+ Animation *pAnim = 0;
+ DISABLE_LOGMANAGER
+ try
+ {
+ pAnim=mSceneMgr->getAnimation(pszName);
+ } catch(...)
+ {
+ }
+ ENABLE_LOGMANAGER
+
+ // If this animation has not been created yet, we create it
+ if(pAnim == 0)
+ {
+ float fLength = StringConverter::parseReal(animElem->Attribute("length"));
+ pAnim = mSceneMgr->createAnimation(pszName, fLength);
+ pAnim->setInterpolationMode(Animation::IM_LINEAR);
+ }
+
+ // Create animation track for this node
+ NodeAnimationTrack *pTrack = pAnim->createNodeTrack(pAnim->getNumNodeTracks()+1, pNode);
+
+ // Iterate all keyframes for this node
+ for (TiXmlElement* pKeyframeElem = animElem->FirstChildElement();
+ pKeyframeElem != 0; pKeyframeElem = pKeyframeElem->NextSiblingElement())
+ {
+ float fTime=StringConverter::parseReal(pKeyframeElem->Attribute("time"));
+ TransformKeyFrame *pKeyFrame = pTrack->createNodeKeyFrame(fTime);
+
+ // Position
+ TiXmlElement* posElem = pKeyframeElem->FirstChildElement("position");
+ if(posElem)
+ {
+ Vector3 trans;
+ trans.x = StringConverter::parseReal(posElem->Attribute("x"));
+ trans.y = StringConverter::parseReal(posElem->Attribute("y"));
+ trans.z = StringConverter::parseReal(posElem->Attribute("z"));
+ pKeyFrame->setTranslate(trans);
+ }
+
+ // Rotation
+ TiXmlElement* rotElem = pKeyframeElem->FirstChildElement("rotation");
+ if(rotElem)
+ {
+ Quaternion qRot;
+ qRot.x = StringConverter::parseReal(rotElem->Attribute("x"));
+ qRot.y = StringConverter::parseReal(rotElem->Attribute("y"));
+ qRot.z = StringConverter::parseReal(rotElem->Attribute("z"));
+ qRot.w = StringConverter::parseReal(rotElem->Attribute("w"));
+ pKeyFrame->setRotation(qRot);
+ }
+
+ // Scale
+ TiXmlElement* scaleElem = pKeyframeElem->FirstChildElement("scale");
+ if(scaleElem)
+ {
+ Vector3 scale;
+ scale.x = StringConverter::parseReal(scaleElem->Attribute("x"));
+ scale.y = StringConverter::parseReal(scaleElem->Attribute("y"));
+ scale.z = StringConverter::parseReal(scaleElem->Attribute("z"));
+ pKeyFrame->setScale(scale);
+ }
+ }
+ }
+ }
+
+ return pNode;
+}
+
+// Create SceneManager
+Ogre::SceneNode* OSMScene::createSceneManager(TiXmlElement* sceneProp, BOOL& bHandled)
+{
+ assert(sceneProp);
+
+ // Scene manager
+ TiXmlElement* sceneMgrElem = sceneProp->FirstChildElement("sceneManager");
+ int type = Ogre::StringConverter::parseInt(sceneMgrElem->Attribute("type"));
+ Ogre::SceneType sceneType = static_cast<Ogre::SceneType>(1 << (type - 1));
+ mSceneMgr = Ogre::Root::getSingleton().createSceneManager(sceneType);
+ assert(mSceneMgr);
+
+ SceneNode* pSceneRoot = mSceneMgr->getRootSceneNode()->createChildSceneNode();
+ assert(pSceneRoot);
+
+ // Scene shadows
+ TiXmlElement* shadowsElem = sceneProp->FirstChildElement("shadowTechnique");
+ if(shadowsElem)
+ {
+ int type = StringConverter::parseInt(shadowsElem->Attribute("type"));
+ Ogre::ShadowTechnique shadowType = static_cast<Ogre::ShadowTechnique>(type);
+
+ mSceneMgr->setShadowTechnique(shadowType);
+
+ int tex_size = StringConverter::parseInt(shadowsElem->Attribute("tex_size"));
+ int tex_count = StringConverter::parseInt(shadowsElem->Attribute("tex_count"));
+
+ mSceneMgr->setShadowTextureSettings(tex_size, tex_count);
+
+ // Shadow Color
+ TiXmlElement* colorElem = shadowsElem->FirstChildElement("color");
+ if(colorElem)
+ {
+ ColourValue color;
+ color.r = StringConverter::parseReal(colorElem->Attribute("r"));
+ color.g = StringConverter::parseReal(colorElem->Attribute("g"));
+ color.b = StringConverter::parseReal(colorElem->Attribute("b"));
+
+ mSceneMgr->setShadowColour(color);
+ }
+ }
+
+ // Scene fog
+ TiXmlElement* fogElem = sceneProp->FirstChildElement("fogMode");
+ if(fogElem)
+ {
+ int type = StringConverter::parseInt(fogElem->Attribute("type"));
+ FogMode mode = static_cast<FogMode>(type);
+
+ float density = StringConverter::parseReal(fogElem->Attribute("density"));
+ float linearStart = StringConverter::parseReal(fogElem->Attribute("linearStart"));
+ float linearEnd = StringConverter::parseReal(fogElem->Attribute("linearEnd"));
+
+ Ogre::ColourValue color;
+
+ // Fog Color
+ TiXmlElement* colorElem = fogElem->FirstChildElement("color");
+ if(colorElem)
+ {
+ color.r = StringConverter::parseReal(colorElem->Attribute("r"));
+ color.g = StringConverter::parseReal(colorElem->Attribute("g"));
+ color.b = StringConverter::parseReal(colorElem->Attribute("b"));
+ }
+
+ mSceneMgr->setFog(mode, color, density, linearStart, linearEnd);
+ }
+
+ // World Geometry
+ const char* worldGeometry = sceneMgrElem->Attribute("worldGeometry");
+ if(worldGeometry != NULL)
+ {
+ // Some scene managers need cameras created before the world geometry
+ try {
+ // cameras
+ TiXmlElement* list = sceneProp->FirstChildElement("cameras");
+ if(list)
+ createCameras(list, pSceneRoot);
+
+ if(sceneType == ST_EXTERIOR_CLOSE)
+ {
+
+ if(mCameras.empty())
+ {
+
+ OGRE_EXCEPT(Exception::ERR_RT_ASSERTION_FAILED,
+ "oSceneLoader: Scene dont contain cameras, \
+ Terrain Scene Manager needs a camera to initialize",
+ "OSMScene::createSceneManager");
+ }
+
+ Camera* primaryCamera = mCameras[0];
+
+ mWindow->getViewport(0)->setCamera(primaryCamera);
+
+ mSceneMgr->setOption("PrimaryCamera", primaryCamera);
+ }
+
+ // cameras created, the main scene loader method should not re-parse the list
+ bHandled = TRUE;
+ } catch(...)
+ {
+ }
+
+ mSceneMgr->setWorldGeometry(worldGeometry);
+ }
+
+ return pSceneRoot;
+}
+
+// Set Scene Properties
+void OSMScene::setSceneProperties(TiXmlElement* sceneProp)
+{
+ // Ambient light Color
+ TiXmlElement* colorElem = sceneProp->FirstChildElement("lightColor");
+ if(colorElem)
+ {
+ ColourValue color;
+ color.r = StringConverter::parseReal(colorElem->Attribute("r"));
+ color.g = StringConverter::parseReal(colorElem->Attribute("g"));
+ color.b = StringConverter::parseReal(colorElem->Attribute("b"));
+
+ mSceneMgr->setAmbientLight(color);
+ }
+
+ // Background Color
+ colorElem = sceneProp->FirstChildElement("bkgcolor");
+ if(colorElem && mWindow)
+ {
+ int numViewports = mWindow->getNumViewports();
+ if(numViewports)
+ {
+ Ogre::ColourValue color;
+ color.r = StringConverter::parseReal(colorElem->Attribute("r"));
+ color.g = StringConverter::parseReal(colorElem->Attribute("g"));
+ color.b = StringConverter::parseReal(colorElem->Attribute("b"));
+
+ for(int i=0; i<numViewports; ++i)
+ mWindow->getViewport(i)->setBackgroundColour(color);
+ }
+ }
+
+ // Scene sky
+ TiXmlElement* skyElem = sceneProp->FirstChildElement("skyTechnique");
+ if(skyElem)
+ {
+ int type = StringConverter::parseInt(skyElem->Attribute("type"));
+ String materialName = skyElem->Attribute("material");
+
+ if(materialName != " ") {
+ bool drawFirst = StringConverter::parseBool(skyElem->Attribute("drawFirst"));
+ float tiling = StringConverter::parseReal(skyElem->Attribute("tiling"));
+ float scale = StringConverter::parseReal(skyElem->Attribute("scale"));
+ float dist = StringConverter::parseReal(skyElem->Attribute("dist"));
+ float bow = StringConverter::parseReal(skyElem->Attribute("bow"));
+ int xSegments = StringConverter::parseInt(skyElem->Attribute("xSegments"));
+ int ySegments = StringConverter::parseInt(skyElem->Attribute("ySegments"));
+ Ogre::Quaternion quat(Quaternion::IDENTITY);
+ Ogre::Plane plane;
+ plane.d = dist;
+ plane.normal = -(Vector3::UNIT_Y);
+
+ switch(type) {
+
+ case SCENE_SKYPLANE:
+
+ mSceneMgr->setSkyPlane(true, plane, materialName, scale,
+ tiling, drawFirst, bow, xSegments, ySegments);
+
+ mSceneMgr->setSkyBox(false, "");
+ mSceneMgr->setSkyDome(false, "");
+
+ break;
+
+ case SCENE_SKYBOX:
+
+ mSceneMgr->setSkyBox(true, materialName, dist, drawFirst, quat);
+ mSceneMgr->setSkyPlane(false, plane, "");
+ mSceneMgr->setSkyDome(false, "");
+
+ break;
+
+ case SCENE_SKYDOME:
+
+ mSceneMgr->setSkyDome(true, materialName, bow, tiling, dist,
+ drawFirst, quat, xSegments, ySegments);
+
+ mSceneMgr->setSkyPlane(false, plane, "");
+ mSceneMgr->setSkyBox(false, "");
+
+ break;
+
+ }
+ }
+ }
+}
+
+// Create all entities in scene
+void OSMScene::createEntities(TiXmlElement* pEntityNode, Ogre::SceneNode* pSceneRoot)
+{
+ // Iterate all meshes, creating them.
+ for (TiXmlElement* pMeshElem = pEntityNode->FirstChildElement();
+ pMeshElem != 0; pMeshElem = pMeshElem->NextSiblingElement())
+ {
+ // Ogre could cast an exception, in which case we just try to
+ // continue reading the other meshes
+ try
+ {
+ const char *pszName = pMeshElem->Attribute("name");
+ const char *pszFileName = pMeshElem->Attribute("filename");
+
+ // try to create the mesh
+ Entity *pEntity = mSceneMgr->createEntity(pszName, pszFileName);
+ if(pEntity==0) continue;
+
+ // Check if the object should cast shadows
+ const char *pszCastShadows=pMeshElem->Attribute("CastShadows");
+ if(pszCastShadows && stricmp(pszCastShadows, "no")==0)
+ pEntity->setCastShadows(false);
+ else
+ pEntity->setCastShadows(true);
+
+ // Create node with full information
+ SceneNode *pObjNode=createNode(pMeshElem, pSceneRoot);
+
+ // Attach the mesh entity to node
+ pObjNode->attachObject(pEntity);
+
+ // Notify
+ if(mCallbacks)
+ mCallbacks->OnEntityCreate(pEntity, pMeshElem);
+
+ // Add to entity list
+ mEntities.push_back(pEntity);
+ } catch(...)
+ {
+ continue;
+ }
+ }
+}
+
+// Create all Lights in scene
+void OSMScene::createLights(TiXmlElement* pLightNode, Ogre::SceneNode* pSceneRoot)
+{
+ // Iterate all Lights, creating them. We do not attach them yet, since
+ // we need to make sure all potential parent entities have been created.
+ for (TiXmlElement* pLightElem = pLightNode->FirstChildElement();
+ pLightElem != 0; pLightElem = pLightElem->NextSiblingElement())
+ {
+ // Ogre could cast an exception, in which case we just try to
+ // continue reading the other Lights
+ try
+ {
+ const char *pszName = pLightElem->Attribute("name");
+
+ Light *pLight = mSceneMgr->createLight(pszName);
+ if(pLight==0) continue;
+
+ // Figure out which type of light we are using
+ const char *pszType = pLightElem->Attribute("type");
+ if(stricmp(pszType, "omni")==0)
+ {
+ pLight->setType(Light::LT_POINT);
+ } else if(stricmp(pszType, "spot")==0)
+ {
+ pLight->setType(Light::LT_SPOTLIGHT);
+ pLight->setSpotlightRange(
+ Degree(StringConverter::parseReal(pLightElem->Attribute("hotspot"))),
+ Degree(StringConverter::parseReal(pLightElem->Attribute("falloff"))));
+ pLight->setDirection(0,0,-1);
+
+ } else if(stricmp(pszType, "directional")==0)
+ {
+ pLight->setType(Light::LT_DIRECTIONAL);
+ }
+
+ // Check if the light should be on
+ const char *pszOn = pLightElem->Attribute("on");
+ if(pszOn!=0 && stricmp(pszOn, "true")==0)
+ pLight->setVisible(true);
+ else
+ pLight->setVisible(false);
+
+ // Check if the object should cast shadows
+ const char *pszCastShadows = pLightElem->Attribute("CastShadows");
+ if(pszCastShadows && stricmp(pszCastShadows, "no")==0)
+ pLight->setCastShadows(false);
+ else
+ pLight->setCastShadows(true);
+
+ // Diffuse Color
+ TiXmlElement* colorElem = pLightElem->FirstChildElement("color");
+ if(colorElem)
+ {
+ pLight->setDiffuseColour(
+ StringConverter::parseReal(colorElem->Attribute("r")),
+ StringConverter::parseReal(colorElem->Attribute("g")),
+ StringConverter::parseReal(colorElem->Attribute("b")));
+ }
+
+ // Specular Color
+ TiXmlElement* specularElem = pLightElem->FirstChildElement("specular");
+ if(specularElem)
+ {
+ pLight->setSpecularColour(
+ StringConverter::parseReal(specularElem->Attribute("r")),
+ StringConverter::parseReal(specularElem->Attribute("g")),
+ StringConverter::parseReal(specularElem->Attribute("b")));
+ }
+
+ // Attenuation
+ TiXmlElement* attenElem = pLightElem->FirstChildElement("attenuation");
+ if(attenElem) {
+ pLight->setAttenuation(
+ StringConverter::parseReal(attenElem->Attribute("range")),
+ StringConverter::parseReal(attenElem->Attribute("constant")),
+ StringConverter::parseReal(attenElem->Attribute("linear")),
+ StringConverter::parseReal(attenElem->Attribute("quadratic")));
+ }
+
+ // Create node with full information
+ SceneNode *pLightNode=createNode(pLightElem, pSceneRoot);
+
+ // Attach the Light entity to node
+ pLightNode->attachObject(pLight);
+
+ // Target
+ TiXmlElement* targetElem=pLightElem->FirstChildElement("target");
+ if(targetElem)
+ {
+ // Create node with full information
+ SceneNode *pTargetNode=createNode(targetElem, pSceneRoot);
+ pLightNode->setAutoTracking(true, pTargetNode);
+ }
+
+ // Notify
+ if(mCallbacks)
+ mCallbacks->OnLightCreate(pLight, pLightElem);
+
+ // Add to light list
+ mLights.push_back(pLight);
+ } catch(...)
+ {
+ continue;
+ }
+ }
+}
+
+// Create all Cameras in scene
+void OSMScene::createCameras(TiXmlElement* pCameraNode, Ogre::SceneNode* pSceneRoot)
+{
+ // Iterate all Cameras, creating them. We do not attach them yet, since
+ // we need to make sure all potential parent entities have been created.
+ for (TiXmlElement* pCameraElem = pCameraNode->FirstChildElement();
+ pCameraElem != 0; pCameraElem = pCameraElem->NextSiblingElement())
+ {
+ // Ogre could cast an exception, in which case we just try to
+ // continue reading the other Cameras
+ try
+ {
+ const char *pszName = pCameraElem->Attribute("name");
+
+ // Create camera
+ Camera *pCamera=mSceneMgr->createCamera(pszName);
+ if(pCamera==0) continue;
+
+ // Set Field of View on camera
+ pCamera->setFOVy(Radian(StringConverter::parseReal(pCameraElem->Attribute("FOV"))));
+ pCamera->setNearClipDistance(5);
+
+ // Create node with full information
+ SceneNode *pCameraNode=createNode(pCameraElem, pSceneRoot);
+
+ // Attach the Camera entity to node
+ pCameraNode->attachObject(pCamera);
+
+ // Target
+ TiXmlElement* targetElem=pCameraElem->FirstChildElement("target");
+ if(targetElem)
+ {
+ // Create node with full information
+ SceneNode *pTargetNode=createNode(targetElem, pSceneRoot);
+ pCameraNode->setAutoTracking(true, pTargetNode);
+ }
+
+ if(!mWindow)
+ {
+
+ OGRE_EXCEPT(Exception::ERR_RT_ASSERTION_FAILED,
+ "oSceneLoader: RenderWindow not valid, \
+ If the RenderWindow was not auto created, \
+ you must add it in the OSMScene object contructor",
+ "OSMScene::createCameras");
+
+ }
+
+ // If viewport(s) are not present, create a default viewport
+ if(mWindow->getNumViewports() == 0)
+ {
+ Viewport* vp = mWindow->addViewport(pCamera);
+
+ // Alter the camera aspect ratio to match the viewport
+ pCamera->setAspectRatio(
+ Real(vp->getActualWidth()) / Real(vp->getActualHeight()));
+ }
+
+
+ // Notify
+ if(mCallbacks)
+ mCallbacks->OnCameraCreate(pCamera, pCameraElem);
+
+ // Add to camera list
+ mCameras.push_back(pCamera);
+ } catch(...)
+ {
+ continue;
+ }
+ }
+
+}
+
+// For CE version, helpers, shapes, static geometry
+// and external skeleton animation support is not provided
+void OSMScene::createHelpers(TiXmlElement* pHelperNode, Ogre::SceneNode* pSceneRoot)
+{
+
+}
+
+void OSMScene::createShapes(TiXmlElement* pShapeNode)
+{
+
+
+}
+
+void OSMScene::createStaticGeometry(TiXmlElement* pStaticGeom)
+{
+
+}
+
+void OSMScene::loadAnimations(TiXmlElement* animationsNode, SkeletonHandles& handles) {
+
+ // Iterate all skeletons, adding animations from ".anim" files
+}
+
+OSMAnimSerializer::OSMAnimSerializer() {
+
+}
+
+void OSMAnimSerializer::addAnimation(Ogre::SkeletonPtr skel, const Ogre::String& filename) {
+
+
+}
Added: trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.h
===================================================================
--- trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.h (rev 0)
+++ trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.h 2007-11-14 05:48:13 UTC (rev 480)
@@ -0,0 +1,108 @@
+/**********************************************************************
+ *<
+ oFusion Scene Loader CE (see License.txt)
+
+ FILE: ogreAnimationCompiler.h
+
+ DESCRIPTION: OE_XMLScene reader (oe_scene) include header
+
+ IMPLEMENTED BY: Andres Carrera
+
+ HISTORY:
+
+ Original implementation by Lasse Tassing (Channex)
+ 2005 ITE ApS, Lasse Tassing
+
+ *> Copyright (c) 2006, All Rights Reserved.
+ **********************************************************************/
+
+
+#ifndef __OGRE_XML_SCENE__
+#define __OGRE_XML_SCENE__
+
+
+#include "Ogre.h"
+#include "OgreSharedPtr.h"
+#include "tinyxml.h"
+
+#include "IOSMSceneCallbacks.h"
+#include "OSMAnimSerializer.h"
+
+class TiXmlDocumentPtr : public Ogre::SharedPtr<TiXmlDocument> {
+public:
+ TiXmlDocumentPtr() : Ogre::SharedPtr<TiXmlDocument>() {}
+ explicit TiXmlDocumentPtr(TiXmlDocument* rep) : Ogre::SharedPtr<TiXmlDocument>(rep) {}
+
+};
+
+class OSMScene
+{
+public:
+
+ typedef std::vector<Ogre::Camera*> CameraList;
+ typedef std::vector<Ogre::Light*> LightList;
+ typedef std::vector<Ogre::Entity*> EntityList;
+
+ OSMScene(Ogre::SceneManager* pSceneMgr = 0, Ogre::RenderWindow* win = 0);
+ ~OSMScene(void);
+
+ // Initialise
+ bool initialise(const char *pszXMLFile, OSMSceneCallbacks* pCallbacks = NULL);
+
+ // Declare all resources used in the scene
+ void declareResources(void);
+
+ // Create scene, optionally attaching it to a parent node
+ bool createScene(Ogre::SceneNode *pParent = NULL);
+
+ // Get list of cameras in this scene
+ CameraList& getCameraList(void);
+
+ // Get list of lights in this scene
+ LightList& getLightList(void);
+
+ // Get list of lights in this scene
+ EntityList& getEntityList(void);
+
+ // Get created scene manager
+ Ogre::SceneManager* getSceneManager(void) { return mSceneMgr; }
+
+private:
+ // Create node from information
+ Ogre::SceneNode* createNode(TiXmlElement* pElem, Ogre::...
[truncated message content] |
|
From: <and...@us...> - 2007-11-14 03:30:47
|
Revision: 479
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=479&view=rev
Author: andy_miller
Date: 2007-11-13 19:30:52 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Updates to support rpath/ORIGIN - allow linux build to find the necessary libraries
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/SConstruct
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-14 03:04:08 UTC (rev 478)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-14 03:30:52 UTC (rev 479)
@@ -18,7 +18,7 @@
LIB_Boost = 'libboost_python-gcc41-1_34'
# in Linux we need to code in the Relative path for the library
-RPATH="../lib"
+RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib')
# We need to know where to find gccxml......
gccxml_bin = os.path.join(BASE_DIR,'gccxml-build/bin')
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2007-11-14 03:04:08 UTC (rev 478)
+++ trunk/python-ogre/SConstruct 2007-11-14 03:30:52 UTC (rev 479)
@@ -94,8 +94,9 @@
# Let us select the projects to build
possible_projects = []
-for name in environment.projects.keys():
- possible_projects.append ( name )
+for name,cls in environment.projects.items():
+ if cls.active:
+ possible_projects.append ( name )
# ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
# 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
# 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd',
@@ -127,7 +128,7 @@
_env = Environment(ENV=os.environ)
if environment.rpath:
- _env.Append(RPATH=environment.rpath)
+ _env.Append(RPATH=_env.Literal(environment.rpath))
## Use custom compilier if wanted (things like ccache)
@@ -141,6 +142,8 @@
linkflags=get_linkflags()
if hasattr ( cls, 'LINKFLAGS' ):
linkflags += cls.LINKFLAGS
+ if environment.rpath:
+ linkflags += ' -z origin '
_env.Append( LINKFLAGS=linkflags )
_env.Append ( LIBS = cls.libs )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-14 03:04:03
|
Revision: 478
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=478&view=rev
Author: andy_miller
Date: 2007-11-13 19:04:08 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Update for latest version
Modified Paths:
--------------
trunk/python-ogre/code_generators/caelum/generate_code.py
Modified: trunk/python-ogre/code_generators/caelum/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/generate_code.py 2007-11-13 11:49:12 UTC (rev 477)
+++ trunk/python-ogre/code_generators/caelum/generate_code.py 2007-11-14 03:04:08 UTC (rev 478)
@@ -101,13 +101,13 @@
def create_output( size ):
return [ ft.output( i ) for i in range( size ) ]
- for x in main_ns.mem_funs('::caelum::UniversalClock::getGregorianDateFromJulianDay'):
+ for x in main_ns.mem_funs('::caelum::UniversalClock::getGregorianDateFromJulianDay',allow_empty=True ):
x.add_transformation( ft.output('year'), ft.output('month'), ft.output('day'), alias = 'getGregorianDateFromJulianDay' )
x.documentation = docit ("","JulianDay", "tuple - year,month,day")
- x=main_ns.mem_fun('::caelum::UniversalClock::getGregorianDateTimeFromJulianDay')
- x.add_transformation( ft.output('year'), ft.output('month'), ft.output('day'),ft.output('hour'), ft.output('minute'), ft.output('second') )
- x.documentation = docit ("","JulianDay", "tuple - year,month,day,hour, minute, second")
+ #x=main_ns.mem_fun('::caelum::UniversalClock::getGregorianDateTimeFromJulianDay')
+ #x.add_transformation( ft.output('year'), ft.output('month'), ft.output('day'),ft.output('hour'), ft.output('minute'), ft.output('second') )
+ #x.documentation = docit ("","JulianDay", "tuple - year,month,day,hour, minute, second")
###############################################################################
##
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-13 11:49:10
|
Revision: 477
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=477&view=rev
Author: andy_miller
Date: 2007-11-13 03:49:12 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Typo in ogreforests and removed caelum from build
Modified Paths:
--------------
trunk/python-ogre/scripts/06-GenerateCode.sh
trunk/python-ogre/scripts/07-BuildModules.sh
Modified: trunk/python-ogre/scripts/06-GenerateCode.sh
===================================================================
--- trunk/python-ogre/scripts/06-GenerateCode.sh 2007-11-13 10:45:31 UTC (rev 476)
+++ trunk/python-ogre/scripts/06-GenerateCode.sh 2007-11-13 11:49:12 UTC (rev 477)
@@ -64,7 +64,7 @@
echo ' -- creating forests code'
echo ' -- creating forests code' >> $INSTALL_DIR/log.out
- $INSTALL_DIR/gen_code.sh forests
+ $INSTALL_DIR/gen_code.sh ogreforests
echo ' -- creating bullet code '
echo ' -- creating bullet code' >> $INSTALL_DIR/log.out
Modified: trunk/python-ogre/scripts/07-BuildModules.sh
===================================================================
--- trunk/python-ogre/scripts/07-BuildModules.sh 2007-11-13 10:45:31 UTC (rev 476)
+++ trunk/python-ogre/scripts/07-BuildModules.sh 2007-11-13 11:49:12 UTC (rev 477)
@@ -12,8 +12,8 @@
then
scons PROJECTS=$1 -i
else
- scons PROJECTS=ogre,ois,cegui,plib,ogrenewt,ogreode,ogreal,quickgui,et,caelum,bullet -i
-#,ogrebulletc,ogrebulletd -i
+ scons PROJECTS=ogre,ois,cegui,plib,ogrenewt,ogreode,ogreal,quickgui,et,bullet,ogreforests -i
+#,ogrebulletc,ogrebulletd,caelum -i
fi
#opcode -- not really suited to a linux build -- lots of work needed ?
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-13 10:46:16
|
Revision: 476
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=476&view=rev
Author: andy_miller
Date: 2007-11-13 02:45:31 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
add watermesh and ofusion to the linux config
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-13 10:39:26 UTC (rev 475)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-13 10:45:31 UTC (rev 476)
@@ -52,7 +52,8 @@
PATH_et = os.path.join(PATH_THIRDPARTY, 'et')
PATH_caelum = os.path.join(PATH_THIRDPARTY, 'caelum')
PATH_noise= os.path.join(PATH_THIRDPARTY, 'noise')
-
+PATH_watermesh= os.path.join(PATH_THIRDPARTY, 'watermesh')
+PATH_ofusion= os.path.join(PATH_THIRDPARTY, 'ofusion')
PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
# PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-13 10:40:25
|
Revision: 475
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=475&view=rev
Author: andy_miller
Date: 2007-11-13 02:39:26 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Add patch to the prereqs...
Modified Paths:
--------------
trunk/python-ogre/scripts/00-PreReqs.sh
Modified: trunk/python-ogre/scripts/00-PreReqs.sh
===================================================================
--- trunk/python-ogre/scripts/00-PreReqs.sh 2007-11-13 08:31:31 UTC (rev 474)
+++ trunk/python-ogre/scripts/00-PreReqs.sh 2007-11-13 10:39:26 UTC (rev 475)
@@ -1,6 +1,6 @@
#!/bin/bash
# Part of the Python-Ogre installation
sudo apt-get install g++ libfreetype6-dev libpcre3-dev autoconf automake1.9 libgl1-mesa-dev libx11-dev \
-libglut3-dev libtool libxaw7-dev libxxf86vm-dev \
+libglut3-dev libtool libxaw7-dev libxxf86vm-dev patch \
libxrandr-dev cvs subversion libxt-dev libexpat1-dev python python-dev \
python-celementtree libglew-dev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-13 08:31:30
|
Revision: 474
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=474&view=rev
Author: andy_miller
Date: 2007-11-13 00:31:31 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Put date in correct place
Modified Paths:
--------------
trunk/python-ogre/scripts/01-RetrieveSource.sh
Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-11-13 08:30:47 UTC (rev 473)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-11-13 08:31:31 UTC (rev 474)
@@ -36,7 +36,7 @@
echo " -- getting python-ogre"
svn co https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre
echo " -- getting gccxml"
-cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML -D "1 Oct 2007" co gccxml
+cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co -D "1 Oct 2007" gccxml
echo " -- getting ogreode"
cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode
echo " -- getting ogrenewt"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-13 08:30:52
|
Revision: 473
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=473&view=rev
Author: andy_miller
Date: 2007-11-13 00:30:47 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Fix to scripts
Added Paths:
-----------
trunk/python-ogre/scripts/01-RetrieveSource.sh
Added: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh (rev 0)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-11-13 08:30:47 UTC (rev 473)
@@ -0,0 +1,50 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+
+# master config setup
+source ./config.sh
+
+echo "Retrieving sources"
+#
+# Get all sources
+#
+pushd $DOWNLOADS
+echo " -- Getting bundles"
+$WGET http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/Cg-1.5_Aug2007_x86.tar.gz
+$WGET http://www.cmake.org/files/v2.4/cmake-2.4.6-Linux-i386.tar.gz
+$WGET http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip
+$WGET http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz
+$WGET http://prdownloads.sourceforge.net/wgois/ois-1.0RC1.tar.gz
+$WGET http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz
+##$WGET http://prdownloads.sourceforge.net/scons/scons-0.96.96.tar.gz
+$WGET http://downloads.sourceforge.net/scons/scons-0.97.0d20070918.tar.gz
+$WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2
+$WGET http://prdownloads.sourceforge.net/opende/ode-src-0.9.zip
+$WGET http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2
+$WGET http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz
+$WGET http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
+$WGET http://www.openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz
+$WGET http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz
+$WGET http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz
+$WGET http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2
+##$WGET http://devfiles.ageia.com/PhysX_2.7.2_SDK_CoreLinux_deb.tar.gz?
+$WGET http://downloads.sourceforge.net/bullet/bullet-2.63final.tgz
+popd
+cd $INSTALL_DIR
+echo " -- getting pygccxml"
+svn co https://pygccxml.svn.sourceforge.net/svnroot/pygccxml pygccxml
+echo " -- getting python-ogre"
+svn co https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre
+echo " -- getting gccxml"
+cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML -D "1 Oct 2007" co gccxml
+echo " -- getting ogreode"
+cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode
+echo " -- getting ogrenewt"
+cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogrenewt
+echo " -- getting nxogre"
+svn co http://latest.nxogre.org/nxogre3/ nxogre
+echo ""
+echo "======= Sources Retrieved ======="
+echo ""
+
+
Property changes on: trunk/python-ogre/scripts/01-RetrieveSource.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-13 08:30:20
|
Revision: 472
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=472&view=rev
Author: andy_miller
Date: 2007-11-13 00:30:14 -0800 (Tue, 13 Nov 2007)
Log Message:
-----------
Fix to script
Removed Paths:
-------------
trunk/python-ogre/scripts/01-RetrieveSource.sh
Deleted: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-11-13 07:26:03 UTC (rev 471)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-11-13 08:30:14 UTC (rev 472)
@@ -1,50 +0,0 @@
-#!/bin/bash
-# Part of the Python-Ogre installation
-
-# master config setup
-source ./config.sh
-
-echo "Retrieving sources"
-#
-# Get all sources
-#
-pushd $DOWNLOADS
-echo " -- Getting bundles"
-$WGET http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/Cg-1.5_Aug2007_x86.tar.gz
-$WGET http://www.cmake.org/files/v2.4/cmake-2.4.6-Linux-i386.tar.gz
-$WGET http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip
-$WGET http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz
-$WGET http://prdownloads.sourceforge.net/wgois/ois-1.0RC1.tar.gz
-$WGET http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz
-##$WGET http://prdownloads.sourceforge.net/scons/scons-0.96.96.tar.gz
-$WGET http://downloads.sourceforge.net/scons/scons-0.97.0d20070918.tar.gz
-$WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2
-$WGET http://prdownloads.sourceforge.net/opende/ode-src-0.9.zip
-$WGET http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2
-$WGET http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz
-$WGET http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
-$WGET http://www.openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz
-$WGET http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz
-$WGET http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz
-$WGET http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2
-##$WGET http://devfiles.ageia.com/PhysX_2.7.2_SDK_CoreLinux_deb.tar.gz?
-$WGET http://downloads.sourceforge.net/bullet/bullet-2.63final.tgz
-popd
-cd $INSTALL_DIR
-echo " -- getting pygccxml"
-svn co https://pygccxml.svn.sourceforge.net/svnroot/pygccxml pygccxml
-echo " -- getting python-ogre"
-svn co https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre
-echo " -- getting gccxml"
-cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML -D "1 Oct 2007" co gccxml
-echo " -- getting ogreode"
-cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode
-echo " -- getting ogrenewt"
-cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogrenewt
-echo " -- getting nxogre"
-svn co http://latest.nxogre.org/nxogre3/ nxogre
-echo ""
-echo "======= Sources Retrieved ======="
-echo ""
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-13 07:26:01
|
Revision: 471
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=471&view=rev
Author: andy_miller
Date: 2007-11-12 23:26:03 -0800 (Mon, 12 Nov 2007)
Log Message:
-----------
General merge to my working environment
Added Paths:
-----------
trunk/python-ogre/demos/bullet/
trunk/python-ogre/demos/bullet/test01.py
trunk/python-ogre/demos/nxogre/BetaGui.py.org
trunk/python-ogre/demos/ogre/1.py
trunk/python-ogre/demos/ogre/Julia.py
trunk/python-ogre/demos/ogre/Shadows.py
trunk/python-ogre/demos/ogre/ThingRenderable.py
trunk/python-ogre/demos/ogre/VolumeRenderable.py
trunk/python-ogre/demos/ogre/VolumeTex.py
trunk/python-ogre/demos/ogre/a1.py
trunk/python-ogre/demos/ogre/c.sed
trunk/python-ogre/demos/ogre/c1.sed
trunk/python-ogre/demos/ogre/demo_water_s.py
trunk/python-ogre/demos/ogre/name.xml
trunk/python-ogre/demos/ogre/sf_OIS.py
trunk/python-ogre/demos/ogre/tests/Test_ImageLoad.py
trunk/python-ogre/demos/ogre/tests/ogre.txt
trunk/python-ogre/demos/ogre/water1.py
trunk/python-ogre/demos/ogre/water_mesh_s.py
trunk/python-ogre/demos/qgui/resources.cfg.quickgui
Added: trunk/python-ogre/demos/bullet/test01.py
===================================================================
--- trunk/python-ogre/demos/bullet/test01.py (rev 0)
+++ trunk/python-ogre/demos/bullet/test01.py 2007-11-13 07:26:03 UTC (rev 471)
@@ -0,0 +1,34 @@
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE
+import ogre.physics.bullet as bullet
+t = bullet.btTransform()
+ms = bullet.btDefaultMotionState (t)
+s = bullet.btBoxShape(bullet.btVector3(10,10,10))
+body = bullet.btRigidBody(1, ms, s)
+print body
+
+
+collisionConfiguration = bullet.btDefaultCollisionConfiguration()
+dispatcher = bullet.btCollisionDispatcher (collisionConfiguration)
+
+worldAabbMin = bullet.btVector3(-1000,-1000,-1000)
+worldAabbMax = bullet.btVector3(1000,1000,1000)
+maxProxies = 32766
+
+broadphase = bullet.btAxisSweep3(worldAabbMin, worldAabbMax, maxProxies)
+
+solver = bullet.btSequentialImpulseConstraintSolver()
+
+world = bullet.btDiscreteDynamicsWorld(dispatcher, broadphase , solver)
+world.getDispatchInfo().m_enableSPU = True
+world.setGravity(bullet.btVector3(0,-10,0))
+
+print world
+print solver
+print broadphase
+print dispatcher
+print collisionConfiguration
+
Added: trunk/python-ogre/demos/nxogre/BetaGui.py.org
===================================================================
--- trunk/python-ogre/demos/nxogre/BetaGui.py.org (rev 0)
+++ trunk/python-ogre/demos/nxogre/BetaGui.py.org 2007-11-13 07:26:03 UTC (rev 471)
@@ -0,0 +1,348 @@
+##/ Betajaen's GUI 015 Uncompressed
+##/ Written by Robin "Betajaen" Southern 07-Nov-2006, http:##www.ogre3d.org/wiki/index.php/BetaGUI
+##/ This code is under the Whatevar! licence. Do what you want but keep the original copyright header.
+
+## Converted to Python-Ogre By Andy Miller
+
+#include "Ogre.h"
+import ogre.renderer.OGRE as ogre
+
+from Enums import *
+
+wt = Enum ('NONE','MOVE','RESIZE','RESIZE_AND_MOVE')
+WindowPlacementType = Enum ( 'WPT_NONE','WPT_VERTICAL', 'WPT_HORIZONTAL' )
+WindowActivity = Enum ( 'WA_NONE', 'WA_MOVE', 'WA_RESIZE', 'WA_PRESS' )
+
+class GUI :
+ def __init__ (self, font, fontSize):
+ self.WindowToDestroy=None
+ self.PointerOverlay=None
+ self.Font = font
+ self.FontSize = fontSize
+ self.WindowCount=0
+ self.ButtonCount=0
+ self.TextCount=0
+ self.Overlay = ogre.OverlayManager.getSingleton().create("BetaGUI")
+ self.Overlay.show()
+ self.Windows=[]
+
+ def __del__ ( self ):
+ for w in self.Windows:
+ del w
+ del self.Windows
+
+ def injectMouse(self, x, y, LMB):
+ if (self.PointerOverlay):
+ self.PointerOverlay.setPosition(x,y)
+
+ if (self.WindowToDestroy) :
+ for i in range ( len (self.Windows)):
+ if self.WindowToDestroy == self.Windows[i] :
+ del self.WindowToDestroy
+ self.Windows.remove(i)
+ self.WindowToDestroy=0
+ return False
+
+ for w in self.Windows:
+ if w.check(x,y,LMB):
+ return True
+ return False
+
+ def injectKey(self, key, x, y):
+ for w in self.Windows:
+ if w.checkKey(key,x,y):
+ return True
+ return False
+
+ def injectBackspace(self, x, y):
+ self.in_jectKey("!b", x, y)
+
+ def createOverlay(self, name, position, dimensions, material="", caption="", autoAdd=True):
+ type="Panel"
+
+ if caption!="":
+ type="TextArea"
+
+ e=ogre.OverlayManager.getSingleton().createOverlayElement(type, name, False)
+
+ e.setMetricsMode(ogre.GMM_PIXELS)
+ e.setDimensions(dimensions.x, dimensions.y)
+ e.setPosition(position.x, position.y)
+
+ if material!="" :
+ e.setMaterialName(material)
+
+ if caption!="":
+ e.setCaption(caption)
+ e.setParameter("font_name",self.Font)
+ e.setParameter("char_height",str(self.FontSize))
+
+ if(autoAdd):
+ self.Overlay.add2D(e)
+ e.show()
+
+ return e
+
+ def createMousePointer(self, d, m) :
+ o = ogre.OverlayManager.getSingleton().create("BetaGUI.MP")
+ o.setZOrder(649)
+ self.PointerOverlay = self.createOverlay("bg.mp", ogre.Vector2(0,0), d, m, "", False)
+ o.add2D(self.PointerOverlay)
+ o.show()
+ self.PointerOverlay.show()
+ return self.PointerOverlay
+
+ def createWindow(self, Dimensions, Material, type_, caption=""):
+ window = Window(Dimensions, Material, type_, caption, self)
+ self.Windows.append(window)
+ return window
+
+
+
+class Window:
+
+ def hide(self ):
+ self.Overlay.hide()
+
+ def show( self ):
+ self.Overlay.show()
+
+ def isVisible(self):
+ return self.Overlay.isVisible()
+
+
+ def __init__(self, Dimensions, Material, t, caption, gui):
+ self.x =Dimensions.x
+ self.y =Dimensions.y
+ self.w =Dimensions.z
+ self.h =Dimensions.w
+ self.GUI = gui
+ self.Titlebar = None
+ self.Reziser=None
+ self.ActiveTextInput=None
+ self.ActiveButton=None
+ self.Buttons=[]
+ self.TextInputs=[]
+
+ self.Overlay = gui.createOverlay("BetaGUI.w" + str(gui.WindowCount),
+ ogre.Vector2(Dimensions.x,Dimensions.y), ogre.Vector2(Dimensions.z,Dimensions.w), Material)
+ gui.WindowCount += 1
+ if t >= 2:
+ c = Callback()
+ c.t=4
+ self.Reziser=self.createButton(ogre.Vector4(Dimensions.z-16,Dimensions.w-16,16,16),Material+".resize", "",c)
+
+ if t == 1 or t == 3 :
+ c=Callback()
+ c.t=3
+ self.Titlebar = self.createButton(ogre.Vector4(0,0,Dimensions.z,22),Material + ".titlebar", caption, c)
+
+
+ def __del__( self ):
+ for i in self.Buttons:
+ del i
+ del self.Buttons
+ for i in self.TextInputs:
+ del i
+ del self.TextInputs
+
+ self.GUI.Overlay.remove2D(self.Overlay)
+
+
+ def createButton(self, D, M, T, C):
+ x = Button(D, M, T, C, self)
+ self.Buttons.append(x)
+ return x
+
+ def createTextInput(self,D, M, V, L):
+ x = TextInput(D,M,V,L,self)
+ self.TextInputs.append(x)
+ return x
+
+ def createStaticText(self, D, T):
+ x = self.GUI.createOverlay(self.Overlay.getName() + str(self.GUI.TextCount),
+ ogre.Vector2(D.x,D.y),ogre.Vector2(D.z,D.w),"", T,False)
+ self.GUI.TextCount +=1
+ self.Overlay.addChild(x)
+ x.show()
+
+ def checkKey(self, k, px, py) :
+
+ if not self.Overlay.isVisible():
+ return False
+
+ if not(px>=self.x and py>=self.y) or not(px<=self.x+self.w and py<=self.y+self.h):
+ return False
+
+ if(self.ActiveTextInput == 0):
+ return False
+
+ if k=="!b" :
+ self.ActiveTextInput.setValue(self.ActiveTextInput.getValue[0,-1])
+ return True
+
+ if len (self.ActiveTextInput.getValue()) >= self.ActiveTextInput.length:
+ return True
+
+ self.ActiveTextInput.value+=k
+ self.ActiveTextInput.Caption.setCaption(self.ActiveTextInput.value)
+
+ return True
+
+ def check(self, px, py, LMB):
+ if not self.Overlay.isVisible():
+ return False
+
+ if ( not (px >= self.x and py >= self.y) or not(px <= self.x + self.w and py <= self.y + self.h)):
+ if (self.ActiveButton):
+ self.ActiveButton.activate(False)
+ return False
+
+ if self.ActiveButton :
+ self.ActiveButton.activate(False)
+ for i in range ( len (self.Buttons) ):
+ if (self.Buttons[i].in_(px,py,self.x,self.y)):
+ continue
+ if (self.ActiveButton):
+ self.ActiveButton.activate(False)
+
+ self.ActiveButton=self.Buttons[i]
+ self.ActiveButton.activate(True)
+
+ if not LMB:
+ return True
+
+ if self.ActiveTextInput:
+ self.ActiveTextInput.Overlay.setMaterialName(self.ActiveTextInput.MatNameNormal)
+ self.ActiveTextInput=0
+
+ tempt = self.ActiveButton.callback.t
+ if tempt ==1:
+ self.ActiveButton.callback.fp(self.ActiveButton)
+ return True
+ elif tempt ==2 :
+ self.ActiveButton.callback.LS.onButtonPress(self.ActiveButton)
+ return True
+ elif tempt ==4 :
+ self.x=px-(self.ActiveButton.w/2)
+ self.y=py-(self.ActiveButton.h/2)
+ self.Overlay.setPosition(self.x,self.y)
+ return True
+ elif tempt ==4 :
+ self.w=px-self.x+8
+ self.h=py-self.y+8
+ self.Overlay.setDimensions(self.w,self.h)
+ self.Reziser.x=w-16
+ self.Reziser.y=h-16
+ self.Reziser.self.Overlay.setPosition(self.Reziser.x,self.Reziser.y)
+ if(self.Titlebar):
+ self.Titlebar.w=self.w
+ self.Titlebar.self.Overlay.setWidth(self.Titlebar.w)
+ return True
+
+ if not LMB:
+ return True
+
+ for i in range ( len (self.TextInputs)):
+
+ if self.TextInputs[i].in_(px,py,self.x,self.y):
+ continue
+
+ self.ActiveTextInput=self.TextInputs[i]
+ self.ActiveTextInput.Overlay.setMaterialName(self.ActiveTextInput.MatNameActive)
+ return True
+
+ if self.ActiveTextInput :
+ self.ActiveTextInput.Overlay.setMaterialName(self.ActiveTextInput.MatNameNormal)
+ self.ActiveTextInput=0
+
+ return True
+
+
+class BetaGUIListener :
+ def __init__(self):
+ pass
+ def onButtonPress(self, ref):
+ pass
+
+class Callback :
+ def __init__ (self,Value=None):
+ ## Type of callback: 0 - None, 1 - FunctionPointer 2 - GUIListener, 3 - self.Overlayve Window, 4 - Resize
+ self.t=0
+ self.callbackvalue = Value
+
+
+class Button :
+
+ def __del__(self):
+ self.Overlay.getParent().reself.OverlayveChild(self.Overlay.getName())
+ self.Caption.getParent().reself.OverlayveChild(self.Caption.getName())
+
+ def activate(self, a):
+ if not a and self.MatNameNormal!="":
+ self.Overlay.setMaterialName(self.MatNameNormal)
+ if a and self.MatNameActive!="":
+ self.Overlay.setMaterialName(self.MatNameActive)
+
+ def in_(self, mx, my, px, py):
+ return ( not (mx >= x + px and my >= y + py)) or ( not (mx <= x + px + w and my <= y + py + h) )
+
+ def __init__ (self, Dimensions, m, Text, cb, parent):
+ self.x=Dimensions.x
+ self.y=Dimensions.y
+ self.w=Dimensions.z
+ self.h=Dimensions.w
+ self.MatNameNormal = m
+ self.MatNameActive = m
+# NXD("Button=" << self.MatNameNormal << ":" << self.MatNameActive)
+
+ ma=ogre.MaterialManager.getSingleton().getByName(self.MatNameNormal + ".active")
+ if not ma:
+ self.MatNameActive += ".active"
+
+ self.Overlay = parent.GUI.createOverlay(parent.Overlay.getName() + "b" + str(parent.GUI.ButtonCount),
+ ogre.Vector2(self.x,self.y),ogre.Vector2(self.w,self.h),m,"",False)
+ parent.GUI.ButtonCount +=1
+ self.Caption = parent.GUI.createOverlay(self.Overlay.getName() + "c",
+ ogre.Vector2(4,(self.h - parent.GUI.FontSize) / 2),ogre.Vector2(self.w, self.h),"",Text,False)
+ parent.Overlay.addChild(self.Overlay)
+ self.Overlay.show()
+ self.Overlay.addChild(self.Caption)
+ self.Caption.show()
+ self.callback = cb
+
+
+class TextInput :
+
+ def getValue(self):
+ return self.value
+
+ def setValue(self,v) :
+ self.value=v
+ self.Caption.setCaption(v)
+
+ def in_(self, mx, my, px, py) :
+ return ( not (mx >= x + px and my >= y + py)) or ( not (mx <= x + px + w and my <= y + py + h) )
+
+ def __init__ (self, D, M, V, L, P):
+ self.x = D.x
+ self.y = D.y
+ self.w = D.z
+ self.h = D.w
+ self.value = V
+ self.MatNameNormal = M
+ self.MatNameActive = M
+ self.length = L
+ ma=ogre.MaterialManager.getSingleton().getByName(self.MatNameNormal + ".active")
+ if not ma:
+ self.MatNameActive += ".active"
+
+ self.Overlay=P.GUI.createOverlay(P.Overlay.getName() + "t" + str(P.GUI.TextCount) ,
+ ogre.Vector2(self.x,self.y),ogre.Vector2(self.w,self.h),M,"",False)
+ P.GUI.TextCount += 1
+ self.Caption=P.GUI.createOverlay(self.Overlay.getName() + "c",
+ ogre.Vector2(4,(self.h - P.GUI.FontSize) / 2),ogre.Vector2(self.w,self.h),"",V,False)
+ P.Overlay.addChild(self.Overlay)
+ self.Overlay.show()
+ self.Overlay.addChild(self.Caption)
+ self.Caption.show()
Added: trunk/python-ogre/demos/ogre/1.py
===================================================================
--- trunk/python-ogre/demos/ogre/1.py (rev 0)
+++ trunk/python-ogre/demos/ogre/1.py 2007-11-13 07:26:03 UTC (rev 471)
@@ -0,0 +1,4 @@
+import time
+
+while True:
+ print "hello", time.localtime()
\ No newline at end of file
Added: trunk/python-ogre/demos/ogre/Julia.py
===================================================================
--- trunk/python-ogre/demos/ogre/Julia.py (rev 0)
+++ trunk/python-ogre/demos/ogre/Julia.py 2007-11-13 07:26:03 UTC (rev 471)
@@ -0,0 +1,98 @@
+# /* Original author: John C. Hare
+# * Date: June 26, 1996 (although I've had these around for at least 6 years)
+# * Adapted to C++ by W.J. van der Laan 2004
+# */
+
+/**
+ * Simple, fast, inline quaternion math functions
+ */
+class Quat:
+ r=0
+ i=0
+ j=0
+ k=0
+
+def qadd(a, b)
+ a.r += b.r
+ a.i += b.i
+ a.j += b.j
+ a.k += b.k
+
+
+def qmult(Quat &c, const Quat &a, const Quat &b)
+
+ c.r = a.r*b.r - a.i*b.i - a.j*b.j - a.k*b.k;
+ c.i = a.r*b.i + a.i*b.r + a.j*b.k - a.k*b.j;
+ c.j = a.r*b.j + a.j*b.r + a.k*b.i - a.i*b.k;
+ c.k = a.r*b.k + a.k*b.r + a.i*b.j - a.j*b.i;
+
+
+def qsqr(Quat &b, const Quat &a)
+
+ b.r = a.r*a.r - a.i*a.i - a.j*a.j - a.k*a.k;
+ b.i = 2.0f*a.r*a.i;
+ b.j = 2.0f*a.r*a.j;
+ b.k = 2.0f*a.r*a.k;
+
+
+/**
+ * Implicit function that evaluates the Julia set.
+ */
+class Julia
+private:
+ float global_real, global_imag, global_theta;
+ Quat oc,c,eio,emio;
+public:
+ Julia(float global_real, float global_imag, float global_theta);
+ inline float eval(float x, float y, float z)
+ Quat q, temp;
+ int i;
+
+ q.r = x;
+ q.i = y;
+ q.j = z;
+ q.k = 0.0;
+
+ for (i = 30; i > 0; i--)
+ qsqr(temp, q);
+ qmult(q, emio, temp);
+ qadd(q, c);
+
+ if (q.r*q.r + q.i*q.i + q.j*q.j + q.k*q.k > 8.0)
+ break;
+
+
+ return((float)i);
+
+ ;
+
+
+Julia::Julia(float global_real, float global_imag, float global_theta):
+ global_real(global_real), global_imag(global_imag), global_theta(global_theta)
+
+ oc.r = global_real;
+ oc.i = global_imag;
+ oc.j = oc.k = 0.0;
+
+ eio.r = cos(global_theta);
+ eio.i = sin(global_theta);
+ eio.j = 0.0;
+ eio.k = 0.0;
+
+ emio.r = cos(-global_theta);
+ emio.i = sin(-global_theta);
+ emio.j = 0.0;
+ emio.k = 0.0;
+
+ /***
+ *** multiply eio*c only once at the beginning of iteration
+ *** (since q |-> sqrt(eio*(q-eio*c)))
+ *** q -> e-io*q^2 - eio*c
+ ***/
+
+ qmult(c, eio,oc);
+
+
+
+
+#endif
Added: trunk/python-ogre/demos/ogre/Shadows.py
===================================================================
--- trunk/python-ogre/demos/ogre/Shadows.py (rev 0)
+++ trunk/python-ogre/demos/ogre/Shadows.py 2007-11-13 07:26:03 UTC (rev 471)
@@ -0,0 +1,1563 @@
+/*
+-----------------------------------------------------------------------------
+This source file is part of OGRE
+ (Object-oriented Graphics Rendering Engine)
+For the latest info, see http:##www.ogre3d.org/
+
+Copyright (c) 2000-2006 Torus Knot Software Ltd
+Also see acknowledgements in Readme.html
+
+You may use self sample code for anything you like, it is not covered by the
+LGPL like the rest of the engine.
+-----------------------------------------------------------------------------
+*/
+
+/**
+ \file
+ Shadows.cpp
+ \brief
+ Shows a few ways to use Ogre's shadowing techniques
+*/
+
+#include <CEGUI/CEGUIImageset.h>
+#include <CEGUI/CEGUISystem.h>
+#include <CEGUI/CEGUILogger.h>
+#include <CEGUI/CEGUISchemeManager.h>
+#include <CEGUI/CEGUIWindowManager.h>
+#include <CEGUI/CEGUIWindow.h>
+#include <CEGUI/elements/CEGUICombobox.h>
+#include <CEGUI/elements/CEGUIComboDropList.h>
+#include <CEGUI/elements/CEGUIEditbox.h>
+#include <CEGUI/elements/CEGUIListbox.h>
+#include <CEGUI/elements/CEGUIListboxTextItem.h>
+#include <CEGUI/elements/CEGUIPushButton.h>
+#include <CEGUI/elements/CEGUIScrollbar.h>
+#include <CEGUI/elements/CEGUIRadioButton.h>
+#include "OgreCEGUIRenderer.h"
+#include "OgreCEGUIResourceProvider.h"
+#include "ExampleApplication.h"
+
+/*
+#include "OgreNoMemoryMacros.h"
+#include <ode/odecpp.h>
+#include <ode/odecpp_collision.h>
+#include "OgreMemoryMacros.h"
+*/
+
+/*
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32:
+#include "OgreNoMemoryMacros.h"
+#include <crtdbg.h>
+#endi*/
+
+Entity* mAthene
+AnimationState* mAnimState = 0
+Entity* pPlaneEnt
+std.vector<Entity*> pColumns
+Light* mLight
+Light* mSunLight
+SceneNode* mLightNode = 0
+AnimationState* mLightAnimationState = 0
+ColourValue mMinLightColour(0.2, 0.1, 0.0)
+ColourValue mMaxLightColour(0.5, 0.3, 0.1)
+Real mMinFlareSize = 40
+Real mMaxFlareSize = 80
+
+## New depth shadowmapping
+String CUSTOM_ROCKWALL_MATERIAL("Ogre/DepthShadowmap/Receiver/RockWall")
+String CUSTOM_CASTER_MATERIAL("Ogre/DepthShadowmap/Caster/Float")
+String CUSTOM_RECEIVER_MATERIAL("Ogre/DepthShadowmap/Receiver/Float")
+String CUSTOM_ATHENE_MATERIAL("Ogre/DepthShadowmap/Receiver/Athene")
+
+String BASIC_ROCKWALL_MATERIAL("Examples/Rockwall")
+String BASIC_ATHENE_MATERIAL("Examples/Athene/NormalMapped")
+
+
+
+OverlayElement* mShadowTechniqueInfo
+OverlayElement* mMaterialInfo
+OverlayElement* mInfo
+
+
+/** This class 'wibbles' the light and billboard */
+class LightWibbler : public ControllerValue<Real>
+
+protected:
+ Light* mLight
+ Billboard* mBillboard
+ ColourValue mColourRange
+ ColourValue mMinColour
+ Real mMinSize
+ Real mSizeRange
+ Real intensity
+public:
+ LightWibbler(Light* light, Billboard* billboard, ColourValue& minColour,
+ ColourValue& maxColour, Real minSize, Real maxSize)
+
+ mLight = light
+ mBillboard = billboard
+ mMinColour = minColour
+ mColourRange.r = maxColour.r - minColour.r
+ mColourRange.g = maxColour.g - minColour.g
+ mColourRange.b = maxColour.b - minColour.b
+ mMinSize = minSize
+ mSizeRange = maxSize - minSize
+
+
+ virtual Real getValue (void)
+
+ return intensity
+
+
+ virtual void setValue (Real value)
+
+ intensity = value
+
+ ColourValue newColour
+
+ ## Attenuate the brightness of the light
+ newColour.r = mMinColour.r + (mColourRange.r * intensity)
+ newColour.g = mMinColour.g + (mColourRange.g * intensity)
+ newColour.b = mMinColour.b + (mColourRange.b * intensity)
+
+ mLight->setDiffuseColour(newColour)
+ mBillboard->setColour(newColour)
+ ## set billboard size
+ Real newSize = mMinSize + (intensity * mSizeRange)
+ mBillboard->setDimensions(newSize, newSize)
+
+
+
+
+Real timeDelay = 0
+#define KEY_PRESSED(_key,_timeDelay, _macro) \
+
+ if (mKeyboard->isKeyDown(_key) && timeDelay <= 0) \:
+
+ timeDelay = _timeDelay \
+ _macro \
+
+
+
+
+##---------------------------------------------------------------------------
+class GaussianListener: public Ogre.CompositorInstance::Listener
+
+protected:
+ int mVpWidth, mVpHeight
+ ## Array params - have to pack in groups of 4 since self is how Cg generates them
+ ## also prevents dependent texture read problems if ops don't require swizzle
+ float mBloomTexWeights[15][4]
+ float mBloomTexOffsetsHorz[15][4]
+ float mBloomTexOffsetsVert[15][4]
+public:
+ GaussianListener() {}
+ virtual ~GaussianListener() {}
+ void notifyViewportSize(int width, int height)
+
+ mVpWidth = width
+ mVpHeight = height
+ ## Calculate gaussian texture offsets & weights
+ float deviation = 3.0
+ float texelSize = 1.0 / (float)std.min(mVpWidth, mVpHeight)
+
+ ## central sample, no offset
+ mBloomTexOffsetsHorz[0][0] = 0.0
+ mBloomTexOffsetsHorz[0][1] = 0.0
+ mBloomTexOffsetsVert[0][0] = 0.0
+ mBloomTexOffsetsVert[0][1] = 0.0
+ mBloomTexWeights[0][0] = mBloomTexWeights[0][1] =
+ mBloomTexWeights[0][2] = Ogre.Math::gaussianDistribution(0, 0, deviation)
+ mBloomTexWeights[0][3] = 1.0
+
+ ## 'pre' samples
+ for(int i = 1 i < 8; ++i)
+
+ mBloomTexWeights[i][0] = mBloomTexWeights[i][1] =
+ mBloomTexWeights[i][2] = Ogre.Math::gaussianDistribution(i, 0, deviation)
+ mBloomTexWeights[i][3] = 1.0
+ mBloomTexOffsetsHorz[i][0] = i * texelSize
+ mBloomTexOffsetsHorz[i][1] = 0.0
+ mBloomTexOffsetsVert[i][0] = 0.0
+ mBloomTexOffsetsVert[i][1] = i * texelSize
+
+ ## 'post' samples
+ for(int i = 8 i < 15; ++i)
+
+ mBloomTexWeights[i][0] = mBloomTexWeights[i][1] =
+ mBloomTexWeights[i][2] = mBloomTexWeights[i - 7][0]
+ mBloomTexWeights[i][3] = 1.0
+
+ mBloomTexOffsetsHorz[i][0] = -mBloomTexOffsetsHorz[i - 7][0]
+ mBloomTexOffsetsHorz[i][1] = 0.0
+ mBloomTexOffsetsVert[i][0] = 0.0
+ mBloomTexOffsetsVert[i][1] = -mBloomTexOffsetsVert[i - 7][1]
+
+
+
+ virtual void notifyMaterialSetup(Ogre.uint32 pass_id, Ogre::MaterialPtr &mat)
+
+ ## Prepare the fragment params offsets
+ switch(pass_id)
+
+ case 701: ## blur horz
+
+ ## horizontal bloom
+ mat->load()
+ Ogre.GpuProgramParametersSharedPtr fparams =
+ mat->getBestTechnique()->getPass(0)->getFragmentProgramParameters()
+ Ogre.String& progName = mat->getBestTechnique()->getPass(0)->getFragmentProgramName()
+ ## A bit hacky - Cg & HLSL index arrays via [0], GLSL does not
+ fparams->setNamedConstant("sampleOffsets", mBloomTexOffsetsHorz[0], 15)
+ fparams->setNamedConstant("sampleWeights", mBloomTexWeights[0], 15)
+
+ break
+
+ case 700: ## blur vert
+
+ ## vertical bloom
+ mat->load()
+ Ogre.GpuProgramParametersSharedPtr fparams =
+ mat->getTechnique(0)->getPass(0)->getFragmentProgramParameters()
+ Ogre.String& progName = mat->getBestTechnique()->getPass(0)->getFragmentProgramName()
+ fparams->setNamedConstant("sampleOffsets", mBloomTexOffsetsVert[0], 15)
+ fparams->setNamedConstant("sampleWeights", mBloomTexWeights[0], 15)
+
+ break
+
+
+
+
+ virtual void notifyMaterialRender(Ogre.uint32 pass_id, Ogre::MaterialPtr &mat)
+
+
+
+
+GaussianListener gaussianListener
+
+
+class ShadowsListener : public ExampleFrameListener, public OIS.MouseListener,
+ public OIS.KeyListener
+
+protected:
+ SceneManager* mSceneMgr
+ Viewport *mShadowVp
+ CompositorInstance* mShadowCompositor
+ bool mShutdownRequested
+ CEGUI.Window* mRootGuiPanel
+ bool mLMBDown
+ bool mRMBDown
+ bool mProcessMovement
+ bool mUpdateMovement
+ bool mMoveFwd
+ bool mMoveBck
+ bool mMoveLeft
+ bool mMoveRight
+ CEGUI.Point mLastMousePosition
+ bool mLastMousePositionSet
+ float mAvgFrameTime
+ Camera* mTexCam
+
+
+ ##----------------------------------------------------------------//
+ CEGUI.MouseButton convertOISMouseButtonToCegui(int buttonID)
+
+ switch (buttonID)
+
+ case 0: return CEGUI.LeftButton
+ case 1: return CEGUI.RightButton
+ case 2: return CEGUI.MiddleButton
+ case 3: return CEGUI.X1Button
+ default: return CEGUI.LeftButton
+
+
+public:
+ ShadowsListener(RenderWindow* win, Camera* cam, SceneManager* sm)
+ : ExampleFrameListener(win, cam, True, true)
+ , mSceneMgr(sm)
+ , mShadowVp(0)
+ , mShadowCompositor(0)
+ , mShutdownRequested(False)
+ , mLMBDown(False)
+ , mRMBDown(False)
+ , mProcessMovement(False)
+ , mUpdateMovement(False)
+ , mMoveFwd(False)
+ , mMoveBck(False)
+ , mMoveLeft(False)
+ , mMoveRight(False)
+ , mLastMousePositionSet(False)
+ , mAvgFrameTime(0.1)
+
+
+ mMouse->setEventCallback(self)
+ mKeyboard->setEventCallback(self)
+
+ mRootGuiPanel = CEGUI.WindowManager::getSingleton().getWindow("Shadows")
+
+ mMoveSpeed = 10.0
+
+ ## Set up a debug panel to display the shadow
+ MaterialPtr debugMat = MaterialManager.getSingleton().create(
+ "Ogre/DebugShadowMap0", ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
+ debugMat->getTechnique(0)->getPass(0)->setLightingEnabled(False)
+ TexturePtr shadowTex = mSceneMgr->getShadowTexture(0)
+ TextureUnitState *t = debugMat->getTechnique(0)->getPass(0)->createTextureUnitState(shadowTex->getName())
+ t->setTextureAddressingMode(TextureUnitState.TAM_CLAMP)
+
+ debugMat = MaterialManager.getSingleton().create(
+ "Ogre/DebugShadowMap1", ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
+ debugMat->getTechnique(0)->getPass(0)->setLightingEnabled(False)
+ shadowTex = mSceneMgr->getShadowTexture(1)
+ t = debugMat->getTechnique(0)->getPass(0)->createTextureUnitState(shadowTex->getName())
+ t->setTextureAddressingMode(TextureUnitState.TAM_CLAMP)
+
+ /* Uncomment self to display the shadow textures
+ OverlayContainer* debugPanel = (OverlayContainer*)
+ (OverlayManager.getSingleton().createOverlayElement("Panel", "Ogre/DebugShadowPanel0"))
+ debugPanel->_setPosition(0.8, 0)
+ debugPanel->_setDimensions(0.2, 0.2)
+ debugPanel->setMaterialName("Ogre/DebugShadowMap0")
+ Overlay* debugOverlay = OverlayManager.getSingleton().getByName("Core/DebugOverlay")
+ debugOverlay->add2D(debugPanel)
+
+ debugPanel = (OverlayContainer*)
+ (OverlayManager.getSingleton().createOverlayElement("Panel", "Ogre/DebugShadowPanel1"))
+ debugPanel->_setPosition(0.8, 0.2)
+ debugPanel->_setDimensions(0.2, 0.2)
+ debugPanel->setMaterialName("Ogre/DebugShadowMap1")
+ debugOverlay->add2D(debugPanel)
+ */
+
+
+
+
+
+ bool frameStarted( FrameEvent& evt)
+
+ CEGUI.System::getSingleton().injectTimePulse(evt.timeSinceLastFrame)
+
+ mMouse->capture()
+ mKeyboard->capture()
+
+ if (mShutdownRequested):
+ return False
+ else:
+
+ ## update movement process
+ if(mProcessMovement || mUpdateMovement):
+
+ mTranslateVector.x += mMoveLeft ? mAvgFrameTime * -mMoveSpeed : 0
+ mTranslateVector.x += mMoveRight ? mAvgFrameTime * mMoveSpeed : 0
+ mTranslateVector.z += mMoveFwd ? mAvgFrameTime * -mMoveSpeed : 0
+ mTranslateVector.z += mMoveBck ? mAvgFrameTime * mMoveSpeed : 0
+
+ mCamera->yaw(mRotX)
+ mCamera->pitch(mRotY)
+ mCamera->moveRelative(mTranslateVector)
+
+ mUpdateMovement = False
+ mRotX = 0
+ mRotY = 0
+ mTranslateVector = Ogre.Vector3::ZERO
+
+
+
+
+ return True
+
+
+ bool frameEnded( FrameEvent& evt)
+
+ if (mAnimState):
+ mAnimState->addTime(evt.timeSinceLastFrame)
+
+ if (mShutdownRequested):
+ return False
+ else:
+ return ExampleFrameListener.frameEnded(evt)
+
+
+ ##----------------------------------------------------------------//
+ bool mouseMoved( OIS.MouseEvent &arg )
+
+ CEGUI.System::getSingleton().injectMouseMove( arg.state.X.rel, arg.state.Y.rel )
+ return True
+
+
+ ##----------------------------------------------------------------//
+ bool mousePressed( OIS.MouseEvent &arg, OIS::MouseButtonID id )
+
+ CEGUI.System::getSingleton().injectMouseButtonDown(convertOISMouseButtonToCegui(id))
+ return True
+
+
+ ##----------------------------------------------------------------//
+ bool mouseReleased( OIS.MouseEvent &arg, OIS::MouseButtonID id )
+
+ CEGUI.System::getSingleton().injectMouseButtonUp(convertOISMouseButtonToCegui(id))
+ return True
+
+
+ ##----------------------------------------------------------------//
+ bool keyPressed( OIS.KeyEvent &arg )
+
+ if( arg.key == OIS.KC_ESCAPE ):
+ mShutdownRequested = True
+
+ if (arg.key == OIS.KC_SYSRQ):
+ mWindow->writeContentsToTimestampedFile("screenshot", ".jpg")
+
+ CEGUI.System::getSingleton().injectKeyDown( arg.key )
+ CEGUI.System::getSingleton().injectChar( arg.text )
+ return True
+
+
+ ##----------------------------------------------------------------//
+ bool keyReleased( OIS.KeyEvent &arg )
+
+ CEGUI.System::getSingleton().injectKeyUp( arg.key )
+ return True
+
+ ##--------------------------------------------------------------------------
+ bool handleMouseMove( CEGUI.EventArgs& e)
+
+ CEGUI.MouseEventArgs& me = static_cast<const CEGUI::MouseEventArgs&>(e)
+
+ if( mLMBDown && !mRMBDown):
+
+ ## rotate camera
+ mRotX += Degree(-me.moveDelta.d_x * mAvgFrameTime * 3.0)
+ mRotY += Degree(-me.moveDelta.d_y * mAvgFrameTime * 3.0)
+ CEGUI.MouseCursor::getSingleton().setPosition( mLastMousePosition )
+ mUpdateMovement = True
+
+ else:
+
+ if( mRMBDown && !mLMBDown):
+
+ ## translate camera
+ mTranslateVector.x += me.moveDelta.d_x * mAvgFrameTime * mMoveSpeed
+ mTranslateVector.y += -me.moveDelta.d_y * mAvgFrameTime * mMoveSpeed
+ ##mTranslateVector.z = 0
+ CEGUI.MouseCursor::getSingleton().setPosition( mLastMousePosition )
+ mUpdateMovement = True
+
+ else:
+
+ if( mRMBDown && mLMBDown):
+
+ mTranslateVector.z += (me.moveDelta.d_x + me.moveDelta.d_y) * mAvgFrameTime * mMoveSpeed
+ CEGUI.MouseCursor::getSingleton().setPosition( mLastMousePosition )
+ mUpdateMovement = True
+
+
+
+
+
+ return True
+
+
+ ##--------------------------------------------------------------------------
+ bool handleMouseButtonUp( CEGUI.EventArgs& e)
+
+ CEGUI.MouseEventArgs& me = static_cast<const CEGUI::MouseEventArgs&>(e)
+
+ ##Window* wndw = (( WindowEventArgs&)e).window
+ if( me.button == CEGUI.LeftButton ):
+
+ mLMBDown = False
+
+
+ if( me.button == CEGUI.RightButton ):
+
+ mRMBDown = False
+
+ if( !mLMBDown && !mRMBDown ):
+
+ CEGUI.MouseCursor::getSingleton().show()
+ if(mLastMousePositionSet):
+
+ CEGUI.MouseCursor::getSingleton().setPosition( mLastMousePosition )
+ mLastMousePositionSet = False
+
+ mRootGuiPanel->releaseInput()
+
+
+ return True
+
+
+ ##--------------------------------------------------------------------------
+ bool handleMouseButtonDown( CEGUI.EventArgs& e)
+
+ CEGUI.MouseEventArgs& me = static_cast<const CEGUI::MouseEventArgs&>(e)
+
+ ##Window* wndw = (( WindowEventArgs&)e).window
+ if( me.button == CEGUI.LeftButton ):
+
+ mLMBDown = True
+
+
+ if( me.button == CEGUI.RightButton ):
+
+ mRMBDown = True
+
+
+ if( mLMBDown || mRMBDown ):
+
+ CEGUI.MouseCursor::getSingleton().hide()
+ if (!mLastMousePositionSet):
+
+ mLastMousePosition = CEGUI.MouseCursor::getSingleton().getPosition()
+ mLastMousePositionSet = True
+
+ mRootGuiPanel->captureInput()
+
+
+ return True
+
+
+ ##--------------------------------------------------------------------------
+ bool handleMouseWheelEvent( CEGUI.EventArgs& e)
+
+ CEGUI.MouseEventArgs& me = static_cast<const CEGUI::MouseEventArgs&>(e)
+ mTranslateVector.z += me.wheelChange * -5.0
+ mUpdateMovement = True
+
+ return True
+
+
+ ##--------------------------------------------------------------------------
+ void checkMovementKeys(CEGUI.Key::Scan scancode, bool state )
+
+
+ switch ( scancode )
+
+ case CEGUI.Key::A:
+ mMoveLeft = state
+ break
+
+ case CEGUI.Key::D:
+ mMoveRight = state
+ break
+
+ case CEGUI.Key::S:
+ mMoveBck = state
+ break
+
+ case CEGUI.Key::W:
+ mMoveFwd = state
+ break
+
+ default:
+ break
+
+
+
+ mProcessMovement = mMoveLeft || mMoveRight || mMoveFwd || mMoveBck
+
+
+ ##--------------------------------------------------------------------------
+ bool handleKeyDownEvent( CEGUI.EventArgs& e)
+
+ CEGUI.KeyEventArgs& ke = static_cast<const CEGUI::KeyEventArgs&>(e)
+
+ checkMovementKeys(ke.scancode , True)
+
+ return True
+
+
+ ##--------------------------------------------------------------------------
+ bool handleKeyUpEvent( CEGUI.EventArgs& e)
+
+ CEGUI.KeyEventArgs& ke = static_cast<const CEGUI::KeyEventArgs&>(e)
+ checkMovementKeys(ke.scancode, False )
+
+ return True
+
+
+
+
+
+
+
+class ShadowsApplication : public ExampleApplication
+
+protected:
+ enum ShadowProjection
+
+ UNIFORM,
+ UNIFORM_FOCUSED,
+ LISPSM,
+ PLANE_OPTIMAL
+
+
+ enum ShadowMaterial
+
+ MAT_STANDARD,
+ MAT_DEPTH_FLOAT,
+ MAT_DEPTH_FLOAT_PCF
+
+ CEGUI.OgreCEGUIRenderer* mGUIRenderer
+ CEGUI.System* mGUISystem
+ CEGUI.Window* mDescWindow
+ CEGUI.Scrollbar* mFixedBias
+ CEGUI.Scrollbar* mGradientBias
+ CEGUI.Scrollbar* mGradientClamp
+ CEGUI.Window* mDepthShadowTweak
+ CEGUI.Window* mFixedBiasText
+ CEGUI.Window* mGradientBiasText
+ CEGUI.Window* mGradientClampText
+
+
+ ShadowTechnique mCurrentShadowTechnique
+ ShadowProjection mCurrentProjection
+ ShadowMaterial mCurrentMaterial
+
+ GpuProgramParametersSharedPtr mCustomRockwallVparams
+ GpuProgramParametersSharedPtr mCustomRockwallFparams
+ GpuProgramParametersSharedPtr mCustomAtheneVparams
+ GpuProgramParametersSharedPtr mCustomAtheneFparams
+
+ ShadowCameraSetupPtr mCurrentShadowCameraSetup
+ ##/ Plane that defines plane-optimal shadow mapping basis
+ MovablePlane* mPlane
+ ## transient pointer to LiSPSM setup if present
+ LiSPSMShadowCameraSetup* mLiSPSMSetup
+
+ bool mIsOpenGL
+
+public:
+ ShadowsApplication() :
+ mGUIRenderer(0),
+ mGUISystem(0),
+ mPlane(0)
+
+
+
+
+
+ ~ShadowsApplication()
+
+ mDescWindow = 0
+
+ if(mGUISystem):
+
+ delete mGUISystem
+ mGUISystem = 0
+
+ if(mGUIRenderer):
+
+ delete mGUIRenderer
+ mGUIRenderer = 0
+
+
+ delete mPlane
+
+protected:
+
+ ## Override self to ensure FPU mode
+ bool configure(void)
+
+ ## Show the configuration dialog and initialise the system
+ ## You can skip self and use root.restoreConfig() to load configuration
+ ## settings if you were sure there are valid ones saved in ogre.cfg
+ if(mRoot->showConfigDialog()):
+
+ ## Custom option - to use PlaneOptimalShadowCameraSetup we must have
+ ## double-precision. Thus, set the D3D floating point mode if present,
+ ## no matter what was chosen
+ ConfigOptionMap& optMap = mRoot->getRenderSystem()->getConfigOptions()
+ ConfigOptionMap.iterator i = optMap.find("Floating-point mode")
+ if (i != optMap.end()):
+
+ if (i->second.currentValue != "Consistent"):
+
+ i->second.currentValue = "Consistent"
+ LogManager.getSingleton().logMessage("Demo_Shadows: overriding "
+ "D3D floating point mode to 'Consistent' to ensure precision "
+ "for plane-optimal camera setup option")
+
+
+
+
+ ## If returned True, user clicked OK so initialise
+ ## Here we choose to let the system create a default rendering window by passing 'True'
+ mWindow = mRoot->initialise(True)
+ return True
+
+ else:
+
+ return False
+
+
+
+ void generalSceneSetup()
+
+ ## do self first so we generate edge lists
+ mSceneMgr->setShadowTechnique(SHADOWTYPE_STENCIL_ADDITIVE)
+ mCurrentShadowTechnique = SHADOWTYPE_STENCIL_ADDITIVE
+
+ ## Set ambient light off
+ mSceneMgr->setAmbientLight(ColourValue(0.0, 0.0, 0.0))
+
+ ## Fixed light, dim
+ mSunLight = mSceneMgr->createLight("SunLight")
+ mSunLight->setType(Light.LT_SPOTLIGHT)
+ mSunLight->setPosition(1500,1750,1300)
+ mSunLight->setSpotlightRange(Degree(30), Degree(50))
+ Vector3 dir
+ dir = -mSunLight->getPosition()
+ dir.normalise()
+ mSunLight->setDirection(dir)
+ mSunLight->setDiffuseColour(0.35, 0.35, 0.38)
+ mSunLight->setSpecularColour(0.9, 0.9, 1)
+
+ ## Point light, movable, reddish
+ mLight = mSceneMgr->createLight("Light2")
+ mLight->setDiffuseColour(mMinLightColour)
+ mLight->setSpecularColour(1, 1, 1)
+ mLight->setAttenuation(8000,1,0.0005,0)
+
+ ## Create light node
+ mLightNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(
+ "MovingLightNode")
+ mLightNode->attachObject(mLight)
+ ## create billboard set
+ BillboardSet* bbs = mSceneMgr->createBillboardSet("lightbbs", 1)
+ bbs->setMaterialName("Examples/Flare")
+ Billboard* bb = bbs->createBillboard(0,0,0,mMinLightColour)
+ ## attach
+ mLightNode->attachObject(bbs)
+
+ ## create controller, after self is will get updated on its own
+ ControllerFunctionRealPtr func = ControllerFunctionRealPtr(
+ new WaveformControllerFunction(Ogre.WFT_SINE, 0.75, 0.5))
+ ControllerManager& contMgr = ControllerManager.getSingleton()
+ ControllerValueRealPtr val = ControllerValueRealPtr(
+ new LightWibbler(mLight, bb, mMinLightColour, mMaxLightColour,
+ mMinFlareSize, mMaxFlareSize))
+ Controller<Real>* controller = contMgr.createController(
+ contMgr.getFrameTimeSource(), val, func)
+
+ ##mLight->setPosition(Vector3(300,250,-300))
+ mLightNode->setPosition(Vector3(300,1750,-700))
+
+
+ ## Create a track for the light
+ Animation* anim = mSceneMgr->createAnimation("LightTrack", 20)
+ ## Spline it for nice curves
+ anim->setInterpolationMode(Animation.IM_SPLINE)
+ ## Create a track to animate the camera's node
+ NodeAnimationTrack* track = anim->createNodeTrack(0, mLightNode)
+ ## Setup keyframes
+ TransformKeyFrame* key = track->createNodeKeyFrame(0) ## A startposition
+ key->setTranslate(Vector3(300,750,-700))
+ key = track->createNodeKeyFrame(2) ##B
+ key->setTranslate(Vector3(150,800,-250))
+ key = track->createNodeKeyFrame(4) ##C
+ key->setTranslate(Vector3(-150,850,-100))
+ key = track->createNodeKeyFrame(6) ##D
+ key->setTranslate(Vector3(-400,700,-200))
+ key = track->createNodeKeyFrame(8) ##E
+ key->setTranslate(Vector3(-200,700,-400))
+ key = track->createNodeKeyFrame(10) ##F
+ key->setTranslate(Vector3(-100,850,-200))
+ key = track->createNodeKeyFrame(12) ##G
+ key->setTranslate(Vector3(-100,575,180))
+ key = track->createNodeKeyFrame(14) ##H
+ key->setTranslate(Vector3(0,750,300))
+ key = track->createNodeKeyFrame(16) ##I
+ key->setTranslate(Vector3(100,850,100))
+ key = track->createNodeKeyFrame(18) ##J
+ key->setTranslate(Vector3(250,800,0))
+ key = track->createNodeKeyFrame(20) ##K == A
+ key->setTranslate(Vector3(300,750,-700))
+ ## Create a new animation state to track self
+ mAnimState = mSceneMgr->createAnimationState("LightTrack")
+ mAnimState->setEnabled(True)
+ ## Make light node look at origin, self is for when we
+ ## change the moving light to a spotlight
+ mLightNode->setAutoTracking(True, mSceneMgr->getRootSceneNode())
+
+ ## Prepare athene mesh for normalmapping
+ MeshPtr pAthene = MeshManager.getSingleton().load("athene.mesh",
+ ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
+ unsigned short src, dest
+ if (!pAthene->suggestTangentVectorBuildParams(VES_TANGENT, src, dest)):
+
+ pAthene->buildTangentVectors(VES_TANGENT, src, dest)
+
+
+ SceneNode* node
+ node = mSceneMgr->getRootSceneNode()->createChildSceneNode()
+ mAthene = mSceneMgr->createEntity( "athene", "athene.mesh" )
+ mAthene->setMaterialName(BASIC_ATHENE_MATERIAL)
+ node->attachObject( mAthene )
+ node->translate(0,-27, 0)
+ node->yaw(Degree(90))
+
+ Entity* pEnt
+ ## Columns
+ for (int x = -2 x <= 2; ++x)
+
+ for (int z = -2 z <= 2; ++z)
+
+ if (x != 0 || z != 0):
+
+ StringUtil.StrStreamType str
+ str << "col" << x << "_" << z
+ node = mSceneMgr->getRootSceneNode()->createChildSceneNode()
+ pEnt = mSceneMgr->createEntity( str.str(), "column.mesh" )
+ pEnt->setMaterialName(BASIC_ROCKWALL_MATERIAL)
+ pColumns.push_back(pEnt)
+ node->attachObject( pEnt )
+ node->translate(x*300,0, z*300)
+
+
+
+
+
+
+
+ ## Skybox
+ mSceneMgr->setSkyBox(True, "Examples/StormySkyBox")
+
+ ## Floor plane (use POSM plane def)
+ mPlane = new MovablePlane("*mPlane")
+ mPlane->normal = Vector3.UNIT_Y
+ mPlane->d = 107
+ MeshManager.getSingleton().createPlane("Myplane",
+ ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME, *mPlane,
+ 1500,1500,50,50,True,1,5,5,Vector3.UNIT_Z)
+ pPlaneEnt = mSceneMgr->createEntity( "plane", "Myplane" )
+ pPlaneEnt->setMaterialName(BASIC_ROCKWALL_MATERIAL)
+ pPlaneEnt->setCastShadows(False)
+ mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(pPlaneEnt)
+
+ if (mRoot->getRenderSystem()->getCapabilities()->hasCapability(RSC_HWRENDER_TO_TEXTURE)):
+
+ ## In D3D, use a 1024x1024 shadow texture
+ mSceneMgr->setShadowTextureSettings(1024, 2)
+
+ else:
+
+ ## Use 512x512 texture in GL since we can't go higher than the window res
+ mSceneMgr->setShadowTextureSettings(512, 2)
+
+ mSceneMgr->setShadowColour(ColourValue(0.5, 0.5, 0.5))
+
+ ## incase infinite far distance is not supported
+ mCamera->setFarClipDistance(100000)
+
+ ##mSceneMgr->setShowDebugShadows(True)
+
+ mCamera->setPosition(250, 20, 400)
+ mCamera->lookAt(0, 10, 0)
+
+
+
+ ## Just override the mandatory create scene method
+ void createScene(void)
+
+ ## Need to detect D3D or GL for best depth shadowmapping
+ if (Root.getSingleton().getRenderSystem()->getName().find("GL") != String::npos):
+
+ mIsOpenGL = True
+
+ else:
+
+ mIsOpenGL = False
+
+
+ ## set up general scene (self defaults to additive stencils)
+ generalSceneSetup()
+
+ setupGUI()
+
+
+
+
+ ##/ Change basic shadow technique
+ void changeShadowTechnique(ShadowTechnique newTech)
+
+ mSceneMgr->setShadowTechnique(newTech)
+
+ ## Below is for projection
+ ##configureShadowCameras(mCurrentShadowTechnique, newTech)
+
+ configureLights(newTech)
+
+ ## Advanced modes - materials / compositors
+ ##configureCompositors(mCurrentShadowTechnique, newTech)
+ ##configureTextures(mCurrentShadowTechnique, newTech)
+ ##configureShadowCasterReceiverMaterials(mCurrentShadowTechnique, newTech)
+
+ updateGUI(newTech)
+
+ mCurrentShadowTechnique = newTech
+
+
+
+
+
+
+ void configureLights(ShadowTechnique newTech)
+
+ Vector3 dir
+ switch (newTech)
+
+ case SHADOWTYPE_STENCIL_ADDITIVE:
+ ## Fixed light, dim
+ mSunLight->setCastShadows(True)
+
+ ## Point light, movable, reddish
+ mLight->setType(Light.LT_POINT)
+ mLight->setCastShadows(True)
+ mLight->setDiffuseColour(mMinLightColour)
+ mLight->setSpecularColour(1, 1, 1)
+ mLight->setAttenuation(8000,1,0.0005,0)
+
+ break
+ case SHADOWTYPE_STENCIL_MODULATIVE:
+ ## Multiple lights cause obvious silhouette edges in modulative mode
+ ## So turn off shadows on the direct light
+ ## Fixed light, dim
+ mSunLight->setCastShadows(False)
+
+ ## Point light, movable, reddish
+ mLight->setType(Light.LT_POINT)
+ mLight->setCastShadows(True)
+ mLight->setDiffuseColour(mMinLightColour)
+ mLight->setSpecularColour(1, 1, 1)
+ mLight->setAttenuation(8000,1,0.0005,0)
+ break
+ case SHADOWTYPE_TEXTURE_MODULATIVE:
+ case SHADOWTYPE_TEXTURE_ADDITIVE:
+ ## Fixed light, dim
+ mSunLight->setCastShadows(True)
+
+ ## Change moving light to spotlight
+ ## Point light, movable, reddish
+ mLight->setType(Light.LT_SPOTLIGHT)
+ mLight->setDirection(Vector3.NEGATIVE_UNIT_Z)
+ mLight->setCastShadows(True)
+ mLight->setDiffuseColour(mMinLightColour)
+ mLight->setSpecularColour(1, 1, 1)
+ mLight->setAttenuation(8000,1,0.0005,0)
+ mLight->setSpotlightRange(Degree(80),Degree(90))
+
+
+ break
+ default:
+ break
+
+
+
+
+ void setupGUI()
+
+ ## setup GUI system
+ mGUIRenderer = new CEGUI.OgreCEGUIRenderer(mWindow,
+ Ogre.RENDER_QUEUE_OVERLAY, False, 3000, mSceneMgr)
+
+ mGUISystem = new CEGUI.System(mGUIRenderer)
+
+ CEGUI.Logger::getSingleton().setLoggingLevel(CEGUI::Informative)
+
+ ## load scheme and set up defaults
+ CEGUI.SchemeManager::getSingleton().loadScheme(
+ (CEGUI.utf8*)"TaharezLookSkin.scheme")
+ mGUISystem->setDefaultMouseCursor(
+ (CEGUI.utf8*)"TaharezLook", (CEGUI::utf8*)"MouseArrow")
+ mGUISystem->setDefaultFont((CEGUI.utf8*)"BlueHighway-12")
+
+ CEGUI.Window* sheet =
+ CEGUI.WindowManager::getSingleton().loadWindowLayout(
+ (CEGUI.utf8*)"shadows.layout")
+ mGUISystem->setGUISheet(sheet)
+
+ ## Tooltips aren't big enough, do our own
+ ##mGUISystem->setDefaultTooltip("TaharezLook/Tooltip")
+
+ CEGUI.WindowManager& wmgr = CEGUI::WindowManager::getSingleton()
+ ## Get description window
+ mDescWindow = wmgr.getWindow("Shadows/Desc")
+
+ CEGUI.Window *wnd = wmgr.getWindow("Shadows/Stencil")
+ wnd->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnter, self))
+ wnd->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+ wnd = wmgr.getWindow("Shadows/Texture")
+ wnd->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnter, self))
+ wnd->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+ wnd = wmgr.getWindow("Shadows/Additive")
+ wnd->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnter, self))
+ wnd->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+ wnd = wmgr.getWindow("Shadows/Modulative")
+ wnd->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnter, self))
+ wnd->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+
+ ## Combo doesn't raise enter / exit itself, have to grab subcomponents?
+ CEGUI.Combobox* cbo = static_cast<CEGUI::Combobox*>(wmgr.getWindow("Shadows/Projection"))
+ cbo->subscribeEvent(CEGUI.Combobox::EventListSelectionAccepted,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleProjectionChanged, self))
+ cbo->getEditbox()->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnterCombo, self))
+ cbo->getEditbox()->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+ cbo->getDropList()->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnterCombo, self))
+ cbo->getDropList()->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+ cbo->getPushButton()->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnterCombo, self))
+ cbo->getPushButton()->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+ ## Populate projection
+ ## Get a select image to be used for highlighting items in listbox when mouse moves over them
+ CEGUI.Image* selectImage = &CEGUI::ImagesetManager::getSingleton().getImageset("TaharezLook")->getImage("MultiListSelectionBrush")
+ CEGUI.ListboxTextItem* li = new CEGUI::ListboxTextItem("Uniform", UNIFORM)
+ li->setSelectionBrushImage(selectImage)
+ li->setTooltipText("Uniform: Shadows are rendered and projected using a uniform "
+ "frustum for the whole light coverage. Simple and lowest quality.")
+ cbo->addItem(li)
+ cbo->setItemSelectState(li, True)
+ cbo->setText("Uniform")
+ mCurrentProjection = UNIFORM
+ li = new CEGUI.ListboxTextItem("Uniform Focused", UNIFORM_FOCUSED)
+ li->setSelectionBrushImage(selectImage)
+ li->setTooltipText("Uniform Focused: As Uniform except that the frustum is "
+ "focused on the visible area of the camera. Better quality than Uniform "
+ "at the expense of some 'swimming'.")
+ cbo->addItem(li)
+ li = new CEGUI.ListboxTextItem("LiSPSM", LISPSM)
+ li->setSelectionBrushImage(selectImage)
+ li->setTooltipText("LiSPSM: The frustum is distorted to take into account "
+ "the perspective of the camera, and focused on the visible area. "
+ "Good quality & flexibility.")
+ cbo->addItem(li)
+ li = new CEGUI.ListboxTextItem("Plane Optimal", PLANE_OPTIMAL)
+ li->setSelectionBrushImage(selectImage)
+ li->setTooltipText("Plane Optimal: The frustum is optimised to project "
+ "shadows onto a plane of interest. Best possible quality for the "
+ "plane, less good for other receiver angles.")
+ cbo->addItem(li)
+
+
+ cbo = static_cast<CEGUI.Combobox*>(wmgr.getWindow("Shadows/Material"))
+ cbo->getEditbox()->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnterCombo, self))
+ cbo->getEditbox()->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+ cbo->getDropList()->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnterCombo, self))
+ cbo->getDropList()->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+ cbo->getPushButton()->subscribeEvent(CEGUI.Window::EventMouseEnters,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseEnterCombo, self))
+ cbo->getPushButton()->subscribeEvent(CEGUI.Window::EventMouseLeaves,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMouseLeave, self))
+ cbo->subscribeEvent(CEGUI.Combobox::EventListSelectionAccepted,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleMaterialChanged, self))
+
+ li = new CEGUI.ListboxTextItem("Standard", MAT_STANDARD)
+ li->setSelectionBrushImage(selectImage)
+ li->setTooltipText("Standard Material: Shadows are rendered into a simple RGB texture "
+ " and are received only by objects that are not themselves shadow casters "
+ " (no self-shadowing)")
+ cbo->addItem(li)
+ cbo->setItemSelectState(li, True)
+ cbo->setText("Standard")
+ mCurrentMaterial = MAT_STANDARD
+
+ ## Only add depth shadowmapping if supported
+ if (GpuProgramManager.getSingleton().isSyntaxSupported("ps_2_0") ||:
+ GpuProgramManager.getSingleton().isSyntaxSupported("glsl"))
+
+ li = new CEGUI.ListboxTextItem("Depth Shadowmap", MAT_DEPTH_FLOAT)
+ li->setSelectionBrushImage(selectImage)
+ li->setTooltipText("Depth Shadowmap: Shadow caster depth is rendered into a "
+ " floating point texture and a depth comparison is performed on receivers "
+ " (self-shadowing allowed). Requires floating point textures and shader support.")
+ cbo->addItem(li)
+
+ li = new CEGUI.ListboxTextItem("Depth Shadowmap (PCF)", MAT_DEPTH_FLOAT_PCF)
+ li->setSelectionBrushImage(selectImage)
+ li->setTooltipText("Depth Shadowmap (PCF): Shadow caster depth is rendered into a "
+ " floating point texture and a depth comparison is performed on receivers "
+ " (self-shadowing allowed), with a percentage closest filter. Requires "
+ "floating point textures and shader support.")
+ cbo->addItem(li)
+
+
+ CEGUI.RadioButton* radio = static_cast<CEGUI::RadioButton*>(
+ wmgr.getWindow("Shadows/Stencil"))
+ radio->setSelected(True)
+ radio->subscribeEvent(CEGUI.RadioButton::EventSelectStateChanged,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleShadowTypeChanged, self))
+ radio = static_cast<CEGUI.RadioButton*>(wmgr.getWindow("Shadows/Texture"))
+ radio->subscribeEvent(CEGUI.RadioButton::EventSelectStateChanged,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleShadowTypeChanged, self))
+ radio = static_cast<CEGUI.RadioButton*>(wmgr.getWindow("Shadows/Modulative"))
+ radio->subscribeEvent(CEGUI.RadioButton::EventSelectStateChanged,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleShadowTypeChanged, self))
+ radio = static_cast<CEGUI.RadioButton*>(wmgr.getWindow("Shadows/Additive"))
+ radio->setSelected(True)
+ radio->subscribeEvent(CEGUI.RadioButton::EventSelectStateChanged,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleShadowTypeChanged, self))
+
+
+
+ mFixedBias = static_cast<CEGUI.Scrollbar*>(wmgr.getWindow("Shadows/DepthShadowTweakGroup/FixedBias"))
+ mFixedBias->setScrollPosition(0.002)
+ mFixedBias->subscribeEvent(CEGUI.Scrollbar::EventScrollPositionChanged,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleParamsChanged, self))
+ mGradientBias = static_cast<CEGUI.Scrollbar*>(wmgr.getWindow("Shadows/DepthShadowTweakGroup/SlopeBias"))
+ mGradientBias->setScrollPosition(0.0008)
+ mGradientBias->subscribeEvent(CEGUI.Scrollbar::EventScrollPositionChanged,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleParamsChanged, self))
+ mGradientClamp = static_cast<CEGUI.Scrollbar*>(wmgr.getWindow("Shadows/DepthShadowTweakGroup/SlopeClamp"))
+ mGradientClamp->setScrollPosition(0.02)
+ mGradientClamp->subscribeEvent(CEGUI.Scrollbar::EventScrollPositionChanged,
+ CEGUI.Event::Subscriber(&ShadowsApplication::handleParamsChanged, self))
+
+ mDepthShadowTweak = wmgr.getWindow("Shadows/DepthShadowTweakGroup")
+ mDepthShadowTweak->setVisible(False)
+ mFixedBiasText = wmgr.getWindow("Shadows/DepthShadowTweakGroup/FixedBiasText")
+ mGradientBiasText = wmgr.getWindow("Shadows/DepthShadowTweakGroup/SlopeBiasText")
+ mGradientClampText = wmgr.getWindow("Shadows/DepthShadowTweakGroup/SlopeClampText")
+
+
+
+
+ updateGUI(mCurrentShadowTechnique)
+
+
+
+
+
+ void updateGUI(ShadowTechnique newTech)
+
+ bool isTextureBased = (newTech & SHADOWDETAILTYPE_TEXTURE) != 0
+
+ ## Stencil based technique, turn off the texture-specific options
+ CEGUI.WindowManager& wmgr = CEGUI::WindowManager::getSingleton()
+ CEGUI.Window* win = wmgr.getWindow("Shadows/Projection")
+ win->setEnabled(isTextureBased)
+ win = wmgr.getWindow("Shadows/Material")
+ win->setEnabled(isTextureBased)
+
+
+
+ ##/ callback when mouse enters a described field (non-combo)
+ bool handleMouseEnter( CEGUI.EventArgs& e)
+
+ CEGUI.WindowEventArgs& winargs =
+ static_cast< CEGUI.WindowEventArgs&>(e)
+ mDescWindow->setText(winargs.window->getTooltipText())
+
+ return True
+
+ ##/ callback when mouse leaves a described field
+ bool handleMouseLeave( CEGUI.EventArgs& e)
+
+ ##if (mDescWindow):
+ ## mDescWindow->setText("")
+
+ return True
+
+
+ void updateTipForCombo(CEGUI.Combobox* cbo)
+
+
+ CEGUI.String text = cbo->getTooltipText()
+
+ text.append(" ")
+ if (cbo->getSelectedItem()):
+ text.append(cbo->getSelectedItem()->getTooltipText())
+ mDescWindow->setText(text)
+
+
+ ##/ callback when mouse enters a described field (combo)
+ bool handleMouseEnterCombo( CEGUI.EventArgs& e)
+
+ CEGUI.WindowEventArgs& winargs =
+ static_cast< CEGUI.WindowEventArgs&>(e)
+ ## get tooltip from parent combo (events raised on contained components)
+ CEGUI.Combobox* cbo = static_cast<CEGUI::Combobox*>(winargs.window->getParent())
+ updateTipForCombo(cbo)
+
+ return True
+
+ ## Callback when a shadow type combo changed
+ bool handleShadowTypeChanged( CEGUI.EventArgs& e)
+
+ ## Only trigger change on selected
+ CEGUI.WindowEventArgs& we = static_cast<const CEGUI::WindowEventArgs&>(e)
+ CEGUI.RadioButton* radio = static_cast<CEGUI::RadioButton*>(we.window)
+ if (radio->isSelected()):
+
+ ShadowTechnique newTech = mCurrentShadowTechnique
+ switch (radio->getID())
+
+ case 1:
+ ## stencil
+ newTech = static_cast<ShadowTechnique>(
+ (newTech & ~SHADOWDETAILTYPE_TEXTURE) | SHADOWDETAILTYPE_STENCIL)
+ resetMaterials()
+ break
+ case 2:
+ ## texture
+ newTech = static_cast<ShadowTechnique>(
+ (newTech & ~SHADOWDETAILTYPE_STENCIL) | SHADOWDETAILTYPE_TEXTURE)
+ break
+ case 3:
+ ## additive
+ newTech = static_cast<ShadowTechnique>(
+ (newTech & ~SHADOWDETAILTYPE_MODULATIVE) | SHADOWDETAILTYPE_ADDITIVE)
+ break
+ case 4:
+ ## modulative
+ newTech = static_cast<ShadowTechnique>(
+ (newTech & ~SHADOWDETAILTYPE_ADDITIVE) | SHADOWDETAILTYPE_MODULATIVE)
+ break
+
+
+
+
+ changeShadowTechnique(newTech)
+
+
+
+ return True
+
+
+ bool handleProjectionChanged( CEGUI.EventArgs& e)
+
+ CEGUI.WindowEventArgs& winargs =
+ static_cast< CEGUI.WindowEventArgs&>(e)
+ CEGUI.Combobox* cbo = static_cast<CEGUI::Combobox*>(winargs.window)
+
+ if (cbo->getSelectedItem()):
+
+ ShadowProjection proj = (ShadowProjection)cbo->getSelectedItem()->getID()
+ if (proj != mCurrentProjection):
+
+ switch(proj)
+
+ case UNIFORM:
+ mCurrentShadowCameraSetup =
+ ShadowCameraSetupPtr(new DefaultShadowCameraSetup())
+ break
+ case UNIFORM_FOCUSED:
+ mCurrentShadowCameraSetup =
+ ShadowCameraSetupPtr(new FocusedShadowCameraSetup())
+ break
+ case LISPSM:
+
+ mLiSPSMSetup = new LiSPSMShadowCameraSetup()
+ ##mLiSPSMSetup->setUseAggressiveFocusRegion(False)
+ mCurrentShadowCameraSetup = ShadowCameraSetupPtr(mLiSPSMSetup)
+
+ break
+ case PLANE_OPTIMAL:
+ mCurrentShadowCameraSetup =
+ ShadowCameraSetupPtr(new PlaneOptimalShadowCameraSetup(mPlane))
+ break
+
+
+ mCurrentProjection = proj
+
+ mSceneMgr->setShadowCameraSetup(mCurrentShadowCameraSetup)
+
+ updateTipForCombo(cbo)
+ if (!mCustomRockwallVparams.isNull() && !mCustomRockwallFparams.isNull()):
+
+ ## set
+ setDefaultDepthShadowParams()
+
+
+
+
+
+ return True
+
+
+ void updateDepthShadowParams()
+
+ mCustomRockwallFparams->setNamedConstant("fixedDepthBias",
+ mFixedBias->getScrollPosition())
+ mCustomRockwallFparams->setNamedConstant("gradientScaleBias",
+ mGradientBias->getScrollPosition())
+ mCustomRockwallFparams->setNamedConstant("gradientClamp",
+ mGradientClamp->getScrollPosition())
+
+ mCustomAtheneFparams->setNamedConstant("fixedDepthBias",
+ mFixedBias->getScrollPosition())
+ mCustomAtheneFparams->setNamedConstant("gradientScaleBias",
+ mGradientBias->getScrollPosition())
+ mCustomAtheneFparams->setNamedConstant("gradientClamp",
+ mGradientClamp->getScrollPosition())
+
+
+ mFixedBiasText->setText(StringConverter.toString(
+ mFixedBias->getScrollPosition(), 4, 5, '0', std.ios::fixed))
+ mGradientBiasText->setText(StringConverter.toString(
+ mGradientBias->getScrollPosition(), 4, 5, '0', std.ios::fixed))
+ mGradientClampText->setText(StringConverter.toString(
+ mGradientClamp->getScrollPosition(), 4, 5, '0', std.ios::fixed))
+
+
+ void setDefaultDepthShadowParams()
+
+ switch(mCurrentProjection)
+
+ case UNIFORM:
+ case UNIFORM_FOCUSE...
[truncated message content] |
|
From: <and...@us...> - 2007-11-13 07:17:33
|
Revision: 470
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=470&view=rev
Author: andy_miller
Date: 2007-11-12 23:17:32 -0800 (Mon, 12 Nov 2007)
Log Message:
-----------
Added Watermesh and Ofusion (testing)\nGeneral merge to my working environment
Added Paths:
-----------
trunk/python-ogre/packages_2.6/
trunk/python-ogre/packages_2.6/ogre/
trunk/python-ogre/packages_2.6/ogre/__init__.py
trunk/python-ogre/packages_2.6/ogre/addons/
trunk/python-ogre/packages_2.6/ogre/addons/__init__.py
trunk/python-ogre/packages_2.6/ogre/addons/ogredshow/
trunk/python-ogre/packages_2.6/ogre/addons/ogredshow/__init__.py
trunk/python-ogre/packages_2.6/ogre/addons/ogrevideoffmpeg/
trunk/python-ogre/packages_2.6/ogre/addons/ogrevideoffmpeg/__init__.py
trunk/python-ogre/packages_2.6/ogre/addons/plib/
trunk/python-ogre/packages_2.6/ogre/addons/plib/__init__.py
trunk/python-ogre/packages_2.6/ogre/addons/theora/
trunk/python-ogre/packages_2.6/ogre/addons/theora/__init__.py
trunk/python-ogre/packages_2.6/ogre/gui/
trunk/python-ogre/packages_2.6/ogre/gui/CEGUI/
trunk/python-ogre/packages_2.6/ogre/gui/CEGUI/__init__.py
trunk/python-ogre/packages_2.6/ogre/gui/QuickGUI/
trunk/python-ogre/packages_2.6/ogre/gui/QuickGUI/__init__.py
trunk/python-ogre/packages_2.6/ogre/gui/__init__.py
trunk/python-ogre/packages_2.6/ogre/gui/betagui/
trunk/python-ogre/packages_2.6/ogre/gui/betagui/__init__.py
trunk/python-ogre/packages_2.6/ogre/gui/navi/
trunk/python-ogre/packages_2.6/ogre/gui/navi/__init__.py
trunk/python-ogre/packages_2.6/ogre/io/
trunk/python-ogre/packages_2.6/ogre/io/OIS/
trunk/python-ogre/packages_2.6/ogre/io/OIS/__init__.py
trunk/python-ogre/packages_2.6/ogre/io/__init__.py
trunk/python-ogre/packages_2.6/ogre/physics/
trunk/python-ogre/packages_2.6/ogre/physics/NxOgre/
trunk/python-ogre/packages_2.6/ogre/physics/NxOgre/__init__.py
trunk/python-ogre/packages_2.6/ogre/physics/ODE/
trunk/python-ogre/packages_2.6/ogre/physics/ODE/__init__.py
trunk/python-ogre/packages_2.6/ogre/physics/OgreNewt/
trunk/python-ogre/packages_2.6/ogre/physics/OgreNewt/__init__.py
trunk/python-ogre/packages_2.6/ogre/physics/OgreOde/
trunk/python-ogre/packages_2.6/ogre/physics/OgreOde/__init__.py
trunk/python-ogre/packages_2.6/ogre/physics/OgreRefApp/
trunk/python-ogre/packages_2.6/ogre/physics/OgreRefApp/__init__.py
trunk/python-ogre/packages_2.6/ogre/physics/Opcode/
trunk/python-ogre/packages_2.6/ogre/physics/Opcode/__init__.py
trunk/python-ogre/packages_2.6/ogre/physics/PhysX/
trunk/python-ogre/packages_2.6/ogre/physics/PhysX/__init__.py
trunk/python-ogre/packages_2.6/ogre/physics/__init__.py
trunk/python-ogre/packages_2.6/ogre/physics/bullet/
trunk/python-ogre/packages_2.6/ogre/physics/bullet/__init__.py
trunk/python-ogre/packages_2.6/ogre/renderer/
trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/
trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/__init__.py
trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/_ogre_exceptions_.py
trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/named_tuple.py
trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/sf_OIS.py
trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/sf_utils.py
trunk/python-ogre/packages_2.6/ogre/renderer/__init__.py
trunk/python-ogre/packages_2.6/ogre/sound/
trunk/python-ogre/packages_2.6/ogre/sound/OgreAL/
trunk/python-ogre/packages_2.6/ogre/sound/OgreAL/__init__.py
trunk/python-ogre/packages_2.6/ogre/sound/__init__.py
Added: trunk/python-ogre/packages_2.6/ogre/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+#keep me
Added: trunk/python-ogre/packages_2.6/ogre/addons/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/addons/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/addons/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+#keep me
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/addons/ogredshow/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/addons/ogredshow/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/addons/ogredshow/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+from _ogredshow_ import *
Added: trunk/python-ogre/packages_2.6/ogre/addons/ogrevideoffmpeg/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/addons/ogrevideoffmpeg/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/addons/ogrevideoffmpeg/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+from _ogrevideoffmpeg_ import *
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/addons/plib/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/addons/plib/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/addons/plib/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,2 @@
+import sys, os
+from _plib_ import *
Added: trunk/python-ogre/packages_2.6/ogre/addons/theora/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/addons/theora/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/addons/theora/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+from _theora_ import *
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/gui/CEGUI/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/gui/CEGUI/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/gui/CEGUI/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,10 @@
+import sys, os
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+
+## we need the path for additional CEGUI dll's
+if sys.platform == 'win32':
+ os.environ['PATH'] += ';' + __path__[0]
+
+from _cegui_ import *
+warnings.resetwarnings( )
Added: trunk/python-ogre/packages_2.6/ogre/gui/QuickGUI/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/gui/QuickGUI/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/gui/QuickGUI/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,5 @@
+import sys, os
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+from _quickgui_ import *
+warnings.resetwarnings( )
Added: trunk/python-ogre/packages_2.6/ogre/gui/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/gui/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/gui/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+#keep me
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/gui/betagui/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/gui/betagui/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/gui/betagui/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,4 @@
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+from _betagui_ import *
+warnings.resetwarnings( )
Added: trunk/python-ogre/packages_2.6/ogre/gui/navi/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/gui/navi/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/gui/navi/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,2 @@
+import sys, os
+from _navi_ import *
Added: trunk/python-ogre/packages_2.6/ogre/io/OIS/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/io/OIS/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/io/OIS/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,5 @@
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+
+from _ois_ import *
+warnings.resetwarnings( )
Added: trunk/python-ogre/packages_2.6/ogre/io/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/io/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/io/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+#keep me
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/physics/NxOgre/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/physics/NxOgre/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/physics/NxOgre/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,7 @@
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+
+from _nxogre_ import *
+
+warnings.resetwarnings( )
+
Added: trunk/python-ogre/packages_2.6/ogre/physics/ODE/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/physics/ODE/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/physics/ODE/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+from _ode_ import *
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/physics/OgreNewt/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/physics/OgreNewt/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/physics/OgreNewt/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,6 @@
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+
+from _ogrenewt_ import *
+
+warnings.resetwarnings( )
Added: trunk/python-ogre/packages_2.6/ogre/physics/OgreOde/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/physics/OgreOde/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/physics/OgreOde/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+from _ogreode_ import *
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/physics/OgreRefApp/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/physics/OgreRefApp/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/physics/OgreRefApp/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+from _ogrerefapp_ import *
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/physics/Opcode/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/physics/Opcode/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/physics/Opcode/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+from _opcode_ import *
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/physics/PhysX/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/physics/PhysX/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/physics/PhysX/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,21 @@
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+
+from _physx_ import *
+import ogre.renderer.OGRE as ogre
+
+def NxQuat( arg0=None, arg1=None ):
+ if isinstance (arg0, ogre.Quaternion) :
+ ret = _physx_.NxQuat()
+ ret.w = arg0.w
+ ret.x = arg0.x
+ ret.y = arg0.y
+ ret.z = arg0.z
+ return ret
+ elif arg1:
+ return _physx_.NxQuat(arg0,arg1)
+ elif arg0:
+ return _physx_.NxQuat(arg0)
+ return _physx_.NxQuat()
+warnings.resetwarnings( )
+
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/physics/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/physics/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/physics/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+#keep me
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/physics/bullet/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/physics/bullet/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/physics/bullet/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+from _bullet_ import *
Added: trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,42 @@
+import sys, os
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+
+# Note that we put the Python-Ogre path first to ensure we don't get strange problems with windows
+# picking up the wrong dlls -- Thanks to Pelle for tracking down this issue..
+if sys.platform == 'win32':
+ os.environ['PATH'] = __path__[0] +';' + os.environ['PATH']
+
+from _ogre_ import *
+from _ogre_exceptions_ import *
+
+
+## Note the work around to ensure the Radians and Degree types work correctly
+## the problem is the constructors are overloaded in each class and passing a real to
+## Radian actually causes boost to try it as a Degree first, and as Degreee has a 'Real' overload
+## it create the Degree and passes it back to Radian --
+##
+## and as it's a lot of work and overly confusing to fix this in generate_code.py we fix it here
+##
+def Radian( r=None, d=None ):
+ if isinstance( r, _ogre_.Degree ):
+ return _ogre_.Radian( r )
+ elif isinstance( r, _ogre_.Radian ):
+ return _ogre_.Radian().assign( r )
+ elif d:
+ return _ogre_.Radian( d=d )
+ else:
+ return _ogre_.Radian( r=r )
+
+def Degree( d=None, r=None ):
+ if isinstance( d, _ogre_.Radian ):
+ return _ogre_.Degree( d )
+ elif isinstance( d, _ogre_.Degree ):
+ return _ogre_.Degree().assign( d )
+ elif r:
+ return _ogre.Degree (r=r)
+ else:
+ return _ogre_.Degree( d=d )
+
+warnings.resetwarnings( )
+
Added: trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/_ogre_exceptions_.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/_ogre_exceptions_.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/_ogre_exceptions_.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,111 @@
+import _ogre_
+
+class OgreException(Exception):
+ def __init__( self, app_error ):
+ Exception.__init__( self )
+ self._pimpl = app_error
+
+ def __str__( self ):
+ return self._pimpl.getFullDescription()
+
+ def __getattribute__(self, attr):
+ my_pimpl = super(OgreException, self).__getattribute__("_pimpl")
+ try:
+ return getattr(my_pimpl, attr)
+ except AttributeError:
+ return super(OgreException,self).__getattribute__(attr)
+
+_ogre_.OgreException = OgreException
+#this one for backward compatability
+_ogre_.Exception = OgreException
+_ogre_._Exception_.py_err_class = OgreException
+
+class OgreFileNotFoundException(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(OgreFileNotFoundException,self).__getattribute__(attr)
+
+_ogre_._FileNotFoundException_.py_err_class = OgreFileNotFoundException
+_ogre_.OgreFileNotFoundException = OgreFileNotFoundException
+
+class OgreIOException(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(OgreIOException,self).__getattribute__(attr)
+
+_ogre_._IOException_.py_err_class = OgreIOException
+_ogre_.OgreIOException = OgreIOException
+
+class OgreInvalidStateException(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(OgreInvalidStateException,self).__getattribute__(attr)
+
+_ogre_._InvalidStateException_.py_err_class = OgreInvalidStateException
+_ogre_.OgreInvalidStateException = OgreInvalidStateException
+
+class OgreInvalidParametersException(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(OgreInvalidParametersException,self).__getattribute__(attr)
+
+_ogre_._InvalidParametersException_.py_err_class = OgreInvalidParametersException
+_ogre_.OgreInvalidParametersException = OgreInvalidParametersException
+
+class OgreUnimplementedException(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(OgreUnimplementedException,self).__getattribute__(attr)
+
+_ogre_._UnimplementedException_.py_err_class = OgreUnimplementedException
+_ogre_.OgreUnimplementedException = OgreUnimplementedException
+
+class OgreInternalErrorException(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(OgreInternalErrorException,self).__getattribute__(attr)
+
+_ogre_._InternalErrorException_.py_err_class = OgreInternalErrorException
+_ogre_.OgreInternalErrorException = OgreInternalErrorException
+
+class OgreItemIdentityException(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(OgreItemIdentityException,self).__getattribute__(attr)
+
+_ogre_._ItemIdentityException_.py_err_class = OgreItemIdentityException
+_ogre_.OgreItemIdentityException = OgreItemIdentityException
+
+class OgreRuntimeAssertionException(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(OgreRuntimeAssertionException,self).__getattribute__(attr)
+
+_ogre_._RuntimeAssertionException_.py_err_class = OgreRuntimeAssertionException
+_ogre_.OgreRuntimeAssertionException = OgreRuntimeAssertionException
+
+class OgreRenderingAPIException(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(OgreRenderingAPIException,self).__getattribute__(attr)
+
+_ogre_._RenderingAPIException_.py_err_class = OgreRenderingAPIException
+_ogre_.OgreRenderingAPIException = OgreRenderingAPIException
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/named_tuple.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/named_tuple.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/named_tuple.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,46 @@
+# This file has been generated by Py++.
+
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+class named_tuple(tuple):
+ """Creates tuple, which allows access to stored values by name and\or by index.
+
+ Construction example: named_tuple( ('a',0), ('b',1) )
+ 'a' and 'b' are names, while 0 and 1 are values
+ """
+
+ def __new__(cls, *args):
+ return tuple.__new__( cls, [ val for name, val in args] )
+
+ def __init__(self, *args):
+ tuple.__init__( self )
+ self.__dict__[ '__name2value' ] = dict( args )
+
+ def __getattr__(self, name):
+ try:
+ return self.__dict__['__name2value'][ name ]
+ except KeyError:
+ raise AttributeError( "named_tuple has no attribute '%s'" % name )
+
+ def __setattr__(self, name, value):
+ raise AttributeError( "named_tuple has no attribute '%s'" % name )
+
+ def __getitem__( self, key ):
+ #TODO: it could be nice to support slicing. So the __getitem__ in case of
+ #slicing will return new named_tuple.
+ if isinstance( key, basestring ):
+ return self.__dict__['__name2value'][ key ]
+ else:
+ return super( named_tuple, self ).__getitem__( key )
+
+if __name__ == '__main__':
+ nt = named_tuple( ('a',0), ('b',1) )
+ assert nt.a == 0 and nt.b == 1
+ a,b = nt
+ assert a == 0 and b == 1
+ assert nt[ "a" ] == 0 and nt[ "b" ] == 1
+
+
Added: trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/sf_OIS.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/sf_OIS.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,461 @@
+# This code is in the Public Domain
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre
+# For the latest info, see http://python-ogre.org/
+#
+# It is likely based on original code from OGRE and/or PyOgre
+# For the latest info, see http://www.ogre3d.org/
+#
+# You may use this sample code for anything you like, it is not covered by the
+# LGPL.
+# -----------------------------------------------------------------------------
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as OIS
+###import OgreRefApp
+
+def getPluginPath():
+ """Return the absolute path to a valid plugins.cfg file."""
+ import sys
+ import os
+ import os.path
+
+ paths = [os.path.join(os.getcwd(), 'plugins.cfg'),
+ '/etc/OGRE/plugins.cfg',
+ os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ 'plugins.cfg')]
+ for path in paths:
+ if os.path.exists(path):
+ return path
+
+ sys.stderr.write("\n"
+ "** Warning: Unable to locate a suitable plugins.cfg file.\n"
+ "** Warning: Please check your ogre installation and copy a\n"
+ "** Warning: working plugins.cfg file to the current directory.\n\n")
+ raise ogre.Exception(0, "can't locate the 'plugins.cfg' file", "")
+
+class Application(object):
+ "This class is the base for an Ogre application."
+ debugText=""
+
+ def __init__(self):
+ self.frameListener = None
+ self.root = None
+ self.camera = None
+ self.renderWindow = None
+ self.sceneManager = None
+ self.world = None
+
+ def __del__(self):
+ "Clear variables, this should not actually be needed."
+ del self.camera
+ del self.sceneManager
+ del self.frameListener
+ if self.world:
+ del self.world
+ del self.root
+ del self.renderWindow
+
+ def go(self):
+ "Starts the rendering loop."
+ if not self._setUp():
+ return
+ if self._isPsycoEnabled():
+ self._activatePsyco()
+ self.root.startRendering()
+
+ def goOneFrame(self):
+ "Starts the rendering loop. Show how to use the renderOneFrame Method"
+ if not self._setUp():
+ return
+ if self._isPsycoEnabled():
+ self._activatePsyco()
+
+ self.root.getRenderSystem()._initRenderTargets()
+ while True:
+ ogre.WindowEventUtilities().messagePump()
+ if not self.root.renderOneFrame():
+ break
+
+
+
+ def _setUp(self):
+ """This sets up the ogre application, and returns false if the user
+ hits "cancel" in the dialog box."""
+ self.root = ogre.Root(getPluginPath())
+ self.root.setFrameSmoothingPeriod (5.0)
+
+ self._setUpResources()
+ if not self._configure():
+ return False
+
+ self._chooseSceneManager()
+ self._createWorld()
+ self._createCamera()
+ self._createViewports()
+
+ ogre.TextureManager.getSingleton().setDefaultNumMipmaps (5)
+
+ self._createResourceListener()
+ self._loadResources()
+
+ self._createScene()
+ self._createFrameListener()
+ return True
+
+ def _setUpResources(self):
+ """This sets up Ogre's resources, which are required to be in
+ resources.cfg."""
+ config = ogre.ConfigFile()
+ config.load('resources.cfg' )
+ seci = config.getSectionIterator()
+ while seci.hasMoreElements():
+ SectionName = seci.peekNextKey()
+ Section = seci.getNext()
+ for item in Section:
+ ogre.ResourceGroupManager.getSingleton().\
+ addResourceLocation(item.value, item.key, SectionName)
+
+ def _createResourceListener(self):
+ """This method is here if you want to add a resource listener to check
+ the status of resources loading."""
+ pass
+
+ def _createWorld ( self ):
+ """ this should be overridden when supporting the OgreRefApp framework. Also note you
+ will have to override __createCamera"""
+ pass
+
+ def _loadResources(self):
+ """This loads all initial resources. Redefine this if you do not want
+ to load all resources at startup."""
+ ogre.ResourceGroupManager.getSingleton().initialiseAllResourceGroups()
+
+ def _configure(self):
+ """This shows the config dialog and creates the renderWindow."""
+ carryOn = self.root.showConfigDialog()
+ if carryOn:
+ self.renderWindow = self.root.initialise(True, "OGRE Render Window")
+ return carryOn
+
+ def _chooseSceneManager(self):
+ """Chooses a default SceneManager."""
+ #typedef uint16 SceneTypeMask;
+ #md=ogre.SceneManagerMetaData()
+ #md.sceneTypeMask=ogre.ST_GENERIC
+ #print dir(self.root)
+ self.sceneManager = self.root.createSceneManager(ogre.ST_GENERIC,"ExampleSMInstance")
+
+ def _createCamera(self):
+ """Creates the camera."""
+ self.camera = self.sceneManager.createCamera('PlayerCam')
+ self.camera.setPosition(ogre.Vector3(0, 0, 500))
+ self.camera.lookAt(ogre.Vector3(0, 0, -300))
+ self.camera.NearClipDistance = 5
+
+ def _createViewports(self):
+ """Creates the Viewport."""
+ ## We want a single sampleframework so this work around is to support OgreRefApp Framework
+ ## if using the RefApp camera is based upon World etc etc
+ try:
+ self.viewport = self.renderWindow.addViewport(self.camera.getRealCamera())
+ except AttributeError:
+ self.viewport = self.renderWindow.addViewport(self.camera)
+ self.viewport.BackgroundColour = ogre.ColourValue(0,0,0)
+
+ def _createScene(self):
+ """Creates the scene. Override this with initial scene contents."""
+ pass
+
+ def _createFrameListener(self):
+ """Creates the FrameListener."""
+ #,self.frameListener, self.frameListener.Mouse
+ self.frameListener = FrameListener(self.renderWindow, self.camera)
+ self.frameListener.showDebugOverlay(True)
+ self.root.addFrameListener(self.frameListener)
+
+ def _isPsycoEnabled(self):
+ """Override this function and return True to turn on Psyco"""
+ return False
+
+ def _activatePsyco(self):
+ """Import Psyco if available"""
+ try:
+ import psyco
+ psyco.full()
+ except ImportError:
+ pass
+
+
+class FrameListener(ogre.FrameListener, ogre.WindowEventListener):
+ """A default frame listener, which takes care of basic mouse and keyboard
+ input."""
+
+ def __init__(self, renderWindow, camera, bufferedKeys = False, bufferedMouse = True, bufferedJoy = False):
+ ogre.FrameListener.__init__(self)
+ ogre.WindowEventListener.__init__(self)
+ self.camera = camera
+ self.renderWindow = renderWindow
+ self.statisticsOn = True
+ self.numScreenShots = 0
+ self.timeUntilNextToggle = 0
+ self.sceneDetailIndex = 0
+ self.moveScale = 0.0
+ self.rotationScale = 0.0
+ self.translateVector = ogre.Vector3(0.0,0.0,0.0)
+ self.filtering = ogre.TFO_BILINEAR
+ self.showDebugOverlay(True)
+ self.moveSpeed = 100.0
+ self.rotationSpeed = 8.0
+ self.displayCameraDetails = False
+ self.bufferedKeys = bufferedKeys
+ self.bufferedMouse = bufferedMouse
+ self.bufferedJoy = bufferedJoy
+ self.MenuMode = False # lets understand a simple menu function
+ ## we can tell if we are using OgreRefapp based upon the camera class
+
+ if self.camera.__class__ == ogre.Camera:
+ self.RefAppEnable = False
+ else:
+ self.RefAppEnable = True
+ self._setupInput()
+
+ def __del__ (self ):
+ ogre.WindowEventUtilities.removeWindowEventListener(self.renderWindow, self)
+ self.windowClosed(self.renderWindow)
+
+ def _setupInput(self):
+ # ignore buffered input
+
+ windowHnd = self.renderWindow.getCustomAttributeInt("WINDOW")
+ self.InputManager = \
+ OIS.createPythonInputSystem([("WINDOW",str(windowHnd))])
+
+ #pl = OIS.ParamList()
+ #windowHndStr = str ( windowHnd)
+ #pl.insert("WINDOW", windowHndStr)
+ #im = OIS.InputManager.createInputSystem( pl )
+
+ #Create all devices (We only catch joystick exceptions here, as, most people have Key/Mouse)
+ self.Keyboard = self.InputManager.createInputObjectKeyboard( OIS.OISKeyboard, self.bufferedKeys )
+ self.Mouse = self.InputManager.createInputObjectMouse( OIS.OISMouse, self.bufferedMouse )
+ try:
+ self.Joy = self.InputManager.createInputObjectJoyStick( OIS.OISJoyStick, self.bufferedJoy )
+ except:
+ self.Joy = False
+#
+ #Set initial mouse clipping size
+ self.windowResized(self.renderWindow)
+
+ self.showDebugOverlay(True)
+
+ #Register as a Window listener
+ ogre.WindowEventUtilities.addWindowEventListener(self.renderWindow, self);
+
+ def setMenuMode(self, mode):
+ self.MenuMode = mode
+
+ def _UpdateSimulation( self, frameEvent ):
+ # create a real version of this to update the simulation
+ pass
+
+ def windowResized (self, rw):
+ [width, height, depth, left, top] = rw.getMetrics() # Note the wrapped function as default needs unsigned int's
+ ms = self.Mouse.getMouseState()
+ ms.width = width
+ ms.height = height
+
+ def windowClosed(self, rw):
+ #Only close for window that created OIS (mWindow)
+ if( rw == self.renderWindow ):
+ if( self.InputManager ):
+ self.InputManager.destroyInputObjectMouse( self.Mouse )
+ self.InputManager.destroyInputObjectKeyboard( self.Keyboard )
+ if self.Joy:
+ self.InputManager.destroyInputObjectJoyStick( self.Joy )
+ OIS.InputManager.destroyInputSystem(self.InputManager)
+ self.InputManager=None
+
+ def frameStarted(self, frameEvent):
+ if(self.renderWindow.isClosed()):
+ return False
+
+ ##Need to capture/update each device - this will also trigger any listeners
+ self.Keyboard.capture()
+ self.Mouse.capture()
+ if( self.Joy ):
+ self.Joy.capture()
+
+ ##bool buffJ = (mJoy) ? mJoy->buffered() : true;
+
+ if self.timeUntilNextToggle >= 0:
+ self.timeUntilNextToggle -= frameEvent.timeSinceLastFrame
+
+ if frameEvent.timeSinceLastFrame == 0:
+ self.moveScale = 1
+ self.rotationScale = 0.1
+ else:
+ self.moveScale = self.moveSpeed * frameEvent.timeSinceLastFrame
+ self.rotationScale = self.rotationSpeed * frameEvent.timeSinceLastFrame
+
+ self.rotationX = ogre.Degree(0.0)
+ self.rotationY = ogre.Degree(0.0)
+ self.translateVector = ogre.Vector3(0.0, 0.0, 0.0)
+ if not self._processUnbufferedKeyInput(frameEvent):
+ return False
+
+ if not self.MenuMode: # if we are in Menu mode we don't move the camera..
+ self._processUnbufferedMouseInput(frameEvent)
+ self._moveCamera()
+ # Perform simulation step only if using OgreRefApp. For simplicity create a function that simply does
+ ### "OgreRefApp.World.getSingleton().simulationStep(frameEvent.timeSinceLastFrame)"
+
+ if self.RefAppEnable:
+ self._UpdateSimulation( frameEvent )
+ return True
+
+ def frameEnded(self, frameEvent):
+ self._updateStatistics()
+ return True
+
+ def showDebugOverlay(self, show):
+ """Turns the debug overlay (frame statistics) on or off."""
+ overlay = ogre.OverlayManager.getSingleton().getByName('Core/DebugOverlay')
+ if overlay is None:
+ raise ogre.Exception(111, "Could not find overlay Core/DebugOverlay", "SampleFramework.py")
+ if show:
+ overlay.show()
+ else:
+ overlay.hide()
+
+ def _processUnbufferedKeyInput(self, frameEvent):
+ if self.Keyboard.isKeyDown(OIS.KC_A):
+ self.translateVector.x = -self.moveScale
+
+ if self.Keyboard.isKeyDown(OIS.KC_D):
+ self.translateVector.x = self.moveScale
+
+ if self.Keyboard.isKeyDown(OIS.KC_UP) or self.Keyboard.isKeyDown(OIS.KC_W):
+ self.translateVector.z = -self.moveScale
+
+ if self.Keyboard.isKeyDown(OIS.KC_DOWN) or self.Keyboard.isKeyDown(OIS.KC_S):
+ self.translateVector.z = self.moveScale
+
+ if self.Keyboard.isKeyDown(OIS.KC_PGUP):
+ self.translateVector.y = self.moveScale
+
+ if self.Keyboard.isKeyDown(OIS.KC_PGDOWN):
+ self.translateVector.y = - self.moveScale
+
+ if self.Keyboard.isKeyDown(OIS.KC_RIGHT):
+ self.rotationX = - self.rotationScale
+
+ if self.Keyboard.isKeyDown(OIS.KC_LEFT):
+ self.rotationX = self.rotationScale
+
+ if self.Keyboard.isKeyDown(OIS.KC_ESCAPE) or self.Keyboard.isKeyDown(OIS.KC_Q):
+ return False
+
+ if( self.Keyboard.isKeyDown(OIS.KC_F) and self.timeUntilNextToggle <= 0 ):
+ self.statisticsOn = not self.statisticsOn
+ self.showDebugOverlay(self.statisticsOn)
+ self.timeUntilNextToggle = 1
+
+ if self.Keyboard.isKeyDown(OIS.KC_T) and self.timeUntilNextToggle <= 0:
+ if self.filtering == ogre.TFO_BILINEAR:
+ self.filtering = ogre.TFO_TRILINEAR
+ self.Aniso = 1
+ elif self.filtering == ogre.TFO_TRILINEAR:
+ self.filtering = ogre.TFO_ANISOTROPIC
+ self.Aniso = 8
+ else:
+ self.filtering = ogre.TFO_BILINEAR
+ self.Aniso = 1
+
+ ogre.MaterialManager.getSingleton().setDefaultTextureFiltering(self.filtering)
+ ogre.MaterialManager.getSingleton().setDefaultAnisotropy(self.Aniso)
+ self.showDebugOverlay(self.statisticsOn)
+ self.timeUntilNextToggle = 1
+
+ if self.Keyboard.isKeyDown(OIS.KC_SYSRQ) and self.timeUntilNextToggle <= 0:
+ path = 'screenshot_%d.png' % self.numScreenShots
+ self.numScreenShots += 1
+ self.renderWindow.writeContentsToFile(path)
+ Application.debugText = 'screenshot taken: ' + path
+ self.timeUntilNextToggle = 0.5
+
+ if self.Keyboard.isKeyDown(OIS.KC_R) and self.timeUntilNextToggle <= 0:
+ detailsLevel = [ ogre.PM_SOLID,
+ ogre.PM_WIREFRAME,
+ ogre.PM_POINTS ]
+ self.sceneDetailIndex = (self.sceneDetailIndex + 1) % len(detailsLevel)
+ self.camera.polygonMode=detailsLevel[self.sceneDetailIndex]
+ self.timeUntilNextToggle = 0.5
+
+ if self.Keyboard.isKeyDown(OIS.KC_F) and self.timeUntilNextToggle <= 0:
+ self.statisticsOn = not self.statisticsOn
+ self.showDebugOverlay(self.statisticsOn)
+ self.timeUntilNextToggle = 1
+
+ if self.Keyboard.isKeyDown(OIS.KC_P) and self.timeUntilNextToggle <= 0:
+ self.displayCameraDetails = not self.displayCameraDetails
+ if not self.displayCameraDetails:
+ Application.debugText = ""
+
+ if self.displayCameraDetails:
+ # Print camera details
+ pos = self.camera.getDerivedPosition()
+ o = self.camera.getDerivedOrientation()
+ Application.debugText = "P: %.3f %.3f %.3f O: %.3f %.3f %.3f %.3f" \
+ % (pos.x,pos.y,pos.z, o.w,o.x,o.y,o.z)
+ return True
+
+ def _isToggleKeyDown(self, keyCode, toggleTime = 1.0):
+ if self.Keyboard.isKeyDown(keyCode)and self.timeUntilNextToggle <=0:
+ self.timeUntilNextToggle = toggleTime
+ return True
+ return False
+
+ def _isToggleMouseDown(self, Button, toggleTime = 1.0):
+ ms = self.Mouse.getMouseState()
+ if ms.buttonDown( Button ) and self.timeUntilNextToggle <=0:
+ self.timeUntilNextToggle = toggleTime
+ return True
+ return False
+
+ def _processUnbufferedMouseInput(self, frameEvent):
+ ms = self.Mouse.getMouseState()
+ if ms.buttonDown( OIS.MB_Right ):
+ self.translateVector.x += ms.X.rel * 0.13
+ self.translateVector.y -= ms.Y.rel * 0.13
+ else:
+ self.rotationX = ogre.Degree(- ms.X.rel * 0.13)
+ self.rotationY = ogre.Degree(- ms.Y.rel * 0.13)
+
+ def _moveCamera(self):
+ self.camera.yaw(self.rotationX)
+ self.camera.pitch(self.rotationY)
+ try:
+ self.camera.translate(self.translateVector) # for using OgreRefApp
+ except AttributeError:
+ self.camera.moveRelative(self.translateVector)
+
+ def _updateStatistics(self):
+ statistics = self.renderWindow
+ self._setGuiCaption('Core/AverageFps', 'Average FPS: %f' % statistics.getAverageFPS())
+ self._setGuiCaption('Core/CurrFps', 'Current FPS: %f' % statistics.getLastFPS())
+ self._setGuiCaption('Core/BestFps',
+ 'Best FPS: %f %d ms' % (statistics.getBestFPS(), statistics.getBestFrameTime()))
+ self._setGuiCaption('Core/WorstFps',
+ 'Worst FPS: %f %d ms' % (statistics.getWorstFPS(), statistics.getWorstFrameTime()))
+ self._setGuiCaption('Core/NumTris', 'Triangle Count: %d' % statistics.getTriangleCount())
+ self._setGuiCaption('Core/DebugText', Application.debugText)
+
+ def _setGuiCaption(self, elementName, text):
+ element = ogre.OverlayManager.getSingleton().getOverlayElement(elementName, False)
+ ##d=ogre.UTFString("hell0")
+ ##element.setCaption(d)
+
+ #element.caption="hello"
+
+ #element.setCaption("help")
+ element.setCaption(text) # ogre.UTFString(text))
Added: trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/sf_utils.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/sf_utils.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/renderer/OGRE/sf_utils.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,21 @@
+## Common utilities for the sample framework...
+##
+def getPluginPath():
+ """Return the absolute path to a valid plugins.cfg file."""
+ import sys
+ import os
+ import os.path
+
+ paths = [os.path.join(os.getcwd(), 'plugins.cfg'),
+ '/etc/OGRE/plugins.cfg',
+ os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ 'plugins.cfg')]
+ for path in paths:
+ if os.path.exists(path):
+ return path
+
+ sys.stderr.write("\n"
+ "** Warning: Unable to locate a suitable plugins.cfg file.\n"
+ "** Warning: Please check your ogre installation and copy a\n"
+ "** Warning: working plugins.cfg file to the current directory.\n\n")
+ raise ogre.Exception(0, "can't locate the 'plugins.cfg' file", "")
Added: trunk/python-ogre/packages_2.6/ogre/renderer/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/renderer/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/renderer/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+#keep me
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/sound/OgreAL/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/sound/OgreAL/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/sound/OgreAL/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1,6 @@
+import sys, os
+
+if sys.platform == 'win32':
+ os.environ['PATH'] += ';' + __path__[0]
+
+from _ogreal_ import *
\ No newline at end of file
Added: trunk/python-ogre/packages_2.6/ogre/sound/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.6/ogre/sound/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.6/ogre/sound/__init__.py 2007-11-13 07:17:32 UTC (rev 470)
@@ -0,0 +1 @@
+#keep me
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-13 07:16:54
|
Revision: 469
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=469&view=rev
Author: andy_miller
Date: 2007-11-12 23:16:58 -0800 (Mon, 12 Nov 2007)
Log Message:
-----------
Added Watermesh and Ofusion (testing)\nGeneral merge to my working environment
Added Paths:
-----------
trunk/python-ogre/packages_2.5/ogre/addons/ofusion/
trunk/python-ogre/packages_2.5/ogre/addons/ofusion/__init__.py
trunk/python-ogre/packages_2.5/ogre/addons/watermesh/
trunk/python-ogre/packages_2.5/ogre/addons/watermesh/__init__.py
trunk/python-ogre/packages_2.5/ogre/renderer/OGREdshow/
trunk/python-ogre/packages_2.5/ogre/renderer/OGREdshow/__init__.py
Added: trunk/python-ogre/packages_2.5/ogre/addons/ofusion/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/addons/ofusion/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.5/ogre/addons/ofusion/__init__.py 2007-11-13 07:16:58 UTC (rev 469)
@@ -0,0 +1 @@
+from _ofusion_ import *
Added: trunk/python-ogre/packages_2.5/ogre/addons/watermesh/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/addons/watermesh/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.5/ogre/addons/watermesh/__init__.py 2007-11-13 07:16:58 UTC (rev 469)
@@ -0,0 +1 @@
+from _watermesh_ import *
Added: trunk/python-ogre/packages_2.5/ogre/renderer/OGREdshow/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGREdshow/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGREdshow/__init__.py 2007-11-13 07:16:58 UTC (rev 469)
@@ -0,0 +1,8 @@
+import sys, os
+
+# Note that we put the Python-Ogre path first to ensure we don't get strange problems with windows
+# picking up the wrong dlls -- Thanks to Pelle for tracking down this issue..
+if sys.platform == 'win32':
+ os.environ['PATH'] = __path__[0] +';' + os.environ['PATH']
+
+from _ogredshow_ import *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-13 07:16:38
|
Revision: 468
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=468&view=rev
Author: andy_miller
Date: 2007-11-12 23:16:37 -0800 (Mon, 12 Nov 2007)
Log Message:
-----------
Added Watermesh and Ofusion (testing)\nGeneral merge to my working environment
Modified Paths:
--------------
trunk/python-ogre/scripts/MakeRelease.bat
trunk/python-ogre/scripts/UpdateDLLs.bat
Added Paths:
-----------
trunk/python-ogre/scripts/01-RetrieveSource.py
trunk/python-ogre/scripts/compilesource.bat
trunk/python-ogre/scripts/logger.py
trunk/python-ogre/scripts/test/
trunk/python-ogre/scripts/testlog.py
trunk/python-ogre/scripts/updatesource.bat
Added: trunk/python-ogre/scripts/01-RetrieveSource.py
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.py (rev 0)
+++ trunk/python-ogre/scripts/01-RetrieveSource.py 2007-11-13 07:16:37 UTC (rev 468)
@@ -0,0 +1,66 @@
+#!/bin/python
+# Part of the Python-Ogre installation
+
+import os,sys,urllib
+import logging
+import logger
+print sys.argv
+
+log = logging.getLogger('PO.' + sys.argv[0].split('.')[0])
+log.info ("Retrieving Sources")
+
+root = os.getcwd() # our base location
+
+RetrieveUrls = [
+["wget", "http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/Cg-1.5_Aug2007_x86.tar.gz",''],
+["wget", "http://www.cmake.org/files/v2.4/cmake-2.4.6-Linux-i386.tar.gz",''],
+["wget", "http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip",''],
+["wget", "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz",''],
+["wget", "http://prdownloads.sourceforge.net/wgois/ois-1.0RC1.tar.gz",''],
+["wget", "http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz",''],
+["wget", "http://prdownloads.sourceforge.net/scons/scons-0.96.96.tar.gz",''],
+["wget", "http://downloads.sourceforge.net/scons/scons-0.97.0d20070918.tar.gz",''],
+["wget", "http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2",''],
+["wget", "http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip",''],
+["wget", "http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2",''],
+["wget", "http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz",''],
+["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz",''],
+["wget", "http://www.openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz", ''],
+["wget", "http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz",''],
+["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",''],
+["wget", "http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2",''],
+['svn', "https://pygccxml.svn.sourceforge.net/svnroot/pygccxml pygccxml",""],
+['svn', "https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre",""],
+['cvs', "-z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co gccxml",""],
+['cvs', "-z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode",""],
+['cvs', "-z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogrenewt",""]
+]
+
+try:
+ os.mkdir( os.path.join(root, 'downloads') )
+except:
+ pass
+
+for mode, url, extra in RetrieveUrls:
+
+ if mode == "wget": ## do a standard http get on the file
+ os.chdir ( os.path.join(root, 'downloads') )
+ destfile = url.split('/')[-1]
+ log.info ("Retrieving " + destfile + " from " + url )
+ (filename, headers) = urllib.urlretrieve (url, destfilename)
+ os.chdir ( root )
+
+RetrieveSvns = [
+"https://pygccxml.svn.sourceforge.net/svnroot/pygccxml pygccxml",
+"https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre",
+
+cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co gccxml
+echo " -- getting ogreode"
+cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode
+echo " -- getting ogrenewt"
+cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogrenewt
+echo ""
+echo "======= Sources Retrieved ======="
+echo ""
+
+
Modified: trunk/python-ogre/scripts/MakeRelease.bat
===================================================================
--- trunk/python-ogre/scripts/MakeRelease.bat 2007-11-11 03:11:11 UTC (rev 467)
+++ trunk/python-ogre/scripts/MakeRelease.bat 2007-11-13 07:16:37 UTC (rev 468)
@@ -16,7 +16,7 @@
xcopy ..\plugins ..\..\PythonOgreRelease\plugins
xcopy ..\docs ..\..\PythonOgreRelease\docs
xcopy ..\tools ..\..\PythonOgreRelease\tools
-xcopy ..\ThirdParty ..\..\PythonOgreRelease\ThirdParty
+copy ..\ThirdParty ..\..\PythonOgreRelease\ThirdParty
copy ..\*.rtf ..\..\PythonOgreRelease
copy ..\COPYING ..\..\PythonOgreRelease
copy ..\*.gpl ..\..\PythonOgreRelease
@@ -26,7 +26,7 @@
del ..\..\PythonOgreRelease\1 /s
del ..\..\PythonOgreRelease\2 /s
del ..\..\PythonOgreRelease\ogre.cfg /s
-for /r ..\..\PythonOgreRelease\ %1 in (*) do touch %1
+for /r ..\..\PythonOgreRelease\ %%1 in (*) do touch %%1
rem rmdir /s /q ..\..\PythonOgreRelease\demos\gui\tofix
rem rmdir /s /q ..\..\PythonOgreRelease\demos\ogre\tofix
Modified: trunk/python-ogre/scripts/UpdateDLLs.bat
===================================================================
--- trunk/python-ogre/scripts/UpdateDLLs.bat 2007-11-11 03:11:11 UTC (rev 467)
+++ trunk/python-ogre/scripts/UpdateDLLs.bat 2007-11-13 07:16:37 UTC (rev 468)
@@ -43,7 +43,7 @@
copy /y %ogreode%\loader\lib\Release\OgreOde_Loader.dll %package%\physics\OgreOde
copy /y %ogreode%\prefab\lib\Release\OgreOde_Prefab.dll %package%\physics\OgreOde
rem Physx
-copy /y %physx%\Nx*.dll %package%\physics\PhysX
+copy /y %physx%\Nx*.dll %package%\physics\NxOgre
copy /y %physx%\Ph*.dll %package%\physics\PhysX
rem Theora
copy /y %theora%\Plugin_TheoraVideoSystem.dll ..\plugin
Added: trunk/python-ogre/scripts/compilesource.bat
===================================================================
--- trunk/python-ogre/scripts/compilesource.bat (rev 0)
+++ trunk/python-ogre/scripts/compilesource.bat 2007-11-13 07:16:37 UTC (rev 468)
@@ -0,0 +1,16 @@
+setlocal
+pushd
+set _VCBUILD="c:\\Program Files\\Microsoft Visual Studio 8\\vc\\vcpackages\\vcbuild.exe"
+set _ROOT=c:\\development
+call vcvars32
+cd %_ROOT%\\ogrenew
+%_VCBUILD% /useenv Ogre_vc8.sln "Release|Win32"
+rem cd %_ROOT%\\NxOgre\\NxOgre
+rem %_VCBUILD% /useenv NxOgre.VC8.Windows.sln "Release|Win32"
+cd %_ROOT%\\ogreaddons\\ogreode\\scripts\\vc8
+%_VCBUILD% /useenv OgreOde_CVS.sln "Release|Win32"
+cd %_ROOT%\\ogreaddons\\ogrenewt
+%_VCBUILD% /useenv OgreNewt.sln "Release|Win32"
+
+popd
+endlocal
Added: trunk/python-ogre/scripts/logger.py
===================================================================
--- trunk/python-ogre/scripts/logger.py (rev 0)
+++ trunk/python-ogre/scripts/logger.py 2007-11-13 07:16:37 UTC (rev 468)
@@ -0,0 +1,18 @@
+import logging
+
+# set up logging to file
+logging.basicConfig(level=logging.DEBUG,
+ format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
+ ##datefmt='%m-%d %H:%M',
+ filename='./PythonOgreBuild.log',
+ filemode='w')
+# define a Handler which writes INFO messages or higher to the sys.stderr
+console = logging.StreamHandler()
+console.setLevel(logging.INFO)
+# set a format which is simpler for console use
+formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
+# tell the handler to use this format
+console.setFormatter(formatter)
+# add the handler to the root logger
+logging.getLogger('').addHandler(console)
+
Added: trunk/python-ogre/scripts/testlog.py
===================================================================
--- trunk/python-ogre/scripts/testlog.py (rev 0)
+++ trunk/python-ogre/scripts/testlog.py 2007-11-13 07:16:37 UTC (rev 468)
@@ -0,0 +1,13 @@
+import logging
+import logger
+logger1 = logging.getLogger('myapp.area1')
+logger2 = logging.getLogger('myapp.area2')
+import sys
+print sys.argv[0]
+print sys.argv[0].split('.')[0]
+
+logger1.debug('Quick zephyrs blow, vexing daft Jim.')
+logger1.info('How quickly daft jumping zebras vex.')
+logger2.warning('Jail zesty vixen who grabbed pay from quack.')
+logger2.error('The five boxing wizards jump quickly.')
+
Added: trunk/python-ogre/scripts/updatesource.bat
===================================================================
--- trunk/python-ogre/scripts/updatesource.bat (rev 0)
+++ trunk/python-ogre/scripts/updatesource.bat 2007-11-13 07:16:37 UTC (rev 468)
@@ -0,0 +1,54 @@
+setlocal
+pushd
+set _SVN="c:\apps\svn-win32-1.4.5\bin\svn.exe"
+set _CVS="c:\Program Files\cvsnt\cvs.exe"
+set _VCBUILD="c:\Program Files\Microsoft Visual Studio 8\vc\vcpackages\vcbuild.exe"
+set _ROOT=c:\development
+set _TP=c:\development\pywork\ThirdParty
+
+cd %_ROOT%\ogrenew
+%_CVS% up
+cd %_ROOT%\ogreaddons\ogreode
+%_CVS% up
+
+cd %_ROOT%\NxOgre
+%_SVN% up
+del /q %_TP%\nxogre
+xcopy /s /y NxOgre\include %_TP%\nxogre
+xcopy /s /y NxOgre\source %_TP%\nxogre
+
+cd %_ROOT%\ogreal
+%_SVN% up
+del /q %_TP%\ogreal
+copy include\*.h %_TP%\ogreal
+copy src\*.cpp %_TP%\ogreal
+
+cd %_ROOT%\QuickGui
+%_SVN% up
+del /q %_TP%\quickgui
+copy QuickGui\include\*.h %_TP%\quickgui
+copy QuickGui\src\*.cpp %_TP%\quickgui
+
+cd %_ROOT%\caelum
+%_SVN% up
+del /q %_TP%\caelum
+copy trunk\Caelum\main\include\*.h %_TP%\caelum
+copy trunk\Caelum\main\src\*.cpp %_TP%\caelum
+
+cd %_ROOT%\ogreaddons\ogrebullet
+%_CVS% up
+del /q /s %_TP%\ogrebullet\Collisions
+del /q /s %_TP%\ogrebullet\Dynamics
+xcopy /s Collisions\include %_TP%\ogrebullet\Collisions
+xcopy /s Collisions\src %_TP%\ogrebullet\Collisions
+xcopy /s Dynamics\include %_TP%\ogrebullet\Dynamics
+xcopy /s Dynamics\src %_TP%\ogrebullet\Dynamics
+
+cd %_ROOT%\ogreaddons\forests
+%_CVS% up
+del /q %_TP%\forests
+copy include\*.h %_TP%\forests
+copy source\*.cpp %_TP%\forests
+
+popd
+endlocal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-11 03:11:09
|
Revision: 467
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=467&view=rev
Author: andy_miller
Date: 2007-11-10 19:11:11 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
Issue with some auto building I'm working in
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-11-11 01:31:00 UTC (rev 466)
+++ trunk/python-ogre/environment.py 2007-11-11 03:11:11 UTC (rev 467)
@@ -368,12 +368,13 @@
ModuleName="caelum"
active=True
-class newton:
- version= "1.0"
- active=False
- include_dirs = [r'c:/development/newtonsdk/sdk']
- ModuleName = 'NEWTON'
- parent = ""
+# class newton:
+# version= "1.0"
+# active=False
+# include_dirs = [r'c:/development/newtonsdk/sdk']
+# lib_dirs=[]
+# ModuleName = 'NEWTON'
+# parent = ""
class ogreode:
version= "1.0"
parent = "ogre/physics"
@@ -812,7 +813,7 @@
, 'ogre' : ogre
, 'cegui' : cegui
, 'ode' : ode
- , 'newton' : newton
+# , 'newton' : newton
, 'ogrerefapp' : ogrerefapp
, 'ogrenewt' : ogrenewt
, 'ogreode' : ogreode
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-11 01:30:58
|
Revision: 466
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=466&view=rev
Author: andy_miller
Date: 2007-11-10 17:31:00 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
general Update
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/README
trunk/python-ogre/SConstruct
trunk/python-ogre/code_generators/caelum/generate_code.py
trunk/python-ogre/code_generators/caelum/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h
trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
trunk/python-ogre/code_generators/ogreforests/generate_code.py
trunk/python-ogre/environment.py
trunk/python-ogre/setup.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2007-11-11 01:31:00 UTC (rev 466)
@@ -1,6 +1,6 @@
import os
-SDK=True ## set to true if buiding from 1.4 release source...
+SDK=False # True ## set to true if buiding from 1.4 release source...
## The root directory is where this module is located
module_dir = os.path.abspath(os.path.dirname(__file__) )
@@ -13,6 +13,9 @@
## and the name of the boost python library
LIB_Boost = r'boost_python-vc80-mt-1_35'
+# in Linux we need to code in the Relative path for the library
+RPATH=""
+
# We need to know where to find gccxml......
gccxml_bin = os.path.join(BASE_DIR, 'gccxml/bin/release/gccxml.exe')
# and the Py++ directory as sometimes we need access to the code repository there
@@ -23,14 +26,13 @@
PATH_Ogre = os.path.join(BASE_DIR, 'ogrenew')
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
-PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
+PATH_OIS = os.path.join(BASE_DIR, 'ois' ) ##'ois-1.0RC1')
PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk','sdk')
PATH_FMOD = os.path.join(BASE_DIR, 'fmod')
PATH_ODE = os.path.join(BASE_DIR, 'ode-0.9')
PATH_OGG = os.path.join(BASE_DIR, 'ogg')
PATH_VORBIS= os.path.join(BASE_DIR, 'vorbis')
PATH_OPENAL= os.path.join(BASE_DIR, 'openal')
-PATH_ALUT= os.path.join(BASE_DIR, 'freealut')
PATH_OgreOde= os.path.join(BASE_DIR, PATH_OgreAddons,'ogreode')
# # PATH_OgreBullet= os.path.join(PATH_OgreAddons,'ogrebullet')
# # PATH_ogreforests= os.path.join(PATH_OgreAddons,'forests')
@@ -46,8 +48,10 @@
PATH_et = os.path.join(PATH_THIRDPARTY, 'et')
PATH_caelum = os.path.join(PATH_THIRDPARTY, 'caelum')
PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
+PATH_watermesh= os.path.join(PATH_THIRDPARTY, 'watermesh')
# PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
PATH_noise= os.path.join(PATH_THIRDPARTY, 'noise')
+PATH_ofusion= os.path.join(PATH_THIRDPARTY, 'ofusion')
PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
@@ -72,7 +76,7 @@
PATH_LIB_OgreRefApp = os.path.join( PATH_Ogre, 'lib')
PATH_LIB_OgreNewt = os.path.join( PATH_OgreAddons, 'ogrenewt/OgreNewt_Main/lib/Release')
PATH_LIB_Newton = os.path.join( PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
-PATH_LIB_OIS = os.path.join( PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
+PATH_LIB_OIS = os.path.join( PATH_OIS, 'lib') ## NOTE Posix platforms this lives in'lib' not 'dll'
PATH_LIB_CEGUI = os.path.join( PATH_CEGUI, 'lib' )
PATH_LIB_ODE = os.path.join( PATH_ODE, 'lib/releaselib')## probable releaselib for posix
PATH_LIB_OPCODE = os.path.join( PATH_OPCODE )
@@ -105,7 +109,7 @@
PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
PATH_INCLUDE_OgreNewt = os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
-PATH_INCLUDE_CEGUI = os.path.join(PATH_CEGUI, 'include/CEGUI')
+PATH_INCLUDE_CEGUI = os.path.join(PATH_CEGUI, 'include')
PATH_INCLUDE_ODE = os.path.join( PATH_ODE, 'include')
PATH_INCLUDE_OPCODE = PATH_OPCODE
PATH_INCLUDE_ODESOURCE = os.path.join( PATH_ODE, 'ode/src')
@@ -113,7 +117,6 @@
PATH_INCLUDE_OPENAL = os.path.join( PATH_OPENAL, 'include')
PATH_INCLUDE_OGG= os.path.join( PATH_OGG, 'include' )
PATH_INCLUDE_VORBIS= os.path.join( PATH_VORBIS, 'include' )
-PATH_INCLUDE_ALUT= os.path.join( PATH_ALUT, 'include' )
# # PATH_INCLUDE_OgreBullet = [
# # os.path.join( PATH_OgreBullet,'Collisions','include')
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-11-11 01:31:00 UTC (rev 466)
@@ -17,6 +17,9 @@
## and the name of the boost python library
LIB_Boost = 'libboost_python-gcc41-1_34'
+# in Linux we need to code in the Relative path for the library
+RPATH="../lib"
+
# We need to know where to find gccxml......
gccxml_bin = os.path.join(BASE_DIR,'gccxml-build/bin')
# and the Py++ directory as sometimes we need access to the code repository there
@@ -34,7 +37,6 @@
PATH_OGG = os.path.join(BASE_DIR, 'libogg-1.1.3')
PATH_VORBIS= os.path.join(BASE_DIR, 'libvorbis-1.2.0')
PATH_OPENAL= os.path.join(BASE_DIR, 'openal-0.0.8')
-PATH_ALUT= os.path.join(BASE_DIR, 'freealut-1.1.0')
PATH_OgreOde= os.path.join(PATH_OgreAddons,'ogreode')
# PATH_OgreBullet= os.path.join(PATH_OgreAddons,'ogrebullet')
# PATH_ogreforests= os.path.join(PATH_OgreAddons,'forests')
@@ -105,7 +107,6 @@
PATH_INCLUDE_OPENAL = os.path.join( LOCAL_INCLUDE ) #os.path.join( PATH_OPENAL, 'include')
PATH_INCLUDE_OGG= os.path.join( LOCAL_INCLUDE,'ogg' ) #os.path.join( PATH_OGG, 'include' )
PATH_INCLUDE_VORBIS= os.path.join( LOCAL_INCLUDE,'vorbis' ) #os.path.join( PATH_VORBIS, 'include' )
-PATH_INCLUDE_ALUT= os.path.join( LOCAL_INCLUDE ) #os.path.join( PATH_ALUT, 'include' )
# PATH_INCLUDE_OgreBullet = [
# os.path.join( PATH_OgreBullet,'Collisions','include')
Modified: trunk/python-ogre/README
===================================================================
--- trunk/python-ogre/README 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/README 2007-11-11 01:31:00 UTC (rev 466)
@@ -1,4 +1,4 @@
-Please see http://python-ogre.python.hosting.com for info
+Please see http://python-ogre.org for info
-----
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/SConstruct 2007-11-11 01:31:00 UTC (rev 466)
@@ -92,15 +92,20 @@
return LINKFLAGS
# Let us select the projects to build
-possible_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
- 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
- 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd',
- 'ogreforests', 'et', 'navi', 'caelum', 'noise' ] # , 'raknet'
-default_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
- 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
- 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd',
- 'ogreforests', 'et', 'caelum' ] # 'navi',
+possible_projects = []
+for name in environment.projects.keys():
+ possible_projects.append ( name )
+# ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
+# 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
+# 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd',
+# 'ogreforests', 'et', 'navi', 'caelum', 'noise', 'watermesh' ] # , 'raknet'
+default_projects = possible_projects ## environment.projects
+# ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
+# 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
+# 'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd',
+# 'ogreforests', 'et', 'caelum' ] # 'navi',
+
# This lets you call scons like: 'scons PROJECTS=ogre,cegui'
opts = Options('custom.py')
opts.Add(ListOption('PROJECTS', 'Project to build wrappers for',
@@ -121,6 +126,9 @@
cls._name = name
_env = Environment(ENV=os.environ)
+ if environment.rpath:
+ _env.Append(RPATH=environment.rpath)
+
## Use custom compilier if wanted (things like ccache)
if hasattr(environment, 'cxx_compiler'):
Modified: trunk/python-ogre/code_generators/caelum/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/generate_code.py 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/code_generators/caelum/generate_code.py 2007-11-11 01:31:00 UTC (rev 466)
@@ -100,7 +100,14 @@
def create_output( size ):
return [ ft.output( i ) for i in range( size ) ]
+
+ for x in main_ns.mem_funs('::caelum::UniversalClock::getGregorianDateFromJulianDay'):
+ x.add_transformation( ft.output('year'), ft.output('month'), ft.output('day'), alias = 'getGregorianDateFromJulianDay' )
+ x.documentation = docit ("","JulianDay", "tuple - year,month,day")
+ x=main_ns.mem_fun('::caelum::UniversalClock::getGregorianDateTimeFromJulianDay')
+ x.add_transformation( ft.output('year'), ft.output('month'), ft.output('day'),ft.output('hour'), ft.output('minute'), ft.output('second') )
+ x.documentation = docit ("","JulianDay", "tuple - year,month,day,hour, minute, second")
###############################################################################
##
Modified: trunk/python-ogre/code_generators/caelum/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/hand_made_wrappers.py 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/code_generators/caelum/hand_made_wrappers.py 2007-11-11 01:31:00 UTC (rev 466)
@@ -112,6 +112,7 @@
class_.add_registration_code ( c )
def apply( mb ):
+ return
# rt = mb.class_( 'Sun' )
# rt.add_declaration_code( WRAPPER_DEFINITION_Sun )
# apply_reg (rt, WRAPPER_REGISTRATION_Sun )
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2007-11-11 01:31:00 UTC (rev 466)
@@ -185,7 +185,15 @@
main_ns.constructor("IndexData",arg_types=['::Ogre::IndexData const &']).exclude()
global_ns.class_('::Ogre::OverlayManager').\
mem_fun('destroyOverlayElementImpl', arg_types=['::Ogre::OverlayElement *',None] ).exclude()
+
+
+ excludes = ['::Ogre::Any::getType' ## this returns a std::type_info which doesn't make any sense in Python
+ ]
+ for e in excludes:
+ print "excluding ", e
+ main_ns.member_functions(e).exclude()
+
## change due to CVS Ogre update (Thanks Dermont)
AttribParserList = main_ns.typedef( name="AttribParserList" )
declarations.class_traits.get_declaration( AttribParserList ).exclude()
@@ -241,6 +249,9 @@
main_ns.class_("VertexBoneAssignment_s").include()
# A couple of Std's that need exposing
std_ns = global_ns.namespace("std")
+ for c in std_ns.classes():
+ print c
+# std_ns.class_("pair<unsigned int, unsigned int>").include()
std_ns.class_("pair<unsigned, unsigned>").include()
std_ns.class_("pair<bool, float>").include()
if not HACK:
@@ -880,13 +891,13 @@
, messages.W1031
, messages.W1035
, messages.W1040
- , messages.W1041 # overlapping names when creating a property
- , messages.W1038
- , messages.W1036 # pointer to Python immutable member
- , messages.W1033 # unnamed variables
- , messages.W1018 # expose unnamed classes
- , messages.W1049 # returns reference to local variable
- , messages.W1014 # unsupported '=' operator
+# , messages.W1041 # overlapping names when creating a property
+# , messages.W1038
+# , messages.W1036 # pointer to Python immutable member
+# , messages.W1033 # unnamed variables
+# , messages.W1018 # expose unnamed classes
+# , messages.W1049 # returns reference to local variable
+# , messages.W1014 # unsupported '=' operator
)
# sort_algorithms.USE_CALLDEF_ORGANIZER = True ## tried this to remove a couple of order issues, without success :)
#
Modified: trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-11-11 01:31:00 UTC (rev 466)
@@ -851,10 +851,8 @@
rt = mb.class_( 'RenderQueueListener' )
print "WRAPPER CODE\n\n"
- print rt.wrapper_code
-### AJM: this adds the required wrapper code however you need to edit renderqueuelistener.pypp.cpp to remove
-### the duplicated function definations for it to compile correctly
-##### rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
+ print rt.wrapper_code
+ rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
print "NOW\n\n"
print rt.wrapper_code
Modified: trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h 2007-11-11 01:31:00 UTC (rev 466)
@@ -115,7 +115,7 @@
typedef Ogre::Singleton<Ogre::ArchiveManager> SingletonArchiveManager;
typedef Ogre::RenderSystem* RenderSystemPtr;
-typedef Ogre::Mesh::SubMeshNameMap MeshSubMeshNameMap;
+typedef Ogre::Mesh::SubMeshNameMap SubMeshNameMap;
typedef Ogre::RenderSystem RenderSystem;
typedef Ogre::ConvexBody::PolygonList PolygonList;
typedef Ogre::Polygon::VertexList VertexList;
@@ -364,4 +364,4 @@
-
+
Modified: trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h 2007-11-11 01:31:00 UTC (rev 466)
@@ -3,6 +3,49 @@
// sizeof ( Ogre::ConstVectorIterator );
// sizeof ( Ogre::ConstMapIterator );
+Ogre::AnyNumeric AnyNumInt (1);
+Ogre::AnyNumeric AnyNumReal ((Ogre::Real)1.0);
+Ogre::AnyNumeric AnyNumUint8 ((Ogre::uint8)0);
+Ogre::AnyNumeric AnyNumUint16 ((Ogre::uint16)0);
+Ogre::AnyNumeric AnyNumUint32 ((Ogre::uint32)0);
+Ogre::AnyNumeric AnyNumUint ((Ogre::uint)0);
+Ogre::AnyNumeric AnyNumUlong ((Ogre::ulong)0);
+Ogre::AnyNumeric AnyNumUshort ((Ogre::ushort)0);
+Ogre::AnyNumeric AnyNumUchar ((Ogre::uchar) 0);
+
+Ogre::Any AnyInt (1);
+Ogre::Any AnyReal ((Ogre::Real)1.0);
+Ogre::Any AnyUint8 ((Ogre::uint8)0);
+Ogre::Any AnyUint16 ((Ogre::uint16)0);
+Ogre::Any AnyUint32 ((Ogre::uint32)0);
+Ogre::Any AnyUint ((Ogre::uint)0);
+Ogre::Any AnyUlong ((Ogre::ulong)0);
+Ogre::Any AnyUshort ((Ogre::ushort)0);
+Ogre::Any AnyUchar ((Ogre::uchar) 0);
+Ogre::Any AnyString ((Ogre::String) "");
+
+
+sizeof ( AnyNumInt );
+sizeof ( AnyNumReal );
+sizeof ( AnyNumUint8 );
+sizeof ( AnyNumUint16 );
+sizeof ( AnyNumUint32 );
+sizeof ( AnyNumUint );
+sizeof ( AnyNumUlong );
+sizeof ( AnyNumUshort );
+sizeof ( AnyNumUchar );
+
+sizeof ( AnyInt );
+sizeof ( AnyReal );
+sizeof ( AnyUint8 );
+sizeof ( AnyUint16 );
+sizeof ( AnyUint32 );
+sizeof ( AnyUint );
+sizeof ( AnyUlong );
+sizeof ( AnyUshort );
+sizeof ( AnyUchar );
+sizeof ( AnyString );
+
sizeof ( Ogre::SharedPtr<Ogre::WaveformControllerFunction> );
// sizeof ( Ogre::ControllerFunction<float>);
// sizeof ( Ogre::SharedPtr<Ogre::ControllerFunction<float>>);
Modified: trunk/python-ogre/code_generators/ogreforests/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/generate_code.py 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/code_generators/ogreforests/generate_code.py 2007-11-11 01:31:00 UTC (rev 466)
@@ -150,6 +150,8 @@
def create_output( size ):
return [ ft.output( i ) for i in range( size ) ]
+ x=main_ns.mem_fun('::GeometryPageManager::update')
+ x.add_transformation( ft.input('enableCache'))
###############################################################################
##
@@ -337,10 +339,11 @@
recursive=False )
## and we do a special here as we have to modify a header (PagedGeomerty) to with with GCCXML
- os.remove ( os.path.join ( environment.ogreforests.generated_dir, "PagedGeometry.h" ) )
- common_utils.copyTree ( sourcePath = os.path.join(environment.Config.PATH_INCLUDE_ogreforests,"orig"),
- destPath = environment.ogreforests.generated_dir,
- recursive=False )
+ ## Not needed now as GCCXML has been updated
+# # os.remove ( os.path.join ( environment.ogreforests.generated_dir, "PagedGeometry.h" ) )
+# # common_utils.copyTree ( sourcePath = os.path.join(environment.Config.PATH_INCLUDE_ogreforests,"orig"),
+# # destPath = environment.ogreforests.generated_dir,
+# # recursive=False )
if __name__ == '__main__':
start_time = time.clock()
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/environment.py 2007-11-11 01:31:00 UTC (rev 466)
@@ -119,18 +119,26 @@
includePaths = []
myIncludes = []
libaries = myLibraries # a list of the libraries I need plus
- mySource = [] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'}
- myBuildCmds = [] # commands to build the library with
+ Source = [] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'}
+ BuildCmds = [] # commands to build the library with
######################
+class GeneralModules:
+ pythonModule = False
+ Source = [
+ ["wget", "http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/Cg-1.5_Aug2007_x86.tar.gz",''],
+ ["wget", "http://www.cmake.org/files/v2.4/cmake-2.4.6-Linux-i386.tar.gz",''],
+ ["wget", "http://downloads.sourceforge.net/scons/scons-0.97.0d20070918.tar.gz",''],
+ ]
+
class boost:
+ active = True
version = "3.4"
pythonModule = False
ModuleName = ""
myHome = 'boost'
myLibraryPaths = [ 'boost/bin.v2/libs/python2.5/build/msvc-8.0/release/threading-multi' ]
myLibraries = [ 'boost_python-vc80-mt-1_35']
-
parent = None
children = []
codeGenerationFlags=[]
@@ -140,9 +148,11 @@
includePaths = []
myIncludes = []
libaries = myLibraries # a list of the libraries I need plus
- mySource = ['http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz',
- 'http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2'] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'}
- myBuildCmds = [] # commands to build the library with
+ Source = [
+ ['wget','http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz',''] ,
+ ['wget','http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2','']
+ ] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'}
+ BuildCmds = [] # commands to build the library with
class ogre:
active = True
@@ -199,11 +209,17 @@
cflags += '--gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
-
+ Source = [
+ ["wget", "http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2",''],
+ ["wget", "http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip",''],
+
+ ]
class ois:
active = True
- version= "1.0"
+ pythonModule = True
+ version= "1.1"
+ cflags=''
parent = "ogre/io"
if os.name=='nt':
libs=['OIS_Static',Config.LIB_Boost]
@@ -316,7 +332,10 @@
ModuleName = 'ODE'
CheckIncludes = ['boost/python.hpp', 'ode/ode.h']
active=True
-
+ Source = [
+ ["wget", "http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip",'']
+ ]
+
class opcode:
version= "1.3"
parent = "ogre/physics"
@@ -570,7 +589,6 @@
, Config.PATH_INCLUDE_OGG
, Config.PATH_INCLUDE_VORBIS
, Config.PATH_INCLUDE_OPENAL
- , Config.PATH_INCLUDE_ALUT
]
if os.name=='nt':
lib_dirs = [ Config.PATH_LIB_Boost
@@ -580,7 +598,6 @@
,os.path.join(Config.PATH_VORBIS, 'win32','VorbisEnc_Static_Release')
,os.path.join(Config.PATH_VORBIS, 'win32','VorbisFile_Static_Release')
,os.path.join(Config.PATH_OPENAL, 'libs','Win32')
- ,os.path.join(Config.PATH_ALUT, 'lib')
]
else:
lib_dirs = [ Config.PATH_LIB_Boost
@@ -591,19 +608,21 @@
CCFLAGS = ' -DOgreAL_Export="" -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS -DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER '
libs=[Config.LIB_Boost, 'OgreMain',
'ogg_static',
- 'alut',
'vorbis_static','vorbisfile_static','vorbisenc_static',
'OpenAL32', 'EFX-Util'] ## 'OgreAL' -- going to compile OgreAL ourselves
else:
libs=[Config.LIB_Boost, 'OgreMain',
'ogg',
- 'alut',
'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
active=True
-
+ Source = [
+ ["wget", "http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz",''],
+ ["wget", "http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz",''],
+ ["wget", "http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz",''],
+ ]
class ogrevideoffmpeg:
version="0.2.1"
parent="ogre/addons"
@@ -686,8 +705,10 @@
cflags = ""
parent = "ogre/physics"
libs = [Config.LIB_Boost, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics', 'LibBulletMath'
+ 'LibBulletCollision', 'LibBulletDynamics'
]
+ if os.name == 'nt':
+ libs.append('LibBulletMath')
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
@@ -711,8 +732,10 @@
cflags = ""
parent = "ogre/physics"
libs = [Config.LIB_Boost, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics', 'LibBulletMath'
+ 'LibBulletCollision', 'LibBulletDynamics'
]
+ if os.name == 'nt':
+ libs.append('LibBulletMath')
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
@@ -747,6 +770,38 @@
ModuleName="noise"
active=True
+class watermesh:
+ version="1.0"
+ parent="ogre/addons"
+ cflags = ""
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_watermesh
+ , Config.PATH_INCLUDE_Ogre
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost,
+ Config.PATH_LIB_Ogre_OgreMain
+ ]
+ CheckIncludes=[]
+ libs=[ Config.LIB_Boost, 'OgreMain' ]
+ ModuleName="watermesh"
+ active=True
+
+class ofusion:
+ version="1.0"
+ parent="ogre/addons"
+ cflags = ""
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_ofusion
+ , Config.PATH_INCLUDE_Ogre
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost,
+ Config.PATH_LIB_Ogre_OgreMain
+ ]
+ CheckIncludes=[]
+ libs=[ Config.LIB_Boost, 'OgreMain' ]
+ ModuleName="ofusion"
+ active=True
+
############################################################################################
## Here is the master list....
@@ -779,6 +834,8 @@
, 'et' : et
, 'caelum' : caelum
, 'noise' : noise
+ , 'watermesh' : watermesh
+ , 'ofusion' : ofusion
}
#
@@ -813,8 +870,10 @@
#
# a couple of specials that should be done differently
gccxml_bin = Config.gccxml_bin
-pyplusplus_install_dir = Config.pyplusplus_install_dir
-
+pyplusplus_install_dir = Config.pyplusplus_install_dir
+
+rpath= Config.RPATH
+
for name, cls in projects.items():
# little hack to allow overriding of settings from the config file
Modified: trunk/python-ogre/setup.py
===================================================================
--- trunk/python-ogre/setup.py 2007-11-02 10:51:56 UTC (rev 465)
+++ trunk/python-ogre/setup.py 2007-11-11 01:31:00 UTC (rev 466)
@@ -70,7 +70,7 @@
'ogre.addons.ogrevideoffmpeg', 'ogre.addons.ogredshow',
'ogre.addons.plib','ogre.gui.navi',
'ogre.addons.ogreforests', 'ogre.addons.et', 'ogre.addons.caelum',
- 'ogre.addons.noise' ],
+ 'ogre.addons.noise', 'ogre.addons.watermesh', 'ogre.addons.ofusion' ],
"package_dir": {'': 'packages_'+ PythonVersionString },
"package_data": {'': ['*.pyd', '*.dll', '*.so']}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-02 10:51:54
|
Revision: 465
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=465&view=rev
Author: andy_miller
Date: 2007-11-02 03:51:56 -0700 (Fri, 02 Nov 2007)
Log Message:
-----------
gccxml fix
Modified Paths:
--------------
trunk/python-ogre/scripts/01-RetrieveSource.sh
Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-11-01 20:58:03 UTC (rev 464)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-11-02 10:51:56 UTC (rev 465)
@@ -36,7 +36,7 @@
echo " -- getting python-ogre"
svn co https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre
echo " -- getting gccxml"
-cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co gccxml -D "1 Oct 2007"
+cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML -D "1 Oct 2007" co gccxml
echo " -- getting ogreode"
cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode
echo " -- getting ogrenewt"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-11-01 20:58:02
|
Revision: 464
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=464&view=rev
Author: andy_miller
Date: 2007-11-01 13:58:03 -0700 (Thu, 01 Nov 2007)
Log Message:
-----------
Force an older version of GCCXML until Py+= catches up with it
Modified Paths:
--------------
trunk/python-ogre/scripts/01-RetrieveSource.sh
Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-10-26 05:32:14 UTC (rev 463)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-11-01 20:58:03 UTC (rev 464)
@@ -36,7 +36,7 @@
echo " -- getting python-ogre"
svn co https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre
echo " -- getting gccxml"
-cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co gccxml
+cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co gccxml -D "1 Oct 2007"
echo " -- getting ogreode"
cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode
echo " -- getting ogrenewt"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-26 05:32:15
|
Revision: 463
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=463&view=rev
Author: andy_miller
Date: 2007-10-25 22:32:14 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
Remove freealut as ogreal no longer requires it
Build FreeImage as part fo the build
Exclude DevIL from the Ogre build
Modified Paths:
--------------
trunk/python-ogre/scripts/02-ExtractAndPatch.sh
trunk/python-ogre/scripts/04-BuildBaseLibs.sh
trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh
Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh
===================================================================
--- trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-25 05:38:36 UTC (rev 462)
+++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-10-26 05:32:14 UTC (rev 463)
@@ -14,8 +14,7 @@
tar zxf $DOWNLOADS/CEGUI-0.5.0b.tar.gz
echo " -- Unpacking OIS"
tar zxf $DOWNLOADS/ois-1.0RC1.tar.gz
-echo " -- Unpacking FreeImage"
-unzip -q -o $DOWNLOADS/FreeImage393.zip
+
echo " -- Unpacking Newton"
tar zxf $DOWNLOADS/newtonLinux-1.53.tar.gz
echo " -- Unpacking ODE"
@@ -23,9 +22,19 @@
echo " -- Unpacking OgreAL Support"
tar zxf $DOWNLOADS/libogg-1.1.3.tar.gz
tar zxf $DOWNLOADS/libvorbis-1.2.0.tar.gz
-tar zxf $DOWNLOADS/freealut-1.1.0.tar.gz
+## OgreAL doesn't need ALUT anymore
+## tar zxf $DOWNLOADS/freealut-1.1.0.tar.gz
tar zxf $DOWNLOADS/openal-0.0.8.tar.gz
+echo " -- Unpacking and patching FreeImage"
+unzip -q -o $DOWNLOADS/FreeImage393.zip
+pushd FreeImage
+sed --in-place -s 's|/usr/include|\$(DESTINC)|' Makefile.*
+sed --in-place -s 's|/usr/lib|\$(DESTLIB)|' Makefile.*
+sed --in-place -s 's|-o root -g root||' Makefile.*
+sed --in-place -s 's|ldconfig||' Makefile.*
+popd
+
echo " -- Unpacking CG"
pushd $ROOT
echo "Installing Cg"
Modified: trunk/python-ogre/scripts/04-BuildBaseLibs.sh
===================================================================
--- trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-25 05:38:36 UTC (rev 462)
+++ trunk/python-ogre/scripts/04-BuildBaseLibs.sh 2007-10-26 05:32:14 UTC (rev 463)
@@ -6,6 +6,14 @@
echo " == Building base libraries == "
#
+# Freeimage
+#
+pushd FreeImage
+make
+make DESTINC=$PREFIX/include DESTLIB=$PREFIX/lib install # On Freeimage's case, this is the right path
+popd
+
+#
# zlib as the one included in Ubuntu is buggy
#
echo " -- building zzlib --"
@@ -62,7 +70,7 @@
pushd ogrenew
aclocal
./bootstrap
-./configure --prefix=$PREFIX --with-gui=Xt
+./configure --prefix=$PREFIX --with-gui=Xt --disable-devil
make
make install
#cd ReferenceApplication
Modified: trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh
===================================================================
--- trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh 2007-10-25 05:38:36 UTC (rev 462)
+++ trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh 2007-10-26 05:32:14 UTC (rev 463)
@@ -50,15 +50,15 @@
make install
popd
-echo " -- Building OgreAL - freealut"
-pushd freealut-1.1.0
-./autogen.sh
-./configure --prefix=$PREFIX
+#echo " -- Building OgreAL - freealut"
+#pushd freealut-1.1.0
+#./autogen.sh
+#./configure --prefix=$PREFIX
## ugly hack as the make files in freealut don't really handle a non standard prefix
-cp $PREFIX/include/AL/* ./include/AL
-make
-make install
-popd
+#cp $PREFIX/include/AL/* ./include/AL
+#make
+#make install
+#popd
#
# Bullet
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-25 05:38:33
|
Revision: 462
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=462&view=rev
Author: andy_miller
Date: 2007-10-24 22:38:36 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
Again thanks to Dermont for a new wrapper -- libnoise !!!
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/SConstruct
trunk/python-ogre/environment.py
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/noise/
trunk/python-ogre/ThirdParty/noise/Makefile
trunk/python-ogre/ThirdParty/noise/Sources
trunk/python-ogre/ThirdParty/noise/abs.cpp
trunk/python-ogre/ThirdParty/noise/add.cpp
trunk/python-ogre/ThirdParty/noise/basictypes.h
trunk/python-ogre/ThirdParty/noise/billow.cpp
trunk/python-ogre/ThirdParty/noise/blend.cpp
trunk/python-ogre/ThirdParty/noise/cache.cpp
trunk/python-ogre/ThirdParty/noise/checkerboard.cpp
trunk/python-ogre/ThirdParty/noise/clamp.cpp
trunk/python-ogre/ThirdParty/noise/const.cpp
trunk/python-ogre/ThirdParty/noise/curve.cpp
trunk/python-ogre/ThirdParty/noise/cylinder.cpp
trunk/python-ogre/ThirdParty/noise/cylinders.cpp
trunk/python-ogre/ThirdParty/noise/displace.cpp
trunk/python-ogre/ThirdParty/noise/exception.h
trunk/python-ogre/ThirdParty/noise/exponent.cpp
trunk/python-ogre/ThirdParty/noise/interp.h
trunk/python-ogre/ThirdParty/noise/invert.cpp
trunk/python-ogre/ThirdParty/noise/latlon.cpp
trunk/python-ogre/ThirdParty/noise/latlon.h
trunk/python-ogre/ThirdParty/noise/line.cpp
trunk/python-ogre/ThirdParty/noise/mathconsts.h
trunk/python-ogre/ThirdParty/noise/max.cpp
trunk/python-ogre/ThirdParty/noise/min.cpp
trunk/python-ogre/ThirdParty/noise/misc.h
trunk/python-ogre/ThirdParty/noise/model/
trunk/python-ogre/ThirdParty/noise/model/cylinder.h
trunk/python-ogre/ThirdParty/noise/model/line.h
trunk/python-ogre/ThirdParty/noise/model/model.h
trunk/python-ogre/ThirdParty/noise/model/plane.h
trunk/python-ogre/ThirdParty/noise/model/sphere.h
trunk/python-ogre/ThirdParty/noise/module/
trunk/python-ogre/ThirdParty/noise/module/abs.h
trunk/python-ogre/ThirdParty/noise/module/add.h
trunk/python-ogre/ThirdParty/noise/module/billow.h
trunk/python-ogre/ThirdParty/noise/module/blend.h
trunk/python-ogre/ThirdParty/noise/module/cache.h
trunk/python-ogre/ThirdParty/noise/module/checkerboard.h
trunk/python-ogre/ThirdParty/noise/module/clamp.h
trunk/python-ogre/ThirdParty/noise/module/const.h
trunk/python-ogre/ThirdParty/noise/module/curve.h
trunk/python-ogre/ThirdParty/noise/module/cylinders.h
trunk/python-ogre/ThirdParty/noise/module/displace.h
trunk/python-ogre/ThirdParty/noise/module/exponent.h
trunk/python-ogre/ThirdParty/noise/module/invert.h
trunk/python-ogre/ThirdParty/noise/module/max.h
trunk/python-ogre/ThirdParty/noise/module/min.h
trunk/python-ogre/ThirdParty/noise/module/module.h
trunk/python-ogre/ThirdParty/noise/module/modulebase.h
trunk/python-ogre/ThirdParty/noise/module/multiply.h
trunk/python-ogre/ThirdParty/noise/module/perlin.h
trunk/python-ogre/ThirdParty/noise/module/power.h
trunk/python-ogre/ThirdParty/noise/module/ridgedmulti.h
trunk/python-ogre/ThirdParty/noise/module/rotatepoint.h
trunk/python-ogre/ThirdParty/noise/module/scalebias.h
trunk/python-ogre/ThirdParty/noise/module/scalepoint.h
trunk/python-ogre/ThirdParty/noise/module/select.h
trunk/python-ogre/ThirdParty/noise/module/spheres.h
trunk/python-ogre/ThirdParty/noise/module/terrace.h
trunk/python-ogre/ThirdParty/noise/module/translatepoint.h
trunk/python-ogre/ThirdParty/noise/module/turbulence.h
trunk/python-ogre/ThirdParty/noise/module/voronoi.h
trunk/python-ogre/ThirdParty/noise/modulebase.cpp
trunk/python-ogre/ThirdParty/noise/multiply.cpp
trunk/python-ogre/ThirdParty/noise/noise.h
trunk/python-ogre/ThirdParty/noise/noisegen.cpp
trunk/python-ogre/ThirdParty/noise/noisegen.h
trunk/python-ogre/ThirdParty/noise/noiseutils.cpp
trunk/python-ogre/ThirdParty/noise/noiseutils.h
trunk/python-ogre/ThirdParty/noise/perlin.cpp
trunk/python-ogre/ThirdParty/noise/plane.cpp
trunk/python-ogre/ThirdParty/noise/power.cpp
trunk/python-ogre/ThirdParty/noise/ridgedmulti.cpp
trunk/python-ogre/ThirdParty/noise/rotatepoint.cpp
trunk/python-ogre/ThirdParty/noise/scalebias.cpp
trunk/python-ogre/ThirdParty/noise/scalepoint.cpp
trunk/python-ogre/ThirdParty/noise/select.cpp
trunk/python-ogre/ThirdParty/noise/sphere.cpp
trunk/python-ogre/ThirdParty/noise/spheres.cpp
trunk/python-ogre/ThirdParty/noise/terrace.cpp
trunk/python-ogre/ThirdParty/noise/translatepoint.cpp
trunk/python-ogre/ThirdParty/noise/turbulence.cpp
trunk/python-ogre/ThirdParty/noise/vectortable.h
trunk/python-ogre/ThirdParty/noise/voronoi.cpp
trunk/python-ogre/code_generators/noise/
trunk/python-ogre/code_generators/noise/customization_data.py
trunk/python-ogre/code_generators/noise/generate_code.py
trunk/python-ogre/code_generators/noise/hand_made_wrappers.py
trunk/python-ogre/code_generators/noise/noise_README
trunk/python-ogre/code_generators/noise/python_noise.h
trunk/python-ogre/code_generators/noise/python_noise_aliases.h
trunk/python-ogre/code_generators/noise/python_noise_sizeof.h
trunk/python-ogre/demos/noise/
trunk/python-ogre/demos/noise/Demo_Noise_01.py
trunk/python-ogre/demos/noise/SampleFramework.py
trunk/python-ogre/demos/noise/plugins.cfg
trunk/python-ogre/demos/noise/resources.cfg
trunk/python-ogre/packages_2.5/ogre/addons/noise/
trunk/python-ogre/packages_2.5/ogre/addons/noise/__init__.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2007-10-24 12:02:21 UTC (rev 461)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2007-10-25 05:38:36 UTC (rev 462)
@@ -47,7 +47,9 @@
PATH_caelum = os.path.join(PATH_THIRDPARTY, 'caelum')
PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
# PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
+PATH_noise= os.path.join(PATH_THIRDPARTY, 'noise')
+
PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.62')
PATH_PhysX= "c:/program files/AGEIA Technologies/SDK/v2.7.2/SDKs"
@@ -136,6 +138,7 @@
PATH_INCLUDE_ogredshow = PATH_ogredshow
PATH_INCLUDE_plib = PATH_plib
PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
+PATH_INCLUDE_noise = PATH_noise
##PATH_INCLUDE_ogreforests = os.path.join (PATH_ogreforests,'include')
PATH_INCLUDE_ogreforests = PATH_ogreforests
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-10-24 12:02:21 UTC (rev 461)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-10-25 05:38:36 UTC (rev 462)
@@ -49,6 +49,7 @@
PATH_plib = os.path.join(PATH_THIRDPARTY, 'plib')
PATH_et = os.path.join(PATH_THIRDPARTY, 'et')
PATH_caelum = os.path.join(PATH_THIRDPARTY, 'caelum')
+PATH_noise= os.path.join(PATH_THIRDPARTY, 'noise')
PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
@@ -127,6 +128,7 @@
PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
PATH_INCLUDE_plib = PATH_plib
PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
+PATH_INCLUDE_noise = PATH_noise
PATH_INCLUDE_ogredshow = PATH_ogredshow
PATH_INCLUDE_ogreforests = PATH_ogreforests
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2007-10-24 12:02:21 UTC (rev 461)
+++ trunk/python-ogre/SConstruct 2007-10-25 05:38:36 UTC (rev 462)
@@ -82,7 +82,7 @@
def get_linkflags():
if os.name=='nt':
#LINKFLAGS = " /NOLOGO /INCREMENTAL:NO /DLL /OPT:NOREF /OPT:NOICF /OPT:NOWIN98 /subsystem:console " # no change
- LINKFLAGS = " /NOLOGO /OPT:REF /INCREMENTAL:NO /DLL /OPT:ICF /OPT:NOWIN98 /subsystem:console " # 7 minutes 25% smaller 16.6 Meg
+ LINKFLAGS = " /MAP:FULL /MAPINFO:EXPORTS /NOLOGO /OPT:REF /INCREMENTAL:NO /DLL /OPT:ICF /OPT:NOWIN98 /subsystem:console " # 7 minutes 25% smaller 16.6 Meg
#LINKFLAGS = " /NOLOGO /INCREMENTAL:NO /DLL /subsystem:console " ### LONG Link , 80 minutes - 15.7 meg
elif os.name == 'posix':
if os.sys.platform <> 'darwin':
@@ -95,7 +95,7 @@
possible_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd',
- 'ogreforests', 'et', 'navi', 'caelum' ] # , 'raknet'
+ 'ogreforests', 'et', 'navi', 'caelum', 'noise' ] # , 'raknet'
default_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
'ogrevideoffmpeg', 'ogredshow', 'plib', 'ogrebulletc', 'ogrebulletd',
@@ -165,9 +165,9 @@
## and lets have it install the output into the 'package_dir_name/ModuleName' dir and rename to the PydName
_env.AddPostAction(package,\
'mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % { 'name':package[index] } )
- #else:
- # _env.AddPostAction(package,\
- # '-strip -g -S -d --strip-debug -s %(name)s' % { 'name':package[index] } )
+ else:
+ _env.AddPostAction(package,\
+ '-strip -g -S -d --strip-debug -s %(name)s' % { 'name':package[index] } )
_env.InstallAs(os.path.join(environment.package_dir_name, cls.parent,
cls.ModuleName, cls.PydName),
Added: trunk/python-ogre/ThirdParty/noise/Makefile
===================================================================
--- trunk/python-ogre/ThirdParty/noise/Makefile (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/Makefile 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,56 @@
+LIBTOOL=libtool
+
+# defines source files and vpaths
+include Sources
+
+DEPENDS=$(SOURCES:.cpp=.d)
+
+# What source objects are we building?
+OBJECTS=$(SOURCES:.cpp=.o)
+
+.PHONY: all clean cleandeps cleanobjs cleanlib libnoise libnoise.so libnoise.so.0
+
+# hooks for future makefiles being able to make multiple SOs, or older SOs
+libnoise: libnoise.so libnoise.a libnoise.la
+libnoise.so: libnoise.so.0
+libnoise.so.0: libnoise.so.0.3
+
+# Real build targets
+libnoise.so.0.3: $(OBJECTS)
+ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -Wl,-soname=libnoise.so.0 -o $@ $(OBJECTS:.o=.lo)
+
+libnoise.a: $(OBJECTS)
+ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS)
+libnoise.la: $(OBJECTS)
+ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo)
+
+clean: cleandeps cleanobjs cleanlib
+cleandeps:
+ -rm $(DEPENDS)
+cleanobjs:
+ -rm $(OBJECTS)
+ -rm $(OBJECTS:.o=.lo) #clean up after libtool
+ -rm -rf .libs model/.libs module/.libs
+cleanlib:
+ -rm libnoise.so.0.3
+ -rm libnoise.a
+ -rm libnoise.la
+
+# Utility rules
+# Generates dependancy files:
+%.d: %.cpp
+ @set -e; rm -f $@; \
+ $(CXX) -MM $(CPPFLAGS) $< > $@.$$$$; \
+ sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+ rm -f $@.$$$$
+
+# C and C++ libtool (rather than raw CXX/CC) use
+%.o %.lo: %.cpp
+ $(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $(@:.lo=.o)
+
+%.o %.lo: %.c
+ $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $(@:.lo=.o)
+
+# If dependancies have never been built this will produce a horde of
+# "file not found" warnings and *then* build the deps. Very odd.
+include $(DEPENDS)
Added: trunk/python-ogre/ThirdParty/noise/Sources
===================================================================
--- trunk/python-ogre/ThirdParty/noise/Sources (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/Sources 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,80 @@
+SOURCES=../src/latlon.cpp \
+ ../src/noisegen.cpp \
+ ../src/model/cylinder.cpp \
+ ../src/model/line.cpp \
+ ../src/model/plane.cpp \
+ ../src/model/sphere.cpp \
+ ../src/module/abs.cpp \
+ ../src/module/add.cpp \
+ ../src/module/billow.cpp \
+ ../src/module/blend.cpp \
+ ../src/module/cache.cpp \
+ ../src/module/checkerboard.cpp \
+ ../src/module/clamp.cpp \
+ ../src/module/const.cpp \
+ ../src/module/curve.cpp \
+ ../src/module/cylinders.cpp \
+ ../src/module/displace.cpp \
+ ../src/module/exponent.cpp \
+ ../src/module/invert.cpp \
+ ../src/module/max.cpp \
+ ../src/module/min.cpp \
+ ../src/module/modulebase.cpp \
+ ../src/module/multiply.cpp \
+ ../src/module/perlin.cpp \
+ ../src/module/power.cpp \
+ ../src/module/ridgedmulti.cpp \
+ ../src/module/rotatepoint.cpp \
+ ../src/module/scalebias.cpp \
+ ../src/module/scalepoint.cpp \
+ ../src/module/select.cpp \
+ ../src/module/spheres.cpp \
+ ../src/module/terrace.cpp \
+ ../src/module/translatepoint.cpp \
+ ../src/module/turbulence.cpp \
+ ../src/module/voronoi.cpp
+
+HEADERS=../src/basictypes.h \
+ ../src/exception.h \
+ ../src/interp.h \
+ ../src/latlon.h \
+ ../src/mathconsts.h \
+ ../src/misc.h \
+ ../src/noisegen.h \
+ ../src/noise.h \
+ ../src/vectortable.h \
+ ../src/model/cylinder.h \
+ ../src/model/model.h \
+ ../src/model/sphere.h \
+ ../src/model/line.h \
+ ../src/model/plane.h \
+ ../src/module/abs.h \
+ ../src/module/add.h \
+ ../src/module/billow.h \
+ ../src/module/blend.h \
+ ../src/module/cache.h \
+ ../src/module/checkerboard.h \
+ ../src/module/clamp.h \
+ ../src/module/const.h \
+ ../src/module/curve.h \
+ ../src/module/cylinders.h \
+ ../src/module/displace.h \
+ ../src/module/exponent.h \
+ ../src/module/invert.h \
+ ../src/module/max.h \
+ ../src/module/min.h \
+ ../src/module/module.h \
+ ../src/module/modulebase.h \
+ ../src/module/multiply.h \
+ ../src/module/perlin.h \
+ ../src/module/power.h \
+ ../src/module/ridgedmulti.h \
+ ../src/module/rotatepoint.h \
+ ../src/module/scalebias.h \
+ ../src/module/scalepoint.h \
+ ../src/module/select.h \
+ ../src/module/spheres.h \
+ ../src/module/terrace.h \
+ ../src/module/translatepoint.h \
+ ../src/module/turbulence.h \
+ ../src/module/voronoi.h
Added: trunk/python-ogre/ThirdParty/noise/abs.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/abs.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/abs.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,37 @@
+// abs.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "abs.h"
+
+using namespace noise::module;
+
+Abs::Abs ():
+ Module (GetSourceModuleCount ())
+{
+}
+
+double Abs::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+
+ return fabs (m_pSourceModule[0]->GetValue (x, y, z));
+}
Added: trunk/python-ogre/ThirdParty/noise/add.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/add.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/add.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,39 @@
+// add.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "add.h"
+
+using namespace noise::module;
+
+Add::Add ():
+ Module (GetSourceModuleCount ())
+{
+}
+
+double Add::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+ assert (m_pSourceModule[1] != NULL);
+
+ return m_pSourceModule[0]->GetValue (x, y, z)
+ + m_pSourceModule[1]->GetValue (x, y, z);
+}
Added: trunk/python-ogre/ThirdParty/noise/basictypes.h
===================================================================
--- trunk/python-ogre/ThirdParty/noise/basictypes.h (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/basictypes.h 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,60 @@
+// basictypes.h
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#ifndef NOISE_BASICTYPES_H
+#define NOISE_BASICTYPES_H
+
+// You may need to modify these constants for your compiler or platform.
+
+namespace noise
+{
+
+ /// @defgroup libnoise libnoise
+ /// @addtogroup libnoise
+ /// @{
+
+ /// Unsigned integer type.
+ typedef unsigned int uint;
+
+ /// 32-bit unsigned integer type.
+ typedef unsigned int uint32;
+
+ /// 16-bit unsigned integer type.
+ typedef unsigned short uint16;
+
+ /// 8-bit unsigned integer type.
+ typedef unsigned char uint8;
+
+ /// 32-bit signed integer type.
+ typedef int int32;
+
+ /// 16-bit signed integer type.
+ typedef short int16;
+
+ /// 8-bit signed integer type.
+ typedef char int8;
+
+ /// @}
+
+}
+
+#endif
Added: trunk/python-ogre/ThirdParty/noise/billow.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/billow.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/billow.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,74 @@
+// billow.cpp
+//
+// Copyright (C) 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "billow.h"
+
+using namespace noise::module;
+
+Billow::Billow ():
+ Module (GetSourceModuleCount ()),
+ m_frequency (DEFAULT_BILLOW_FREQUENCY ),
+ m_lacunarity (DEFAULT_BILLOW_LACUNARITY ),
+ m_noiseQuality (DEFAULT_BILLOW_QUALITY ),
+ m_octaveCount (DEFAULT_BILLOW_OCTAVE_COUNT),
+ m_persistence (DEFAULT_BILLOW_PERSISTENCE ),
+ m_seed (DEFAULT_BILLOW_SEED)
+{
+}
+
+double Billow::GetValue (double x, double y, double z) const
+{
+ double value = 0.0;
+ double signal = 0.0;
+ double curPersistence = 1.0;
+ double nx, ny, nz;
+ int seed;
+
+ x *= m_frequency;
+ y *= m_frequency;
+ z *= m_frequency;
+
+ for (int curOctave = 0; curOctave < m_octaveCount; curOctave++) {
+
+ // Make sure that these floating-point values have the same range as a 32-
+ // bit integer so that we can pass them to the coherent-noise functions.
+ nx = MakeInt32Range (x);
+ ny = MakeInt32Range (y);
+ nz = MakeInt32Range (z);
+
+ // Get the coherent-noise value from the input value and add it to the
+ // final result.
+ seed = (m_seed + curOctave) & 0xffffffff;
+ signal = GradientCoherentNoise3D (nx, ny, nz, seed, m_noiseQuality);
+ signal = 2.0 * fabs (signal) - 1.0;
+ value += signal * curPersistence;
+
+ // Prepare the next octave.
+ x *= m_lacunarity;
+ y *= m_lacunarity;
+ z *= m_lacunarity;
+ curPersistence *= m_persistence;
+ }
+ value += 0.5;
+
+ return value;
+}
Added: trunk/python-ogre/ThirdParty/noise/blend.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/blend.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/blend.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,43 @@
+// blend.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "blend.h"
+#include "../interp.h"
+
+using namespace noise::module;
+
+Blend::Blend ():
+ Module (GetSourceModuleCount ())
+{
+}
+
+double Blend::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+ assert (m_pSourceModule[1] != NULL);
+ assert (m_pSourceModule[2] != NULL);
+
+ double v0 = m_pSourceModule[0]->GetValue (x, y, z);
+ double v1 = m_pSourceModule[1]->GetValue (x, y, z);
+ double alpha = (m_pSourceModule[2]->GetValue (x, y, z) + 1.0) / 2.0;
+ return LinearInterp (v0, v1, alpha);
+}
Added: trunk/python-ogre/ThirdParty/noise/cache.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/cache.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/cache.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,45 @@
+// cache.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "cache.h"
+
+using namespace noise::module;
+
+Cache::Cache ():
+ Module (GetSourceModuleCount ()),
+ m_isCached (false)
+{
+}
+
+double Cache::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+
+ if (!(m_isCached && x == m_xCache && y == m_yCache && z == m_zCache)) {
+ m_cachedValue = m_pSourceModule[0]->GetValue (x, y, z);
+ m_xCache = x;
+ m_yCache = y;
+ m_zCache = z;
+ }
+ m_isCached = true;
+ return m_cachedValue;
+}
Added: trunk/python-ogre/ThirdParty/noise/checkerboard.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/checkerboard.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/checkerboard.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,38 @@
+// checkerboard.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "checkerboard.h"
+
+using namespace noise::module;
+
+Checkerboard::Checkerboard ():
+ Module (GetSourceModuleCount ())
+{
+}
+
+double Checkerboard::GetValue (double x, double y, double z) const
+{
+ int ix = (int)(floor (MakeInt32Range (x)));
+ int iy = (int)(floor (MakeInt32Range (y)));
+ int iz = (int)(floor (MakeInt32Range (z)));
+ return (ix & 1 ^ iy & 1 ^ iz & 1)? -1.0: 1.0;
+}
Added: trunk/python-ogre/ThirdParty/noise/clamp.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/clamp.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/clamp.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,54 @@
+// clamp.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "clamp.h"
+
+using namespace noise::module;
+
+Clamp::Clamp ():
+ Module (GetSourceModuleCount ()),
+ m_lowerBound (DEFAULT_CLAMP_LOWER_BOUND),
+ m_upperBound (DEFAULT_CLAMP_UPPER_BOUND)
+{
+}
+
+double Clamp::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+
+ double value = m_pSourceModule[0]->GetValue (x, y, z);
+ if (value < m_lowerBound) {
+ return m_lowerBound;
+ } else if (value > m_upperBound) {
+ return m_upperBound;
+ } else {
+ return value;
+ }
+}
+
+void Clamp::SetBounds (double lowerBound, double upperBound)
+{
+ assert (lowerBound < upperBound);
+
+ m_lowerBound = lowerBound;
+ m_upperBound = upperBound;
+}
Added: trunk/python-ogre/ThirdParty/noise/const.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/const.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/const.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,31 @@
+// const.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "const.h"
+
+using namespace noise::module;
+
+Const::Const ():
+ Module (GetSourceModuleCount ()),
+ m_constValue (DEFAULT_CONST_VALUE)
+{
+}
Added: trunk/python-ogre/ThirdParty/noise/curve.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/curve.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/curve.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,143 @@
+// curve.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "../interp.h"
+#include "../misc.h"
+#include "curve.h"
+
+using namespace noise::module;
+
+Curve::Curve ():
+ Module (GetSourceModuleCount ()),
+ m_pControlPoints (NULL)
+{
+ m_controlPointCount = 0;
+}
+
+Curve::~Curve ()
+{
+ delete[] m_pControlPoints;
+}
+
+void Curve::AddControlPoint (double inputValue, double outputValue)
+{
+ // Find the insertion point for the new control point and insert the new
+ // point at that position. The control point array will remain sorted by
+ // input value.
+ int insertionPos = FindInsertionPos (inputValue);
+ InsertAtPos (insertionPos, inputValue, outputValue);
+}
+
+void Curve::ClearAllControlPoints ()
+{
+ delete[] m_pControlPoints;
+ m_pControlPoints = NULL;
+ m_controlPointCount = 0;
+}
+
+int Curve::FindInsertionPos (double inputValue)
+{
+ int insertionPos;
+ for (insertionPos = 0; insertionPos < m_controlPointCount; insertionPos++) {
+ if (inputValue < m_pControlPoints[insertionPos].inputValue) {
+ // We found the array index in which to insert the new control point.
+ // Exit now.
+ break;
+ } else if (inputValue == m_pControlPoints[insertionPos].inputValue) {
+ // Each control point is required to contain a unique input value, so
+ // throw an exception.
+ throw noise::ExceptionInvalidParam ();
+ }
+ }
+ return insertionPos;
+}
+
+double Curve::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+ assert (m_controlPointCount >= 4);
+
+ // Get the output value from the source module.
+ double sourceModuleValue = m_pSourceModule[0]->GetValue (x, y, z);
+
+ // Find the first element in the control point array that has an input value
+ // larger than the output value from the source module.
+ int indexPos;
+ for (indexPos = 0; indexPos < m_controlPointCount; indexPos++) {
+ if (sourceModuleValue < m_pControlPoints[indexPos].inputValue) {
+ break;
+ }
+ }
+
+ // Find the four nearest control points so that we can perform cubic
+ // interpolation.
+ int index0 = ClampValue (indexPos - 2, 0, m_controlPointCount - 1);
+ int index1 = ClampValue (indexPos - 1, 0, m_controlPointCount - 1);
+ int index2 = ClampValue (indexPos , 0, m_controlPointCount - 1);
+ int index3 = ClampValue (indexPos + 1, 0, m_controlPointCount - 1);
+
+ // If some control points are missing (which occurs if the value from the
+ // source module is greater than the largest input value or less than the
+ // smallest input value of the control point array), get the corresponding
+ // output value of the nearest control point and exit now.
+ if (index1 == index2) {
+ return m_pControlPoints[index1].outputValue;
+ }
+
+ // Compute the alpha value used for cubic interpolation.
+ double input0 = m_pControlPoints[index1].inputValue;
+ double input1 = m_pControlPoints[index2].inputValue;
+ double alpha = (sourceModuleValue - input0) / (input1 - input0);
+
+ // Now perform the cubic interpolation given the alpha value.
+ return CubicInterp (
+ m_pControlPoints[index0].outputValue,
+ m_pControlPoints[index1].outputValue,
+ m_pControlPoints[index2].outputValue,
+ m_pControlPoints[index3].outputValue,
+ alpha);
+}
+
+void Curve::InsertAtPos (int insertionPos, double inputValue,
+ double outputValue)
+{
+ // Make room for the new control point at the specified position within the
+ // control point array. The position is determined by the input value of
+ // the control point; the control points must be sorted by input value
+ // within that array.
+ ControlPoint* newControlPoints = new ControlPoint[m_controlPointCount + 1];
+ for (int i = 0; i < m_controlPointCount; i++) {
+ if (i < insertionPos) {
+ newControlPoints[i] = m_pControlPoints[i];
+ } else {
+ newControlPoints[i + 1] = m_pControlPoints[i];
+ }
+ }
+ delete[] m_pControlPoints;
+ m_pControlPoints = newControlPoints;
+ ++m_controlPointCount;
+
+ // Now that we've made room for the new control point within the array, add
+ // the new control point.
+ m_pControlPoints[insertionPos].inputValue = inputValue ;
+ m_pControlPoints[insertionPos].outputValue = outputValue;
+}
Added: trunk/python-ogre/ThirdParty/noise/cylinder.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/cylinder.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/cylinder.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,47 @@
+// cylinder.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "../mathconsts.h"
+#include "cylinder.h"
+
+using namespace noise;
+using namespace noise::model;
+
+Cylinder::Cylinder (): m_pModule (NULL)
+{
+}
+
+Cylinder::Cylinder (const module::Module& module):
+ m_pModule (&module)
+{
+}
+
+double Cylinder::GetValue (double angle, double height) const
+{
+ assert (m_pModule != NULL);
+
+ double x, y, z;
+ x = cos (angle * DEG_TO_RAD);
+ y = height;
+ z = sin (angle * DEG_TO_RAD);
+ return m_pModule->GetValue (x, y, z);
+}
Added: trunk/python-ogre/ThirdParty/noise/cylinders.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/cylinders.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/cylinders.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,44 @@
+// cylinders.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "../misc.h"
+#include "cylinders.h"
+
+using namespace noise::module;
+
+Cylinders::Cylinders ():
+ Module (GetSourceModuleCount ()),
+ m_frequency (DEFAULT_CYLINDERS_FREQUENCY)
+{
+}
+
+double Cylinders::GetValue (double x, double y, double z) const
+{
+ x *= m_frequency;
+ z *= m_frequency;
+
+ double distFromCenter = sqrt (x * x + z * z);
+ double distFromSmallerSphere = distFromCenter - floor (distFromCenter);
+ double distFromLargerSphere = 1.0 - distFromSmallerSphere;
+ double nearestDist = GetMin (distFromSmallerSphere, distFromLargerSphere);
+ return 1.0 - (nearestDist * 4.0); // Puts it in the -1.0 to +1.0 range.
+}
Added: trunk/python-ogre/ThirdParty/noise/displace.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/displace.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/displace.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,48 @@
+// displace.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "displace.h"
+
+using namespace noise::module;
+
+Displace::Displace ():
+ Module (GetSourceModuleCount ())
+{
+}
+
+double Displace::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+ assert (m_pSourceModule[1] != NULL);
+ assert (m_pSourceModule[2] != NULL);
+ assert (m_pSourceModule[3] != NULL);
+
+ // Get the output values from the three displacement modules. Add each
+ // value to the corresponding coordinate in the input value.
+ double xDisplace = x + (m_pSourceModule[1]->GetValue (x, y, z));
+ double yDisplace = y + (m_pSourceModule[2]->GetValue (x, y, z));
+ double zDisplace = z + (m_pSourceModule[3]->GetValue (x, y, z));
+
+ // Retrieve the output value using the offsetted input value instead of
+ // the original input value.
+ return m_pSourceModule[0]->GetValue (xDisplace, yDisplace, zDisplace);
+}
Added: trunk/python-ogre/ThirdParty/noise/exception.h
===================================================================
--- trunk/python-ogre/ThirdParty/noise/exception.h (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/exception.h 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,74 @@
+// exception.h
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#ifndef NOISE_EXCEPTION_H
+#define NOISE_EXCEPTION_H
+
+namespace noise
+{
+
+ /// @addtogroup libnoise
+ /// @{
+
+ /// Abstract base class for libnoise exceptions
+ class Exception
+ {
+ };
+
+ /// Invalid parameter exception
+ ///
+ /// An invalid parameter was passed to a libnoise function or method.
+ class ExceptionInvalidParam: public Exception
+ {
+ };
+
+ /// No module exception
+ ///
+ /// Could not retrieve a source module from a noise module.
+ ///
+ /// @note If one or more required source modules were not connected to a
+ /// specific noise module, and its GetValue() method was called, that
+ /// method will raise a debug assertion instead of this exception. This
+ /// is done for performance reasons.
+ class ExceptionNoModule: public Exception
+ {
+ };
+
+ /// Out of memory exception
+ ///
+ /// There was not enough memory to perform an action.
+ class ExceptionOutOfMemory: public Exception
+ {
+ };
+
+ /// Unknown exception
+ ///
+ /// libnoise raised an unknown exception.
+ class ExceptionUnknown: public Exception
+ {
+ };
+
+ /// @}
+
+}
+
+#endif
Added: trunk/python-ogre/ThirdParty/noise/exponent.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/exponent.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/exponent.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,39 @@
+// exponent.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "exponent.h"
+
+using namespace noise::module;
+
+Exponent::Exponent ():
+ Module (GetSourceModuleCount ()),
+ m_exponent (DEFAULT_EXPONENT)
+{
+}
+
+double Exponent::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+
+ double value = m_pSourceModule[0]->GetValue (x, y, z);
+ return (pow (fabs ((value + 1.0) / 2.0), m_exponent) * 2.0 - 1.0);
+}
Added: trunk/python-ogre/ThirdParty/noise/interp.h
===================================================================
--- trunk/python-ogre/ThirdParty/noise/interp.h (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/interp.h 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,112 @@
+// interp.h
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#ifndef NOISE_INTERP_H
+#define NOISE_INTERP_H
+
+namespace noise
+{
+
+ /// @addtogroup libnoise
+ /// @{
+
+ /// Performs cubic interpolation between two values bound between two other
+ /// values.
+ ///
+ /// @param n0 The value before the first value.
+ /// @param n1 The first value.
+ /// @param n2 The second value.
+ /// @param n3 The value after the second value.
+ /// @param a The alpha value.
+ ///
+ /// @returns The interpolated value.
+ ///
+ /// The alpha value should range from 0.0 to 1.0. If the alpha value is
+ /// 0.0, this function returns @a n1. If the alpha value is 1.0, this
+ /// function returns @a n2.
+ inline double CubicInterp (double n0, double n1, double n2, double n3,
+ double a)
+ {
+ double p = (n3 - n2) - (n0 - n1);
+ double q = (n0 - n1) - p;
+ double r = n2 - n0;
+ double s = n1;
+ return p * a * a * a + q * a * a + r * a + s;
+ }
+
+ /// Performs linear interpolation between two values.
+ ///
+ /// @param n0 The first value.
+ /// @param n1 The second value.
+ /// @param a The alpha value.
+ ///
+ /// @returns The interpolated value.
+ ///
+ /// The alpha value should range from 0.0 to 1.0. If the alpha value is
+ /// 0.0, this function returns @a n0. If the alpha value is 1.0, this
+ /// function returns @a n1.
+ inline double LinearInterp (double n0, double n1, double a)
+ {
+ return ((1.0 - a) * n0) + (a * n1);
+ }
+
+ /// Maps a value onto a cubic S-curve.
+ ///
+ /// @param a The value to map onto a cubic S-curve.
+ ///
+ /// @returns The mapped value.
+ ///
+ /// @a a should range from 0.0 to 1.0.
+ ///
+ /// The derivitive of a cubic S-curve is zero at @a a = 0.0 and @a a =
+ /// 1.0
+ inline double SCurve3 (double a)
+ {
+ return (a * a * (3.0 - 2.0 * a));
+ }
+
+ /// Maps a value onto a quintic S-curve.
+ ///
+ /// @param a The value to map onto a quintic S-curve.
+ ///
+ /// @returns The mapped value.
+ ///
+ /// @a a should range from 0.0 to 1.0.
+ ///
+ /// The first derivitive of a quintic S-curve is zero at @a a = 0.0 and
+ /// @a a = 1.0
+ ///
+ /// The second derivitive of a quintic S-curve is zero at @a a = 0.0 and
+ /// @a a = 1.0
+ inline double SCurve5 (double a)
+ {
+ double a3 = a * a * a;
+ double a4 = a3 * a;
+ double a5 = a4 * a;
+ return (6.0 * a5) - (15.0 * a4) + (10.0 * a3);
+ }
+
+ // @}
+
+}
+
+#endif
Added: trunk/python-ogre/ThirdParty/noise/invert.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/invert.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/invert.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,37 @@
+// invert.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "invert.h"
+
+using namespace noise::module;
+
+Invert::Invert ():
+ Module (GetSourceModuleCount ())
+{
+}
+
+double Invert::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+
+ return -(m_pSourceModule[0]->GetValue (x, y, z));
+}
Added: trunk/python-ogre/ThirdParty/noise/latlon.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/latlon.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/latlon.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,34 @@
+// latlon.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "latlon.h"
+
+using namespace noise;
+
+void noise::LatLonToXYZ (double lat, double lon, double& x, double& y,
+ double& z)
+{
+ double r = cos (DEG_TO_RAD * lat);
+ x = r * cos (DEG_TO_RAD * lon);
+ y = sin (DEG_TO_RAD * lat);
+ z = r * sin (DEG_TO_RAD * lon);
+}
Added: trunk/python-ogre/ThirdParty/noise/latlon.h
===================================================================
--- trunk/python-ogre/ThirdParty/noise/latlon.h (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/latlon.h 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,52 @@
+// latlon.h
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#ifndef NOISE_LATLON_H
+#define NOISE_LATLON_H
+
+#include <math.h>
+#include "mathconsts.h"
+
+namespace noise
+{
+
+ /// @addtogroup libnoise
+ /// @{
+
+ /// Converts latitude/longitude coordinates on a unit sphere into 3D
+ /// Cartesian coordinates.
+ ///
+ /// @param lat The latitude, in degrees.
+ /// @param lon The longitude, in degrees.
+ /// @param x On exit, this parameter contains the @a x coordinate.
+ /// @param y On exit, this parameter contains the @a y coordinate.
+ /// @param z On exit, this parameter contains the @a z coordinate.
+ ///
+ /// @pre lat must range from @b -90 to @b +90.
+ /// @pre lon must range from @b -180 to @b +180.
+ void LatLonToXYZ (double lat, double lon, double& x, double& y, double& z);
+
+ /// @}
+
+}
+
+#endif
Added: trunk/python-ogre/ThirdParty/noise/line.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/line.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/line.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,65 @@
+// line.cpp
+//
+// Copyright (C) 2004 Keith Davies
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+
+#include "line.h"
+
+using namespace noise;
+using namespace noise::model;
+
+Line::Line ():
+
+ m_attenuate (true),
+ m_pModule (NULL),
+ m_x0 (0.0),
+ m_x1 (1.0),
+ m_y0 (0.0),
+ m_y1 (1.0),
+ m_z0 (0.0),
+ m_z1 (1.0)
+{
+}
+
+Line::Line (const module::Module& module):
+
+ m_attenuate (true),
+ m_pModule (&module),
+ m_x0 (0.0),
+ m_x1 (1.0),
+ m_y0 (0.0),
+ m_y1 (1.0),
+ m_z0 (0.0),
+ m_z1 (1.0)
+{
+}
+
+double Line::GetValue (double p) const
+{
+ assert (m_pModule != NULL);
+
+ double x = (m_x1 - m_x0) * p + m_x0;
+ double y = (m_y1 - m_y0) * p + m_y0;
+ double z = (m_z1 - m_z0) * p + m_z0;
+ double value = m_pModule->GetValue (x, y, z);
+
+ if (m_attenuate) {
+ return p * (1.0 - p) * 4 * value;
+ } else {
+ return value;
+ }
+}
Added: trunk/python-ogre/ThirdParty/noise/mathconsts.h
===================================================================
--- trunk/python-ogre/ThirdParty/noise/mathconsts.h (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/mathconsts.h 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,54 @@
+// mathconsts.h
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#ifndef NOISE_MATHCONSTS_H
+#define NOISE_MATHCONSTS_H
+
+// For whatever reason, I can't find the basic math consts in the MSVC version
+// of math.h.
+
+namespace noise
+{
+
+ /// @addtogroup libnoise
+ /// @{
+
+ /// Pi.
+ const double PI = 3.1415926535897932385;
+
+ /// Square root of 2.
+ const double SQRT_2 = 1.4142135623730950488;
+
+ /// Square root of 3.
+ const double SQRT_3 = 1.7320508075688772935;
+
+ /// Converts an angle from degrees to radians.
+ const double DEG_TO_RAD = PI / 180.0;
+
+ /// Converts an angle from radians to degrees.
+ const double RAD_TO_DEG = 1.0 / DEG_TO_RAD;
+
+ /// @}
+
+}
+
+#endif
Added: trunk/python-ogre/ThirdParty/noise/max.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/max.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/max.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,41 @@
+// max.cpp
+//
+// Copyright (C) 2003, 2004 Jason Bevins
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 2.1 of the License, or (at
+// your option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License (COPYING.txt) for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// The developer's email is jlb...@gm... (for great email, take
+// off every 'zig'.)
+//
+
+#include "../misc.h"
+#include "max.h"
+
+using namespace noise::module;
+
+Max::Max ():
+ Module (GetSourceModuleCount ())
+{
+}
+
+double Max::GetValue (double x, double y, double z) const
+{
+ assert (m_pSourceModule[0] != NULL);
+ assert (m_pSourceModule[1] != NULL);
+
+ double v0 = m_pSourceModule[0]->GetValue (x, y, z);
+ double v1 = m_pSourceModule[1]->GetValue (x, y, z);
+ return GetMax (v0, v1);
+}
Added: trunk/python-ogre/ThirdParty/noise/min.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/min.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/noise/min.cpp 2007-10-25 05:38:36 UTC (rev 462)
@@ -0,0 +1,41 @@
+...
[truncated message content] |
|
From: <and...@us...> - 2007-10-24 12:02:16
|
Revision: 461
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=461&view=rev
Author: andy_miller
Date: 2007-10-24 05:02:21 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
Bug fix for hash maps in linux
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.h
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.cpp 2007-10-24 11:07:33 UTC (rev 460)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.cpp 2007-10-24 12:02:21 UTC (rev 461)
@@ -2,7 +2,6 @@
//Original author: John Judnich
#include "OgreScriptLoader.h"
-#include <hash_map>
#include "OgreResourceGroupManager.h"
#include "OgreException.h"
@@ -34,7 +33,7 @@
singletonPtr = NULL;
//Delete all scripts
- stdext::hash_map<String, ConfigNode*>::iterator i;
+ HashMap<String, ConfigNode*>::iterator i;
for (i = scriptList.begin(); i != scriptList.end(); i++){
delete i->second;
}
@@ -57,7 +56,7 @@
ConfigNode *ConfigScriptLoader::getConfigScript(const String &type, const String &name)
{
- stdext::hash_map<String, ConfigNode*>::iterator i;
+ HashMap<String, ConfigNode*>::iterator i;
String key = type + ' ' + name;
i = scriptList.find(key);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.h 2007-10-24 11:07:33 UTC (rev 460)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.h 2007-10-24 12:02:21 UTC (rev 461)
@@ -4,8 +4,8 @@
#ifndef __QuickGuiSkinSetParser_h_
#define __QuickGuiSkinSetParser_h_
+#include "OgrePrerequisites.h"
#include "OgreScriptLoader.h"
-#include <hash_map>
#include "QuickGUIExportDLL.h"
@@ -35,7 +35,7 @@
Ogre::Real mLoadOrder;
Ogre::StringVector mScriptPatterns;
- stdext::hash_map<Ogre::String, ConfigNode*> scriptList;
+ HashMap <Ogre::String, ConfigNode*> scriptList;
//Parsing
char *parseBuff, *parseBuffEnd, *buffPtr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-24 11:07:30
|
Revision: 460
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=460&view=rev
Author: andy_miller
Date: 2007-10-24 04:07:33 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
Updated QuickGUI
Updated Caelum from the branch SVN (just for fun!)
Final update before putting out a linux binary
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalTrackBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
Added Paths:
-----------
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.h
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.h
trunk/python-ogre/code_generators/physx/build.out
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -5,19 +5,19 @@
#include "Ogre.h"
// Define the dll export qualifier if compiling for Windows
-// // // #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-// // // #ifdef CAELUM_LIB
-// // // #define DllExport __declspec (dllexport)
-// // // #else
-// // // #ifdef __MINGW32__
-// // // #define DllExport
-// // // #else
-// // // #define DllExport __declspec (dllimport)
-// // // #endif
-// // // #endif
-// // // #else
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+ #ifdef CAELUM_LIB
+ #define DllExport __declspec (dllexport)
+ #else
+ #ifdef __MINGW32__
+ #define DllExport
+ #else
+ #define DllExport __declspec (dllimport)
+ #endif
+ #endif
+#else
#define DllExport
-// // // #endif
+#endif
// Define the version code
#define CAELUM_VERSION_MAIN 0
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -16,34 +16,42 @@
switch(mBorderType)
{
case BORDER_TYPE_TOP_LEFT:
+ mSkinComponent = ".border.topleft";
mHorizontalAnchor = ANCHOR_HORIZONTAL_LEFT;
mVerticalAnchor = ANCHOR_VERTICAL_TOP;
break;
case BORDER_TYPE_TOP_RIGHT:
+ mSkinComponent = ".border.topright";
mHorizontalAnchor = ANCHOR_HORIZONTAL_RIGHT;
mVerticalAnchor = ANCHOR_VERTICAL_TOP;
break;
case BORDER_TYPE_BOTTOM_LEFT:
+ mSkinComponent = ".border.bottomleft";
mHorizontalAnchor = ANCHOR_HORIZONTAL_LEFT;
mVerticalAnchor = ANCHOR_VERTICAL_BOTTOM;
break;
case BORDER_TYPE_BOTTOM_RIGHT:
+ mSkinComponent = ".border.bottomright";
mHorizontalAnchor = ANCHOR_HORIZONTAL_RIGHT;
mVerticalAnchor = ANCHOR_VERTICAL_BOTTOM;
break;
case BORDER_TYPE_LEFT:
+ mSkinComponent = ".border.left";
mHorizontalAnchor = ANCHOR_HORIZONTAL_LEFT;
mVerticalAnchor = ANCHOR_VERTICAL_TOP_BOTTOM;
break;
case BORDER_TYPE_TOP:
+ mSkinComponent = ".border.top";
mHorizontalAnchor = ANCHOR_HORIZONTAL_LEFT_RIGHT;
mVerticalAnchor = ANCHOR_VERTICAL_TOP;
break;
case BORDER_TYPE_RIGHT:
+ mSkinComponent = ".border.right";
mHorizontalAnchor = ANCHOR_HORIZONTAL_RIGHT;
mVerticalAnchor = ANCHOR_VERTICAL_TOP_BOTTOM;
break;
case BORDER_TYPE_BOTTOM:
+ mSkinComponent = ".border.bottom";
mHorizontalAnchor = ANCHOR_HORIZONTAL_LEFT_RIGHT;
mVerticalAnchor = ANCHOR_VERTICAL_BOTTOM;
break;
@@ -158,4 +166,19 @@
mc->offsetOrigin(0,0);
mc->setPosition(currentPosition.x,currentPosition.y);
}
+
+ void Border::setSkin(const Ogre::String& skinName, Ogre::String extension, bool recursive)
+ {
+ mSkinName = skinName;
+ if(mParentWidget != NULL)
+ setTexture(mSkinName + mParentWidget->getSkinComponent() + mSkinComponent + extension);
+ else
+ setTexture(mSkinName + mSkinComponent + extension);
+
+ if(recursive)
+ {
+ for(std::vector<Widget*>::iterator it = mChildWidgets.begin(); it != mChildWidgets.end(); ++it)
+ (*it)->setSkin(skinName,extension,recursive);
+ }
+ }
}
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIBorder.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -47,6 +47,8 @@
BorderType getBorderType();
+ void setSkin(const Ogre::String& skinName, Ogre::String extension = ".png", bool recursive = false);
+
protected:
virtual ~Border();
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -10,6 +10,7 @@
mButtonDown(false)
{
mWidgetType = TYPE_BUTTON;
+ mSkinComponent = ".button";
mButtonDownTexture = mTextureName + ".down" + mTextureExtension;
mButtonOverTexture = mTextureName + ".over" + mTextureExtension;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -13,10 +13,12 @@
mVPixelPadHeight(10)
{
mWidgetType = TYPE_COMBOBOX;
+ mSkinComponent = ".combobox";
addEventHandler(EVENT_LOSE_FOCUS,&ComboBox::onLoseFocus,this);
addEventHandler(EVENT_MOUSE_ENTER,&ComboBox::onMouseEnters,this);
addEventHandler(EVENT_MOUSE_LEAVE,&ComboBox::onMouseLeaves,this);
addEventHandler(EVENT_MOUSE_BUTTON_UP,&ComboBox::onMouseButtonUp,this);
+ addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&ComboBox::onMouseButtonDown,this);
mTextUtilities = new Text(mInstanceName+".TextUtilities",mQuadContainer,this);
mTextUtilities->disable();
@@ -38,6 +40,7 @@
mList->allowScrolling(true);
mList->hide();
mList->setPropogateEventFiring(EVENT_MOUSE_BUTTON_UP,true);
+ mList->setPropogateEventFiring(EVENT_MOUSE_BUTTON_DOWN,true);
mList->setPropogateEventFiring(EVENT_MOUSE_ENTER,true);
mList->setPropogateEventFiring(EVENT_MOUSE_LEAVE,true);
@@ -48,6 +51,8 @@
mMenuLabel->setHorizontalAnchor(ANCHOR_HORIZONTAL_LEFT_RIGHT);
mMenuLabel->setPosition(0,0);
mMenuLabel->setPropogateEventFiring(EVENT_LOSE_FOCUS,true);
+ mMenuLabel->setPropogateEventFiring(EVENT_MOUSE_ENTER,true);
+ mMenuLabel->setPropogateEventFiring(EVENT_MOUSE_LEAVE,true);
mGUIManager->notifyNameUsed(mInstanceName+".DropDownButton");
mButton = new Button(mInstanceName+".DropDownButton",Size(mSize.height,mSize.height),mTextureName + ".button" + mTextureExtension,mGUIManager);
@@ -57,6 +62,8 @@
mButton->setHorizontalAnchor(ANCHOR_HORIZONTAL_RIGHT);
mButton->setVerticalAnchor(ANCHOR_VERTICAL_TOP_BOTTOM);
mButton->setPropogateEventFiring(EVENT_MOUSE_BUTTON_UP,true);
+ mButton->setPropogateEventFiring(EVENT_MOUSE_ENTER,true);
+ mButton->setPropogateEventFiring(EVENT_MOUSE_LEAVE,true);
mHighlightTexture = mTextureName + ".highlight" + mTextureExtension;
@@ -181,7 +188,9 @@
{
highlightListItem(dynamic_cast<MenuLabel*>(mea.widget));
}
- //setTexture(mDefaultTexture + ".over" + mTextureExtension);
+
+ setTexture(mTextureName + ".over" + mTextureExtension,false);
+ mButton->applyButtonOverTexture();
}
void ComboBox::onMouseLeaves(const EventArgs& args)
@@ -189,9 +198,16 @@
mHighlightPanel->setVisible(false);
mHighlightedItem = NULL;
- //setTexture(mDefaultTexture + mTextureExtension);
+ setTexture(mTextureName + mTextureExtension,false);
+ mButton->applyDefaultTexture();
}
+ void ComboBox::onMouseButtonDown(const EventArgs& args)
+ {
+ setTexture(mTextureName + ".down" + mTextureExtension,false);
+ mButton->applyButtonDownTexture();
+ }
+
void ComboBox::onMouseButtonUp(const EventArgs& args)
{
const MouseEventArgs& mea = dynamic_cast<const MouseEventArgs&>(args);
@@ -203,13 +219,11 @@
{
mList->hide();
mGUIManager->_menuClosed(mList);
- mButton->applyDefaultTexture();
}
else
{
mList->show();
mGUIManager->_menuOpened(mList);
- mButton->applyButtonDownTexture();
}
}
}
@@ -217,7 +231,7 @@
void ComboBox::onSelection(const EventArgs& args)
{
selectItem(dynamic_cast<MenuLabel*>(dynamic_cast<const WidgetEventArgs&>(args).widget));
-// setTexture(mDefaultTexture + mTextureExtension);
+ setTexture(mTextureName + mTextureExtension,false);
mButton->applyDefaultTexture();
mList->hide();
@@ -314,6 +328,27 @@
ComboBox::setSize(pixelSize.width,pixelSize.height);
}
+ void ComboBox::setSkin(const Ogre::String& skinName, Ogre::String extension, bool recursive)
+ {
+ mSkinName = skinName;
+ setTexture(mSkinName + mSkinComponent + extension);
+ }
+
+ void ComboBox::setTexture(const Ogre::String& textureName, bool updateBaseTexture)
+ {
+ Image::setTexture(textureName,updateBaseTexture);
+
+ if(updateBaseTexture)
+ {
+ mList->setTexture(mTextureName + ".list" + mTextureExtension);
+ mMenuLabel->setTexture(mTextureName + ".menulabel" + mTextureExtension);
+ mButton->setTexture(mTextureName + ".button" + mTextureExtension);
+
+ mHighlightTexture = mTextureName + ".highlight" + mTextureExtension;
+ mHighlightPanel->setTexture(mHighlightTexture);
+ }
+ }
+
void ComboBox::setVerticalPixelPadHeight(unsigned int height)
{
mVPixelPadHeight = height;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -80,6 +80,12 @@
*/
virtual void setSize(const Ogre::Real& pixelWidth, const Ogre::Real& pixelHeight);
virtual void setSize(const Size& pixelSize);
+ virtual void setSkin(const Ogre::String& skinName, Ogre::String extension = ".png", bool recursive = false);
+ /**
+ * Applies the texture to the Quad if exists in some form, and updates the Image used for
+ * transparency picking.
+ */
+ virtual void setTexture(const Ogre::String& textureName, bool updateBaseTexture = true);
void setVerticalPixelPadHeight(unsigned int height);
protected:
@@ -99,6 +105,7 @@
void hideDropDownList(const EventArgs& args);
void onLoseFocus(const EventArgs& args);
void onMouseButtonUp(const EventArgs& args);
+ void onMouseButtonDown(const EventArgs& args);
void onMouseEnters(const EventArgs& args);
void onMouseLeaves(const EventArgs& args);
/**
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -3,10 +3,11 @@
namespace QuickGUI
{
Console::Console(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm) :
- MultiLineLabel(instanceName,pixelSize,textureName,gm),
+ LabelArea(instanceName,pixelSize,textureName,gm),
mMaxLines(30)
{
mWidgetType = TYPE_CONSOLE;
+ mSkinComponent = ".console";
mInputBox = new TextBox(mInstanceName+".InputBox",Size(mSize.width,0),"qgui.textbox.png",mGUIManager);
addChild(mInputBox);
@@ -59,7 +60,7 @@
void Console::clearText()
{
- MultiLineLabel::clearText();
+ LabelArea::clearText();
mInputBox->clearText();
}
@@ -83,13 +84,13 @@
void Console::setDisabledTextColor(const Ogre::ColourValue& c)
{
- MultiLineLabel::setDisabledTextColor(c);
+ LabelArea::setDisabledTextColor(c);
mInputBox->setDisabledTextColor(c);
}
void Console::setHorizontalAlignment(HorizontalAlignment ha)
{
- MultiLineLabel::setHorizontalAlignment(ha);
+ LabelArea::setHorizontalAlignment(ha);
mInputBox->setHorizontalAlignment(ha);
}
@@ -100,13 +101,13 @@
void Console::setTextColor(Ogre::ColourValue color)
{
- MultiLineLabel::setTextColor(color);
+ LabelArea::setTextColor(color);
mInputBox->setTextColor(color);
}
void Console::setVerticalAlignment(VerticalAlignment va)
{
- MultiLineLabel::setVerticalAlignment(va);
+ LabelArea::setVerticalAlignment(va);
mInputBox->setVerticalAlignment(va);
}
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -1,13 +1,13 @@
#ifndef QUICKGUICONSOLE_H
#define QUICKGUICONSOLE_H
-#include "QuickGUIMultiLineLabel.h"
+#include "QuickGUILabelArea.h"
#include "QuickGUITextBox.h"
namespace QuickGUI
{
class Console :
- public MultiLineLabel
+ public LabelArea
{
public:
Console(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -15,6 +15,7 @@
mButtonLayout(BUTTON_LAYOUT_OPPOSITE)
{
mWidgetType = TYPE_SCROLLBAR_HORIZONTAL;
+ mSkinComponent = ".scrollbar.horizontal";
mGUIManager->registerTimeListener(this);
addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&HorizontalScrollBar::onMouseDownOnTrack,this);
addEventHandler(EVENT_MOUSE_BUTTON_UP,&HorizontalScrollBar::onMouseUpOnTrack,this);
@@ -261,9 +262,11 @@
void HorizontalScrollBar::onMouseDownOnTrack(const EventArgs& args)
{
- if(dynamic_cast<const MouseEventArgs&>(args).button == MB_Left)
+ QuickGUI::MouseButtonID id = dynamic_cast<const MouseEventArgs&>(args).button;
+ if(id == MB_Left)
{
mMouseDownOnTrack = true;
+ mButtonDown = MB_Left;
Point mousePosition = dynamic_cast<const MouseEventArgs&>(args).position - getScreenPosition();
@@ -282,11 +285,34 @@
mRepeatTimer = 0;
}
+ else if(id == MB_Right)
+ {
+ mMouseDownOnTrack = true;
+ mButtonDown = MB_Right;
+
+ Point mousePosition = dynamic_cast<const MouseEventArgs&>(args).position - getScreenPosition();
+
+ ScrollEventArgs scrollArgs(this);
+ // if mouse clicked left of track, scroll right.
+ if(mousePosition.x < mSlider->getXPosition())
+ {
+ scrollArgs.sliderIncreasedPosition = false;
+ _scroll(mLargeChange,scrollArgs);
+ }
+ else
+ {
+ scrollArgs.sliderIncreasedPosition = true;
+ _scroll(-mLargeChange,scrollArgs);
+ }
+
+ mRepeatTimer = 0;
+ }
}
void HorizontalScrollBar::onMouseUpOnTrack(const EventArgs& args)
{
- if(dynamic_cast<const MouseEventArgs&>(args).button == MB_Left)
+ QuickGUI::MouseButtonID id = dynamic_cast<const MouseEventArgs&>(args).button;
+ if((id == MB_Left) || (id == MB_Right))
{
mMouseDownOnTrack = false;
}
@@ -306,22 +332,36 @@
void HorizontalScrollBar::onScrollLeftDown(const EventArgs& args)
{
- if(dynamic_cast<const MouseEventArgs&>(args).button == MB_Left)
+ QuickGUI::MouseButtonID id = dynamic_cast<const MouseEventArgs&>(args).button;
+ if(id == MB_Left)
{
scrollLeftSmall();
mRepeatTimer = 0;
}
+ else if(id == MB_Right)
+ {
+ scrollRightSmall();
+
+ mRepeatTimer = 0;
+ }
}
void HorizontalScrollBar::onScrollRightDown(const EventArgs& args)
{
- if(dynamic_cast<const MouseEventArgs&>(args).button == MB_Left)
+ QuickGUI::MouseButtonID id = dynamic_cast<const MouseEventArgs&>(args).button;
+ if(id == MB_Left)
{
scrollRightSmall();
mRepeatTimer = 0;
}
+ else if(id == MB_Right)
+ {
+ scrollLeftSmall();
+
+ mRepeatTimer = 0;
+ }
}
void HorizontalScrollBar::onSliderDragged(const EventArgs& args)
@@ -431,7 +471,7 @@
if(mMouseDownOnTrack)
{
MouseEventArgs args(this);
- args.button = MB_Left;
+ args.button = mButtonDown;
args.position = mGUIManager->getMouseCursor()->getPosition();
onMouseDownOnTrack(args);
return;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalScrollBar.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -132,6 +132,7 @@
void onScrollRightDown(const EventArgs& args);
bool mMouseDownOnTrack;
+ MouseButtonID mButtonDown;
void onMouseDownOnTrack(const EventArgs& args);
void onMouseUpOnTrack(const EventArgs& args);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIHorizontalTrackBar.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -10,6 +10,7 @@
mLargeChange(3)
{
mWidgetType = TYPE_TRACKBAR_HORIZONTAL;
+ mSkinComponent = ".trackbar.horizontal";
addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&HorizontalTrackBar::onMouseButtonDown,this);
// Creat slider button at the beginning of the HorizontalTrackBar, whether horizonal (left) or vertical (bot)
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -6,6 +6,7 @@
Widget(instanceName,pixelSize,texture,gm)
{
mWidgetType = TYPE_IMAGE;
+ mSkinComponent = ".image";
}
Image::~Image()
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -17,6 +17,7 @@
mVPixelPadHeight(6)
{
mWidgetType = TYPE_LABEL;
+ mSkinComponent = ".label";
mText = new Text(mInstanceName+".Text",mQuadContainer,this);
mText->setQuadLayer(mQuadLayer);
}
Added: trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -0,0 +1,205 @@
+#include "QuickGUILabelArea.h"
+
+namespace QuickGUI
+{
+ LabelArea::LabelArea(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm) :
+ Label(instanceName,pixelSize,textureName,gm),
+ mOffset(0.0),
+ mCaption("")
+ {
+ mWidgetType = TYPE_LABELAREA;
+ mSkinComponent = ".labelarea";
+ mAutoSize = false;
+
+ mTextList = new List(mInstanceName+".TextList",mSize,"",mGUIManager);
+ addChild(mTextList);
+ mTextList->setHorizontalAnchor(ANCHOR_HORIZONTAL_LEFT_RIGHT);
+ mTextList->setVerticalAnchor(ANCHOR_VERTICAL_TOP_BOTTOM);
+
+ allowScrolling(true);
+ }
+
+ LabelArea::~LabelArea()
+ {
+ }
+
+ int LabelArea::_getLine(int startIndex)
+ {
+ int end = startIndex + 1;
+
+ Ogre::Real length = 0;
+ Ogre::FontPtr font = mText->getFont();
+ Ogre::Real fontTextureWidth = mText->getFontTextureWidth();
+ Ogre::Font::UVRect uvRect;
+ while( (end < static_cast<int>(mCaption.length())) && (length <= (mSize.width - mOffset)))
+ {
+ if(mText->isWhiteSpace(mCaption[end]))
+ {
+ if(mText->isSpace(mCaption[end]))
+ uvRect = font->getGlyphTexCoords('r');
+ else if(mText->isTab(mCaption[end]))
+ {
+ uvRect = font->getGlyphTexCoords('r');
+ uvRect.right = uvRect.right + ((uvRect.right - uvRect.left) * (SPACES_PER_TAB - 1));
+ }
+ }
+ else
+ uvRect = font->getGlyphTexCoords(mCaption[end]);
+ length += (((uvRect.right - uvRect.left) * TEXT_MULTIPLIER) * fontTextureWidth);
+ ++end;
+ }
+
+ // The rest of the caption is less than the width of the Widget.
+ if( end == static_cast<int>(mCaption.length()) )
+ return end;
+ // Remaining portion of caption is larger than the width of the widget.
+ else
+ {
+ // Iterate backwards until we find a space.
+ while( !mText->isSpace(mCaption[end]) )
+ --end;
+
+ return end;
+ }
+ }
+
+ void LabelArea::alignText()
+ {
+ }
+
+ void LabelArea::allowScrolling(bool allow)
+ {
+ mScrollingAllowed = allow;
+ mTextList->allowScrolling(mScrollingAllowed);
+
+ if(allow)
+ mOffset = mTextList->mRightScrollBar->getWidth();
+ else
+ mOffset = 0.0;
+ }
+
+ void LabelArea::clearText()
+ {
+ setText("");
+ }
+
+ void LabelArea::disable()
+ {
+ mTextColor = mText->getColor();
+
+ for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
+ {
+ dynamic_cast<TextBox*>(mTextList->getItem(i))->setTextColor(mDisabledTextColor);
+ }
+
+ Label::disable();
+ }
+
+ void LabelArea::enable()
+ {
+ for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
+ {
+ dynamic_cast<TextBox*>(mTextList->getItem(i))->setTextColor(mTextColor);
+ }
+
+ Label::enable();
+ }
+
+ Ogre::UTFString LabelArea::getText()
+ {
+ return mCaption;
+ }
+
+ bool LabelArea::scrollingAllowed()
+ {
+ return mScrollingAllowed;
+ }
+
+ void LabelArea::setDisabledTextColor(const Ogre::ColourValue& c)
+ {
+ mDisabledTextColor = c;
+
+ for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
+ {
+ dynamic_cast<TextBox*>(mTextList->getItem(i))->setDisabledTextColor(mDisabledTextColor);
+ }
+
+ if(!mEnabled)
+ disable();
+ }
+
+ void LabelArea::setFont(const Ogre::String& fontScriptName, bool recursive)
+ {
+ Label::setFont(fontScriptName,recursive);
+ setText(mCaption);
+ }
+
+ void LabelArea::setHorizontalAlignment(HorizontalAlignment ha)
+ {
+ mHorizontalAlignment = ha;
+
+ for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
+ {
+ dynamic_cast<TextBox*>(mTextList->getItem(i))->setHorizontalAlignment(mHorizontalAlignment);
+ }
+ }
+
+ void LabelArea::setText(const Ogre::UTFString& text)
+ {
+ mCaption = text;
+
+ // Caption Iterator
+ int textIndex = 0;
+ // Index denoting the end of a line that can fix within the widgets width.
+ int lineEnd = 0;
+ // The index of the text box to use, or create and use.
+ int textBoxIndex = 0;
+
+ while( textIndex < static_cast<int>(mCaption.size()) )
+ {
+ lineEnd = _getLine(textIndex);
+
+ TextBox* tb;
+ if( textBoxIndex >= mTextList->getNumberOfItems() )
+ {
+ tb = mTextList->addTextBox();
+ tb->setTexture("");
+ }
+ else
+ tb = dynamic_cast<TextBox*>(mTextList->getItem(textBoxIndex));
+
+ tb->setReadOnly(true);
+ tb->setUseBorders(false);
+ tb->setText(mCaption.substr(textIndex,lineEnd - textIndex));
+ ++textBoxIndex;
+
+ textIndex = lineEnd + 1;
+ }
+
+ // destroy remaining unused textboxes.
+ int numExtraTextBoxes = mTextList->getNumberOfItems() - textBoxIndex;
+ while( numExtraTextBoxes > 0 )
+ {
+ mTextList->removeItem(textBoxIndex);
+ --numExtraTextBoxes;
+ }
+ }
+
+ void LabelArea::setTextColor(Ogre::ColourValue color)
+ {
+ for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
+ {
+ dynamic_cast<TextBox*>(mTextList->getItem(i))->setTextColor(color);
+ }
+ }
+
+ void LabelArea::setVerticalAlignment(VerticalAlignment va)
+ {
+ mVerticalAlignment = va;
+
+ for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
+ {
+ dynamic_cast<TextBox*>(mTextList->getItem(i))->setVerticalAlignment(mVerticalAlignment);
+ }
+ }
+}
Added: trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.h (rev 0)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -0,0 +1,71 @@
+#ifndef QUICKGUIMULTILINELABEL_H
+#define QUICKGUIMULTILINELABEL_H
+
+#include "QuickGUIList.h"
+#include "QuickGUILabel.h"
+
+#include <vector>
+
+namespace QuickGUI
+{
+ class _QuickGUIExport LabelArea :
+ public Label
+ {
+ public:
+ LabelArea(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm);
+ ~LabelArea();
+
+ /**
+ * Aligns the child Label widget horizontally and vertically
+ */
+ virtual void alignText();
+ void allowScrolling(bool allow);
+
+ virtual void clearText();
+
+ /**
+ * Disable Widget, making it unresponsive to events.
+ */
+ virtual void disable();
+ /**
+ * Enable Widget, allowing it to accept and handle events.
+ */
+ virtual void enable();
+
+ virtual Ogre::UTFString getText();
+
+ bool scrollingAllowed();
+ /**
+ * Sets the color of the text when the widget is disabled.
+ */
+ virtual void setDisabledTextColor(const Ogre::ColourValue& c);
+ virtual void setFont(const Ogre::String& fontScriptName, bool recursive = false);
+ /**
+ * Sets text horizontal alignment.
+ */
+ virtual void setHorizontalAlignment(HorizontalAlignment ha);
+ virtual void setText(const Ogre::UTFString& text);
+ virtual void setTextColor(Ogre::ColourValue color);
+ /**
+ * Sets text vertical alignment.
+ */
+ virtual void setVerticalAlignment(VerticalAlignment va);
+
+ protected:
+ Ogre::UTFString mCaption;
+ List* mTextList;
+ // if ScrollBar is visible, width used to calculating a line of text is modified.
+ Ogre::Real mOffset;
+
+ bool mScrollingAllowed;
+
+ // Properties that are used across all TextBoxes
+ Ogre::String mTextBoxTextureName;
+ Ogre::String mTextBoxFont;
+
+ // Finds the end of the last word that can fit in one text box.
+ int _getLine(int startIndex);
+ };
+}
+
+#endif
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -14,6 +14,7 @@
mVPixelPadHeight(6)
{
mWidgetType = TYPE_LIST;
+ mSkinComponent = ".list";
mTextUtilities = new Text(mInstanceName+".TextUtilities",mQuadContainer,this);
mTextUtilities->disable();
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -24,7 +24,7 @@
{
public:
friend class ComboBox;
- friend class MultiLineLabel;
+ friend class LabelArea;
public:
/** Constructor
@param
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -316,8 +316,8 @@
case Widget::TYPE_LABEL: s = "Label"; break;
case Widget::TYPE_LIST: s = "List"; break;
case Widget::TYPE_MENULABEL: s = "MenuLabel"; break;
- case Widget::TYPE_MULTILINELABEL: s = "MultiLineLabel"; break;
- case Widget::TYPE_MULTILINETEXTBOX: s = "MultiLineTextBox"; break;
+ case Widget::TYPE_LABELAREA: s = "LabelArea"; break;
+ case Widget::TYPE_TEXTAREA: s = "TextArea"; break;
case Widget::TYPE_NSTATEBUTTON: s = "NStateButton"; break;
case Widget::TYPE_PANEL: s = "Panel"; break;
case Widget::TYPE_PROGRESSBAR: s = "ProgressBar"; break;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -10,6 +10,7 @@
mButtonTextureName("")
{
mWidgetType = TYPE_MENULABEL;
+ mSkinComponent = ".menulabel";
mTextBoundsPixelOffset.x = mSize.height;
mTextBoundsRelativeSize.width = (mSize.width - (mSize.height * 2.0)) / mSize.width;
Deleted: trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -1,204 +0,0 @@
-#include "QuickGUIMultiLineLabel.h"
-
-namespace QuickGUI
-{
- MultiLineLabel::MultiLineLabel(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm) :
- Label(instanceName,pixelSize,textureName,gm),
- mOffset(0.0),
- mCaption("")
- {
- mWidgetType = TYPE_MULTILINELABEL;
- mAutoSize = false;
-
- mTextList = new List(mInstanceName+".TextList",mSize,"",mGUIManager);
- addChild(mTextList);
- mTextList->setHorizontalAnchor(ANCHOR_HORIZONTAL_LEFT_RIGHT);
- mTextList->setVerticalAnchor(ANCHOR_VERTICAL_TOP_BOTTOM);
-
- allowScrolling(true);
- }
-
- MultiLineLabel::~MultiLineLabel()
- {
- }
-
- int MultiLineLabel::_getLine(int startIndex)
- {
- int end = startIndex + 1;
-
- Ogre::Real length = 0;
- Ogre::FontPtr font = mText->getFont();
- Ogre::Real fontTextureWidth = mText->getFontTextureWidth();
- Ogre::Font::UVRect uvRect;
- while( (end < static_cast<int>(mCaption.length())) && (length <= (mSize.width - mOffset)))
- {
- if(mText->isWhiteSpace(mCaption[end]))
- {
- if(mText->isSpace(mCaption[end]))
- uvRect = font->getGlyphTexCoords('r');
- else if(mText->isTab(mCaption[end]))
- {
- uvRect = font->getGlyphTexCoords('r');
- uvRect.right = uvRect.right + ((uvRect.right - uvRect.left) * (SPACES_PER_TAB - 1));
- }
- }
- else
- uvRect = font->getGlyphTexCoords(mCaption[end]);
- length += (((uvRect.right - uvRect.left) * TEXT_MULTIPLIER) * fontTextureWidth);
- ++end;
- }
-
- // The rest of the caption is less than the width of the Widget.
- if( end == static_cast<int>(mCaption.length()) )
- return end;
- // Remaining portion of caption is larger than the width of the widget.
- else
- {
- // Iterate backwards until we find a space.
- while( !mText->isSpace(mCaption[end]) )
- --end;
-
- return end;
- }
- }
-
- void MultiLineLabel::alignText()
- {
- }
-
- void MultiLineLabel::allowScrolling(bool allow)
- {
- mScrollingAllowed = allow;
- mTextList->allowScrolling(mScrollingAllowed);
-
- if(allow)
- mOffset = mTextList->mRightScrollBar->getWidth();
- else
- mOffset = 0.0;
- }
-
- void MultiLineLabel::clearText()
- {
- setText("");
- }
-
- void MultiLineLabel::disable()
- {
- mTextColor = mText->getColor();
-
- for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
- {
- dynamic_cast<TextBox*>(mTextList->getItem(i))->setTextColor(mDisabledTextColor);
- }
-
- Label::disable();
- }
-
- void MultiLineLabel::enable()
- {
- for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
- {
- dynamic_cast<TextBox*>(mTextList->getItem(i))->setTextColor(mTextColor);
- }
-
- Label::enable();
- }
-
- Ogre::UTFString MultiLineLabel::getText()
- {
- return mCaption;
- }
-
- bool MultiLineLabel::scrollingAllowed()
- {
- return mScrollingAllowed;
- }
-
- void MultiLineLabel::setDisabledTextColor(const Ogre::ColourValue& c)
- {
- mDisabledTextColor = c;
-
- for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
- {
- dynamic_cast<TextBox*>(mTextList->getItem(i))->setDisabledTextColor(mDisabledTextColor);
- }
-
- if(!mEnabled)
- disable();
- }
-
- void MultiLineLabel::setFont(const Ogre::String& fontScriptName, bool recursive)
- {
- Label::setFont(fontScriptName,recursive);
- setText(mCaption);
- }
-
- void MultiLineLabel::setHorizontalAlignment(HorizontalAlignment ha)
- {
- mHorizontalAlignment = ha;
-
- for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
- {
- dynamic_cast<TextBox*>(mTextList->getItem(i))->setHorizontalAlignment(mHorizontalAlignment);
- }
- }
-
- void MultiLineLabel::setText(const Ogre::UTFString& text)
- {
- mCaption = text;
-
- // Caption Iterator
- int textIndex = 0;
- // Index denoting the end of a line that can fix within the widgets width.
- int lineEnd = 0;
- // The index of the text box to use, or create and use.
- int textBoxIndex = 0;
-
- while( textIndex < static_cast<int>(mCaption.size()) )
- {
- lineEnd = _getLine(textIndex);
-
- TextBox* tb;
- if( textBoxIndex >= mTextList->getNumberOfItems() )
- {
- tb = mTextList->addTextBox();
- tb->setTexture("");
- }
- else
- tb = dynamic_cast<TextBox*>(mTextList->getItem(textBoxIndex));
-
- tb->setReadOnly(true);
- tb->setUseBorders(false);
- tb->setText(mCaption.substr(textIndex,lineEnd - textIndex));
- ++textBoxIndex;
-
- textIndex = lineEnd + 1;
- }
-
- // destroy remaining unused textboxes.
- int numExtraTextBoxes = mTextList->getNumberOfItems() - textBoxIndex;
- while( numExtraTextBoxes > 0 )
- {
- mTextList->removeItem(textBoxIndex);
- --numExtraTextBoxes;
- }
- }
-
- void MultiLineLabel::setTextColor(Ogre::ColourValue color)
- {
- for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
- {
- dynamic_cast<TextBox*>(mTextList->getItem(i))->setTextColor(color);
- }
- }
-
- void MultiLineLabel::setVerticalAlignment(VerticalAlignment va)
- {
- mVerticalAlignment = va;
-
- for( int i = 0; i < mTextList->getNumberOfItems(); ++i )
- {
- dynamic_cast<TextBox*>(mTextList->getItem(i))->setVerticalAlignment(mVerticalAlignment);
- }
- }
-}
Deleted: trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineLabel.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -1,71 +0,0 @@
-#ifndef QUICKGUIMULTILINELABEL_H
-#define QUICKGUIMULTILINELABEL_H
-
-#include "QuickGUIList.h"
-#include "QuickGUILabel.h"
-
-#include <vector>
-
-namespace QuickGUI
-{
- class _QuickGUIExport MultiLineLabel :
- public Label
- {
- public:
- MultiLineLabel(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm);
- ~MultiLineLabel();
-
- /**
- * Aligns the child Label widget horizontally and vertically
- */
- virtual void alignText();
- void allowScrolling(bool allow);
-
- virtual void clearText();
-
- /**
- * Disable Widget, making it unresponsive to events.
- */
- virtual void disable();
- /**
- * Enable Widget, allowing it to accept and handle events.
- */
- virtual void enable();
-
- virtual Ogre::UTFString getText();
-
- bool scrollingAllowed();
- /**
- * Sets the color of the text when the widget is disabled.
- */
- virtual void setDisabledTextColor(const Ogre::ColourValue& c);
- virtual void setFont(const Ogre::String& fontScriptName, bool recursive = false);
- /**
- * Sets text horizontal alignment.
- */
- virtual void setHorizontalAlignment(HorizontalAlignment ha);
- virtual void setText(const Ogre::UTFString& text);
- virtual void setTextColor(Ogre::ColourValue color);
- /**
- * Sets text vertical alignment.
- */
- virtual void setVerticalAlignment(VerticalAlignment va);
-
- protected:
- Ogre::UTFString mCaption;
- List* mTextList;
- // if ScrollBar is visible, width used to calculating a line of text is modified.
- Ogre::Real mOffset;
-
- bool mScrollingAllowed;
-
- // Properties that are used across all TextBoxes
- Ogre::String mTextBoxTextureName;
- Ogre::String mTextBoxFont;
-
- // Finds the end of the last word that can fit in one text box.
- int _getLine(int startIndex);
- };
-}
-
-#endif
Deleted: trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -1,14 +0,0 @@
-#include "QuickGUIMultiLineTextBox.h"
-
-namespace QuickGUI
-{
- MultiLineTextBox::MultiLineTextBox(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm) :
- MultiLineLabel(instanceName,pixelSize,textureName,gm)
- {
- mWidgetType = TYPE_MULTILINETEXTBOX;
- }
-
- MultiLineTextBox::~MultiLineTextBox()
- {
- }
-}
Deleted: trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIMultiLineTextBox.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -1,19 +0,0 @@
-#ifndef QUICKGUIMULTILINETEXTBOX_H
-#define QUICKGUIMULTILINETEXTBOX_H
-
-#include "QuickGUIMultiLineLabel.h"
-
-namespace QuickGUI
-{
- class _QuickGUIExport MultiLineTextBox :
- public MultiLineLabel
- {
- public:
- MultiLineTextBox(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm);
- ~MultiLineTextBox();
-
- protected:
- };
-}
-
-#endif
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -6,6 +6,7 @@
Button(instanceName,pixelSize,"",gm)
{
mWidgetType = TYPE_NSTATEBUTTON;
+ mSkinComponent = "";
mAutoSize = false;
addEventHandler(EVENT_MOUSE_BUTTON_UP,&NStateButton::onMouseButtonUp,this);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -201,12 +201,12 @@
return newList;
}
- MultiLineLabel* Panel::createMultiLineLabel()
+ LabelArea* Panel::createMultiLineLabel()
{
- Ogre::String name = mGUIManager->generateName(TYPE_MULTILINELABEL);
+ Ogre::String name = mGUIManager->generateName(TYPE_LABELAREA);
mGUIManager->notifyNameUsed(name);
- MultiLineLabel* newMultiLineLabel = new MultiLineLabel(name,Size(300,100),"qgui.multilinelabel.png",mGUIManager);
+ LabelArea* newMultiLineLabel = new LabelArea(name,Size(300,100),"qgui.LabelArea.png",mGUIManager);
addChild(newMultiLineLabel);
newMultiLineLabel->setPosition(0,0);
newMultiLineLabel->setFont(mFontName,true);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -8,7 +8,7 @@
#include "QuickGUIComboBox.h"
#include "QuickGUIConsole.h"
#include "QuickGUIImage.h"
-#include "QuickGUIMultiLineLabel.h"
+#include "QuickGUILabelArea.h"
#include "QuickGUINStateButton.h"
#include "QuickGUIProgressBar.h"
#include "QuickGUIScrollPane.h"
@@ -74,7 +74,7 @@
List* createList();
- MultiLineLabel* createMultiLineLabel();
+ LabelArea* createMultiLineLabel();
NStateButton* createNStateButton();
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -10,6 +10,7 @@
mFillDirection(FILLS_NEGATIVE_TO_POSITIVE)
{
mWidgetType = TYPE_PROGRESSBAR;
+ mSkinComponent = ".progressbar";
if( mSize.width > mSize.height )
mLayout = LAYOUT_HORIZONTAL;
else
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -10,6 +10,7 @@
mVerticalButtonLayout(VerticalScrollBar::BUTTON_LAYOUT_OPPOSITE)
{
mWidgetType = TYPE_SCROLL_PANE;
+ mSkinComponent = ".scrollpane";
mScrollPaneAccessible = false;
mGainFocusOnClick = false;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -5,11 +5,10 @@
namespace QuickGUI
{
Sheet::Sheet(const Ogre::String& name, const Ogre::String& texture, GUIManager* gm) :
- Panel(name,Size(gm->getViewportWidth(),gm->getViewportHeight()),texture,gm),
- mDefaultTextColor(Ogre::ColourValue::White),
- mSkin("qgui")
+ Panel(name,Size(gm->getViewportWidth(),gm->getViewportHeight()),texture,gm)
{
mQuadContainer = this;
+ mSkinComponent = ".sheet";
mWidgetType = TYPE_SHEET;
Ogre::FontManager* fm = Ogre::FontManager::getSingletonPtr();
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -44,9 +44,6 @@
protected:
virtual void setQuadContainer(QuadContainer* container);
- protected:
- Ogre::String mSkin;
- Ogre::ColourValue mDefaultTextColor;
};
}
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -5,8 +5,7 @@
namespace QuickGUI
{
- SkinSet::SkinSet(const Ogre::String& skinName,
- const Ogre::String &resourceGroup) :
+ SkinSet::SkinSet(const Ogre::String& skinName, const Ogre::String &resourceGroup) :
mSkinName(skinName),
mResourceGroup(resourceGroup),
mNumIndividualTextures(0),
@@ -386,11 +385,11 @@
}
// Following lines are unnecessary... just puts it out to a file to see :-)
- Ogre::Image finalImageSet;
+/* Ogre::Image finalImageSet;
finalImageSet.load("QuickGUI.output.png", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
buf->blitToMemory(finalImageSet.getPixelBox());
finalImageSet.save("SkinSetImage.png");
- }
+*/ }
bool SkinSet::containsImage(Ogre::String textureName)
{
@@ -400,6 +399,11 @@
return false;
}
+ Ogre::String SkinSet::getSkinName()
+ {
+ return mSkinName;
+ }
+
Ogre::String SkinSet::getTextureName()
{
return mTexture->getName();
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -49,6 +49,7 @@
*/
bool containsImage(Ogre::String textureName);
+ Ogre::String getSkinName();
// Return the name of the skin for this SkinSet
Ogre::String getTextureName();
Added: trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -0,0 +1,15 @@
+#include "QuickGUITextArea.h"
+
+namespace QuickGUI
+{
+ TextArea::TextArea(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm) :
+ LabelArea(instanceName,pixelSize,textureName,gm)
+ {
+ mWidgetType = TYPE_TEXTAREA;
+ mSkinComponent = ".textarea";
+ }
+
+ TextArea::~TextArea()
+ {
+ }
+}
Added: trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.h (rev 0)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -0,0 +1,19 @@
+#ifndef QUICKGUIMULTILINETEXTBOX_H
+#define QUICKGUIMULTILINETEXTBOX_H
+
+#include "QuickGUILabelArea.h"
+
+namespace QuickGUI
+{
+ class _QuickGUIExport TextArea :
+ public LabelArea
+ {
+ public:
+ TextArea(const Ogre::String& instanceName, Size pixelSize, Ogre::String textureName, GUIManager* gm);
+ ~TextArea();
+
+ protected:
+ };
+}
+
+#endif
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -28,6 +28,7 @@
mRCtrlDown(false)
{
mWidgetType = TYPE_TEXTBOX;
+ mSkinComponent = ".textbox";
mHorizontalAlignment = HA_LEFT;
mMouseCursor = mGUIManager->getMouseCursor();
mGUIManager->registerTimeListener(this);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -22,7 +22,7 @@
public Label
{
public:
- friend class MultiLineLabel;
+ friend class LabelArea;
public:
/** Constructor
@param
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -10,6 +10,7 @@
Label(instanceName,pixelSize,texture,gm)
{
mWidgetType = TYPE_TITLEBAR;
+ mSkinComponent = ".titlebar";
mScrollPaneAccessible = false;
setQuadLayer(Quad::LAYER_MENU);
mInheritQuadLayer = false;
@@ -110,6 +111,21 @@
fireEvent(EVENT_PARENT_CHANGED,args);
}
+ void TitleBar::setSkin(const Ogre::String& skinName, Ogre::String extension, bool recursive)
+ {
+ mSkinName = skinName;
+ if(mParentWidget != NULL)
+ setTexture(mSkinName + mParentWidget->getSkinComponent() + mSkinComponent + extension);
+ else
+ setTexture(mSkinName + mSkinComponent + extension);
+
+ if(recursive)
+ {
+ for(std::vector<Widget*>::iterator it = mChildWidgets.begin(); it != mChildWidgets.end(); ++it)
+ (*it)->setSkin(skinName,extension,recursive);
+ }
+ }
+
void TitleBar::setText(const Ogre::UTFString& text)
{
mText->setCaption(text);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -70,6 +70,7 @@
*/
void setCaption(const Ogre::UTFString& caption);
virtual void setFont(const Ogre::String& fontScriptName, bool recursive = false);
+ void setSkin(const Ogre::String& skinName, Ogre::String extension = ".png", bool recursive = false);
virtual void setText(const Ogre::UTFString& text);
virtual void setWidth(Ogre::Real pixelWidth);
/**
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -15,6 +15,7 @@
mButtonLayout(BUTTON_LAYOUT_OPPOSITE)
{
mWidgetType = TYPE_SCROLLBAR_VERTICAL;
+ mSkinComponent = ".scrollbar.vertical";
mGUIManager->registerTimeListener(this);
addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&VerticalScrollBar::onMouseDownOnTrack,this);
addEventHandler(EVENT_MOUSE_BUTTON_UP,&VerticalScrollBar::onMouseUpOnTrack,this);
@@ -262,14 +263,16 @@
void VerticalScrollBar::onMouseDownOnTrack(const EventArgs& args)
{
- if(dynamic_cast<const MouseEventArgs&>(args).button == MB_Left)
+ QuickGUI::MouseButtonID id = dynamic_cast<const MouseEventArgs&>(args).button;
+ if(id == MB_Left)
{
mMouseDownOnTrack = true;
+ mButtonDown = MB_Left;
Point mousePosition = dynamic_cast<const MouseEventArgs&>(args).position - getScreenPosition();
ScrollEventArgs scrollArgs(this);
- // if mouse clicked left of track, scroll left.
+ // if mouse clicked above track, scroll up.
if(mousePosition.y < mSlider->getYPosition())
{
scrollArgs.sliderIncreasedPosition = false;
@@ -283,11 +286,34 @@
mRepeatTimer = 0;
}
+ else if(id == MB_Right)
+ {
+ mMouseDownOnTrack = true;
+ mButtonDown = MB_Right;
+
+ Point mousePosition = dynamic_cast<const MouseEventArgs&>(args).position - getScreenPosition();
+
+ ScrollEventArgs scrollArgs(this);
+ // if mouse clicked below track, scroll down.
+ if(mousePosition.y < mSlider->getYPosition())
+ {
+ scrollArgs.sliderIncreasedPosition = false;
+ _scroll(mLargeChange,scrollArgs);
+ }
+ else
+ {
+ scrollArgs.sliderIncreasedPosition = true;
+ _scroll(-mLargeChange,scrollArgs);
+ }
+
+ mRepeatTimer = 0;
+ }
}
void VerticalScrollBar::onMouseUpOnTrack(const EventArgs& args)
{
- if(dynamic_cast<const MouseEventArgs&>(args).button == MB_Left)
+ QuickGUI::MouseButtonID id = dynamic_cast<const MouseEventArgs&>(args).button;
+ if((id == MB_Left) || (id == MB_Right))
{
mMouseDownOnTrack = false;
}
@@ -307,22 +333,36 @@
void VerticalScrollBar::onScrollUpDown(const EventArgs& args)
{
- if(dynamic_cast<const MouseEventArgs&>(args).button == MB_Left)
+ QuickGUI::MouseButtonID id = dynamic_cast<const MouseEventArgs&>(args).button;
+ if(id == MB_Left)
{
scrollUpSmall();
mRepeatTimer = 0;
}
+ else if(id == MB_Right)
+ {
+ scrollDownSmall();
+
+ mRepeatTimer = 0;
+ }
}
void VerticalScrollBar::onScrollDownDown(const EventArgs& args)
{
- if(dynamic_cast<const MouseEventArgs&>(args).button == MB_Left)
+ QuickGUI::MouseButtonID id = dynamic_cast<const MouseEventArgs&>(args).button;
+ if(id == MB_Left)
{
scrollDownSmall();
mRepeatTimer = 0;
}
+ else if(id == MB_Right)
+ {
+ scrollUpSmall();
+
+ mRepeatTimer = 0;
+ }
}
void VerticalScrollBar::onSliderDragged(const EventArgs& args)
@@ -432,7 +472,7 @@
if(mMouseDownOnTrack)
{
MouseEventArgs args(this);
- args.button = MB_Left;
+ args.button = mButtonDown;
args.position = mGUIManager->getMouseCursor()->getPosition();
onMouseDownOnTrack(args);
return;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalScrollBar.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -133,6 +133,7 @@
void onScrollDownDown(const EventArgs& args);
bool mMouseDownOnTrack;
+ MouseButtonID mButtonDown;
void onMouseDownOnTrack(const EventArgs& args);
void onMouseUpOnTrack(const EventArgs& args);
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalTrackBar.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalTrackBar.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIVerticalTrackBar.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -11,6 +11,7 @@
mLargeChange(3)
{
mWidgetType = TYPE_TRACKBAR_VERTICAL;
+ mSkinComponent = ".trackbar.vertical";
addEventHandler(EVENT_MOUSE_BUTTON_DOWN,&VerticalTrackBar::onMouseButtonDown,this);
// Creat slider button at the beginning of the VerticalTrackBar, whether horizonal (left) or vertical (bot)
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp 2007-10-24 11:07:33 UTC (rev 460)
@@ -1136,9 +1136,16 @@
mScrollPaneAccessible = accessible;
}
- void Widget::setSkin(const Ogre::String& skinName)
+ void Widget::setSkin(const Ogre::String& skinName, Ogre::String extension, bool recursive)
{
mSkinName = skinName;
+ setTexture(mSkinName + mSkinComponent + extension);
+
+ if(recursive)
+ {
+ for(std::vector<Widget*>::iterator it = mChildWidgets.begin(); it != mChildWidgets.end(); ++it)
+ (*it)->setSkin(skinName,extension,recursive);
+ }
}
void Widget::setSize(const Ogre::Real& pixelWidth, const Ogre::Real& pixelHeight)
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h 2007-10-24 11:07:33 UTC (rev 460)
@@ -51,8 +51,8 @@
TYPE_LABEL ,
TYPE_LIST ,
TYPE_MENULABEL ,
- TYPE_MULTILINELABEL ,
- TYPE_MULTILINETEXTBOX ,
+ TYPE_LABELAREA ,
+ TYPE_TEXTAREA ,
TYPE_NSTATEBUTTON ,
TYPE_PANEL ,
TYPE_PROGRESSBAR ,
@@ -422,7 +422,7 @@
void setScreenXPosition(const Ogre::Real& pixelX);
void setScreenYPosition(const Ogre::Real& pixelY);
void setScrollPaneAccessible(bool accessible);
- void setSkin(const Ogre::String& skinName);
+ virtual void setSkin(const Ogre::String& skinName, Ogre::String extension = ".png", bool recursive = false);
/**
* Manually set size of widget.
*/
Deleted: trunk/python-ogre/code_generators/physx/build.out
===================================================================
--- trunk/python-ogre/code_generators/physx/build.out 2007-10-24 06:16:06 UTC (rev 459)
+++ trunk/python-ogre/code_generators/physx/build.out 2007-10-24 11:07:33 UTC (rev 460)
@@ -1,1176 +0,0 @@
-WARNING: Unable to find ode/ode.h include file (ode class) in include_dirs
-WARNING: Unable to find ode/ode.h include file (ogrerefapp class) in include_dirs
-WARNING: Unable to find ode/ode.h include file (ogreode class) in include_dirs
-WARNING: Unable to find ode/odecpp.h include file (ogreode class) in include_dirs
-WARNING: Unable to find Ogreode_Prefab.h include file (ogreode class) in include_dirs
-
-INFO Creating xml file "/home/andy/development/python-ogre/code_generators/cache/physx_2.7.2_cache.xml" from source file "/home/andy/development/python-ogre/code_generators/physx/python_physx.h" ...
-
-INFO gccxml cmd: /home/andy/development/gccxml-build/bin/gccxml -I"/home/andy/development/python-ogre" -I"/home/andy/development/root/usr/include/boost-1_34" -I"/home/andy/development/root/usr/include/OGRE" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/Cooking/Include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/Foundation/include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/PhysXLoader/include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/NxCharacter/include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/NxExtensions/include" -I"/home/andy/development/root/usr/include/PhysX/v2.7.2/SDKs/Physics/include" -D"LINUX" -D"VERSION_2.7.2" "/home/andy/development/python-ogre/code_generators/physx/python_physx.h" -fxml="/home/andy/development/python-ogre/code_generators/cache/physx_2.7.2_cache.xml"
-
-INFO Parsing xml file "/home/andy/development/python-ogre/code_generators/cache/physx_2.7.2_cache.xml" ...
-Excluding static const NX_NO_HIGH_LIMIT [variable]
-Excluding static const NX_NO_LOW_LIMIT [variable]
-Excluding static const NxInvPiF32 [variable]
-Excluding static const NxTwoPiF32 [variable]
-Excluding static const NxHalfPiF32 [variable]
-Excluding static const NxPiF32 [variable]
-Excluding static const NxInvPiF64 [variable]
-Excluding static const NxTwoPiF64 [variable]
-Excluding static const NxHalfPiF64 [variable]
-Excluding static const NxPiF64 [variable]
-excluded NxForceFieldShapeDesc::type [variable] protected
-excluded NxContactStreamIterator::pointNormalForce [variable] protected
-excluded NxContactStreamIterator::stream [variable] protected...
[truncated message content] |
|
From: <and...@us...> - 2007-10-24 06:16:02
|
Revision: 459
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=459&view=rev
Author: andy_miller
Date: 2007-10-23 23:16:06 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Fixes for OgreForests under Linux (and Ogre 1.5) thanks to Dermont
Changes to environment.py to only link BulletMath library under NT -- fix for Linxu build
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/forests/BatchPage.cpp
trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h
trunk/python-ogre/ThirdParty/forests/PagedGeometry.h
trunk/python-ogre/ThirdParty/forests/PropertyMaps.h
trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
trunk/python-ogre/ThirdParty/forests/orig/PagedGeometry.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
trunk/python-ogre/demos/ogreforests/plugins.cfg
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/ThirdParty/forests/BatchPage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchPage.cpp 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/BatchPage.cpp 2007-10-24 06:16:06 UTC (rev 459)
@@ -263,3 +263,4 @@
}
}
+
Modified: trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2007-10-24 06:16:06 UTC (rev 459)
@@ -15,7 +15,7 @@
#include "BatchedGeometry.h"
-#include "OgreRoot.h"
+/*#include "OgreRoot.h"
#include "OgreRenderSystem.h"
#include "OgreCamera.h"
#include "OgreVector3.h"
@@ -30,7 +30,8 @@
#include "OgreHardwareBufferManager.h"
#include "OgreHardwareBuffer.h"
#include "OgreMaterialManager.h"
-#include "OgreMaterial.h"
+#include "OgreMaterial.h"*/
+
using namespace Ogre;
@@ -51,7 +52,13 @@
BatchedGeometry::~BatchedGeometry()
{
clear();
+}
+
+#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
+void BatchedGeometry::visitRenderables(Ogre::Renderable::Visitor*, bool)
+{
}
+#endif
void BatchedGeometry::addEntity(Entity *ent, const Vector3 &position, const Quaternion &orientation, const Vector3 &scale, const Ogre::ColourValue &color)
{
@@ -336,7 +343,7 @@
//If no vertex colors are used, make sure the final batch includes them (so the shade values work)
if (!vertexData->vertexDeclaration->findElementBySemantic(VES_DIFFUSE)) {
- Ogre::ushort i = (ushort)vertBinding->getBufferCount();
+ Ogre::ushort i = (Ogre::ushort)vertBinding->getBufferCount();
vertDecl->addElement(i, 0, VET_COLOUR, VES_DIFFUSE);
Modified: trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -20,13 +20,32 @@
#include "OgreMovableObject.h"
#include "OgreSceneNode.h"
#include "OgreMaterialManager.h"
+#include "OgreRoot.h"
+#include "OgreRenderSystem.h"
+#include "OgreCamera.h"
+#include "OgreVector3.h"
+#include "OgreQuaternion.h"
+#include "OgreSceneNode.h"
+#include "OgreString.h"
+#include "OgreStringConverter.h"
+#include "OgreEntity.h"
+#include "OgreSubMesh.h"
+#include "OgreMesh.h"
+#include "OgreMeshManager.h"
+#include "OgreHardwareBufferManager.h"
+#include "OgreHardwareBuffer.h"
+#include "OgreMaterialManager.h"
+#include "OgreMaterial.h"
-
class BatchedGeometry: public Ogre::MovableObject
{
public:
BatchedGeometry(Ogre::SceneManager *mgr);
~BatchedGeometry();
+
+#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
+ void visitRenderables(Ogre::Renderable::Visitor* visitor, bool debugRenderables);
+#endif
void addEntity(Ogre::Entity *ent, const Ogre::Vector3 &position, const Ogre::Quaternion &orientation = Ogre::Quaternion::IDENTITY, const Ogre::Vector3 &scale = Ogre::Vector3::UNIT_SCALE, const Ogre::ColourValue &color = Ogre::ColourValue::White);
void build();
@@ -119,4 +138,5 @@
-#endif
\ No newline at end of file
+#endif
+
Modified: trunk/python-ogre/ThirdParty/forests/PagedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PagedGeometry.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/PagedGeometry.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -97,8 +97,8 @@
#include "OgreCamera.h"
#include "OgreVector3.h"
#include "OgreTimer.h"
+#include "OgreRoot.h"
-
class GeometryPageManager;
class PageLoader;
Modified: trunk/python-ogre/ThirdParty/forests/PropertyMaps.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PropertyMaps.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/PropertyMaps.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -240,4 +240,5 @@
-#endif
\ No newline at end of file
+#endif
+
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -278,4 +278,5 @@
-#endif
\ No newline at end of file
+#endif
+
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -240,4 +240,5 @@
-#endif
\ No newline at end of file
+#endif
+
Modified: trunk/python-ogre/ThirdParty/forests/orig/PagedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/orig/PagedGeometry.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/forests/orig/PagedGeometry.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -96,7 +96,8 @@
#include "OgreCommon.h"
#include "OgreCamera.h"
#include "OgreVector3.h"
-#include "OgreTimer.h"
+#include "OgreTimer.h"
+#include "OgreRoot.h"
class GeometryPageManager;
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -68,4 +68,5 @@
};
};
}
-#endif //_OGREBULLETCOLLISIONS_OgreBtConverter_H
\ No newline at end of file
+#endif //_OGREBULLETCOLLISIONS_OgreBtConverter_H
+
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h 2007-10-24 06:16:06 UTC (rev 459)
@@ -53,4 +53,5 @@
class WheelInfo;
}
-#endif //_OGREBULLETDYNAMICS_PREREQUISITES_H
\ No newline at end of file
+#endif //_OGREBULLETDYNAMICS_PREREQUISITES_H
+
Modified: trunk/python-ogre/demos/ogreforests/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogreforests/plugins.cfg 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/demos/ogreforests/plugins.cfg 2007-10-24 06:16:06 UTC (rev 459)
@@ -2,18 +2,18 @@
## Use this for Windows
# Define plugin folder
-PluginFolder=../../plugins
-Plugin=RenderSystem_GL.dll
-Plugin=RenderSystem_Direct3D9.dll
-Plugin=Plugin_ParticleFX.dll
-Plugin=Plugin_BSPSceneManager.dll
-Plugin=Plugin_OctreeSceneManager.dll
-Plugin=Plugin_CgProgramManager.dll
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+#Plugin=RenderSystem_GL.dll
+#Plugin=RenderSystem_Direct3D9.dll
+#Plugin=Plugin_ParticleFX.dll
+#Plugin=Plugin_BSPSceneManager.dll
+#Plugin=Plugin_OctreeSceneManager.dll
+#Plugin=Plugin_CgProgramManager.dll
##
## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager
+ Plugin=RenderSystem_GL
+ Plugin=Plugin_ParticleFX
+ Plugin=Plugin_BSPSceneManager
+ Plugin=Plugin_OctreeSceneManager
+ Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-10-24 06:10:17 UTC (rev 458)
+++ trunk/python-ogre/environment.py 2007-10-24 06:16:06 UTC (rev 459)
@@ -684,10 +684,13 @@
active=True
version = "1.0"
cflags = ""
- parent = "ogre/physics"
+ parent = "ogre/physics"
libs = [Config.LIB_Boost, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics', 'LibBulletMath'
+ 'LibBulletCollision', 'LibBulletDynamics'
]
+ if os.name=='nt':
+ libs.append ('LibBulletMath')
+
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
@@ -711,8 +714,10 @@
cflags = ""
parent = "ogre/physics"
libs = [Config.LIB_Boost, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics', 'LibBulletMath'
- ]
+ 'LibBulletCollision', 'LibBulletDynamics'
+ ]
+ if os.name=='nt':
+ libs.append ('LibBulletMath')
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-24 06:10:12
|
Revision: 458
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=458&view=rev
Author: andy_miller
Date: 2007-10-23 23:10:17 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Media file name changes for linux use
Added Paths:
-----------
trunk/python-ogre/demos/ogreforests/media/trees/leaves.png
trunk/python-ogre/demos/ogreforests/media/trees/pineleaves.png
Added: trunk/python-ogre/demos/ogreforests/media/trees/leaves.png
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/ogreforests/media/trees/leaves.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/ogreforests/media/trees/pineleaves.png
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/ogreforests/media/trees/pineleaves.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-24 06:09:23
|
Revision: 457
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=457&view=rev
Author: andy_miller
Date: 2007-10-23 23:09:27 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Need to change case on media files
Removed Paths:
-------------
trunk/python-ogre/demos/ogreforests/media/trees/Leaves.png
trunk/python-ogre/demos/ogreforests/media/trees/PineLeaves.png
Deleted: trunk/python-ogre/demos/ogreforests/media/trees/Leaves.png
===================================================================
(Binary files differ)
Deleted: trunk/python-ogre/demos/ogreforests/media/trees/PineLeaves.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-10-24 03:29:05
|
Revision: 456
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=456&view=rev
Author: andy_miller
Date: 2007-10-23 20:29:10 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Rolling back my Linux fixes for OgreBullet which I'd managed to remove....
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisions.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsConvexCast.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsMeshToShapeConverter.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObject.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamics.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRigidBody.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.h
Added Paths:
-----------
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.cpp
Copied: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp (from rev 441, trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp)
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp 2007-10-24 03:29:10 UTC (rev 456)
@@ -0,0 +1,650 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+
+#include "OgreBulletCollisions.h"
+
+#include "Ogre.h"
+#include "OgreFontManager.h"
+
+#include "Debug/OgreBulletCollisionsDebugContact.h"
+#include "OgreBulletCollisionsShape.h"
+#include "OgreBulletCollisionsObject.h"
+#include "OgreBulletCollisionsWorld.h"
+
+using namespace Ogre;
+
+#define POS_TEX_BINDING 0
+#define COLOUR_BINDING 1
+
+namespace OgreBulletCollisions
+{
+ //------------------------------------------------------------------------------------------------
+ DebugContact::DebugContact(const String &name, CollisionsWorld *world) :
+ _name(name),
+ _world(world),
+ _enabled(false)
+ {
+ // scene node
+ _node = _world->getSceneManager()->getRootSceneNode ()->createChildSceneNode ();
+
+ // sphere attach to contact point
+ _point = _world->getSceneManager()->createEntity(name + String("_debug_point"), "sphere.mesh");
+ _point_node = _node->createChildSceneNode ();
+ _point_node->attachObject (_point);
+ _point_node->setScale(0.001, 0.001, 0.001);
+
+ // normal direction debug
+ _normal = new DebugNormal();
+ _node->attachObject (_normal);
+
+ // text info on contact
+ _text = new DebugContactText(name + String("_debug_text"), _node->createChildSceneNode ());
+ _text->setPosition (Vector3(0,5,0));
+ _text->setCaption ("-");
+ _text->setVisible (false);
+
+ _node->setVisible (false);
+ }
+ //------------------------------------------------------------------------------------------------
+ DebugContact::~DebugContact()
+ {
+ delete _text;
+
+ _point_node->detachObject (_point->getName ());
+ _node->detachObject (_normal->getName ());
+
+ _world->getSceneManager()->destroyEntity (_point->getName ());
+
+ _node->detachAllObjects ();
+ _node->removeAndDestroyAllChildren ();
+
+ delete _normal;
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContact::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
+ {
+ _node->setPosition (pt);
+
+ _point_node->setPosition (depth * normal);
+
+ //String contactLabel("p: ");
+ //contactLabel = contactLabel + StringConverter::toString(contact->getPosition());
+ //contactLabel = contactLabel + ", n: ";
+ //contactLabel = contactLabel + StringConverter::toString(contact->getNormal());
+ //_text->setCaption (contactLabel);
+ //_text->setVisible (false);
+
+ //_text->setPosition (contact->getPosition () + Vector3(0,5,0));
+
+ _normal->update (normal, pt, depth);
+ }
+ //------------------------------------------------------------------------------------------------
+ bool DebugContact::isEnabled () const
+ {
+ return _enabled;
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContact::setEnabled (bool enable)
+ {
+ _enabled = enable;
+ _node->setVisible (_enabled);
+ };
+ //------------------------------------------------------------------------------------------------
+ void DebugNormal::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
+ {
+ DebugLines::clear ();
+ // set normal following contact normal
+ //contact->_normal
+ //contact->_position
+ DebugLines::addLine (Vector3::ZERO,
+ 5*normal);
+ DebugLines::draw ();
+ }
+ //------------------------------------------------------------------------------------------------
+ DebugContactText::DebugContactText(const String &name,
+ SceneNode *node,
+ const String &caption,
+ const String &fontName,
+ int charHeight,
+ const ColourValue &color)
+ : mpCam(NULL)
+ , mpWin(NULL)
+ , mpFont(NULL)
+ , mName(name)
+ , mCaption(caption)
+ , mFontName(fontName)
+ , mCharHeight(charHeight)
+ , mColor(color)
+ , mType("DebugContact")
+ , mTimeUntilNextToggle(0)
+ , mSpaceWidth(0)
+ , mUpdateColors(true)
+ , mOnTop(false)
+ , mHorizontalAlignment(H_LEFT)
+ , mVerticalAlignment(V_BELOW)
+ , mAdditionalHeight(0.0)
+ , mNode(node)
+
+ {
+ if (name.empty())
+ Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without name", "DebugContact::DebugContact");
+//
+// if (caption.empty())
+// Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without caption", "DebugContact::DebugContact");
+
+ mRenderOp.vertexData = NULL;
+ this->setFontName(mFontName);
+ //this->_setupGeometry();
+ mNode->attachObject(this);
+ }
+ //------------------------------------------------------------------------------------------------
+ DebugContactText::~DebugContactText()
+ {
+ mNode->detachObject(this->getName());
+ if (mRenderOp.vertexData)
+ delete mRenderOp.vertexData;
+ }
+#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
+ void DebugContactText::visitRenderables(Renderable::Visitor* visitor,
+ bool debugRenderables)
+ {
+ visitor->visit(this, 0, false);
+ }
+#endif
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setPosition(const Vector3 &pos)
+ {
+ mNode->setPosition (pos);
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setFontName(const String &fontName)
+ {
+ if((Ogre::MaterialManager::getSingletonPtr()->resourceExists(mName + "Material")))
+ {
+ Ogre::MaterialManager::getSingleton().remove(mName + "Material");
+ }
+
+ if (mFontName != fontName || mpMaterial.isNull() || !mpFont)
+ {
+ mFontName = fontName;
+ mpFont = (Font *)FontManager::getSingleton().getByName(mFontName).getPointer();
+ if (!mpFont)
+ Exception(Exception::ERR_ITEM_NOT_FOUND, "Could not find font " + fontName, "DebugContact::setFontName");
+
+ mpFont->load();
+ if (!mpMaterial.isNull())
+ {
+ MaterialManager::getSingletonPtr()->remove(mpMaterial->getName());
+ mpMaterial.setNull();
+ }
+
+ mpMaterial = mpFont->getMaterial()->clone(mName + "Material");
+ if (!mpMaterial->isLoaded())
+ mpMaterial->load();
+
+ mpMaterial->setDepthCheckEnabled(!mOnTop);
+ //mpMaterial->setDepthBias(!mOnTop);
+ mpMaterial->setDepthBias(0,!mOnTop);
+ mpMaterial->setDepthWriteEnabled(mOnTop);
+ mpMaterial->setLightingEnabled(false);
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setCaption(const String &caption)
+ {
+ if (caption != mCaption)
+ {
+ mCaption = caption;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setColor(const ColourValue &color)
+ {
+ if (color != mColor)
+ {
+ mColor = color;
+ mUpdateColors = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setCharacterHeight(unsigned int height)
+ {
+ if (height != mCharHeight)
+ {
+ mCharHeight = height;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setSpaceWidth(unsigned int width)
+ {
+ if (width != mSpaceWidth)
+ {
+ mSpaceWidth = width;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setTextAlignment(const HorizontalAlignment& horizontalAlignment, const VerticalAlignment& verticalAlignment)
+ {
+ if(mHorizontalAlignment != horizontalAlignment)
+ {
+ mHorizontalAlignment = horizontalAlignment;
+ mNeedUpdate = true;
+ }
+ if(mVerticalAlignment != verticalAlignment)
+ {
+ mVerticalAlignment = verticalAlignment;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::setAdditionalHeight( Real height )
+ {
+ if( mAdditionalHeight != height )
+ {
+ mAdditionalHeight = height;
+ mNeedUpdate = true;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::showOnTop(bool show)
+ {
+ if( mOnTop != show && !mpMaterial.isNull() )
+ {
+ mOnTop = show;
+ mpMaterial->setDepthBias(0,!mOnTop);
+ mpMaterial->setDepthCheckEnabled(!mOnTop);
+ mpMaterial->setDepthWriteEnabled(mOnTop);
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::_setupGeometry()
+ {
+ assert(mpFont);
+ assert(!mpMaterial.isNull());
+
+ unsigned int vertexCount = static_cast<unsigned int>(mCaption.size() * 6);
+
+ if (mRenderOp.vertexData)
+ {
+ // Removed this test as it causes problems when replacing a caption
+ // of the same size: replacing "Hello" with "hello"
+ // as well as when changing the text alignment
+ //if (mRenderOp.vertexData->vertexCount != vertexCount)
+ {
+ delete mRenderOp.vertexData;
+ mRenderOp.vertexData = NULL;
+ mUpdateColors = true;
+ }
+ }
+
+ if (!mRenderOp.vertexData)
+ mRenderOp.vertexData = new VertexData();
+
+ mRenderOp.indexData = 0;
+ mRenderOp.vertexData->vertexStart = 0;
+ mRenderOp.vertexData->vertexCount = vertexCount;
+ mRenderOp.operationType = RenderOperation::OT_TRIANGLE_LIST;
+ mRenderOp.useIndexes = false;
+
+ VertexDeclaration *decl = mRenderOp.vertexData->vertexDeclaration;
+ VertexBufferBinding *bind = mRenderOp.vertexData->vertexBufferBinding;
+ size_t offset = 0;
+
+ // create/bind positions/tex.ccord. buffer
+ if (!decl->findElementBySemantic(VES_POSITION))
+ decl->addElement(POS_TEX_BINDING, offset, VET_FLOAT3, VES_POSITION);
+
+ offset += VertexElement::getTypeSize(VET_FLOAT3);
+
+ if (!decl->findElementBySemantic(VES_TEXTURE_COORDINATES))
+ decl->addElement(POS_TEX_BINDING, offset, Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES, 0);
+
+ HardwareVertexBufferSharedPtr ptbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(POS_TEX_BINDING),
+ mRenderOp.vertexData->vertexCount,
+ HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
+ bind->setBinding(POS_TEX_BINDING, ptbuf);
+
+ // Colours - store these in a separate buffer because they change less often
+ if (!decl->findElementBySemantic(VES_DIFFUSE))
+ decl->addElement(COLOUR_BINDING, 0, VET_COLOUR, VES_DIFFUSE);
+
+ HardwareVertexBufferSharedPtr cbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(COLOUR_BINDING),
+ mRenderOp.vertexData->vertexCount,
+ HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
+ bind->setBinding(COLOUR_BINDING, cbuf);
+
+ size_t charlen = mCaption.size();
+ Real *pPCBuff = static_cast<Real*>(ptbuf->lock(HardwareBuffer::HBL_DISCARD));
+
+ float largestWidth = 0;
+ float left = 0 * 2.0 - 1.0;
+ float top = -((0 * 2.0) - 1.0);
+
+ // Derive space width from a capital A
+ if (mSpaceWidth == 0)
+ mSpaceWidth = mpFont->getGlyphAspectRatio('A') * mCharHeight * 2.0;
+
+ // for calculation of AABB
+ Ogre::Vector3 min, max, currPos;
+ Ogre::Real maxSquaredRadius;
+ bool first = true;
+
+ // Use iterator
+ String::iterator i, iend;
+ iend = mCaption.end();
+ bool newLine = true;
+ Real len = 0.0f;
+
+ if(mVerticalAlignment == DebugContactText::V_ABOVE)
+ {
+ // Raise the first line of the caption
+ top += mCharHeight;
+ for (i = mCaption.begin(); i != iend; ++i)
+ {
+ if (*i == '\n')
+ top += mCharHeight * 2.0;
+ }
+ }
+
+ for (i = mCaption.begin(); i != iend; ++i)
+ {
+ if (newLine)
+ {
+ len = 0.0f;
+ for (String::iterator j = i; j != iend && *j != '\n'; j++)
+ {
+ if (*j == ' ')
+ len += mSpaceWidth;
+ else
+ len += mpFont->getGlyphAspectRatio(*j) * mCharHeight * 2.0;
+ }
+ newLine = false;
+ }
+
+ if (*i == '\n')
+ {
+ left = 0 * 2.0 - 1.0;
+ top -= mCharHeight * 2.0;
+ newLine = true;
+ continue;
+ }
+
+ if (*i == ' ')
+ {
+ // Just leave a gap, no tris
+ left += mSpaceWidth;
+ // Also reduce tri count
+ mRenderOp.vertexData->vertexCount -= 6;
+ continue;
+ }
+
+ Real horiz_height = mpFont->getGlyphAspectRatio(*i);
+
+ //mpFont->getGlyphTexCoords(*i, u1, v1, u2, v2);
+ const Font::UVRect &uvRect = mpFont->getGlyphTexCoords(*i);
+ const Real u1 = uvRect.left;
+ const Real u2 = uvRect.right;
+ const Real v1 = uvRect.top;
+ const Real v2 = uvRect.bottom;
+
+ // each vert is (x, y, z, u, v)
+ //-------------------------------------------------------------------------------------
+ // First tri
+ //
+ // Upper left
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u1;
+ *pPCBuff++ = v1;
+
+ // Deal with bounds
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ currPos = Ogre::Vector3(left, top, -1.0);
+ else
+ currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
+ if (first)
+ {
+ min = max = currPos;
+ maxSquaredRadius = currPos.squaredLength();
+ first = false;
+ }
+ else
+ {
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+ }
+
+ top -= mCharHeight * 2.0;
+
+ // Bottom left
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u1;
+ *pPCBuff++ = v2;
+
+ // Deal with bounds
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ currPos = Ogre::Vector3(left, top, -1.0);
+ else
+ currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ top += mCharHeight * 2.0;
+ left += horiz_height * mCharHeight * 2.0;
+
+ // Top right
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u2;
+ *pPCBuff++ = v1;
+ //-------------------------------------------------------------------------------------
+
+ // Deal with bounds
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ currPos = Ogre::Vector3(left, top, -1.0);
+ else
+ currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ //-------------------------------------------------------------------------------------
+ // Second tri
+ //
+ // Top right (again)
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u2;
+ *pPCBuff++ = v1;
+
+ currPos = Ogre::Vector3(left, top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ top -= mCharHeight * 2.0;
+ left -= horiz_height * mCharHeight * 2.0;
+
+ // Bottom left (again)
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u1;
+ *pPCBuff++ = v2;
+
+ currPos = Ogre::Vector3(left, top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ left += horiz_height * mCharHeight * 2.0;
+
+ // Bottom right
+ if(mHorizontalAlignment == DebugContactText::H_LEFT)
+ *pPCBuff++ = left;
+ else
+ *pPCBuff++ = left - (len / 2);
+ *pPCBuff++ = top;
+ *pPCBuff++ = -1.0;
+ *pPCBuff++ = u2;
+ *pPCBuff++ = v2;
+ //-------------------------------------------------------------------------------------
+
+ currPos = Ogre::Vector3(left, top, -1.0);
+ min.makeFloor(currPos);
+ max.makeCeil(currPos);
+ maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
+
+ // Go back up with top
+ top += mCharHeight * 2.0;
+
+ float currentWidth = (left + 1)/2 - 0;
+ if (currentWidth > largestWidth)
+ largestWidth = currentWidth;
+ }
+
+ // Unlock vertex buffer
+ ptbuf->unlock();
+
+ // update AABB/Sphere radius
+ mAABB = Ogre::AxisAlignedBox(min, max);
+ mRadius = Ogre::Math::Sqrt(maxSquaredRadius);
+
+ if (mUpdateColors)
+ this->_updateColors();
+
+ mNeedUpdate = false;
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::_updateColors(void)
+ {
+ assert(mpFont);
+ assert(!mpMaterial.isNull());
+
+ // Convert to system-specific
+ RGBA color;
+ Root::getSingleton().convertColourValue(mColor, &color);
+ HardwareVertexBufferSharedPtr vbuf = mRenderOp.vertexData->vertexBufferBinding->getBuffer(COLOUR_BINDING);
+ RGBA *pDest = static_cast<RGBA*>(vbuf->lock(HardwareBuffer::HBL_DISCARD));
+ for (unsigned int i = 0; i < mRenderOp.vertexData->vertexCount; ++i)
+ *pDest++ = color;
+ vbuf->unlock();
+ mUpdateColors = false;
+ }
+ //------------------------------------------------------------------------------------------------
+ const Quaternion& DebugContactText::getWorldOrientation(void) const
+ {
+ assert(mpCam);
+ return const_cast<Quaternion&>(mpCam->getDerivedOrientation());
+ }
+ //------------------------------------------------------------------------------------------------
+ const Vector3& DebugContactText::getWorldPosition(void) const
+ {
+ assert(mParentNode);
+ return mParentNode->_getDerivedPosition();
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::getWorldTransforms(Matrix4 *xform) const
+ {
+ if (this->isVisible() && mpCam)
+ {
+ Matrix3 rot3x3, scale3x3 = Matrix3::IDENTITY;
+
+ // store rotation in a matrix
+ mpCam->getDerivedOrientation().ToRotationMatrix(rot3x3);
+
+ // parent node position
+ Vector3 ppos = mParentNode->_getDerivedPosition() + Vector3::UNIT_Y*mAdditionalHeight;
+
+ // apply scale
+ scale3x3[0][0] = mParentNode->_getDerivedScale().x / 2;
+ scale3x3[1][1] = mParentNode->_getDerivedScale().y / 2;
+ scale3x3[2][2] = mParentNode->_getDerivedScale().z / 2;
+
+ // apply all transforms to xform
+ *xform = (rot3x3 * scale3x3);
+ xform->setTrans(ppos);
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::getRenderOperation(RenderOperation &op)
+ {
+ if (this->isVisible())
+ {
+ if (mNeedUpdate)
+ this->_setupGeometry();
+ if (mUpdateColors)
+ this->_updateColors();
+ op = mRenderOp;
+ }
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::_notifyCurrentCamera(Camera *cam)
+ {
+ mpCam = cam;
+ }
+ //------------------------------------------------------------------------------------------------
+ void DebugContactText::_updateRenderQueue(RenderQueue* queue)
+ {
+ if (this->isVisible())
+ {
+ if (mNeedUpdate)
+ this->_setupGeometry();
+ if (mUpdateColors)
+ this->_updateColors();
+
+ queue->addRenderable(this, mRenderQueueID, OGRE_RENDERABLE_DEFAULT_PRIORITY);
+ // queue->addRenderable(this, mRenderQueueID, RENDER_QUEUE_SKIES_LATE);
+ }
+ }
+}
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h 2007-10-23 13:54:19 UTC (rev 455)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h 2007-10-24 03:29:10 UTC (rev 456)
@@ -1,177 +1,177 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
- (Object-oriented Graphics Rendering Engine Bullet Wrapper)
- For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
- Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-#ifndef __OgreBulletCollisionsDebugContact_H__
-#define __OgreBulletCollisionsDebugContact_H__
-
-#include "OgreBulletCollisionsPreRequisites.h"
-#include "Debug/OgreBulletCollisionsDebugLines.h"
-
-
-namespace OgreBulletCollisions
-{
- //------------------------------------------------------------------------------------------------
- class DebugContact
- {
- public:
- DebugContact(const Ogre::String &name, CollisionsWorld *world);
- ~DebugContact();
-
- bool isEnabled () const;
- void setEnabled (bool enable);
-
- void update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth);
-
- private:
- DebugNormal *_normal;
- DebugContactText *_text;
- Ogre::Entity *_point;
- bool _enabled;
- Ogre::String _name;
- Ogre::SceneNode *_node;
- Ogre::SceneNode *_point_node;
- CollisionsWorld *_world;
- };
-
- //------------------------------------------------------------------------------------------------
- class DebugNormal : public DebugLines
- {
- public:
- DebugNormal() : DebugLines(){};
- ~DebugNormal(){};
-
- void update (const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth);
- };
-
- //------------------------------------------------------------------------------------------------
- class DebugContactText : public Ogre::MovableObject, public Ogre::Renderable
- {
- public:
- enum HorizontalAlignment {H_LEFT, H_CENTER};
- enum VerticalAlignment {V_BELOW, V_ABOVE};
- /******************************** public methods ******************************/
- public:
- DebugContactText(const Ogre::String &name,
- Ogre::SceneNode *node,
- const Ogre::String &caption = "",
- const Ogre::String &fontName = "BlueHighway",
- int charHeight = 32,
- const Ogre::ColourValue &color = Ogre::ColourValue::White);
-
-
- ~DebugContactText();
-
-#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
- void visitRenderables(Renderable::Visitor* visitor, bool debugRenderables);
-#endif
- // Set settings
- void setPosition(const Ogre::Vector3 &pos);
-
- void setFontName(const Ogre::String &fontName);
- void setCaption(const Ogre::String &caption);
- void setColor(const Ogre::ColourValue &color);
- void setCharacterHeight(unsigned int height);
- void setSpaceWidth(unsigned int width);
- void setTextAlignment(const HorizontalAlignment& horizontalAlignment,
- const VerticalAlignment& verticalAlignment);
- void setAdditionalHeight( Ogre::Real height );
- void showOnTop(bool show=true);
-
- // Get settings
- const Ogre::String &getFontName() const {return mFontName;}
- const Ogre::String &getCaption() const {return mCaption;}
- const Ogre::ColourValue &getColor() const {return mColor;}
-
- unsigned int getCharacterHeight() const {return mCharHeight;}
- unsigned int getSpaceWidth() const {return mSpaceWidth;}
- Ogre::Real getAdditionalHeight() const {return mAdditionalHeight;}
- bool getShowOnTop() const {return mOnTop;}
- Ogre::AxisAlignedBox GetAABB(void) { return mAABB; }
-
- /******************************** protected methods and overload **************/
- protected:
-
- // from OgreBulletCollisionsDebugContact, create the object
- void _setupGeometry();
- void _updateColors();
-
- // from MovableObject
- void getWorldTransforms(Ogre::Matrix4 *xform) const;
- Ogre::Real getBoundingRadius(void) const {return mRadius;};
- Ogre::Real getSquaredViewDepth(const Ogre::Camera *cam) const {return 0;};
- const Ogre::Quaternion &getWorldOrientation(void) const;
- const Ogre::Vector3 &getWorldPosition(void) const;
- const Ogre::AxisAlignedBox &getBoundingBox(void) const {return mAABB;};
- const Ogre::String &getName(void) const {return mName;};
- const Ogre::String &getMovableType(void) const {static Ogre::String movType = "MovableText"; return movType;};
-
- void _notifyCurrentCamera(Ogre::Camera *cam);
- void _updateRenderQueue(Ogre::RenderQueue* queue);
-
- // from renderable
- void getRenderOperation(Ogre::RenderOperation &op);
- const Ogre::MaterialPtr &getMaterial(void) const {assert(!mpMaterial.isNull());return mpMaterial;};
- const Ogre::LightList &getLights(void) const {return mLList;};
-
- /******************************** OgreBulletCollisionsDebugContact data ****************************/
-
-
- protected:
- Ogre::String mFontName;
- Ogre::String mType;
- Ogre::String mName;
- Ogre::String mCaption;
- HorizontalAlignment mHorizontalAlignment;
- VerticalAlignment mVerticalAlignment;
-
- Ogre::ColourValue mColor;
- Ogre::RenderOperation mRenderOp;
- Ogre::AxisAlignedBox mAABB;
- Ogre::LightList mLList;
-
- unsigned int mCharHeight;
- unsigned int mSpaceWidth;
-
- bool mNeedUpdate;
- bool mUpdateColors;
- bool mOnTop;
-
- Ogre::Real mTimeUntilNextToggle;
- Ogre::Real mRadius;
- Ogre::Real mAdditionalHeight;
-
- Ogre::Camera *mpCam;
- Ogre::RenderWindow *mpWin;
- Ogre::Font *mpFont;
- Ogre::MaterialPtr mpMaterial;
- Ogre::MaterialPtr mpBackgroundMaterial;
-
- Ogre::SceneNode *mNode;
- };
-}
-
-#endif //__OgreBulletCollisionsDebugContact_H__
-
+/***************************************************************************
+
+This source file is part of OGREBULLET
+ (Object-oriented Graphics Rendering Engine Bullet Wrapper)
+ For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+ Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef __OgreBulletCollisionsDebugContact_H__
+#define __OgreBulletCollisionsDebugContact_H__
+
+#include "OgreBulletCollisionsPreRequisites.h"
+#include "Debug/OgreBulletCollisionsDebugLines.h"
+
+
+namespace OgreBulletCollisions
+{
+ //------------------------------------------------------------------------------------------------
+ class DebugContact
+ {
+ public:
+ DebugContact(const Ogre::String &name, CollisionsWorld *world);
+ ~DebugContact();
+
+ bool isEnabled () const;
+ void setEnabled (bool enable);
+
+ void update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth);
+
+ private:
+ DebugNormal *_normal;
+ DebugContactText *_text;
+ Ogre::Entity *_point;
+ bool _enabled;
+ Ogre::String _name;
+ Ogre::SceneNode *_node;
+ Ogre::SceneNode *_point_node;
+ CollisionsWorld *_world;
+ };
+
+ //------------------------------------------------------------------------------------------------
+ class DebugNormal : public DebugLines
+ {
+ public:
+ DebugNormal() : DebugLines(){};
+ ~DebugNormal(){};
+
+ void update (const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth);
+ };
+
+ //------------------------------------------------------------------------------------------------
+ class DebugContactText : public Ogre::MovableObject, public Ogre::Renderable
+ {
+ public:
+ enum HorizontalAlignment {H_LEFT, H_CENTER};
+ enum VerticalAlignment {V_BELOW, V_ABOVE};
+ /******************************** public methods ******************************/
+ public:
+ DebugContactText(const Ogre::String &name,
+ Ogre::SceneNode *node,
+ const Ogre::String &caption = "",
+ const Ogre::String &fontName = "BlueHighway",
+ int charHeight = 32,
+ const Ogre::ColourValue &color = Ogre::ColourValue::White);
+
+
+ ~DebugContactText();
+
+#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
+ void visitRenderables(Renderable::Visitor* visitor, bool debugRenderables);
+#endif
+ // Set settings
+ void setPosition(const Ogre::Vector3 &pos);
+
+ void setFontName(const Ogre::String &fontName);
+ void setCaption(const Ogre::String &caption);
+ void setColor(const Ogre::ColourValue &color);
+ void setCharacterHeight(unsigned int height);
+ void setSpaceWidth(unsigned int width);
+ void setTextAlignment(const HorizontalAlignment& horizontalAlignment,
+ const VerticalAlignment& verticalAlignment);
+ void setAdditionalHeight( Ogre::Real height );
+ void showOnTop(bool show=true);
+
+ // Get settings
+ const Ogre::String &getFontName() const {return mFontName;}
+ const Ogre::String &getCaption() const {return mCaption;}
+ const Ogre::ColourValue &getColor() const {return mColor;}
+
+ unsigned int getCharacterHeight() const {return mCharHeight;}
+ unsigned int getSpaceWidth() const {return mSpaceWidth;}
+ Ogre::Real getAdditionalHeight() const {return mAdditionalHeight;}
+ bool getShowOnTop() const {return mOnTop;}
+ Ogre::AxisAlignedBox GetAABB(void) { return mAABB; }
+
+ /******************************** protected methods and overload **************/
+ protected:
+
+ // from OgreBulletCollisionsDebugContact, create the object
+ void _setupGeometry();
+ void _updateColors();
+
+ // from MovableObject
+ void getWorldTransforms(Ogre::Matrix4 *xform) const;
+ Ogre::Real getBoundingRadius(void) const {return mRadius;};
+ Ogre::Real getSquaredViewDepth(const Ogre::Camera *cam) const {return 0;};
+ const Ogre::Quaternion &getWorldOrientation(void) const;
+ const Ogre::Vector3 &getWorldPosition(void) const;
+ const Ogre::AxisAlignedBox &getBoundingBox(void) const {return mAABB;};
+ const Ogre::String &getName(void) const {return mName;};
+ const Ogre::String &getMovableType(void) const {static Ogre::String movType = "MovableText"; return movType;};
+
+ void _notifyCurrentCamera(Ogre::Camera *cam);
+ void _updateRenderQueue(Ogre::RenderQueue* queue);
+
+ // from renderable
+ void getRenderOperation(Ogre::RenderOperation &op);
+ const Ogre::MaterialPtr &getMaterial(void) const {assert(!mpMaterial.isNull());return mpMaterial;};
+ const Ogre::LightList &getLights(void) const {return mLList;};
+
+ /******************************** OgreBulletCollisionsDebugContact data ****************************/
+
+
+ protected:
+ Ogre::String mFontName;
+ Ogre::String mType;
+ Ogre::String mName;
+ Ogre::String mCaption;
+ HorizontalAlignment mHorizontalAlignment;
+ VerticalAlignment mVerticalAlignment;
+
+ Ogre::ColourValue mColor;
+ Ogre::RenderOperation mRenderOp;
+ Ogre::AxisAlignedBox mAABB;
+ Ogre::LightList mLList;
+
+ unsigned int mCharHeight;
+ unsigned int mSpaceWidth;
+
+ bool mNeedUpdate;
+ bool mUpdateColors;
+ bool mOnTop;
+
+ Ogre::Real mTimeUntilNextToggle;
+ Ogre::Real mRadius;
+ Ogre::Real mAdditionalHeight;
+
+ Ogre::Camera *mpCam;
+ Ogre::RenderWindow *mpWin;
+ Ogre::Font *mpFont;
+ Ogre::MaterialPtr mpMaterial;
+ Ogre::MaterialPtr mpBackgroundMaterial;
+
+ Ogre::SceneNode *mNode;
+ };
+}
+
+#endif //__OgreBulletCollisionsDebugContact_H__
+
Copied: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp (from rev 441, trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp)
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp 2007-10-24 03:29:10 UTC (rev 456)
@@ -0,0 +1,237 @@
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm...
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+-----------------------------------------------------------------------------
+*/
+
+#include "OgreBulletCollisions.h"
+
+#include "Debug/OgreBulletCollisionsDebugDrawer.h"
+#include "Utils/OgreBulletConverter.h"
+
+using namespace OgreBulletCollisions;
+using namespace Ogre;
+
+//------------------------------------------------------------------------------------------------
+DebugDrawer::DebugDrawer() :
+ DebugLines(),
+ btIDebugDraw(),
+ mDebugMode(0)
+{
+}
+//------------------------------------------------------------------------------------------------
+DebugDrawer::~DebugDrawer()
+{
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::reportErrorWarning(const char* warningString)
+{
+ Ogre::LogManager::getSingleton().getDefaultLog()->logMessage(warningString);
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawAabb(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawAabb;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawAabb;
+}
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawAabb () const {return (mDebugMode & btIDebugDraw::DBG_DrawAabb) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawWireframe () const {return (mDebugMode & btIDebugDraw::DBG_DrawWireframe) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawFeaturesText () const {return (mDebugMode & btIDebugDraw::DBG_DrawFeaturesText) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawContactPoints () const {return (mDebugMode & btIDebugDraw::DBG_DrawContactPoints) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesNoDeactivation () const {return (mDebugMode & btIDebugDraw::DBG_NoDeactivation) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesNoHelpText () const {return (mDebugMode & btIDebugDraw::DBG_NoHelpText) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDrawText () const {return (mDebugMode & btIDebugDraw::DBG_DrawText) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesProfileTimings () const {return (mDebugMode & btIDebugDraw::DBG_ProfileTimings) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesEnableSatComparison () const {return (mDebugMode & btIDebugDraw::DBG_EnableSatComparison) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesDisableBulletLCP () const {return (mDebugMode & btIDebugDraw::DBG_DisableBulletLCP) != 0;};
+//------------------------------------------------------------------------------------------------
+bool DebugDrawer::doesEnableCCD () const {return (mDebugMode & btIDebugDraw::DBG_EnableCCD) != 0;};
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawWireframe(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawWireframe;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawWireframe;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawFeaturesText(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawFeaturesText;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawFeaturesText;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawContactPoints(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawContactPoints;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawContactPoints;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setNoDeactivation(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_NoDeactivation;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_NoDeactivation;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setNoHelpText(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_NoHelpText;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_NoHelpText;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDrawText(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DrawText;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DrawText;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setProfileTimings(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_ProfileTimings;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_ProfileTimings;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setEnableSatComparison(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_EnableSatComparison;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_EnableSatComparison;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setDisableBulletLCP (bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_DisableBulletLCP ;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_DisableBulletLCP ;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::setEnableCCD(bool enable)
+{
+ if (enable)
+ mDebugMode |= btIDebugDraw::DBG_EnableCCD;
+ else
+ mDebugMode &= ~btIDebugDraw::DBG_EnableCCD;
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawAabb(const btVector3& from,const btVector3& to,const btVector3& color)
+{
+ if (mDebugMode & btIDebugDraw::DBG_DrawAabb)
+ {
+ drawAabb (BtOgreConverter::to(from), BtOgreConverter::to(to), BtOgreConverter::to (color));
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawLine(const btVector3& from,const btVector3& to,const btVector3& color)
+{
+ if (mDebugMode > 0)
+ {
+ drawLine (BtOgreConverter::to(from), BtOgreConverter::to(to), BtOgreConverter::to (color));
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,
+ btScalar distance,int lifeTime,const btVector3& color)
+{
+ if (mDebugMode & btIDebugDraw::DBG_DrawContactPoints)
+ {
+ //
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawAabb (const Ogre::Vector3& from,const Ogre::Vector3& to,const Ogre::Vector3& color)
+{
+ if (mDebugMode & btIDebugDraw::DBG_DrawAabb)
+ {
+ Vector3 halfExtents = (to-from)* 0.5f;
+ Vector3 center = (to+from) *0.5f;
+ int i,j;
+
+ Vector3 edgecoord(1.f,1.f,1.f),pa,pb;
+ for (i=0;i<4;i++)
+ {
+ for (j=0;j<3;j++)
+ {
+ pa = Vector3(edgecoord[0]*halfExtents[0], edgecoord[1]*halfExtents[1],
+ edgecoord[2]*halfExtents[2]);
+ pa+=center;
+
+ int othercoord = j%3;
+ edgecoord[othercoord]*=-1.f;
+ pb = Vector3(edgecoord[0]*halfExtents[0], edgecoord[1]*halfExtents[1],
+ edgecoord[2]*halfExtents[2]);
+ pb+=center;
+
+ drawLine(pa,pb,color);
+ }
+ edgecoord = Vector3(-1.f,-1.f,-1.f);
+ if (i<3)
+ edgecoord[i]*=-1.f;
+ }
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawLine(const Ogre::Vector3& from,const Ogre::Vector3& to,const Ogre::Vector3& color)
+{
+ if (mDebugMode > 0)
+ {
+ addLine (from, to);
+ }
+}
+//------------------------------------------------------------------------------------------------
+void DebugDrawer::drawContactPoint(const Ogre::Vector3& PointOnB,const Ogre::Vector3& normalOnB,
+ Real distance,int lifeTime,const Ogre::Vector3& color)
+{
+ if (mDebugMode & btIDebugDraw::DBG_DrawContactPoints)
+ {
+
+ }
+ //...
+}
+//------------------------------------------------------------------------------------------------
+
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h 2007-10-23 13:54:19 UTC (rev 455)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h 2007-10-24 03:29:10 UTC (rev 456)
@@ -1,88 +1,88 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
-(Object-oriented Graphics Rendering Engine Bullet Wrapper)
-For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
-Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-#ifndef _OgreBulletCollisions_DebugDrawer_H_
-#define _OgreBulletCollisions_DebugDrawer_H_
-
-#include "OgreBulletCollisionsPreRequisites.h"
-
-#include "Debug/OgreBulletCollisionsDebugLines.h"
-
-namespace OgreBulletCollisions
-{
- //------------------------------------------------------------------------------------------------
- class DebugDrawer : public DebugLines, public btIDebugDraw
- {
- public:
- DebugDrawer();
- virtual ~DebugDrawer();
-
-
- virtual void setDebugMode(int mode){mDebugMode = mode;};
- virtual int getDebugMode() const { return mDebugMode;};
-
- virtual void drawLine(const btVector3& from,const btVector3& to,const btVector3& color);
- virtual void drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,
- btScalar distance,int lifeTime,const btVector3& color);
-
- void drawAabb(const Ogre::Vector3& from,const Ogre::Vector3& to,const Ogre::Vector3& color);
- void drawLine(const Ogre::Vector3& from,const Ogre::Vector3& to,const Ogre::Vector3& color);
- void drawContactPoint(const Ogre::Vector3& PointOnB,const Ogre::Vector3& normalOnB,
- Ogre::Real distance,int lifeTime,const Ogre::Vector3& color);
-
- void setDrawAabb(bool enable);
- void setDrawWireframe(bool enable);
- void setDrawFeaturesText(bool enable);
- void setDrawContactPoints(bool enable);
- void setNoDeactivation(bool enable);
- void setNoHelpText(bool enable);
- void setDrawText(bool enable);
- void setPr...
[truncated message content] |
