python-ogre-commit Mailing List for Ogre3d Python bindings (Python-Ogre) (Page 26)

Brought to you by: andy_miller, roman_yakovenko

python-ogre-commit — changes to source code will be reported to the mailing list

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

Flat | Threaded

<< < 1 .. 24 25 26 27 28 .. 31 > >> (Page 26 of 31)

[Python-ogre-commit] SF.net SVN: python-ogre: [505] trunk/python-ogre/demos/showcase_01/plugins. cfg

From: <bha...@us...> - 2007-12-17 18:03:04

Revision: 505
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=505&view=rev
Author:   bharling
Date:     2007-12-17 10:03:00 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
Updated to the latest version of the showcase demo. 

A little speed improvement.

-bharling

Added Paths:
-----------
    trunk/python-ogre/demos/showcase_01/plugins.cfg

Added: trunk/python-ogre/demos/showcase_01/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/showcase_01/plugins.cfg	                        (rev 0)
+++ trunk/python-ogre/demos/showcase_01/plugins.cfg	2007-12-17 18:03:00 UTC (rev 505)
@@ -0,0 +1,19 @@
+# Defines plugins to load
+
+## 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
+
+##
+## NOTE use this for MacOS or Linux
+# Plugin=RenderSystem_GL
+# Plugin=Plugin_ParticleFX
+# Plugin=Plugin_BSPSceneManager
+# Plugin=Plugin_OctreeSceneManager
+# Plugin=Plugin_CgProgramManager


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [504] trunk/python-ogre/demos/showcase_01/Ogre.log

From: <bha...@us...> - 2007-12-17 18:02:54

Revision: 504
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=504&view=rev
Author:   bharling
Date:     2007-12-17 10:02:54 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
Updated to the latest version of the showcase demo. 

A little speed improvement.

-bharling

Added Paths:
-----------
    trunk/python-ogre/demos/showcase_01/Ogre.log

Added: trunk/python-ogre/demos/showcase_01/Ogre.log
===================================================================
--- trunk/python-ogre/demos/showcase_01/Ogre.log	                        (rev 0)
+++ trunk/python-ogre/demos/showcase_01/Ogre.log	2007-12-17 18:02:54 UTC (rev 504)
@@ -0,0 +1,491 @@
+17:46:34: Creating resource group General
+17:46:34: Creating resource group Internal
+17:46:34: Creating resource group Autodetect
+17:46:34: SceneManagerFactory for type 'DefaultSceneManager' registered.
+17:46:34: Registering ResourceManager for type Material
+17:46:34: Registering ResourceManager for type Mesh
+17:46:34: Registering ResourceManager for type Skeleton
+17:46:34: MovableObjectFactory for type 'ParticleSystem' registered.
+17:46:34: OverlayElementFactory for type Panel registered.
+17:46:34: OverlayElementFactory for type BorderPanel registered.
+17:46:34: OverlayElementFactory for type TextArea registered.
+17:46:34: Registering ResourceManager for type Font
+17:46:34: ArchiveFactory for archive type FileSystem registered.
+17:46:34: ArchiveFactory for archive type Zip registered.
+17:46:34: FreeImage version: 3.9.2
+17:46:34: This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details
+17:46:34: Supported formats: bmp,ico,jpg,jif,jpeg,jpe,jng,koa,iff,lbm,mng,pbm,pbm,pcd,pcx,pgm,pgm,png,ppm,ppm,ras,tga,targa,tif,tiff,wap,wbmp,wbm,psd,cut,xbm,xpm,gif,hdr,g3,sgi
+17:46:34: DDS codec registering
+17:46:34: Registering ResourceManager for type HighLevelGpuProgram
+17:46:34: Registering ResourceManager for type Compositor
+17:46:34: MovableObjectFactory for type 'Entity' registered.
+17:46:34: MovableObjectFactory for type 'Light' registered.
+17:46:34: MovableObjectFactory for type 'BillboardSet' registered.
+17:46:34: MovableObjectFactory for type 'ManualObject' registered.
+17:46:34: MovableObjectFactory for type 'BillboardChain' registered.
+17:46:34: MovableObjectFactory for type 'RibbonTrail' registered.
+17:46:34: Loading library ../../plugins\RenderSystem_GL.dll
+17:46:34: Installing plugin: GL RenderSystem
+17:46:34: OpenGL Rendering Subsystem created.
+17:46:35: Plugin successfully installed
+17:46:35: Loading library ../../plugins\RenderSystem_Direct3D9.dll
+17:46:35: Installing plugin: D3D9 RenderSystem
+17:46:35: D3D9 : Direct3D9 Rendering Subsystem created.
+17:46:36: D3D9: Driver Detection Starts
+17:46:36: D3D9: Driver Detection Ends
+17:46:36: Plugin successfully installed
+17:46:36: Loading library ../../plugins\Plugin_ParticleFX.dll
+17:46:36: Installing plugin: ParticleFX
+17:46:36: Particle Emitter Type 'Point' registered
+17:46:36: Particle Emitter Type 'Box' registered
+17:46:36: Particle Emitter Type 'Ellipsoid' registered
+17:46:36: Particle Emitter Type 'Cylinder' registered
+17:46:36: Particle Emitter Type 'Ring' registered
+17:46:36: Particle Emitter Type 'HollowEllipsoid' registered
+17:46:36: Particle Affector Type 'LinearForce' registered
+17:46:36: Particle Affector Type 'ColourFader' registered
+17:46:36: Particle Affector Type 'ColourFader2' registered
+17:46:36: Particle Affector Type 'ColourImage' registered
+17:46:36: Particle Affector Type 'ColourInterpolator' registered
+17:46:36: Particle Affector Type 'Scaler' registered
+17:46:36: Particle Affector Type 'Rotator' registered
+17:46:36: Particle Affector Type 'DirectionRandomiser' registered
+17:46:36: Particle Affector Type 'DeflectorPlane' registered
+17:46:36: Plugin successfully installed
+17:46:36: Loading library ../../plugins\Plugin_BSPSceneManager.dll
+17:46:36: Installing plugin: BSP Scene Manager
+17:46:36: Plugin successfully installed
+17:46:36: Loading library ../../plugins\Plugin_OctreeSceneManager.dll
+17:46:36: Installing plugin: Octree & Terrain Scene Manager
+17:46:36: Plugin successfully installed
+17:46:36: Loading library ../../plugins\Plugin_CgProgramManager.dll
+17:46:36: Installing plugin: Cg Program Manager
+17:46:36: Plugin successfully installed
+17:46:36: *-*-* OGRE Initialising
+17:46:36: *-*-* Version 1.4.5 (Eihort)
+17:46:36: Creating resource group Bootstrap
+17:46:36: Added resource location '../media/packs/OgreCore.zip' of type 'Zip' to resource group 'Bootstrap'
+17:46:36: Creating resource group Caelum
+17:46:36: Added resource location '../caelum/media' of type 'FileSystem' to resource group 'Caelum'
+17:46:36: Added resource location '../media' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/fonts' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/sounds' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/Audio' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/materials/programs' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/materials/scripts' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/materials/textures' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/models' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/overlays' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/particle' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/gui' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location './media/trees' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location './media/grass' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location './media/terrains' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location './media/Triplanar' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location './media/SkyManager' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location './media/sounds' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location './media/water' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location './media/Characters' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location './media/perPixel' of type 'FileSystem' to resource group 'General'
+17:46:36: Added resource location '../media/packs/cubemap.zip' of type 'Zip' to resource group 'General'
+17:46:36: Added resource location '../media/packs/cubemapsJS.zip' of type 'Zip' to resource group 'General'
+17:46:36: Added resource location '../media/packs/dragon.zip' of type 'Zip' to resource group 'General'
+17:46:36: Added resource location '../media/packs/fresneldemo.zip' of type 'Zip' to resource group 'General'
+17:46:36: Added resource location '../media/packs/ogretestmap.zip' of type 'Zip' to resource group 'General'
+17:46:36: Added resource location '../media/packs/skybox.zip' of type 'Zip' to resource group 'General'
+17:46:36: D3D9 : RenderSystem Option: Allow NVPerfHUD = No
+17:46:36: D3D9 : RenderSystem Option: Anti aliasing = None
+17:46:36: D3D9 : RenderSystem Option: Floating-point mode = Fastest
+17:46:36: D3D9 : RenderSystem Option: Full Screen = Yes
+17:46:36: D3D9 : RenderSystem Option: Rendering Device = Radeon X1650 Series
+17:46:36: D3D9 : RenderSystem Option: VSync = No
+17:46:36: D3D9 : RenderSystem Option: Video Mode = 1024 x 768 @ 32-bit colour
+17:46:37: CPU Identifier & Features
+17:46:37: -------------------------
+17:46:37:  *   CPU ID: GenuineIntel: Intel(R) Pentium(R) 4 CPU 2.80GHz
+17:46:37:  *      SSE: yes
+17:46:37:  *     SSE2: yes
+17:46:37:  *     SSE3: no
+17:46:37:  *      MMX: yes
+17:46:37:  *   MMXEXT: yes
+17:46:37:  *    3DNOW: no
+17:46:37:  * 3DNOWEXT: no
+17:46:37:  *     CMOV: yes
+17:46:37:  *      TSC: yes
+17:46:37:  *      FPU: yes
+17:46:37:  *      PRO: no
+17:46:37:  *       HT: yes
+17:46:37: -------------------------
+17:46:37: D3D9 : Subsystem Initialising
+17:46:37: D3D9RenderSystem::createRenderWindow "OGRE Render Window", 1024x768 fullscreen  miscParams: FSAA=0 FSAAQuality=0 colourDepth=32 useNVPerfHUD=false vsync=false 
+17:46:37: D3D9 : Created D3D9 Rendering Window 'OGRE Render Window' : 1024x768, 32bpp
+17:46:37: Registering ResourceManager for type Texture
+17:46:37: Registering ResourceManager for type GpuProgram
+17:46:37: RenderSystem capabilities
+17:46:37: -------------------------
+17:46:37:  * Hardware generation of mipmaps: yes
+17:46:37:  * Texture blending: yes
+17:46:37:  * Anisotropic texture filtering: yes
+17:46:38:  * Dot product texture operation: yes
+17:46:38:  * Cube mapping: yes
+17:46:38:  * Hardware stencil buffer: yes
+17:46:38:    - Stencil depth: 8
+17:46:38:    - Two sided stencil support: yes
+17:46:38:    - Wrap stencil values: yes
+17:46:38:  * Hardware vertex / index buffers: yes
+17:46:38:  * Vertex programs: yes
+17:46:38:    - Max vertex program version: vs_3_0
+17:46:38:  * Fragment programs: yes
+17:46:38:    - Max fragment program version: ps_3_0
+17:46:38:  * Texture Compression: yes
+17:46:38:    - DXT: yes
+17:46:38:    - VTC: no
+17:46:38:  * Scissor Rectangle: yes
+17:46:38:  * Hardware Occlusion Query: yes
+17:46:38:  * User clip planes: yes
+17:46:38:  * VET_UBYTE4 vertex element type: yes
+17:46:38:  * Infinite far plane projection: yes
+17:46:38:  * Hardware render-to-texture: yes
+17:46:38:  * Floating point textures: yes
+17:46:38:  * Non-power-of-two textures: yes (limited)
+17:46:38:  * Volume textures: yes
+17:46:38:  * Multiple Render Targets: 4
+17:46:38:  * Point Sprites: yes
+17:46:38:  * Extended point parameters: yes
+17:46:38:  * Max Point Size: 256
+17:46:38:  * Vertex texture fetch: no
+17:46:38: ***************************************
+17:46:38: *** D3D9 : Subsystem Initialised OK ***
+17:46:38: ***************************************
+17:46:38: ResourceBackgroundQueue - threading disabled
+17:46:38: Particle Renderer Type 'billboard' registered
+17:46:38: SceneManagerFactory for type 'BspSceneManager' registered.
+17:46:38: Registering ResourceManager for type BspLevel
+17:46:38: SceneManagerFactory for type 'OctreeSceneManager' registered.
+17:46:38: SceneManagerFactory for type 'TerrainSceneManager' registered.
+17:46:38: TerrainSceneManager: Registered a new PageSource for type Heightmap
+17:46:38: Creating viewport on target 'OGRE Render Window', rendering from camera 'PlayerCam', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
+17:46:38: Parsing scripts for resource group Autodetect
+17:46:38: Finished parsing scripts for resource group Autodetect
+17:46:38: Parsing scripts for resource group Bootstrap
+17:46:38: Parsing script OgreCore.material
+17:46:38: Parsing script OgreProfiler.material
+17:46:38: Parsing script Ogre.fontdef
+17:46:38: Parsing script OgreDebugPanel.overlay
+17:46:38: Texture: New_Ogre_Border_Center.png: Loading 1 faces(PF_A8R8G8B8,256x128x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x128x1.
+17:46:38: Texture: New_Ogre_Border.png: Loading 1 faces(PF_A8R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x256x1.
+17:46:38: Texture: New_Ogre_Border_Break.png: Loading 1 faces(PF_A8R8G8B8,32x32x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,32x32x1.
+17:46:38: Font BlueHighwayusing texture size 512x512
+17:46:38: Info: Freetype returned null for character 127 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 128 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 129 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 130 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 131 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 132 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 133 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 134 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 135 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 136 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 137 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 138 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 139 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 140 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 141 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 142 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 143 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 144 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 145 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 146 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 147 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 148 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 149 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 150 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 151 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 152 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 153 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 154 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 155 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 156 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 157 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 158 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 159 in font BlueHighway
+17:46:38: Info: Freetype returned null for character 160 in font BlueHighway
+17:46:38: Texture: BlueHighwayTexture: Loading 1 faces(PF_BYTE_LA,512x512x1) with 0 generated mipmaps from Image. Internal format is PF_BYTE_LA,512x512x1.
+17:46:38: Texture: ogretext.png: Loading 1 faces(PF_A8R8G8B8,256x128x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x128x1.
+17:46:38: Parsing script OgreLoadingPanel.overlay
+17:46:38: Finished parsing scripts for resource group Bootstrap
+17:46:38: Parsing scripts for resource group Caelum
+17:46:38: Parsing script GroundFog.program
+17:46:38: Parsing script Haze.program
+17:46:38: Parsing script GroundFog.material
+17:46:38: Parsing script LayeredClouds.material
+17:46:39: OGRE EXCEPTION(2:InvalidParametersException): Parameter called sunDirection does not exist.  in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
+17:46:39: Error at line 53 of LayeredClouds.material: Invalid param_named attribute - Parameter called sunDirection does not exist. 
+17:46:39: Error at line 53 of LayeredClouds.material: Invalid param_named attribute - expected at least 3 parameters.
+17:46:39: Parsing script Terrain.material
+17:46:39: Finished parsing scripts for resource group Caelum
+17:46:39: Parsing scripts for resource group General
+17:46:39: Parsing script Examples.program
+17:46:39: Parsing script StdQuad_vp.program
+17:46:39: Parsing script BlackAndWhite.material
+17:46:39: Parsing script Bloom.material
+17:46:39: Parsing script Civic.material
+17:46:39: Parsing script creature.material
+17:46:39: Parsing script CustomShadows.material
+17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: High-level program CustomShadows/ShadowCasterVP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: High-level program CustomShadows/ShadowCasterFP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: High-level program CustomShadows/ShadowCasterVP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: High-level program CustomShadows/ShadowCasterFP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: High-level program CustomShadows/ShadowReceiverVP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: High-level program CustomShadows/ShadowReceiverFP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:39: High-level program CustomShadows/ShadowReceiverVP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: High-level program CustomShadows/ShadowReceiverFP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderVP.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: High-level program CustomShadows/SimpleShaderVP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderVP.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderVP.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: High-level program CustomShadows/SimpleShaderVP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderVP.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderFP.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: High-level program CustomShadows/SimpleShaderFP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderFP.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderFP.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: High-level program CustomShadows/SimpleShaderFP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderFP.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:40: Parsing script DepthShadowmap.material
+17:46:40: Parsing script DOF.material
+17:46:40: Parsing script Embossed.material
+17:46:40: Parsing script Example-DynTex.material
+17:46:40: Parsing script Example-Water.material
+17:46:40: Parsing script Example.material
+17:46:40: Parsing script Examples-Advanced.material
+17:46:41: Parsing script facial.material
+17:46:41: Parsing script Glass.material
+17:46:41: Parsing script hdr.material
+17:46:41: Parsing script HeatVision.material
+17:46:42: Parsing script Hurt.material
+17:46:42: Parsing script instancing.material
+17:46:42: Parsing script Invert.material
+17:46:42: Parsing script Laplace.material
+17:46:42: Parsing script MotionBlur.material
+17:46:42: Parsing script Ocean.material
+17:46:42: Error in material OceanCg at line 176 of Ocean.material: Invalid texture option - combineduvw.
+17:46:43: Parsing script OffsetMapping.material
+17:46:43: Parsing script Ogre.material
+17:46:43: Parsing script OldMovie.material
+17:46:43: Parsing script OldTV.material
+17:46:43: Parsing script PlaneOptimalShadows.material
+17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: High-level program PlaneOptimalShadows/ShadowCasterVP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: High-level program PlaneOptimalShadows/ShadowCasterFP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: High-level program PlaneOptimalShadows/ShadowCasterVP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: High-level program PlaneOptimalShadows/ShadowCasterFP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: High-level program PlaneOptimalShadows/ShadowReceiverVP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: High-level program PlaneOptimalShadows/ShadowReceiverFP/Cg encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: High-level program PlaneOptimalShadows/ShadowReceiverVP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: High-level program PlaneOptimalShadows/ShadowReceiverFP/HLSL encountered an error during loading and is thus not supported.
+OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
+17:46:43: Parsing script Posterize.material
+17:46:43: Parsing script RZR-002.material
+17:46:43: Parsing script Scene.material
+17:46:43: Parsing script SharpenEdges.material
+17:46:43: Parsing script smoke.material
+17:46:43: Parsing script Tiling.material
+17:46:43: Parsing script Tower.material
+17:46:43: Parsing script VarianceShadowmap.material
+17:46:44: Parsing script zombie.material
+17:46:44: Parsing script beech.material
+17:46:44: Parsing script birch.material
+17:46:44: Parsing script blenTree.material
+17:46:44: Parsing script boulder.material
+17:46:44: Parsing script CloudyNoonSkyBox.material
+17:46:44: Parsing script LOTTreeLeaves.material
+17:46:44: Parsing script LOTTreeTrunk.material
+17:46:44: Parsing script Materials.material
+17:46:44: Parsing script palms.material
+17:46:44: Parsing script Pine.material
+17:46:44: Parsing script spotted_shroom.material
+17:46:44: Parsing script tipi.material
+17:46:44: Parsing script tree.material
+17:46:44: Parsing script TreeNew.material
+17:46:44: Parsing script BdBush.material
+17:46:44: Parsing script grass.material
+17:46:44: Parsing script grass1.material
+17:46:44: Parsing script shortgrass.material
+17:46:44: Parsing script OverhangTerrainSceneManager.material
+17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightSpecular does not exist.  in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
+17:46:44: Error at line 21 of OverhangTerrainSceneManager.material: Invalid param_named_auto attribute - Parameter called lightSpecular does not exist. 
+17:46:44: Parsing script sky.material
+17:46:44: Parsing script ocean_new.material
+17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightSpecular does not exist.  in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
+17:46:44: Error at line 38 of ocean_new.material: Invalid param_named_auto attribute - Parameter called lightSpecular does not exist. 
+17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightDiffuse does not exist.  in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
+17:46:44: Error at line 38 of ocean_new.material: Invalid param_named_auto attribute - Parameter called lightDiffuse does not exist. 
+17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called exponent does not exist.  in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
+17:46:44: Error at line 38 of ocean_new.material: Invalid param_named attribute - Parameter called exponent does not exist. 
+17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called ambient does not exist.  in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
+17:46:44: Error at line 38 of ocean_new.material: Invalid param_named attribute - Parameter called ambient does not exist. 
+17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightPosition does not exist.  in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
+17:46:44: Error at line 38 of ocean_new.material: Invalid param_named_auto attribute - Parameter called lightPosition does not exist. 
+17:46:44: Error in material MrBenSea at line 59 of ocean_new.material: Invalid param_named attribute - expected at least 3 parameters.
+17:46:44: Parsing script Ocean_rtt.material
+17:46:44: Parsing script Whale.material
+17:46:44: Parsing script perpixel.material
+17:46:44: OGRE EXCEPTION(4:ItemIdentityException): Resource with the name Ogre/BasicVertexPrograms/AmbientOneTexture already exists. in ResourceManager::add at ..\src\OgreResourceManager.cpp (line 113)
+17:46:44: Error at line 47 of perpixel.material: Could not create GPU program 'Ogre/BasicVertexPrograms/AmbientOneTexture', error reported was: Resource with the name Ogre/BasicVertexPrograms/AmbientOneTexture already exists.
+17:46:45: Parsing script plane.material
+17:46:45: Parsing script RomanBath.material
+17:46:45: Parsing script Examples.compositor
+17:46:45: Parsing script test.fontdef
+17:46:45: Parsing script sample.fontdef
+17:46:45: Parsing script Arial.fontdef
+17:46:45: Parsing script emitted_emitter.particle
+17:46:45: Parsing script Example-Water.particle
+17:46:45: Parsing script Example.particle
+17:46:45: Parsing script smoke.particle
+17:46:45: Parsing script Compositor.overlay
+17:46:45: Parsing script DP3.overlay
+17:46:45: Parsing script Example-CubeMapping.overlay
+17:46:45: Parsing script Example-DynTex.overlay
+17:46:45: Parsing script Example-Water.overlay
+17:46:45: Parsing script Shadows.overlay
+17:46:45: Finished parsing scripts for resource group General
+17:46:45: Parsing scripts for resource group Internal
+17:46:45: Finished parsing scripts for resource group Internal
+17:46:45: TerrainSceneManager: Activated PageSource Heightmap
+17:46:45: Texture: terrain_texture.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+17:46:45: Texture: grass_1024.jpg: Loading 1 faces(PF_R8G8B8,1024x1024x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,1024x1024x1.
+17:46:45: Texture: terr_rock6.jpg: Loading 1 faces(PF_R8G8B8,1024x1024x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,1024x1024x1.
+17:46:45: Texture: sand.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+17:46:45: WARNING: Texture instance 'RttTex' was defined as manually loaded, but no manual loader was provided. This Resource will be lost if it has to be reloaded.
+17:46:45: Creating viewport on target 'rtt/3391360', rendering from camera 'ReflectCam', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
+17:46:45: D3D9 : Loading 3D Texture, image name : 'NoiseVolume.dds' with 5 mip map levels
+17:46:45: Initialising Caelum system...
+17:46:45: System attributes set up.
+17:46:45: Generating sky dome material...
+17:46:46: 	Material not found; creating...
+17:46:46: 		Material [OK]
+17:46:46: 		Pass [OK]
+17:46:46: 		TextureUnit - Sky gradient [OK]
+17:46:46: 		TextureUnit - Atmosphere depth [OK]
+17:46:46: Texture: EarthClearSky2.png: Loading 1 faces(PF_A8R8G8B8,64x64x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,64x64x1.
+17:46:46: Texture: AtmosphereDepth.png: Loading 1 faces(PF_R8G8B8,32x1x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,32x1x1.
+17:46:46: 	DONE
+17:46:46: DONE
+17:46:46: Creating CaelumSphericDome sphere mesh resource...
+17:46:46: WARNING: Mesh instance 'CaelumSphericDome' was defined as manually loaded, but no manual loader was provided. This Resource will be lost if it has to be reloaded.
+17:46:46: DONE
+17:46:46: Generating sun material...
+17:46:46: 	Material not found; creating...
+17:46:46: 		Material [OK]
+17:46:46: 		Pass [OK]
+17:46:46: 	DONE
+17:46:46: DONE
+17:46:46: Mesh: Loading sphere.mesh.
+17:46:46: Generating starfield material...
+17:46:46: 	Material not found; creating...
+17:46:46: 		Material [OK]
+17:46:46: 		Pass [OK]
+17:46:46: 		TextureUnit [OK]
+17:46:46: 	DONE
+17:46:46: DONE
+17:46:46: Texture: Starfield.jpg: Loading 1 faces(PF_R8G8B8,1024x1024x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,1024x1024x1.
+17:46:46: Creating CaelumStarfieldDome sphere mesh resource...
+17:46:46: WARNING: Mesh instance 'CaelumStarfieldDome' was defined as manually loaded, but no manual loader was provided. This Resource will be lost if it has to be reloaded.
+17:46:46: DONE
+17:46:46: Texture: noise1.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:46: Texture: noise2.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:46: Texture: noise3.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:46: Texture: noise4.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:46: Texture: Noise1.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:46: Texture: Noise2.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:46: Texture: Noise3.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:46: Texture: Noise4.png: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:46: DONE
+17:46:46: Mesh: Loading KinkyPalm.mesh.
+17:46:46: Texture: palmtree_palmtexture_2.t.bmp: Loading 1 faces(PF_A8R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,512x512x1.
+17:46:46: Mesh: Loading StraightPalm.mesh.
+17:46:46: Mesh: Loading BendyPalm.mesh.
+17:46:46: Mesh: Loading BigDarkBush.mesh.
+17:46:46: Texture: bush3_IMG_1409.png: Loading 1 faces(PF_A8R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,512x512x1.
+17:46:46: Mesh: Loading birch.mesh.
+17:46:46: Texture: LEAFS.PNG: Loading 1 faces(PF_A8R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,512x512x1.
+17:46:46: Texture: PLANTS09.JPG: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+17:46:46: Mesh: Loading benTree.mesh.
+17:46:46: D3D9 : ***** Dimensions altered by the render system
+17:46:46: D3D9 : ***** Source image dimensions : 600x600
+17:46:46: D3D9 : ***** Texture dimensions : 1024x1024
+17:46:46: Texture: wood7.jpg: Loading 1 faces(PF_R8G8B8,600x600x1) with 5 generated mipmaps from Image. Internal format is PF_X8R8G8B8,1024x1024x1.
+17:46:46: Texture: tree_bush.png: Loading 1 faces(PF_A8R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x256x1.
+17:46:47: Mesh: Loading spotty_shroom.mesh.
+17:46:47: Texture: spotty_shroom.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:47: Mesh: Loading blue_shroom.mesh.
+17:46:47: Texture: blue_shroom.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:47: Mesh: Loading beech_tree.mesh.
+17:46:47: Texture: branches.png: Loading 1 faces(PF_A8R8G8B8,128x128x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,128x128x1.
+17:46:47: Mesh: Loading Pine.mesh.
+17:46:47: D3D9 : ***** Dimensions altered by the render system
+17:46:47: D3D9 : ***** Source image dimensions : 500x500
+17:46:47: D3D9 : ***** Texture dimensions : 512x512
+17:46:47: Texture: leaves5.png: Loading 1 faces(PF_A8R8G8B8,500x500x1) with 5 generated mipmaps from Image. Internal format is PF_A8R8G8B8,512x512x1.
+17:46:47: D3D9 : ***** Dimensions altered by the render system
+17:46:47: D3D9 : ***** Source image dimensions : 1536x1024
+17:46:47: D3D9 : ***** Texture dimensions : 2048x1024
+17:46:47: Texture: bark23.jpg: Loading 1 faces(PF_R8G8B8,1536x1024x1) with 5 generated mipmaps from Image. Internal format is PF_X8R8G8B8,2048x1024x1.
+17:46:50: Texture: terrain_grass.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+17:46:50: D3D9 : ***** Dimensions altered by the render system
+17:46:50: D3D9 : ***** Source image dimensions : 513x513
+17:46:50: D3D9 : ***** Texture dimensions : 1024x1024
+17:46:50: Texture: densitymap.png: Loading 1 faces(PF_A8R8G8B8,513x513x1) with 5 generated mipmaps from Image. Internal format is PF_A8R8G8B8,1024x1024x1.
+17:46:51: Mesh: Loading robot.mesh.
+17:46:51: Skeleton: Loading robot.skeleton
+17:46:51: Texture: r2skin.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
+17:46:51: Mesh: Loading whale.mesh.
+17:46:51: Skeleton: Loading Whale-whalebone.skeleton
+17:46:51: Texture: Whale.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:51: WARNING: the mesh 'whale.mesh' includes vertices without bone assignments. Those vertices will transform to wrong position when skeletal animation enabled. To eliminate this, assign at least one bone assignment per vertex on your mesh.
+17:46:51: Mesh: Loading tipi.mesh.
+17:46:51: Texture: tipi.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with  hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
+17:46:51: Creating viewport on target 'rtt/214041824', rendering from camera 'ImpostorCam2', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
+17:46:51: Creating resource group BinFolder
+17:46:51: Added resource location '.' of type 'FileSystem' to resource group 'BinFolder'
+17:46:51: Texture: Impostor.General.BigDarkBush.mesh.png: Loading 1 faces(PF_A8R8G8B8,1024x512x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,1024x512x1.
+17:46:51: Render Target 'rtt/214041824' Average FPS: 0 Best FPS: 0 Worst FPS: 999
+17:46:51: Creating viewport on target 'rtt/214045024', rendering from camera 'ImpostorCam36', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
+17:46:51: Added resource location '.' of type 'FileSystem' to resource group 'BinFolder'
+17:46:51: Texture: Impostor.General.Pine.mesh.png: Loading 1 faces(PF_A8R8G8B8,1024x512x1) with  hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,1024x512x1.
+17:46:51: Render Target 'rtt/214045024' Average FPS: 0 Best FPS: 0 Worst FPS: 999
+17:46:52: D3D9 : ***** Dimensions altered by the render system
+17:46:52: D3D9 : ***** Source image dimensions : 253x253
+17:46:52: D3D9 : ***** Texture dimensions : 256x256
+17:46:52: Texture: grass2.png: Loading 1 faces(PF_A8R8G8B8,253x253x1) with 5 generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x256x1.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [503] trunk/python-ogre/demos/showcase_01/ogre.cfg

From: <bha...@us...> - 2007-12-17 18:02:41

Revision: 503
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=503&view=rev
Author:   bharling
Date:     2007-12-17 10:02:47 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
Updated to the latest version of the showcase demo. 

A little speed improvement.

-bharling

Added Paths:
-----------
    trunk/python-ogre/demos/showcase_01/ogre.cfg

Added: trunk/python-ogre/demos/showcase_01/ogre.cfg
===================================================================
--- trunk/python-ogre/demos/showcase_01/ogre.cfg	                        (rev 0)
+++ trunk/python-ogre/demos/showcase_01/ogre.cfg	2007-12-17 18:02:47 UTC (rev 503)
@@ -0,0 +1,19 @@
+Render System=Direct3D9 Rendering Subsystem
+
+[OpenGL Rendering Subsystem]
+Colour Depth=32
+Display Frequency=100
+FSAA=0
+Full Screen=Yes
+RTT Preferred Mode=PBuffer
+VSync=No
+Video Mode=1024 x 768
+
+[Direct3D9 Rendering Subsystem]
+Allow NVPerfHUD=No
+Anti aliasing=None
+Floating-point mode=Fastest
+Full Screen=Yes
+Rendering Device=Radeon X1650 Series
+VSync=No
+Video Mode=1024 x 768 @ 32-bit colour


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [502] trunk/python-ogre/demos/showcase_01/ Demo_Forest.py

From: <bha...@us...> - 2007-12-17 18:02:41

Revision: 502
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=502&view=rev
Author:   bharling
Date:     2007-12-17 10:02:39 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
Updated to the latest version of the showcase demo. 

A little speed improvement.

-bharling

Added Paths:
-----------
    trunk/python-ogre/demos/showcase_01/Demo_Forest.py

Added: trunk/python-ogre/demos/showcase_01/Demo_Forest.py
===================================================================
--- trunk/python-ogre/demos/showcase_01/Demo_Forest.py	                        (rev 0)
+++ trunk/python-ogre/demos/showcase_01/Demo_Forest.py	2007-12-17 18:02:39 UTC (rev 502)
@@ -0,0 +1,763 @@
+
+
+
+
+import warnings 
+warnings.simplefilter('ignore', RuntimeWarning) 
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as ois
+import ogre.addons.ogreforests as forests
+import ogre.addons.plib as plib
+#import ogre.sound.OgreAL as OgreAL
+import ogre.addons.caelum as caelum
+import SampleFramework as sf
+import math, random, ctypes
+warnings.simplefilter('default', RuntimeWarning)
+
+import psyco
+psyco.full()
+
+
+WORLD_SIZE = 5000
+WATER_LEVEL = 80
+
+CONNECTED = False
+
+TREE_FPS = 1.00 / 4.0
+
+class ForestApplication(sf.Application, ogre.RenderTargetListener):
+    def __init__(self):
+        "Init Render Application"
+        sf.Application.__init__(self)
+        self.mPlane = None
+        self.mPlaneEnt = None
+        self.mReflectCam= None
+        self.mPlaneNode= None
+        self.connected = False
+        ogre.RenderTargetListener.__init__(self)
+    
+    
+    
+    def _chooseSceneManager(self):
+        # self.sceneManager = self.root.createSceneManager("TerrainSceneManager")
+        self.sceneManager = self.root.createSceneManager("TerrainSceneManager")
+        # self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE)
+
+        
+    def preRenderTargetUpdate(self,evt):
+        self.mPlane.setVisible(False)
+           
+    def postRenderTargetUpdate(self,evt):
+        self.mPlane.setVisible(True)
+        
+    def createReflectionSystem(self):
+        "Override sf create scene"
+        sceneManager = self.sceneManager
+        camera = self.camera
+
+        # Create a prefab plane
+        self.mPlane = ogre.MovablePlane("ReflectPlane")
+        self.mPlane.d = 0
+        self.mPlane.normal =ogre.Vector3.UNIT_Y
+        ogre.MeshManager.getSingleton().createPlane("ReflectionPlane", 
+            ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME, 
+            self.mPlane, 10000.0, 10000.0, 
+            1, 1, True, 1, 1.0, 1.0, ogre.Vector3.UNIT_Z,
+            ogre.HardwareBuffer.HBU_STATIC_WRITE_ONLY, ogre.HardwareBuffer.HBU_STATIC_WRITE_ONLY, 
+            True,True
+            )
+        # Create plane entity
+        self.mPlaneEnt = sceneManager.createEntity( "Plane", "ReflectionPlane" )
+        # Attach the rtt entity to the root of the scene
+        rootNode = sceneManager.getRootSceneNode()
+        self.mPlaneNode = rootNode.createChildSceneNode()
+        # Attach both the plane entity, and the plane definition
+        self.mPlaneNode.attachObject(self.mPlaneEnt)
+        self.mPlaneNode.attachObject(self.mPlane) 
+        self.mPlaneNode.translate( ogre.Vector3(2500, WATER_LEVEL, 2500))
+
+        # create RenderTexture
+        rttTex = self.root.getRenderSystem().createRenderTexture( "RttTex", 512, 512, 
+                                                                 ogre.TEX_TYPE_2D,ogre.PixelFormat.PF_R8G8B8 )
+
+        
+        self.mReflectCam = sceneManager.createCamera("ReflectCam")
+        self.mReflectCam.setNearClipDistance(camera.getNearClipDistance())
+        self.mReflectCam.setFarClipDistance(camera.getFarClipDistance())
+        w = self.renderWindow.getViewport(0).getActualWidth() 
+        h = self.renderWindow.getViewport(0).getActualHeight ()
+        self.mReflectCam.setAspectRatio ( float(w)/float(h) )
+        # create ViewPort        
+        v = rttTex.addViewport( self.mReflectCam )
+        v.setClearEveryFrame ( True  )
+        v.setBackgroundColour (ogre.ColourValue.Black)
+
+        oceanMat = ogre.MaterialManager.getSingleton().getByName("OceanCg_RTT")
+        mPass = oceanMat.getTechnique(0).getPass(0)
+        tState = mPass.getTextureUnitState(1)
+        tState.setTextureName("RttTex")
+        tState.setColourOperationEx( ogre.LBX_BLEND_MANUAL, ogre.LBS_TEXTURE, 
+                               ogre.LBS_CURRENT, ogre.ColourValue.White,
+                              ogre.ColourValue.White, 0.25)
+                                
+        tState.setTextureAddressingMode (ogre.TextureUnitState.TAM_CLAMP)
+        #tState.setProjectiveTexturing(True, self.mReflectCam)
+        
+        
+        rttTex.addListener(self)
+
+        # set up linked reflection
+        self.mReflectCam.enableReflection(self.mPlane)
+        # Also clip
+        
+        # NOTE..  a difference in Python implementation
+        ## this doesn't work as mPlane is treated as a Plane instead of a MoveablePlane 
+        #self.mReflectCam.enableCustomNearClipPlane(self.mPlane) 
+        ## So we have an override :)
+        
+        self.mReflectCam.enableCustomNearClipPlaneMP(self.mPlane) 
+
+        #Give the plane a texture
+        self.mPlaneEnt.setMaterialName("OceanCg_RTT")
+
+        
+    def getTerrainHeight( self, x, z ):
+        #print "GetHeight"
+        if ( x < 0 or z < 0 or x > WORLD_SIZE or z > WORLD_SIZE ):  return 0
+        self.updateRay.setOrigin( ogre.Vector3(x, 0.0, z) )
+        self.updateRay.setDirection( ogre.Vector3.UNIT_Y )
+        self.raySceneQuery.setRay( self.updateRay )
+        self.raySceneQuery.execute( self.raySceneQueryListener )
+        return self.raySceneQueryListener.resultDistance
+    
+    
+    def tryConnect(self):
+        import socket as s
+        # we need to send (and recieve) data on the local machine using port 4444
+        (family, socktype, proto, canonname, sockaddr) = s.getaddrinfo ( "127.0.0.1",4444)[0] #s.gethostname(), 4444 )[0]
+        self.socket = s.socket( s.AF_INET, s.SOCK_STREAM ) # create the client socket, note I'm testing with UDP traffic
+        self.socket.connect ( sockaddr )
+        CONNECTED = True
+        self.connected = True
+        print 'Client Connects'
+        
+        
+    def __del__(self):
+        self.socket.close()
+        sf.Application.__del__(self)
+        
+    ##---- PagedGeometry test ----
+    def createTrees(self):
+
+        
+        ## TREES
+        ##Initialize the PagedGeometry engine
+        self.trees = forests.PagedGeometry()
+        self.trees.setCamera( self.camera )
+        self.trees.setPageSize( 500 )
+        self.trees.setBounds( ogre.FloatRect(0, 0, WORLD_SIZE, WORLD_SIZE) )
+        
+        self.mTex = ogre.TextureManager.getSingleton().createManual(
+                        "DynamicTexture",
+                        ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME,
+                        ogre.TEX_TYPE_2D,
+                        16, 16,
+                        0,
+                        ogre.PF_BYTE_BGRA,
+                        ogre.TU_DYNAMIC)
+    
+        ##Set up LODs
+        ##self.trees.addDetailLevelEntityPage(50, 50)
+        self.trees.addDetailLevelBatchPage(100, 20)
+        self.trees.addDetailLevelImpostorPage(2000, 100)
+        ##Set up a TreeLoader for easy use
+        self.treeLoader = forests.TreeLoader2D( self.trees, ogre.FloatRect(0, 0, WORLD_SIZE, WORLD_SIZE) )
+        self.trees.setPageLoader(self.treeLoader)
+        self.treeLoader.setHeightFunction(self, "getTerrainHeight")
+        
+    
+        ##And add 20,000 trees to the scene through the "easy-to-use" TreeLoader class
+        palm1 = self.sceneManager.createEntity("MyTree", "KinkyPalm.mesh")
+        palm2 = self.sceneManager.createEntity("pineTree", "StraightPalm.mesh")
+        palm3 = self.sceneManager.createEntity("palmBendy", "BendyPalm.mesh")
+        bush1 = self.sceneManager.createEntity("bush1", "BigDarkBush.mesh")
+        birch = self.sceneManager.createEntity("birch", "birch.mesh")
+        benTree = self.sceneManager.createEntity("benTree", "benTree.mesh")
+        spot_shroom = self.sceneManager.createEntity("redShroom", "spotty_shroom.mesh")
+        blue_shroom = self.sceneManager.createEntity("blueShroom", "blue_shroom.mesh")
+        beech = self.sceneManager.createEntity("beech", "beech_tree.mesh")
+        newTree = self.sceneManager.createEntity("newTree", "Pine.mesh")
+        self.treeModels = [ bush1, newTree ]#, palm2, spot_shroom ]
+        # fix the damn rotations
+        x=0
+        z=0
+        for i in range (30000):
+            yaw = random.randrange(0, 360)
+    
+            if (random.randrange(0, 1000) <= 800):
+                x += random.randrange(-10.0, 10.0)
+                z += random.randrange(-10.0, 10.0)
+                if (x < 0): x = 0 
+                elif (x > WORLD_SIZE): x = WORLD_SIZE
+                if (z < 0): z = 0 
+                elif (z > WORLD_SIZE): z = WORLD_SIZE
+            else:
+                x = random.randrange(0, WORLD_SIZE)
+                z = random.randrange(0, WORLD_SIZE)
+            
+            scale = random.randrange(9, 20) / 10
+            
+            if self.getTerrainHeight(x, z) > WATER_LEVEL:
+                t_type = random.randrange(0, len(self.treeModels))
+                self.treeLoader.addTree(self.treeModels[t_type], ogre.Vector2(x, z), ogre.Degree(yaw), scale)
+
+        #self.treeLoader.setColorMap(self.mTex)
+        ##Grass
+        
+        ##Initialize the PagedGeometry engine
+        self.grass = forests.PagedGeometry(self.camera, 50)
+        ##trees = new PagedGeometry(camera, 50, ogre.FloatRect(0, 0, WORLD_SIZE, WORLD_SIZE))
+        
+        ##Set up LODs
+        self.grass.addDetailLevelGrassPage(100.0,0.0)
+        
+        ##Set up a TreeLoader for easy use
+        self.grassLoader = forests.GrassLoader(self.grass)
+        self.grass.setPageLoader(self.grassLoader)
+        self.grassLoader.setHeightFunction(self, "getTerrainHeight")
+
+        ## iterate grass materials
+        for nam in ["grass"]:#, "dry_grass", "tall_grass"]:
+            grassLayer = self.grassLoader.addLayer(nam)
+            
+            grassLayer.setAnimationEnabled(True)
+            grassLayer.setSwaySpeed(1.5)
+            grassLayer.setSwayLength(0.08)
+            grassLayer.setSwayDistribution(10.0)
+            
+            grassLayer.setDensity(0.2)
+            
+            grassLayer.setMapBounds(ogre.FloatRect(0, 0, WORLD_SIZE, WORLD_SIZE))
+            
+            grassLayer.setColorMap("terrain_grass.jpg")
+            #grassLayer.setColorMap(self.mTex)
+            grassLayer.setColorMapFilter(forests.MAPFILTER_BILINEAR)
+            
+            grassLayer.setDensityMap("densitymap.png")
+            grassLayer.setDensityMapFilter(forests.MAPFILTER_NONE)
+        
+            ##grassLayer.setMinimumSize(0.5,0.5)
+            ##grassLayer.setMaximumSize(1.0, 1.0) 
+            
+            grassLayer.setMinimumSize(4.0,1.5)
+            grassLayer.setMaximumSize(4.0,2.0)
+            
+            grassLayer.setFadeTechnique(forests.FADETECH_GROW)
+        
+        
+    def createSkySystem(self):
+        self.caelumSystem = caelum.CaelumSystem(self.root, self.sceneManager)
+        
+        ## Setup sun position model.
+        self.spm = caelum.SimpleSunPositionModel (ogre.Degree (13))
+        ## IMHO EarthSunPositionModel is broken, so it default to sspm.
+        ##caelum.SunPositionModel *spm = new caelum.EarthSunPositionModel (ogre.Radian (ogre.Degree (37)), 0.5)
+        
+        ## Setup sun options
+        self.caelumSystem.getSun ().setAmbientMultiplier (ogre.ColourValue(0.5, 0.5, 0.5, 100.0))
+        self.caelumSystem.getSun ().setDiffuseMultiplier (ogre.ColourValue(3, 3, 2.7, 100.0))
+        ## For green terrain:
+        #self.caelumSystem.getSun ().setDiffuseMultiplier (ogre.ColourValue(0.5, 0.5, 0.5))
+        self.caelumSystem.getSun ().setSpecularMultiplier (ogre.ColourValue(2.0, 2.0, 2.0, 100.0))
+        self.caelumSystem.getSun ().setSunPositionModel (self.spm)
+        self.caelumSystem.getSun ().setManageAmbientLight (True)
+
+        sun = self.caelumSystem.getSun()
+        
+        ## Basic fogging setup.
+        ## This is a hack until proper fogging is implemented.
+        #self.caelumSystem.getSkyColourModel().setFogDensityMultiplier(0.0015)
+        #self.caelumSystem.setManageFog(True)
+        
+        ## Setup cloud options
+
+        self.caelumSystem.getClouds ().setCloudSpeed(ogre.Vector2(-0.00001, 0.00001))
+        clouds = self.caelumSystem.getClouds()
+        self.caelumSystem.getClouds().setCloudMassOffset(ogre.Vector2(0.5, 0.2))
+        self.caelumSystem.getClouds().setCloudCover(0.5)
+        self.caelumSystem.getClouds().setCloudBlendTime(7200 * 24)
+        self.caelumSystem.getClouds().setCloudMassBlend(0.9)
+        self.caelumSystem.getClouds().update(self.caelumSystem.getUniversalClock().getCurrentTime(), ogre.Vector3.UNIT_Y, ogre.ColourValue(0.5, 0.5, 0.5), ogre.ColourValue(3, 3, 2.7))
+        #self.caelumSystem.getClouds().setAnimating(False)
+        self.caelumSystem.getUniversalClock ().setTimeScale (256)
+        ogre.ControllerManager.getSingleton().setTimeFactor (256)
+        
+        
+        ## Setup starfield options
+        self.caelumSystem.getStarfield ().setInclination (ogre.Degree (13))
+        
+        ## Set some time parameters
+        self.caelumSystem.getUniversalClock ().setTimeScale (256)
+        self.caelumSystem.getUniversalClock ().setCurrentTime (18000) ## Jan 1st, 5am
+
+
+        ## Register all to the render window
+        self.renderWindow.addListener(self.caelumSystem)
+        
+        
+    def createEntities(self):
+        self.robots = []
+
+        for i in range(10):
+            robo = Robot(self)
+            robo.spawn(ogre.Vector3(2500 + (i * 10), 600, 2500), i)
+            self.robots.append(robo)
+            
+        self.whales = []
+        for i in range(3):
+            
+            whale = Whale(self)
+            whale.spawn(ogre.Vector3(1800,300,2500), 10+i)
+            self.whales.append(whale)
+
+    
+ 
+        
+        
+        tipi_ent = self.sceneManager.createEntity("tipi", "tipi.mesh")
+        tipi_node = self.sceneManager.getRootSceneNode().createChildSceneNode()
+        tipi_node.attachObject(tipi_ent)
+        tipi_node.setPosition(ogre.Vector3(700, 100, 750))
+        pos = tipi_node.getPosition()
+        tipi_node.setPosition(pos.x, self.getTerrainHeight(700,750) + 0, pos.z)
+        
+        
+        
+
+
+    ##Loads world
+    def _createScene(self):
+        camera = self.camera
+        camera.setNearClipDistance(4.00)
+
+        self.updateRay = ogre.Ray()
+        self.updateRay.setOrigin(camera.getPosition())
+        self.updateRay.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+        self.raySceneQuery = self.sceneManager.createRayQuery(self.updateRay)
+        self.raySceneQuery.setQueryTypeMask(ogre.SceneManager.WORLD_GEOMETRY_TYPE_MASK )   
+        self.raySceneQuery.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
+        self.raySceneQueryListener = myRaySceneQueryListener()
+        terrain_cfg = "./triplanar_terrain.cfg"
+    
+        self.sceneManager.setWorldGeometry( terrain_cfg )
+        
+        self.createReflectionSystem()
+    
+        ## Set a nice viewpoint
+        camera.setPosition(2274,600,2586)
+        camera.lookAt(2000, 500, 2600)
+        ##camera.setPolygonMode(PM_WIREFRAME
+        
+        self.createSkySystem()
+        
+        self.createTrees()
+        
+        self.createEntities()
+
+
+    def _createFrameListener(self):
+        self.frameListener = GrassFrameListener(self)
+        self.root.addFrameListener(self.frameListener)
+##        self.roboListener = robotsListener(self)
+##        self.root.addFrameListener(self.roboListener)
+##        self.fL = RenderToTextureFrameListener(self.renderWindow, self.camera,
+##                                                           self.mReflectCam, self.mPlaneNode)
+##        self.root.addFrameListener(self.fL)
+##        
+##        self.visuals = VisualsListener(self)
+##        self.root.addFrameListener(self.visuals)
+##        
+##        self.sounds = soundListener()
+##        self.root.addFrameListener(self.sounds)
+
+        
+    def setTextureManual(self, texture, width, height, dataArray): 
+        # Get the pixel buffer 
+        pixelBuffer = texture.getBuffer() 
+        # Lock the pixel buffer and get a pixel box 
+        pointer = pixelBuffer.lock(0,width*height,ogre.HardwareBuffer.HBL_NORMAL) 
+        #number 4 here is use to accommodate the bytes for r, g, b, a may vary with different pixel formats 
+        storageclass = ctypes.c_uint8 * (width*height*4) 
+        cbuffer=storageclass.from_address(ogre.CastInt(pointer))
+        cbuffer[:] = dataArray[:]
+        # Unlock the pixel buffer 
+        pixelBuffer.unlock()
+        
+class Robot:
+    def __init__(self, app):
+        self.app = app
+        self.speed = 5.0
+        self.decisionTime = 5.0 + random.randint(2, 10)
+        self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
+        self.mustRotate = True
+        
+    def spawn(self, position, numActors):
+        self.timer = 0.0
+        self.ent = self.app.sceneManager.createEntity("robot_" + str(numActors), "robot.mesh")
+        self.posNode = self.app.sceneManager.getRootSceneNode().createChildSceneNode()
+        self.rotNode = self.posNode.createChildSceneNode()
+        self.posNode.setScale(ogre.Vector3(0.1, 0.1, 0.1))
+        self.rotNode.attachObject(self.ent)
+        self.posNode.setPosition(position)
+        self.rotNode.yaw(ogre.Degree(90))
+        #print self.posNode.position
+        self.animation = self.ent.getAnimationState('Walk')
+        self.animation.Enabled = True
+
+    def addTime(self, time):
+        self.animation.addTime(time)
+        #print self.Node.position
+        self.timer += time
+        if self.timer >= self.decisionTime:
+            self.timer = 0
+            self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
+            self.direction.normalise()
+            self.mustRotate = True
+            self.posNode.setDirection(self.direction.x, 0, self.direction.y, self.posNode.TS_WORLD)
+            print self.posNode.position
+        if self.mustRotate:
+            pass
+                
+        pos = self.posNode.position
+        off = self.direction * (self.speed * time)
+        self.posNode.setPosition(pos.x + off.x, pos.y, pos.z + off.y)
+        
+        
+class Whale:
+    def __init__(self, app):
+        self.app = app
+        self.speed = 8.0
+        self.decisionTime = 10.0 + random.randint(2, 10)
+        self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
+        self.mustRotate = True
+        
+    def spawn(self, position, numActors):
+        self.timer = 0.0
+        self.ent = self.app.sceneManager.createEntity("whale_" + str(numActors), "whale.mesh")
+        self.posNode = self.app.sceneManager.getRootSceneNode().createChildSceneNode()
+        self.rotNode = self.posNode.createChildSceneNode()
+        scal = random.uniform(2.0, 5.0)
+        self.posNode.setScale(ogre.Vector3(scal, scal, scal))
+        self.rotNode.attachObject(self.ent)
+        self.posNode.setPosition(position)
+        self.rotNode.yaw(ogre.Degree(90))
+        #print self.posNode.position
+        self.animation = self.ent.getAnimationState('Swim')
+        self.animation.Enabled = True
+
+    def addTime(self, time):
+        self.animation.addTime(time)
+        #print self.Node.position
+        self.timer += time
+        if self.timer >= self.decisionTime:
+            self.timer = 0
+            self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
+            self.direction.normalise()
+            self.mustRotate = True
+            self.posNode.setDirection(self.direction.x, 0, self.direction.y, self.posNode.TS_WORLD)
+            print self.posNode.position
+        if self.mustRotate:
+            pass
+                
+        pos = self.posNode.position
+        off = self.direction * (self.speed * time)
+        self.posNode.setPosition(pos.x + off.x, pos.y, pos.z + off.y)
+        
+        
+        
+##class robotsListener(ogre.FrameListener):
+##    def __init__(self, app):
+##        ogre.FrameListener.__init__(self)
+##        self.app = app
+##        self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
+##                                                            ogre.Vector3.NEGATIVE_UNIT_Y))
+##        self.Ray = ogre.Ray()
+##
+##        
+##    def frameStarted(self, frameEvent):
+##        for r in self.app.robots:
+##            r.addTime(frameEvent.timeSinceLastFrame)
+##            self.Ray.setOrigin(r.posNode.position)
+##            self.Ray.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+##            self.raySceneQuery.Ray = self.Ray
+##            for queryResult in self.raySceneQuery.execute():
+##                if queryResult.worldFragment is not None:
+##                    pos = r.posNode.position
+##                    r.posNode.setPosition(pos.x, pos.y - queryResult.distance + 0.6, pos.z)
+##                    break
+##        for whale in self.app.whales:        
+##            whale.addTime(frameEvent.timeSinceLastFrame)
+##        return True
+##        #return ogre.FrameListener.frameStarted(self, frameEvent)
+    
+
+    
+class GrassFrameListener(sf.FrameListener):#, ogre.RaySceneQueryListener):
+    def __init__(self, app):
+        print "Making FrameListener"
+        sf.FrameListener.__init__(self, app.renderWindow, app.camera)
+        #ogre.RaySceneQueryListener.__init__(self)
+        self.app = app
+##        self.sceneManager = app.sceneManager
+        self.timeSince = 0.0
+        self.timeTillNextUpdate = 0
+        self.moveSpeed = 40.0
+        self.updateToggle = True
+        self.getLeafMaterialParams()
+        self.camera = app.camera
+        self.mReflectCam = app.mReflectCam       
+        self.planeNode = app.mPlaneNode
+        self.curFogSettings = [ app.sceneManager.getFogStart(),
+                                app.sceneManager.getFogEnd(),
+                                app.sceneManager.getFogDensity(),
+                                app.sceneManager.getFogColour()
+                                ]
+        self.nextFogSettings = []
+        self.transitionTime = 0.0
+        self.timer = 0.0
+        self.tree_timer = 0.0
+        # use this to tweak the persons position
+        self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
+                                                                    ogre.Vector3.NEGATIVE_UNIT_Y))
+        
+        self.Ray = ogre.Ray()
+
+
+    def getLeafMaterialParams(self):
+        self.mActiveMaterial = ogre.MaterialManager.getSingleton().getByName("LOTTreeLeavesNoBones")
+        self.mActivePass = self.mActiveMaterial.getTechnique(0).getPass(0)
+        self.mActiveVertexProgram = self.mActivePass.getVertexProgram()
+        self.mActiveVertexParameters = self.mActivePass.getVertexProgramParameters()
+        
+    def queryResult(self, fragment,  distance):
+        self.resultDistance = distance
+        return False
+
+        
+    def frameStarted(self, frameEvent):
+        self.timeTillNextUpdate -= frameEvent.timeSinceLastFrame
+        if (self.timeTillNextUpdate<= 0):
+            if (self.Keyboard.isKeyDown (ois.KC_SPACE)):
+                self.timeTillNextUpdate = 3
+                self.doHarvesting()
+
+        self.tree_timer += frameEvent.timeSinceLastFrame
+        if self.tree_timer >= TREE_FPS:
+            self.app.trees.update()
+            self.app.grass.update()
+            self.tree_timer = 0.0
+            
+            
+        self.app.grassLoader.updateAnimation()
+        self.timeSince = frameEvent.timeSinceLastFrame
+        updateRay = ogre.Ray()
+        updateRay.setOrigin (self.camera.getPosition() + ogre.Vector3(0.0, 10.0, 0.0))
+        updateRay.setDirection (ogre.Vector3.NEGATIVE_UNIT_Y)
+        self.raySceneQuery.Ray = updateRay
+        pos = self.camera.getPosition()
+        th = self.app.getTerrainHeight(pos.x, pos.z)
+        self.camera.setPosition(pos.x, th+18.0, pos.z)
+
+##        for queryResult in self.raySceneQuery.execute():
+##            if queryResult.worldFragment is not None:
+##                pos = self.camera.getPosition()
+##                self.camera.setPosition (pos.x, pos.y - queryResult.distance + 18.0, pos.z)
+##                break
+
+        self.mReflectCam.setOrientation ( self.camera.getOrientation() )
+        self.mReflectCam.setPosition (self.camera.getPosition())
+
+        if self.camera.getPosition().y < WATER_LEVEL:
+            self.app.sceneManager.setFog(ogre.FOG_LINEAR, ogre.ColourValue(0.0,0.0,0.1),
+                                       0.001, 2, 50)
+        else:
+            self.app.sceneManager.setFog(ogre.FOG_LINEAR, self.app.caelumSystem.getSun().getSunLightColour(),
+                                       0.001, 1000, 2500)
+        
+        ## Robotos
+        
+        for r in self.app.robots:
+            r.addTime(frameEvent.timeSinceLastFrame)
+            pos = r.posNode.getPosition()
+            th = self.app.getTerrainHeight(pos.x, pos.z)
+            r.posNode.setPosition(pos.x, th, pos.z)
+            
+        for whale in self.app.whales:        
+            whale.addTime(frameEvent.timeSinceLastFrame)
+
+
+        # Caelum Sunlight Ting
+##        greyVal = int(255 * self.app.caelumSystem.getSun().getSunLightColour().r)
+##        colArray = [greyVal, greyVal, greyVal, 255] * 16 * 16
+##        self.app.setTextureManual(self.app.mTex, 16,16, colArray)
+        # self.app.treeLoader.setColorMap( self.app.mTex )
+
+        # ------------------------------------- SPECIAL LEAF MESH STUFF ------------------------------------ #
+        
+        # Get PreRotated Quad Thingy for leaf meshes..
+##        vCenter = ogre.Vector3( 0.0, 0.0, 0.0 ) 
+##        forward = self.app.camera.getDerivedDirection()
+##        vRight = forward.crossProduct(ogre.Vector3.UNIT_Y) 
+##        vUp = self.app.camera.getUp()
+##        vRight.normalise() 
+##        vUp.normalise()
+##
+##        vPoint0 = vCenter + (-vRight - vUp) 
+##        vPoint1 = vCenter + ( vRight - vUp) 
+##        vPoint2 = vCenter + ( vRight + vUp) 
+##        vPoint3 = vCenter + (-vRight + vUp) 
+
+        #single prerotated quad oriented towards the camera 
+##        preRotatedQuad = ogre.Matrix4(
+##                   vPoint0.x, vPoint0.y, vPoint0.z, 0.0,
+##                   vPoint1.x, vPoint1.y, vPoint1.z, 0.0,
+##                   vPoint2.x, vPoint2.y, vPoint2.z, 0.0,
+##                   vPoint3.x, vPoint3.y, vPoint3.z, 0.0
+##                   )
+##
+##        self.mActiveVertexParameters.setNamedConstant("preRotatedQuad[0]", preRotatedQuad, 16) 
+
+##        FloatArray16 = ctypes.c_float * 16 
+##        preRotatedQuad = FloatArray16( 
+##                vPoint0.x, vPoint0.y, vPoint0.z, 0.0, 
+##                vPoint1.x, vPoint1.y, vPoint1.z, 0.0, 
+##                vPoint2.x, vPoint2.y, vPoint2.z, 0.0, 
+##                vPoint3.x, vPoint3.y, vPoint3.z, 0.0 
+##                ) 
+##        #self.mActiveVertexParameters.setNamedConstant("preRotatedQuad[0]", ctypes.addressof(preRotatedQuad), 16)
+##        self.mActiveVertexParameters.setNamedConstant("preRotatedQuad[0]", preRotatedQuad, 16)
+        # ------------------------------------- SPECIAL LEAF MESH STUFF ------------------------------------ #
+        
+        return sf.FrameListener.frameStarted(self, frameEvent)
+    
+    def doHarvesting(self):
+        print 'Harvesting;'
+##        pos = self.app.camera.getPosition()
+##        pos = str((pos.x, pos.y, pos.z)) 
+##        self.app.socket.send ( pos )
+##        incomming = self.app.socket.recv ( 256 )
+##        print "Received:", incomming
+##        self.app.debugText = 'You Found a ' + incomming
+##        self.showDebugOverlay(True)
+
+    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)
+
+
+class myRaySceneQueryListener ( ogre.RaySceneQueryListener ):
+    def queryResult(self, fragment,  distance):
+        self.resultDistance = distance
+        return False
+
+##class RenderToTextureFrameListener(ogre.FrameListener):
+##
+##    def __init__(self, renderWindow, camera, mReflectCam , planeSceneNode):
+##    
+##        ogre.FrameListener.__init__(self)
+##        self.camera = camera
+##        self.mReflectCam = mReflectCam       
+##        self.planeNode = planeSceneNode
+##
+##    def frameStarted(self, frameEvent):
+##        #result = sf.FrameListener.frameStarted(self,frameEvent)
+##        #if not result: return result
+##        # Make sure reflection camera is updated too
+##        self.mReflectCam.setOrientation ( self.camera.getOrientation() )
+##        self.mReflectCam.setPosition (self.camera.getPosition())
+##        # Rotate plane
+####        dd = ogre.Degree(d=(30.0 * frameEvent.timeSinceLastFrame))
+####        self.planeNode.yaw(dd, ogre.Node.TS_PARENT)
+##        
+##        return True
+    
+    
+##class VisualsListener(ogre.FrameListener):
+##    def __init__(self, app):
+##        ogre.FrameListener.__init__(self)
+##        self.app = app
+##        self.camera = app.camera
+##        self.curFogSettings = [ app.sceneManager.getFogStart(),
+##                                app.sceneManager.getFogEnd(),
+##                                app.sceneManager.getFogDensity(),
+##                                app.sceneManager.getFogColour()
+##                                ]
+##        self.nextFogSettings = []
+##        self.transitionTime = 0.0
+##        self.timer = 0.0
+##        
+##    def setNextFog(self, time, fogStart, fogEnd, fogDens, FogColour):
+##        self.transitionTime = time
+##        self.nextFogSettings = [ fogStart, fogEnd, fogDens, FogColour ]
+##        self.timer = 0.0
+##        
+##    def frameStarted(self, frameEvent):
+##        if self.camera.getPosition().y < WATER_LEVEL:
+##            self.app.sceneManager.setFog(ogre.FOG_LINEAR, ogre.ColourValue(0.0,0.0,0.1),
+##                                       0.001, 2, 50)
+##        else:
+##            self.app.sceneManager.setFog(ogre.FOG_LINEAR, self.app.caelumSystem.getSun().getSunLightColour(),
+##                                       0.001, 1000, 2500)
+##                                    
+##        #print self.app.camera.getPosition()
+##        return True
+                                        
+##        if self.timer < self.transitionTime:
+##            # if nothing is happening they both equal 0
+##            self.timer += frameEvent.timeSinceLastFrame
+##            
+##            if self.timer >= self.transitionTime:
+##                self.timer = 0.0
+##                self.transitionTime = 0.0
+##            else:
+##                pc = float(self.timer / self.transitionTime)
+##                print pc
+##                self.app.sceneManager.setFog(ogre.FOG_LINEAR, self.nextFogSettings[3] * pc,
+##                                                self.nextFogSettings[2] * pc,
+##                                                self.nextFogSettings[0] * pc,
+##                                                self.nextFogSettings[1] * pc)
+
+                
+class soundListener(ogre.FrameListener):
+    def __init__(self):
+        ogre.FrameListener.__init__(self)
+
+
+        self.sched = plib.slScheduler ( 8000 ) 
+        self.mixer = plib.smMixer ( "/dev/mixer" ) 
+
+        self.mixer.setMasterVolume ( 20 )
+        self.sched.setSafetyMargin ( 0.128 )
+
+        self.s1 = plib.slSample ( 'forest_day.wav', self.sched )
+
+
+        #   s1.adjustVolume ( 10.0 )
+        #print dir(sched)
+        self.sched.loopSample ( self.s1 )
+
+    def frameStarted(self, event):
+        self.sched.update ()
+        return True
+          
+
+if __name__ == '__main__':
+    try:
+        application = ForestApplication()
+        application.go()
+    except ogre.OgreException, e:
+        print e


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [501] trunk/python-ogre/demos/showcase_01

From: <bha...@us...> - 2007-12-17 18:02:28

Revision: 501
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=501&view=rev
Author:   bharling
Date:     2007-12-17 10:02:30 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
Updated to the latest version of the showcase demo. 

A little speed improvement.

-bharling

Added Paths:
-----------
    trunk/python-ogre/demos/showcase_01/media/
    trunk/python-ogre/demos/showcase_01/media/Characters/
    trunk/python-ogre/demos/showcase_01/media/Characters/OgreXMLConverter.log
    trunk/python-ogre/demos/showcase_01/media/Characters/Thumbs.db
    trunk/python-ogre/demos/showcase_01/media/Characters/Whale-whalebone.skeleton
    trunk/python-ogre/demos/showcase_01/media/Characters/Whale-whalebone.skeleton.xml
    trunk/python-ogre/demos/showcase_01/media/Characters/Whale.jpg
    trunk/python-ogre/demos/showcase_01/media/Characters/Whale.material
    trunk/python-ogre/demos/showcase_01/media/Characters/Whale.mesh
    trunk/python-ogre/demos/showcase_01/media/Characters/Whale.mesh.xml
    trunk/python-ogre/demos/showcase_01/media/Characters/meshmagick.log
    trunk/python-ogre/demos/showcase_01/media/PSSM/
    trunk/python-ogre/demos/showcase_01/media/PSSM/PSSM.material
    trunk/python-ogre/demos/showcase_01/media/SkyManager/
    trunk/python-ogre/demos/showcase_01/media/SkyManager/Thumbs.db
    trunk/python-ogre/demos/showcase_01/media/SkyManager/daycloud.png
    trunk/python-ogre/demos/showcase_01/media/SkyManager/nightcloud.png
    trunk/python-ogre/demos/showcase_01/media/SkyManager/nightcloud2.png
    trunk/python-ogre/demos/showcase_01/media/SkyManager/sky.material
    trunk/python-ogre/demos/showcase_01/media/SkyManager/skydomePS1_4.cg
    trunk/python-ogre/demos/showcase_01/media/SkyManager/skydomeVS1_1.cg
    trunk/python-ogre/demos/showcase_01/media/SkyManager/starFlare.png
    trunk/python-ogre/demos/showcase_01/media/Triplanar/
    trunk/python-ogre/demos/showcase_01/media/Triplanar/New Text Document.txt
    trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.bak
    trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.cg.old
    trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material
    trunk/python-ogre/demos/showcase_01/media/Triplanar/OverhangTerrainSceneManager.material.bak
    trunk/python-ogre/demos/showcase_01/media/Triplanar/TerrainShadows.cg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/TerrainShadows.cg.bak
    trunk/python-ogre/demos/showcase_01/media/Triplanar/Thumbs.db
    trunk/python-ogre/demos/showcase_01/media/Triplanar/fp0.frag
    trunk/python-ogre/demos/showcase_01/media/Triplanar/grass_1024.jpg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/normal_terrain.png
    trunk/python-ogre/demos/showcase_01/media/Triplanar/overhang.cg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/reliefmap.cg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/sand.jpg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/tangent_map.py
    trunk/python-ogre/demos/showcase_01/media/Triplanar/tangent_map.py.bak
    trunk/python-ogre/demos/showcase_01/media/Triplanar/tangentmap.png
    trunk/python-ogre/demos/showcase_01/media/Triplanar/terr_rock6.jpg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain.cfg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain.png
    trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain_dds.png
    trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain_detail.jpg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/terrain_texture.jpg
    trunk/python-ogre/demos/showcase_01/media/Triplanar/vp0.vert
    trunk/python-ogre/demos/showcase_01/media/Triplanar.zip
    trunk/python-ogre/demos/showcase_01/media/grass/
    trunk/python-ogre/demos/showcase_01/media/grass/BdBush.material
    trunk/python-ogre/demos/showcase_01/media/grass/BigDarkBush.mesh
    trunk/python-ogre/demos/showcase_01/media/grass/ShortGrass.mesh
    trunk/python-ogre/demos/showcase_01/media/grass/Thumbs.db
    trunk/python-ogre/demos/showcase_01/media/grass/bush3_IMG_1409.png
    trunk/python-ogre/demos/showcase_01/media/grass/bush3_IMG_1409.tga.bmp
    trunk/python-ogre/demos/showcase_01/media/grass/fgrass1_v2_256.png
    trunk/python-ogre/demos/showcase_01/media/grass/grass.material
    trunk/python-ogre/demos/showcase_01/media/grass/grass.png
    trunk/python-ogre/demos/showcase_01/media/grass/grass1.material
    trunk/python-ogre/demos/showcase_01/media/grass/grass1_SKIN#02.bmp
    trunk/python-ogre/demos/showcase_01/media/grass/grass2.png
    trunk/python-ogre/demos/showcase_01/media/grass/grass2_grass2.BMP.bmp
    trunk/python-ogre/demos/showcase_01/media/grass/grass3_SKIN#22.bmp
    trunk/python-ogre/demos/showcase_01/media/grass/grass4_SKIN#32.bmp
    trunk/python-ogre/demos/showcase_01/media/grass/grass5_SKIN#33.bmp
    trunk/python-ogre/demos/showcase_01/media/grass/grass6_SKIN#41.bmp
    trunk/python-ogre/demos/showcase_01/media/grass/meshmagick.log
    trunk/python-ogre/demos/showcase_01/media/grass/shortgrass.material
    trunk/python-ogre/demos/showcase_01/media/grass/tall_grass.png
    trunk/python-ogre/demos/showcase_01/media/perPixel/
    trunk/python-ogre/demos/showcase_01/media/perPixel/ARNOLD.cg
    trunk/python-ogre/demos/showcase_01/media/perPixel/New Folder/
    trunk/python-ogre/demos/showcase_01/media/perPixel/New Folder (2)/
    trunk/python-ogre/demos/showcase_01/media/perPixel/perpixel.material
    trunk/python-ogre/demos/showcase_01/media/perPixel/plane.material
    trunk/python-ogre/demos/showcase_01/media/perPixel/plane.mesh
    trunk/python-ogre/demos/showcase_01/media/sounds/
    trunk/python-ogre/demos/showcase_01/media/terrains/
    trunk/python-ogre/demos/showcase_01/media/terrains/Thumbs.db
    trunk/python-ogre/demos/showcase_01/media/terrains/densitymap.png
    trunk/python-ogre/demos/showcase_01/media/terrains/terrain.cfg
    trunk/python-ogre/demos/showcase_01/media/terrains/terrain.png
    trunk/python-ogre/demos/showcase_01/media/terrains/terrain_detail.jpg
    trunk/python-ogre/demos/showcase_01/media/terrains/terrain_grass.jpg
    trunk/python-ogre/demos/showcase_01/media/terrains/terrain_texture_greeb.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/
    trunk/python-ogre/demos/showcase_01/media/trees/Bark1.tga
    trunk/python-ogre/demos/showcase_01/media/trees/BendyPalm.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/Branch1.tga
    trunk/python-ogre/demos/showcase_01/media/trees/CloudyNoonSkyBox.material
    trunk/python-ogre/demos/showcase_01/media/trees/KinkyPalm.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/LEAFS.JPG
    trunk/python-ogre/demos/showcase_01/media/trees/LEAFS.png
    trunk/python-ogre/demos/showcase_01/media/trees/LOTTreeLeaves.cg
    trunk/python-ogre/demos/showcase_01/media/trees/LOTTreeLeaves.material
    trunk/python-ogre/demos/showcase_01/media/trees/LOTTreeTrunk.material
    trunk/python-ogre/demos/showcase_01/media/trees/Leaf1.tga
    trunk/python-ogre/demos/showcase_01/media/trees/Leaves.png
    trunk/python-ogre/demos/showcase_01/media/trees/Materials.material
    trunk/python-ogre/demos/showcase_01/media/trees/OgreMeshUpgrade.log
    trunk/python-ogre/demos/showcase_01/media/trees/OgreXMLConverter.log
    trunk/python-ogre/demos/showcase_01/media/trees/PLANTS09.JPG
    trunk/python-ogre/demos/showcase_01/media/trees/Pine.material
    trunk/python-ogre/demos/showcase_01/media/trees/Pine.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/Pine1.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/PineLeaves.png
    trunk/python-ogre/demos/showcase_01/media/trees/StraightPalm.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/TREE00.JPG
    trunk/python-ogre/demos/showcase_01/media/trees/Thumbs.db
    trunk/python-ogre/demos/showcase_01/media/trees/TreeNew.material
    trunk/python-ogre/demos/showcase_01/media/trees/bark23.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/beech.material
    trunk/python-ogre/demos/showcase_01/media/trees/beech_tree.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/benTree.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/birch.material
    trunk/python-ogre/demos/showcase_01/media/trees/birch.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/blenTree.material
    trunk/python-ogre/demos/showcase_01/media/trees/blue_shroom.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/blue_shroom.jpg.tga
    trunk/python-ogre/demos/showcase_01/media/trees/blue_shroom.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/boulder.material
    trunk/python-ogre/demos/showcase_01/media/trees/boulder.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/boulder.mesh.xml
    trunk/python-ogre/demos/showcase_01/media/trees/boulder2.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/boulder2.mesh.xml
    trunk/python-ogre/demos/showcase_01/media/trees/branches.png
    trunk/python-ogre/demos/showcase_01/media/trees/cloudy_noon_BK.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/cloudy_noon_DN.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/cloudy_noon_FR.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/cloudy_noon_LF.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/cloudy_noon_RT.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/cloudy_noon_UP.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/grid.png
    trunk/python-ogre/demos/showcase_01/media/trees/leaves.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/leaves1.png
    trunk/python-ogre/demos/showcase_01/media/trees/leaves4.png
    trunk/python-ogre/demos/showcase_01/media/trees/leaves5.png
    trunk/python-ogre/demos/showcase_01/media/trees/lotTree.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/meshmagick.log
    trunk/python-ogre/demos/showcase_01/media/trees/mrbenTree.blend
    trunk/python-ogre/demos/showcase_01/media/trees/mrbenTree.blend1
    trunk/python-ogre/demos/showcase_01/media/trees/newTree.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/palms.material
    trunk/python-ogre/demos/showcase_01/media/trees/palmtree_palmtexture_2.t.bmp
    trunk/python-ogre/demos/showcase_01/media/trees/readme.txt
    trunk/python-ogre/demos/showcase_01/media/trees/shaders.cg
    trunk/python-ogre/demos/showcase_01/media/trees/shrooms.blend
    trunk/python-ogre/demos/showcase_01/media/trees/shrooms.blend1
    trunk/python-ogre/demos/showcase_01/media/trees/spotted_shroom.material
    trunk/python-ogre/demos/showcase_01/media/trees/spotty_shroom.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/spotty_shroom.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/tipi.blend
    trunk/python-ogre/demos/showcase_01/media/trees/tipi.jpg
    trunk/python-ogre/demos/showcase_01/media/trees/tipi.material
    trunk/python-ogre/demos/showcase_01/media/trees/tipi.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/tree.blend
    trunk/python-ogre/demos/showcase_01/media/trees/tree.blend1
    trunk/python-ogre/demos/showcase_01/media/trees/tree.material
    trunk/python-ogre/demos/showcase_01/media/trees/tree.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/tree2.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/tree_01 - Default.mesh
    trunk/python-ogre/demos/showcase_01/media/trees/tree_bark.png
    trunk/python-ogre/demos/showcase_01/media/trees/tree_bark_nm.png
    trunk/python-ogre/demos/showcase_01/media/trees/tree_bush.png
    trunk/python-ogre/demos/showcase_01/media/trees/wood7.jpg
    trunk/python-ogre/demos/showcase_01/media/water/
    trunk/python-ogre/demos/showcase_01/media/water/LargeNoise.png
    trunk/python-ogre/demos/showcase_01/media/water/MediumNoise.png
    trunk/python-ogre/demos/showcase_01/media/water/Ocean_rtt.material
    trunk/python-ogre/demos/showcase_01/media/water/SmallNoise.png
    trunk/python-ogre/demos/showcase_01/media/water/Thumbs.db
    trunk/python-ogre/demos/showcase_01/media/water/oceanHLSL_Cg_Rtt.frag
    trunk/python-ogre/demos/showcase_01/media/water/oceanHLSL_Cg_Rtt.vert
    trunk/python-ogre/demos/showcase_01/media/water/ocean_new.material
    trunk/python-ogre/demos/showcase_01/media/water/sea.cg

Added: trunk/python-ogre/demos/showcase_01/media/Characters/OgreXMLConverter.log
===================================================================
--- trunk/python-ogre/demos/showcase_01/media/Characters/OgreXMLConverter.log	                        (rev 0)
+++ trunk/python-ogre/demos/showcase_01/media/Characters/OgreXMLConverter.log	2007-12-17 18:02:30 UTC (rev 501)
@@ -0,0 +1,40 @@
+12:59:46: Creating resource group General
+12:59:46: Creating resource group Internal
+12:59:46: Creating resource group Autodetect
+12:59:46: Registering ResourceManager for type Mesh
+12:59:46: Registering ResourceManager for type Material
+12:59:46: Registering ResourceManager for type Skeleton
+12:59:47: XMLMeshSerializer reading mesh data from C:\PythonOgre\demos\ogreforests\media\Characters\Whale.mesh.xml...
+12:59:47: Reading submeshes...
+12:59:47: Reading geometry...
+12:59:48: Geometry done...
+12:59:48: Reading bone assignments...
+12:59:48: Bone assignments done.
+12:59:48: Submeshes done.
+12:59:48: Skeleton: Loading Whale-whalebone.skeleton
+12:59:48: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource Whale-whalebone.skeleton in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 603)
+12:59:48: Unable to load skeleton Whale-whalebone.skeleton for Mesh conversion. This Mesh will not be animated. You can ignore this message if you are using an offline tool.
+12:59:49: XMLMeshSerializer import successful.
+12:59:49: Reorganising vertex buffers to automatic layout..
+12:59:49: MeshSerializer writing mesh data to C:\PythonOgre\demos\ogreforests\media\Characters\Whale.mesh...
+12:59:49: File header written.
+12:59:49: Writing mesh data...
+12:59:49: Writing submesh...
+12:59:49: Exporting submesh texture aliases...
+12:59:49: Submesh texture aliases exported.
+12:59:49: Exporting dedicated geometry bone assignments...
+12:59:49: Dedicated geometry bone assignments exported.
+12:59:49: Submesh exported.
+12:59:49: Exporting skeleton link...
+12:59:49: Skeleton link exported.
+12:59:49: Exporting bounds information....
+12:59:49: Bounds information exported.
+12:59:49: Exporting submesh name table...
+12:59:49: Submesh name table exported.
+12:59:49: Exporting edge lists...
+12:59:49: Edge lists exported
+12:59:49: Mesh data exported.
+12:59:49: MeshSerializer export successful.
+12:59:49: Unregistering ResourceManager for type Skeleton
+12:59:49: Unregistering ResourceManager for type Material
+12:59:49: Unregistering ResourceManager for type Mesh

Added: trunk/python-ogre/demos/showcase_01/media/Characters/Thumbs.db
===================================================================
(Binary files differ)


Property changes on: trunk/python-ogre/demos/showcase_01/media/Characters/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/python-ogre/demos/showcase_01/media/Characters/Whale-whalebone.skeleton
===================================================================
(Binary files differ)


Property changes on: trunk/python-ogre/demos/showcase_01/media/Characters/Whale-whalebone.skeleton
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/python-ogre/demos/showcase_01/media/Characters/Whale-whalebone.skeleton.xml
===================================================================
--- trunk/python-ogre/demos/showcase_01/media/Characters/Whale-whalebone.skeleton.xml	                        (rev 0)
+++ trunk/python-ogre/demos/showcase_01/media/Characters/Whale-whalebone.skeleton.xml	2007-12-17 18:02:30 UTC (rev 501)
@@ -0,0 +1,16589 @@
+<skeleton>
+	<bones>
+		<bone id="16" name="Bone">
+			<position x="0.084931" y="11.507857" z="1.426712"/>
+			<rotation angle="3.046224">
+				<axis x="1.000000" y="0.000000" z="-0.000000"/>
+			</rotation>
+		</bone>
+		<bone id="11" name="Bone.001">
+			<position x="-0.000000" y="3.087533" z="0.000000"/>
+			<rotation angle="0.609904">
+				<axis x="0.253312" y="-0.966285" z="-0.046112"/>
+			</rotation>
+		</bone>
+		<bone id="12" name="Bone.002">
+			<position x="0.000000" y="2.519525" z="-0.000000"/>
+			<rotation angle="0.612070">
+				<axis x="-0.265676" y="0.962766" z="0.049979"/>
+			</rotation>
+		</bone>
+		<bone id="2" name="Bone.017">
+			<position x="-0.000000" y="2.484534" z="-0.000000"/>
+			<rotation angle="1.689754">
+				<axis x="0.999995" y="-0.003061" z="-0.000161"/>
+			</rotation>
+		</bone>
+		<bone id="6" name="Bone.009">
+			<position x="-0.000000" y="2.484534" z="-0.000000"/>
+			<rotation angle="2.611115">
+				<axis x="0.753921" y="-0.656082" z="-0.034060"/>
+			</rotation>
+		</bone>
+		<bone id="5" name="Bone.008">
+			<position x="-0.000000" y="2.484534" z="-0.000000"/>
+			<rotation angle="2.586684">
+				<axis x="0.754074" y="0.655906" z="0.034047"/>
+			</rotation>
+		</bone>
+		<bone id="13" name="Bone.003">
+			<position x="-0.000000" y="2.484534" z="-0.000000"/>
+			<rotation angle="3.141593">
+				<axis x="0.005923" y="-0.994758" z="-0.102082"/>
+			</rotation>
+		</bone>
+		<bone id="10" name="Bone.013">
+			<position x="0.000001" y="2.753625" z="-0.000000"/>
+			<rotation angle="0.613797">
+				<axis x="-0.772222" y="0.562855" z="0.294732"/>
+			</rotation>
+		</bone>
+		<bone id="0" name="Bone.010">
+			<position x="0.000000" y="2.827932" z="-0.000000"/>
+			<rotation angle="0.545135">
+				<axis x="-0.775067" y="-0.586857" z="-0.234243"/>
+			</rotation>
+		</bone>
+		<bone id="9" name="Bone.012">
+			<position x="-0.000000" y="3.750328" z="-0.000000"/>
+			<rotation angle="3.116856">
+				<axis x="-0.004177" y="0.702577" z="-0.711596"/>
+			</rotation>
+		</bone>
+		<bone id="14" name="Bone.004">
+			<position x="-0.000000" y="3.750328" z="-0.000000"/>
+			<rotation angle="2.474775">
+				<axis x="-0.005945" y="0.998682" z="0.050984"/>
+			</rotation>
+		</bone>
+		<bone id="3" name="Bone.014">
+			<position x="-0.000000" y="4.277715" z="-0.000000"/>
+			<rotation angle="0.144436">
+				<axis x="-0.754092" y="0.212077" z="0.621585"/>
+			</rotation>
+		</bone>
+		<bone id="1" name="Bone.011">
+			<position x="0.000000" y="3.592659" z="-0.000000"/>
+			<rotation angle="0.244558">
+				<axis x="-0.687540" y="-0.031046" z="-0.725483"/>
+			</rotation>
+		</bone>
+		<bone id="15" name="Bone.005">
+			<position x="-0.000000" y="2.948473" z="-0.000000"/>
+			<rotation angle="0.820266">
+				<axis x="0.133525" y="-0.986514" z="-0.094668"/>
+			</rotation>
+		</bone>
+		<bone id="7" name="Bone.006">
+			<position x="0.000000" y="2.460120" z="-0.000000"/>
+			<rotation angle="0.664106">
+				<axis x="-0.068243" y="-0.993660" z="0.089349"/>
+			</rotation>
+		</bone>
+		<bone id="17" name="Bone.007">
+			<position x="-0.000000" y="2.254438" z="0.000000"/>
+			<rotation angle="1.940100">
+				<axis x="0.050227" y="0.997144" z="-0.056399"/>
+			</rotation>
+		</bone>
+		<bone id="4" name="Bone.016">
+			<position x="0.000000" y="2.170027" z="0.000000"/>
+			<rotation angle="2.915909">
+				<axis x="0.597592" y="-0.801569" z="-0.019239"/>
+			</rotation>
+		</bone>
+		<bone id="8" name="Bone.015">
+			<position x="0.000000" y="2.170027" z="0.000000"/>
+			<rotation angle="3.060831">
+				<axis x="-0.598840" y="-0.794411" z="0.101498"/>
+			</rotation>
+		</bone>
+	</bones>
+	<bonehierarchy>
+		<boneparent bone="Bone.001" parent="Bone" />
+		<boneparent bone="Bone.002" parent="Bone.001" />
+		<boneparent bone="Bone.017" parent="Bone.002" />
+		<boneparent bone="Bone.009" parent="Bone.002" />
+		<boneparent bone="Bone.008" parent="Bone.002" />
+		<boneparent bone="Bone.003" parent="Bone.002" />
+		<boneparent bone="Bone.013" parent="Bone.009" />
+		<boneparent bone="Bone.010" parent="Bone.008" />
+		<boneparent bone="Bone.012" parent="Bone.003" />
+		<boneparent bone="Bone.004" parent="Bone.003" />
+		<boneparent bone="Bone.014" parent="Bone.013" />
+		<boneparent bone="Bone.011" parent="Bone.010" />
+		<boneparent bone="Bone.005" parent="Bone.004" />
+		<boneparent bone="Bone.006" parent="Bone.005" />
+		<boneparent bone="Bone.007" parent="Bone.006" />
+		<boneparent bone="Bone.016" parent="Bone.007" />
+		<boneparent bone="Bone.015" parent="Bone.007" />
+	</bonehierarchy>
+	<animations>
+		<animation name="Swim" length="5.160000">
+			<tracks>
+				<track bone="Bone">
+					<keyframes>
+						<keyframe time="0.000000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.000000">
+								<axis x="0.000000" y="-0.998863" z="-0.047666"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.040000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.000000">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.080000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.001196">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.120000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.002584">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.160000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.004683">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.200000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.007308">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.240000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.010518">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.280000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.014236">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.320000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.018477">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.360000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.023161">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.400000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.028245">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.440000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.033639">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.480000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.039270">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.520000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.045045">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.560000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.050867">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.600000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.056643">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.640000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.062273">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.680000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.067672">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.720000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.072750">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.760000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.077434">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.800000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.081670">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.840000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.085407">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.880000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.088603">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.920000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.091237">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.960000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.093289">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.000000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.094753">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.040000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.095630">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.080000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.095919">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.120000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.094005">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.160000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.088209">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.200000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.078562">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.240000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.065261">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.280000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.048722">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.320000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.029605">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.360000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.008843">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.400000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.012525">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.440000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.033297">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.480000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.052409">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.520000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.068946">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.560000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.082249">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.600000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.091896">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.640000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.097690">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.680000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.099608">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.720000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.098848">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.760000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.096548">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.800000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.092712">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.840000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.087389">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.880000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.080692">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.920000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.072805">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="1.960000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.063996">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.000000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.054602">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.040000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.045008">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.080000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.035608">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.120000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.026798">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.160000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.018911">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.200000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.012217">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.240000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.006905">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.280000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.003088">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.320000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.000691">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.360000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.000000">
+								<axis x="1.000000" y="0.000000" z="-0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.400000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.000000">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.440000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.000691">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.480000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.001196">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.520000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.001953">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.560000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.003164">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.600000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.004528">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.640000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.006138">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.680000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.008023">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.720000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.010149">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.760000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.012506">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.800000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.015082">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.840000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.017887">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.880000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.020877">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.920000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.024060">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="2.960000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.027405">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.000000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.030897">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.040000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.034520">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.080000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.038249">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.120000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.042055">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.160000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.045915">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.200000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.049806">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.240000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.053690">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.280000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.057549">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.320000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.061355">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.360000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.065085">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.400000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.068707">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.440000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.072204">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.480000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.075551">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.520000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.078732">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.560000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.081725">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.600000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.084520">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.640000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.087099">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.680000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.089455">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.720000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.091576">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.760000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.093458">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.800000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.095090">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.840000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.096474">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.880000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.097607">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.920000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.098486">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="3.960000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.099111">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.000000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.099483">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.040000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.099608">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.080000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.099330">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.120000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.098486">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.160000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.097073">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.200000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.095090">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.240000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.092548">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.280000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.089455">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.320000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.085836">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.360000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.081725">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.400000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.077162">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.440000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.072204">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.480000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.066910">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.520000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.061355">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.560000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.055627">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.600000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.049806">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.640000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.043979">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.680000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.038249">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.720000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.032697">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.760000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.027405">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.800000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.022440">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.840000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.017887">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.880000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.013776">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.920000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.010149">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="4.960000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.007076">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="5.000000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.004528">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="5.040000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.002490">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="5.080000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.001196">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="5.120000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.000000">
+								<axis x="-1.000000" y="-0.000000" z="0.000001"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="5.160000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.000000">
+								<axis x="0.000000" y="-0.998863" z="-0.047666"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+					</keyframes>
+				</track>
+				<track bone="Bone.001">
+					<keyframes>
+						<keyframe time="0.000000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.103527">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.040000">
+							<translate x="0.000000" y="-0.000001" z="0.000000"/>
+							<rotate angle="0.103428">
+								<axis x="0.831272" y="-0.017719" z="-0.555583"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.080000">
+							<translate x="0.000000" y="0.000000" z="0.000000"/>
+							<rotate angle="0.103112">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.120000">
+							<translate x="0.000000" y="-0.000001" z="-0.000000"/>
+							<rotate angle="0.102550">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.160000">
+							<translate x="0.000000" y="-0.000001" z="-0.000000"/>
+							<rotate angle="0.101710">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.200000">
+							<translate x="0.000000" y="-0.000000" z="-0.000000"/>
+							<rotate angle="0.100556">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.240000">
+							<translate x="-0.000000" y="-0.000000" z="-0.000000"/>
+							<rotate angle="0.099053">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.280000">
+							<translate x="0.000000" y="0.000000" z="-0.000000"/>
+							<rotate angle="0.097164">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.320000">
+							<translate x="0.000000" y="0.000000" z="-0.000000"/>
+							<rotate angle="0.094851">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.360000">
+							<translate x="-0.000000" y="-0.000000" z="0.000000"/>
+							<rotate angle="0.092080">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.400000">
+							<translate x="0.000000" y="0.000000" z="-0.000000"/>
+							<rotate angle="0.088813">
+								<axis x="0.831272" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.440000">
+							<translate x="-0.000000" y="-0.000000" z="-0.000000"/>
+							<rotate angle="0.085023">
+								<axis x="0.831271" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" z="1.000000"/>
+						</keyframe>
+						<keyframe time="0.480000">
+							<translate x="0.000000" y="-0.000001" z="-0.000000"/>
+							<rotate angle="0.080689">
+								<axis x="0.831271" y="-0.017719" z="-0.555584"/>
+							</rotate>
+							<scale x="1.000000" y="1.000000" ...
 
[truncated message content]

[Python-ogre-commit] SF.net SVN: python-ogre: [500] trunk/python-ogre/demos/showcase_01

From: <bha...@us...> - 2007-12-17 17:52:58

Revision: 500
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=500&view=rev
Author:   bharling
Date:     2007-12-17 09:52:49 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
Removed file/folder

Removed Paths:
-------------
    trunk/python-ogre/demos/showcase_01/Demo_Forest.py
    trunk/python-ogre/demos/showcase_01/Demo_Forest.py.bak
    trunk/python-ogre/demos/showcase_01/Ogre.log
    trunk/python-ogre/demos/showcase_01/SampleFramework.py
    trunk/python-ogre/demos/showcase_01/media/
    trunk/python-ogre/demos/showcase_01/ogre.cfg
    trunk/python-ogre/demos/showcase_01/plugins.cfg
    trunk/python-ogre/demos/showcase_01/resources.cfg
    trunk/python-ogre/demos/showcase_01/triplanar_terrain.cfg

Deleted: trunk/python-ogre/demos/showcase_01/Demo_Forest.py
===================================================================
--- trunk/python-ogre/demos/showcase_01/Demo_Forest.py	2007-12-16 14:20:20 UTC (rev 499)
+++ trunk/python-ogre/demos/showcase_01/Demo_Forest.py	2007-12-17 17:52:49 UTC (rev 500)
@@ -1,330 +0,0 @@
-
-
-
-
-import warnings 
-warnings.simplefilter('ignore', RuntimeWarning) 
-import ogre.renderer.OGRE as ogre
-import ogre.addons.ogreforests as forests
-import SampleFramework as sf
-import math, random
-warnings.simplefilter('default', RuntimeWarning)
-
-class ForestApplication(sf.Application):
-    def _chooseSceneManager(self):
-        # self.sceneManager = self.root.createSceneManager("TerrainSceneManager")
-        self.sceneManager = self.root.createSceneManager(ogre.ST_EXTERIOR_CLOSE)
-        # self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE)
-        
-    def getTerrainHeight( self, x, z ):
-        if ( x < 0 or z < 0 or x > 1500 or z > 1500 ):  return 0
-        self.updateRay.setOrigin( ogre.Vector3(x, 0.0, z) )
-        self.updateRay.setDirection( ogre.Vector3.UNIT_Y )
-        self.raySceneQuery.setRay( self.updateRay )
-        self.raySceneQuery.execute( self.raySceneQueryListener )
-        return self.raySceneQueryListener.resultDistance
-
-    ##Loads world
-    def _createScene(self):
-        camera = self.camera
-        
-        ## Set ambient light
-        self.sceneManager.setAmbientLight((0.5, 0.5, 0.5))
-    
-        ## Create a light
-        l = self.sceneManager.createLight("MainLight")
-        l.setPosition(20,80,50)
-        ## Fog
-        ## NB it's VERY important to set this before calling setWorldGeometry 
-        ## because the vertex program picked will be different
-        ##ColourValue fadeColour(0.93, 0.86, 0.76)
-        fadeColour = (120.0/255, 173.0/255, 246.0/255)
-        self.sceneManager.setFog( ogre.FOG_LINEAR, fadeColour, .001, 200, 1000)
-        self.renderWindow.getViewport(0).setBackgroundColour(fadeColour)
-    
-        terrain_cfg = "./triplanar_terrain.cfg"
-    
-        self.sceneManager.setWorldGeometry( terrain_cfg )
-        ## Infinite far plane?
-        if self.root.getRenderSystem().getCapabilities().hasCapability(ogre.RSC_INFINITE_FAR_PLANE):
-            camera.setFarClipDistance(0)
-        ##camera.setFarClipDistance(1000)
-    
-        ## Set a nice viewpoint
-        camera.setPosition(750,100,750)
-        camera.lookAt(750, 100, 750+1)
-        ##camera.setPolygonMode(PM_WIREFRAME)
-
-        plane = ogre.Plane()
-        n = plane.normal
-        n.x, n.y, n.z = 0, -1, 0
-        plane.d = 5000
-        self.sceneManager.setSkyPlane(True, plane, 'Examples/CloudySky', 1000, 3)
-
-        #self.sceneManager.setSkyPlane(True, 'Examples/CloudySky', 5, 8)
-
-        
-        ##---- PagedGeometry test ----
-        
-        ## TREES
-        ##Initialize the PagedGeometry engine
-        self.trees = forests.PagedGeometry()
-        self.trees.setCamera( camera )
-        self.trees.setPageSize( 100 )
-        self.trees.setBounds( ogre.FloatRect(0, 0, 1500, 1500) )
-    
-        ##Set up LODs
-        ##self.trees.addDetailLevelEntityPage(50, 50)
-        self.trees.addDetailLevelBatchPage(50, 50)
-        self.trees.addDetailLevelImpostorPage(900, 50)
-    
-        ##Set up a TreeLoader for easy use
-        self.treeLoader = forests.TreeLoader2D( self.trees, ogre.FloatRect(0, 0, 1500, 1500) )
-        self.trees.setPageLoader(self.treeLoader)
-        self.treeLoader.setHeightFunction(self, "getTerrainHeight")
-    
-        ##And add 20,000 trees to the scene through the "easy-to-use" TreeLoader class
-        palm1 = self.sceneManager.createEntity("MyTree", "KinkyPalm.mesh")
-        palm2 = self.sceneManager.createEntity("pineTree", "StraightPalm.mesh")
-        palm3 = self.sceneManager.createEntity("palmBendy", "BendyPalm.mesh")
-        bush1 = self.sceneManager.createEntity("bush1", "BigDarkBush.mesh")
-        birch = self.sceneManager.createEntity("birch", "birch.mesh")
-        benTree = self.sceneManager.createEntity("benTree", "benTree.mesh")
-        spot_shroom = self.sceneManager.createEntity("redShroom", "spotty_shroom.mesh")
-        blue_shroom = self.sceneManager.createEntity("blueShroom", "blue_shroom.mesh")
-        beech = self.sceneManager.createEntity("beech", "beech_tree.mesh")
-
-        self.treeModels = [ bush1, benTree, spot_shroom, blue_shroom, beech]
-        # fix the damn rotations
-##        rotNode = self.sceneManager.getRootSceneNode().createChildSceneNode( "rotNode" )
-##        rotNode.attachObject( self.palm1 )
-##        rotNode.attachObject( self.palm2 )
-##        rotNode.attachObject( self.palm3 )
-##        rotNode.attachObject( self.bush1 )
-##        rotNode.pitch(ogre.Degree(-90).valueRadians())
-        
-        
-        
-        x=0
-        z=0
-        for i in range (10000):
-            yaw = random.randrange(0, 360)
-    
-            if (random.randrange(0, 1000) <= 800):
-                x += random.randrange(-10.0, 10.0)
-                z += random.randrange(-10.0, 10.0)
-                if (x < 0): x = 0 
-                elif (x > 1500): x = 1500
-                if (z < 0): z = 0 
-                elif (z > 1500): z = 1500
-            else:
-                x = random.randrange(0, 1500)
-                z = random.randrange(0, 1500)
-            
-            scale = random.randrange(9, 20) / 10
-
-            t_type = random.randrange(0, len(self.treeModels))
-            self.treeLoader.addTree(self.treeModels[t_type], ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-
-##            if t_type == 0:
-##                self.treeLoader.addTree(self.palm1, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-##            elif t_type == 1:
-##                self.treeLoader.addTree(self.palm2, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-##            elif t_type == 2:
-##                self.treeLoader.addTree(self.palm3, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-##            elif t_type == 3:
-##                self.treeLoader.addTree(self.bush1, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-        ##Grass
-        
-        ##Initialize the PagedGeometry engine
-        self.grass = forests.PagedGeometry(camera, 30)
-        ##trees = new PagedGeometry(camera, 50, ogre.FloatRect(0, 0, 1500, 1500))
-        
-        ##Set up LODs
-        self.grass.addDetailLevelGrassPage(100.0,0.0)
-        
-        ##Set up a TreeLoader for easy use
-        self.grassLoader = forests.GrassLoader(self.grass)
-        self.grass.setPageLoader(self.grassLoader)
-        self.grassLoader.setHeightFunction(self, "getTerrainHeight")
-
-        ## iterate grass materials
-        for nam in ["grass", "dry_grass", "tall_grass"]:
-            grassLayer = self.grassLoader.addLayer(nam)
-            
-            grassLayer.setAnimationEnabled(True)
-            grassLayer.setSwaySpeed(1.5)
-            grassLayer.setSwayLength(0.08)
-            grassLayer.setSwayDistribution(10.0)
-
-            grassLayer.setDensity(0.6)
-
-            grassLayer.setMapBounds(ogre.FloatRect(0, 0, 1500, 1500))
-
-            grassLayer.setColorMap("terrain_texture_greeb.jpg")
-            grassLayer.setColorMapFilter(forests.MAPFILTER_BILINEAR)
-
-            grassLayer.setDensityMap("densitymap.png")
-            grassLayer.setDensityMapFilter(forests.MAPFILTER_NONE)
-        
-            ##grassLayer.setMinimumSize(0.5,0.5)
-            ##grassLayer.setMaximumSize(1.0, 1.0) 
-
-            grassLayer.setMinimumSize(4.0,2.0)
-            grassLayer.setMaximumSize(4.0,2.0)
-
-            grassLayer.setFadeTechnique(forests.FADETECH_GROW)
-
-        self.robots = []
-
-        for i in range(5):
-            robo = Robot(self)
-            robo.spawn(ogre.Vector3(700 + (i * 10), 100, 750), i)
-            self.robots.append(robo)
-
-
-        
-        #rNode.translate(ogre.Vector3(750,70,760))
-        #rNode.setScale(ogre.Vector3(0.5,0.5,0.5))
-        
-        self.updateRay = ogre.Ray();
-    
-        ##RaySceneQuery for terrain height check
-        self.updateRay.setOrigin(camera.getPosition())
-        self.updateRay.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
-        self.raySceneQuery = self.sceneManager.createRayQuery(self.updateRay)
-        self.raySceneQuery.setQueryTypeMask(ogre.SceneManager.WORLD_GEOMETRY_TYPE_MASK )   
-        self.raySceneQuery.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION) 
-        self.raySceneQueryListener = myRaySceneQueryListener()
-        
-        tipi_ent = self.sceneManager.createEntity("tipi", "tipi.mesh")
-        tipi_node = self.sceneManager.getRootSceneNode().createChildSceneNode()
-        tipi_node.attachObject(tipi_ent)
-        tipi_node.setPosition(ogre.Vector3(700, 100, 750))
-        pos = tipi_node.getPosition()
-        tipi_node.setPosition(pos.x, self.getTerrainHeight(700,750) + 0, pos.z)
-
-    def _createFrameListener(self):
-        self.frameListener = GrassFrameListener(self)
-        self.root.addFrameListener(self.frameListener)
-
-        self.roboListener = robotsListener(self)
-        self.root.addFrameListener(self.roboListener)
-
-
-class Robot:
-    def __init__(self, app):
-        self.app = app
-        self.speed = 5.0
-        self.decisionTime = 5.0
-        self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
-        self.mustRotate = True
-        
-    def spawn(self, position, numActors):
-        self.timer = 0.0
-        self.ent = self.app.sceneManager.createEntity("robot_" + str(numActors), "robot.mesh")
-        self.posNode = self.app.sceneManager.getRootSceneNode().createChildSceneNode()
-        self.rotNode = self.posNode.createChildSceneNode()
-        self.posNode.setScale(ogre.Vector3(0.1, 0.1, 0.1))
-        self.rotNode.attachObject(self.ent)
-        self.posNode.setPosition(position)
-        self.rotNode.yaw(ogre.Degree(90))
-        print self.posNode.position
-        self.animation = self.ent.getAnimationState('Walk')
-        self.animation.Enabled = True
-        
-        
-
-    def addTime(self, time):
-        self.animation.addTime(time)
-        #print self.Node.position
-        self.timer += time
-        if self.timer >= self.decisionTime:
-            self.timer = 0
-            self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
-            self.direction.normalise()
-            self.mustRotate = True
-            self.posNode.setDirection(self.direction.x, 0, self.direction.y, self.posNode.TS_WORLD)
-            print self.posNode.position
-        if self.mustRotate:
-            pass
-                
-        pos = self.posNode.position
-        off = self.direction * (self.speed * time)
-        self.posNode.setPosition(pos.x + off.x, pos.y, pos.z + off.y)
-        
-        
-        
-class robotsListener(sf.FrameListener):
-    def __init__(self, app):
-        sf.FrameListener.__init__(self, app.renderWindow, app.camera)
-        self.app = app
-        self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
-                                                            ogre.Vector3.NEGATIVE_UNIT_Y))
-        self.Ray = ogre.Ray()
-
-        
-    def frameStarted(self, frameEvent):
-        for r in self.app.robots:
-            r.addTime(frameEvent.timeSinceLastFrame)
-            self.Ray.setOrigin(r.posNode.position)
-            self.Ray.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
-            self.raySceneQuery.Ray = self.Ray
-            for queryResult in self.raySceneQuery.execute():
-                if queryResult.worldFragment is not None:
-                    pos = r.posNode.position
-                    r.posNode.setPosition(pos.x, pos.y - queryResult.distance + 0.6, pos.z)
-                    break
-        return sf.FrameListener.frameStarted(self, frameEvent)
-    
-class GrassFrameListener(sf.FrameListener):
-    def __init__(self, app):
-        sf.FrameListener.__init__(self, app.renderWindow, app.camera)
-        self.app = app
-        self.timeSince = 0.0
-        self.updateToggle = True
-        # use this to tweak the persons position
-        self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
-                                                                    ogre.Vector3.NEGATIVE_UNIT_Y))
-
-        
-    def frameStarted(self, frameEvent):
-        if self.updateToggle:
-            self.app.trees.update()
-        else:
-            self.app.grass.update()
-        self.updateToggle = not self.updateToggle
-        self.app.grassLoader.updateAnimation()
-        self.timeSince = frameEvent.timeSinceLastFrame
-        updateRay = ogre.Ray()
-        updateRay.setOrigin (self.camera.getPosition() + ogre.Vector3(0.0, 10.0, 0.0))
-        updateRay.setDirection (ogre.Vector3.NEGATIVE_UNIT_Y)
-        self.raySceneQuery.Ray = updateRay
-        for queryResult in self.raySceneQuery.execute():
-            if queryResult.worldFragment is not None:
-                pos = self.camera.getPosition()
-                self.camera.setPosition (pos.x, pos.y - queryResult.distance + 18.0, pos.z)
-                break
-        return sf.FrameListener.frameStarted(self, frameEvent)
-
-    def _moveCamera(self):
-        self.camera.yaw(self.rotationX)
-        self.camera.pitch(self.rotationY)
-        try:
-            self.camera.translate(self.translateVector * 0.1 * self.timeSince) # for using OgreRefApp
-        except AttributeError:
-            self.camera.moveRelative(self.translateVector * 0.1 * self.timeSince)
-
-
-class myRaySceneQueryListener ( ogre.RaySceneQueryListener ):
-    def queryResult(self, fragment,  distance):
-      self.resultDistance = distance
-      return False
-          
-
-if __name__ == '__main__':
-    try:
-        application = ForestApplication()
-        application.go()
-    except ogre.OgreException, e:
-        print e

Deleted: trunk/python-ogre/demos/showcase_01/Demo_Forest.py.bak
===================================================================
--- trunk/python-ogre/demos/showcase_01/Demo_Forest.py.bak	2007-12-16 14:20:20 UTC (rev 499)
+++ trunk/python-ogre/demos/showcase_01/Demo_Forest.py.bak	2007-12-17 17:52:49 UTC (rev 500)
@@ -1,326 +0,0 @@
-
-
-
-
-import warnings 
-warnings.simplefilter('ignore', RuntimeWarning) 
-import ogre.renderer.OGRE as ogre
-import ogre.addons.ogreforests as forests
-import SampleFramework as sf
-import math, random
-warnings.simplefilter('default', RuntimeWarning)
-
-class ForestApplication(sf.Application):
-    def _chooseSceneManager(self):
-        # self.sceneManager = self.root.createSceneManager("TerrainSceneManager")
-        self.sceneManager = self.root.createSceneManager(ogre.ST_EXTERIOR_CLOSE)
-        # self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE)
-        
-    def getTerrainHeight( self, x, z ):
-        if ( x < 0 or z < 0 or x > 1500 or z > 1500 ):  return 0
-        self.updateRay.setOrigin( ogre.Vector3(x, 0.0, z) )
-        self.updateRay.setDirection( ogre.Vector3.UNIT_Y )
-        self.raySceneQuery.setRay( self.updateRay )
-        self.raySceneQuery.execute( self.raySceneQueryListener )
-        return self.raySceneQueryListener.resultDistance
-
-    ##Loads world
-    def _createScene(self):
-        camera = self.camera
-        
-        ## Set ambient light
-        self.sceneManager.setAmbientLight((0.5, 0.5, 0.5))
-    
-        ## Create a light
-        l = self.sceneManager.createLight("MainLight")
-        l.setPosition(20,80,50)
-        ## Fog
-        ## NB it's VERY important to set this before calling setWorldGeometry 
-        ## because the vertex program picked will be different
-        ##ColourValue fadeColour(0.93, 0.86, 0.76)
-        fadeColour = (120.0/255, 173.0/255, 246.0/255)
-        self.sceneManager.setFog( ogre.FOG_LINEAR, fadeColour, .001, 200, 1000)
-        self.renderWindow.getViewport(0).setBackgroundColour(fadeColour)
-    
-        terrain_cfg = "./triplanar_terrain.cfg"
-    
-        self.sceneManager.setWorldGeometry( terrain_cfg )
-        ## Infinite far plane?
-        if self.root.getRenderSystem().getCapabilities().hasCapability(ogre.RSC_INFINITE_FAR_PLANE):
-            camera.setFarClipDistance(0)
-        ##camera.setFarClipDistance(1000)
-    
-        ## Set a nice viewpoint
-        camera.setPosition(750,100,750)
-        camera.lookAt(750, 100, 750+1)
-        ##camera.setPolygonMode(PM_WIREFRAME)
-
-        plane = ogre.Plane()
-        n = plane.normal
-        n.x, n.y, n.z = 0, -1, 0
-        plane.d = 5000
-        self.sceneManager.setSkyPlane(True, plane, 'Examples/CloudySky', 1000, 3)
-
-        #self.sceneManager.setSkyPlane(True, 'Examples/CloudySky', 5, 8)
-
-        
-        ##---- PagedGeometry test ----
-        
-        ## TREES
-        ##Initialize the PagedGeometry engine
-        self.trees = forests.PagedGeometry()
-        self.trees.setCamera( camera )
-        self.trees.setPageSize( 100 )
-        self.trees.setBounds( ogre.FloatRect(0, 0, 1500, 1500) )
-    
-        ##Set up LODs
-        ##self.trees.addDetailLevelEntityPage(50, 50)
-        self.trees.addDetailLevelBatchPage(50, 50)
-        self.trees.addDetailLevelImpostorPage(900, 50)
-    
-        ##Set up a TreeLoader for easy use
-        self.treeLoader = forests.TreeLoader2D( self.trees, ogre.FloatRect(0, 0, 1500, 1500) )
-        self.trees.setPageLoader(self.treeLoader)
-        self.treeLoader.setHeightFunction(self, "getTerrainHeight")
-    
-        ##And add 20,000 trees to the scene through the "easy-to-use" TreeLoader class
-        palm1 = self.sceneManager.createEntity("MyTree", "KinkyPalm.mesh")
-        palm2 = self.sceneManager.createEntity("pineTree", "StraightPalm.mesh")
-        palm3 = self.sceneManager.createEntity("palmBendy", "BendyPalm.mesh")
-        bush1 = self.sceneManager.createEntity("bush1", "BigDarkBush.mesh")
-        birch = self.sceneManager.createEntity("birch", "birch.mesh")
-        benTree = self.sceneManager.createEntity("benTree", "benTree.mesh")
-        spot_shroom = self.sceneManager.createEntity("redShroom", "spotty_shroom.mesh")
-        blue_shroom = self.sceneManager.createEntity("blueShroom", "blue_shroom.mesh")
-
-        self.treeModels = [ bush1, benTree, spot_shroom, blue_shroom]
-        # fix the damn rotations
-##        rotNode = self.sceneManager.getRootSceneNode().createChildSceneNode( "rotNode" )
-##        rotNode.attachObject( self.palm1 )
-##        rotNode.attachObject( self.palm2 )
-##        rotNode.attachObject( self.palm3 )
-##        rotNode.attachObject( self.bush1 )
-##        rotNode.pitch(ogre.Degree(-90).valueRadians())
-        
-        
-        
-        x=0
-        z=0
-        for i in range (10000):
-            yaw = random.randrange(0, 360)
-    
-            if (random.randrange(0, 1000) <= 800):
-                x += random.randrange(-10.0, 10.0)
-                z += random.randrange(-10.0, 10.0)
-                if (x < 0): x = 0 
-                elif (x > 1500): x = 1500
-                if (z < 0): z = 0 
-                elif (z > 1500): z = 1500
-            else:
-                x = random.randrange(0, 1500)
-                z = random.randrange(0, 1500)
-            
-            scale = random.randrange(9, 20) / 10
-
-            t_type = random.randrange(0, len(self.treeModels))
-            self.treeLoader.addTree(self.treeModels[t_type], ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-
-##            if t_type == 0:
-##                self.treeLoader.addTree(self.palm1, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-##            elif t_type == 1:
-##                self.treeLoader.addTree(self.palm2, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-##            elif t_type == 2:
-##                self.treeLoader.addTree(self.palm3, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-##            elif t_type == 3:
-##                self.treeLoader.addTree(self.bush1, ogre.Vector2(x, z), ogre.Degree(yaw), scale)
-        ##Grass
-        
-        ##Initialize the PagedGeometry engine
-        self.grass = forests.PagedGeometry(camera, 30)
-        ##trees = new PagedGeometry(camera, 50, ogre.FloatRect(0, 0, 1500, 1500))
-        
-        ##Set up LODs
-        self.grass.addDetailLevelGrassPage(100.0,0.0)
-        
-        ##Set up a TreeLoader for easy use
-        self.grassLoader = forests.GrassLoader(self.grass)
-        self.grass.setPageLoader(self.grassLoader)
-        self.grassLoader.setHeightFunction(self, "getTerrainHeight")
-
-        ## iterate grass materials
-        for nam in ["grass", "dry_grass"]:
-            grassLayer = self.grassLoader.addLayer(nam)
-            
-            grassLayer.setAnimationEnabled(True)
-            grassLayer.setSwaySpeed(1.5)
-            grassLayer.setSwayLength(0.08)
-            grassLayer.setSwayDistribution(10.0)
-
-            grassLayer.setDensity(0.6)
-
-            grassLayer.setMapBounds(ogre.FloatRect(0, 0, 1500, 1500))
-
-            grassLayer.setColorMap("terrain_texture_greeb.jpg")
-            grassLayer.setColorMapFilter(forests.MAPFILTER_BILINEAR)
-
-            grassLayer.setDensityMap("densitymap.png")
-            grassLayer.setDensityMapFilter(forests.MAPFILTER_NONE)
-        
-            ##grassLayer.setMinimumSize(0.5,0.5)
-            ##grassLayer.setMaximumSize(1.0, 1.0) 
-
-            grassLayer.setMinimumSize(4.0,2.0)
-            grassLayer.setMaximumSize(4.0,2.0)
-
-            grassLayer.setFadeTechnique(forests.FADETECH_GROW)
-
-        self.robots = []
-
-        for i in range(5):
-            robo = Robot(self)
-            robo.spawn(ogre.Vector3(700 + (i * 10), 100, 750), i)
-            self.robots.append(robo)
-
-        tipi_ent = self.sceneManager.createEntity("tipi", "tipi.mesh")
-        tipi_node = self.sceneManager.getRootSceneNode().createChildSceneNode()
-        tipi_node.attachObject(tipi_ent)
-        tipi_node.setPosition(ogre.Vector3(700, 100, 750))
-        tipi_node.position.y = self.getTerrainHeight(700,750)
-        
-        #rNode.translate(ogre.Vector3(750,70,760))
-        #rNode.setScale(ogre.Vector3(0.5,0.5,0.5))
-        
-        self.updateRay = ogre.Ray();
-    
-        ##RaySceneQuery for terrain height check
-        self.updateRay.setOrigin(camera.getPosition())
-        self.updateRay.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
-        self.raySceneQuery = self.sceneManager.createRayQuery(self.updateRay)
-        self.raySceneQuery.setQueryTypeMask(ogre.SceneManager.WORLD_GEOMETRY_TYPE_MASK )   
-        self.raySceneQuery.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION) 
-        self.raySceneQueryListener = myRaySceneQueryListener()
-
-    def _createFrameListener(self):
-        self.frameListener = GrassFrameListener(self)
-        self.root.addFrameListener(self.frameListener)
-
-        self.roboListener = robotsListener(self)
-        self.root.addFrameListener(self.roboListener)
-
-
-class Robot:
-    def __init__(self, app):
-        self.app = app
-        self.speed = 5.0
-        self.decisionTime = 5.0
-        self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
-        self.mustRotate = True
-        
-    def spawn(self, position, numActors):
-        self.timer = 0.0
-        self.ent = self.app.sceneManager.createEntity("robot_" + str(numActors), "robot.mesh")
-        self.posNode = self.app.sceneManager.getRootSceneNode().createChildSceneNode()
-        self.rotNode = self.posNode.createChildSceneNode()
-        self.posNode.setScale(ogre.Vector3(0.1, 0.1, 0.1))
-        self.rotNode.attachObject(self.ent)
-        self.posNode.setPosition(position)
-        self.rotNode.yaw(ogre.Degree(90))
-        print self.posNode.position
-        self.animation = self.ent.getAnimationState('Walk')
-        self.animation.Enabled = True
-        
-        
-
-    def addTime(self, time):
-        self.animation.addTime(time)
-        #print self.Node.position
-        self.timer += time
-        if self.timer >= self.decisionTime:
-            self.timer = 0
-            self.direction = ogre.Vector2(random.uniform(-1.0, 1.0), random.uniform(-1.0, 1.0))
-            self.direction.normalise()
-            self.mustRotate = True
-            self.posNode.setDirection(self.direction.x, 0, self.direction.y, self.posNode.TS_WORLD)
-            print self.posNode.position
-        if self.mustRotate:
-            pass
-                
-        pos = self.posNode.position
-        off = self.direction * (self.speed * time)
-        self.posNode.setPosition(pos.x + off.x, pos.y, pos.z + off.y)
-        
-        
-        
-class robotsListener(sf.FrameListener):
-    def __init__(self, app):
-        sf.FrameListener.__init__(self, app.renderWindow, app.camera)
-        self.app = app
-        self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
-                                                            ogre.Vector3.NEGATIVE_UNIT_Y))
-        self.Ray = ogre.Ray()
-
-        
-    def frameStarted(self, frameEvent):
-        for r in self.app.robots:
-            r.addTime(frameEvent.timeSinceLastFrame)
-            self.Ray.setOrigin(r.posNode.position)
-            self.Ray.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
-            self.raySceneQuery.Ray = self.Ray
-            for queryResult in self.raySceneQuery.execute():
-                if queryResult.worldFragment is not None:
-                    pos = r.posNode.position
-                    r.posNode.setPosition(pos.x, pos.y - queryResult.distance + 0.6, pos.z)
-                    break
-        return sf.FrameListener.frameStarted(self, frameEvent)
-    
-class GrassFrameListener(sf.FrameListener):
-    def __init__(self, app):
-        sf.FrameListener.__init__(self, app.renderWindow, app.camera)
-        self.app = app
-        self.timeSince = 0.0
-        self.updateToggle = True
-        # use this to tweak the persons position
-        self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
-                                                                    ogre.Vector3.NEGATIVE_UNIT_Y))
-
-        
-    def frameStarted(self, frameEvent):
-        if self.updateToggle:
-            self.app.trees.update()
-        else:
-            self.app.grass.update()
-        self.updateToggle = not self.updateToggle
-        self.app.grassLoader.updateAnimation()
-        self.timeSince = frameEvent.timeSinceLastFrame
-        updateRay = ogre.Ray()
-        updateRay.setOrigin (self.camera.getPosition() + ogre.Vector3(0.0, 10.0, 0.0))
-        updateRay.setDirection (ogre.Vector3.NEGATIVE_UNIT_Y)
-        self.raySceneQuery.Ray = updateRay
-        for queryResult in self.raySceneQuery.execute():
-            if queryResult.worldFragment is not None:
-                pos = self.camera.getPosition()
-                self.camera.setPosition (pos.x, pos.y - queryResult.distance + 18.0, pos.z)
-                break
-        return sf.FrameListener.frameStarted(self, frameEvent)
-
-    def _moveCamera(self):
-        self.camera.yaw(self.rotationX)
-        self.camera.pitch(self.rotationY)
-        try:
-            self.camera.translate(self.translateVector * 0.1 * self.timeSince) # for using OgreRefApp
-        except AttributeError:
-            self.camera.moveRelative(self.translateVector * 0.1 * self.timeSince)
-
-
-class myRaySceneQueryListener ( ogre.RaySceneQueryListener ):
-    def queryResult(self, fragment,  distance):
-      self.resultDistance = distance
-      return False
-          
-
-if __name__ == '__main__':
-    try:
-        application = ForestApplication()
-        application.go()
-    except ogre.OgreException, e:
-        print e

Deleted: trunk/python-ogre/demos/showcase_01/Ogre.log
===================================================================
--- trunk/python-ogre/demos/showcase_01/Ogre.log	2007-12-16 14:20:20 UTC (rev 499)
+++ trunk/python-ogre/demos/showcase_01/Ogre.log	2007-12-17 17:52:49 UTC (rev 500)
@@ -1,30 +0,0 @@
-08:23:00: Creating resource group General
-08:23:00: Creating resource group Internal
-08:23:00: Creating resource group Autodetect
-08:23:00: SceneManagerFactory for type 'DefaultSceneManager' registered.
-08:23:00: Registering ResourceManager for type Material
-08:23:00: Registering ResourceManager for type Mesh
-08:23:00: Registering ResourceManager for type Skeleton
-08:23:00: MovableObjectFactory for type 'ParticleSystem' registered.
-08:23:00: OverlayElementFactory for type Panel registered.
-08:23:00: OverlayElementFactory for type BorderPanel registered.
-08:23:00: OverlayElementFactory for type TextArea registered.
-08:23:00: Registering ResourceManager for type Font
-08:23:00: ArchiveFactory for archive type FileSystem registered.
-08:23:00: ArchiveFactory for archive type Zip registered.
-08:23:00: FreeImage version: 3.9.2
-08:23:00: This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details
-08:23:00: Supported formats: bmp,ico,jpg,jif,jpeg,jpe,jng,koa,iff,lbm,mng,pbm,pbm,pcd,pcx,pgm,pgm,png,ppm,ppm,ras,tga,targa,tif,tiff,wap,wbmp,wbm,psd,cut,xbm,xpm,gif,hdr,g3,sgi
-08:23:00: DDS codec registering
-08:23:00: Registering ResourceManager for type HighLevelGpuProgram
-08:23:00: Registering ResourceManager for type Compositor
-08:23:00: MovableObjectFactory for type 'Entity' registered.
-08:23:00: MovableObjectFactory for type 'Light' registered.
-08:23:00: MovableObjectFactory for type 'BillboardSet' registered.
-08:23:00: MovableObjectFactory for type 'ManualObject' registered.
-08:23:00: MovableObjectFactory for type 'BillboardChain' registered.
-08:23:00: MovableObjectFactory for type 'RibbonTrail' registered.
-08:23:00: Loading library ../../plugins\RenderSystem_GL.dll
-08:23:00: OGRE EXCEPTION(7:InternalErrorException): Could not load dynamic library ../../plugins\RenderSystem_GL.dll.  System Error: The specified module could not be found.
-
- in DynLib::load at ..\src\OgreDynLib.cpp (line 80)

Deleted: trunk/python-ogre/demos/showcase_01/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/showcase_01/SampleFramework.py	2007-12-16 14:20:20 UTC (rev 499)
+++ trunk/python-ogre/demos/showcase_01/SampleFramework.py	2007-12-17 17:52:49 UTC (rev 500)
@@ -1,14 +0,0 @@
-# This code is in the Public Domain
-#
-
-import ogre.renderer.OGRE as ogre
-
-# We don't use the verisons but it's nice to set them up...
-ogre.OgreVersion = ogre.GetOgreVersion()
-ogre.OgreVersionString = ogre.OgreVersion[0] + ogre.OgreVersion[1] + ogre.OgreVersion[2]
-ogre.PythonOgreVersion = ogre.GetPythonOgreVersion()
-
-from ogre.renderer.OGRE.sf_OIS import * 
-           
-    
-

Deleted: trunk/python-ogre/demos/showcase_01/ogre.cfg
===================================================================
--- trunk/python-ogre/demos/showcase_01/ogre.cfg	2007-12-16 14:20:20 UTC (rev 499)
+++ trunk/python-ogre/demos/showcase_01/ogre.cfg	2007-12-17 17:52:49 UTC (rev 500)
@@ -1,19 +0,0 @@
-Render System=Direct3D9 Rendering Subsystem
-
-[OpenGL Rendering Subsystem]
-Colour Depth=32
-Display Frequency=100
-FSAA=0
-Full Screen=Yes
-RTT Preferred Mode=FBO
-VSync=No
-Video Mode=1024 x 768
-
-[Direct3D9 Rendering Subsystem]
-Allow NVPerfHUD=No
-Anti aliasing=None
-Floating-point mode=Fastest
-Full Screen=Yes
-Rendering Device=Radeon X1650 Series
-VSync=No
-Video Mode=800 x 600 @ 32-bit colour

Deleted: trunk/python-ogre/demos/showcase_01/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/showcase_01/plugins.cfg	2007-12-16 14:20:20 UTC (rev 499)
+++ trunk/python-ogre/demos/showcase_01/plugins.cfg	2007-12-17 17:52:49 UTC (rev 500)
@@ -1,19 +0,0 @@
-# Defines plugins to load
-
-## 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
-
-##
-## NOTE use this for MacOS or Linux
-# Plugin=RenderSystem_GL
-# Plugin=Plugin_ParticleFX
-# Plugin=Plugin_BSPSceneManager
-# Plugin=Plugin_OctreeSceneManager
-# Plugin=Plugin_CgProgramManager

Deleted: trunk/python-ogre/demos/showcase_01/resources.cfg
===================================================================
--- trunk/python-ogre/demos/showcase_01/resources.cfg	2007-12-16 14:20:20 UTC (rev 499)
+++ trunk/python-ogre/demos/showcase_01/resources.cfg	2007-12-17 17:52:49 UTC (rev 500)
@@ -1,30 +0,0 @@
-[Bootstrap]
-Zip=../media/packs/OgreCore.zip
-
-# Resource locations to be added to the default path
-[General]
-FileSystem=../media
-FileSystem=../media/fonts
-FileSystem=../media/sounds
-FileSystem=../media/Audio
-FileSystem=../media/materials/programs
-FileSystem=../media/materials/scripts
-FileSystem=../media/materials/textures
-FileSystem=../media/models
-FileSystem=../media/overlays
-FileSystem=../media/particle
-FileSystem=../media/gui
-Zip=../media/packs/cubemap.zip
-Zip=../media/packs/cubemapsJS.zip
-Zip=../media/packs/dragon.zip
-Zip=../media/packs/fresneldemo.zip
-Zip=../media/packs/ogretestmap.zip
-Zip=../media/packs/skybox.zip
-#Zip=../media/packs/chiropteraDM.pk3
-
-FileSystem=./media/trees
-FileSystem=./media/grass
-FileSystem=./media/terrains
-FileSystem=./media/Triplanar
-
-

Deleted: trunk/python-ogre/demos/showcase_01/triplanar_terrain.cfg
===================================================================
--- trunk/python-ogre/demos/showcase_01/triplanar_terrain.cfg	2007-12-16 14:20:20 UTC (rev 499)
+++ trunk/python-ogre/demos/showcase_01/triplanar_terrain.cfg	2007-12-17 17:52:49 UTC (rev 500)
@@ -1,71 +0,0 @@
-# The main world texture (if you wish the terrain manager to create a material for you)
-#WorldTexture=terrain_texture.jpg
-
-# The detail texture (if you wish the terrain manager to create a material for you)
-#DetailTexture=terrain_detail.jpg
-
-#number of times the detail texture will tile in a terrain tile
-DetailTile=3
-
-# Heightmap source
-PageSource=Heightmap
-
-# Heightmap-source specific settings
-Heightmap.image=terrain.png
-
-# If you use RAW, fill in the below too
-# RAW-specific setting - size (horizontal/vertical)
-#Heightmap.raw.size=513
-# RAW-specific setting - bytes per pixel (1 = 8bit, 2=16bit)
-#Heightmap.raw.bpp=2
-
-# How large is a page of tiles (in vertices)? Must be (2^n)+1
-PageSize=513
-
-# How large is each tile? Must be (2^n)+1 and be smaller than PageSize
-TileSize=65
-
-# The maximum error allowed when determining which LOD to use
-MaxPixelError=3
-
-# The size of a terrain page, in world units
-PageWorldX=1500
-PageWorldZ=1500
-# Maximum height of the terrain 
-MaxHeight=100
-
-# Upper LOD limit
-MaxMipMapLevel=5
-
-VertexNormals=yes
-#VertexColors=yes
-#UseTriStrips=yes
-
-# Use vertex program to morph LODs, if available
-VertexProgramMorph=yes
-
-# The proportional distance range at which the LOD morph starts to take effect
-# This is as a proportion of the distance between the current LODs effective range,
-# and the effective range of the next lower LOD
-LODMorphStart=0.2
-
-# This following section is for if you want to provide your own terrain shading routine
-# Note that since you define your textures within the material this makes the 
-# WorldTexture and DetailTexture settings redundant
-
-# The name of the vertex program parameter you wish to bind the morph LOD factor to
-# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely
-# to the same position as the next lower LOD
-# USE THIS IF YOU USE HIGH-LEVEL VERTEX PROGRAMS WITH LOD MORPHING
-MorphLODFactorParamName=morphFactor
-
-# The index of the vertex program parameter you wish to bind the morph LOD factor to
-# this is 0 when there is no adjustment (highest) to 1 when the morph takes it completely
-# to the same position as the next lower LOD
-# USE THIS IF YOU USE ASSEMBLER VERTEX PROGRAMS WITH LOD MORPHING
-#MorphLODFactorParamIndex=4
-
-# The name of the material you will define to shade the terrain
-CustomMaterialName=OverhangTerrain_simple
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [499] trunk/python-ogre

From: <and...@us...> - 2007-12-16 14:20:21

Revision: 499
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=499&view=rev
Author:   andy_miller
Date:     2007-12-16 06:20:20 -0800 (Sun, 16 Dec 2007)

Log Message:
-----------
General Updates and test of new scripts

Modified Paths:
--------------
    trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
    trunk/python-ogre/ThirdParty/caelum/GroundFog.h
    trunk/python-ogre/ThirdParty/caelum/LayeredClouds.cpp
    trunk/python-ogre/ThirdParty/caelum/LayeredClouds.h
    trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp
    trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALSound.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALSound.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h
    trunk/python-ogre/code_generators/caelum/generate_code.py

Added Paths:
-----------
    trunk/python-ogre/ThirdParty/caelum/ImageHelper.cpp
    trunk/python-ogre/ThirdParty/caelum/ImageHelper.h
    trunk/python-ogre/makeall.py
    trunk/python-ogre/scripts_V2/
    trunk/python-ogre/scripts_V2/BuildModule.py
    trunk/python-ogre/scripts_V2/environment.py

Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -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/caelum/GroundFog.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/GroundFog.h	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/caelum/GroundFog.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -129,5 +129,4 @@
 
 }
 
-#endif //GROUNDFOG_H
-
+#endif //GROUNDFOG_H
\ No newline at end of file

Added: trunk/python-ogre/ThirdParty/caelum/ImageHelper.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/ImageHelper.cpp	                        (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/ImageHelper.cpp	2007-12-16 14:20:20 UTC (rev 499)
@@ -0,0 +1,48 @@
+#include "CaelumPrecompiled.h"
+#include "ImageHelper.h"
+
+namespace caelum
+{
+    Ogre::ColourValue getInterpolatedColour (
+            float fx, float fy, Ogre::Image *img, bool wrapX)
+    {
+	    // Don't -> all the time, and avoid unsigned warnings
+        int imgWidth = static_cast<int>(img->getWidth ());
+        int imgHeight = static_cast<int>(img->getHeight ());
+
+	    // Calculate pixel y coord.
+        int py = Ogre::Math::IFloor(Ogre::Math::Abs (fy) * (imgHeight - 1));
+        // Snap to py image bounds.
+        py = std::max(0, std::min(py, imgHeight - 1));
+
+	    // Get the two closest pixels on x.
+        // px1 and px2 are the closest integer pixels to px.
+        float px = fx * (img->getWidth () - 1);
+	    int px1, px2;
+        px1 = Ogre::Math::IFloor(px);
+        px2 = Ogre::Math::ICeil(px);
+
+        if (wrapX) {
+            // Wrap x coords. The funny addition ensures that it does
+            // "the right thing" for negative values.
+            px1 = (px1 % imgWidth + imgWidth) % imgWidth;
+            px2 = (px2 % imgWidth + imgWidth) % imgWidth;
+        } else {
+            px1 = std::max(0, std::min(px1, imgWidth - 1));
+            px2 = std::max(0, std::min(px2, imgWidth - 1));
+        }
+
+	    // Calculate the interpolated pixel
+	    Ogre::ColourValue c1, c2, cf;
+        c1 = img->getColourAt (px1, py, 0);
+        c2 = img->getColourAt (px2, py, 0);
+
+        // Blend the two pixels together.
+        // diff is the weight between pixel 1 and pixel 2.
+        float diff = px - px1;
+	    cf = c1 * (1 - diff) + c2 * diff;
+
+	    return cf;
+    }
+
+}
\ No newline at end of file

Added: trunk/python-ogre/ThirdParty/caelum/ImageHelper.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/ImageHelper.h	                        (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/ImageHelper.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -0,0 +1,24 @@
+#ifndef CAELUM_HEADER__IMAGE_HELPER_H
+#define CAELUM_HEADER__IMAGE_HELPER_H
+
+#include "CaelumPrerequisites.h"
+
+namespace caelum
+{
+	/** Gets the interpolated colour between two pixels from an image.
+        Interpolate a texture pixel by hand. (fx, fy) are in texture coordinates,
+        ranging [0-1] across the entire texture.
+        Smooth blending is only done on the x coordinate.
+        Wrapping is only supported on X as well.
+
+		@param fx Horizontal coordinate.
+		@param fy Vertical coordiate.
+		@param img The lookup image.
+		@param wrapX To wrap the x coordinate.
+		@return The interpolated colour.
+	 */
+	DllExport Ogre::ColourValue getInterpolatedColour (float fx, float fy, Ogre::Image *img,
+            bool wrapX = true);
+}
+
+#endif // CAELUM_HEADER__IMAGE_HELPER_H
\ No newline at end of file

Modified: trunk/python-ogre/ThirdParty/caelum/LayeredClouds.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/LayeredClouds.cpp	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/caelum/LayeredClouds.cpp	2007-12-16 14:20:20 UTC (rev 499)
@@ -1,6 +1,7 @@
 #include "CaelumPrecompiled.h"
 #include "LayeredClouds.h"
 #include "CaelumExceptions.h"
+#include "ImageHelper.h"
 
 namespace
 {
@@ -22,13 +23,14 @@
 			const Ogre::String &meshName,
 			const Ogre::String &entityName
 	):
-			mSceneMgr(scene)
+			mSceneMgr(scene),
+            mCloudCoverLookup(0)
 	{
 		// Create cloud plane mesh if it doesn't exist.
 		if (Ogre::MeshManager::getSingleton ().getByName (meshName).isNull ()) {
 			Ogre::Plane plane = Ogre::Plane(Ogre::Vector3::NEGATIVE_UNIT_Y, -0.1);
 			Ogre::MeshManager::getSingleton ().createCurvedPlane(
-					meshName, resourceGroupName, plane, 2, 2, .4, 16, 16,
+					meshName, resourceGroupName, plane, 2, 2, .4, 64, 64,
 					false, 1, 1, 1, Ogre::Vector3::UNIT_Z);
 		}
 
@@ -54,6 +56,8 @@
 		getVpParams()->setIgnoreMissingParams(true);
 
 		// Default parameter values
+        assert(mCloudCoverLookup.get() == 0);
+        setCloudCoverLookup("CloudCoverLookup.png");
 		setCloudCover(0.5);
 		setCloudMassOffset(Ogre::Vector2(0, 0));
 		setCloudDetailOffset(Ogre::Vector2(0, 0));
@@ -191,10 +195,27 @@
 	}
 
 	void LayeredClouds::setCloudCover(const Ogre::Real cloudCover) {
-		getFpParams()->setNamedConstant("cloudCover", mCloudCover = cloudCover);
+        mCloudCover = cloudCover;
+        float cloudCoverageThreshold = 0;
+        if (mCloudCoverLookup.get() != 0) {
+            cloudCoverageThreshold = getInterpolatedColour(cloudCover, 1, mCloudCoverLookup.get(), false).r;
+        } else {
+            cloudCoverageThreshold = 1 - cloudCover;
+        }
+        getFpParams()->setNamedConstant("cloudCoverageThreshold", cloudCoverageThreshold);
 	}
 
 	Ogre::Real LayeredClouds::getCloudCover() const {
 		return mCloudCover;
 	}
+
+    void LayeredClouds::setCloudCoverLookup (const Ogre::String& fileName) {
+        mCloudCoverLookup.reset(0);
+        mCloudCoverLookup.reset(new Ogre::Image());
+        mCloudCoverLookup->load (fileName, RESOURCE_GROUP_NAME);
+    }
+
+    void LayeredClouds::disableCloudCoverLookup () {
+        mCloudCoverLookup = 0;
+    }
 } // namespace caelum

Modified: trunk/python-ogre/ThirdParty/caelum/LayeredClouds.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/LayeredClouds.h	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/caelum/LayeredClouds.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -53,6 +53,26 @@
 		 */
 		Ogre::Real getCloudCover () const;
 
+        /** Set the image used to lookup the cloud coverage threshold.
+         *  This image is used to calculate the cloud coverage threshold
+         *  based on the desired cloud cover.
+         *
+         *  The cloud coverage threshold is substracted from cloud intensity
+         *  at any point; to generate fewer or more clouds. That threshold is
+         *  not linear, a lookup is required to ensure that setCloudCover(0.1)
+         *  will actually have 10% the clouds at setCloudCover(1).
+         *
+         *  The lookup is the inverse of the sum on the histogram, and was
+         *  calculated with a small hacky tool.
+         */
+        void setCloudCoverLookup (const Ogre::String& fileName);
+
+        /** Disable any cloud cover lookup.
+         *  @see setCloudCoverLookup.
+         */
+        void disableCloudCoverLookup ();
+
+
 		/** Sets blending factor between the two cloud mass layers.
 		 */
 		void setCloudMassBlend (const Ogre::Real cloudCover);
@@ -139,7 +159,11 @@
 		/// Current cloud detail layer offset.
 		Ogre::Vector2 mCloudDetailOffset;
 
+        /// Lookup used for cloud coverage.
+        /// see setCloudCoverLookup.
+        std::auto_ptr<Ogre::Image> mCloudCoverLookup;
 
+
 		/// If this class controls animation for itself.
 		bool mAnimating;
 

Modified: trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp	2007-12-16 14:20:20 UTC (rev 499)
@@ -1,5 +1,6 @@
 #include "CaelumPrecompiled.h"
 #include "SkyColourModel.h"
+#include "ImageHelper.h"
 
 namespace caelum {
 
@@ -83,44 +84,4 @@
     return col;
 }
 
-Ogre::ColourValue SkyColourModel::getInterpolatedColour (float fx, float fy, Ogre::Image *img, bool wrapX) {
-	// Don't -> all the time, and avoid unsigned warnings
-    int imgWidth = static_cast<int>(img->getWidth ());
-    int imgHeight = static_cast<int>(img->getHeight ());
-
-	// Calculate pixel y coord.
-    int py = Ogre::Math::IFloor(Ogre::Math::Abs (fy) * (imgHeight - 1));
-    // Snap to py image bounds.
-    py = std::max(0, std::min(py, imgHeight - 1));
-
-	// Get the two closest pixels on x.
-    // px1 and px2 are the closest integer pixels to px.
-    float px = fx * (img->getWidth () - 1);
-	int px1, px2;
-    px1 = Ogre::Math::IFloor(px);
-    px2 = Ogre::Math::ICeil(px);
-
-    if (wrapX) {
-        // Wrap x coords. The funny addition ensures that it does
-        // "the right thing" for negative values.
-        px1 = (px1 % imgWidth + imgWidth) % imgWidth;
-        px2 = (px2 % imgWidth + imgWidth) % imgWidth;
-    } else {
-        px1 = std::max(0, std::min(px1, imgWidth - 1));
-        px2 = std::max(0, std::min(px2, imgWidth - 1));
-    }
-
-	// Calculate the interpolated pixel
-	Ogre::ColourValue c1, c2, cf;
-    c1 = img->getColourAt (px1, py, 0);
-    c2 = img->getColourAt (px2, py, 0);
-
-    // Blend the two pixels together.
-    // diff is the weight between pixel 1 and pixel 2.
-    float diff = px - px1;
-	cf = c1 * (1 - diff) + c2 * diff;
-
-	return cf;
-}
-
 } // namespace caelum

Modified: trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/caelum/SkyColourModel.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -72,22 +72,6 @@
 		/// Sun colour is taken from this image.
 		/// 'resources/SunGradient.png' is the default image; but you can supply another
 		void setSunColoursImage (const Ogre::String &filename);
-
-	protected:
-		/** Gets the interpolated colour between two pixels from an image.
-            Interpolate a texture pixel by hand. (fx, fy) are in texture coordinates,
-            ranging [0-1] across the entire texture.
-            Smooth blending is only done on the x coordinate.
-            Wrapping is only supported on X as well.
-
-			@param fx Horizontal coordinate.
-			@param fy Vertical coordiate.
-			@param img The lookup image.
-			@param wrapX To wrap the x coordinate.
-			@return The interpolated colour.
-		 */
-		static Ogre::ColourValue getInterpolatedColour (float fx, float fy, Ogre::Image *img,
-                bool wrapX = true);
 };
 
 } // namespace caelum

Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp	2007-12-16 14:20:20 UTC (rev 499)
@@ -109,27 +109,7 @@
 
 			mLengthInSeconds = ov_time_total(&mOggStream, -1);
 
-			mBuffers = new BufferRef[mNumBuffers];
-			alGenBuffers(mNumBuffers, mBuffers);
-			CheckError(alGetError(), "Could not generate buffer");
-
-			for(int i = 0; i < mNumBuffers; i++)
-			{
-				CheckCondition(AL_NONE != mBuffers[i], 13, "Could not generate buffer");
-				Buffer buffer = bufferData(&mOggStream, mStream ? mBufferSize : 0);
-				alBufferData(mBuffers[i], mFormat, &buffer[0], static_cast<Size>(buffer.size()), mFreq);
-				CheckError(alGetError(), "Could not load buffer data");
-			}
-
-			createAndBindSource();
-			
-			if(mStream)
-			{
-				// There is an issue with looping and streaming, so we will
-				// disable looping and deal with it on our own.
-				alSourcei (mSource, AL_LOOPING,	AL_FALSE);
-				CheckError(alGetError(), "Failed to set looping");
-			}
+			generateBuffers();
 		}
 		catch(Ogre::Exception e)
 		{
@@ -153,39 +133,28 @@
 		ov_clear(&mOggStream);
 	}
 
-	bool OggSound::play()
+	bool OggSound::loadBuffers()
 	{
-		if(isStopped() && mStream)
+		for(int i = 0; i < mNumBuffers; i++)
 		{
-			for(int i = 0; i < mNumBuffers; i++)
-			{
-				CheckCondition(AL_NONE != mBuffers[i], 13, "Could not generate buffer");
-				Buffer buffer = bufferData(&mOggStream, mStream ? mBufferSize : 0);
-				alBufferData(mBuffers[i], mFormat, &buffer[0], static_cast<Size>(buffer.size()), mFreq);
-				CheckError(alGetError(), "Could not load buffer data");
-			}
-		    
-			alSourceQueueBuffers(mSource, mNumBuffers, mBuffers);
-			CheckError(alGetError(), "Failed to queue Buffers");
+			CheckCondition(AL_NONE != mBuffers[i], 13, "Could not generate buffer");
+			Buffer buffer = bufferData(&mOggStream, mStream ? mBufferSize : 0);
+			alBufferData(mBuffers[i], mFormat, &buffer[0], static_cast<Size>(buffer.size()), mFreq);
+			CheckError(alGetError(), "Could not load buffer data");
 		}
 
-		return Sound::play();
+		return true;
 	}
 
-	bool OggSound::stop()
+	bool OggSound::unloadBuffers()
 	{
-		if(Sound::stop())
+		if(mStream)
 		{
-			return true;
+			ov_time_seek(&mOggStream, 0);
+			return false;
 		}
 		else
 		{
-			if(mStream)
-			{
-				emptyQueues();
-				ov_time_seek(&mOggStream, 0);
-			}
-
 			return true;
 		}
 	}
@@ -200,7 +169,7 @@
 		{
 			bool wasPlaying = isPlaying();
 			
-			stop();
+			pause();
 			ov_time_seek(&mOggStream, seconds);
 
 			if(wasPlaying) play();
@@ -231,14 +200,14 @@
 		}
 	}
 
-	bool OggSound::_updateSound()
+	bool OggSound::updateSound()
 	{
 		// Call the parent method to update the position
-		Sound::_updateSound();
+		Sound::updateSound();
 
 		bool eof = false;
 
-		if(mStream)
+		if(mStream && mSource != AL_NONE)
 		{
 			// Update the stream
 			int processed;
@@ -256,7 +225,7 @@
 				Buffer data = bufferData(&mOggStream, mBufferSize);
 				alBufferData(buffer, mFormat, &data[0], static_cast<Size>(data.size()), mFreq);
 
-				eof = mSoundStream->eof();
+				eof = (mOggStream.offset == mOggStream.end);
 		 
 				alSourceQueueBuffers(mSource, 1, &buffer);
 				CheckError(alGetError(), "Failed to queue buffers");
@@ -301,10 +270,12 @@
 			while(buffer.size() < size)
 			{
 				sizeRead = ov_read(&mOggStream, data, mBufferSize, 0, 2, 1, &section);
+				if(sizeRead == 0) break;
 				buffer.insert(buffer.end(), data, data + sizeRead);
 			}
 		}
-
+		
+		delete[] data;
 		return buffer;
 	}
 } // Namespace

Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.h	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -70,23 +70,23 @@
 		 */
 		OggSound(const Ogre::String& name, const Ogre::DataStreamPtr& soundStream, bool loop, bool stream);
 
-		/// This is called each frame to update the position, direction, etc
-		virtual bool _updateSound();
-
 	public:
 		/** Standard Destructor. */
 		virtual ~OggSound();
 
-		/** Plays the sound. */
-		virtual bool play();
-		/** Stops the sound. @note Upon calling play again, the sound will resume from the begining */
-		virtual bool stop();
-
 		/** Sets the offset within the audio stream in seconds */
 		virtual void setSecondOffset(Ogre::Real seconds);
 		/** Returns the current offset within the audio stream in seconds */
 		virtual Ogre::Real getSecondOffset();
 
+	protected:
+		/// This is called each frame to update the position, direction, etc
+		virtual bool updateSound();
+		/// Loads the buffers to be played.  Returns whether the buffer is loaded.
+		virtual bool loadBuffers();
+		/// Unloads the buffers.  Returns true if the buffers are still loaded.
+		virtual bool unloadBuffers();
+
 	private:
 		/// Returns a buffer containing the next chunk of length size
 		Buffer bufferData(OggVorbis_File *oggVorbisFile, int size);

Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -88,6 +88,7 @@
 	typedef ALsizei Size;
 	typedef ALchar* ALString;
 	typedef std::vector<char> Buffer;
+	typedef std::queue<SourceRef> SourcePool;
 
 	/// Struct used with STL containers
 	struct DeleteObject

Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALSound.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALSound.cpp	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALSound.cpp	2007-12-16 14:20:20 UTC (rev 499)
@@ -50,7 +50,10 @@
 		mLengthInSeconds(0),
 		mBuffers(0),
 		mBufferSize(0),
-		mNumBuffers(1),
+		mBuffersLoaded(false),
+		mBuffersQueued(false),
+		mPriority(NORMAL),
+		mStartTime(0),
 		mStream(false),
 		mPitch(1.0),
 		mGain(1.0),
@@ -83,7 +86,11 @@
 		mLengthInSeconds(0),
 		mBuffers(0),
 		mBufferSize(0),
+		mBuffersLoaded(false),
+		mBuffersQueued(false),
 		mNumBuffers(stream?2:1),
+		mPriority(NORMAL),
+		mStartTime(0),
 		mStream(stream),
 		MovableObject(name),
 		mPitch(1.0), mGain(1.0),
@@ -116,7 +123,11 @@
 		mChannels(0),
 		mLengthInSeconds(0),
 		mBufferSize(0),
+		mBuffersLoaded(true),
+		mBuffersQueued(false),
 		mNumBuffers(1),
+		mPriority(NORMAL),
+		mStartTime(0),
 		mStream(false),
 		MovableObject(name),
 		mLoop(loop?AL_TRUE:AL_FALSE),
@@ -150,13 +161,11 @@
 
 		// mBufferSize is equal to 1/4 of a second of audio
 		mLengthInSeconds = mSize / (mBufferSize * 4);
-
-		createAndBindSource();
 	}
 
 	Sound::~Sound()
 	{
-		emptyQueues();
+		stop();
 
 		try
 		{
@@ -169,26 +178,64 @@
 			// Don't die because of this.
 		}
 
-		alSourcei(mSource, AL_BUFFER, 0);
-		CheckError(alGetError(), "Failed to release buffer");
+		if(mSource != AL_NONE)
+		{
+			alSourcei(mSource, AL_BUFFER, 0);
+			CheckError(alGetError(), "Failed to release buffer");
+		}
 
-		alDeleteSources(1, &mSource);
-		CheckError(alGetError(), "Failed to release source");
+		delete[] mBuffers;
+
+		SoundManager::getSingleton()._releaseSource(this);
 	}
 
 	bool Sound::play()
 	{
 		if(isPlaying()) return true;
 
-		alSourcePlay(mSource);
-		CheckError(alGetError(), "Failed to play sound");
+		if(mStartTime == 0)
+		{
+			time(&mStartTime);
+		}
+		else if(!isPaused())
+		{
+			time_t currentTime;
+			time(&currentTime);
 
+			setSecondOffset(currentTime - mStartTime);
+		}
+
+		if(mSource != AL_NONE || (mSource = SoundManager::getSingleton()._requestSource(this)) != AL_NONE)
+		{
+			if(!mBuffersLoaded)
+			{
+				mBuffersLoaded = loadBuffers();
+			}
+
+			if(!mBuffersQueued)
+			{
+				// Unqueue any buffers that may be left over
+				unqueueBuffers();
+				queueBuffers();
+			}
+
+			initSource();
+
+			alSourcePlay(mSource);
+			CheckError(alGetError(), "Failed to play sound");
+		}
+
 		return false;
 	}
 
 	bool Sound::isPlaying() const
 	{
-		State state;    
+		if(mSource == AL_NONE)
+		{
+			return false;
+		}
+
+		State state;
 		alGetSourcei(mSource, AL_SOURCE_STATE, &state);
 		CheckError(alGetError(), "Failed to get State");
 
@@ -199,14 +246,22 @@
 	{
 		if(!isPlaying()) return true;
 
-		alSourcePause(mSource);
-		CheckError(alGetError(), "Failed to pause sound");
+		if(mSource != AL_NONE)
+		{
+			alSourcePause(mSource);
+			CheckError(alGetError(), "Failed to pause sound");
+		}
 
 		return false;
 	}
 
 	bool Sound::isPaused() const
 	{
+		if(mSource == AL_NONE)
+		{
+			return false;
+		}
+
 		State state;    
 		alGetSourcei(mSource, AL_SOURCE_STATE, &state);
 		CheckError(alGetError(), "Failed to get State");
@@ -216,16 +271,39 @@
 
 	bool Sound::stop()
 	{
-		if(isStopped()) return true;
+		if(isStopped())
+		{
+			if(mSource != AL_NONE)
+			{
+				mSource = SoundManager::getSingleton()._releaseSource(this);
+				return true;
+			}
+		}
+		else if(mSource != AL_NONE)
+		{
+			// Stop the source
+			alSourceStop(mSource);
+			CheckError(alGetError(), "Failed to stop sound");
 
-		alSourceStop(mSource);
-		CheckError(alGetError(), "Failed to stop sound");
+			unqueueBuffers();
 
-		return false;
+			mBuffersLoaded = unloadBuffers();
+		}
+
+		mSource = SoundManager::getSingleton()._releaseSource(this);
+
+		mStartTime = 0;
+
+		return true;
 	}
 
 	bool Sound::isStopped() const
 	{
+		if(mSource == AL_NONE)
+		{
+			return true;
+		}
+
 		State state;    
 		alGetSourcei(mSource, AL_SOURCE_STATE, &state);
 		CheckError(alGetError(), "Failed to get State");
@@ -235,6 +313,11 @@
 
 	bool Sound::isInitial() const
 	{
+		if(mSource == AL_NONE)
+		{
+			return true;
+		}
+
 		State state;    
 		alGetSourcei(mSource, AL_SOURCE_STATE, &state);
 		CheckError(alGetError(), "Failed to get State");
@@ -245,50 +328,78 @@
 	void Sound::setPitch(Ogre::Real pitch)
 	{
 		mPitch = pitch;
-		alSourcef(mSource, AL_PITCH, mPitch);
-		CheckError(alGetError(), "Failed to set Pitch");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_PITCH, mPitch);
+			CheckError(alGetError(), "Failed to set Pitch");
+		}
 	}
 
 	void Sound::setGain(Ogre::Real gain)
 	{
 		mGain = gain;
-		alSourcef(mSource, AL_GAIN, mGain);
-		CheckError(alGetError(), "Failed to set Gain");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_GAIN, mGain);
+			CheckError(alGetError(), "Failed to set Gain");
+		}
 	}
 
 	void Sound::setMaxGain(Ogre::Real maxGain)
 	{
 		mMaxGain = maxGain;
-		alSourcef(mSource, AL_MAX_GAIN, mMaxGain);
-		CheckError(alGetError(), "Failed to set Max Gain");
+		
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_MAX_GAIN, mMaxGain);
+			CheckError(alGetError(), "Failed to set Max Gain");
+		}
 	}
 
 	void Sound::setMinGain(Ogre::Real minGain)
 	{
 		mMinGain = minGain;
-		alSourcef(mSource, AL_MIN_GAIN, mMinGain);
-		CheckError(alGetError(), "Failed to set Min Gain");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_MIN_GAIN, mMinGain);
+			CheckError(alGetError(), "Failed to set Min Gain");
+		}
 	}
 
 	void Sound::setMaxDistance(Ogre::Real maxDistance)
 	{
 		mMaxDistance = maxDistance;
-		alSourcef(mSource, AL_MAX_DISTANCE, mMaxDistance);
-		CheckError(alGetError(), "Failed to set Max Distance");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_MAX_DISTANCE, mMaxDistance);
+			CheckError(alGetError(), "Failed to set Max Distance");
+		}
 	}
 
 	void Sound::setRolloffFactor(Ogre::Real rolloffFactor)
 	{
 		mRolloffFactor = rolloffFactor;
-		alSourcef(mSource, AL_ROLLOFF_FACTOR, mRolloffFactor);
-		CheckError(alGetError(), "Failed to set Rolloff Factor");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_ROLLOFF_FACTOR, mRolloffFactor);
+			CheckError(alGetError(), "Failed to set Rolloff Factor");
+		}
 	}
 
 	void Sound::setReferenceDistance(Ogre::Real refDistance)
 	{
 		mReferenceDistance = refDistance;
-		alSourcef(mSource, AL_REFERENCE_DISTANCE, mReferenceDistance);
-		CheckError(alGetError(), "Failed to set Reference Distance");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_REFERENCE_DISTANCE, mReferenceDistance);
+			CheckError(alGetError(), "Failed to set Reference Distance");
+		}
 	}
 
 	void Sound::setDistanceValues(Ogre::Real maxDistance, Ogre::Real rolloffFactor, Ogre::Real refDistance)
@@ -303,8 +414,12 @@
 		mVelocity.x = x;
 		mVelocity.y = y;
 		mVelocity.z = z;
-		alSource3f(mSource, AL_VELOCITY, mVelocity.x, mVelocity.y, mVelocity.z);
-		CheckError(alGetError(), "Failed to set Velocity");
+
+		if(mSource != AL_NONE)
+		{
+			alSource3f(mSource, AL_VELOCITY, mVelocity.x, mVelocity.y, mVelocity.z);
+			CheckError(alGetError(), "Failed to set Velocity");
+		}
 	}
 
 	void Sound::setVelocity(const Ogre::Vector3& vec)
@@ -318,49 +433,77 @@
 		if(mParentNode) return;
 
 		mSourceRelative = relative;
-		alSourcei(mSource, AL_SOURCE_RELATIVE, mSourceRelative);
-		CheckError(alGetError(), "Failed to set Source Relative");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcei(mSource, AL_SOURCE_RELATIVE, mSourceRelative);
+			CheckError(alGetError(), "Failed to set Source Relative");
+		}
 	}
 
 	void Sound::setOuterConeGain(Ogre::Real outerConeGain)
 	{
 		mOuterConeGain = outerConeGain;
-		alSourcef(mSource, AL_CONE_OUTER_GAIN, mOuterConeGain);
-		CheckError(alGetError(), "Failed to set Outer Cone Gain");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_CONE_OUTER_GAIN, mOuterConeGain);
+			CheckError(alGetError(), "Failed to set Outer Cone Gain");
+		}
 	}
 
 	void Sound::setInnerConeAngle(Ogre::Real innerConeAngle)
 	{
 		mInnerConeAngle = innerConeAngle;
-		alSourcef(mSource, AL_CONE_INNER_ANGLE, mInnerConeAngle);
-		CheckError(alGetError(), "Failed to set Inner Cone Angle");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_CONE_INNER_ANGLE, mInnerConeAngle);
+			CheckError(alGetError(), "Failed to set Inner Cone Angle");
+		}
 	}
 
 	void Sound::setOuterConeAngle(Ogre::Real outerConeAngle)
 	{
 		mOuterConeAngle = outerConeAngle;
-		alSourcef(mSource, AL_CONE_OUTER_ANGLE, mOuterConeAngle);
-		CheckError(alGetError(), "Failed to set Outer Cone Angle");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_CONE_OUTER_ANGLE, mOuterConeAngle);
+			CheckError(alGetError(), "Failed to set Outer Cone Angle");
+		}
 	}
 
 	void Sound::setLoop(bool loop)
 	{
 		mLoop = loop?AL_TRUE:AL_FALSE;
-		alSourcei(mSource, AL_LOOPING, mLoop);
-		CheckError(alGetError(), "Failed to set Looping");
+
+		if(mSource != AL_NONE)
+		{
+			alSourcei(mSource, AL_LOOPING, mLoop);
+			CheckError(alGetError(), "Failed to set Looping");
+		}
 	}
 
 	void Sound::setSecondOffset(Ogre::Real seconds)
 	{
-		alSourcef(mSource, AL_SEC_OFFSET, seconds);
-		CheckError(alGetError(), "Failed to set offset");
+		if(mSource != AL_NONE)
+		{
+			alSourcef(mSource, AL_SEC_OFFSET, seconds);
+			CheckError(alGetError(), "Failed to set offset");
+		}
 	}
 
 	Ogre::Real Sound::getSecondOffset()
 	{
 		Ogre::Real offset = 0;
-		alGetSourcef(mSource, AL_SEC_OFFSET, &offset);
-		CheckError(alGetError(), "Failed to set Looping");
+
+		if(mSource != AL_NONE)
+		{
+			alGetSourcef(mSource, AL_SEC_OFFSET, &offset);
+			CheckError(alGetError(), "Failed to set Looping");
+		}
+
 		return offset;
 	}
 
@@ -416,35 +559,29 @@
         mLocalTransformDirty = false;
 	}
 
-	bool Sound::_updateSound()
+	bool Sound::updateSound()
 	{
 		_update();
-		alSource3f(mSource, AL_POSITION, mDerivedPosition.x, mDerivedPosition.y, mDerivedPosition.z);
-		CheckError(alGetError(), "Failed to set Position");
 
-		alSource3f(mSource, AL_DIRECTION, mDerivedDirection.x, mDerivedDirection.y, mDerivedDirection.z);
-		CheckError(alGetError(), "Failed to set Direction");
+		if(mSource != AL_NONE)
+		{
+			alSource3f(mSource, AL_POSITION, mDerivedPosition.x, mDerivedPosition.y, mDerivedPosition.z);
+			CheckError(alGetError(), "Failed to set Position");
+
+			alSource3f(mSource, AL_DIRECTION, mDerivedDirection.x, mDerivedDirection.y, mDerivedDirection.z);
+			CheckError(alGetError(), "Failed to set Direction");
+		}
+
 		return true;
 	}
 
-	void Sound::createAndBindSource()
+	void Sound::initSource()
 	{
-		if(SoundManager::getSingleton().xRamSupport())
+		if(mSource == AL_NONE)
 		{
-			SoundManager::getSingleton().eaxSetBufferMode(mNumBuffers, mBuffers, SoundManager::xRamHardware);
+			return;
 		}
 
-		alGenSources(1, &mSource);		
-		CheckError(alGetError(), "Failed to generate source");
-
-		initSource();
-		
-		alSourceQueueBuffers(mSource, mNumBuffers, mBuffers);
-		CheckError(alGetError(), "Failed to bind Buffer");
-	}
-
-	void Sound::initSource()
-	{
 		alSourcef (mSource, AL_PITCH,				mPitch);
 		alSourcef (mSource, AL_GAIN,				mGain);
 		alSourcef (mSource, AL_MAX_GAIN,			mMaxGain);
@@ -459,10 +596,24 @@
 		alSource3f(mSource, AL_VELOCITY,			mVelocity.x, mVelocity.y, mVelocity.z);
 		alSource3f(mSource, AL_DIRECTION,			mDerivedDirection.x, mDerivedDirection.y, mDerivedDirection.z);
 		alSourcei (mSource, AL_SOURCE_RELATIVE,		mSourceRelative);
-		alSourcei (mSource, AL_LOOPING,				mLoop);
+		// There is an issue with looping and streaming, so we will
+		// disable looping and deal with it on our own.
+		alSourcei (mSource, AL_LOOPING,				mStream ? AL_FALSE : mLoop);
 		CheckError(alGetError(), "Failed to initialize source");
 	}
 
+	void Sound::generateBuffers()
+	{
+		mBuffers = new BufferRef[mNumBuffers];
+		alGenBuffers(mNumBuffers, mBuffers);
+		CheckError(alGetError(), "Could not generate buffer");
+
+		if(SoundManager::getSingleton().xRamSupport())
+		{
+			SoundManager::getSingleton().eaxSetBufferMode(mNumBuffers, mBuffers, SoundManager::xRamHardware);
+		}
+	}
+
 	void Sound::calculateFormatInfo()
 	{
 		switch(mChannels)
@@ -542,22 +693,32 @@
 		}
 	}
 
-	void Sound::emptyQueues()
+	void Sound::queueBuffers()
 	{
+		alSourceQueueBuffers(mSource, mNumBuffers, mBuffers);
+		CheckError(alGetError(), "Failed to bind Buffer");
+	}
+
+	void Sound::unqueueBuffers()
+	{
 		/*
 		** If the sound doens't have a state yet it causes an
-		** error when you try to unqueue the buffers! :S
+		** error when you try to unqueue the buffers! :S  In 
+		** order to get around this we stop the source even if
+		** it wasn't playing.
 		*/
-		if(isInitial()) play();
+		alSourceStop(mSource);
+		CheckError(alGetError(), "Failed to stop sound");
 
-		stop();
-
 		int queued;
 		alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
 		CheckError(alGetError(), "Failed to get Source");
 
 		alSourceUnqueueBuffers(mSource, queued, mBuffers);
 		CheckError(alGetError(), "Failed to unqueue Buffers");
+
+		
+		mBuffersQueued = false;
 	}
 
 	const Ogre::String& Sound::getMovableType(void) const
@@ -583,8 +744,11 @@
 		if(mSourceRelative)
 		{
 			mSourceRelative = false;
-			alSourcei(mSource, AL_SOURCE_RELATIVE, AL_FALSE);
-			CheckCondition(alGetError() == AL_NO_ERROR, 13, "Inalid Value");
+			if(mSource != AL_NONE)
+			{
+				alSourcei(mSource, AL_SOURCE_RELATIVE, AL_FALSE);
+				CheckCondition(alGetError() == AL_NO_ERROR, 13, "Inalid Value");
+			}
 		}
 		mParentNode = parent;
 		_update();

Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALSound.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALSound.h	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALSound.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -66,8 +66,15 @@
 		/** Standard Destructor */
 		virtual ~Sound();
 
+		enum Priority
+		{
+			LOW,
+			NORMAL,
+			HIGH
+		};
+
 		/** Plays the sound. */
-		virtual bool play();
+		bool play();
 		/** Returns true if the sound is playing, otherwise false. */
 		virtual bool isPlaying() const;
 		/** Pauses the sound. @note Upon calling play again, the sound will resume where it left off */
@@ -75,7 +82,7 @@
 		/** Returns true if the sound is paused, otherwise false. */
 		virtual bool isPaused() const;
 		/** Stops the sound. @note Upon calling play again, the sound will resume from the begining */
-		virtual bool stop();
+		bool stop();
 		/** Returns true if the sound is stopped, otherwise false. */
 		virtual bool isStopped() const;
 		/** Returns true if the source does not have a state yet, otherwise false */
@@ -252,6 +259,10 @@
 		bool isLooping() const {return mLoop==AL_TRUE?true:false;}
 		/** Returns streaming state */
 		bool isStreaming() const {return mStream==AL_TRUE?true:false;}
+		/** Sets the priority of the sound */
+		void setPriority(Priority priority) {mPriority = priority;}
+		/** Returns the current Priority for the sound */
+		Priority getPriority() const {return mPriority;}
 		/** Returns the duration of the audio in seconds */
 		Ogre::Real getSecondDuration() {return mLengthInSeconds;}
 		/** Sets the offset within the audio stream in seconds */
@@ -264,6 +275,7 @@
 		const Ogre::Vector3& getDerivedDirection() const {return mDerivedDirection;}
 		/** Returns the name of the file used to create this Sound. */
 		const Ogre::String& getFileName() const {return mFileName;}
+
 		/** Overridden from MovableObject */
 		const Ogre::String& getMovableType() const;
 		/** Overridden from MovableObject */
@@ -281,15 +293,25 @@
 
 	protected:
 		/// Updates the sound if need be
-		virtual bool _updateSound();
-		/// Creates the source and binds the buffer
-		void createAndBindSource();
+		virtual bool updateSound();
+		/// Sets the source for the sound
+		void setSource(SourceRef source) {mSource = source;}
+		/// Returns the SourceRef
+		SourceRef getSource() {return mSource;}
 		/// Convienance method to reset the sound state
 		void initSource();
+		/// Convienance method for creating buffers
+		void generateBuffers();
 		/// Calculates format info for the sounds. @note requires mFreq, mChannels and mBPS;
 		void calculateFormatInfo();
+		/// Queues buffers to be played
+		void queueBuffers();
 		/// Empties any queues that may still be active in the sound
-		void emptyQueues();
+		void unqueueBuffers();
+		/// Loads the buffers to be played.  Returns whether the buffer is loaded.
+		virtual bool loadBuffers() {return true;}
+		/// Unloads the buffers.  Returns true if the buffers are still loaded.
+		virtual bool unloadBuffers() {return true;}
 
 		/// Returns the BufferRef for this sounds
 		BufferRef getBufferRef() const {return mBuffers[0];}
@@ -328,12 +350,19 @@
 		int mNumBuffers;
 		int mBufferSize;
 		bool mStream;
+		bool mBuffersLoaded;
+		bool mBuffersQueued;
 		Size mFreq;
 		Size mSize;
 		Size mChannels;
 		Size mBPS;
 		BufferFormat mFormat;
 
+		Priority mPriority;
+
+		// This allows us to start a sound back where is should be after being sacrificed
+		time_t mStartTime;
+
 		Ogre::Real mLengthInSeconds;
 		
 		friend class SoundManager;

Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp	2007-12-16 14:20:20 UTC (rev 499)
@@ -51,6 +51,8 @@
 		mEAXSupport(false),
 		mEAXVersion(0),
 		mXRAMSupport(false),
+		mEFXSupport(false),
+		mSendsPerSource(10),
 		mContext(0),
 		mDevice(0),
 		mDopplerFactor(1.0),
@@ -86,6 +88,22 @@
 		destroyAllSounds();
 		delete Listener::getSingletonPtr();
 
+		// Clean out mActiveSounds and mQueuedSounds
+		mActiveSounds.clear();
+		mQueuedSounds.clear();
+
+		// Clean up the SourcePool
+		while(!mSourcePool.empty())
+		{
+			alDeleteSources(1, &mSourcePool.front());
+			CheckError(alcGetError(mDevice), "Failed to destroy source");
+			mSourcePool.pop();
+		}
+
+		// delete all FormatData pointers in the FormatMap;
+		std::for_each(mSupportedFormats.begin(), mSupportedFormats.end(), DeleteSecond());
+		mSupportedFormats.clear();
+
 		// Unregister the Sound and Listener Factories
 		Ogre::Root::getSingleton().removeMovableObjectFactory(mSoundFactory);
 		Ogre::Root::getSingleton().removeMovableObjectFactory(mListenerFactory);
@@ -93,10 +111,6 @@
 		delete mListenerFactory;
 		delete mSoundFactory;
 
-		// delete all FormatData pointers in the FormatMap;
-		std::for_each(mSupportedFormats.begin(), mSupportedFormats.end(), DeleteSecond());
-		mSupportedFormats.clear();
-
 		Ogre::LogManager::getSingleton().logMessage("*-*-* Releasing OpenAL");
 
 		// Release the OpenAL Context and the Audio device
@@ -220,15 +234,116 @@
 	{
 		void operator()(std::pair<std::string, Sound*> pair)const
 		{
-			pair.second->_updateSound();
+			pair.second->updateSound();
 		}
 	};
 
+	struct SoundManager::SortLowToHigh
+	{
+		bool operator()(const Sound *sound1, const Sound *sound2)const
+		{
+			// First we see if either sound has stopped and not given up its source
+			if(sound1->isStopped())
+				return true;
+			else if(sound2->isStopped())
+				return false;
+
+			// If they are both playing we'll test priority
+			if(sound1->getPriority() < sound2->getPriority())
+				return true;
+			else if (sound1->getPriority() > sound2->getPriority())
+				return false;
+
+			// If they are the same priority we'll test against the
+			// distance from the listener
+			Ogre::Real distSound1, distSound2;
+			Ogre::Vector3 listenerPos = Listener::getSingleton().getDerivedPosition();
+			if(sound1->isRelativeToListener())
+			{
+				distSound1 = sound1->getPosition().length();
+			}
+			else
+			{
+				distSound1 = sound1->getDerivedPosition().distance(listenerPos);
+			}
+
+			if(sound2->isRelativeToListener())
+			{
+				distSound2 = sound1->getPosition().length();
+			}
+			else
+			{
+				distSound2 = sound2->getDerivedPosition().distance(listenerPos);
+			}
+
+			if(distSound1 > distSound2)
+				return true;
+			else if(distSound1 < distSound2)
+				return false;
+
+			// If they are at the same priority and distance from the listener then
+			// they are both equally well suited to being sacrificed so we compare
+			// their pointers since it really doesn't matter
+			return sound1 < sound2;
+		}
+	};
+
+	struct SoundManager::SortHighToLow
+	{
+		bool operator()(const Sound *sound1, const Sound *sound2)const
+		{
+			// First we'll test priority
+			if(sound1->getPriority() > sound2->getPriority())
+				return true;
+			else if (sound1->getPriority() < sound2->getPriority())
+				return false;
+
+			// If they are the same priority we'll test against the
+			// distance from the listener
+			Ogre::Real distSound1, distSound2;
+			Ogre::Vector3 listenerPos = Listener::getSingleton().getDerivedPosition();
+			if(sound1->isRelativeToListener())
+			{
+				distSound1 = sound1->getPosition().length();
+			}
+			else
+			{
+				distSound1 = sound1->getDerivedPosition().distance(listenerPos);
+			}
+
+			if(sound2->isRelativeToListener())
+			{
+				distSound2 = sound1->getPosition().length();
+			}
+			else
+			{
+				distSound2 = sound2->getDerivedPosition().distance(listenerPos);
+			}
+
+			if(distSound1 < distSound2)
+				return true;
+			else if(distSound1 > distSound2)
+				return false;
+
+			// If they are at the same priority and distance from the listener then
+			// they are both equally well suited to stealing a source so we compare
+			// their pointers since it really doesn't matter
+			return sound1 < sound2;
+		}
+	};
+
 	bool SoundManager::frameStarted(const Ogre::FrameEvent& evt)
 	{
 		// Update the Sound and Listeners if necessary	
 		std::for_each(mSoundMap.begin(), mSoundMap.end(), UpdateSound());
 		Listener::getSingleton().updateListener();
+
+		// Sort the active and queued sounds
+		std::sort(mActiveSounds.begin(), mActiveSounds.end(), SortLowToHigh());
+		std::sort(mQueuedSounds.begin(), mQueuedSounds.end(), SortHighToLow());
+
+		// Check to see if we should sacrifice any sounds
+		updateSourceAllocations();
 		return true;
 	}
 
@@ -249,6 +364,7 @@
 	Ogre::StringVector SoundManager::getDeviceList()
 	{
 		const ALCchar* deviceList = alcGetString(NULL, ALC_DEVICE_SPECIFIER);
+		CheckError(alGetError(), "Unable to list devices");
 
 		Ogre::StringVector deviceVector;
 		/*
@@ -263,20 +379,33 @@
 		*/
 		while(*deviceList != NULL)
 		{
-			ALCdevice *device = alcOpenDevice(deviceList);
-			if(device)
+			try
 			{
-				// Device seems to be valid
-				ALCcontext *context = alcCreateContext(device, NULL);
-				if(context)
+				ALCdevice *device = alcOpenDevice(deviceList);
+				CheckError(alGetError(), "Unable to open device");
+
+				if(device)
 				{
-					// Context seems to be valid
-					alcMakeContextCurrent(context);
-					deviceVector.push_back(alcGetString(device, ALC_DEVICE_SPECIFIER));
-					alcDestroyContext(context);
+					// Device seems to be valid
+					ALCcontext *context = alcCreateContext(device, NULL);
+					CheckError(alGetError(), "Unable to create context");
+					if(context)
+					{
+						// Context seems to be valid
+						alcMakeContextCurrent(context);
+						CheckError(alGetError(), "Unable to make context current");
+						deviceVector.push_back(alcGetString(device, ALC_DEVICE_SPECIFIER));
+						alcDestroyContext(context);
+						CheckError(alGetError(), "Unable to destroy context");
+					}
+					alcCloseDevice(device);
 				}
-				alcCloseDevice(device);
 			}
+			catch(...)
+			{
+				// Don't die here, we'll just skip this device.
+			}
+
 			deviceList += strlen(deviceList) + 1;
 		}
 
@@ -327,19 +456,118 @@
 		mSoundFactory->_removeBufferRef(bufferName);
 	}
 
-	int SoundManager::_getMaxSources()
+	SourceRef SoundManager::_requestSource(Sound *sound)
 	{
+		if(sound->getSource() != AL_NONE)
+		{
+			// This sound already has a source, so we'll just return the same one
+			return sound->getSource();
+		}
+
+		SoundList::iterator soundItr;
+		for(soundItr = mQueuedSounds.begin(); soundItr != mQueuedSounds.end(); soundItr++)
+		{
+			if((*soundItr) == sound)
+			{
+				// This sound has already requested a source
+				return AL_NONE;
+				break;
+			}
+		}
+
+		if(!mSourcePool.empty())
+		{
+			mActiveSounds.push_back(sound);
+			SourceRef source = mSourcePool.front();
+			mSourcePool.pop();
+			return source;
+		}
+		else
+		{
+			Sound *activeSound = mActiveSounds.front();
+			Ogre::Vector3 listenerPos = Listener::getSingleton().getDerivedPosition();
+			Ogre::Real distSound = sound->getDerivedPosition().distance(listenerPos);
+			Ogre::Real distActiveSound = activeSound->getDerivedPosition().distance(listenerPos);
+
+			if(sound->getPriority() > activeSound->getPriority() ||
+				sound->getPriority() == activeSound->getPriority() && distSound < distActiveSound)
+			{
+				activeSound->pause();
+				SourceRef source = activeSound->getSource();
+				mActiveSounds.erase(mActiveSounds.begin());
+				mQueuedSounds.push_back(activeSound);
+
+				mActiveSounds.push_back(sound);
+				return source;
+			}
+			else
+			{
+				mQueuedSounds.push_back(sound);
+				return AL_NONE;
+			}
+		}
+	}
+
+	SourceRef SoundManager::_releaseSource(Sound *sound)
+	{
+		bool soundFound = false;
+		SoundList::iterator soundItr;
+		for(soundItr = mActiveSounds.begin(); soundItr != mActiveSounds.end(); soundItr++)
+		{
+			if((*soundItr) == sound)
+			{
+				mActiveSounds.erase(soundItr);
+				soundFound = true;
+				break;
+			}
+		}
+
+		// If it's not in the active list, check the queued list
+		if(!soundFound)
+		{
+			for(soundItr = mQueuedSounds.begin(); soundItr != mQueuedSounds.end(); soundItr++)
+			{
+				if((*soundItr) == sound)
+				{
+					mQueuedSounds.erase(soundItr);
+					break;
+				}
+			}
+		}
+
+		SourceRef source = sound->getSource();
+		if(source != AL_NONE)
+		{
+			if(!mQueuedSounds.empty())
+			{
+				Sound *queuedSound = mQueuedSounds.front();
+				mQueuedSounds.erase(mQueuedSounds.begin());
+
+				queuedSound->setSource(source);
+				queuedSound->play();
+				mActiveSounds.push_back(queuedSound);
+			}
+			else
+			{
+				mSourcePool.push(source);
+			}
+		}
+
+		return AL_NONE;
+	}
+
+	int SoundManager::createSourcePool()
+	{
 		SourceRef source;
-		std::vector<SourceRef> sources;
 
 		int numSources = 0;
-		while (alGetError() == AL_NO_ERROR && numSources < 32)
+		while(alGetError() == AL_NO_ERROR && numSources < 100)
 		{
 			source = 0;
 			alGenSources(1, &source);
-			if (source != 0)
+			if(source != 0)
 			{
-				sources.push_back(source);
+				mSourcePool.push(source);
 				numSources++;
 			}
 			else
@@ -350,20 +578,11 @@
 			}
 		}
 
-		for(std::vector<SourceRef>::iterator it = sources.begin(); it != sources.end(); it++)
-		{
-			source = static_cast<SourceRef>(*it);
-			alDeleteSources(1, &source);
-			CheckError(alGetError(), "Failed to delete Source");
-		}
-
 		return numSources;
 	}
 
 	void SoundManager::initializeDevice(const Ogre::String& deviceName)
 	{
-		bool deviceInList = false;
-
 		Ogre::LogManager::getSingleton().logMessage("OpenAL Devices");
 		Ogre::LogManager::getSingleton().logMessage("--------------");
 
@@ -371,8 +590,9 @@
 
 		// List devices in log and see if the sugested device is in the list
 		Ogre::StringVector deviceList = getDeviceList();
+		bool deviceInList = false;
 		Ogre::StringVector::iterator deviceItr;
-		for(deviceItr = deviceList.begin(); deviceItr != deviceList.end(); deviceItr++)
+		for(deviceItr = deviceList.begin(); deviceItr != deviceList.end() && (*deviceItr).compare("") != 0; deviceItr++)
 		{
 			deviceInList = (*deviceItr).compare(deviceName) == 0;
 			ss << "  * " << (*deviceItr);
@@ -445,6 +665,12 @@
 			}
 		}
 
+		// Check for EFX Support
+		if(alcIsExtensionPresent(mDevice, "ALC_EXT_EFX") == AL_TRUE)
+		{
+			Ogre::LogManager::getSingleton().logMessage("EFX Extension Found");
+		}
+
 		// Check for X-RAM extension
 		if(alIsExtensionPresent("EAX-RAM") == AL_TRUE)
 		{
@@ -460,7 +686,63 @@
 				" (" + Ogre::StringConverter::toString(mXRamFree) + " free)");
 		}
 
-		// See how many sources the harware allows
-		mMaxNumSources = _getMaxSources();
+		// Create our pool of sources
+		mMaxNumSources = createSourcePool();
 	}
+
+	void SoundManager::updateSourceAllocations()
+	{
+		while(!mQueuedSounds.empty())
+		{
+			Sound *queuedSound = mQueuedSounds.front();
+			Sound *activeSound = mActiveSounds.front();
+
+			Ogre::Real distQueuedSound, distActiveSound;
+			Ogre::Vector3 listenerPos = Listener::getSingleton().getDerivedPosition();
+			if(queuedSound->isRelativeToListener())
+			{
+				distQueuedSound = queuedSound->getPosition().length();
+			}
+			else
+			{
+				distQueuedSound = queuedSound->getDerivedPosition().distance(listenerPos);
+			}
+
+			if(activeSound->isRelativeToListener())
+			{
+				distActiveSound = activeSound->getPosition().length();
+			}
+			else
+			{
+				distActiveSound = activeSound->getDerivedPosition().distance(listenerPos);
+			}
+
+			if(queuedSound->getPriority() > activeSound->getPriority() ||
+				queuedSound->getPriority() == activeSound->getPriority() && distQueuedSound < distActiveSound)
+			{
+				// Remove the sounds from their respective lists
+				mActiveSounds.erase(mActiveSounds.begin());
+				mQueuedSounds.erase(mQueuedSounds.begin());
+
+				// Steal the source from the currently active sound
+				activeSound->pause();
+				activeSound->unqueueBuffers();
+				SourceRef source = activeSound->getSource();
+				activeSound->setSource(AL_NONE);
+
+				// Kickstart the currently queued sound
+				queuedSound->setSource(source);
+				queuedSound->play();
+
+				// Add the sound back to the correct lists
+				mActiveSounds.push_back(queuedSound);
+				mQueuedSounds.push_back(activeSound);
+			}
+			else
+			{
+				// We have no more sounds that we can sacrifice
+				break;
+			}
+		}
+	}
 } // Namespace

Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.h	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -174,6 +174,9 @@
 		/** Removes a BufferRef from the BufferMap */
 		void _removeBufferRef(const Ogre::String& bufferName);
 
+		SourceRef _requestSource(Sound *sound);
+		SourceRef _releaseSource(Sound *sound);
+
 		static const Ogre::String FILE_TYPE;
 		static const Ogre::String OGG;
 		static const Ogre::String WAV;
@@ -198,15 +201,20 @@
 		bool mEAXSupport;
 		int mEAXVersion;
 		bool mXRAMSupport;
+		bool mEFXSupport;
+		int mSendsPerSource;
 		Ogre::Real mDopplerFactor;
 		Ogre::Real mSpeedOfSound;
 
 	private:
-		int _getMaxSources();
+		int createSourcePool();
 		void createListener();
 		void initializeDevice(const Ogre::String& deviceName);
 		void checkFeatureSupport();
+		void updateSourceAllocations();
 		struct UpdateSound;
+		struct SortLowToHigh;
+		struct SortHighToLow;
 
 		int mMaxNumSources;
 		FormatMap mSupportedFormats;
@@ -214,6 +222,10 @@
 		SoundMap mSoundMap;
 		SoundList mPauseResumeAll;
 
+		SourcePool mSourcePool;
+		SoundList mActiveSounds;
+		SoundList mQueuedSounds;
+
 		ALCcontext *mContext;
 		ALCdevice *mDevice;
 

Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp	2007-12-16 14:20:20 UTC (rev 499)
@@ -114,29 +114,9 @@
 			calculateFormatInfo();
 
 			// mBufferSize is equal to 1/4 of a second of audio
-			mLengthInSeconds = mDataSize / (mBufferSize * 4);
+			mLengthInSeconds = (float)mDataSize / ((float)mBufferSize * 4);
 
-			mBuffers = new BufferRef[mNumBuffers];
-			alGenBuffers(mNumBuffers, mBuffers);
-			CheckError(alGetError(), "Could not generate buffer");
-
-			for(int i = 0; i < mNumBuffers; i++)
-			{
-				CheckCondition(AL_NONE != mBuffers[i], 13, "Could not generate buffer");
-				Buffer buffer = bufferData(mSoundStream, mStream?mBufferSize:mDataSize);
-				alBufferData(mBuffers[i], mFormat, &buffer[0], static_cast<Size>(buffer.size()), mFreq);
-				CheckError(alGetError(), "Could not load buffer data");
-			}
-
-			createAndBindSource();
-
-			if(mStream)
-			{
-				// There is an issue with looping and streaming, so we will
-				// disable looping and deal with it on our own.
-				alSourcei (mSource, AL_LOOPING,	AL_FALSE);
-				CheckError(alGetError(), "Failed to set looping");
-			}
+			generateBuffers();
 		}
 		catch(Ogre::Exception e)
 		{
@@ -156,39 +136,28 @@
 	WavSound::~WavSound()
 	{}
 
-	bool WavSound::play()
+	bool WavSound::loadBuffers()
 	{
-		if(isStopped() && mStream)
+		for(int i = 0; i < mNumBuffers; i++)
 		{
-			for(int i = 0; i < mNumBuffers; i++)
-			{
-				CheckCondition(AL_NONE != mBuffers[i], 13, "Could not generate buffer");
-				Buffer buffer = bufferData(mSoundStream, mStream?mBufferSize:mDataSize);
-				alBufferData(mBuffers[i], mFormat, &buffer[0], static_cast<Size>(buffer.size()), mFreq);
-				CheckError(alGetError(), "Could not load buffer data");
-			}
-		    
-			alSourceQueueBuffers(mSource, mNumBuffers, mBuffers);
-			CheckError(alGetError(), "Failed to queue Buffers");
+			CheckCondition(AL_NONE != mBuffers[i], 13, "Could not generate buffer");
+			Buffer buffer = bufferData(mSoundStream, mStream?mBufferSize:mDataSize);
+			alBufferData(mBuffers[i], mFormat, &buffer[0], static_cast<Size>(buffer.size()), mFreq);
+			CheckError(alGetError(), "Could not load buffer data");
 		}
 
-		return Sound::play();
+		return true;
 	}
 
-	bool WavSound::stop()
+	bool WavSound::unloadBuffers()
 	{
-		if(Sound::stop())
+		if(mStream)
 		{
-			return true;
+			mSoundStream->seek(mDataStart);
+			return false;
 		}
 		else
 		{
-			if(mStream)
-			{
-				emptyQueues();
-				mSoundStream->seek(mDataStart);
-			}
-
 			return true;
 		}
 	}
@@ -203,7 +172,7 @@
 		{
 			bool wasPlaying = isPlaying();
 
-			stop();
+			pause();
 
 			// mBufferSize is 1/4 of a second
 			size_t dataOffset = static_cast<size_t>(seconds * mBufferSize * 4);
@@ -230,7 +199,7 @@
 			*/
 
 			// mBufferSize is 1/4 of a second
-			Ogre::Real wavStreamOffset = (mSoundStream->tell() - mDataStart) / (mBufferSize * 4);
+			Ogre::Real wavStreamOffset = (float)(mSoundStream->tell() - mDataStart) / (float)(mBufferSize * 4);
 			Ogre::Real bufferOffset = Sound::getSecondOffset();
 
 			Ogre::Real totalOffset = wavStreamOffset + (0.25 - bufferOffset);
@@ -238,14 +207,14 @@
 		}
 	}
 
-	bool WavSound::_updateSound()
+	bool WavSound::updateSound()
 	{
 		// Call the parent method to update the position
-		Sound::_updateSound();
+		Sound::updateSound();
 
 		bool eof = false;
 
-		if(mStream)
+		if(mStream && mSource != AL_NONE)
 		{
 			// Update the stream
 			int processed;

Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h	2007-12-16 14:20:20 UTC (rev 499)
@@ -68,23 +68,23 @@
 		 */
 		WavSound(const Ogre::String& name, const Ogre::DataStreamPtr& soundStream, bool loop, bool stream);
 
-		/// This is called each frame to update the position, direction, etc
-		virtual bool _updateSound();
-
 	public:
 		/** Standard Destructor. */
 		virtual ~WavSound();
 
-		/** Plays the sound. */
-		virtual bool play();
-		/** Stops the sound. @note Upon calling play again, the sound will resume from the begining */
-		virtual bool stop();
-
 		/** Sets the offset within the audio stream in seconds */
 		virtual void setSecondOffset(Ogre::Real seconds);
 		/** Returns the current offset within the audio stream in seconds */
 		virtual Ogre::Real getSecondOffset();
 
+	protected:
+		/// This is called each frame to update the position, direction, etc
+		virtual bool updateSound();
+		/// Loads the buffers to be played.  Returns whether the buffer is loaded.
+		virtual bool loadBuffers();
+		/// Unloads the buffers.  Returns true if the buffers are still loaded.
+		virtual bool unloadBuffers();
+
 	private:
 		Buffer bufferData(Ogre::DataStreamPtr dataStream, int size);
 		size_t mDataStart;

Modified: trunk/python-ogre/code_generators/caelum/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/generate_code.py	2007-12-09 09:24:43 UTC (rev 498)
+++ trunk/python-ogre/code_generators/caelum/generate_code.py	2007-12-16 14:20:20 UTC (rev 499)
@@ -83,6 +83,7 @@
         main_ns = global_ns
     # Py++ doesn't know that this should be noncopyable so we set it here        
     main_ns.class_('CaelumSystem').noncopyable = True
+    main_ns.class_('LayeredClouds').noncopyable = True
               
 ############################################################
 ##

Added: trunk/python-ogre/makeall.py
===================================================================
--- trunk/python-ogre/makeall.py	                        (rev 0)
+++ trunk/python-ogre/makeall.py	2007-12-16 14:20:20 UTC (rev 499)
@@ -0,0 +1,15 @@
+import subprocess
+import environment
+
+default_projects = []
+for name,cls in environment.projects.items():
+    if cls.active:
+        process = subprocess.Popen (["scons", "PROJECTS="+name], shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        print "Processing:", name,
+        out,err = process.communicate()
+        returncode = process.returncode
+        if returncode != 0:
+            print "ERROR:",returncode, "  ", out, err
+        else:
+            print "OK"
+            

Added: trunk/python-ogre/scripts_V2/BuildModule.py
===================================================================
--- trunk/python-ogre/scripts_V2/BuildModule.py	                        (rev 0)
+++ trunk/python-ogre/scripts_V2/BuildModule.py	2007-12-16 14:20:20 UTC (rev 499)
@@ -0,0 +1,139 @@
+#
+#  BuildModule will build a Python-Ogre module.
+#
+
+## Curent
+
+from optparse import OptionParser
+import subprocess
+import environment
+import logging
+import sys
+import types
+import os
+
+logger = None
+
+def setupLogging ():
+    # 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='log.out',
+                        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)
+  
+    
+def getClassList ():
+    """ create a dictionary of classes from the enfironment modules
+    """
+    dict = {}
+    for c in dir(environment):
+        var = environment.__dict__[c]
+        if isinstance ( var, types.ClassType ) :    ## OK so we know it's a class      
+#             logger.debug ( "getClassList: Checking %s" % c )
+            if hasattr(var, 'active') and hasattr(var, 'pythonModule'):   # and it looks like one we can about
+#                 logger.debug ( "getClassList: it's one of ours")
+                dict[c] = var
+    return dict
+                
+def exit( ExitMessage ):
+     logger.error( ExitMessage )
+     sys.exit( -1 )
+
+  
+## This stuff has to be in my spawing sub process        
+# # export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$PREFIX/lib/pkgconfig
+# # export LD_LIBRARY_PATH=$PREFIX/lib
+# # export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
+# # export CXXFLAGS=$CFLAGS
+# # export LDFLAGS="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin"
+# # export PATH=$PREFIX/bin:$PATH
+# # export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages     
+     
+     
+def spawnTask ( task, cwdin = '' ):
+    """Execute a command line task and manage the return code etc
+    """
+    PREFIX = environment.PREFIX
+    PATH = os.environ["PATH"]
+    env = os.environ
+    env["PKG_CONFIG_PATH"]=PREFIX+"/lib/pkgconfig"
+    env["LD_LIBRARY_PATH"]=PREFIX+"/lib"
+    env["CFLAGS"]="\"-I"+PREFIX+"/include -L"+PREFIX+"/lib\""
+    env["CXXFLAGS"]="\"-I"+PREFIX+"/include -L"+PREFIX+"/lib\""
+    env["LDFLAGS"]="\"-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin\""
+    env["PATH"]=PREFIX+"/bin:" + PATH
+    env["PYTHONPATH"]=PREFIX+"/lib/python25/site-packages"
+
+     
+    logger.debug ( "Spawning '%s' in '%s' " % (task,cwdin) )
+    process = subprocess.Popen (task, shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd = cwdin, env=env)
+    out,err = process.communicate()
+    returncode = process.returncode
+    if returncode != 0:
+        logger.warning ( "Task Failed" )
+        logger.debug ( out )
+        logger.debug ( err )
+    return returncode     
+     
+def retrieveSource ( module ):
+    """ Here's we we retrieve the necessary source files
+    """    
+    for cmd,args,cwd in module.source:
+        l...
 
[truncated message content]

[Python-ogre-commit] SF.net SVN: python-ogre: [498] trunk/python-ogre

From: <and...@us...> - 2007-12-09 09:24:39

Revision: 498
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=498&view=rev
Author:   andy_miller
Date:     2007-12-09 01:24:43 -0800 (Sun, 09 Dec 2007)

Log Message:
-----------
I'm hoping that this fixes the relative library path stuff for Linux
Also change to look in the parent directory for plugins.cfg

Modified Paths:
--------------
    trunk/python-ogre/SConstruct
    trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
    trunk/python-ogre/scripts/04-BuildBaseLibs.sh
    trunk/python-ogre/scripts/config.sh

Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct	2007-12-09 01:08:24 UTC (rev 497)
+++ trunk/python-ogre/SConstruct	2007-12-09 09:24:43 UTC (rev 498)
@@ -150,7 +150,7 @@
         
         if environment.rpath:
             _env.Append(RPATH=_env.Literal(environment.rpath))
-            print "****", _env['RPATH']
+            _env.Append( LINKFLAGS = Split('-z origin') )
         
         # Stores signatures in a separate .sconsign file 
         # in each directory as the single one was getting huge

Modified: trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py	2007-12-09 01:08:24 UTC (rev 497)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py	2007-12-09 09:24:43 UTC (rev 498)
@@ -19,7 +19,8 @@
     import os
     import os.path
     
-    paths = [os.path.join(os.getcwd(), 'plugins.cfg'),
+    paths = [os.path.join(os.getcwd(), '../plugins.cfg'),
+             os.path.join(os.getcwd(), 'plugins.cfg'),
              '/etc/OGRE/plugins.cfg',
              os.path.join(os.path.dirname(os.path.abspath(__file__)),
                               'plugins.cfg')]

Modified: trunk/python-ogre/scripts/04-BuildBaseLibs.sh
===================================================================
--- trunk/python-ogre/scripts/04-BuildBaseLibs.sh	2007-12-09 01:08:24 UTC (rev 497)
+++ trunk/python-ogre/scripts/04-BuildBaseLibs.sh	2007-12-09 09:24:43 UTC (rev 498)
@@ -67,6 +67,7 @@
 # Install Ogre (Object Oriented Graphics Rendering Engine)
 #
 echo " -- Building Ogre"
+export ZZIPLIB_LIBS="-lzzip"
 pushd ogrenew 
 aclocal
 ./bootstrap

Modified: trunk/python-ogre/scripts/config.sh
===================================================================
--- trunk/python-ogre/scripts/config.sh	2007-12-09 01:08:24 UTC (rev 497)
+++ trunk/python-ogre/scripts/config.sh	2007-12-09 09:24:43 UTC (rev 498)
@@ -5,6 +5,7 @@
 WGETARGS="-c -nc --tries=3 --random-wait"
 WGET="`which wget` $WGETARGS"
 
+
 TEMPFILE=`mktemp`
 cat << EOF > $TEMPFILE
 #!/usr/bin/python
@@ -19,6 +20,7 @@
 export LD_LIBRARY_PATH=$PREFIX/lib
 export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
 export CXXFLAGS=$CFLAGS
+export LDFLAGS="-Wl,-rpath='\$\$ORIGIN/../../lib' -Wl,-rpath='\$\$ORIGIN' -Wl,-z,origin"
 export PATH=$PREFIX/bin:$PATH
 export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [497] trunk/python-ogre

From: <and...@us...> - 2007-12-09 01:08:20

Revision: 497
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=497&view=rev
Author:   andy_miller
Date:     2007-12-08 17:08:24 -0800 (Sat, 08 Dec 2007)

Log Message:
-----------
Finally fixed the RPATH and Origin..  Small change to Ogreal 

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/SConstruct
    trunk/python-ogre/code_generators/ogreal/generate_code.py

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-08 00:16:24 UTC (rev 496)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-09 01:08:24 UTC (rev 497)
@@ -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=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, '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-12-08 00:16:24 UTC (rev 496)
+++ trunk/python-ogre/SConstruct	2007-12-09 01:08:24 UTC (rev 497)
@@ -149,7 +149,8 @@
         _env = Environment(ENV=os.environ)
         
         if environment.rpath:
-            _env.Append(RPATH=environment.rpath)
+            _env.Append(RPATH=_env.Literal(environment.rpath))
+            print "****", _env['RPATH']
         
         # Stores signatures in a separate .sconsign file 
         # in each directory as the single one was getting huge

Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py	2007-12-08 00:16:24 UTC (rev 496)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py	2007-12-09 01:08:24 UTC (rev 497)
@@ -164,7 +164,9 @@
                         os.path.join( environment.ogreal.root_dir, "python_ogreal.h" )
                         , environment.ogreal.cache_file )
 
-    defined_symbols = [ 'OGREAL_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD', 'WIN32', '_LIB', '_MBCS', 'NDEBUG' ]
+    defined_symbols = [ 'OGREAL_NONCLIENT_BUILD', 'OGRE_NONCLIENT_BUILD' ]
+    if os.name=='nt':
+        defined_symbols= defined_symbols + [ 'WIN32', '_LIB', '_MBCS', 'NDEBUG' ]
     defined_symbols.append( 'OGREAL_VERSION_' + environment.ogreal.version )  
     
     #


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [496] trunk/python-ogre/scripts

From: <and...@us...> - 2007-12-08 00:16:23

Revision: 496
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=496&view=rev
Author:   andy_miller
Date:     2007-12-07 16:16:24 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------
Screwed up the scritp files in the last update

Modified Paths:
--------------
    trunk/python-ogre/scripts/00-PreReqs.sh
    trunk/python-ogre/scripts/01-RetrieveSource.sh
    trunk/python-ogre/scripts/config.sh

Modified: trunk/python-ogre/scripts/00-PreReqs.sh
===================================================================
--- trunk/python-ogre/scripts/00-PreReqs.sh	2007-12-07 09:55:52 UTC (rev 495)
+++ trunk/python-ogre/scripts/00-PreReqs.sh	2007-12-08 00:16:24 UTC (rev 496)
@@ -1,25 +1,6 @@
 #!/bin/bash
-# Part of the Python-Ogre installation
-if [ $DARWIN == 1 ] then
-    pushd $DOWNLOADS
-    curl -o wget-1.10.2.tar.gz http://ftp.gnu.org/pub/gnu/wget/wget-1.10.2.tar.gz
-    curl -o subversion-client-1.3.1.dmg http://metissian.com/downloads/macosx/subversion/subversion-client-1.3.1.dmg
-    curl -o python-2.5-macosx.dmg http://www.pythonmac.org/packages/py25-fat/dmg/python-2.5-macosx.dmg
-    
-    popd
-    tar zxf $DOWNLOADS/wget-1.10.2.tar.gz
-    pushd wget-1.10.2
-    ./configure --prefix='/usr'
-    make
-    sudo make install
-    popd
-    sudo open $DOWNLOADS/subversion-client-1.3.1.dmg
-    sudo open $DOWNLOADS/python-2.5-macosx.dmg
-else 
-
+# 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 patch \
 libxrandr-dev cvs subversion libxt-dev libexpat1-dev python python-dev \
 python-celementtree libglew-dev 
-
-if
\ No newline at end of file

Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh	2007-12-07 09:55:52 UTC (rev 495)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh	2007-12-08 00:16:24 UTC (rev 496)
@@ -10,38 +10,25 @@
 #
 pushd $DOWNLOADS 
 echo " -- Getting bundles"
-
-## Handle Mac/Linux differences
-if [ $DARWIN == 1 ]
-then
-# Mac files
-$WGET http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0023/Cg-1.5_Sep2007_Tiger.dmg
-$WGET http://downloads.sourceforge.net/boost/boost-jam-3.1.16-1-macosxppc.tgz
-else
-# Linux files
-$WGET http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0023/Cg-1.5_Sep2007_x86.tar.gz 
-$WGET http://prdownloads.sourceforge.net/boost/boost-jam-3.1.16-1-linuxx86.tgz 
-$WGET http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz 
-fi
-
-# Generic
-$WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2
+$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_1.tar.bz2
+$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://downloads.sourceforge.net/bullet/bullet-2.64.tgz
-
-
 ##$WGET http://devfiles.ageia.com/PhysX_2.7.2_SDK_CoreLinux_deb.tar.gz?
+$WGET http://downloads.sourceforge.net/bullet/bullet-2.64.tgz
 popd 
 cd $INSTALL_DIR
 echo " -- getting pygccxml"

Modified: trunk/python-ogre/scripts/config.sh
===================================================================
--- trunk/python-ogre/scripts/config.sh	2007-12-07 09:55:52 UTC (rev 495)
+++ trunk/python-ogre/scripts/config.sh	2007-12-08 00:16:24 UTC (rev 496)
@@ -5,19 +5,6 @@
 WGETARGS="-c -nc --tries=3 --random-wait"
 WGET="`which wget` $WGETARGS"
 
-
-TEMPFILE=`mktemp -t temp.XXXXX`
-cat << EOF > $TEMPFILE
-#!/usr/bin/python
-import sys,os
-if sys.platform=='darwin':
-   print 1
-else : print 0
-EOF
-DARWIN=`python $TEMPFILE`
-rm $TEMPFILE
-
-
 TEMPFILE=`mktemp`
 cat << EOF > $TEMPFILE
 #!/usr/bin/python


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [495] trunk/python-ogre/demos/particleuniverse

From: <and...@us...> - 2007-12-07 09:55:47

Revision: 495
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=495&view=rev
Author:   andy_miller
Date:     2007-12-07 01:55:52 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------
Need the media files for the demo to work

Added Paths:
-----------
    trunk/python-ogre/demos/particleuniverse/Media/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/gui/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/gui/puviewer.layout
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_burst.material
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_explosion.material
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_flame.material
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_generic.material
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_lightning.material
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_lod.material
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_rain.material
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_tornado.material
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/stone.material
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/models/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/models/pu_stone.mesh
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_11_20.pu
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_1_10.pu
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_21_30.pu
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_explosion.pu
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_flame.pu
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_generic.pua
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_lightning.pu
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_lod.pu
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_rain.pu
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_tornado.pu
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/128x128/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/128x128/pu_mist_01_128x128.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/128x128/pu_smoke_01_128x128.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/128x128/pu_smoke_02_128x128.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/128x128/pu_star_01_128x128.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/128x128/pu_star_02_128x128.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/128x128/pu_water_01_128x128.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_flare_10_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_flare_11_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_flare_12_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_flare_13_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_flare_14_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_flare_15_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_flare_16_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_flare_17_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_flare_23_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/256x256/pu_smoke_01_256x256.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/32x32/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/32x32/pu_rain_01.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_dot_01_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_dot_02_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_dot_03_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_dot_04_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_explode_01_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_fire_01_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_flare_01_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_flare_02_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_flare_03_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_ice_01_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_nucleus.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_smoke_01_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_smoke_02_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_star_01_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_star_02_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_star_03_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_star_04_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_star_05_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/64x64/pu_star_06_64x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/crate6.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_barrel.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_blue_ball.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_circle.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_dirt_256x512.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_dot_5x5.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_flame.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_green_ball.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_hart.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_lightning_20x64.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_red_ball.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_ribbontrail.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_sand_336x330.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_smoke.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_smoke_428x427.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_smoke_black_192x192.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_smoke_brown_336x330.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_smoke_grey_312x312.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_smoke_grey_336x330.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_smoke_red_192x192.png
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/pu_stone.jpeg
    trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/textures/various/sand.jpeg

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/gui/puviewer.layout
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/gui/puviewer.layout	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/gui/puviewer.layout	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,71 @@
+<?xml version="1.0" ?>
+<GUILayout>
+<Window Type="DefaultGUISheet" Name="root">
+    <Window Type="DefaultGUISheet" Name="ParticleUniverseViewer">
+		<Property Name="UnifiedSize" Value="{{1,0},{1,0}}" />
+
+		<Window Type="TaharezLook/FrameWindow" Name="ParticleUniverseViewer/WindowPropertiesWindow">
+			<Property Name="UnifiedSize" Value="{{0.25,0},{0.8,0}}"  />
+	            <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
+	            <Property Name="TitlebarEnabled" Value="true" />
+	            <Property Name="CloseButtonEnabled" Value="false" />
+			<Property Name="Text" Value="Particle Universe Viewer" />
+
+			<Window Type="TaharezLook/Listbox" Name="ParticleUniverseViewer/ListboxTemplates">
+				<Property Name="UnifiedPosition" Value="{{0.05,0},{0.05,0}}"  />
+				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+				<Property Name="UnifiedSize" Value="{{0.9,0},{0.46,0}}"  />
+			</Window>
+
+			<Window Type="TaharezLook/StaticText" Name="ParticleUniverseViewer/SelectedName">
+				<Property Name="UnifiedPosition" Value="{{0.05,0},{0.52,0}}"  />
+				<Property Name="UnifiedSize" Value="{{0.9,0},{0.05,0}}"  />
+				<Property Name="BackgroundEnabled" Value="True" />
+			</Window>
+
+			<Window Type="TaharezLook/Button" Name="ParticleUniverseViewer/ButtonStart">
+				<Property Name="UnifiedPosition" Value="{{0.1,0},{0.58,0}}"  />
+				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+				<Property Name="UnifiedSize" Value="{{0.8,0},{0.05,0}}"  />
+				<Property Name="Text" Value="Start" />
+			</Window>
+
+			<Window Type="TaharezLook/Button" Name="ParticleUniverseViewer/ButtonPause">
+				<Property Name="UnifiedPosition" Value="{{0.1,0},{0.64,0}}"  />
+				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+				<Property Name="UnifiedSize" Value="{{0.8,0},{0.05,0}}"  />
+				<Property Name="Text" Value="Pause" />
+			</Window>
+
+			<Window Type="TaharezLook/Button" Name="ParticleUniverseViewer/ButtonResume">
+				<Property Name="UnifiedPosition" Value="{{0.1,0},{0.70,0}}"  />
+				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+				<Property Name="UnifiedSize" Value="{{0.8,0},{0.05,0}}"  />
+				<Property Name="Text" Value="Resume" />
+			</Window>
+
+			<Window Type="TaharezLook/Button" Name="ParticleUniverseViewer/ButtonStop">
+				<Property Name="UnifiedPosition" Value="{{0.1,0},{0.76,0}}"  />
+				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+				<Property Name="UnifiedSize" Value="{{0.8,0},{0.05,0}}"  />
+				<Property Name="Text" Value="Stop" />
+			</Window>
+
+			<Window Type="TaharezLook/Checkbox" Name="ParticleUniverseViewer/CheckResetCamera" >
+				<Property Name="UnifiedPosition" Value="{{0.1,0},{0.82,0}}"  />
+				<Property Name="Text" Value="Reset Camera" />
+				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+				<Property Name="UnifiedSize" Value="{{0.8,0},{0.05,0}}"  />
+			</Window>
+
+			<Window Type="TaharezLook/Checkbox" Name="ParticleUniverseViewer/CheckSkybox" >
+				<Property Name="UnifiedPosition" Value="{{0.1,0},{0.88,0}}"  />
+				<Property Name="Text" Value="Skybox" />
+				<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+				<Property Name="UnifiedSize" Value="{{0.8,0},{0.05,0}}"  />
+			</Window>
+        </Window>
+	</Window>
+</Window>
+
+</GUILayout>

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_burst.material
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_burst.material	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_burst.material	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,33 @@
+material ParticleUniverse/GreenBall
+{
+	technique
+	{
+		pass
+		{
+			depth_write off
+			scene_blend alpha_blend
+			texture_unit
+			{
+				texture pu_green_ball.png
+			}
+		}
+	}
+}
+
+material ParticleUniverse/BurstFlare
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+			scene_blend add
+			texture_unit
+			{
+				texture pu_dot_03_64x64.png
+			}
+		}
+	}
+}
+

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_explosion.material
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_explosion.material	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_explosion.material	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,73 @@
+material ParticleUniverse/ExplosionFire
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+			scene_blend add
+			fog_override true
+
+			texture_unit
+			{
+				texture pu_smoke_02_128x128.png
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+material ParticleUniverse/Nucleus
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture pu_nucleus.png
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+material ParticleUniverse/Debris
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture pu_fire_01_64x64.png
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+//-----------------------------------------------------------------------------------------------------------------------------------------------
+material ParticleUniverse/Dirt
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+			scene_blend alpha_blend
+			texture_unit
+			{
+				texture pu_dirt_256x512.png
+				tex_address_mode clamp
+			}
+		}
+	}
+}

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_flame.material
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_flame.material	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_flame.material	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,56 @@
+material ParticleUniverse/Flame
+{
+	technique
+	{
+		pass
+		{
+			scene_blend add
+			depth_write off
+			texture_unit
+			{
+				texture pu_flame.png
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+//-----------------------------------------------------------------------------------------------------------------------------------------------
+material ParticleUniverse/Fire
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+			texture_unit
+			{
+				texture pu_flame.png
+				tex_address_mode clamp
+				wave_xform scroll_x sine 0 0.3 0 0.15
+			}
+		}
+	}
+}
+//-----------------------------------------------------------------------------------------------------------------------------------------------
+material ParticleUniverse/Smoke
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+			scene_blend alpha_blend
+
+			texture_unit
+			{
+				texture pu_smoke_brown_336x330.png
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+//-----------------------------------------------------------------------------------------------------------------------------------------------
+

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_generic.material
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_generic.material	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_generic.material	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,119 @@
+material ParticleUniverse/Street
+{
+	technique
+	{
+		pass
+		{
+			texture_unit
+			{
+				texture pu_street.jpeg
+				scale 0.05 0.05
+			}
+		}
+	}
+}
+
+material ParticleUniverse/Sand
+{
+	technique
+	{
+		pass
+		{
+			texture_unit
+			{
+				texture sand.jpeg
+				tex_address_mode mirror
+			}
+		}
+	}
+}
+
+material ParticleUniverse/ColourFlare
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend alpha_blend
+			depth_write off
+
+			texture_unit
+			{
+				texture pu_star_06_64x64.png
+			}
+		}
+	}
+}
+
+material ParticleUniverse/Crate
+{
+	technique
+	{
+		pass
+		{
+			texture_unit
+			{
+				texture crate6.png
+			}
+		}
+	}
+}
+
+material ParticleUniverse/Star
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+			scene_blend add
+			fog_override true
+
+			texture_unit
+			{
+				texture pu_flare_12_256x256.png
+				tex_address_mode clamp
+			}
+		}
+	}
+}
+
+material ParticleUniverse/RibbonTrail
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend add
+			depth_write off
+
+			texture_unit
+			{
+				texture pu_ribbontrail.png 1d
+				tex_address_mode clamp
+				filtering none
+			}
+		}
+	}
+}
+
+material ParticleUniverse/Hart
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend alpha_blend
+			depth_write off
+
+			texture_unit
+			{
+				texture pu_hart.png
+			}
+		}
+	}
+}

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_lightning.material
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_lightning.material	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_lightning.material	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,17 @@
+material ParticleUniverse/Lightning
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			scene_blend alpha_blend
+			depth_write off
+
+			texture_unit
+			{
+				texture pu_lightning_20x64.png
+			}
+		}
+	}
+}
\ No newline at end of file

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_lod.material
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_lod.material	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_lod.material	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,15 @@
+material ParticleUniverse/RustyBarrel
+{
+	technique
+	{
+		pass
+		{
+			depth_write off
+			scene_blend alpha_blend
+			texture_unit
+			{
+				texture pu_barrel.png
+			}
+		}
+	}
+}

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_rain.material
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_rain.material	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_rain.material	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,31 @@
+material ParticleUniverse/Circle
+{
+	technique
+	{
+		pass
+		{
+			depth_write off
+			scene_blend alpha_blend
+			texture_unit
+			{
+				texture pu_circle.png
+			}
+		}
+	}
+}
+
+material ParticleUniverse/Rain_01
+{
+	technique
+	{
+		pass
+		{
+			scene_blend add
+			depth_write off
+			texture_unit
+			{
+				texture pu_rain_01.png
+			}
+		}
+	}
+}

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_tornado.material
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_tornado.material	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/pu_tornado.material	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,20 @@
+//-----------------------------------------------------------------------------------------------------------------------------------------------
+material ParticleUniverse/Tornado
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+			scene_blend alpha_blend
+
+			texture_unit
+			{
+				texture pu_sand_336x330.png
+			}
+		}
+	}
+}
+//-----------------------------------------------------------------------------------------------------------------------------------------------
+

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/stone.material
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/stone.material	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/material/stone.material	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,18 @@
+//-----------------------------------------------------------------------------------------------------------------------------------------------
+material ParticleUniverse/Stone
+{
+	technique
+	{
+		pass
+		{
+			lighting off
+			depth_write off
+			texture_unit
+			{
+				texture pu_stone.jpeg
+				scale 0.5 0.5
+			}
+		}
+	}
+}
+//-----------------------------------------------------------------------------------------------------------------------------------------------

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/models/pu_stone.mesh
===================================================================
(Binary files differ)


Property changes on: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/models/pu_stone.mesh
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_11_20.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_11_20.pu	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_11_20.pu	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,458 @@
+// ---------------------------------------------------------------------------------------------------------------
+// example_011:
+// - This is a simple particle system that demonstrates the dynamic behaviour of emission rate and velocity.
+//   Adding control points, the emission rate and velocity are defined as a curve within the interval of 0..8 seconds.
+// ---------------------------------------------------------------------------------------------------------------
+system example_011
+{
+	technique
+	{
+		renderer Billboard
+		{
+			billboard_type				oriented_shape
+			billboard_origin			bottom_center
+		}
+		material						ParticleUniverse/GreenBall
+		default_particle_width			2
+		default_particle_height			2
+		visual_particle_quota			500
+		emitter							Point
+		{
+			emission_rate				dyn_curved_spline
+			{
+				control_point			0 5
+				control_point			2 20
+				control_point			4 200
+				control_point			6 30
+				control_point			8 0
+			}
+			angle						25
+			direction					0 1 0
+			velocity					dyn_curved_spline
+			{
+				control_point			0 100
+				control_point			2 200
+				control_point			4 400
+				control_point			6 100
+				control_point			8 0
+			}
+			time_to_live				dyn_random
+			{
+				min						2
+				max						6
+			}
+		}
+		affector						LinearForce
+		{
+			force_aff_vector			0 -100 0
+		}
+		affector						Align
+		{
+			align_aff_resize			true
+
+		}
+	}
+}
+
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_012:
+// - With the use of the Jet affector, it possible to give the velocity another non-linear boost.
+// ---------------------------------------------------------------------------------------------------------------
+system example_012
+{
+	technique
+	{
+		// Use the billboard renderer defined in the *.pua script
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/BurstFlare
+		default_particle_width			10
+		default_particle_height			10
+		visual_particle_quota			2000
+		emitter							SphereSurface
+		{
+			sphere_surface_em_radius	100
+			auto_direction				true
+			emission_rate				100
+			velocity					0
+			time_to_live				4
+			duration					2
+		}
+		
+		// Wait 2 seconds until the handler is activated.
+		observer						OnTime
+		{
+			on_time						greater_than 2
+			since_start_system			true
+			handler						DoEnableComponent
+			{
+				enable_component		affector_component myJet true
+			}
+		}
+		
+		// Change the colour of the particle
+		affector						Colour
+		{
+			colour_aff_time_colour		0 1 0 0
+			colour_aff_time_colour		0.6 0 1 1
+			colour_aff_time_colour		1 0 0 1
+		}
+		
+		// Change the scale of the particle
+		affector						Scale
+		{
+			scale						10
+		}
+
+		// Apply a boost if the Jet affector is enabled
+		affector						Jet myJet
+		{
+			enabled						false
+			jet_aff_accel				dyn_random
+			{
+				min						1
+				max						20
+			}
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_013:
+// - The Particle Follower makes sure that emitted particle always be kept in the neighbourhood of their
+//   predecessors.
+// ---------------------------------------------------------------------------------------------------------------
+system example_013
+{
+	technique
+	{
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/GreenBall
+		default_particle_width			30
+		default_particle_height			30
+		visual_particle_quota			1000
+		emitter							Box
+		{
+			emission_rate				20
+			angle						90
+			direction					0 1 0
+			velocity					400
+			time_to_live				7
+		}
+		affector						LinearForce
+		{
+			force_aff_vector			0 -80 0
+		}
+		affector						ParticleFollower
+		{
+			follower_min_distance		60
+			follower_max_distance		300
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_014:
+// - The Mesh Surface Emitter emits particles on the surface of a mesh.
+// ---------------------------------------------------------------------------------------------------------------
+system example_014
+{
+	technique
+	{
+		position						0 0 1200
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/GreenBall
+		default_particle_width			0.5
+		default_particle_height			0.5
+		visual_particle_quota			5000
+		emitter							MeshSurface
+		{
+			emission_rate				5000
+			force_emission				true
+			mesh_surface_mesh_name		ogrehead.mesh
+			mesh_surface_distribution	heterogeneous_2
+			time_to_live				10
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_015:
+// - Particles collide with the SphereCollider and bounce, while their velocity and rotation speed decrease.
+// ---------------------------------------------------------------------------------------------------------------
+system example_015
+{
+	technique
+	{
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/Star
+		default_particle_width			50
+		default_particle_height			50
+		visual_particle_quota			3000
+		emitter							Box
+		{
+			position					0 0 0
+			box_em_width				300
+			box_em_height				10
+			box_em_depth				300
+			emission_rate				20
+			angle						10
+			direction					0 1 0
+			velocity					200
+			time_to_live				7
+		}
+		affector						SphereCollider
+		{
+			position					0 400 0
+			sphere_collider_radius		300
+			collision_intersection		point
+			collision_type				flow
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_016:
+// - Scale Affector, using separate scaling for x and y in combination with control points, to simulate an
+//   explosion type of effect (fast scaling at the start).
+// ---------------------------------------------------------------------------------------------------------------
+system example_016
+{
+	technique
+	{
+		renderer						Billboard
+		{
+			billboard_type				oriented_self
+			billboard_origin			bottom_center
+		}
+		material						ParticleUniverse/Dirt
+		default_particle_width			1
+		default_particle_height			6
+		visual_particle_quota			3000
+		emitter							Point
+		{
+			position					0 0 0
+			emission_rate				10
+			force_emission				true
+			angle						60
+			direction					0 1 0
+			velocity					dyn_random
+			{
+				min						10
+				max						30
+			}
+			time_to_live				4
+		}
+		affector						Scale
+		{
+			// Start with fast expansion
+			x_scale						dyn_curved_linear
+			{
+				control_point			0 400
+				control_point			0.2 200
+				control_point			0.4 100
+				control_point			0.6 50
+				control_point			4 0
+			}
+			y_scale						dyn_curved_linear
+			{
+				control_point			0 1000
+				control_point			0.2 500
+				control_point			0.4 200
+				control_point			0.6 100
+				control_point			4 0
+			}
+		}
+		affector						Colour
+		{
+			colour_aff_time_colour		0 1 1 1 1
+			colour_aff_time_colour		0.4 1 1 1 1
+			colour_aff_time_colour		0.5 1 1 1 0
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_017:
+// - PlaneCollider
+// ---------------------------------------------------------------------------------------------------------------
+system example_017
+{
+	technique
+	{
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/Star
+		default_particle_width			120
+		default_particle_height			120
+		visual_particle_quota			3000
+		emitter							Box
+		{
+			position					0 400 0
+			box_em_width				500
+			box_em_height				10
+			box_em_depth				500
+			emission_rate				5
+			angle						40
+			direction					1 -1 0
+			velocity					50
+			time_to_live				10
+		}
+		observer						OnVelocity
+		{
+			// Don\xB4t move anymore if the velocity is low
+			velocity_threshold			less_than 3
+			handler	DoFreeze {}
+		}
+		affector						PlaneCollider
+		{
+			position					0 -200 0
+			plane_collider_normal		0 1 0
+			collision_intersection		point
+			collision_type				bounce
+
+			// friction and bouncyness decrease rotation speed and velocity
+			collision_friction			0.7
+			collision_bouncyness		0.7
+
+		}
+		affector						TextureRotator
+		{
+			// Decrease of rotation speed if a particle collides is only possible if the particle controls 
+			// its own rotation speed.
+			tex_rot_use_own_rotation	true
+			tex_rot_speed				10
+		}
+		affector						LinearForce
+		{
+			force_aff_vector			0 -1200 0
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_018:
+// - With the OnCount observer the number of emitted particles are managed precisely.
+// ---------------------------------------------------------------------------------------------------------------
+system example_018
+{
+	technique
+	{
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/Hart
+		default_particle_width			50
+		default_particle_height			50
+		emitter							Point
+		{
+			emission_rate				50
+			angle						360
+			direction					0 1 0
+			velocity					400
+			time_to_live				5
+		}
+		observer						OnCount
+		{
+			count_threshold			    greater_than 200
+			handler						DoStopSystem {}
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_019:
+// - BoxCollider.
+// ---------------------------------------------------------------------------------------------------------------
+system example_019
+{
+	technique
+	{
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/Star
+		default_particle_width			10
+		default_particle_height			10
+		visual_particle_quota			5000
+		
+		emitter							Box
+		{
+			position					100 300 100
+			box_em_width				300
+			box_em_height				10
+			box_em_depth				300
+			emission_rate				1000
+			angle						50
+			direction					-1 -2 -1
+			velocity					200
+			time_to_live				15
+		}
+		affector						BoxCollider
+		{
+			position					0 100 0
+			box_collider_width			150
+			box_collider_height			150
+			box_collider_depth			150
+			collision_intersection		box
+			collision_type				bounce
+			collision_bouncyness		0.2
+		}
+		// Make sure that an emitted particle is white at the start
+		observer						OnEmission
+		{
+			// This handler causes the 'colourReset' affector to be called only once
+			handler						DoAffector
+			{
+				force_affector			colourReset
+			}
+		}
+		// If the particle collides, it will turn red
+		observer						OnCollision
+		{
+			// This handler causes the 'colourCollision' affector to be called only once
+			handler						DoAffector
+			{
+				force_affector			colourCollision
+			}
+		}
+		affector						Colour	colourReset
+		{
+			enabled						false
+			colour_aff_time_colour		0 1 1 1
+		}
+		affector						Colour	colourCollision
+		{
+			enabled						false
+			colour_aff_time_colour		0 1 0 0
+		}
+		affector						LinearForce
+		{
+			force_aff_vector			0 -100 0
+		}
+	}
+}
+// ---------------------------------------------------------------------------------------------------------------
+// example_020:
+// - Randomiser (affector)
+// ---------------------------------------------------------------------------------------------------------------
+system example_020
+{
+	technique
+	{
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/Star
+		default_particle_width			50
+		default_particle_height			50
+		emitter							Point
+		{
+			emission_rate				2
+			angle						360
+			direction					0 1 0
+			velocity					1
+			time_to_live				10
+		}
+		affector						Randomiser
+		{
+			rand_aff_max_deviation_x	200
+			rand_aff_max_deviation_y	200
+			rand_aff_max_deviation_z	200
+			rand_aff_time_step			0.1
+		}
+	}
+}

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_1_10.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_1_10.pu	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_1_10.pu	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,399 @@
+// ---------------------------------------------------------------------------------------------------------------
+// Define some aliasses for convenience
+// ---------------------------------------------------------------------------------------------------------------
+alias									$PointEmitter
+{
+	emitter								Point
+	{
+		emission_rate					50
+		angle							25
+		direction						0 1 0
+		velocity						220
+		time_to_live					3
+	}
+}
+alias									$LinearForce
+{
+	affector							LinearForce
+	{
+		force_aff_vector				0 -100 0
+	}
+}
+// ---------------------------------------------------------------------------------------------------------------
+// example_001:
+// - fixed_timeout
+// - nonvisible_update_timeout
+// - iteration_interval
+// - use emitter and affector alias
+// Example will present shocking movement, because the iteration_interval is set high
+// ---------------------------------------------------------------------------------------------------------------
+system example_001
+{
+	fixed_timeout						10
+	nonvisible_update_timeout			3
+	iteration_interval					0.1
+	technique
+	{
+		// Use the billboard renderer defined in the *.pua script
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/GreenBall
+		default_particle_width			20
+		default_particle_height			20
+		visual_particle_quota			500
+		use_alias						$PointEmitter
+		use_alias						$LinearForce
+	}
+}
+// ---------------------------------------------------------------------------------------------------------------
+// example_002:
+// - duration
+// - repeat/delay
+// ---------------------------------------------------------------------------------------------------------------
+system example_002
+{
+	technique
+	{
+		// Use the billboard renderer defined in the *.pua script
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/Hart
+		default_particle_width			50
+		default_particle_height			50
+		visual_particle_quota			500
+		emitter							Point
+		{
+			// Disable the emitter initially. The repeat_delay will enable it again after \xB4x\xB4 seconds.
+			enabled						false
+			emission_rate				50
+			duration					dyn_random
+			{
+				min						0.1
+				max						3
+			}
+			repeat_delay				dyn_random
+			{
+				min						0.1
+				max						3
+			}
+			angle						25
+			direction					0 1 0
+			velocity					220
+			time_to_live				3
+		}
+		use_alias						$LinearForce
+	}
+}
+// ---------------------------------------------------------------------------------------------------------------
+// example_003:
+// - position
+// See how position of the technique, emitter and the SceneNode are combined.
+// ---------------------------------------------------------------------------------------------------------------
+system example_003
+{
+	technique
+	{
+		position						500 0 0
+		material						ParticleUniverse/GreenBall
+		default_particle_width			20
+		default_particle_height			20
+		visual_particle_quota			500
+		// Use the billboard renderer defined in the *.pua script
+		use_alias						$defaultBillboardRenderer
+		emitter							Point
+		{
+			position					0 200 0
+			emission_rate				50
+			angle						25
+			direction					0 1 0
+			velocity					200
+			time_to_live				40
+			duration					2
+		}
+		affector						Gravity
+		{
+			position					-500 400 0
+			gravity						50000
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_004:
+// - Sphere surface emitter
+// - Colour Affector
+// ---------------------------------------------------------------------------------------------------------------
+system example_004
+{
+	technique
+	{
+		// Use the billboard renderer defined in the *.pua script
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/Star
+		default_particle_width			20
+		default_particle_height			20
+		visual_particle_quota			1500
+		emitter							SphereSurface
+		{
+			position					0 200 0
+			sphere_surface_em_radius	100
+			emission_rate				250
+			velocity					0
+			time_to_live				1.8
+		}
+		affector						Colour
+		{
+			colour_aff_time_colour		0 1 1 0 1
+			colour_aff_time_colour		1 1 0 0 0
+		}
+		affector						Gravity
+		{
+			position					0 200 0
+			gravity						5000
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_005:
+// - Vertex emitter
+// The particles are emitted along the outline of the mesh. If all particles are gone, the particle system stops.
+// ---------------------------------------------------------------------------------------------------------------
+system example_005
+{
+	technique
+	{
+		position						0 0 1000
+		// Use the billboard renderer defined in the *.pua script
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/Star
+		default_particle_width			5
+		default_particle_height			5
+		visual_particle_quota			1500
+		emitter							Vertex
+		{
+			vertex_em_mesh_name			athene.mesh
+			vertex_em_step				30
+			vertex_em_segments			5
+			vertex_em_iterations		5
+			position					0 0 0
+			emission_rate				500
+			angle						360
+			direction					0 1 0
+			velocity					2
+			time_to_live				7
+		}
+		observer						OnClear
+		{
+			handler						DoStopSystem {}
+		}
+		affector						Colour
+		{
+			colour_aff_time_colour		0 1 1 0
+			colour_aff_time_colour		1 0 0 0
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_006:
+// - Entity Renderer
+// ---------------------------------------------------------------------------------------------------------------
+system example_006
+{
+	technique
+	{
+		default_particle_width			80
+		default_particle_height			80
+		default_particle_depth			10
+		visual_particle_quota			10
+		material						ParticleUniverse/Crate
+
+		renderer						Entity
+		{
+			entity_renderer_mesh_name	WoodPallet.mesh
+		}
+		
+		emitter							Point
+		{
+			emission_rate				5
+			angle						40
+			direction					0 1 0
+			velocity					300
+			time_to_live				10
+		}
+		
+		affector						LinearForce
+		{
+			force_aff_vector			0 -100 0
+		}
+		affector						Align
+		{
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_007:
+// - emitted emitters
+// This is the Particle Universe version of Ogre's fireworks particle system
+// ---------------------------------------------------------------------------------------------------------------
+system example_007
+{
+	technique
+	{
+		default_particle_width			10
+		default_particle_height			10
+		visual_particle_quota			1000
+		emitted_emitter_quota			10
+		use_alias						$defaultBillboardRenderer
+		material						Examples/Flare
+
+		emitter							Box
+		{
+			emits						emitter_particle	explosion
+			angle						20
+			emission_rate				1000
+			direction					0 1 0
+			velocity					260
+			time_to_live				3
+		}
+
+		emitter							Point				explosion
+		{
+			enabled						false
+			angle						360
+			emission_rate				1000
+			time_to_live				2
+			direction					0 1 0
+			velocity					80
+			duration					0.1
+			repeat_delay				dyn_random
+			{
+				min						2
+				max						3
+			}
+		}
+
+		affector						LinearForce
+		{
+			force_aff_vector			0 -100 0
+			force_aff_application		add
+		}
+
+		affector						Colour
+		{
+			colour_aff_time_colour		0 1 1 0
+			colour_aff_time_colour		0.5 1 0 0
+			colour_aff_time_colour		0.9 0 0 1
+			colour_aff_time_colour		1 0 0 0
+		}
+	}
+}
+// ---------------------------------------------------------------------------------------------------------------
+// example_008:
+// - OnQuota observer
+// This particle system emits visual particles until the visual particle quota has been reached. This activates
+// the event handler, which disables the emitter from further emission of particles. This way the emitter only
+// emits the number of particles defined by the quota and then stops.
+// ---------------------------------------------------------------------------------------------------------------
+system example_008
+{
+	technique
+	{
+		// Use the billboard renderer defined in the *.pua script
+		use_alias						$defaultBillboardRenderer
+		
+		material						ParticleUniverse/Hart
+		default_particle_width			50
+		default_particle_height			50
+		visual_particle_quota			200
+
+		emitter							Point myPointEmitter
+		{
+			emission_rate				100
+			angle						25
+			direction					0 1 0
+			velocity					220
+			time_to_live				5
+		}
+
+		observer						OnQuota
+		{
+			observe_particle_type		visual_particle
+			handler						DoEnableComponent
+			{
+				enable_component		emitter_component myPointEmitter false
+			}
+		}
+
+		use_alias						$LinearForce
+	}
+}
+// ---------------------------------------------------------------------------------------------------------------
+// example_009:
+// - Circle emitter
+// ---------------------------------------------------------------------------------------------------------------
+system example_009
+{
+	technique
+	{
+		// Use the billboard renderer defined in the *.pua script
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/GreenBall
+		default_particle_width			10
+		default_particle_height			10
+		visual_particle_quota			5000
+		emitter							Circle
+		{
+			emission_rate				1000
+			auto_direction				true
+			time_to_live				5
+			circle_em_radius			100
+			circle_em_random			false
+			circle_em_step				0.2
+			velocity					70
+		}
+		affector						SineForce
+		{
+			force_aff_vector			0 80 0
+			sinef_aff_frequency_min		5
+			sinef_aff_frequency_max		5
+		}
+	}
+}
+// ---------------------------------------------------------------------------------------------------------------
+// example_010:
+// - Circle emitter
+// ---------------------------------------------------------------------------------------------------------------
+system example_010
+{
+	technique
+	{
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/Star
+		default_particle_width			20
+		default_particle_height			20
+		visual_particle_quota			2000
+		emitter							Circle
+		{
+			emission_rate				300
+			direction					0 1 0
+			time_to_live				4
+			circle_em_radius			100
+			velocity					20
+		}
+		affector						Colour
+		{
+			colour_aff_time_colour		0 0 1 0
+			colour_aff_time_colour		0.8 0 0 1
+			colour_aff_time_colour		1 0 0 0
+		}
+		affector						Jet
+		{
+			jet_aff_accel				dyn_random
+			{
+				min						0.1
+				max						1
+			}
+		}
+	}
+}

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_21_30.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_21_30.pu	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_21_30.pu	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,143 @@
+// ---------------------------------------------------------------------------------------------------------------
+// example_021:
+// ---------------------------------------------------------------------------------------------------------------
+system example_021
+{
+	technique
+	{
+		position						-800 0 0
+		default_particle_width			30
+		default_particle_height			30
+		visual_particle_quota			5000
+		emitted_emitter_quota			1
+		use_alias						$defaultBillboardRenderer
+		material						Examples/Flare
+
+		emitter							Point
+		{
+			emits						emitter_particle	Flares
+			emission_rate				1
+			direction					1 0 0
+			velocity					2000
+			time_to_live				5
+		}
+
+		emitter							SphereSurface		Flares
+		{
+			angle						360
+			sphere_surface_em_radius	100
+			auto_direction				true
+			emission_rate				3000
+			time_to_live				dyn_random
+			{
+				min						1
+				max						3
+			}
+			velocity					dyn_random
+			{
+				min						60
+				max						250
+			}
+		}
+		affector						Colour
+		{
+			colour_aff_time_colour		0 1 0 1
+			colour_aff_time_colour		0.5 1 0 0
+			colour_aff_time_colour		0.9 0 1 0
+			colour_aff_time_colour		1 0 0 0
+		}
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_022: RibbonTrailRenderer
+// ---------------------------------------------------------------------------------------------------------------
+system example_022
+{
+	technique
+	{
+		// Set the quota low
+		visual_particle_quota					40
+		default_particle_width					10
+		material								ParticleUniverse/RibbonTrail
+		renderer								RibbonTrail
+		{
+			ribbontrail_vertex_colours			true
+			ribbontrail_max_elements			60
+			ribbontrail_length					600
+			ribbontrail_random_initial_colour	true
+			ribbontrail_colour_change			0.8 0.8 0.8 0.8
+		}
+		emitter									Point
+		{
+			emission_rate						10
+			angle								360
+			direction							0 1 0
+			velocity							1500
+			time_to_live						40
+		}
+		affector								Gravity
+		{
+			position							0 -200 -100
+			gravity								550000
+		}
+		affector								Gravity
+		{
+			position							0 200 100
+			gravity								550000
+		}
+	}
+}
+// ---------------------------------------------------------------------------------------------------------------
+// example_023:
+// - Exclude emitters
+// - PathFollower
+// ---------------------------------------------------------------------------------------------------------------
+system example_023
+{
+	technique
+	{
+		default_particle_width			10
+		default_particle_height			10
+		visual_particle_quota			3000
+		emitted_emitter_quota			10
+		use_alias						$defaultBillboardRenderer
+		material						Examples/Flare
+
+		emitter							Point
+		{
+			emits						emitter_particle	flares
+			angle						360
+			emission_rate				4
+			direction					0 0.1 0
+			velocity					200
+			time_to_live				4
+		}
+
+		emitter							Point				flares
+		{
+			angle						360
+			emission_rate				200
+			time_to_live				2
+			direction					0 1 0
+			velocity					80
+		}
+
+		affector						Colour
+		{
+			colour_aff_time_colour		0 1 1 1
+			colour_aff_time_colour		0.6 1 1 0
+			colour_aff_time_colour		0.9 1 0 0
+			colour_aff_time_colour		1 0 0 0
+		}
+		affector						PathFollower
+		{
+			exclude_emitter				"flares"
+			path_follower_point			-40 -10 -40
+			path_follower_point			-10 50 40
+			path_follower_point			-10 -20 -10
+			path_follower_point			40 -50 70
+			path_follower_point			-100 -10 -60
+		}
+	}
+}

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_explosion.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_explosion.pu	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_explosion.pu	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,197 @@
+// ------------------------------------------- Begin: Explosion system -------------------------------------------
+// The explosion system is an example of a complex particle system.
+// Note, that the Projectiles and debris are not emitted immediately, but only after some time to make the effect
+// look a bit more realistic.
+// ---------------------------------------------------------------------------------------------------------------
+system explosionSystem
+{
+	// --------------- The Flame Burst ---------------
+	technique
+	{
+		use_alias						$defaultBillboardRenderer
+		material						ParticleUniverse/ExplosionFire
+		default_particle_width			10
+		default_particle_height			10
+		visual_particle_quota			500
+		emitter							SphereSurface		BurstEmitter
+		{
+			emission_rate				20
+			auto_direction				true
+			sphere_surface_em_radius	5
+			velocity					100
+			time_to_live				2
+		}
+		
+		// Change the colour of the burst
+		affector						Colour
+		{
+			colour_aff_time_colour		0 1 1 0.95
+			colour_aff_time_colour		0.5 0.18 0.05 0.01
+			colour_aff_time_colour		1 0 0 0
+		}
+		
+		// Let it grow fast, equally in all dimensions
+		affector						Scale
+		{
+			scale						200
+		}
+
+		// After 0.7 seconds, the emitters stops
+		observer						OnTime
+		{
+			on_time						greater_than 0.7
+			since_start_system			true
+			handler						DoEnableComponent
+			{
+				enable_component		emitter_component	BurstEmitter	false
+			}
+		}
+	}
+	
+	// --------------- Projectiles (this technique is responsible for emitting the projectiles) ---------------
+	technique
+	{
+		use_alias						$defaultBillboardRenderer
+		emitted_technique_quota			6
+
+		// Emit the technique that is responsible for the projectiles
+		emitter							Point	NucleusEmitter
+		{
+			enabled						false
+			emission_rate				6
+			emits						technique_particle	NucleusTechnique
+			force_emission				true
+			angle						80
+			direction					0 1 0
+			velocity					300
+			time_to_live				10
+		}
+		
+		// Apply some kind of gravity
+		affector						LinearForce
+		{
+			force_aff_vector			0 -100 0
+		}
+
+		// After 0.3 seconds, the emitter starts
+		observer						OnTime
+		{
+			on_time						greater_than 0.3
+			since_start_system			true
+			handler						DoEnableComponent
+			{
+				enable_component		emitter_component	NucleusEmitter	true
+			}
+		}
+	}
+	
+	// --------------- The emitted Projectile ---------------
+	technique							NucleusTechnique
+	{
+		material						ParticleUniverse/Nucleus
+		default_particle_width			15
+		default_particle_height			15
+		visual_particle_quota			500
+		
+		// 'oriented_self' doesn't work, because the direction of the particle is zero. 
+		// So use the default settings
+		use_alias						$defaultBillboardRenderer
+		emitter							Point
+		{
+			emission_rate				100
+			direction					0 -1 0
+			angle						360
+			time_to_live				3
+			velocity					2
+		}
+		
+		// Change the texture from red to grey and fading out
+		affector						Colour
+		{
+			colour_aff_time_colour		0 0.5 0.4 0.2
+			colour_aff_time_colour		0.1 0.5 0.2 0.05
+			colour_aff_time_colour		0.2 0.1 0.1 0.1
+			colour_aff_time_colour		1 0 0 0
+		}
+
+		// Rotate the texture to keep variation
+		affector						TextureRotator
+		{
+			tex_rot_use_own_rotation	true
+			tex_rot_speed				dyn_random
+			{
+				min						0.1
+				max						1
+			}
+			tex_rot_rotation			dyn_random
+			{
+				min						1
+				max						90
+			}
+		}
+
+		// Make the projectile smaller over time
+		affector						Scale
+		{
+			scale						-5
+		}
+	}
+
+	// --------------- Debris ---------------
+	technique
+	{
+		material						ParticleUniverse/Debris
+		visual_particle_quota			500
+		renderer						Billboard
+		{
+			billboard_type				oriented_self
+		}
+		
+		// Emit the debris
+		emitter							Point	DebrisEmitter
+		{
+			enabled						false
+			emission_rate				100
+			force_emission				true
+			direction					0 -1 0
+			angle						360
+			time_to_live				5
+			particle_height				dyn_random
+			{
+				min						2
+				max						20
+			}
+			particle_width				3
+			velocity					dyn_random
+			{
+				min						100
+				max						180
+			}
+		}
+		
+		// Start with a normal coloured texture and fade out
+		affector						Colour
+		{
+			colour_aff_time_colour		0 1 1 1
+			colour_aff_time_colour		1 0 0 0
+		}
+		
+		// Apply some kind of gravity
+		affector						LinearForce
+		{
+			force_aff_vector			0 -100 0
+		}
+		
+		// After 0.3 seconds, the emitters starts
+		observer						OnTime
+		{
+			on_time						greater_than 0.3
+			since_start_system			true
+			handler						DoEnableComponent
+			{
+				enable_component		emitter_component	DebrisEmitter	true
+			}
+		}
+	}
+}
+// ---------------------------------------------- End: Explosion system ----------------------------------------------

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_flame.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_flame.pu	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_flame.pu	2007-12-07 09:55:52 UTC (rev 495)
@@ -0,0 +1,191 @@
+// ---------------------------------------------- Begin: Flame system ----------------------------------------------
+// This particle system demonstrates the emission of affectors and the effect on the flames.
+// ---------------------------------------------------------------------------------------------------------------
+system flameSystem
+{
+	technique
+	{
+		material							ParticleUniverse/Flame
+		default_particle_width				45
+		default_particle_height				60
+		visual_particle_quota				2000
+		emitted_affector_quota				200
+
+		renderer Billboard
+		{
+			billboard_type					oriented_self
+		}
+
+		// Emission of flame particles
+		emitter								Box						flamesEmitter
+		{
+			emission_rate					200
+			angle							40
+			direction						0 1 0
+			box_em_height					1
+			velocity						dyn_random
+			{
+				min							60
+				max							80
+			}
+			time_to_live					dyn_random
+			{
+				min							5
+				max							9
+			}
+		}
+
+		// Emission of Gravity Affectors
+		emitter								Box						gravityEmitter
+		{
+			emission_rate					5
+			emits							affector_particle		gravityAffector
+			angle							80
+			direction						0 1 0
+			position						0 60 0
+			velocity						dyn_random
+			{
+				min							80
+				max							120
+			}
+			
+			// Define the mass of the affectors (instead of defining it in the GravityAffector 
+			// itself (which is also possible))
+			mass							dyn_random
+			{
+				min							20
+				max							40
+			}
+
+			time_to_live					dyn_random
+			{
+				min							2
+				max							5
+			}
+		}
+		
+		// Affector to be emitted
+		affector							Gravity				gravityAffector
+		{
+			gravity						40
+		}
+		
+		// Affector that affects all (visual) particles in general
+		affector							Scale
+		{
+			scale							-10
+		}
+
+		// Affect with a random Sine force (also affects the Gravity affector particles)
+		affector							SineForce
+		{
+			force_aff_vector				30 0 0
+			sinef_aff_frequency_min			1
+			sinef_aff_frequency_max			3
+		}
+
+		affector							Colour
+		{
+			colour_aff_time_colour			0 1 1 1
+			colour_aff_time_colour			1 0 0 0
+		}
+	}
+}
+// ----------------------------------------------- End: Flame system ----------------------------------------------
+
+
+// ---------------------------------------------- Begin: Fire system ----------------------------------------------
+// This particle system demonstrates the combination of 2 combined particle techniques.
+// ---------------------------------------------------------------------------------------------------------------
+system fireSystem
+{
+	// ---------------- Fire ----------------
+	technique
+	{
+		material							ParticleUniverse/Fire
+		default_particle_width				60
+		default_particle_height				60
+		visual_particle_quota				500
+
+		renderer Billboard
+		{
+			// Put the fire in front of the smoke (just for testing)
+			render_queue_group				80
+		}
+
+		// Emission of fire particles
+		emitter								Point
+		{
+			emission_rate					50
+			angle							30
+			direction						0 1 0
+			velocity						dyn_random
+			{
+				min							60
+				max							80
+			}
+			time_to_live					dyn_random
+			{
+				min							3
+				max							6
+			}
+		}
+		
+		
+		// Use a gravity affector to attract the particles a bit
+		affector							Gravity
+		{
+			position						0 200 0
+			gravity						1000
+		}
+
+		affector							Scale
+		{
+			scale							-5
+		}
+
+		affector							Colour
+		{
+			colour_aff_time_colour			0 1 1 1
+			colour_aff_time_colour			1 0 0 0
+		}
+	}
+
+	// ---------------- Smoke ----------------
+	technique
+	{
+		material							ParticleUniverse/Smoke
+		default_particle_width				40
+		default_particle_height				40
+		use_alias							$defaultBillboardRenderer
+
+		// Emission of smoke particles
+		emitter								Point
+		{
+			emission_rate					20
+			angle							20
+			direction						0 1 0
+			velocity						dyn_random
+			{
+				min							60
+				max							80
+			}
+			time_to_live					dyn_random
+			{
+				min							5
+				max							7
+			}
+		}
+
+		affector							Scale
+		{
+			scale							20
+		}
+		
+		affector							Colour
+		{
+			colour_aff_time_colour			0 1 0.9 0 1
+			colour_aff_time_colour			1 1 1 1 0
+		}
+	}
+}

Added: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_generic.pua
===================================================================
--- trunk/python-ogre...
 
[truncated message content]

[Python-ogre-commit] SF.net SVN: python-ogre: [494] trunk/python-ogre/demos/particleuniverse/ Demo_Particle.py

From: <and...@us...> - 2007-12-07 09:49:19

Revision: 494
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=494&view=rev
Author:   andy_miller
Date:     2007-12-07 01:49:23 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------
ParticleUniverse demo works now....

Modified Paths:
--------------
    trunk/python-ogre/demos/particleuniverse/Demo_Particle.py

Modified: trunk/python-ogre/demos/particleuniverse/Demo_Particle.py
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Demo_Particle.py	2007-12-07 09:30:09 UTC (rev 493)
+++ trunk/python-ogre/demos/particleuniverse/Demo_Particle.py	2007-12-07 09:49:23 UTC (rev 494)
@@ -30,37 +30,30 @@
         sceneManager = self.sceneManager
         camera = self.camera
 
-        sceneManager.ambientLight = ogre.ColourValue(0.5, 0.5, 0.5)
+        sceneManager.ambientLight = ogre.ColourValue(1.0, 1.0, 1.0)
 #         sceneManager.setSkyDome(True, 'Examples/CloudySky', 5.0, 8.0)
 
+        # create a main node to hang the effects off
         self.fountainNode = sceneManager.getRootSceneNode().createChildSceneNode()
+        self.fountainNode.setPosition(ogre.Vector3(0, 0, -800))
+        ## Setup Camera
+        camera.setPosition(ogre.Vector3(0,0,500))
+        camera.lookAt(ogre.Vector3(0,0,-300))
         
-        print dir(PU)
-        sm = PU.ParticleSystemManager.getSingletonPtr()
-        print sm
-# 	std::vector<Ogre::String> names;
-# 	mParticleSystemManager->particleSystemTemplateNames(names);
-# 	std::vector<Ogre::String>::iterator it;
-# 	std::vector<Ogre::String>::iterator itEnd = names.end();
-# 	CEGUI::ListboxTextItem* item;
-# 	for (it = names.begin(); it != itEnd; ++it)
-# 	{
-# 		item = new CEGUI::ListboxTextItem((*it), 0);
-# 		mListBox->addItem(item);
-# 	}
-
+        # here is how to get the list of available templates
+        names = ogre.StringVector()
+        PU.ParticleSystemManager.getSingleton().particleSystemTemplateNames(names)
+        for n in names:
+            print "PU template:", n
+            
+        # create the particle system
+        self.particleSystem2 = PU.ParticleSystemManager.getSingleton().createParticleSystem("mySystem", "fireSystem", sceneManager)
         
+        # attach it to the node
+        self.fountainNode.attachObject(self.particleSystem2)
         
-#         particleSystem1 = sceneManager.createParticleSystem('fountain1', 'Examples/Smoke')
-        
-        particleSystem2 = PU.ParticleSystemManager.getSingleton().createParticleSystem("mySystem", "example_003", sceneManager)
-        print particleSystem2
-        
-        node = self.fountainNode.createChildSceneNode()
-        node.attachObject(particleSystem2)
-        
-        
-       
+        # and don't forget to start it
+        self.particleSystem2.start()
                 
 if __name__ == '__main__':
     try:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [493] trunk/python-ogre/code_generators/ particleuniverse

From: <and...@us...> - 2007-12-07 09:30:05

Revision: 493
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=493&view=rev
Author:   andy_miller
Date:     2007-12-07 01:30:09 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------
Couple of ParticleUniverse header files needed updating towork..

Added Paths:
-----------
    trunk/python-ogre/code_generators/particleuniverse/ParticleUniverseDynamicAttributeFactory.h
    trunk/python-ogre/code_generators/particleuniverse/ParticleUniverseHook.h

Added: trunk/python-ogre/code_generators/particleuniverse/ParticleUniverseDynamicAttributeFactory.h
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/ParticleUniverseDynamicAttributeFactory.h	                        (rev 0)
+++ trunk/python-ogre/code_generators/particleuniverse/ParticleUniverseDynamicAttributeFactory.h	2007-12-07 09:30:09 UTC (rev 493)
@@ -0,0 +1,85 @@
+/*
+-----------------------------------------------------------------------------
+This source file is part of the Particle Universe product.
+
+Copyright (c) 2006-2007 Henry van Merode
+
+Usage of this program is free for non-commercial use and licensed under the
+the terms of the GNU Lesser General Public License.
+
+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 __PU_DYNAMIC_ATTRIBUTE_FACTORY_H__
+#define __PU_DYNAMIC_ATTRIBUTE_FACTORY_H__
+
+#include "ParticleUniverseDynamicAttribute.h"
+
+namespace ParticleUniverse
+{
+	/** This factory class is responsible for creating a DynamicAttribute object.
+    */
+	class _ParticleUniverseExport DynamicAttributeFactory
+	{
+	    public:
+
+			DynamicAttributeFactory(void) {};
+	        virtual ~DynamicAttributeFactory(void) {};
+
+			/** 
+	        */
+			template <class T>
+			T* createDynamicAttribute(void)
+			{
+				return new T();
+			};
+
+
+			/** 
+	        */
+			DynamicAttribute* cloneDynamicAttribute(DynamicAttribute* dynamicAttribute)
+			{
+				if (dynamicAttribute)
+				{
+					switch(dynamicAttribute->getType())
+					{
+						case DynamicAttribute::DAT_FIXED:
+						{
+							DynamicAttributeFixed* dynAttr = createDynamicAttribute<DynamicAttributeFixed>();
+							dynamicAttribute->copyAttributesTo(dynAttr);
+							return dynAttr;	
+						}
+						break;
+
+						case DynamicAttribute::DAT_RANDOM:
+						{
+							DynamicAttributeRandom* dynAttr = createDynamicAttribute<DynamicAttributeRandom>();
+							dynamicAttribute->copyAttributesTo(dynAttr);
+							return dynAttr;
+						}
+						break;
+
+						case DynamicAttribute::DAT_CURVED:
+						{
+							DynamicAttributeCurved* dynAttr = createDynamicAttribute<DynamicAttributeCurved>();
+							dynamicAttribute->copyAttributesTo(dynAttr);
+							return dynAttr;
+						}
+						break;
+					}
+				}
+
+				return 0;
+			}
+			
+			/** Delete a DynamicAttribute
+	        */
+			void destroyDynamicAttribute (DynamicAttribute* dynamicAttribute){delete dynamicAttribute;};
+	};
+
+}
+#endif

Added: trunk/python-ogre/code_generators/particleuniverse/ParticleUniverseHook.h
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/ParticleUniverseHook.h	                        (rev 0)
+++ trunk/python-ogre/code_generators/particleuniverse/ParticleUniverseHook.h	2007-12-07 09:30:09 UTC (rev 493)
@@ -0,0 +1,126 @@
+/*
+-----------------------------------------------------------------------------
+This source file is part of the Particle Universe product.
+
+Copyright (c) 2006-2007 Henry van Merode
+
+Usage of this program is free for non-commercial use and licensed under the
+the terms of the GNU Lesser General Public License.
+
+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 __PU_HOOK_H__
+#define __PU_HOOK_H__
+
+#include "ParticleUniversePrerequisites.h"
+
+namespace ParticleUniverse
+{
+	/** The Hook class is a template helper class that is used to call the hook functions of objects (Affectors, 
+		Externs, ...) registered at the ParticleSystem. This prevents that the same code is duplicated 
+		too much.
+    */
+	template <typename T>
+	class _ParticleUniverseExport Hook
+	{
+		public:
+			/** Templated version to prepare objects.
+			*/
+			static void _prepare(std::vector<T*>* list, ParticleTechnique* technique)
+			{
+				if (list->empty())
+					return;
+                typename T::iterator it;
+                typename T::iterator itEnd = list->end();
+				for (it = list->begin(); it != itEnd; ++it)
+				{
+					(*it)->_prepare(technique);
+				}
+			}
+
+			/** Templated version to notify objects that the ParticleSystem starts
+			*/
+			static void _notifyStart(std::vector<T*>* list)
+			{
+				if (list->empty())
+					return;
+                typename T::iterator it;
+                typename T::iterator itEnd = list->end();
+				for (it = list->begin(); it != itEnd; ++it)
+				{
+					(*it)->_notifyStart();
+				}
+			}
+
+			/** Templated version to notify objects that the ParticleSystem stops
+			*/
+			static void _notifyStop(std::vector<T*>* list)
+			{
+				if (list->empty())
+					return;
+                typename T::iterator it;
+                typename T::iterator itEnd = list->end();
+				for (it = list->begin(); it != itEnd; ++it)
+				{
+					(*it)->_notifyStop();
+				}
+			}
+
+			/** Templated version of _preProcessParticles.
+			@remarks
+				_preProcessParticles allows actions before the individual particles are processed.
+			*/
+			static void _preProcessParticles(std::vector<T*>* list, ParticleTechnique* technique, Ogre::Real timeElapsed)
+			{
+				if (list->empty())
+					return;
+                typename T::iterator it;
+                typename T::iterator itEnd = list->end();
+				for (it = list->begin(); it != itEnd; ++it)
+				{
+					(*it)->_preProcessParticles(technique, timeElapsed);
+				}
+			}
+
+			/** Templated version to process a particle.
+			*/
+			static void _processParticle(std::vector<T*>* list, 
+				ParticleTechnique* particleTechnique, 
+				Particle* particle, 
+				Ogre::Real timeElapsed, 
+				bool firstParticle)
+			{
+				if (list->empty())
+					return;
+                typename T::iterator it;
+                typename T::iterator itEnd = list->end();
+				for (it = list->begin(); it != itEnd; ++it)
+				{
+					(*it)->_processParticle(particleTechnique, particle, timeElapsed, firstParticle);
+				}
+			}
+
+			/** Templated version of _postProcessParticles.
+			@remarks
+				_postProcessParticles allows actions after the individual particles are processed.
+			*/
+			static void _postProcessParticles(std::vector<T*>* list, ParticleTechnique* technique, Ogre::Real timeElapsed)
+			{
+				if (list->empty())
+					return;
+                typename T::iterator it;
+                typename T::iterator itEnd = list->end();
+				for (it = list->begin(); it != itEnd; ++it)
+				{
+					(*it)->_postProcessParticles(technique, timeElapsed);
+				}
+			}
+	};
+
+}
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [492] trunk/python-ogre

From: <and...@us...> - 2007-12-07 09:28:18

Revision: 492
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=492&view=rev
Author:   andy_miller
Date:     2007-12-07 01:28:19 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------
ParticleUniverse Update --compiling and loading -- demos needs updating

Modified Paths:
--------------
    trunk/python-ogre/code_generators/particleuniverse/customization_data.py
    trunk/python-ogre/code_generators/particleuniverse/generate_code.py
    trunk/python-ogre/code_generators/template/generate_code.py

Added Paths:
-----------
    trunk/python-ogre/demos/particleuniverse/
    trunk/python-ogre/demos/particleuniverse/Demo_Particle.py
    trunk/python-ogre/demos/particleuniverse/SampleFramework.py
    trunk/python-ogre/demos/particleuniverse/ogre.cfg
    trunk/python-ogre/demos/particleuniverse/plugins.cfg
    trunk/python-ogre/demos/particleuniverse/resources.cfg
    trunk/python-ogre/packages_2.5/ogre/addons/particleuniverse/
    trunk/python-ogre/packages_2.5/ogre/addons/particleuniverse/__init__.py

Modified: trunk/python-ogre/code_generators/particleuniverse/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/customization_data.py	2007-12-07 05:28:32 UTC (rev 491)
+++ trunk/python-ogre/code_generators/particleuniverse/customization_data.py	2007-12-07 09:28:19 UTC (rev 492)
@@ -1,6 +1,8 @@
 
 def header_files( version ):
-    return [ "ParticleUniverseSystemManager.h"]
+    return [ 'ParticleUniverseSystemManager.h', 
+            'ParticleRenderers/ParticleUniverseBox.h'
+            ]
   
 def huge_classes( version ):
     return []

Modified: trunk/python-ogre/code_generators/particleuniverse/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/generate_code.py	2007-12-07 05:28:32 UTC (rev 491)
+++ trunk/python-ogre/code_generators/particleuniverse/generate_code.py	2007-12-07 09:28:19 UTC (rev 492)
@@ -53,6 +53,11 @@
         main_ns = global_ns.namespace( MAIN_NAMESPACE )
     else:
         main_ns = global_ns    
+        
+    NotExported=['ParticleSystemManagerTokens'      ## this one is defined in a strange way within the header so lets not use it...
+                ]
+    for c in NotExported:
+        main_ns.class_( c ).exclude()
 
 ############################################################
 ##
@@ -210,7 +215,7 @@
                                            )
                                            
     # if this module depends on another set it here                                           
-    ## mb.register_module_dependency ( environment.ogre.generated_dir )
+    mb.register_module_dependency ( environment.ogre.generated_dir )
     
     # normally implicit conversions work OK, however they can cause strange things to happen so safer to leave off
     mb.constructors().allow_implicit_conversion = False                                           
@@ -234,6 +239,9 @@
     ManualTransformations ( mb )
     AutoFixes ( mb, MAIN_NAMESPACE )
     ManualFixes ( mb )
+    
+    common_utils.Auto_Functional_Transformation ( main_ns, special_vars=['::Ogre::Real &','::Ogre::ushort &','size_t &'] )
+    
     #
     # We need to tell boost how to handle calling (and returning from) certain functions
     #
@@ -268,6 +276,7 @@
         mb.code_creator.user_defined_directories.append(inc )
     mb.code_creator.user_defined_directories.append( environment.particleuniverse.generated_dir )
     mb.code_creator.replace_included_headers( customization_data.header_files( environment.particleuniverse.version ) )
+    print "1111", customization_data.header_files( environment.particleuniverse.version )
 
     huge_classes = map( mb.class_, customization_data.huge_classes( environment.particleuniverse.version ) )
 

Modified: trunk/python-ogre/code_generators/template/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/template/generate_code.py	2007-12-07 05:28:32 UTC (rev 491)
+++ trunk/python-ogre/code_generators/template/generate_code.py	2007-12-07 09:28:19 UTC (rev 492)
@@ -23,8 +23,8 @@
 import common_utils
 import customization_data
 import hand_made_wrappers
-import register_exceptions
 
+
 from pygccxml import parser
 from pygccxml import declarations
 from pyplusplus import messages
@@ -211,7 +211,7 @@
                                            )
                                            
     # if this module depends on another set it here                                           
-    ## mb.register_module_dependency ( environment.ogre.generated_dir )
+    mb.register_module_dependency ( environment.ogre.generated_dir )
     
     # normally implicit conversions work OK, however they can cause strange things to happen so safer to leave off
     mb.constructors().allow_implicit_conversion = False                                           

Added: trunk/python-ogre/demos/particleuniverse/Demo_Particle.py
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Demo_Particle.py	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/Demo_Particle.py	2007-12-07 09:28:19 UTC (rev 492)
@@ -0,0 +1,70 @@
+# 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 sys,os
+sys.path.insert(0,'..')
+sys.path.insert(0,'.')
+
+## this here becase the ParticelUnivser.dll needs to be access by both the python module and the ogre plugins
+## need a better fix ling term
+if sys.platform == 'win32': 
+    newpath = os.path.join ( os.path.abspath(os.path.dirname(__file__)), '../../plugins')
+    os.environ['PATH'] =  newpath +';' + os.environ['PATH']
+    
+import PythonOgreConfig
+import ogre.renderer.OGRE as ogre
+import ogre.addons.particleuniverse as PU
+import SampleFramework as sf
+
+        
+class SmokeApplication(sf.Application):
+    def _createScene(self):
+        sceneManager = self.sceneManager
+        camera = self.camera
+
+        sceneManager.ambientLight = ogre.ColourValue(0.5, 0.5, 0.5)
+#         sceneManager.setSkyDome(True, 'Examples/CloudySky', 5.0, 8.0)
+
+        self.fountainNode = sceneManager.getRootSceneNode().createChildSceneNode()
+        
+        print dir(PU)
+        sm = PU.ParticleSystemManager.getSingletonPtr()
+        print sm
+# 	std::vector<Ogre::String> names;
+# 	mParticleSystemManager->particleSystemTemplateNames(names);
+# 	std::vector<Ogre::String>::iterator it;
+# 	std::vector<Ogre::String>::iterator itEnd = names.end();
+# 	CEGUI::ListboxTextItem* item;
+# 	for (it = names.begin(); it != itEnd; ++it)
+# 	{
+# 		item = new CEGUI::ListboxTextItem((*it), 0);
+# 		mListBox->addItem(item);
+# 	}
+
+        
+        
+#         particleSystem1 = sceneManager.createParticleSystem('fountain1', 'Examples/Smoke')
+        
+        particleSystem2 = PU.ParticleSystemManager.getSingleton().createParticleSystem("mySystem", "example_003", sceneManager)
+        print particleSystem2
+        
+        node = self.fountainNode.createChildSceneNode()
+        node.attachObject(particleSystem2)
+        
+        
+       
+                
+if __name__ == '__main__':
+    try:
+        application = SmokeApplication()
+        application.go()
+    except ogre.OgreException, e:
+        print e

Added: trunk/python-ogre/demos/particleuniverse/SampleFramework.py
===================================================================
--- trunk/python-ogre/demos/particleuniverse/SampleFramework.py	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/SampleFramework.py	2007-12-07 09:28:19 UTC (rev 492)
@@ -0,0 +1,468 @@
+# 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
+
+from Enums import *
+
+Action = Enum ('QUIT','SCREENSHOT','DEBUG_MODE','RESET_SCENE', 'PAUSE', 'SLOWER', 'FASTER',
+         'OPTION_1','OPTION_2','OPTION_3','OPTION_4',
+         'PAN_FORWARD','PAN_BACKWARD','PAN_LEFT','PAN_RIGHT','PAN_UP','PAN_DOWN',
+         'X','NEG_X','Y','NEG_Y','Z','NEG_Z','MODIFIER',
+         'MOUSE_PRIMARY','MOUSE_ALT','MOUSE_NONE','MOUSE_BOTH', 'MOUSE_LOOK' )
+         
+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/demos/particleuniverse/ogre.cfg
===================================================================
--- trunk/python-ogre/demos/particleuniverse/ogre.cfg	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/ogre.cfg	2007-12-07 09:28:19 UTC (rev 492)
@@ -0,0 +1,19 @@
+Render System=Direct3D9 Rendering Subsystem
+
+[OpenGL Rendering Subsystem]
+Colour Depth=32
+Display Frequency=60
+FSAA=0
+Full Screen=Yes
+RTT Preferred Mode=FBO
+VSync=No
+Video Mode=1024 x 768
+
+[Direct3D9 Rendering Subsystem]
+Allow NVPerfHUD=No
+Anti aliasing=None
+Floating-point mode=Fastest
+Full Screen=No
+Rendering Device=ATI Mobility Radeon X1300
+VSync=No
+Video Mode=800 x 600 @ 32-bit colour

Added: trunk/python-ogre/demos/particleuniverse/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/particleuniverse/plugins.cfg	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/plugins.cfg	2007-12-07 09:28:19 UTC (rev 492)
@@ -0,0 +1,21 @@
+# Defines plugins to load
+
+## Use this for Windows
+# Define plugin folder
+#PluginFolder=c:/pythonogre/plugins
+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
+Plugin=ParticleUniverse.dll
+
+##
+## NOTE use this for MacOS or Linux
+# Plugin=RenderSystem_GL
+# Plugin=Plugin_ParticleFX
+# Plugin=Plugin_BSPSceneManager
+# Plugin=Plugin_OctreeSceneManager
+# Plugin=Plugin_CgProgramManager

Added: trunk/python-ogre/demos/particleuniverse/resources.cfg
===================================================================
--- trunk/python-ogre/demos/particleuniverse/resources.cfg	                        (rev 0)
+++ trunk/python-ogre/demos/particleuniverse/resources.cfg	2007-12-07 09:28:19 UTC (rev 492)
@@ -0,0 +1,34 @@
+[Bootstrap]
+Zip=../media/packs/OgreCore.zip
+
+# Resource locations to be added to the default path
+[General]
+FileSystem=../media
+FileSystem=../media/fonts
+FileSystem=../media/sounds
+FileSystem=../media/Audio
+FileSystem=../media/materials/programs
+FileSystem=../media/materials/scripts
+FileSystem=../media/materials/textures
+FileSystem=../media/models
+FileSystem=../media/overlays
+FileSystem=../media/particle
+FileSystem=../media/gui
+Zip=../media/packs/cubemap.zip
+Zip=../media/packs/cubemapsJS.zip
+Zip=../media/packs/dragon.zip
+Zip=../media/packs/fresneldemo.zip
+Zip=../media/packs/ogretestmap.zip
+Zip=../media/packs/skybox.zip
+#Zip=../media/packs/chiropteraDM.pk3
+
+FileSystem=./Media/ParticleUniverse
+FileSystem=./Media/ParticleUniverse/material
+FileSystem=./Media/ParticleUniverse/scripts
+FileSystem=./Media/ParticleUniverse/models
+FileSystem=./Media/ParticleUniverse/gui
+FileSystem=./Media/ParticleUniverse/textures/32x32
+FileSystem=./Media/ParticleUniverse/textures/64x64
+FileSystem=./Media/ParticleUniverse/textures/128x128
+FileSystem=./Media/ParticleUniverse/textures/256x256
+FileSystem=./Media/ParticleUniverse/textures/various 
\ No newline at end of file

Added: trunk/python-ogre/packages_2.5/ogre/addons/particleuniverse/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/addons/particleuniverse/__init__.py	                        (rev 0)
+++ trunk/python-ogre/packages_2.5/ogre/addons/particleuniverse/__init__.py	2007-12-07 09:28:19 UTC (rev 492)
@@ -0,0 +1 @@
+from _particleuniverse_ import *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [491] trunk/python-ogre

From: <and...@us...> - 2007-12-07 05:28:32

Revision: 491
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=491&view=rev
Author:   andy_miller
Date:     2007-12-06 21:28:32 -0800 (Thu, 06 Dec 2007)

Log Message:
-----------
Initial checkin for particleuniverse module -- doesn't work yet, however wnat the framework here

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_nt.py
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/environment.py
    trunk/python-ogre/scripts/00-PreReqs.sh
    trunk/python-ogre/scripts/01-RetrieveSource.sh
    trunk/python-ogre/scripts/config.sh

Added Paths:
-----------
    trunk/python-ogre/code_generators/particleuniverse/
    trunk/python-ogre/code_generators/particleuniverse/customization_data.py
    trunk/python-ogre/code_generators/particleuniverse/generate_code.py
    trunk/python-ogre/code_generators/particleuniverse/hand_made_wrappers.py
    trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse.h
    trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse_aliases.h
    trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse_sizeof.h

Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py	2007-12-05 00:32:48 UTC (rev 490)
+++ trunk/python-ogre/PythonOgreConfig_nt.py	2007-12-07 05:28:32 UTC (rev 491)
@@ -61,6 +61,8 @@
 PATH_ffmpeg=        os.path.join(BASE_DIR, 'ffmpeg')
 PATH_navi =         os.path.join(BASE_DIR, 'navi','Navi')
 
+PATH_particleuniverse = os.path.join(PATH_Ogre, 'PlugIns', 'ParticleUniverse' )
+
 # it's time for the SDK version
 if SDK:
     PATH_CEGUI =        os.path.join(BASE_DIR, 'Ogrenew')
@@ -96,7 +98,7 @@
 PATH_LIB_plib =                 PATH_plib
 PATH_LIB_navi=                  os.path.join(PATH_navi, 'lib')
 PATH_LIB_ogredshow =            PATH_ogredshow
-
+PATH_LIB_particleuniverse =     os.path.join(PATH_particleuniverse, 'bin', 'release')
 if SDK:
     PATH_LIB_Ogre_CEGUIRenderer =   os.path.join( PATH_Ogre, 'lib')
     PATH_LIB_OIS =                  os.path.join( PATH_Ogre, 'Dependencies/lib/Release') ## NOTE Posix platforms this lives in'lib' not 'dll'
@@ -144,6 +146,7 @@
 PATH_INCLUDE_noise = PATH_noise 
 ##PATH_INCLUDE_ogreforests =         os.path.join (PATH_ogreforests,'include')
 PATH_INCLUDE_ogreforests =         PATH_ogreforests
+PATH_INCLUDE_particleuniverse = os.path.join(PATH_particleuniverse, 'include' )
 
 PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
                         ,os.path.join(BASE_DIR, 'vorbis', 'include')

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-05 00:32:48 UTC (rev 490)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-07 05:28:32 UTC (rev 491)
@@ -50,7 +50,7 @@
 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_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')
@@ -60,6 +60,7 @@
 PATH_Theora=        os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
 PATH_ffmpeg=        os.path.join(BASE_DIR, 'ffmpeg')
 PATH_navi =         os.path.join(BASE_DIR, 'navi','Navi')
+PATH_particleuniverse = os.path.join(PATH_Ogre, 'PlugIns', 'ParticleUniverse' )
 
 
 ###
@@ -91,6 +92,7 @@
 PATH_LIB_ffmpeg=                os.path.join(PATH_ffmpeg, 'lib')
 PATH_LIB_plib =                 PATH_plib
 PATH_LIB_navi=                  os.path.join(PATH_navi, 'lib')
+PATH_LIB_particleuniverse =     os.path.join(PATH_particleuniverse, 'bin', 'release')
 
 
 PATH_INCLUDE_Ogre=          os.path.join(LOCAL_INCLUDE,'OGRE')  # os.path.join(PATH_Ogre,'OgreMain/include') 
@@ -131,11 +133,12 @@
 PATH_INCLUDE_noise = PATH_noise 
 PATH_INCLUDE_ogredshow =    PATH_ogredshow
 PATH_INCLUDE_ogreforests =         PATH_ogreforests
+PATH_INCLUDE_particleuniverse = os.path.join(PATH_particleuniverse, 'include' )
 
 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-1.8.3','include')
                         ,os.path.join(PATH_THIRDPARTY,'ptypes','include')
                         ]
 physxbase = os.path.join(LOCAL_INCLUDE, 'PhysX','v2.7.3', 'SDKs')

Added: trunk/python-ogre/code_generators/particleuniverse/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/customization_data.py	                        (rev 0)
+++ trunk/python-ogre/code_generators/particleuniverse/customization_data.py	2007-12-07 05:28:32 UTC (rev 491)
@@ -0,0 +1,7 @@
+
+def header_files( version ):
+    return [ "ParticleUniverseSystemManager.h"]
+  
+def huge_classes( version ):
+    return []
+   
\ No newline at end of file

Added: trunk/python-ogre/code_generators/particleuniverse/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/generate_code.py	                        (rev 0)
+++ trunk/python-ogre/code_generators/particleuniverse/generate_code.py	2007-12-07 05:28:32 UTC (rev 491)
@@ -0,0 +1,286 @@
+#!/usr/bin/env python
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre and is covered by the LGPL
+# For the latest info, see http://python-ogre.org/
+#
+# -----------------------------------------------------------------------------
+
+## STARTER TEMPLATE..
+## replace particleuniverse with lowercase project name
+## set MAIN_NAMESPACE
+## rename and configure .h files
+
+
+import os, sys, time, shutil
+
+#add environment to the path
+sys.path.append( os.path.join( '..', '..' ) )
+#add common utils to the pass
+sys.path.append( '..' )
+sys.path.append( '.' )
+
+import environment
+import common_utils
+import customization_data
+import hand_made_wrappers
+
+from pygccxml import parser
+from pygccxml import declarations
+from pyplusplus import messages
+from pyplusplus import module_builder
+from pyplusplus import decl_wrappers
+
+from pyplusplus import function_transformers as ft
+from pyplusplus.module_builder import call_policies
+from pyplusplus.module_creator import sort_algorithms
+
+import common_utils.extract_documentation as exdoc
+import common_utils.var_checker as varchecker
+import common_utils.ogre_properties as ogre_properties
+from common_utils import docit
+
+MAIN_NAMESPACE = 'ParticleUniverse'
+
+############################################################
+##
+##  Here is where we manually exclude stuff
+##
+############################################################
+
+def ManualExclude ( mb ):
+    global_ns = mb.global_ns
+    if MAIN_NAMESPACE:
+        main_ns = global_ns.namespace( MAIN_NAMESPACE )
+    else:
+        main_ns = global_ns    
+
+############################################################
+##
+##  And there are things that manually need to be INCLUDED 
+##
+############################################################
+    
+def ManualInclude ( mb ):
+    global_ns = mb.global_ns
+    if MAIN_NAMESPACE:
+        main_ns = global_ns.namespace( MAIN_NAMESPACE )
+    else:
+        main_ns = global_ns    
+        
+############################################################
+##
+##  And things that need manual fixes, but not necessarly hand wrapped
+##
+############################################################
+def ManualFixes ( mb ):    
+    global_ns = mb.global_ns
+    if MAIN_NAMESPACE:
+        main_ns = global_ns.namespace( MAIN_NAMESPACE )
+    else:
+        main_ns = global_ns
+              
+############################################################
+##
+##  And things that need to have their argument and call values fixed.
+##  ie functions that pass pointers in the argument list and of course we need
+##  to read the updated values - so instead we pass them back 
+##  as new values in a tuple (ETC ETC)
+##
+############################################################
+        
+def ManualTransformations ( mb ):
+    global_ns = mb.global_ns
+    if MAIN_NAMESPACE:
+        main_ns = global_ns.namespace( MAIN_NAMESPACE )
+    else:
+        main_ns = global_ns
+                
+    def create_output( size ):
+        return [ ft.output( i ) for i in range( size ) ]
+        
+    
+###############################################################################
+##
+##  Now for the AUTOMATIC stuff that should just work
+##
+###############################################################################
+    
+def AutoFixes ( mb, MAIN_NAMESPACE ): 
+    """ now we fix a range of things automatically - typically by going through 
+    the entire name space trying to guess stuff and fix it:)
+    """    
+    global_ns = mb.global_ns
+    if MAIN_NAMESPACE:
+        main_ns = global_ns.namespace( MAIN_NAMESPACE )
+    else:
+        main_ns = global_ns
+        
+    # Functions that have void pointers in their argument list need to change to unsigned int's  
+    pointee_types=[]
+    ignore_names=[]
+    common_utils.Fix_Void_Ptr_Args  ( main_ns ) # , pointee_types, ignore_names )
+
+    # and change functions that return a variety of pointers to instead return unsigned int's
+    pointee_types=[]
+    ignore_names=[]  # these are function names we know it's cool to exclude
+    common_utils.Fix_Pointer_Returns ( main_ns ) # , pointee_types, ignore_names )   
+
+    # functions that need to have implicit conversions turned off
+    ImplicitClasses=[] 
+    common_utils.Fix_Implicit_Conversions ( main_ns, ImplicitClasses )
+    
+    if os.name =='nt':
+        Fix_NT( mb )
+    elif os.name =='posix':
+        Fix_Posix( mb )
+        
+    common_utils.Auto_Document( mb, MAIN_NAMESPACE )
+        
+ 
+###############################################################################
+##
+## here are the helper functions that do much of the work
+##
+###############################################################################     
+def Fix_Posix ( mb ):
+    """ fixup for posix specific stuff -- note only expect to be called on a posix machine
+    """
+    ## we could do more here if need be...
+    if sys.platform == 'darwin':
+        pass
+    elif sys.platform.startswith ('linux'):
+        pass
+
+
+def Fix_NT ( mb ):
+    """ fixup for NT systems
+    """
+        
+
+#
+# the 'main'function
+#            
+def generate_code():  
+    messages.disable( 
+#           Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
+          messages.W1020
+        , messages.W1021
+        , messages.W1022
+        , messages.W1023
+        , messages.W1024
+        , messages.W1025
+        , messages.W1026
+        , messages.W1027
+        , messages.W1028
+        , messages.W1029
+        , messages.W1030
+        , messages.W1031
+        , messages.W1035
+        , messages.W1040 
+        , messages.W1038        
+        , messages.W1041
+        , 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
+         )
+    #
+    # Use GCCXML to create the controlling XML file.
+    # If the cache file (../cache/*.xml) doesn't exist it gets created, otherwise it just gets loaded
+    # NOTE: If you update the source library code you need to manually delete the cache .XML file   
+    #
+    xml_cached_fc = parser.create_cached_source_fc(
+                        os.path.join( environment.particleuniverse.root_dir, "python_particleuniverse.h" )
+                        , environment.particleuniverse.cache_file )
+
+    defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY' ,'PARTICLE_UNIVERSE_EXPORTS', '__PYTHONOGRE_BUILD_CODE' ]
+    defined_symbols.append( 'VERSION_' + environment.particleuniverse.version )  
+    
+    #
+    # build the core Py++ system from the GCCXML created source
+    #    
+    mb = module_builder.module_builder_t( [ xml_cached_fc ]
+                                          , gccxml_path=environment.gccxml_bin
+                                          , working_directory=environment.root_dir
+                                          , include_paths=environment.particleuniverse.include_dirs
+                                          , define_symbols=defined_symbols
+                                          , indexing_suite_version=2
+                                          , cflags=environment.particleuniverse.cflags
+                                           )
+                                           
+    # if this module depends on another set it here                                           
+    ## mb.register_module_dependency ( environment.ogre.generated_dir )
+    
+    # normally implicit conversions work OK, however they can cause strange things to happen so safer to leave off
+    mb.constructors().allow_implicit_conversion = False                                           
+    
+    mb.BOOST_PYTHON_MAX_ARITY = 25
+    mb.classes().always_expose_using_scope = True
+            
+    #
+    # We filter (both include and exclude) specific classes and functions that we want to wrap
+    # 
+    global_ns = mb.global_ns
+    global_ns.exclude()
+    main_ns = global_ns.namespace( MAIN_NAMESPACE )
+    main_ns.include()
+       
+    common_utils.AutoExclude ( mb, MAIN_NAMESPACE )
+    ManualExclude ( mb )
+    common_utils.AutoInclude ( mb, MAIN_NAMESPACE )
+    ManualInclude ( mb )
+    # here we fixup functions that expect to modifiy their 'passed' variables    
+    ManualTransformations ( mb )
+    AutoFixes ( mb, MAIN_NAMESPACE )
+    ManualFixes ( mb )
+    #
+    # We need to tell boost how to handle calling (and returning from) certain functions
+    #
+    common_utils.Set_DefaultCall_Policies ( mb.global_ns.namespace ( MAIN_NAMESPACE ) )
+    
+    #
+    # the manual stuff all done here !!!
+    #
+    hand_made_wrappers.apply( mb )
+
+    NoPropClasses = [""]
+    for cls in main_ns.classes():
+        if cls.name not in NoPropClasses:
+            cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
+            
+    common_utils.add_constants( mb, { 'particleuniverse_version' :  '"%s"' % environment.particleuniverse.version.replace("\n", "\\\n") 
+                                      , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
+                                      
+    ## need to create a welcome doc string for this...                                  
+    common_utils.add_constants( mb, { '__doc__' :  '"particleuniverse DESCRIPTION"' } ) 
+    
+    
+    ##########################################################################################
+    #
+    # Creating the code. After this step you should not modify/customize declarations.
+    #
+    ##########################################################################################
+    extractor = exdoc.doc_extractor() # I'm excluding the UTFstring docs as lots about nothing 
+    mb.build_code_creator (module_name='_particleuniverse_' , doc_extractor= extractor )
+    
+    for inc in environment.particleuniverse.include_dirs:
+        mb.code_creator.user_defined_directories.append(inc )
+    mb.code_creator.user_defined_directories.append( environment.particleuniverse.generated_dir )
+    mb.code_creator.replace_included_headers( customization_data.header_files( environment.particleuniverse.version ) )
+
+    huge_classes = map( mb.class_, customization_data.huge_classes( environment.particleuniverse.version ) )
+
+    mb.split_module(environment.particleuniverse.generated_dir, huge_classes, use_files_sum_repository=False)
+
+    ## now we need to ensure a series of headers and additional source files are
+    ## copied to the generated directory..
+    
+#     common_utils.copyTree ( sourcePath = environment.Config.PATH_INCLUDE_particleuniverse, 
+#                             destPath = environment.particleuniverse.generated_dir, 
+#                             recursive=False )
+        
+if __name__ == '__main__':
+    start_time = time.clock()
+    generate_code()
+    print 'Source code was updated( %f minutes ).' % (  ( time.clock() - start_time )/60 )

Added: trunk/python-ogre/code_generators/particleuniverse/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/hand_made_wrappers.py	                        (rev 0)
+++ trunk/python-ogre/code_generators/particleuniverse/hand_made_wrappers.py	2007-12-07 05:28:32 UTC (rev 491)
@@ -0,0 +1,15 @@
+import os
+import environment
+
+
+
+#################################################################################################
+#################################################################################################
+
+def apply_reg ( class_, code ):
+    for c in code:
+        class_.add_registration_code ( c )
+        
+def apply( mb ):
+    pass
+    
\ No newline at end of file

Added: trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse.h
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse.h	                        (rev 0)
+++ trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse.h	2007-12-07 05:28:32 UTC (rev 491)
@@ -0,0 +1,19 @@
+// keep everything in lowercase (except the namespace which must match the C++ library) to stop Linux/Windows issues
+#include "ParticleUniverseSystemManager.h"  // the master include for the c++ library
+
+// First we create a magic namespace to hold all our aliases
+namespace pyplusplus { namespace aliases {
+    
+ #include "python_particleuniverse_aliases.h"   // we use this to fix up what would otherwise be ugly names
+} } 
+
+// then we exposed everything needed (and more) to ensure GCCXML makes them visible to Py++
+//
+namespace python_particleuniverse{ namespace details{
+inline void instantiate(){
+ using namespace ParticleUniverse;              // note the use of the 'actual' namespace here -- case sensitive
+ #include "python_particleuniverse_sizeof.h"    // this is used to expose classes/variables that don't happen automatically
+ 
+} } }
+
+

Added: trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse_aliases.h	                        (rev 0)
+++ trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse_aliases.h	2007-12-07 05:28:32 UTC (rev 491)
@@ -0,0 +1 @@
+// typedef name nicename;

Added: trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse_sizeof.h	                        (rev 0)
+++ trunk/python-ogre/code_generators/particleuniverse/python_particleuniverse_sizeof.h	2007-12-07 05:28:32 UTC (rev 491)
@@ -0,0 +1 @@
+// sizeof ( variable );

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2007-12-05 00:32:48 UTC (rev 490)
+++ trunk/python-ogre/environment.py	2007-12-07 05:28:32 UTC (rev 491)
@@ -503,6 +503,24 @@
     ModuleName="ogreforests"   
     active=True
     
+class particleuniverse:
+    version="0.4"
+    parent="ogre/addons"
+    CCFLAGS = ' ' 
+    cflags=""
+    include_dirs = [ Config.PATH_Boost,
+                    Config.PATH_INCLUDE_Ogre,
+                    Config.PATH_INCLUDE_particleuniverse
+                    ]
+    lib_dirs = [Config.PATH_LIB_Boost,
+                Config.PATH_LIB_Ogre_OgreMain,
+                Config.PATH_LIB_particleuniverse
+                ]
+    CheckIncludes=[]
+    libs=[  Config.LIB_Boost, 'OgreMain', 'ParticleUniverse' ]
+    ModuleName="particleuniverse"   
+    active=True
+
 class nxogre:
     version="0.9"
     parent="ogre/physics"
@@ -864,6 +882,7 @@
     , 'noise' : noise
     , 'watermesh' : watermesh
     , 'ofusion' : ofusion
+    , 'particleuniverse' : particleuniverse
 }        
 
 #

Modified: trunk/python-ogre/scripts/00-PreReqs.sh
===================================================================
--- trunk/python-ogre/scripts/00-PreReqs.sh	2007-12-05 00:32:48 UTC (rev 490)
+++ trunk/python-ogre/scripts/00-PreReqs.sh	2007-12-07 05:28:32 UTC (rev 491)
@@ -1,6 +1,25 @@
 #!/bin/bash
-# Part of the Python-Ogre installation 
+# Part of the Python-Ogre installation
+if [ $DARWIN == 1 ] then
+    pushd $DOWNLOADS
+    curl -o wget-1.10.2.tar.gz http://ftp.gnu.org/pub/gnu/wget/wget-1.10.2.tar.gz
+    curl -o subversion-client-1.3.1.dmg http://metissian.com/downloads/macosx/subversion/subversion-client-1.3.1.dmg
+    curl -o python-2.5-macosx.dmg http://www.pythonmac.org/packages/py25-fat/dmg/python-2.5-macosx.dmg
+    
+    popd
+    tar zxf $DOWNLOADS/wget-1.10.2.tar.gz
+    pushd wget-1.10.2
+    ./configure --prefix='/usr'
+    make
+    sudo make install
+    popd
+    sudo open $DOWNLOADS/subversion-client-1.3.1.dmg
+    sudo open $DOWNLOADS/python-2.5-macosx.dmg
+else 
+
 sudo apt-get install g++ libfreetype6-dev libpcre3-dev autoconf automake1.9 libgl1-mesa-dev libx11-dev \
 libglut3-dev libtool libxaw7-dev libxxf86vm-dev patch \
 libxrandr-dev cvs subversion libxt-dev libexpat1-dev python python-dev \
 python-celementtree libglew-dev 
+
+if
\ No newline at end of file

Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh	2007-12-05 00:32:48 UTC (rev 490)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh	2007-12-07 05:28:32 UTC (rev 491)
@@ -10,25 +10,38 @@
 #
 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 
+
+## Handle Mac/Linux differences
+if [ $DARWIN == 1 ]
+then
+# Mac files
+$WGET http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0023/Cg-1.5_Sep2007_Tiger.dmg
+$WGET http://downloads.sourceforge.net/boost/boost-jam-3.1.16-1-macosxppc.tgz
+else
+# Linux files
+$WGET http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0023/Cg-1.5_Sep2007_x86.tar.gz 
+$WGET http://prdownloads.sourceforge.net/boost/boost-jam-3.1.16-1-linuxx86.tgz 
+$WGET http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz 
+fi
+
+# Generic
+$WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2
 $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://downloads.sourceforge.net/boost/boost_1_34_1.tar.bz2
 $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://downloads.sourceforge.net/bullet/bullet-2.64.tgz
+
+
 ##$WGET http://devfiles.ageia.com/PhysX_2.7.2_SDK_CoreLinux_deb.tar.gz?
-$WGET http://downloads.sourceforge.net/bullet/bullet-2.64.tgz
 popd 
 cd $INSTALL_DIR
 echo " -- getting pygccxml"

Modified: trunk/python-ogre/scripts/config.sh
===================================================================
--- trunk/python-ogre/scripts/config.sh	2007-12-05 00:32:48 UTC (rev 490)
+++ trunk/python-ogre/scripts/config.sh	2007-12-07 05:28:32 UTC (rev 491)
@@ -5,6 +5,19 @@
 WGETARGS="-c -nc --tries=3 --random-wait"
 WGET="`which wget` $WGETARGS"
 
+
+TEMPFILE=`mktemp -t temp.XXXXX`
+cat << EOF > $TEMPFILE
+#!/usr/bin/python
+import sys,os
+if sys.platform=='darwin':
+   print 1
+else : print 0
+EOF
+DARWIN=`python $TEMPFILE`
+rm $TEMPFILE
+
+
 TEMPFILE=`mktemp`
 cat << EOF > $TEMPFILE
 #!/usr/bin/python


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [490] trunk/python-ogre

From: <and...@us...> - 2007-12-05 00:32:46

Revision: 490
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=490&view=rev
Author:   andy_miller
Date:     2007-12-04 16:32:48 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
Linux Updates:  
  New lines at end of source file
  Include Ogre.h in OgreForests source files
  Update Changelog to reflect new Ogre Patch

Modified Paths:
--------------
    trunk/python-ogre/ChangeLog.txt
    trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h
    trunk/python-ogre/ThirdParty/forests/GrassLoader.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/code_generators/ogreforests/customization_data.py
    trunk/python-ogre/demos/cegui/plugins.cfg

Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt	2007-12-04 13:23:43 UTC (rev 489)
+++ trunk/python-ogre/ChangeLog.txt	2007-12-05 00:32:48 UTC (rev 490)
@@ -24,7 +24,8 @@
    New helper functions for bone and sceneNode to return them as nodes ( .castAsNode() ).  
    Changes due to using precompiled headers -- python_ogre_precompiled.h is now the primary header which includes 
    boost and python_ogre_masterlist.  The masterlist now uses Ogre.h and OgreStableHeaders.h to 
-   include most of the headers, so the missing list is smaller and easier to manage
+   include most of the headers, so the missing list is smaller and easier to manage
+   There is a newer patch file for the Ogre C++ library that changes certain functions from 'Pure virtual' to 'virtual' as this is required to allow function transformations to work (RenderQueueListener::RenderQueueStarted etc)
 * ogreal -- updated to SVN r90
 * ogrebulletc and ogrebulletd -- updated to latest CVS and using bullet 2.64
 * ogredshow -- Not part of this release as not compatible with latest DirectX SDK (I think..)

Modified: trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h	2007-12-04 13:23:43 UTC (rev 489)
+++ trunk/python-ogre/ThirdParty/forests/BatchedGeometry.h	2007-12-05 00:32:48 UTC (rev 490)
@@ -16,6 +16,7 @@
 #ifndef __BatchedGeometry_H__
 #define __BatchedGeometry_H__
 
+#include "Ogre.h"
 #include "OgrePrerequisites.h"
 #include "OgreMovableObject.h"
 #include "OgreSceneNode.h"
@@ -124,4 +125,4 @@
 
 
 
-#endif
\ No newline at end of file
+#endif

Modified: trunk/python-ogre/ThirdParty/forests/GrassLoader.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/GrassLoader.h	2007-12-04 13:23:43 UTC (rev 489)
+++ trunk/python-ogre/ThirdParty/forests/GrassLoader.h	2007-12-05 00:32:48 UTC (rev 490)
@@ -519,3 +519,4 @@
 };
 
 #endif
+

Modified: trunk/python-ogre/ThirdParty/forests/PropertyMaps.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PropertyMaps.h	2007-12-04 13:23:43 UTC (rev 489)
+++ trunk/python-ogre/ThirdParty/forests/PropertyMaps.h	2007-12-05 00:32:48 UTC (rev 490)
@@ -241,4 +241,6 @@
 
 
 
-#endif
\ No newline at end of file
+#endif
+
+

Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h	2007-12-04 13:23:43 UTC (rev 489)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h	2007-12-05 00:32:48 UTC (rev 490)
@@ -292,4 +292,6 @@
 
 
 
-#endif
\ No newline at end of file
+#endif
+
+

Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h	2007-12-04 13:23:43 UTC (rev 489)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h	2007-12-05 00:32:48 UTC (rev 490)
@@ -254,4 +254,6 @@
 
 
 
-#endif
\ No newline at end of file
+#endif
+
+

Modified: trunk/python-ogre/code_generators/ogreforests/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/customization_data.py	2007-12-04 13:23:43 UTC (rev 489)
+++ trunk/python-ogre/code_generators/ogreforests/customization_data.py	2007-12-05 00:32:48 UTC (rev 490)
@@ -1,6 +1,7 @@
 
 def header_files( version ):
-    return [ "GrassLoader.h"
+    return [ "Ogre.h"
+            ,"GrassLoader.h"
             ,"TreeLoader3D.h"
             ,"TreeLoader2D.h"
             ,"BatchPage.h"
@@ -9,4 +10,4 @@
   
 def huge_classes( version ):
     return []
-   
\ No newline at end of file
+   

Modified: trunk/python-ogre/demos/cegui/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/cegui/plugins.cfg	2007-12-04 13:23:43 UTC (rev 489)
+++ trunk/python-ogre/demos/cegui/plugins.cfg	2007-12-05 00:32:48 UTC (rev 490)
@@ -1,19 +1,19 @@
 # Defines plugins to load
 
-## User this for Windows
+## 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [489] trunk/python-ogre/scripts/07-BuildModules.sh

From: <and...@us...> - 2007-12-04 13:23:38

Revision: 489
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=489&view=rev
Author:   andy_miller
Date:     2007-12-04 05:23:43 -0800 (Tue, 04 Dec 2007)

Log Message:
-----------
Change build to call scons seperately for each module as there is a bug in scons where it uses the command line 
as it's detection for a rebuild which was causing excess building

Modified Paths:
--------------
    trunk/python-ogre/scripts/07-BuildModules.sh

Modified: trunk/python-ogre/scripts/07-BuildModules.sh
===================================================================
--- trunk/python-ogre/scripts/07-BuildModules.sh	2007-12-04 07:49:39 UTC (rev 488)
+++ trunk/python-ogre/scripts/07-BuildModules.sh	2007-12-04 13:23:43 UTC (rev 489)
@@ -12,7 +12,8 @@
 then 
     scons PROJECTS=$1 
 else
-    scons PROJECTS=ogre,ois,caelum,cegui,plib,ogrenewt,ogreode,quickgui,et,bullet,ogreforests -i
+    for PROJ in ogre ois cegui quickgui; do scons PROJECTS=$PROJ ; done ;
+    for PROJ in plib ogrenewt ogreode caelum et ogreforests bullet ogrebulletc ogrebulletd ; do scons PROJECTS=$PROJ ; done ;
 #ogreal,ogrebulletc,ogrebulletd,nxogre -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.

[Python-ogre-commit] SF.net SVN: python-ogre: [488] trunk/python-ogre

From: <and...@us...> - 2007-12-04 07:49:37

Revision: 488
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=488&view=rev
Author:   andy_miller
Date:     2007-12-03 23:49:39 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
Update Linux build to Bullet 2.64
Add new line to GroundFog to stop warning

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/ThirdParty/caelum/GroundFog.h
    trunk/python-ogre/scripts/01-RetrieveSource.sh
    trunk/python-ogre/scripts/02-ExtractAndPatch.sh
    trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh
    trunk/python-ogre/scripts/07-BuildModules.sh
    trunk/python-ogre/scripts/gen_code.sh

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-04 03:39:50 UTC (rev 487)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2007-12-04 07:49:39 UTC (rev 488)
@@ -38,8 +38,6 @@
 PATH_VORBIS=        os.path.join(BASE_DIR, 'libvorbis-1.2.0')
 PATH_OPENAL=        os.path.join(BASE_DIR, 'openal-0.0.8')
 PATH_OgreOde=       os.path.join(PATH_OgreAddons,'ogreode')
-# PATH_OgreBullet=    os.path.join(PATH_OgreAddons,'ogrebullet')
-# PATH_ogreforests=    os.path.join(PATH_OgreAddons,'forests')
 
 PATH_OgreBullet=    os.path.join(PATH_THIRDPARTY,'ogrebullet')
 PATH_ogreforests=   os.path.join(PATH_THIRDPARTY,'forests')
@@ -57,8 +55,8 @@
 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')
-PATH_Bullet=        os.path.join(BASE_DIR, 'bullet-2.63final') 
-###PATH_PhysX=         os.path.join(BASE_DIR, 'Physx/v2.7.2/SDKs')
+PATH_Bullet=        os.path.join(BASE_DIR, 'bullet-2.64') 
+###PATH_PhysX=         os.path.join(BASE_DIR, 'Physx/v2.7.3/SDKs')
 PATH_Theora=        os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
 PATH_ffmpeg=        os.path.join(BASE_DIR, 'ffmpeg')
 PATH_navi =         os.path.join(BASE_DIR, 'navi','Navi')
@@ -86,7 +84,7 @@
 PATH_LIB_betagui =              PATH_betagui
 PATH_LIB_quickgui =             PATH_quickgui
 # PATH_LIB_NxOgre=                os.path.join(LOCAL_LIB )
-PATH_LIB_PhysX =                os.path.join(LOCAL_LIB, 'PhysX','v2.7.2')
+PATH_LIB_PhysX =                os.path.join(LOCAL_LIB, 'PhysX','v2.7.3')
 PATH_LIB_Bullet = 		        os.path.join( LOCAL_LIB )
 PATH_LIB_Theora=                os.path.join(PATH_Theora, 'bin', 'Release')
 PATH_LIB_ogrevideoffmpeg =      PATH_ogrevideoffmpeg
@@ -137,9 +135,10 @@
 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-1.8.3','include')
+                        ,os.path.join(PATH_THIRDPARTY,'ptypes','include')
                         ]
-physxbase = os.path.join(LOCAL_INCLUDE, 'PhysX','v2.7.2', 'SDKs')
+physxbase = os.path.join(LOCAL_INCLUDE, 'PhysX','v2.7.3', 'SDKs')
 PATH_INCLUDE_PhysX= [ physxbase
                     ,os.path.join(physxbase, 'Cooking','Include')
                     ,os.path.join(physxbase, 'Foundation','include')

Modified: trunk/python-ogre/ThirdParty/caelum/GroundFog.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/GroundFog.h	2007-12-04 03:39:50 UTC (rev 487)
+++ trunk/python-ogre/ThirdParty/caelum/GroundFog.h	2007-12-04 07:49:39 UTC (rev 488)
@@ -129,4 +129,5 @@
 
 }
 
-#endif //GROUNDFOG_H
\ No newline at end of file
+#endif //GROUNDFOG_H
+

Modified: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh	2007-12-04 03:39:50 UTC (rev 487)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh	2007-12-04 07:49:39 UTC (rev 488)
@@ -28,7 +28,7 @@
 $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
+$WGET http://downloads.sourceforge.net/bullet/bullet-2.64.tgz
 popd 
 cd $INSTALL_DIR
 echo " -- getting pygccxml"
@@ -36,7 +36,8 @@
 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 -D "1 Oct 2007" gccxml 
+##cvs -z3 -q  -d :pserver:an...@ww...:/cvsroot/GCC_XML  co -D "1 Oct 2007" gccxml 
+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"

Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh
===================================================================
--- trunk/python-ogre/scripts/02-ExtractAndPatch.sh	2007-12-04 03:39:50 UTC (rev 487)
+++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh	2007-12-04 07:49:39 UTC (rev 488)
@@ -95,7 +95,7 @@
 echo "EMPTY" >>./NEWS
 popd
 echo " -- Unpacking Bullet"
-tar zxf $DOWNLOADS/bullet-2.63final.tgz
+tar zxf $DOWNLOADS/bullet-2.64.tgz
 echo
 echo "== Finished Extraction and Patching =="
 echo

Modified: trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh
===================================================================
--- trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh	2007-12-04 03:39:50 UTC (rev 487)
+++ trunk/python-ogre/scripts/05-BuildAdditionalLibs.sh	2007-12-04 07:49:39 UTC (rev 488)
@@ -64,7 +64,7 @@
 # Bullet
 # 
 echo " -- Building Bullet --"
-pushd bullet-2.63final
+pushd bullet-2.64
 cmake . -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX
 make
 find . -name *.a -execdir cp {} $PREFIX/lib \;

Modified: trunk/python-ogre/scripts/07-BuildModules.sh
===================================================================
--- trunk/python-ogre/scripts/07-BuildModules.sh	2007-12-04 03:39:50 UTC (rev 487)
+++ trunk/python-ogre/scripts/07-BuildModules.sh	2007-12-04 07:49:39 UTC (rev 488)
@@ -10,10 +10,10 @@
 cd python-ogre 
 if [ $1 != "" ]
 then 
-    scons PROJECTS=$1 -i
+    scons PROJECTS=$1 
 else
-    scons PROJECTS=ogre,ois,cegui,plib,ogrenewt,ogreode,ogreal,quickgui,et,bullet,ogreforests -i
-#,ogrebulletc,ogrebulletd,caelum -i
+    scons PROJECTS=ogre,ois,caelum,cegui,plib,ogrenewt,ogreode,quickgui,et,bullet,ogreforests -i
+#ogreal,ogrebulletc,ogrebulletd,nxogre -i
 fi
 #opcode -- not really suited to a linux build -- lots of work needed ? 
 #

Modified: trunk/python-ogre/scripts/gen_code.sh
===================================================================
--- trunk/python-ogre/scripts/gen_code.sh	2007-12-04 03:39:50 UTC (rev 487)
+++ trunk/python-ogre/scripts/gen_code.sh	2007-12-04 07:49:39 UTC (rev 488)
@@ -4,5 +4,5 @@
 # master config setup
 source ./config.sh
 pushd $INSTALL_DIR/python-ogre/code_generators/$1
-python generate_code.py > build.out
+python generate_code.py > build.out 2>&1
 popd


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [487] trunk/python-ogre/code_generators/ogre

From: <and...@us...> - 2007-12-04 03:39:47

Revision: 487
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=487&view=rev
Author:   andy_miller
Date:     2007-12-03 19:39:50 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
Linux fixes:
	typo in case
	unsigned to unsigned int for new gxxcml 
	#if platform is linux for include header
support

Modified Paths:
--------------
    trunk/python-ogre/code_generators/ogre/customization_data.py
    trunk/python-ogre/code_generators/ogre/generate_code.py
    trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h

Modified: trunk/python-ogre/code_generators/ogre/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/customization_data.py	2007-12-04 02:36:50 UTC (rev 486)
+++ trunk/python-ogre/code_generators/ogre/customization_data.py	2007-12-04 03:39:50 UTC (rev 487)
@@ -2,7 +2,7 @@
 def header_files( version ):
     if not version.startswith("1.2"):
         ## 21Nov07; Change to precompiled header support
-        return [ 'Python_ogre_precompiled.h'
+        return [ 'python_ogre_precompiled.h'
 # #                  ,'boost/python.hpp'
 # #                  ,'python_ogre_masterlist.h'
 # #                  ,'boost/python/ssize_t.hpp' ## needed for python2.4 as it doesn't define ssize_t

Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py	2007-12-04 02:36:50 UTC (rev 486)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py	2007-12-04 03:39:50 UTC (rev 487)
@@ -680,7 +680,10 @@
     elif sys.platform.startswith ('linux'):
         pass
     mb.global_ns.class_('vector<int, std::allocator<int> >').alias='VectorInt'
-    mb.global_ns.class_('vector<std::pair<unsigned, unsigned>, std::allocator<std::pair<unsigned, unsigned> > >').alias='VectorUnsignedUnsigned'
+    try:
+        mb.global_ns.class_('vector<std::pair<unsigned int, unsigned int>, std::allocator<std::pair<unsigned int, unsigned int> > >').alias='VectorUnsignedUnsigned'
+    except:
+        pass
     #as reported by mike with linux:bp::arg("flags")=(std::_Ios_Fmtflags)0
     mb.namespace( MAIN_NAMESPACE ).class_('StringConverter').member_functions('toString').exclude()    
 
@@ -983,7 +986,8 @@
     ## copied to the generaated directory..
     additional_files=[
             os.path.join( environment.shared_ptr_dir, 'py_shared_ptr.h'),
-            os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'python_ogre_precompiled.h' ),
+            os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'python_ogre_precompiled.h' ),
+            os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'python_ogre_masterlist.h' ),
             os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'generators.h' ),
             os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'custom_rvalue.cpp' ),
             os.path.join( environment.include_dir, 'tuples.hpp' )

Modified: trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h	2007-12-04 02:36:50 UTC (rev 486)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h	2007-12-04 03:39:50 UTC (rev 487)
@@ -6,11 +6,14 @@
 sizeof ( Ogre::MapIterator< std::multimap<Ogre::String, Ogre::String> > );
 sizeof ( Ogre::MapIterator< std::map<Ogre::String, std::multimap<Ogre::String, Ogre::String>*> > );
 
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
 sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, Ogre::Node*, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, Ogre::Node*> >, false> > );
 //sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, unsigned short, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, unsigned short> >, false> > );
 sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, Ogre::SharedPtr<Ogre::Resource>, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, Ogre::SharedPtr<Ogre::Resource> > >, false> > );
-sizeof( std::pair<Ogre::SharedPtr<Ogre::Resource>, bool> );
 sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, Ogre::MovableObject*, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, Ogre::MovableObject*> >, false> > );
+#endif
+
+sizeof ( std::pair<Ogre::SharedPtr<Ogre::Resource>, bool> );
 
 std::vector< int > v;
 std::set< std::string > s;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [486] trunk/python-ogre/patch/ogre.patch

From: <and...@us...> - 2007-12-04 02:36:44

Revision: 486
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=486&view=rev
Author:   andy_miller
Date:     2007-12-03 18:36:50 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
include stdexcept in header for linux build

Modified Paths:
--------------
    trunk/python-ogre/patch/ogre.patch

Modified: trunk/python-ogre/patch/ogre.patch
===================================================================
--- trunk/python-ogre/patch/ogre.patch	2007-12-03 23:09:57 UTC (rev 485)
+++ trunk/python-ogre/patch/ogre.patch	2007-12-04 02:36:50 UTC (rev 486)
@@ -10,7 +10,15 @@
 
 --- ogrenew/OgreMain/include/OgreDataStream.h	23 Aug 2006 08:18:33 -0000	1.12
 +++ ogrenew/OgreMain/include/OgreDataStream.h	24 Nov 2007 00:35:47 -0000
-@@ -79,7 +79,7 @@
+@@ -33,6 +33,7 @@
+ #include "OgreString.h"
+ #include "OgreSharedPtr.h"
+ #include <istream>
++#include <stdexcept>
+ 
+ namespace Ogre {
+ 
+@@ -79,7 +80,7 @@
  		@param count Number of bytes to read
  		@returns The number of bytes read
  		*/
@@ -22,7 +30,16 @@
 
 --- ogrenew/OgreMain/include/OgreHardwareBuffer.h	23 Aug 2006 08:18:33 -0000	1.17
 +++ ogrenew/OgreMain/include/OgreHardwareBuffer.h	24 Nov 2007 00:37:00 -0000
-@@ -244,7 +244,7 @@
+@@ -31,6 +31,8 @@
+ 
+ // Precompiler options
+ #include "OgrePrerequisites.h"
++#include <stdexcept>
++
+ 
+ namespace Ogre {
+ 
+@@ -244,7 +246,7 @@
              @param pDest The area of memory in which to place the data, must be large enough to 
                  accommodate the data!
              */
@@ -34,7 +51,16 @@
 
 --- ogrenew/OgreMain/include/OgreRenderQueueListener.h	23 Aug 2006 08:18:35 -0000	1.10
 +++ ogrenew/OgreMain/include/OgreRenderQueueListener.h	24 Nov 2007 00:34:52 -0000
-@@ -65,7 +65,7 @@
+@@ -31,6 +31,8 @@
+ 
+ #include "OgrePrerequisites.h"
+ #include "OgreRenderQueue.h"
++#include <stdexcept>
++
+ 
+ namespace Ogre {
+ 
+@@ -65,7 +67,7 @@
  			for this queue group.
          */
          virtual void renderQueueStarted(uint8 queueGroupId, const String& invocation, 
@@ -43,7 +69,7 @@
  
          /** Event raised after a queue group is rendered. 
          @remarks
-@@ -80,7 +80,7 @@
+@@ -80,7 +82,7 @@
  			events will also be fired for it again.
          */
          virtual void renderQueueEnded(uint8 queueGroupId, const String& invocation, 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [485] trunk/python-ogre/patch/ogre.patch

From: <and...@us...> - 2007-12-03 23:09:56

Revision: 485
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=485&view=rev
Author:   andy_miller
Date:     2007-12-03 15:09:57 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
Tweaked ogre patch file

Modified Paths:
--------------
    trunk/python-ogre/patch/ogre.patch

Modified: trunk/python-ogre/patch/ogre.patch
===================================================================
--- trunk/python-ogre/patch/ogre.patch	2007-12-02 06:25:09 UTC (rev 484)
+++ trunk/python-ogre/patch/ogre.patch	2007-12-03 23:09:57 UTC (rev 485)
@@ -8,8 +8,8 @@
  AC_SUBST(CFLAGS_VISIBILITY)
  AC_LANG_POP
 
---- OgreMain/include/OgreDataStream.h	23 Aug 2006 08:18:33 -0000	1.12
-+++ OgreMain/include/OgreDataStream.h	24 Nov 2007 00:35:47 -0000
+--- ogrenew/OgreMain/include/OgreDataStream.h	23 Aug 2006 08:18:33 -0000	1.12
++++ ogrenew/OgreMain/include/OgreDataStream.h	24 Nov 2007 00:35:47 -0000
 @@ -79,7 +79,7 @@
  		@param count Number of bytes to read
  		@returns The number of bytes read
@@ -20,8 +20,8 @@
  		@remarks
  			The delimiter character is not included in the data
 
- --- OgreMain/include/OgreHardwareBuffer.h	23 Aug 2006 08:18:33 -0000	1.17
-+++ OgreMain/include/OgreHardwareBuffer.h	24 Nov 2007 00:37:00 -0000
+--- ogrenew/OgreMain/include/OgreHardwareBuffer.h	23 Aug 2006 08:18:33 -0000	1.17
++++ ogrenew/OgreMain/include/OgreHardwareBuffer.h	24 Nov 2007 00:37:00 -0000
 @@ -244,7 +244,7 @@
              @param pDest The area of memory in which to place the data, must be large enough to 
                  accommodate the data!
@@ -32,8 +32,8 @@
                  ensure that your buffer is big enough.
  		    @param offset The byte offset from the start of the buffer to start writing
 
---- OgreMain/include/OgreRenderQueueListener.h	23 Aug 2006 08:18:35 -0000	1.10
-+++ OgreMain/include/OgreRenderQueueListener.h	24 Nov 2007 00:34:52 -0000
+--- ogrenew/OgreMain/include/OgreRenderQueueListener.h	23 Aug 2006 08:18:35 -0000	1.10
++++ ogrenew/OgreMain/include/OgreRenderQueueListener.h	24 Nov 2007 00:34:52 -0000
 @@ -65,7 +65,7 @@
  			for this queue group.
          */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [484] trunk/python-ogre

From: <and...@us...> - 2007-12-02 06:25:04

Revision: 484
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=484&view=rev
Author:   andy_miller
Date:     2007-12-01 22:25:09 -0800 (Sat, 01 Dec 2007)

Log Message:
-----------
More missing files and some cleanup

Added Paths:
-----------
    trunk/python-ogre/boost/tools/build/v2/user-config.jam.Python-Ogre
    trunk/python-ogre/patch/navi.patch

Removed Paths:
-------------
    trunk/python-ogre/code_generators/physx/customization_data.pyc
    trunk/python-ogre/code_generators/physx/hand_made_wrappers.pyc

Added: trunk/python-ogre/boost/tools/build/v2/user-config.jam.Python-Ogre
===================================================================
--- trunk/python-ogre/boost/tools/build/v2/user-config.jam.Python-Ogre	                        (rev 0)
+++ trunk/python-ogre/boost/tools/build/v2/user-config.jam.Python-Ogre	2007-12-02 06:25:09 UTC (rev 484)
@@ -0,0 +1,56 @@
+# Copyright 2003, 2005 Douglas Gregor 
+# Copyright 2004 John Maddock 
+# Copyright 2002, 2003, 2004 Vladimir Prus 
+# Distributed under the Boost Software License, Version 1.0. 
+# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
+
+#  This file is used to configure your Boost.Build installation. Please read
+#  the user manual to find out where to put it.
+
+#  Toolset declarations are most important in this file. They tell Boost.Build
+#  what compilers are available and where to look for them. The first toolset
+#  will become "default" one.
+#  Some important libraries can also be configured.
+#  Uncomment relevant parts to suite your local configuration and preferences.
+
+import toolset : using ;
+using python ;
+#using python : 2.5 ;
+##using msvc : 7.1 ;
+#  GCC configuration
+
+#  Configure gcc (default version)
+#  using gcc ;
+
+#  Configure specific gcc version, giving alternative name to use
+#  using gcc : 3.2 : g++-3.2 ;
+
+#  MSVC configuration
+
+#  Configure msvc (default version, searched in standard location
+#  and PATH).
+#  using msvc ;
+
+#  Borland configuration
+#  using borland ;
+
+
+#  STLPort configuration
+
+#  Configure, specifying location of STLPort headers. 
+#  Libraries must be either not needed, or available to
+#  the compiler by default
+#  using stlport : : /usr/include/stlport ;
+
+#  Configure, specifying locatioh of both headers and libraries
+#  using stlport : : /usr/include/stlport /usr/lib ;
+
+
+#  QT configuration
+
+#  Configure, assuming QTDIR gives the installation prefix
+#  using qt ;
+
+#  Configure with explicit installation prefix
+#  using qt : /usr/opt/qt ;
+

Deleted: trunk/python-ogre/code_generators/physx/customization_data.pyc
===================================================================
(Binary files differ)

Deleted: trunk/python-ogre/code_generators/physx/hand_made_wrappers.pyc
===================================================================
(Binary files differ)

Added: trunk/python-ogre/patch/navi.patch
===================================================================
--- trunk/python-ogre/patch/navi.patch	                        (rev 0)
+++ trunk/python-ogre/patch/navi.patch	2007-12-02 06:25:09 UTC (rev 484)
@@ -0,0 +1,45 @@
+--- Navi/Include/Navi.h	(revision 25)
++++ Navi/Include/Navi.h	(working copy)
+@@ -34,7 +34,7 @@
+ {
+ 	class _NaviExport Navi : public LLEmbeddedBrowserWindowObserver, public Ogre::WindowEventListener, public Ogre::ManualResourceLoader
+ 	{
+-		friend NaviManager;
++		friend class NaviManager;
+ 
+ 		std::string naviName;
+ 		unsigned short naviWidth;
+@@ -69,8 +69,8 @@
+ 		std::multimap<std::string, NaviDelegate> delegateMap;
+ 		std::multimap<std::string, NaviDelegate>::iterator delegateIter;
+ 		std::pair<std::multimap<std::string, NaviDelegate>::iterator, std::multimap<std::string, NaviDelegate>::iterator> dmBounds;
+-		std::map<std::string, std::vector<std::string>> ensureKeysMap;
+-		std::map<std::string, std::vector<std::string>>::iterator ensureKeysMapIter;
++		std::map<std::string, std::vector<std::string> > ensureKeysMap;
++		std::map<std::string, std::vector<std::string> >::iterator ensureKeysMapIter;
+ 		bool okayToDelete;
+ 		bool isVisible;
+ 		bool fadingOut;
+
+--- Navi/Include/NaviMouse.h	(revision 25)
++++ Navi/Include/NaviMouse.h	(working copy)
+@@ -41,7 +41,7 @@
+ 	class _NaviExport NaviMouse : public Singleton<NaviMouse>, public Ogre::ManualResourceLoader
+ 	{
+ 		friend class NaviManager;
+-		friend NaviCursor;
++		friend class NaviCursor;
+ 		int mouseX, mouseY;
+ 		unsigned short width, height;
+ 		unsigned short texWidth, texHeight;
+
+--- Navi/Include/NaviManager.h	(revision 25)
++++ Navi/Include/NaviManager.h	(working copy)
+@@ -37,6 +37,7 @@
+ 
+ namespace NaviLibrary
+ {
++    class Navi; // needed for Python-Ogre gccxml processing
+ 	/**
+ 	* Enumerates relative positions. Used by NaviManager::NaviPosition
+ 	*/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [483] trunk/python-ogre/code_generators

From: <and...@us...> - 2007-12-02 06:22:55

Revision: 483
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=483&view=rev
Author:   andy_miller
Date:     2007-12-01 22:23:00 -0800 (Sat, 01 Dec 2007)

Log Message:
-----------
Missing files -- precompiled header support for ogre and the sizeof header
ile for build nxogre under windows..

Added Paths:
-----------
    trunk/python-ogre/code_generators/nxogre/python_nxogre_sizeof.h.windows
    trunk/python-ogre/code_generators/ogre/python_ogre_precompiled.h

Added: trunk/python-ogre/code_generators/nxogre/python_nxogre_sizeof.h.windows
===================================================================
--- trunk/python-ogre/code_generators/nxogre/python_nxogre_sizeof.h.windows	                        (rev 0)
+++ trunk/python-ogre/code_generators/nxogre/python_nxogre_sizeof.h.windows	2007-12-02 06:23:00 UTC (rev 483)
@@ -0,0 +1,63 @@
+sizeof ( NxControllersHit );
+sizeof ( NxBoxShapeDesc );
+sizeof ( NxPlaneShapeDesc );
+sizeof ( NxControllerManager );
+sizeof ( NxControllerShapeHit );
+sizeof ( NxPruningStructure );
+sizeof ( NxVec3 );
+sizeof ( NxSceneLimits );
+sizeof ( NxWheelShapeDesc );
+sizeof ( NxController  );
+sizeof ( NxUserRaycastReport );
+sizeof ( NxControllerAction );
+sizeof ( NxWheelShape );
+sizeof ( NxHeightFieldShapeDesc );
+sizeof ( NxClothMesh );
+sizeof ( NxConvexShapeDesc );
+sizeof ( NxMeshData );
+sizeof ( NxFluid );
+sizeof ( NxHeightFieldAxis );
+sizeof ( NxTriangleMeshShapeDesc );
+sizeof ( NxTriangleMesh );
+sizeof ( NxSweepQueryHit );
+sizeof ( NxSphereShapeDesc );
+sizeof ( NxJointType );
+sizeof ( NxPhysicsSDK );
+sizeof ( NxUserAllocator );
+sizeof ( NxHeightField  );
+sizeof ( NxUserContactReport );
+//sizeof ( NxOgre::FluidDrain );
+sizeof ( NxImplicitScreenMesh  );
+sizeof ( NxMemoryType );
+sizeof ( NxJointState );
+sizeof ( NxBounds3 );
+sizeof ( NxRaycastHit );
+//sizeof ( NxOgre::FluidEmitter );
+sizeof ( NxContactPairFlag );
+sizeof ( NxClothDesc );
+sizeof ( NxContactPair );
+sizeof ( NxForceMode );
+//sizeof ( NxOgre::Compartment );
+sizeof ( NxCombineMode );
+sizeof ( NxExtendedVec3 );
+sizeof ( NxThreadPriority );
+sizeof ( NxConvexMesh );
+sizeof ( NxContactPair );
+sizeof ( NxSceneLimits );
+sizeof ( NxWheelShape );
+sizeof ( NxUserControllerHitReport );
+sizeof ( NxSceneDesc );
+sizeof ( NxScene );
+sizeof ( NxPhysicsSDK );
+sizeof ( NxShape );
+sizeof ( NxGroupsMask );
+sizeof ( NxControllersHit );
+sizeof ( JointCallback );
+sizeof ( JointCallback::JointBreakCallback );
+sizeof(std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >,std::basic_string<char, std::char_traits<char>, std::allocator<char> > >);
+
+sizeof ( std::pair<std::string, std::string> );
+
+
+
+

Added: trunk/python-ogre/code_generators/ogre/python_ogre_precompiled.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_precompiled.h	                        (rev 0)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_precompiled.h	2007-12-02 06:23:00 UTC (rev 483)
@@ -0,0 +1,4 @@
+/* precompiled header to improve compile times */
+#include "boost/python.hpp"
+#include "boost/python/ssize_t.hpp"
+#include "python_ogre_masterlist.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Python-ogre-commit] SF.net SVN: python-ogre: [482] trunk/python-ogre/ThirdParty

From: <and...@us...> - 2007-12-02 06:20:46

Revision: 482
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=482&view=rev
Author:   andy_miller
Date:     2007-12-01 22:20:51 -0800 (Sat, 01 Dec 2007)

Log Message:
-----------
Missing files...

Added Paths:
-----------
    trunk/python-ogre/ThirdParty/betagui/old/
    trunk/python-ogre/ThirdParty/betagui/old/BetaGUI.h
    trunk/python-ogre/ThirdParty/betagui/old/BetaGui.cpp
    trunk/python-ogre/ThirdParty/betagui/old/BetaGui.py
    trunk/python-ogre/ThirdParty/caelum/CameraBoundElement.cpp
    trunk/python-ogre/ThirdParty/ptypes/
    trunk/python-ogre/ThirdParty/ptypes/LICENSE
    trunk/python-ogre/ThirdParty/ptypes/Makefile
    trunk/python-ogre/ThirdParty/ptypes/doc/
    trunk/python-ogre/ThirdParty/ptypes/doc/async.examples.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.jobqueue.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.message.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.msgqueue.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.mutex.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.rwlock.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.semaphore.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.thread.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.trigger.html
    trunk/python-ogre/ThirdParty/ptypes/doc/async.utils.html
    trunk/python-ogre/ThirdParty/ptypes/doc/basic.html
    trunk/python-ogre/ThirdParty/ptypes/doc/changes.html
    trunk/python-ogre/ThirdParty/ptypes/doc/compiling.html
    trunk/python-ogre/ThirdParty/ptypes/doc/criterrors.html
    trunk/python-ogre/ThirdParty/ptypes/doc/cset.constructors.html
    trunk/python-ogre/ThirdParty/ptypes/doc/cset.html
    trunk/python-ogre/ThirdParty/ptypes/doc/cset.manipulation.html
    trunk/python-ogre/ThirdParty/ptypes/doc/cset.operators.html
    trunk/python-ogre/ThirdParty/ptypes/doc/deploying.html
    trunk/python-ogre/ThirdParty/ptypes/doc/freshmeat-logo.png
    trunk/python-ogre/ThirdParty/ptypes/doc/htsrc.html
    trunk/python-ogre/ThirdParty/ptypes/doc/include/
    trunk/python-ogre/ThirdParty/ptypes/doc/include/pasync.h.html
    trunk/python-ogre/ThirdParty/ptypes/doc/include/pinet.h.html
    trunk/python-ogre/ThirdParty/ptypes/doc/include/pport.h.html
    trunk/python-ogre/ThirdParty/ptypes/doc/include/pstreams.h.html
    trunk/python-ogre/ThirdParty/ptypes/doc/include/ptime.h.html
    trunk/python-ogre/ThirdParty/ptypes/doc/include/ptypes.h.html
    trunk/python-ogre/ThirdParty/ptypes/doc/index.html
    trunk/python-ogre/ThirdParty/ptypes/doc/inet.examples.html
    trunk/python-ogre/ThirdParty/ptypes/doc/inet.html
    trunk/python-ogre/ThirdParty/ptypes/doc/inet.ipmessage.html
    trunk/python-ogre/ThirdParty/ptypes/doc/inet.ipmsgserver.html
    trunk/python-ogre/ThirdParty/ptypes/doc/inet.ipstmserver.html
    trunk/python-ogre/ThirdParty/ptypes/doc/inet.ipstream.html
    trunk/python-ogre/ThirdParty/ptypes/doc/inet.utils.html
    trunk/python-ogre/ThirdParty/ptypes/doc/intro.html
    trunk/python-ogre/ThirdParty/ptypes/doc/lists.html
    trunk/python-ogre/ThirdParty/ptypes/doc/lists.textmap.html
    trunk/python-ogre/ThirdParty/ptypes/doc/lists.tobjlist.html
    trunk/python-ogre/ThirdParty/ptypes/doc/lists.tpodlist.html
    trunk/python-ogre/ThirdParty/ptypes/doc/lists.tstrlist.html
    trunk/python-ogre/ThirdParty/ptypes/doc/portability.html
    trunk/python-ogre/ThirdParty/ptypes/doc/ref.html
    trunk/python-ogre/ThirdParty/ptypes/doc/ref.tmpl.html
    trunk/python-ogre/ThirdParty/ptypes/doc/source-forge-logo.png
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.errors.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.examples.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.infile.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.inmem.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.instm.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.iobase.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.logfile.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.md5.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.namedpipe.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.npserver.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.outfile.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.outmem.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.outstm.html
    trunk/python-ogre/ThirdParty/ptypes/doc/streams.stdio.html
    trunk/python-ogre/ThirdParty/ptypes/doc/string.constructors.html
    trunk/python-ogre/ThirdParty/ptypes/doc/string.conversion.html
    trunk/python-ogre/ThirdParty/ptypes/doc/string.html
    trunk/python-ogre/ThirdParty/ptypes/doc/string.manipulation.html
    trunk/python-ogre/ThirdParty/ptypes/doc/string.operators.html
    trunk/python-ogre/ThirdParty/ptypes/doc/string.typecasts.html
    trunk/python-ogre/ThirdParty/ptypes/doc/styles.css
    trunk/python-ogre/ThirdParty/ptypes/doc/time.calendar.html
    trunk/python-ogre/ThirdParty/ptypes/doc/time.datetime.html
    trunk/python-ogre/ThirdParty/ptypes/doc/time.html
    trunk/python-ogre/ThirdParty/ptypes/doc/time.time.html
    trunk/python-ogre/ThirdParty/ptypes/doc/title-21.png
    trunk/python-ogre/ThirdParty/ptypes/doc/unit.html
    trunk/python-ogre/ThirdParty/ptypes/doc/unknown.html
    trunk/python-ogre/ThirdParty/ptypes/doc/variant.arrays.html
    trunk/python-ogre/ThirdParty/ptypes/doc/variant.html
    trunk/python-ogre/ThirdParty/ptypes/doc/variant.objrefs.html
    trunk/python-ogre/ThirdParty/ptypes/doc/variant.typecasts.html
    trunk/python-ogre/ThirdParty/ptypes/doc/variant.utils.html
    trunk/python-ogre/ThirdParty/ptypes/doc/wshare.html
    trunk/python-ogre/ThirdParty/ptypes/include/
    trunk/python-ogre/ThirdParty/ptypes/include/pasync.h
    trunk/python-ogre/ThirdParty/ptypes/include/pinet.h
    trunk/python-ogre/ThirdParty/ptypes/include/pport.h
    trunk/python-ogre/ThirdParty/ptypes/include/pstreams.h
    trunk/python-ogre/ThirdParty/ptypes/include/ptime.h
    trunk/python-ogre/ThirdParty/ptypes/include/ptypes/
    trunk/python-ogre/ThirdParty/ptypes/include/ptypes/pasync.h
    trunk/python-ogre/ThirdParty/ptypes/include/ptypes/pinet.h
    trunk/python-ogre/ThirdParty/ptypes/include/ptypes/pport.h
    trunk/python-ogre/ThirdParty/ptypes/include/ptypes/pstreams.h
    trunk/python-ogre/ThirdParty/ptypes/include/ptypes/ptime.h
    trunk/python-ogre/ThirdParty/ptypes/include/ptypes/ptypes.h
    trunk/python-ogre/ThirdParty/ptypes/include/ptypes.h
    trunk/python-ogre/ThirdParty/ptypes/index.html
    trunk/python-ogre/ThirdParty/ptypes/src/
    trunk/python-ogre/ThirdParty/ptypes/src/Makefile.Darwin
    trunk/python-ogre/ThirdParty/ptypes/src/Makefile.FreeBSD
    trunk/python-ogre/ThirdParty/ptypes/src/Makefile.HP-UX
    trunk/python-ogre/ThirdParty/ptypes/src/Makefile.Linux
    trunk/python-ogre/ThirdParty/ptypes/src/Makefile.SunOS
    trunk/python-ogre/ThirdParty/ptypes/src/Makefile.common
    trunk/python-ogre/ThirdParty/ptypes/src/pasync.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/patomic.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/patomic.sparc.s
    trunk/python-ogre/ThirdParty/ptypes/src/pcomponent.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pcset.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pcsetdbg.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pexcept.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pfatal.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pfdxstm.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pinfile.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pinfilter.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pinmem.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pinstm.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pintee.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/piobase.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pipbase.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pipmsg.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pipmsgsv.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pipstm.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pipstmsv.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pipsvbase.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pmd5.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pmem.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pmsgq.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pmtxtable.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pnpipe.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pnpserver.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pobjlist.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/poutfile.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/poutfilter.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/poutmem.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/poutstm.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/ppipe.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/ppodlist.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pputf.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/prwlock.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/psemaphore.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pstdio.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pstrcase.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pstrconv.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pstring.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pstrlist.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pstrmanip.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pstrtoi.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pstrutils.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/ptextmap.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pthread.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/ptime.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/ptimedsem.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/ptrigger.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/ptypes_test.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/punit.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/punknown.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pvariant.cxx
    trunk/python-ogre/ThirdParty/ptypes/src/pversion.cxx
    trunk/python-ogre/ThirdParty/ptypes/win32/
    trunk/python-ogre/ThirdParty/ptypes/win32/PTypes.sln
    trunk/python-ogre/ThirdParty/ptypes/win32/PTypes_DLL.vcproj
    trunk/python-ogre/ThirdParty/ptypes/win32/PTypes_Lib.vcproj
    trunk/python-ogre/ThirdParty/ptypes/win32/PTypes_Lib_ST.vcproj
    trunk/python-ogre/ThirdParty/ptypes/win32/PTypes_Test.vcproj
    trunk/python-ogre/ThirdParty/ptypes/win32/PTypes_Test_ST.vcproj
    trunk/python-ogre/ThirdParty/ptypes/win32/dll_version.rc
    trunk/python-ogre/ThirdParty/ptypes/win32/resource.h
    trunk/python-ogre/ThirdParty/ptypes/win32/wshare.vcproj
    trunk/python-ogre/ThirdParty/ptypes/wshare/
    trunk/python-ogre/ThirdParty/ptypes/wshare/Makefile.Darwin
    trunk/python-ogre/ThirdParty/ptypes/wshare/Makefile.FreeBSD
    trunk/python-ogre/ThirdParty/ptypes/wshare/Makefile.HP-UX
    trunk/python-ogre/ThirdParty/ptypes/wshare/Makefile.Linux
    trunk/python-ogre/ThirdParty/ptypes/wshare/Makefile.SunOS
    trunk/python-ogre/ThirdParty/ptypes/wshare/Makefile.common
    trunk/python-ogre/ThirdParty/ptypes/wshare/clients.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/clients.h
    trunk/python-ogre/ThirdParty/ptypes/wshare/config.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/config.h
    trunk/python-ogre/ThirdParty/ptypes/wshare/log.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/log.h
    trunk/python-ogre/ThirdParty/ptypes/wshare/mimetable.awk
    trunk/python-ogre/ThirdParty/ptypes/wshare/mimetable.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/mod_about.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/mod_file.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/mod_wstat.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/modules.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/modules.h
    trunk/python-ogre/ThirdParty/ptypes/wshare/request.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/request.h
    trunk/python-ogre/ThirdParty/ptypes/wshare/sysutils.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/sysutils.h
    trunk/python-ogre/ThirdParty/ptypes/wshare/urlutils.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/urlutils.h
    trunk/python-ogre/ThirdParty/ptypes/wshare/utils.cxx
    trunk/python-ogre/ThirdParty/ptypes/wshare/utils.h
    trunk/python-ogre/ThirdParty/ptypes/wshare/wshare.cxx
    trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIPrecompiledHeaders.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIPrecompiledHeaders.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIPrerequisites.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSetManager.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSetManager.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUITextHelper.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUITextHelper.h

Added: trunk/python-ogre/ThirdParty/betagui/old/BetaGUI.h
===================================================================
--- trunk/python-ogre/ThirdParty/betagui/old/BetaGUI.h	                        (rev 0)
+++ trunk/python-ogre/ThirdParty/betagui/old/BetaGUI.h	2007-12-02 06:20:51 UTC (rev 482)
@@ -0,0 +1,638 @@
+#ifndef BETAGUI_H
+#define BETAGUI_H
+
+/// Betajaen's GUI 016 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.
+
+#include "Ogre.h"
+#include "OgreTextAreaOverlayElement.h"
+
+#include <iostream>
+
+using namespace Ogre;
+using namespace std;
+
+namespace BetaGUI 
+{
+    //------------------------------------------------------------------------------------------------
+    class GUI;
+
+    class Widget;
+    class Window;
+
+    class Button;
+    class BoolButton;
+    class MenuButton;
+    class RealButton;
+
+    class StaticText;
+    class TextInput;
+
+    class Callback;
+
+    class Effect;
+    class AlphaEffect;
+    class MoveEffect;
+    class SizeEffect;
+
+    //------------------------------------------------------------------------------------------------
+	enum WindowFeatureType 
+    { 
+		WFT_NONE                =   0,
+		WFT_MOVE           ,
+		WFT_RESIZE         ,
+		WFT_RESIZE_AND_MOVE
+    };
+    //------------------------------------------------------------------------------------------------
+     enum WindowPlacementType 
+     { 
+         WPT_NONE       =   0,
+         WPT_VERTICAL   ,
+         WPT_HORIZONTAL 
+     };
+    //------------------------------------------------------------------------------------------------
+    enum WindowActivity 
+    {
+        WA_NONE   =   0,
+        WA_MOVE   ,
+        WA_RESIZE ,
+        WA_PRESS  
+    };
+    //------------------------------------------------------------------------------------------------
+	class GUI 
+    {
+		public:
+
+			friend class Window;
+
+            friend class Button;
+
+            friend class MenuButton;
+            friend class BoolButton;
+            friend class RealButton;
+
+            friend class StaticText;
+			friend class TextInput;
+
+            GUI(const Ogre::String &baseOverlay, const Ogre::String &font, int fontSize, Ogre::RenderWindow *win);
+
+			~GUI();
+
+            void sortZOrder() ;
+
+            void setZRangeOrder(int nearZ, int FarZ);
+
+			bool injectMouse(int x, int y, bool LMB);
+            bool injectMouse(float x, float y, bool LMB);
+
+			bool injectKey(const Ogre::String &key, int x, int y);
+
+			void injectBackspace(int x, int y);
+
+            Window*	 createWindow(
+                const Ogre::Vector4 &Dimensions, 
+                const Ogre::String &Material, 
+                WindowFeatureType type, 
+                const Ogre::String &caption = "");
+
+			void destroyWindow(Window *window) {
+                mNextWindowToDestroy=window;
+            }
+            Ogre::OverlayContainer* createOverlay(const Ogre::String &name, 
+                const Ogre::Vector2 &position,
+                const Ogre::Vector2 &dimensions, 
+                const Ogre::String &material = "", 
+                const Ogre::String &caption = "");
+
+			Ogre::OverlayContainer* createMousePointer(Ogre::Vector2 dimensions, 
+                const Ogre::String &material);
+				
+ 
+
+            Window *addMenuWindow(const Ogre::Vector2 dimensions);
+           
+            void update(Ogre::Real timeElapsed);
+            void addEffect (Effect* e);
+            Ogre::Real getUpTime() const {return mUpTime;}
+
+	protected:
+            //Ogre::Overlay*          mGuiOverlay;					// Main sheet overlay
+            std::vector<Window*>    mWindows;					    // Windows
+			Window *                mNextWindowToDestroy;			// Window to destroy
+			Ogre::OverlayContainer* mMousePointerOverlay;			// Mouse Pointer Overlay
+
+			Ogre::String mFont;
+			int mFontSize;
+			int mWindowCount, mButtonCount, mTextCaptionCount, mTextCaptionCountArea, mButtonCountTextArea;
+
+
+            Ogre::uint  mDragWindowAction; 
+
+            int         mDragX, mDragY; 
+            int         mDragWindowX, mDragWindowY;
+
+            Window *    mActiveDraggedWindow; 
+            TextInput * mActiveTextInput; 
+            Button *    mActiveButton; 
+
+            Ogre::Vector2           mNextMenuWindowPos;
+            Window *                mMenuWindow;
+            Ogre::RenderWindow *    mRenderWindow;
+
+            std::list<Effect*> mActiveEffects;
+
+            Ogre::Real mUpTime;
+            Ogre::String mName;
+            int mFarZ;
+            int mNearZ;
+    };
+    //------------------------------------------------------------------------------------------------
+    class Widget 
+    {
+    public:
+
+        friend class GUI;
+
+        Widget(const Ogre::Vector4 &Dimension, 
+            const Ogre::String &materialNameNormal,
+            bool hasOverState = true,
+            bool hasActiveState = true);
+        
+        virtual ~Widget();
+        
+        Ogre::Vector2 getPosition()  const{return Ogre::Vector2(mPosX,mPosY);}
+        Ogre::Vector2 getSize()   const {return Ogre::Vector2(mWidth,mHeight); }
+      
+        void setPosition(const Ogre::Vector2 &position);
+        void setSize(const Ogre::Vector2 &size);
+        
+        virtual void show(){setAlpha (1.0, true);}; 
+        virtual void hide(){setAlpha (0.0, true);}; 
+
+        virtual bool isVisible() {return mMainOverlay->isVisible ();};    
+
+        virtual void over(const bool a);
+        virtual void activate(const bool a);
+
+        virtual void adjustSizeToContent();
+
+        virtual void setPosition(float X,float Y);
+        virtual void setPosition(int X,int Y);
+        virtual void setSize(int X,int Y);
+        virtual void setAlpha(const Ogre::Real alpha, const bool isContainer);
+        virtual void setMaterialBlendFactor(const Ogre::Real blendFactor, const bool isContainer);
+
+        // mUnderEffect getter
+        bool getUnderEffect() const { return mUnderEffect; }
+        // mUnderEffect setter
+        void setUnderEffect(bool val);
+
+        // mOver getter
+        bool getOver() const { return mOver; }
+        // mOver setter
+        void setOver(bool val) { mOver = val; }
+        // mActive getter
+        bool getActive() const { return mActive; }
+        // mActive setter
+        void setActive(bool val) { mActive = val; }
+        
+        // mActive setter
+		void setMainMaterial(const Ogre::String& mat) {
+			mMainOverlay->setMaterialName(mat);
+		}
+
+		void setCaptionMaterial(const Ogre::String& mat) {
+			mCaptionOverlay->setMaterialName(mat);
+		}
+
+		void setText(const Ogre::String& t) {
+			mCaptionOverlay->setCaption(t);
+		}
+
+		Ogre::String getText() const {
+			return mCaptionOverlay->getCaption();
+		}
+
+    protected:
+        //------------------------------------------------------------------------------------------------
+        inline bool isOut (const int x, const int y) const 
+        {
+            return (x < mPosX) || (y < mPosY) 
+                || (x > (mPosX + mWidth)) || 
+                (y > (mPosY + mHeight));
+        }
+        //------------------------------------------------------------------------------------------------
+        inline bool isIn (const int x, const int y) const 
+        {
+            return (x >= mPosX) && (y >= mPosY) 
+                && (x <= (mPosX + mWidth)) && 
+                (y <= (mPosY + mHeight));
+        }
+
+        void instantiateMaterial(Ogre::OverlayContainer * const oc, bool reset) const;
+        void setOverlayAlpha(Ogre::OverlayContainer * const oc, const Ogre::Real alpha) const;
+        void setOverlayMaterialBlendFactor(Ogre::OverlayContainer * const oc, const Ogre::Real blendFactor) const;
+
+        int mPosX, mPosY, mWidth, mHeight;
+
+        std::vector<Widget *> mChildren;
+        Ogre::OverlayContainer* mMainOverlay;
+        Ogre::OverlayContainer* mCaptionOverlay;			
+        Ogre::String mMaterialName;						
+
+        bool mHasMaterial;
+        bool mHasOverState;
+        bool mHasActiveState;
+        bool mUnderEffect;
+        bool mOver;
+        bool mActive;
+    };
+    //------------------------------------------------------------------------------------------------
+    class Window : public Widget
+    {
+		public:
+			friend class Button;
+            friend class TextInput;
+            friend class StaticText;
+			friend class GUI;
+
+            Window(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, WindowFeatureType type, const Ogre::String &caption, GUI *gui);
+            virtual ~Window();
+
+			Button*		createButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
+                const Ogre::String &Text, Callback callback);
+
+			TextInput*	createTextInput(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
+                const Ogre::String & Value, int length);
+
+			StaticText* createStaticText(const Ogre::Vector4 &Dimensions, const Ogre::String &Text);
+		
+			void setSize(int X,int Y);
+
+            MenuButton *addMenuButton(Window *target, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
+            BoolButton *addBoolButton(bool value, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
+            RealButton *addRealButton(Ogre::Real value, const Ogre::Vector4 &SliderMoves, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
+            StaticText* addStaticText(const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
+
+            Window *addMenuWindowTab(const Ogre::String &label,  
+                bool titleBarWin = true, 
+                WindowPlacementType wpt = WPT_VERTICAL);
+
+            MenuButton* createMenuButton(const Ogre::Vector4 &D, const Ogre::String &M, const Ogre::String &T, Callback C, Window *t);
+            BoolButton* createBoolButton(const Ogre::Vector4 &D, const Ogre::String &M, const Ogre::String &T, Callback C, bool boolValue);
+            
+            RealButton *createRealButton(Ogre::Real value, 
+                const Ogre::Vector4 &SliderMoves, 
+                const Ogre::String &label,
+                const Ogre::Vector2 &pos);
+
+            GUI* getGUI() const {return mGUI;}
+
+			void setFadeOut(bool f){mFadeOut = f;}
+            void setZOrder(int zOrder){mGuiOverlay->setZOrder (zOrder);}
+		protected:
+
+			
+			bool check(int x, int y, bool LMB); 
+            bool checkKey(const Ogre::String &key, int x, int y);
+
+			TextInput* mActiveTextInput;		// Active TextInput
+
+            Button 
+                *mCloseButton,
+                *mResizerButton,
+                *mActiveButton,
+                *mTitleBarButton;				// Resizer, ActiveButton, Title bar			
+
+			GUI *mGUI;							// mGUI pointer
+			
+            std::vector<Button*> mButtons;		// Buttons
+            std::vector<TextInput*> mTextInput;	// TextInputs
+
+            Ogre::Overlay *mGuiOverlay;
+
+            void addWidget(const Widget * const w, WindowPlacementType wpt);
+            Ogre::Vector2 mNextWidgetPos;
+            WindowActivity mDragType;  
+
+			bool mFadeOut;
+
+    };
+    //------------------------------------------------------------------------------------------------
+	class BetaGUIListener 
+    {
+		public:
+			virtual void onButtonPress(Button*, unsigned char) = 0;
+    };
+    //------------------------------------------------------------------------------------------------
+	class Callback 
+    {
+		public:
+			friend class Window;
+			friend class Button;
+			
+			Callback() {
+				mCallbackType=0;
+			}
+			
+			Callback( void(*functionPointer)(BetaGUI::Button*, bool) ) {
+				mCallbackType=1;
+				fp = functionPointer;
+			}
+
+			Callback(BetaGUIListener *l){
+				mCallbackType = 2;
+				mListener = l;
+			}
+		protected:
+			unsigned char mCallbackType;					// Type of callback: 0 - None, 1 - FunctionPointer 2 - GUIListener, 3 - Move Window, 4 - Resize
+			void(*fp)(BetaGUI::Button*, bool);	// Function pointer (if 1)
+			BetaGUIListener *mListener;		// GuiListener (if 2)
+    };
+    //------------------------------------------------------------------------------------------------
+    class Button : public Widget
+    {
+		public:
+            friend class Window;
+            friend class GUI;
+		
+			Button(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
+                const Ogre::String &Text, Callback callback, Window *parent);			
+            virtual ~Button() {}
+
+		protected:
+			Callback mCallback;			// Callback to use
+    };
+    //------------------------------------------------------------------------------------------------
+    class MenuButton : public Button
+    {
+    public:
+        MenuButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
+                    const Ogre::String &Text, Callback callback, Window *parent, 
+                    Window *target) :
+            Button(Dimensions, Material, Text, callback, parent),
+            mTarget(target)
+            {};
+            virtual ~MenuButton(){};
+    protected:
+        void activate(const bool a) ;
+
+        Window *mTarget;
+    };
+    //------------------------------------------------------------------------------------------------
+    class BoolButton : public Button
+    {
+    public:
+        BoolButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
+            const Ogre::String &Text, Callback callback, Window *parent, bool boolValue):
+            Button(Dimensions, Material, Text, callback, parent),
+            mBoolValue(boolValue)
+            {}
+        virtual ~BoolButton(){};
+
+    protected:
+        void activate(const bool a) ;
+
+        bool mBoolValue;
+    };
+    //------------------------------------------------------------------------------------------------
+    class TextInput : public Widget
+    {
+		public:
+            friend class Window;
+            friend class GUI;
+			
+			TextInput(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
+                        const Ogre::String &Value, unsigned int length, Window *parent);
+			virtual ~TextInput(){}
+            const Ogre::String &getValue() const {return mValueText;}			
+			void setValue(const Ogre::String &v) {mCaptionOverlay->setCaption(mValueText = v);}
+
+		protected:
+            unsigned int length;
+			Ogre::String mValueText;// MaterialName Normal, MaterialName Active
+			
+    };
+    //------------------------------------------------------------------------------------------------
+    class StaticText : public Widget
+    {
+    public:
+        friend class Window;
+
+        StaticText(const Ogre::Vector4 &Dimensions,
+            const Ogre::String &Value,  
+            Window *parent);
+        virtual ~StaticText(){}
+
+        const Ogre::String &getValue() const 
+        {return mValueText;}
+
+        void setValue(const Ogre::String &v) 
+        {
+            mCaptionOverlay->setCaption(mValueText = v);
+            mWidth = static_cast<int> (mValueText.size () * 7);
+            mParent->adjustSizeToContent ();
+        }
+
+    protected:
+
+        int            length;
+        Ogre::String   mValueText;
+        Window         *mParent;
+    };
+    //------------------------------------------------------------------------------------------------
+    class RealButton : public BetaGUIListener, public Widget
+    {
+        public:
+            friend class Window;
+
+            RealButton(BetaGUI::Window *window, 
+                Ogre::Real value, 
+                const Ogre::Vector4 &SliderMoves,
+                const Ogre::String &label, 
+                const Ogre::Vector2 &pos);
+
+            virtual ~RealButton(){};
+
+            Ogre::Real getValue() const {return mValue;}
+
+            void setValue(const Ogre::Real v);
+
+            void onButtonPress(BetaGUI::Button *ref, Ogre::uchar type);
+        protected:
+
+            int        length;
+
+            BetaGUI::TextInput *mtextValueInput;
+            BetaGUI::Button    *mForward, *mFastForward, *mRewind, *mFastRewind;
+
+            Ogre::Real      mValue;
+            Ogre::String    mValueText;
+         
+            Ogre::Real     mLowSlideUnit;    
+            Ogre::Real     mFastSlideUnit;   
+            Ogre::Real     mMinValue;       
+            Ogre::Real     mMaxValue; 
+
+    };
+    //------------------------------------------------------------------------------------------------
+    class Effect
+    {
+    public:
+        enum EffectInterpolatorType
+        {
+            EFFECT_LINEAR = 0,
+            EFFECT_LINEARX2,
+            EFFECT_LINEARX4,
+            EFFECT_SIN
+        };
+    public:
+        Effect(Widget * const widget, const Ogre::Real duration, 
+            const Ogre::Real startTime, const Ogre::Real currTime = 0, const bool repeat = false,
+            EffectInterpolatorType type = EFFECT_LINEARX4) : 
+            mWidget(widget), 
+            mStartTime(startTime), 
+            mDuration(duration), 
+            mRepeat(repeat),
+            mCurrTime(currTime),
+            mType(type)
+        {
+            assert (duration != 0);
+        }
+        virtual ~Effect(){};
+
+        virtual void updateValue(const Ogre::Real factor) = 0;
+
+        bool update(Ogre::Real timeElapsed);
+        Ogre::Real getTimeFactor() ;
+        bool getTimeOrIsFinished();
+//         Ogre::Real linearInterpolate(const Ogre::Real start, 
+//             const Ogre::Real end, 
+//             const Ogre::Real timeFactor) const;
+        Ogre::Real interpolate(const Ogre::Real start, 
+            const Ogre::Real end, 
+            const Ogre::Real timeFactor) const;
+
+    protected:
+        Widget * const mWidget;
+        const Ogre::Real mStartTime; 
+        const Ogre::Real mDuration;
+        const bool mRepeat;
+
+        Ogre::Real mCurrTime;
+        const EffectInterpolatorType mType;
+    };
+    //------------------------------------------------------------------------------------------------
+    class AlphaEffect : public Effect
+    {
+    public:
+
+        AlphaEffect(Widget * const widget, 
+            const Ogre::Real duration, 
+            const Ogre::Real startAlpha,
+            const Ogre::Real endAlpha,
+            const Ogre::Real startTime, 
+            const Ogre::Real currTime = 0, 
+            const bool repeat = false,
+            EffectInterpolatorType type = EFFECT_LINEARX4) : 
+        Effect(widget, duration, startTime,  currTime, repeat), 
+            mStartAlpha(startAlpha), 
+            mEndAlpha(endAlpha)
+        {
+            assert(mStartAlpha >= 0.0 && mStartAlpha <= 1.0);
+            assert(mEndAlpha >= 0.0 && mEndAlpha <= 1.0);
+        }
+        virtual ~AlphaEffect(){};
+
+        void updateValue(const Ogre::Real factor);
+    private:
+        const Ogre::Real mStartAlpha;
+        const Ogre::Real mEndAlpha;
+    };
+    //------------------------------------------------------------------------------------------------
+    class MoveEffect : public Effect
+    {
+    public:
+        MoveEffect(Widget * const widget, 
+            const Ogre::Real duration, 
+            const Ogre::Vector2 &startPosition,
+            const Ogre::Vector2 &endPosition,
+            const Ogre::Real startTime, 
+            const Ogre::Real currTime = 0, 
+            const bool repeat = false,
+            EffectInterpolatorType type = EFFECT_LINEARX4) : 
+        Effect(widget, duration, startTime,  currTime, repeat), 
+            mStartPosition(startPosition), 
+            mEndPosition(endPosition)
+        {}
+        virtual ~MoveEffect(){};
+        void updateValue(const Ogre::Real factor);
+
+    private:
+        const Ogre::Vector2 mStartPosition;
+        const Ogre::Vector2 mEndPosition;
+    };
+    //------------------------------------------------------------------------------------------------
+    class SizeEffect : public Effect
+    {
+    public:
+        SizeEffect(Widget * const widget, 
+            const Ogre::Real duration, 
+            const Ogre::Vector2 &startSize,
+            const Ogre::Vector2 &endSize,
+            const Ogre::Real startTime, 
+            const Ogre::Real currTime = 0, 
+            const bool repeat = false,
+            EffectInterpolatorType type = EFFECT_LINEARX4) : 
+        Effect(widget, duration, startTime, currTime, repeat), 
+            mStartSize(startSize), 
+            mEndSize(endSize)
+        {}
+        virtual ~SizeEffect(){};
+        void updateValue(const Ogre::Real factor);
+
+    private:
+        const Ogre::Vector2 mStartSize;
+        const Ogre::Vector2 mEndSize;
+    };
+    //------------------------------------------------------------------------------------------------
+    class ActivateEffect : public Effect
+    {
+    public:
+        ActivateEffect(Widget * const widget, 
+            const Ogre::Real duration, 
+            const Ogre::Real startTime, 
+            const Ogre::Real currTime = 0, 
+            const bool repeat = false,
+            EffectInterpolatorType type = EFFECT_LINEARX4): 
+        Effect(widget, duration, startTime, currTime, repeat)
+        {};
+        virtual ~ActivateEffect(){};
+        void updateValue(const Ogre::Real factor);
+
+    };
+    //------------------------------------------------------------------------------------------------
+    class OverEffect : public Effect
+    {
+    public:
+        OverEffect(Widget * const widget, 
+            const Ogre::Real duration, 
+            const Ogre::Real startTime, 
+            const Ogre::Real currTime = 0, 
+            const bool repeat = false,
+            EffectInterpolatorType type = EFFECT_LINEARX4): 
+        Effect(widget, duration, startTime, currTime, repeat)
+        {};
+        virtual ~OverEffect(){};
+        void updateValue(const Ogre::Real factor);
+
+    };
+    //------------------------------------------------------------------------------------------------
+
+
+} // End of Namespace
+
+///////////////////////////////////////////////////////////////////////////////
+#endif
+

Added: trunk/python-ogre/ThirdParty/betagui/old/BetaGui.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/betagui/old/BetaGui.cpp	                        (rev 0)
+++ trunk/python-ogre/ThirdParty/betagui/old/BetaGui.cpp	2007-12-02 06:20:51 UTC (rev 482)
@@ -0,0 +1,1269 @@
+#include "BetaGUI.h"
+
+namespace BetaGUI 
+{
+    //------------------------------------------------------------------------------------------------
+	GUI::GUI(const String &baseOverlay, const String &font, int fontSize, RenderWindow *win)
+		:mNextWindowToDestroy(0),
+		 mMousePointerOverlay(0),
+		 mFont(font),
+		 mFontSize(fontSize),
+		 mWindowCount(0),
+		 mButtonCount(0),
+		 mTextCaptionCount(0),
+         mTextCaptionCountArea(0),
+         mButtonCountTextArea(0),
+         mNextMenuWindowPos(0,0),
+         mMenuWindow(0),
+         mRenderWindow(win),
+         mDragWindowAction(WA_NONE),
+         mActiveDraggedWindow(0),
+         mActiveTextInput(0),
+         mActiveButton(0),
+         mUpTime(0),
+         mFarZ(100),
+         mNearZ(101),
+         mName(baseOverlay)
+    {
+           
+    }
+    //------------------------------------------------------------------------------------------------
+	GUI::~GUI() 
+    {
+        for(std::vector<Window*>::iterator i=mWindows.begin();i!=mWindows.end();++i) 
+        {
+            delete (*i); 
+        }
+
+        std::list<Effect*>::iterator itEffect = mActiveEffects.begin();
+        while (itEffect != mActiveEffects.end())        
+        {
+            delete *itEffect;
+            ++itEffect;            
+        } 
+    }
+    //------------------------------------------------------------------------------------------------
+    void GUI::setZRangeOrder(int nearZ, int FarZ) 
+    {
+        assert (mNearZ > mFarZ);
+        mNearZ = nearZ;
+        mFarZ = FarZ;
+        sortZOrder();
+    };
+    //------------------------------------------------------------------------------------------------
+    void GUI::sortZOrder()
+    {
+        assert (mNearZ > mFarZ);
+        int farZ = mFarZ;
+        for(std::vector<Window*>::iterator i=mWindows.begin();i!=mWindows.end();++i) 
+        {
+            (*i)->setZOrder(farZ) ; 
+            if (farZ + 1 < mNearZ)
+                farZ++;
+        }
+        if (mActiveDraggedWindow)
+            mActiveDraggedWindow->setZOrder(mNearZ) ;
+    }
+    //------------------------------------------------------------------------------------------------
+    void GUI::update (Ogre::Real timeElapsed)
+    {
+        mUpTime += timeElapsed;
+
+        {
+            std::vector<Window*>::iterator itWindow = mWindows.begin();       
+            while (itWindow != mWindows.end())        
+            {
+                (*itWindow)->setUnderEffect(false);
+                ++itWindow;
+            } 
+        }
+        {
+            std::list<Effect*>::iterator itEffect = mActiveEffects.begin();       
+            while (itEffect != mActiveEffects.end())        
+            {
+                if ((*itEffect)->update(timeElapsed))
+                {
+                    delete *itEffect;
+                    itEffect = mActiveEffects.erase(itEffect);
+                }
+                else
+                {
+                    ++itEffect;
+                }
+            } 
+        }
+        if (mNextWindowToDestroy) 
+        {
+            for(std::vector<Window*>::iterator i=mWindows.begin();i!=mWindows.end();++i) 
+            {
+                if(mNextWindowToDestroy==(*i)) 
+                {
+                    delete mNextWindowToDestroy;
+                    mWindows.erase(i);
+                    mNextWindowToDestroy=0;
+                }
+            }
+        }
+    }
+    //------------------------------------------------------------------------------------------------
+    void GUI::addEffect (Effect* e)
+    {
+        mActiveEffects.push_back(e);
+    }
+    //-----------------------------------------------------------------------------
+    bool GUI::injectMouse(float x, float y, bool LMB)
+    {
+        return injectMouse ( int(x), int(y), LMB );
+    }   
+    
+	bool GUI::injectMouse(int x, int y, bool LMB) 
+    {		
+       // if (mMousePointerOverlay)
+       // {
+       //     mMousePointerOverlay->hide ();
+            mMousePointerOverlay->setPosition(x,y);
+       // }
+
+               
+        if (LMB)
+        {
+            if (mActiveTextInput) 
+            { 
+                mActiveTextInput->mMainOverlay->setMaterialName(mActiveTextInput->mMaterialName);
+                mActiveTextInput = 0;
+            }
+
+
+            if (mActiveButton && mActiveDraggedWindow) 
+            {
+                 if (mActiveDraggedWindow->mDragType == WA_MOVE) 
+                 {
+                       mDragWindowAction = WA_MOVE; 
+                       mActiveDraggedWindow->setPosition (
+                           mDragWindowX + (x - mDragX),
+                           mDragWindowY + (y - mDragY)
+                           );
+                       return true;
+                 } 
+                 else if (mActiveDraggedWindow->mDragType == WA_RESIZE) 
+                 {
+                     mDragWindowAction = WA_RESIZE; 
+                     mActiveDraggedWindow->setSize (
+                         mDragWindowX + (x - mDragX),
+                         mDragWindowY + (y - mDragY)
+                         );
+                       return true;
+                 } 
+            }
+        }
+        else if (mDragWindowAction != WA_NONE)
+        {
+            mDragWindowAction = WA_NONE;
+            mActiveDraggedWindow = 0; 
+            sortZOrder ();
+        }
+
+        assert (mDragWindowAction == WA_NONE) ;  
+        for(std::vector<Window*>::iterator i=mWindows.begin();i!=mWindows.end();++i) 
+        {
+		    if((*i)->isVisible() && 
+                (*i)->check(x, y, LMB)) 
+            {
+                mActiveDraggedWindow = (*i);
+                sortZOrder ();
+
+                //if (mMousePointerOverlay)
+                //   mMousePointerOverlay->show ();
+			    return true;
+		    }
+	    }      
+
+		return false;
+    }	
+    //------------------------------------------------------------------------------------------------
+	bool GUI::injectKey(const String &key, int x, int y) 
+    {
+        if (mActiveTextInput == 0 || key.empty()) 
+            return false;
+
+        if (key == "!b") 
+        {
+            mActiveTextInput->setValue(
+                mActiveTextInput->mValueText.substr(0, mActiveTextInput->mValueText.length()-1)
+                );
+            return true;
+        }
+
+        if (mActiveTextInput->mValueText.length() >= mActiveTextInput->length) 
+            return true;
+
+        mActiveTextInput->mCaptionOverlay->setCaption(mActiveTextInput->mValueText += key);
+        return false;
+    }
+    //------------------------------------------------------------------------------------------------
+	void GUI::injectBackspace(int x, int y) 
+    {
+		injectKey("!b", x, y);
+    }
+    //------------------------------------------------------------------------------------------------
+	OverlayContainer* GUI::createOverlay(const String &name, const Vector2 &position, 
+        const Vector2 &dimensions, const String &material, 
+        const String &caption) 
+    {
+        OverlayContainer* e;
+        const bool isTextArea = !caption.empty();
+        try
+        {
+            e =  static_cast<OverlayContainer*>
+                (OverlayManager::getSingleton().getOverlayElement (name));
+        }
+        catch (...) 
+        {    
+            e = static_cast<OverlayContainer*>
+                (OverlayManager::getSingleton().createOverlayElement(
+                    (isTextArea ? "TextArea" : "Panel" ), 
+                    name));
+        }
+
+        e->setMetricsMode(Ogre::GMM_PIXELS);
+        e->setDimensions(dimensions.x, dimensions.y);
+        e->setPosition(position.x, position.y);
+
+        if (!material.empty())
+            e->setMaterialName(material);
+
+        if (isTextArea) 
+        {
+            e->setCaption(caption);
+            e->setParameter("font_name", mFont);
+            e->setParameter("char_height", StringConverter::toString(mFontSize));
+
+            e->setParameter("colour_top", 
+                StringConverter::toString(ColourValue(0.57, 0.86, 0.68, 1.00)));
+            e->setParameter("colour_bottom", 
+                StringConverter::toString(ColourValue(0.68, 0.86, 0.68, 1.00)));
+        } 
+		return e;
+    }
+    //------------------------------------------------------------------------------------------------
+    OverlayContainer* GUI::createMousePointer(Vector2 d, const String &m) 
+    {
+        Overlay* o = (Overlay*)OverlayManager::getSingleton().getByName("BetaGUI.MP");
+		if (!o)
+            o = OverlayManager::getSingleton().create("BetaGUI.MP");
+
+		o->setZOrder(648);
+
+		mMousePointerOverlay = createOverlay("bg.mp", Vector2(0,0), d, m, "");
+
+        if (mMousePointerOverlay != o->getChild (mMousePointerOverlay->getName ()))
+		    o->add2D(mMousePointerOverlay);
+		o->show();
+        mMousePointerOverlay->show();
+		return mMousePointerOverlay;
+    }
+    //------------------------------------------------------------------------------------------------
+    Window* GUI::createWindow(const Vector4 &Dimensions, const String & Material, WindowFeatureType type, const String &caption) 
+    {
+        Window* window = new Window(Dimensions, Material, type, caption, this);
+        mWindows.push_back(window);
+        return window;
+    }
+    //------------------------------------------------------------------------------------------------
+    Window *GUI::addMenuWindow(const Vector2 dimensions)
+    {
+        assert (mMenuWindow == 0);       
+        mMenuWindow = createWindow(Vector4(0, 0, dimensions.x, dimensions.y),
+            "bgui.window", WFT_NONE,  ""); 
+
+        mNextMenuWindowPos.y = 25;
+        return mMenuWindow;
+    }
+    //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    Widget::Widget(const Ogre::Vector4 &Dimension, 
+        const Ogre::String &materialNameNormal,
+        bool hasOverState,
+        bool hasActiveState):
+        mPosX(Dimension.x),
+        mPosY(Dimension.y),
+        mWidth(Dimension.z),
+        mHeight(Dimension.w),
+        mMainOverlay(0), 
+        mCaptionOverlay(0),
+        mMaterialName(materialNameNormal),
+        mHasMaterial(!materialNameNormal.empty()),
+        mHasOverState(hasOverState && mHasMaterial),
+        mHasActiveState(hasActiveState && mHasMaterial),
+        mUnderEffect(false),
+        mOver(false),
+        mActive(false)
+    {
+
+    }
+    //------------------------------------------------------------------------------------------------
+    Widget::~Widget() 
+    {
+        if (mMainOverlay && mMainOverlay->getParent()) mMainOverlay->getParent()->removeChild(mMainOverlay->getName());
+        if (mCaptionOverlay && mCaptionOverlay->getParent()) mCaptionOverlay->getParent()->removeChild(mCaptionOverlay->getName());
+
+        for(std::vector<Widget*>::iterator i=mChildren.begin();i!=mChildren.end();++i)
+            delete (*i);
+    }  
+    //------------------------------------------------------------------------------------------------
+    void Widget::over(const bool a) 
+    {
+        assert(!mUnderEffect);
+        mOver = a;
+        if (!a && mHasMaterial && mMainOverlay)
+        {
+            mMainOverlay->setMaterialName(mMaterialName);
+
+            if (mCaptionOverlay)
+            {
+                mCaptionOverlay->setParameter("colour_top", 
+                    Ogre::StringConverter::toString(Ogre::ColourValue(0.57, 0.86, 0.68, 1.0)));
+                mCaptionOverlay->setParameter("colour_bottom", 
+                    Ogre::StringConverter::toString(Ogre::ColourValue(0.68, 0.86, 0.68, 1.00)));
+            }
+        }
+        if (a && mHasActiveState && mMainOverlay)
+        {
+            mMainOverlay->setMaterialName(mMaterialName + ".over");
+
+            if (mCaptionOverlay)
+            {
+                mCaptionOverlay->setParameter("colour_top", 
+                    Ogre::StringConverter::toString(Ogre::ColourValue(1.0, 0.96, 0.76, 1.0)));
+                mCaptionOverlay->setParameter("colour_bottom", 
+                    Ogre::StringConverter::toString(Ogre::ColourValue(1.0, 0.96, 0.76, 1.00)));
+            }
+        }
+        // propagate ?
+        //for(std::vector<Widget*>::iterator i=mChildren.begin();i!=mChildren.end();++i) 
+        //{
+        //    (*i)->over(a);
+        //}
+    }
+    //------------------------------------------------------------------------------------------------
+    void Widget::activate(const bool a) 
+    {
+        assert(!mUnderEffect);
+        mActive = a;
+        if (!a && mHasMaterial && mMainOverlay)
+        {
+            mMainOverlay->setMaterialName(mMaterialName);
+
+            if (mCaptionOverlay)
+            {
+                mCaptionOverlay->setParameter("colour_top", 
+                    Ogre::StringConverter::toString(Ogre::ColourValue(0.57, 0.86, 0.68, 1.0)));
+                mCaptionOverlay->setParameter("colour_bottom", 
+                    Ogre::StringConverter::toString(Ogre::ColourValue(0.68, 0.86, 0.68, 1.00)));
+            }
+        }
+        if (a && mHasActiveState && mMainOverlay)
+        {
+            mMainOverlay->setMaterialName(mMaterialName + ".active");
+
+            if (mCaptionOverlay)
+            {
+                mCaptionOverlay->setParameter("colour_top", 
+                    Ogre::StringConverter::toString(Ogre::ColourValue(1.0, 0.96, 0.76, 1.0)));
+                mCaptionOverlay->setParameter("colour_bottom", 
+                    Ogre::StringConverter::toString(Ogre::ColourValue(1.0, 0.96, 0.76, 1.00)));
+            }
+        }
+        // propagate ?
+        //for(std::vector<Widget*>::iterator i=mChildren.begin();i!=mChildren.end();++i) 
+        //{
+        //    (*i)->activate(a);
+        //}
+    }
+    //------------------------------------------------------------------------------------------------
+    void Widget::setUnderEffect(const bool effect)
+    {
+        if (effect)
+        {
+            if (mActive)
+                activate (false);
+            if (mOver)
+                over (false);
+        }
+        mUnderEffect = effect;
+    };
+    //------------------------------------------------------------------------------------------------
+    void Widget::instantiateMaterial(OverlayContainer * const oc, bool reset) const
+    {
+        if (oc->getMaterial ().isNull ())
+            return;
+
+        const String matName (oc->getMaterial ()->getName ());
+        const bool isInstantied = StringUtil::endsWith(matName, ".GuiInstance", false);
+        if (reset)
+        {
+            if (isInstantied)
+                oc->setMaterialName (
+                matName.substr(0, 
+                matName.length() - (oc->getName ().length() + 12)));
+        }
+        else if (!isInstantied)
+        {
+            const String newMatName(matName + oc->getName () + ".GuiInstance");
+            // need to instantiate a material there...
+            if (!MaterialManager::getSingleton ().resourceExists (newMatName))
+            {
+                oc->getMaterial ()->clone (newMatName);
+            }                    
+            oc->setMaterialName (newMatName);
+        }
+    }
+    //------------------------------------------------------------------------------------------------
+    void Widget::setOverlayAlpha(OverlayContainer * const oc, const Ogre::Real alpha) const
+    {
+        if (!oc->getMaterial ().isNull ())
+        {
+            TextureUnitState *t = oc->getMaterial ()->getBestTechnique ()->getPass(0)->getTextureUnitState (0);
+            if (t) t->setAlphaOperation (LBX_MODULATE, LBS_TEXTURE, LBS_MANUAL, alpha, alpha, alpha);
+        }
+    } 
+    //------------------------------------------------------------------------------------------------
+    void Widget::setAlpha(const Ogre::Real alpha, const bool isContainer)
+    {         
+        bool noAlpha = false;
+        Ogre::Real alphaValue = alpha;
+    
+        if (alphaValue - 1.0 > -std::numeric_limits<Real>::epsilon())
+        {
+            noAlpha = true;
+            if (isContainer) mMainOverlay->show ();   
+        }
+        else if (alphaValue < std::numeric_limits<Real>::epsilon())
+        {
+            noAlpha = true;
+            if (isContainer) mMainOverlay->hide ();
+        }
+        else if (isContainer)
+        {
+            mMainOverlay->show ();   
+        }        
+        if (noAlpha) alphaValue =  Ogre::Real(1.0);
+
+        //should save in a boolean the instantiated state...
+        if (mMainOverlay)
+        {
+            instantiateMaterial (mMainOverlay, noAlpha);
+            if (!noAlpha) setOverlayAlpha (mMainOverlay, alphaValue);
+        }
+        if (mCaptionOverlay)
+        {
+            instantiateMaterial (mCaptionOverlay, noAlpha);
+            if (!noAlpha) setOverlayAlpha (mCaptionOverlay, alphaValue);
+        }
+        for(std::vector<Widget*>::iterator i=mChildren.begin();i!=mChildren.end();++i) 
+        {
+            (*i)->setAlpha(alphaValue, false);
+        }
+    }
+    //------------------------------------------------------------------------------------------------
+    void Widget::setMaterialBlendFactor(const Ogre::Real blendFactor, const bool isContainer)
+    {
+        bool noBlendFactor = false;
+        Ogre::Real blendFactorValue = blendFactor;
+
+        if (blendFactorValue - 1.0 > -std::numeric_limits<Real>::epsilon())
+        {
+            noBlendFactor = true;
+        }
+        else if (blendFactorValue < std::numeric_limits<Real>::epsilon())
+        {
+            noBlendFactor = true;
+        }
+        if (noBlendFactor) blendFactorValue =  Ogre::Real(1.0);
+
+        //should save in a boolean the instantiated state...
+        if (mMainOverlay)
+        {
+            instantiateMaterial (mMainOverlay, noBlendFactor);
+            if (!noBlendFactor) setOverlayMaterialBlendFactor (mMainOverlay, blendFactorValue);
+        }
+        if (mCaptionOverlay)
+        {
+            instantiateMaterial (mCaptionOverlay, noBlendFactor);
+            if (!noBlendFactor) setOverlayMaterialBlendFactor (mCaptionOverlay, blendFactorValue);
+        }
+        for(std::vector<Widget*>::iterator i=mChildren.begin();i!=mChildren.end();++i) 
+        {
+            (*i)->setMaterialBlendFactor(noBlendFactor, false);
+        }
+    }
+    //------------------------------------------------------------------------------------------------
+    void Widget::setOverlayMaterialBlendFactor(OverlayContainer * const oc, const Ogre::Real blendFactor) const
+    {
+        if (!oc->getMaterial ().isNull ())
+        {
+            TextureUnitState *t = oc->getMaterial ()->getBestTechnique ()->getPass(0)->getTextureUnitState (1);
+            if (t) 
+                //t->setAlphaOperation (LBX_MODULATE, LBS_TEXTURE, LBS_MANUAL, blendFactor, blendFactor, blendFactor);
+                t->setColourOperationEx(LBX_BLEND_MANUAL, LBS_TEXTURE, LBS_CURRENT, ColourValue::White, ColourValue::White, blendFactor);
+        }
+    }
+    //------------------------------------------------------------------------------------------------
+    void Widget::adjustSizeToContent()
+    {
+        Ogre::Real w = 0;
+        Ogre::Real h = 0;
+        for(std::vector<Widget*>::iterator i=mChildren.begin();i!=mChildren.end();++i) 
+        {
+            const Vector2 pos ((*i)->getPosition());
+            const Vector2 size ((*i)->getSize());
+
+            w = std::max(w, pos.x + size.x);
+            h = std::max(h, pos.y + size.y);
+        }
+        setSize(w, h);
+    }
+    //------------------------------------------------------------------------------------------------
+    void Widget::setPosition(float X,float Y)
+    {
+        setPosition(int(X), int(Y));
+    }
+    void Widget::setPosition(const Ogre::Vector2 &position)
+    {
+        setPosition(position.x, position.y);
+    }
+    //------------------------------------------------------------------------------------------------
+    void Widget::setPosition(int X,int Y)
+    {
+        if (mMainOverlay) mMainOverlay->setPosition(mPosX=X,mPosY=Y);
+    }
+    //------------------------------------------------------------------------------------------------
+    void Widget::setSize(const Ogre::Vector2 &size)
+    {
+        setSize(size.x, size.y);
+    };
+    //------------------------------------------------------------------------------------------------
+    void Widget::setSize(int X,int Y)
+    {
+        if (mMainOverlay) mMainOverlay->setDimensions(mWidth=X, mHeight=Y);
+        if (mCaptionOverlay) mCaptionOverlay->setDimensions(mWidth, mHeight);
+    };
+    //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------
+	Window::Window(const Vector4 &Dimensions, const String &material, WindowFeatureType t, const String &caption, GUI *gui)
+		: 
+          Widget(Dimensions, material, true, true),
+		  mGUI(gui),
+		  mTitleBarButton(0),
+          mCloseButton(0),
+		  mResizerButton(0),
+		  mActiveTextInput(0),
+		  mActiveButton(0),
+          mNextWidgetPos(0, 0),
+          mDragType(WA_NONE),
+		  mFadeOut(false)
+	{
+ 
+        const String name(gui->mName + ".w" + StringConverter::toString(gui->mWindowCount++));
+        mGuiOverlay = (Overlay*)OverlayManager::getSingleton().getByName(name);
+        if (!mGuiOverlay)
+			mGuiOverlay = OverlayManager::getSingleton().create(name);
+		mGuiOverlay->show();
+
+        
+		mMainOverlay = gui->createOverlay(name, 
+                                Vector2(Dimensions.x, Dimensions.y), 
+                                Vector2(Dimensions.z, Dimensions.w), 
+                                material); 
+        if (mMainOverlay != mGuiOverlay->getChild (mMainOverlay->getName ()))
+            mGuiOverlay->add2D(mMainOverlay);
+        mMainOverlay->show();
+
+		if (t >= 2) 
+        {
+			Callback c;
+            c.mCallbackType=4;
+			mResizerButton = createButton(
+                Vector4(Dimensions.z-16, Dimensions.w-16, 16, 16),
+                material + ".resize", "", c);
+		}
+        
+        if ((t == 1 || t == 3) && !caption.empty()) 
+        {
+			Callback c;
+            c.mCallbackType=3;
+
+			mTitleBarButton = createButton(Vector4(0,0,Dimensions.z-22,22),
+                material + ".titlebar", caption, c);
+
+            mCloseButton = createMenuButton(Vector4(Dimensions.z-22,0,22,22),
+                material + ".close",  "", Callback(), this);
+
+            mNextWidgetPos.x += 12;
+            mNextWidgetPos.y += 22;
+        }  
+    }
+    //------------------------------------------------------------------------------------------------
+    Window::~Window()
+    {
+       //Widget::~Widget();
+       //OverlayManager::getSingleton ().destroy (mGuiOverlay->getName ());
+    }
+    //------------------------------------------------------------------------------------------------
+    void Window::addWidget(const Widget * const w, WindowPlacementType wpt)
+    {
+        switch(wpt)
+        {
+        case WPT_HORIZONTAL:
+            mNextWidgetPos.x += w->getSize().x; break;
+        case WPT_VERTICAL:
+            mNextWidgetPos.y += w->getSize().y; break;
+        case WPT_NONE:
+        default:
+            break;
+        }
+        adjustSizeToContent();
+    }
+    //------------------------------------------------------------------------------------------------
+    Window *Window::addMenuWindowTab(const String &label, 
+        bool titleBarWin,
+        WindowPlacementType wpt)
+    {
+        const size_t labelVisualSize = label.size()*7;
+        Window *aWindow = mGUI->createWindow(
+            Vector4(mGUI->mNextMenuWindowPos.x, mGUI->mNextMenuWindowPos.y, 200, 48), 
+            "bgui.window", 
+            titleBarWin? WFT_RESIZE_AND_MOVE : WFT_NONE,  
+            titleBarWin? label: "");
+
+        Button *aButton = addMenuButton(aWindow, label, WPT_HORIZONTAL);
+
+        if (wpt != WPT_NONE)
+            mGUI->mNextMenuWindowPos.y += aWindow->getSize ().y + 25;
+        return aWindow;
+    }
+    //------------------------------------------------------------------------------------------------
+    MenuButton *Window::addMenuButton(Window *target, const String &label,
+        WindowPlacementType...
 
[truncated message content]

[Python-ogre-commit] SF.net SVN: python-ogre: [481] trunk/python-ogre

From: <and...@us...> - 2007-12-02 06:17:05

Revision: 481
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=481&view=rev
Author:   andy_miller
Date:     2007-12-01 22:17:06 -0800 (Sat, 01 Dec 2007)

Log Message:
-----------
Significant changes and updates to match latest library version and
gccxml 0.9 support -- see the changelog.txt for details

Modified Paths:
--------------
    trunk/python-ogre/ChangeLog.txt
    trunk/python-ogre/PythonOgreConfig_nt.py
    trunk/python-ogre/SConstruct
    trunk/python-ogre/ThirdParty/betagui/BetaGUI.h
    trunk/python-ogre/ThirdParty/betagui/BetaGui.cpp
    trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
    trunk/python-ogre/ThirdParty/caelum/CameraBoundElement.h
    trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp
    trunk/python-ogre/ThirdParty/caelum/GroundFog.h
    trunk/python-ogre/ThirdParty/caelum/LayeredClouds.cpp
    trunk/python-ogre/ThirdParty/caelum/LayeredClouds.h
    trunk/python-ogre/ThirdParty/caelum/SkyColourModel.cpp
    trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp
    trunk/python-ogre/ThirdParty/caelum/SkyDome.h
    trunk/python-ogre/ThirdParty/caelum/Starfield.cpp
    trunk/python-ogre/ThirdParty/caelum/Starfield.h
    trunk/python-ogre/ThirdParty/caelum/Sun.cpp
    trunk/python-ogre/ThirdParty/caelum/Sun.h
    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/GrassLoader.cpp
    trunk/python-ogre/ThirdParty/forests/GrassLoader.h
    trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
    trunk/python-ogre/ThirdParty/forests/ImpostorPage.h
    trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp
    trunk/python-ogre/ThirdParty/forests/PagedGeometry.h
    trunk/python-ogre/ThirdParty/forests/PropertyMaps.cpp
    trunk/python-ogre/ThirdParty/forests/PropertyMaps.h
    trunk/python-ogre/ThirdParty/forests/StaticBillboardSet.cpp
    trunk/python-ogre/ThirdParty/forests/TreeLoader2D.cpp
    trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
    trunk/python-ogre/ThirdParty/forests/TreeLoader3D.cpp
    trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
    trunk/python-ogre/ThirdParty/nxogre/NxOgreCloth.cpp
    trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.cpp
    trunk/python-ogre/ThirdParty/nxogre/NxOgreEnumsBlueprint.h
    trunk/python-ogre/ThirdParty/nxogre/NxOgrePhysXDriver.cpp
    trunk/python-ogre/ThirdParty/nxogre/NxOgreShapeBlueprintTerrain.h
    trunk/python-ogre/ThirdParty/nxogre/NxOgreSoftBody.cpp
    trunk/python-ogre/ThirdParty/nxogre/NxOgreStable.h
    trunk/python-ogre/ThirdParty/nxogre/NxOgreWorld.cpp
    trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.cpp
    trunk/python-ogre/ThirdParty/ofusion/OgreOSMScene.h
    trunk/python-ogre/ThirdParty/ogreal/OgreAL.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALException.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALException.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALListener.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALListener.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALOggSound.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALPrereqs.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALSound.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALSound.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.h
    trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.cpp
    trunk/python-ogre/ThirdParty/ogreal/OgreALWavSound.h
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp
    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/OgreBulletCollisionsObject.h
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.cpp
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.h
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h
    trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.cpp
    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.cpp
    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.cpp
    trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRigidBody.h
    trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.cpp
    trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUI.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/QuickGUIButton.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIConfigScriptParser.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIEffect.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIEffect.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIEventArgs.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.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/QuickGUIHorizontalTrackBar.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIKeyCode.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUILabelArea.h
    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/QuickGUIManager.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIMemberFunctionPointer.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseButtonID.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUINStateButton.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIPoint.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIPoint.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuad.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuad.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuadContainer.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIQuadContainer.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIRect.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIRect.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIScrollPane.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUISize.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUISize.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinSet.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.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/QuickGUIUtility.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIUtility.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertex.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertexBuffer.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIVertexBuffer.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/QuickGUIVerticalTrackBar.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.cpp
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.h
    trunk/python-ogre/boost/libs/python/build/Jamfile.v2
    trunk/python-ogre/code_generators/betagui/generate_code.py
    trunk/python-ogre/code_generators/betagui/python_betagui_aliases.h
    trunk/python-ogre/code_generators/bullet/customization_data.py
    trunk/python-ogre/code_generators/bullet/generate_code.py
    trunk/python-ogre/code_generators/bullet/hand_made_wrappers.py
    trunk/python-ogre/code_generators/bullet/python_bullet.h
    trunk/python-ogre/code_generators/bullet/python_bullet_aliases.h
    trunk/python-ogre/code_generators/caelum/generate_code.py
    trunk/python-ogre/code_generators/cegui/generate_code.py
    trunk/python-ogre/code_generators/common_utils/__init__.py
    trunk/python-ogre/code_generators/navi/generate_code.py
    trunk/python-ogre/code_generators/nxogre/generate_code.py
    trunk/python-ogre/code_generators/ode/generate_code.py
    trunk/python-ogre/code_generators/ogre/custom_rvalue.cpp
    trunk/python-ogre/code_generators/ogre/customization_data.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.h
    trunk/python-ogre/code_generators/ogre/python_ogre_masterlist.h
    trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
    trunk/python-ogre/code_generators/ogreal/generate_code.py
    trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
    trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
    trunk/python-ogre/code_generators/ogreode/generate_code.py
    trunk/python-ogre/code_generators/ois/customization_data.py
    trunk/python-ogre/code_generators/ois/generate_code.py
    trunk/python-ogre/code_generators/ois/python_ois_aliases.h
    trunk/python-ogre/code_generators/physx/generate_code.py
    trunk/python-ogre/code_generators/quickgui/generate_code.py
    trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
    trunk/python-ogre/code_generators/quickgui/python_quickgui_sizeof.h
    trunk/python-ogre/code_generators/theora/generate_code.py
    trunk/python-ogre/environment.py
    trunk/python-ogre/patch/ogre.patch

Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt	2007-11-14 05:48:13 UTC (rev 480)
+++ trunk/python-ogre/ChangeLog.txt	2007-12-02 06:17:06 UTC (rev 481)
@@ -1,3 +1,48 @@
+December 02 2007: SVN Update
+=============================
+* Full support for gccxml 0.9 (requires the latest gccxml and Py++) -- main change is in simplification of generated
+  template code and changes to noncopyable logic which has required tweaks to the generate_code in a number of libraries
+* Changes to use precompiled headers (Ogre and OIS at moment) which improves compile time significantly
+* Tweaked scons to put it's database file in each library source directory as the single one was getting huge
+* Automatic function added to common_utilites (Auto_Functional_Transformation) to handle function transformation 
+  of common cases where a function takes a non mutable variable (int etc) as a reference instead of passing by value. 
+  This does have potential minior API impacts as functions aren't hand wrapped anymore. 
+  Only implemented for Ogre at moment
+
+Module Specifics:
+* betagui -- now using version 2.x of the source code
+* bullet -- Updated to verssion 2.64
+* caleum -- SVN version r112 - small change to hanve noncopyable changes
+* cegui -- still using 0.5.0, small changes to generator for noncopyable classes
+* et -- no changes - built on 2.2 source
+* navi -- not part of this build due to errors
+* noise -- no changes
+* nxogre -- no changes, still using SVN r
+* ODE -- Updated to version 0.9 with changes due to noncopyable classes
+* ofusion -- no changes
+* ogre -- lots of changes to code generation due to new gccxml.  
+   New helper functions for bone and sceneNode to return them as nodes ( .castAsNode() ).  
+   Changes due to using precompiled headers -- python_ogre_precompiled.h is now the primary header which includes 
+   boost and python_ogre_masterlist.  The masterlist now uses Ogre.h and OgreStableHeaders.h to 
+   include most of the headers, so the missing list is smaller and easier to manage
+* ogreal -- updated to SVN r90
+* ogrebulletc and ogrebulletd -- updated to latest CVS and using bullet 2.64
+* ogredshow -- Not part of this release as not compatible with latest DirectX SDK (I think..)
+* ogreforests -- update to latest CVS
+* ogrenewt -- no changes
+* ogreode -- small change to remove list<Ogre::plane> from generated code as it's part of the ogre module
+* ogrerefapp -- no changes
+* ogrevideoffmpeg -- no changes
+* ois -- no change to source (1.0RC1) however full cleanup to code generator ready to move to SVN verison of OIS
+* opcode -- no change
+* physx -- update to SDK 2.7.3
+* plib -- no change
+* QuickGui -- Update: Svn r272
+* theora -- no change
+* watermesh -- no change
+
+
+
 October 20 2007: Version 1.1.b  SnapShot
 ========================================
 * Fixed Caelum demo

Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py	2007-11-14 05:48:13 UTC (rev 480)
+++ trunk/python-ogre/PythonOgreConfig_nt.py	2007-12-02 06:17:06 UTC (rev 481)
@@ -56,7 +56,7 @@
 
 PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
 PATH_Bullet=        os.path.join(BASE_DIR, 'bullet-2.64') 
-PATH_PhysX=         "c:/program files/AGEIA Technologies/SDK/v2.7.2/SDKs"
+PATH_PhysX=         "c:/program files/AGEIA Technologies/SDK/v2.7.3/SDKs"
 PATH_Theora=        os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
 PATH_ffmpeg=        os.path.join(BASE_DIR, 'ffmpeg')
 PATH_navi =         os.path.join(BASE_DIR, 'navi','Navi')
@@ -148,7 +148,8 @@
 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-2.1.1','include')
+#                         ,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-2.1.1','include')
+                        ,os.path.join(PATH_THIRDPARTY,'ptypes','include')
                         ]
 
 PATH_INCLUDE_PhysX= [ os.path.join(PATH_PhysX, 'Physics','include')

Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct	2007-11-14 05:48:13 UTC (rev 480)
+++ trunk/python-ogre/SConstruct	2007-12-02 06:17:06 UTC (rev 481)
@@ -51,11 +51,9 @@
     if os.name=='nt':
         CCFLAGS=''
         #CCFLAGS += '-DBOOST_PYTHON_MAX_ARITY=19'
-        CCFLAGS += '  /nologo' # -Zm800
+        CCFLAGS += '  /nologo -Zm200 '
         CCFLAGS += ' /W3 /wd4675' # warning level  -Zc:wchar_t 
-        CCFLAGS += ' /TP /MD /Zc:forScope  /EHs /c'
-        ##CCFLAGS += '  /Ogisyb2 /Gs /GR ' #/Op /Ox /O2
-        CCFLAGS += ' /Ox /Ob2 /Oi /Ot /Oy /GS- /GR '
+        CCFLAGS += ' /TP /MD /Zc:forScope /EHs /c /Ox /Ob2 /Oi /Ot /Oy /GS- /GR '
     elif os.name =='posix':
         if os.sys.platform <> 'darwin':
             CCFLAGS = ' `pkg-config --cflags OGRE` '        ## needs to change I think :)
@@ -70,11 +68,22 @@
             CCFLAGS  = ' -I -pipe -Os -I./'
     return CCFLAGS
 
-def get_source_files(_dir):
+def get_source_files(cls, _dir, usepch = False):
+
+    def filterfunc ( filein ):
+        validext = ['.cpp', '.cxx', '.c']
+        if usepch:
+            if filein == cls.pchbuild:
+                return False
+        for e in validext:
+            if filein.endswith ( e ):
+                return True
+        return False
+        
     try:
-        source_files = filter( lambda s: (s.endswith( '.cpp' ) or s.endswith('.cxx') or s.endswith('.c') ), os.listdir(_dir) )
+        source_files = filter( filterfunc , os.listdir(_dir) )
     except OSError,e:
-        print 'WARNING: Generate the sources this directory: "%s"' % _dir
+        print 'WARNING: Generate the sources in this directory: "%s"' % _dir
         raise e
     source_files.sort()
     return source_files ## "Image.pypp.cpp" ##source_files
@@ -82,7 +91,7 @@
 def get_linkflags():
     if os.name=='nt':
         #LINKFLAGS = " /NOLOGO /INCREMENTAL:NO /DLL /OPT:NOREF /OPT:NOICF /OPT:NOWIN98 /subsystem:console " # no change
-        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 = " /MAP:FULL /MAPINFO:EXPORTS /NOLOGO /OPT:REF /INCREMENTAL:NO /DLL /OPT:ICF /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':
@@ -91,17 +100,28 @@
             LINKFLAGS = ''
     return LINKFLAGS
 
+def build_pch( cls, pchfile ):
+    """ lets create a source file that we will use to create the PCH file from """
+    fout = open ( pchfile, 'w' ) ## delete it if it's already there
+    for i in cls.pchincludes:
+        fout.write ( '#include "' + i + '"\n' )
+    fout.write ( "\n" )
+    fout.close()
+  
 # Let us select the projects to build
 
 possible_projects = []
 for name,cls in environment.projects.items():
-    if cls.active:
-        possible_projects.append ( name )
+    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
+default_projects = []
+for name,cls in environment.projects.items():
+    if cls.active:
+        default_projects.append ( name )
+#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',
@@ -114,7 +134,8 @@
 temp_env = Environment(options = opts)
 tobuild = temp_env['PROJECTS']
 del temp_env    
-    
+
+   
         
 for name, cls in environment.projects.items():
     ##if name.active:
@@ -128,8 +149,11 @@
         _env = Environment(ENV=os.environ)
         
         if environment.rpath:
-            _env.Append(RPATH=_env.Literal(environment.rpath))
-
+            _env.Append(RPATH=environment.rpath)
+        
+        # Stores signatures in a separate .sconsign file 
+        # in each directory as the single one was getting huge
+        _env.SConsignFile(os.path.join( cls.generated_dir, "sconsign") )
               
         ## Use custom compilier if wanted (things like ccache)
         if hasattr(environment, 'cxx_compiler'):
@@ -142,8 +166,6 @@
         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 )
         
@@ -154,8 +176,17 @@
             ccflags += cls.CCFLAGS
         _env.Append ( CCFLAGS=ccflags )
         
+        if hasattr( cls, 'pchbuild' ) and hasattr( cls, 'pchstop' ):
+            usepch = True
+            _env['PCHSTOP']= cls.pchstop
+            build_pch ( cls, os.path.join(cls._source, cls.pchbuild) )  ## we build the source pch file here
+            _env['PCH']=_env.PCH( os.path.join(cls._source, cls.pchbuild) )[0]  
+        else:
+            usepch = False  
+
         ## create a list of source files to include
-        _env.Append ( FILES= get_source_files(cls._source) )
+        sourcefiles = get_source_files(cls, cls._source, usepch)
+        _env.Append ( FILES= sourcefiles )
         ##cls._env = _env.Copy()  ## NOT sure this is needed...
         
         ## build it to somewhere else
@@ -165,7 +196,7 @@
         ## create a dynamic Sconscript file in the source directory (only if it doesn't exist)
         create_SConscript ( cls )
 # #         _env.LINKCOM  = [_env['LINKCOM'],\
-# #         				'mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % {'name':cls._name} ]
+# #                         'mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % {'name':cls._name} ]
         ## now call the SConscript file in the source directory
         Export ( '_env' ) 
         package = _env.SConscript(os.path.join( cls._build_dir, 'SConscript' ) )
@@ -175,11 +206,11 @@
         if os.name=="nt":
             ## 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:            	 
+                 '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] } )
-            	         
+                 '-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), 
                                      package[index] )

Modified: trunk/python-ogre/ThirdParty/betagui/BetaGUI.h
===================================================================
--- trunk/python-ogre/ThirdParty/betagui/BetaGUI.h	2007-11-14 05:48:13 UTC (rev 480)
+++ trunk/python-ogre/ThirdParty/betagui/BetaGUI.h	2007-12-02 06:17:06 UTC (rev 481)
@@ -1,638 +1,244 @@
+// Betajaen's GUI "BetaGUI 2.0", Version 35-uncompressed, http://www.ogre3d.org/wiki/index.php/BetaGUI
+//
+// Copyright (c) 2007 Robin Southern <bet...@ih...>
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
 #ifndef BETAGUI_H
 #define BETAGUI_H
 
-/// Betajaen's GUI 016 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.
-
 #include "Ogre.h"
-#include "OgreTextAreaOverlayElement.h"
 
-#include <iostream>
+#pragma pointers_to_members(full_generality, virtual_inheritance)
 
-using namespace Ogre;
-using namespace std;
-
-namespace BetaGUI 
-{
-    //------------------------------------------------------------------------------------------------
-    class GUI;
-
-    class Widget;
-    class Window;
-
-    class Button;
-    class BoolButton;
-    class MenuButton;
-    class RealButton;
-
-    class StaticText;
-    class TextInput;
-
-    class Callback;
-
-    class Effect;
-    class AlphaEffect;
-    class MoveEffect;
-    class SizeEffect;
-
-    //------------------------------------------------------------------------------------------------
-	enum WindowFeatureType 
-    { 
-		WFT_NONE                =   0,
-		WFT_MOVE           ,
-		WFT_RESIZE         ,
-		WFT_RESIZE_AND_MOVE
-    };
-    //------------------------------------------------------------------------------------------------
-     enum WindowPlacementType 
-     { 
-         WPT_NONE       =   0,
-         WPT_VERTICAL   ,
-         WPT_HORIZONTAL 
-     };
-    //------------------------------------------------------------------------------------------------
-    enum WindowActivity 
-    {
-        WA_NONE   =   0,
-        WA_MOVE   ,
-        WA_RESIZE ,
-        WA_PRESS  
-    };
-    //------------------------------------------------------------------------------------------------
-	class GUI 
-    {
+namespace BetaGUI {
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	class GUI;
+		class Style;
+			struct WindowStyle;
+			struct WidgetStyle;
+		class Window;
+			class Widget;
+				class Button;
+				class TextInput;
+					class Slider;
+						class NumericSlider;
+						class StringSlider;
+				class Meter;
+				class Select;
+		class GUIListener{};
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	enum WindowFeatureType	{ 	WFT_NONE = 0, WFT_MOVE, WFT_RESIZE, WFT_RESIZE_AND_MOVE, WFT_ON_TOP		};
+	enum FocusState			{	FS_NONE = 0, FS_SELECT, FS_SELECT_OFF, FS_DRAG							};
+	enum SpecialKey			{	SK_BACKSPACE = 0, SK_ENTER, SK_TAB, SK_ESCAPE							};
+	enum WindowRole			{	WR_NONE = 0, WR_DRAG, WR_RESIZE, WR_CLOSE								};
+	enum WindowMode			{	WM_NONE = 0, WM_DRAG, WM_RESIZE, WM_LMB_DOWN, WM_SLIDER_MOVE			};
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	typedef void (BetaGUI::GUIListener::*ButtonMethodPtr)(BetaGUI::Button*, BetaGUI::FocusState);
+	typedef void (BetaGUI::GUIListener::*SliderMethodPtr)(BetaGUI::Slider*, BetaGUI::FocusState);
+	typedef void (BetaGUI::GUIListener::*TextInputMethodPtr)(BetaGUI::TextInput*, BetaGUI::FocusState);
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	class GUI {		friend class Window;friend class Button;friend class TextInput;
 		public:
-
-			friend class Window;
-
-            friend class Button;
-
-            friend class MenuButton;
-            friend class BoolButton;
-            friend class RealButton;
-
-            friend class StaticText;
-			friend class TextInput;
-
-            GUI(const Ogre::String &baseOverlay, const Ogre::String &font, int fontSize, Ogre::RenderWindow *win);
-
+			GUI(Ogre::RenderWindow*);
 			~GUI();
+			
+			bool injectRelMouse(int RelX, int RelY, bool selectDown);
+			bool injectMouse(unsigned int ScreenX, unsigned int ScreenY, bool selectDown);
+			bool injectKey(const Ogre::String& key, unsigned int x, unsigned int y);
+			void injectSpecialKey(SpecialKey, unsigned int ScreenX, unsigned int ScreenY);
+			
+			Style*		createStyle(const Ogre::String& name);
+			Window*		createWindow(int x, int y, unsigned int width, unsigned int height, const Ogre::String& Style, WindowFeatureType type, const Ogre::String& caption, GUIListener*);
+			void		destroyWindow(Window *window);
+			
+			Ogre::OverlayContainer* createMousePointer(const Ogre::String& material, unsigned int w, unsigned int h);	
+			Ogre::OverlayContainer* createOverlayFromWidgetStyle(const Ogre::String &name, const Ogre::String &style, const Ogre::String &widget, int x, int y, const Ogre::String &caption = "");
+			Ogre::OverlayContainer* createOverlayFromWindowStyle(const Ogre::String &name, const Ogre::String &style, int x, int y, int w, int h);
+		protected:
+			void __updateCenteredOverlay(Ogre::OverlayContainer*);
+			Ogre::OverlayContainer* __getOverlay(const Ogre::String&, const Ogre::String& = "Panel", int x=0, int y=0, int w=0,int h=0);
 
-            void sortZOrder() ;
-
-            void setZRangeOrder(int nearZ, int FarZ);
-
-			bool injectMouse(int x, int y, bool LMB);
-            bool injectMouse(float x, float y, bool LMB);
-
-			bool injectKey(const Ogre::String &key, int x, int y);
-
-			void injectBackspace(int x, int y);
-
-            Window*	 createWindow(
-                const Ogre::Vector4 &Dimensions, 
-                const Ogre::String &Material, 
-                WindowFeatureType type, 
-                const Ogre::String &caption = "");
-
-			void destroyWindow(Window *window) {
-                mNextWindowToDestroy=window;
-            }
-            Ogre::OverlayContainer* createOverlay(const Ogre::String &name, 
-                const Ogre::Vector2 &position,
-                const Ogre::Vector2 &dimensions, 
-                const Ogre::String &material = "", 
-                const Ogre::String &caption = "");
-
-			Ogre::OverlayContainer* createMousePointer(Ogre::Vector2 dimensions, 
-                const Ogre::String &material);
-				
- 
-
-            Window *addMenuWindow(const Ogre::Vector2 dimensions);
-           
-            void update(Ogre::Real timeElapsed);
-            void addEffect (Effect* e);
-            Ogre::Real getUpTime() const {return mUpTime;}
-
-	protected:
-            //Ogre::Overlay*          mGuiOverlay;					// Main sheet overlay
-            std::vector<Window*>    mWindows;					    // Windows
-			Window *                mNextWindowToDestroy;			// Window to destroy
-			Ogre::OverlayContainer* mMousePointerOverlay;			// Mouse Pointer Overlay
-
-			Ogre::String mFont;
-			int mFontSize;
-			int mWindowCount, mButtonCount, mTextCaptionCount, mTextCaptionCountArea, mButtonCountTextArea;
-
-
-            Ogre::uint  mDragWindowAction; 
-
-            int         mDragX, mDragY; 
-            int         mDragWindowX, mDragWindowY;
-
-            Window *    mActiveDraggedWindow; 
-            TextInput * mActiveTextInput; 
-            Button *    mActiveButton; 
-
-            Ogre::Vector2           mNextMenuWindowPos;
-            Window *                mMenuWindow;
-            Ogre::RenderWindow *    mRenderWindow;
-
-            std::list<Effect*> mActiveEffects;
-
-            Ogre::Real mUpTime;
-            Ogre::String mName;
-            int mFarZ;
-            int mNearZ;
-    };
-    //------------------------------------------------------------------------------------------------
-    class Widget 
-    {
-    public:
-
-        friend class GUI;
-
-        Widget(const Ogre::Vector4 &Dimension, 
-            const Ogre::String &materialNameNormal,
-            bool hasOverState = true,
-            bool hasActiveState = true);
-        
-        virtual ~Widget();
-        
-        Ogre::Vector2 getPosition()  const{return Ogre::Vector2(mPosX,mPosY);}
-        Ogre::Vector2 getSize()   const {return Ogre::Vector2(mWidth,mHeight); }
-      
-        void setPosition(const Ogre::Vector2 &position);
-        void setSize(const Ogre::Vector2 &size);
-        
-        virtual void show(){setAlpha (1.0, true);}; 
-        virtual void hide(){setAlpha (0.0, true);}; 
-
-        virtual bool isVisible() {return mMainOverlay->isVisible ();};    
-
-        virtual void over(const bool a);
-        virtual void activate(const bool a);
-
-        virtual void adjustSizeToContent();
-
-        virtual void setPosition(float X,float Y);
-        virtual void setPosition(int X,int Y);
-        virtual void setSize(int X,int Y);
-        virtual void setAlpha(const Ogre::Real alpha, const bool isContainer);
-        virtual void setMaterialBlendFactor(const Ogre::Real blendFactor, const bool isContainer);
-
-        // mUnderEffect getter
-        bool getUnderEffect() const { return mUnderEffect; }
-        // mUnderEffect setter
-        void setUnderEffect(bool val);
-
-        // mOver getter
-        bool getOver() const { return mOver; }
-        // mOver setter
-        void setOver(bool val) { mOver = val; }
-        // mActive getter
-        bool getActive() const { return mActive; }
-        // mActive setter
-        void setActive(bool val) { mActive = val; }
-        
-        // mActive setter
-		void setMainMaterial(const Ogre::String& mat) {
-			mMainOverlay->setMaterialName(mat);
-		}
-
-		void setCaptionMaterial(const Ogre::String& mat) {
-			mCaptionOverlay->setMaterialName(mat);
-		}
-
-		void setText(const Ogre::String& t) {
-			mCaptionOverlay->setCaption(t);
-		}
-
-		Ogre::String getText() const {
-			return mCaptionOverlay->getCaption();
-		}
-
-    protected:
-        //------------------------------------------------------------------------------------------------
-        inline bool isOut (const int x, const int y) const 
-        {
-            return (x < mPosX) || (y < mPosY) 
-                || (x > (mPosX + mWidth)) || 
-                (y > (mPosY + mHeight));
-        }
-        //------------------------------------------------------------------------------------------------
-        inline bool isIn (const int x, const int y) const 
-        {
-            return (x >= mPosX) && (y >= mPosY) 
-                && (x <= (mPosX + mWidth)) && 
-                (y <= (mPosY + mHeight));
-        }
-
-        void instantiateMaterial(Ogre::OverlayContainer * const oc, bool reset) const;
-        void setOverlayAlpha(Ogre::OverlayContainer * const oc, const Ogre::Real alpha) const;
-        void setOverlayMaterialBlendFactor(Ogre::OverlayContainer * const oc, const Ogre::Real blendFactor) const;
-
-        int mPosX, mPosY, mWidth, mHeight;
-
-        std::vector<Widget *> mChildren;
-        Ogre::OverlayContainer* mMainOverlay;
-        Ogre::OverlayContainer* mCaptionOverlay;			
-        Ogre::String mMaterialName;						
-
-        bool mHasMaterial;
-        bool mHasOverState;
-        bool mHasActiveState;
-        bool mUnderEffect;
-        bool mOver;
-        bool mActive;
-    };
-    //------------------------------------------------------------------------------------------------
-    class Window : public Widget
-    {
+			Ogre::Overlay* mOverlay;					// Main sheet overlay
+			std::vector<Window*> mWindow;				// Windows
+			std::map<Ogre::String, Style*> mStyle;		// Styles
+			Window *mWindowToDestroy;					// Window to destroy
+			Ogre::OverlayContainer* mMousePointer;		// Mouse Pointer Overlay
+			unsigned int mWindowCount, mButtonCount, mTextInputCount, mRenderWindowWidth, mRenderWindowHeight;
+			Ogre::Real mWindowRatio;
+	};
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	class Window {		friend class Button;friend class TextInput;friend class GUI;
 		public:
-			friend class Button;
-            friend class TextInput;
-            friend class StaticText;
-			friend class GUI;
-
-            Window(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, WindowFeatureType type, const Ogre::String &caption, GUI *gui);
-            virtual ~Window();
-
-			Button*		createButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
-                const Ogre::String &Text, Callback callback);
-
-			TextInput*	createTextInput(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
-                const Ogre::String & Value, int length);
-
-			StaticText* createStaticText(const Ogre::Vector4 &Dimensions, const Ogre::String &Text);
-		
-			void setSize(int X,int Y);
-
-            MenuButton *addMenuButton(Window *target, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
-            BoolButton *addBoolButton(bool value, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
-            RealButton *addRealButton(Ogre::Real value, const Ogre::Vector4 &SliderMoves, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
-            StaticText* addStaticText(const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
-
-            Window *addMenuWindowTab(const Ogre::String &label,  
-                bool titleBarWin = true, 
-                WindowPlacementType wpt = WPT_VERTICAL);
-
-            MenuButton* createMenuButton(const Ogre::Vector4 &D, const Ogre::String &M, const Ogre::String &T, Callback C, Window *t);
-            BoolButton* createBoolButton(const Ogre::Vector4 &D, const Ogre::String &M, const Ogre::String &T, Callback C, bool boolValue);
-            
-            RealButton *createRealButton(Ogre::Real value, 
-                const Ogre::Vector4 &SliderMoves, 
-                const Ogre::String &label,
-                const Ogre::Vector2 &pos);
-
-            GUI* getGUI() const {return mGUI;}
-
-			void setFadeOut(bool f){mFadeOut = f;}
-            void setZOrder(int zOrder){mGuiOverlay->setZOrder (zOrder);}
+			Button*		createButton(int x, int y, const Ogre::String& Caption, ButtonMethodPtr);
+			TextInput*  createTextInput(int x, int y, int w, const Ogre::String& intialValue, unsigned maxLength);
+			Ogre::OverlayContainer* createStaticText(int x, int y, const Ogre::String& caption);
+			void hide() {		mOverlay->hide();}
+			void show() {		mOverlay->show();}
+			bool isVisible() {	return mOverlay->isVisible();}
+			void setPosition(unsigned int X,unsigned int Y);
+			Ogre::Vector2 getPosition();
+			Ogre::Vector2 getSize();
+			void setSize(unsigned int X,unsigned int Y);
+			Ogre::OverlayContainer* mOverlay;			// Overlay
+			~Window();
 		protected:
-
+			Window(int x, int y, unsigned int width, unsigned int height, const Ogre::String& Style, WindowFeatureType type, const Ogre::String& caption, GUIListener*, GUI*);
 			
-			bool check(int x, int y, bool LMB); 
-            bool checkKey(const Ogre::String &key, int x, int y);
-
-			TextInput* mActiveTextInput;		// Active TextInput
-
-            Button 
-                *mCloseButton,
-                *mResizerButton,
-                *mActiveButton,
-                *mTitleBarButton;				// Resizer, ActiveButton, Title bar			
-
-			GUI *mGUI;							// mGUI pointer
+			bool check(unsigned int x, unsigned int y, bool LMB);
+			bool checkKey(const Ogre::String& key, unsigned int x, unsigned int y);
+			unsigned int x,y,w,h;int dx,dy;							// Dimensions
+			Button *mResizeButton,*mActiveButton,*mTitlebarButton;	// Resizer, ActiveButton, Titlebar
+			TextInput* mActiveTextInput;							// Active TextInput
+			GUI *mGUI;												// mGUI pointer
+			std::vector<BetaGUI::Button*> mButtons;					// Buttons
+			std::vector<BetaGUI::TextInput*> mTextInputs;			// TextInputs
+			Ogre::String mStyle;
+			WindowMode mMode;
+			GUIListener* mListener;
+	};
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	struct WidgetStyle { 
+		WidgetStyle() {WidgetStyle("");}
+		WidgetStyle(const Ogre::String&);
+		void fromStyle(const Ogre::String&);
+		Ogre::String mBackground, mFontFace;
+		unsigned int mFontSize, mDecalSize, mHeight; Ogre::ColourValue mColour; bool centerText;
+	};
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	class Style {
+		public:
+			void addStyle(Ogre::String widgetName, const Ogre::String& style);
+			std::map<Ogre::String, WidgetStyle> mWidgets;
+			Ogre::String mWindow_Background, mFontFace;
+			unsigned int mFontSize;
+			static bool _set(const Ogre::String&, std::pair<Ogre::String,Ogre::String>&, unsigned int&);
+			static bool _set(const Ogre::String&, std::pair<Ogre::String,Ogre::String>&, int&);
+			static bool _set(const Ogre::String&, std::pair<Ogre::String,Ogre::String>&, bool&);
+			static bool _set(const Ogre::String&, std::pair<Ogre::String,Ogre::String>&, Ogre::Real&);
+			static bool _set(const Ogre::String&, std::pair<Ogre::String,Ogre::String>&, Ogre::String&);
+			static bool _set(const Ogre::String&, std::pair<Ogre::String,Ogre::String>&, Ogre::ColourValue&);
+	};
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	class Button { 
+			friend class Window;
 			
-            std::vector<Button*> mButtons;		// Buttons
-            std::vector<TextInput*> mTextInput;	// TextInputs
+			void setCaption(const Ogre::String&, bool resize = false);
 
-            Ogre::Overlay *mGuiOverlay;
+		protected:
 
-            void addWidget(const Widget * const w, WindowPlacementType wpt);
-            Ogre::Vector2 mNextWidgetPos;
-            WindowActivity mDragType;  
+			Button(int x, int y, const Ogre::String& caption, ButtonMethodPtr, Window *parent);
+			Button(int x, int y, int w, int h, const Ogre::String& caption, Window *parent, WindowRole);
+			~Button() {
+				mOverlay->getParent()->removeChild(mOverlay->getName());
+			}
+			void setToActive();
+			void setToNormal();
 
-			bool mFadeOut;
+			bool out(unsigned int mx, unsigned int my, unsigned int px, unsigned int py) {
+				return ( !(mx >= x + px && my >= y + py)) || ( ! (mx <= x + px + w && my <= y + py + h) );
+			}
 
-    };
-    //------------------------------------------------------------------------------------------------
-	class BetaGUIListener 
-    {
+			Ogre::OverlayContainer* mOverlay, *mCaptionOverlay,*mDecalLeft,*mDecalRight;	// Main Overlay and Caption
+			Ogre::String mBackground_Normal,mBackground_Active;									// MaterialName Normal, MaterialName Active
+			int x,y; unsigned int w,h;														// Dimensions.
+			ButtonMethodPtr mMethod;
+			WindowRole mRole;
+			Window *mParent;
+	};
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	class TextInput {
 		public:
-			virtual void onButtonPress(Button*, unsigned char) = 0;
-    };
-    //------------------------------------------------------------------------------------------------
-	class Callback 
-    {
-		public:
 			friend class Window;
-			friend class Button;
 			
-			Callback() {
-				mCallbackType=0;
+		protected:
+			TextInput(int x, int y, int w, const Ogre::String& intialValue, unsigned maxLength, Window *parent);
+			~TextInput(){}
+			Ogre::String getValue() const {
+				return mValue;
 			}
 			
-			Callback( void(*functionPointer)(BetaGUI::Button*, bool) ) {
-				mCallbackType=1;
-				fp = functionPointer;
+			void setValue(const Ogre::String& v) {
+				mCaptionOverlay->setCaption(mValue=v);
 			}
 
-			Callback(BetaGUIListener *l){
-				mCallbackType = 2;
-				mListener = l;
-			}
 		protected:
-			unsigned char mCallbackType;					// Type of callback: 0 - None, 1 - FunctionPointer 2 - GUIListener, 3 - Move Window, 4 - Resize
-			void(*fp)(BetaGUI::Button*, bool);	// Function pointer (if 1)
-			BetaGUIListener *mListener;		// GuiListener (if 2)
-    };
-    //------------------------------------------------------------------------------------------------
-    class Button : public Widget
-    {
+			bool in(unsigned int mx, unsigned int my, unsigned int px, unsigned int py) {
+				return ( !(mx >= x + px && my >= y + py)) || ( ! (mx <= x + px + w && my <= y + py + h) );
+			}
+			Ogre::OverlayContainer* mOverlay,*mCaptionOverlay,*mDecalLeft,*mDecalRight;
+			Ogre::String mBackground_Normal, mBackground_Active, mValue;
+			int x,y;
+			unsigned int w,h, mLength;
+			Window* mParent;
+	};
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	class Slider {
+			friend class Window;
+			
 		public:
-            friend class Window;
-            friend class GUI;
-		
-			Button(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
-                const Ogre::String &Text, Callback callback, Window *parent);			
-            virtual ~Button() {}
+			
+			class SliderValueRange {
+				public:
+					// Mark has to be between 0 and 1 (marker / width). 
+//					virtual void set(Ogre::Real marker, Ogre::String &value) {}
+//					virtual Ogre::Real get() {return 0;}
+//					virtual Ogre::String get() {return "";}
+			};
 
-		protected:
-			Callback mCallback;			// Callback to use
-    };
-    //------------------------------------------------------------------------------------------------
-    class MenuButton : public Button
-    {
-    public:
-        MenuButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
-                    const Ogre::String &Text, Callback callback, Window *parent, 
-                    Window *target) :
-            Button(Dimensions, Material, Text, callback, parent),
-            mTarget(target)
-            {};
-            virtual ~MenuButton(){};
-    protected:
-        void activate(const bool a) ;
+			class NumericSliderValueRange : public SliderValueRange{
+				public:
+					NumericSliderValueRange(Ogre::Real min, Ogre::Real max, Ogre::Real step = 1.0);
+					NumericSliderValueRange(Ogre::Real minA, Ogre::Real maxA, Ogre::Real stepA, Ogre::Real minB, Ogre::Real maxB, Ogre::Real stepB);
 
-        Window *mTarget;
-    };
-    //------------------------------------------------------------------------------------------------
-    class BoolButton : public Button
-    {
-    public:
-        BoolButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
-            const Ogre::String &Text, Callback callback, Window *parent, bool boolValue):
-            Button(Dimensions, Material, Text, callback, parent),
-            mBoolValue(boolValue)
-            {}
-        virtual ~BoolButton(){};
+					
+					// 1. (from 0,1) 2. Value.
+			//		std::map<Ogre::Real, Ogre::Real>;
+			};
 
-    protected:
-        void activate(const bool a) ;
+			class DictionarySliderValueRange {
 
-        bool mBoolValue;
-    };
-    //------------------------------------------------------------------------------------------------
-    class TextInput : public Widget
-    {
-		public:
-            friend class Window;
-            friend class GUI;
-			
-			TextInput(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, 
-                        const Ogre::String &Value, unsigned int length, Window *parent);
-			virtual ~TextInput(){}
-            const Ogre::String &getValue() const {return mValueText;}			
-			void setValue(const Ogre::String &v) {mCaptionOverlay->setCaption(mValueText = v);}
+			};
 
 		protected:
-            unsigned int length;
-			Ogre::String mValueText;// MaterialName Normal, MaterialName Active
+
+			Slider(int x, int y, int width, SliderValueRange*, Window *parent);
 			
-    };
-    //------------------------------------------------------------------------------------------------
-    class StaticText : public Widget
-    {
-    public:
-        friend class Window;
+			void setToActive();
+			void setToNormal();
 
-        StaticText(const Ogre::Vector4 &Dimensions,
-            const Ogre::String &Value,  
-            Window *parent);
-        virtual ~StaticText(){}
+			bool out(unsigned int mx, unsigned int my, unsigned int px, unsigned int py) {
+				return ( !(mx >= x + px && my >= y + py)) || ( ! (mx <= x + px + w && my <= y + py + h) );
+			}
 
-        const Ogre::String &getValue() const 
-        {return mValueText;}
-
-        void setValue(const Ogre::String &v) 
-        {
-            mCaptionOverlay->setCaption(mValueText = v);
-            mWidth = static_cast<int> (mValueText.size () * 7);
-            mParent->adjustSizeToContent ();
-        }
-
-    protected:
-
-        int            length;
-        Ogre::String   mValueText;
-        Window         *mParent;
-    };
-    //------------------------------------------------------------------------------------------------
-    class RealButton : public BetaGUIListener, public Widget
-    {
-        public:
-            friend class Window;
-
-            RealButton(BetaGUI::Window *window, 
-                Ogre::Real value, 
-                const Ogre::Vector4 &SliderMoves,
-                const Ogre::String &label, 
-                const Ogre::Vector2 &pos);
-
-            virtual ~RealButton(){};
-
-            Ogre::Real getValue() const {return mValue;}
-
-            void setValue(const Ogre::Real v);
-
-            void onButtonPress(BetaGUI::Button *ref, Ogre::uchar type);
-        protected:
-
-            int        length;
-
-            BetaGUI::TextInput *mtextValueInput;
-            BetaGUI::Button    *mForward, *mFastForward, *mRewind, *mFastRewind;
-
-            Ogre::Real      mValue;
-            Ogre::String    mValueText;
-         
-            Ogre::Real     mLowSlideUnit;    
-            Ogre::Real     mFastSlideUnit;   
-            Ogre::Real     mMinValue;       
-            Ogre::Real     mMaxValue; 
-
-    };
-    //------------------------------------------------------------------------------------------------
-    class Effect
-    {
-    public:
-        enum EffectInterpolatorType
-        {
-            EFFECT_LINEAR = 0,
-            EFFECT_LINEARX2,
-            EFFECT_LINEARX4,
-            EFFECT_SIN
-        };
-    public:
-        Effect(Widget * const widget, const Ogre::Real duration, 
-            const Ogre::Real startTime, const Ogre::Real currTime = 0, const bool repeat = false,
-            EffectInterpolatorType type = EFFECT_LINEARX4) : 
-            mWidget(widget), 
-            mStartTime(startTime), 
-            mDuration(duration), 
-            mRepeat(repeat),
-            mCurrTime(currTime),
-            mType(type)
-        {
-            assert (duration != 0);
-        }
-        virtual ~Effect(){};
-
-        virtual void updateValue(const Ogre::Real factor) = 0;
-
-        bool update(Ogre::Real timeElapsed);
-        Ogre::Real getTimeFactor() ;
-        bool getTimeOrIsFinished();
-//         Ogre::Real linearInterpolate(const Ogre::Real start, 
-//             const Ogre::Real end, 
-//             const Ogre::Real timeFactor) const;
-        Ogre::Real interpolate(const Ogre::Real start, 
-            const Ogre::Real end, 
-            const Ogre::Real timeFactor) const;
-
-    protected:
-        Widget * const mWidget;
-        const Ogre::Real mStartTime; 
-        const Ogre::Real mDuration;
-        const bool mRepeat;
-
-        Ogre::Real mCurrTime;
-        const EffectInterpolatorType mType;
-    };
-    //------------------------------------------------------------------------------------------------
-    class AlphaEffect : public Effect
-    {
-    public:
-
-        AlphaEffect(Widget * const widget, 
-            const Ogre::Real duration, 
-            const Ogre::Real startAlpha,
-            const Ogre::Real endAlpha,
-            const Ogre::Real startTime, 
-            const Ogre::Real currTime = 0, 
-            const bool repeat = false,
-            EffectInterpolatorType type = EFFECT_LINEARX4) : 
-        Effect(widget, duration, startTime,  currTime, repeat), 
-            mStartAlpha(startAlpha), 
-            mEndAlpha(endAlpha)
-        {
-            assert(mStartAlpha >= 0.0 && mStartAlpha <= 1.0);
-            assert(mEndAlpha >= 0.0 && mEndAlpha <= 1.0);
-        }
-        virtual ~AlphaEffect(){};
-
-        void updateValue(const Ogre::Real factor);
-    private:
-        const Ogre::Real mStartAlpha;
-        const Ogre::Real mEndAlpha;
-    };
-    //------------------------------------------------------------------------------------------------
-    class MoveEffect : public Effect
-    {
-    public:
-        MoveEffect(Widget * const widget, 
-            const Ogre::Real duration, 
-            const Ogre::Vector2 &startPosition,
-            const Ogre::Vector2 &endPosition,
-            const Ogre::Real startTime, 
-            const Ogre::Real currTime = 0, 
-            const bool repeat = false,
-            EffectInterpolatorType type = EFFECT_LINEARX4) : 
-        Effect(widget, duration, startTime,  currTime, repeat), 
-            mStartPosition(startPosition), 
-            mEndPosition(endPosition)
-        {}
-        virtual ~MoveEffect(){};
-        void updateValue(const Ogre::Real factor);
-
-    private:
-        const Ogre::Vector2 mStartPosition;
-        const Ogre::Vector2 mEndPosition;
-    };
-    //------------------------------------------------------------------------------------------------
-    class SizeEffect : public Effect
-    {
-    public:
-        SizeEffect(Widget * const widget, 
-            const Ogre::Real duration, 
-            const Ogre::Vector2 &startSize,
-            const Ogre::Vector2 &endSize,
-            const Ogre::Real startTime, 
-            const Ogre::Real currTime = 0, 
-            const bool repeat = false,
-            EffectInterpolatorType type = EFFECT_LINEARX4) : 
-        Effect(widget, duration, startTime, currTime, repeat), 
-            mStartSize(startSize), 
-            mEndSize(endSize)
-        {}
-        virtual ~SizeEffect(){};
-        void updateValue(const Ogre::Real factor);
-
-    private:
-        const Ogre::Vector2 mStartSize;
-        const Ogre::Vector2 mEndSize;
-    };
-    //------------------------------------------------------------------------------------------------
-    class ActivateEffect : public Effect
-    {
-    public:
-        ActivateEffect(Widget * const widget, 
-            const Ogre::Real duration, 
-            const Ogre::Real startTime, 
-            const Ogre::Real currTime = 0, 
-            const bool repeat = false,
-            EffectInterpolatorType type = EFFECT_LINEARX4): 
-        Effect(widget, duration, startTime, currTime, repeat)
-        {};
-        virtual ~ActivateEffect(){};
-        void updateValue(const Ogre::Real factor);
-
-    };
-    //------------------------------------------------------------------------------------------------
-    class OverEffect : public Effect
-    {
-    public:
-        OverEffect(Widget * const widget, 
-            const Ogre::Real duration, 
-            const Ogre::Real startTime, 
-            const Ogre::Real currTime = 0, 
-            const bool repeat = false,
-            EffectInterpolatorType type = EFFECT_LINEARX4): 
-        Effect(widget, duration, startTime, currTime, repeat)
-        {};
-        virtual ~OverEffect(){};
-        void updateValue(const Ogre::Real factor);
-
-    };
-    //------------------------------------------------------------------------------------------------
-
-
+			Ogre::OverlayContainer* mOverlay, *mMarkerOverlay,*mDecalLeft,*mDecalRight, *mSelection;		// Main Overlay and Caption
+			std::vector<Ogre::OverlayContainer*> mMarkers;
+			Ogre::String mBackground_Normal,mBackground_Active;												// MaterialName Normal, MaterialName Active
+			int x,y; unsigned int w, h;																		// Dimensions.
+			ButtonMethodPtr		mMethod;
+			bool				mHorizontalSlider;
+			SliderValueRange*	mRange;
+			Window *mParent;
+	};
+	///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 } // End of Namespace
-
-///////////////////////////////////////////////////////////////////////////////
-#endif
-
+#endif
\ No newline at end of file

Modified: trunk/python-ogre/ThirdParty/betagui/BetaGui.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/betagui/BetaGui.cpp	2007-11-14 05:48:13 UTC (rev 480)
+++ trunk/python-ogre/ThirdParty/betagui/BetaGui.cpp	2007-12-02 06:17:06 UTC (rev 481)
@@ -1,1269 +1,463 @@
+// Betajaen's GUI "BetaGUI 2.0", Version 35-uncompressed, http://www.ogre3d.org/wiki/index.php/BetaGUI
+//
+// Copyright (c) 2007 Robin Southern <bet...@ih...>
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation t...
 
[truncated message content]

Flat | Threaded

<< < 1 .. 24 25 26 27 28 .. 31 > >> (Page 26 of 31)

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