|
From: <mi...@us...> - 2008-07-23 11:44:33
|
Revision: 672
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=672&view=rev
Author: mithro
Date: 2008-07-23 11:44:41 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Added the log and cfg files to svn:ignore.
Property Changed:
----------------
trunk/python-ogre/demos/OgreNewt/
trunk/python-ogre/demos/bullet/
trunk/python-ogre/demos/caelum/
trunk/python-ogre/demos/cegui/
trunk/python-ogre/demos/dshow/
trunk/python-ogre/demos/et/
trunk/python-ogre/demos/ffmpeg/
trunk/python-ogre/demos/media/
trunk/python-ogre/demos/media_extra/
trunk/python-ogre/demos/navi/
trunk/python-ogre/demos/noise/
trunk/python-ogre/demos/nxogre/
trunk/python-ogre/demos/ode/
trunk/python-ogre/demos/ogreal/
trunk/python-ogre/demos/ogrebullet/
trunk/python-ogre/demos/ogreforests/
trunk/python-ogre/demos/ogreode/
trunk/python-ogre/demos/opcode/
trunk/python-ogre/demos/particleuniverse/
trunk/python-ogre/demos/plib/
trunk/python-ogre/demos/qgui/
trunk/python-ogre/demos/showcase_01/
trunk/python-ogre/demos/theora/
Property changes on: trunk/python-ogre/demos/OgreNewt
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/bullet
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/caelum
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/cegui
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/dshow
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/et
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/ffmpeg
___________________________________________________________________
Added: svn:ignore
+ *.log
*.cfg
Property changes on: trunk/python-ogre/demos/media
___________________________________________________________________
Added: svn:ignore
+ *.log
*.cfg
Property changes on: trunk/python-ogre/demos/media_extra
___________________________________________________________________
Added: svn:ignore
+ *.log
*.cfg
Property changes on: trunk/python-ogre/demos/navi
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/noise
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/nxogre
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/ode
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/ogreal
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/ogrebullet
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/ogreforests
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/ogreode
___________________________________________________________________
Added: svn:ignore
+ *.log
*.cfg
Property changes on: trunk/python-ogre/demos/opcode
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/particleuniverse
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/plib
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/qgui
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/showcase_01
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
Property changes on: trunk/python-ogre/demos/theora
___________________________________________________________________
Added: svn:ignore
+
*.log
*.cfg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-07-29 13:49:07
|
Revision: 679
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=679&view=rev
Author: andy_miller
Date: 2008-07-29 13:49:17 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
More for the Portal support
Modified Paths:
--------------
trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py
trunk/python-ogre/demos/plugins.cfg
Modified: trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py
===================================================================
--- trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py 2008-07-29 12:56:20 UTC (rev 678)
+++ trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py 2008-07-29 13:49:17 UTC (rev 679)
@@ -154,7 +154,7 @@
self.pczSM.setZoneGeometry( zoneName, pcz.castAsPCZSceneNode(self.sceneManager.getRootSceneNode()), terrain_cfg )
# create aab portal(s) around the terrain
- corners =[]
+ corners =[None]*2
aabb = ogre.AxisAlignedBox()
# make portal from terrain to default
Modified: trunk/python-ogre/demos/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/plugins.cfg 2008-07-29 12:56:20 UTC (rev 678)
+++ trunk/python-ogre/demos/plugins.cfg 2008-07-29 13:49:17 UTC (rev 679)
@@ -11,7 +11,10 @@
Plugin=Plugin_OctreeSceneManager.dll
Plugin=Plugin_CgProgramManager.dll
Plugin=Plugin_PCZSceneManager.dll
+Plugin=Plugin_OctreeZone.dll
+Plugin=Plugin_OctreeSceneManager.dll
+
##
## NOTE use this for MacOS or Linux
# Plugin=RenderSystem_GL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-09-07 11:39:21
|
Revision: 736
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=736&view=rev
Author: andy_miller
Date: 2008-09-07 11:39:21 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
Updates for 1.6rc1 release
Modified Paths:
--------------
trunk/python-ogre/demos/OgreNewt/CEGUI_framework.py
trunk/python-ogre/demos/ogreal/Demo_AL_01.py
Added Paths:
-----------
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.compositor
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.material
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_vs.program
trunk/python-ogre/demos/media/materials/programs/ASCIIFP.cg
trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.glsl
trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.glsl
trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.glsl
trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/Blur_vs.glsl
trunk/python-ogre/demos/media/materials/programs/Blur_vs11.hlsl
trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.glsl
trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/Common.cg
trunk/python-ogre/demos/media/materials/programs/DitherFP.cg
trunk/python-ogre/demos/media/materials/programs/HalftoneFP.cg
trunk/python-ogre/demos/media/materials/programs/NightVisionFP.cg
trunk/python-ogre/demos/media/materials/programs/ParticleGS.cg
trunk/python-ogre/demos/media/materials/programs/PassthroughVP.glsl
trunk/python-ogre/demos/media/materials/programs/Radial_Blur_FP.cg
trunk/python-ogre/demos/media/materials/programs/Swizzle.gp
trunk/python-ogre/demos/media/materials/programs/SwizzleGP.cg
trunk/python-ogre/demos/media/materials/programs/SwizzleGP.glsl
trunk/python-ogre/demos/media/materials/programs/hdrutils.hlsl
trunk/python-ogre/demos/media/materials/programs/isosurf.cg
trunk/python-ogre/demos/media/materials/programs/mrttestfp.hlsl
trunk/python-ogre/demos/media/materials/programs/mrttestfp_quad.glsl
trunk/python-ogre/demos/media/materials/programs/mrttestfp_scene.glsl
trunk/python-ogre/demos/media/materials/programs/pssm.cg
trunk/python-ogre/demos/media/materials/scripts/ASCII.material
trunk/python-ogre/demos/media/materials/scripts/ASMSwizzle.material
trunk/python-ogre/demos/media/materials/scripts/Bloom2.material
trunk/python-ogre/demos/media/materials/scripts/CGSwizzle.material
trunk/python-ogre/demos/media/materials/scripts/Dither.material
trunk/python-ogre/demos/media/materials/scripts/GLSLSwizzle.material
trunk/python-ogre/demos/media/materials/scripts/Halftone.material
trunk/python-ogre/demos/media/materials/scripts/IsoSurf.material
trunk/python-ogre/demos/media/materials/scripts/MRTtest.material
trunk/python-ogre/demos/media/materials/scripts/NightVision.material
trunk/python-ogre/demos/media/materials/scripts/ParticleGS.material
trunk/python-ogre/demos/media/materials/scripts/RadialBlur.material
trunk/python-ogre/demos/media/materials/scripts/pssm.material
trunk/python-ogre/demos/media/materials/textures/ASCII.dds
trunk/python-ogre/demos/media/materials/textures/grassWalpha.tga
trunk/python-ogre/demos/media/materials/textures/leaf.png
trunk/python-ogre/demos/media/materials/textures/particle.dds
trunk/python-ogre/demos/ogreal/Demo_AL_02.py
trunk/python-ogre/demos/ogreal/OpenAL32.dll
trunk/python-ogre/demos/ogreal/wrap_oal.dll
Modified: trunk/python-ogre/demos/OgreNewt/CEGUI_framework.py
===================================================================
--- trunk/python-ogre/demos/OgreNewt/CEGUI_framework.py 2008-09-07 06:24:31 UTC (rev 735)
+++ trunk/python-ogre/demos/OgreNewt/CEGUI_framework.py 2008-09-07 11:39:21 UTC (rev 736)
@@ -1,84 +1,100 @@
-import ogre.gui.CEGUI as CEGUI
-import ogre.io.OIS as OIS
-import ogre.renderer.OGRE as Ogre
-import SampleFramework
-
-##----------------------------------------------------------------##
-def convertOISMouseButtonToCegui( buttonID):
- if buttonID ==0:
- return CEGUI.LeftButton
- elif buttonID ==1:
- return CEGUI.RightButton
- elif buttonID ==2:
- return CEGUI.MiddleButton
- elif buttonID ==3:
- return CEGUI.X1Button
- else:
- return CEGUI.LeftButton
-
-def _PointHack(x, y):
- return CEGUI.Vector2(x, y)
-CEGUI.Point = _PointHack
-
-def cegui_reldim ( x ) :
- return CEGUI.UDim((x),0)
-
-class MouseListener ( OIS.MouseListener ):
- def __init__(self):
- OIS.MouseListener.__init__( self)
-
- ##----------------------------------------------------------------##
- def mouseMoved( self, arg ):
- CEGUI.System.getSingleton().injectMouseMove( arg.get_state().X.rel, arg.get_state().Y.rel )
- return True
-
- ##----------------------------------------------------------------##
- def mousePressed( self, arg, id ):
- CEGUI.System.getSingleton().injectMouseButtonDown(convertOISMouseButtonToCegui(id))
- return True
-
- ##----------------------------------------------------------------##
- def mouseReleased( self, arg, id ):
- CEGUI.System.getSingleton().injectMouseButtonUp(convertOISMouseButtonToCegui(id))
- return True
-
-
-class GuiFrameListener(SampleFramework.FrameListener, OIS.KeyListener, OIS.MouseListener):
-
- def __init__(self, renderWindow, camera, CEGUIRenderer):
-
- SampleFramework.FrameListener.__init__(self, renderWindow, camera, True, True, True)
- OIS.KeyListener.__init__(self)
- self.mouselistener = MouseListener ()
- #OIS.MouseListener.__init_(self)
-
- self.Mouse.setEventCallback(self.mouselistener)
- self.Keyboard.setEventCallback(self)
-
- self.ShutdownRequested = False
- self.GUIRenderer = CEGUIRenderer
- self.keepRendering = True # whether to continue rendering or not
- self.numScreenShots = 0 # screen shot count
-
- ## Tell the frame listener to exit at the end of the next frame
- def requestShutdown( self ):
- self.ShutdownRequested = True
-
- def frameEnded(self, evt):
- if self.ShutdownRequested:
- return False
- else:
- return SampleFramework.FrameListener.frameEnded(self, evt)
-
- ##----------------------------------------------------------------##
- def keyPressed( self, arg ):
- if arg.key == OIS.KC_ESCAPE:
- self.ShutdownRequested = True
- CEGUI.System.getSingleton().injectKeyDown( arg.key )
- CEGUI.System.getSingleton().injectChar( arg.text )
- return True
-
- ##----------------------------------------------------------------##
- def keyReleased( self, arg ):
- CEGUI.System.getSingleton().injectKeyUp( arg.key )
- return True
+import ctypes
+import os
+
+# The follow patch from Tim (Mithro) fixes a loder issue with CEGUI - previously we'd patched CEGUI to
+# ensure the CEGUIBase was linked to every module to solve the issue with Python dynamically loading
+# the _cegui_.so module without RTLD_GLOBAL set - then when CEGUI opened it's dynamic modules it
+# couldn't find all the symbols.
+
+#print ctypes.CDLL("../../../root/usr/lib/libCEGUIBase.so", ctypes.RTLD_GLOBAL )
+
+import ogre.gui.CEGUI as CEGUI
+
+# Another fix for CEGUI to ensure we get a working parser..
+if os.name == 'nt':
+ CEGUI.System.setDefaultXMLParserName("ExpatParser")
+else:
+ CEGUI.System.setDefaultXMLParserName("TinyXMLParser")
+
+import ogre.io.OIS as OIS
+import SampleFramework
+
+##----------------------------------------------------------------##
+def convertOISMouseButtonToCegui( buttonID):
+ if buttonID ==0:
+ return CEGUI.LeftButton
+ elif buttonID ==1:
+ return CEGUI.RightButton
+ elif buttonID ==2:
+ return CEGUI.MiddleButton
+ elif buttonID ==3:
+ return CEGUI.X1Button
+ else:
+ return CEGUI.LeftButton
+
+def _PointHack(x, y):
+ return CEGUI.Vector2(x, y)
+CEGUI.Point = _PointHack
+
+def cegui_reldim ( x ) :
+ return CEGUI.UDim((x),0)
+
+class MouseListener ( OIS.MouseListener ):
+ def __init__(self):
+ OIS.MouseListener.__init__( self)
+
+ ##----------------------------------------------------------------##
+ def mouseMoved( self, arg ):
+ CEGUI.System.getSingleton().injectMouseMove( arg.get_state().X.rel, arg.get_state().Y.rel )
+ return True
+
+ ##----------------------------------------------------------------##
+ def mousePressed( self, arg, id ):
+ CEGUI.System.getSingleton().injectMouseButtonDown(convertOISMouseButtonToCegui(id))
+ return True
+
+ ##----------------------------------------------------------------##
+ def mouseReleased( self, arg, id ):
+ CEGUI.System.getSingleton().injectMouseButtonUp(convertOISMouseButtonToCegui(id))
+ return True
+
+
+class GuiFrameListener(SampleFramework.FrameListener , OIS.KeyListener, OIS.MouseListener):
+
+ def __init__(self, renderWindow, camera, CEGUIRenderer):
+
+ SampleFramework.FrameListener.__init__(self, renderWindow, camera, True, True, True)
+ OIS.KeyListener.__init__(self)
+ self.mouselistener = MouseListener ()
+ #OIS.MouseListener.__init_(self)
+
+ self.Mouse.setEventCallback(self.mouselistener)
+ self.Keyboard.setEventCallback(self)
+
+ self.ShutdownRequested = False
+ self.GUIRenderer = CEGUIRenderer
+ self.keepRendering = True # whether to continue rendering or not
+ self.numScreenShots = 0 # screen shot count
+
+ ## Tell the frame listener to exit at the end of the next frame
+ def requestShutdown( self ):
+ self.ShutdownRequested = True
+
+ def frameEnded(self, evt):
+ if self.ShutdownRequested:
+ return False
+ else:
+ return SampleFramework.FrameListener.frameEnded(self, evt)
+
+ ##----------------------------------------------------------------##
+ def keyPressed( self, arg ):
+ if arg.key == OIS.KC_ESCAPE:
+ self.ShutdownRequested = True
+ CEGUI.System.getSingleton().injectKeyDown( arg.key )
+ CEGUI.System.getSingleton().injectChar( arg.text )
+ return True
+
+ ##----------------------------------------------------------------##
+ def keyReleased( self, arg ):
+ CEGUI.System.getSingleton().injectKeyUp( arg.key )
+ return True
Added: trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.compositor
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.compositor (rev 0)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.compositor 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,153 @@
+// Postfilter doing full deferred shading
+
+compositor DeferredShading/ShowLit
+{
+ technique
+ {
+ // temporary textures
+ texture mrt_output target_width target_height PF_FLOAT16_RGBA PF_FLOAT16_RGBA
+
+ target mrt_output
+ {
+ input none
+ pass clear
+ {
+ }
+
+ // everything but the lights and their meshes
+ // could do this with something like a visibility mask too
+ pass render_scene
+ {
+ first_render_queue 22
+ last_render_queue 90
+ }
+ }
+
+ target_output
+ {
+ input none
+
+ // render skies
+ pass render_scene
+ {
+ first_render_queue 5
+ last_render_queue 5
+ }
+
+ // just the lights and their meshes
+ pass render_scene
+ {
+ first_render_queue 20
+ last_render_queue 21
+ }
+ }
+ }
+}
+
+// Postfilter that shows the colour channel
+compositor DeferredShading/ShowColour
+{
+ technique
+ {
+ // temporary textures
+ texture mrt_output target_width target_height PF_FLOAT16_RGBA PF_FLOAT16_RGBA
+
+ target mrt_output
+ {
+ input none
+ pass clear
+ {
+ }
+
+ pass render_scene
+ {
+ first_render_queue 22
+ last_render_queue 90
+ }
+ }
+
+ target_output
+ {
+ input none
+
+ pass render_quad
+ {
+ material DeferredShading/Post/ShowColour
+ input 0 mrt_output 0
+ input 1 mrt_output 1
+ }
+ }
+ }
+}
+
+// Postfilter that shows the normal channel
+compositor DeferredShading/ShowNormals
+{
+ technique
+ {
+ // temporary textures
+ texture mrt_output target_width target_height PF_FLOAT16_RGBA PF_FLOAT16_RGBA
+
+ target mrt_output
+ {
+ input none
+ pass clear
+ {
+ }
+
+ pass render_scene
+ {
+ first_render_queue 22
+ last_render_queue 90
+ }
+ }
+
+ target_output
+ {
+ input none
+
+ pass render_quad
+ {
+ material DeferredShading/Post/ShowNormal
+ input 0 mrt_output 0
+ input 1 mrt_output 1
+ }
+ }
+ }
+}
+
+// Postfilter that shows the depth and specular channel
+compositor DeferredShading/ShowDepthSpecular
+{
+ technique
+ {
+ // temporary textures
+ texture mrt_output target_width target_height PF_FLOAT16_RGBA PF_FLOAT16_RGBA
+
+ target mrt_output
+ {
+ input none
+ pass clear
+ {
+ }
+
+ pass render_scene
+ {
+ first_render_queue 22
+ last_render_queue 90
+ }
+ }
+
+ target_output
+ {
+ input none
+
+ pass render_quad
+ {
+ material DeferredShading/Post/ShowDS
+ input 0 mrt_output 0
+ input 1 mrt_output 1
+ }
+ }
+ }
+}
Added: trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.program
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.program (rev 0)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.program 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,157 @@
+vertex_program DeferredShading/material/hlsl/vs hlsl
+{
+ source DeferredShading/material/hlsl/vs.hlsl
+ target vs_1_1
+ entry_point main
+
+ default_params
+ {
+ param_named_auto worldView worldview_matrix
+ param_named_auto worldViewProj worldviewproj_matrix
+ }
+}
+
+vertex_program DeferredShading/material/glsl/vs glsl
+{
+ source DeferredShading/material/glsl/vs.glsl
+}
+
+vertex_program DeferredShading/material/vs unified
+{
+ delegate DeferredShading/material/hlsl/vs
+ delegate DeferredShading/material/glsl/vs
+}
+
+fragment_program DeferredShading/material/hlsl/ps hlsl
+{
+ source DeferredShading/material/hlsl/ps.hlsl
+ target ps_2_0
+ entry_point main
+ default_params
+ {
+ param_named specularity float 0.0
+ }
+}
+
+fragment_program DeferredShading/material/glsl/ps glsl
+{
+ source DeferredShading/material/glsl/ps.glsl
+ default_params
+ {
+ param_named specularity float 0.0
+ }
+}
+
+fragment_program DeferredShading/material/ps unified
+{
+ delegate DeferredShading/material/hlsl/ps
+ delegate DeferredShading/material/glsl/ps
+}
+
+fragment_program DeferredShading/material/hlsl/notex_ps hlsl
+{
+ source DeferredShading/material/hlsl/notex_ps.hlsl
+ target ps_2_0
+ entry_point main
+ default_params
+ {
+ param_named specularity float 0.0
+ }
+}
+
+fragment_program DeferredShading/material/glsl/notex_ps glsl
+{
+ source DeferredShading/material/glsl/notex_ps.glsl
+ default_params
+ {
+ param_named specularity float 0.0
+ param_named colour float3 0.7 0.7 0.7
+ }
+}
+
+fragment_program DeferredShading/material/notex_ps unified
+{
+ delegate DeferredShading/material/hlsl/notex_ps
+ delegate DeferredShading/material/glsl/notex_ps
+}
+
+vertex_program DeferredShading/material/hlsl/nm_vs hlsl
+{
+ source DeferredShading/material/hlsl/nm_vs.hlsl
+ target vs_1_1
+ entry_point main
+
+ default_params
+ {
+ param_named_auto worldView worldview_matrix
+ param_named_auto worldViewProj worldviewproj_matrix
+ }
+}
+
+vertex_program DeferredShading/material/glsl/nm_vs glsl
+{
+ source DeferredShading/material/glsl/nm_vs.glsl
+}
+
+vertex_program DeferredShading/material/nm_vs unified
+{
+ delegate DeferredShading/material/hlsl/nm_vs
+ delegate DeferredShading/material/glsl/nm_vs
+}
+
+fragment_program DeferredShading/material/hlsl/nm_ps hlsl
+{
+ source DeferredShading/material/hlsl/nm_ps.hlsl
+ target ps_2_0
+ entry_point main
+ default_params
+ {
+ param_named specularity float 0.0
+ }
+}
+
+fragment_program DeferredShading/material/glsl/nm_ps glsl
+{
+ source DeferredShading/material/glsl/nm_ps.glsl
+ default_params
+ {
+ param_named specularity float 0.0
+ param_named tex0 int 0
+ param_named normTex int 1
+ }
+}
+
+fragment_program DeferredShading/material/nm_ps unified
+{
+ delegate DeferredShading/material/hlsl/nm_ps
+ delegate DeferredShading/material/glsl/nm_ps
+}
+
+fragment_program DeferredShading/material/hlsl/nm_notex_ps hlsl
+{
+ source DeferredShading/material/hlsl/nm_notex_ps.hlsl
+ target ps_2_0
+ entry_point main
+ default_params
+ {
+ param_named colour float3 0.7 0.7 0.7
+ param_named specularity float 0.0
+ }
+}
+
+fragment_program DeferredShading/material/glsl/nm_notex_ps glsl
+{
+ source DeferredShading/material/glsl/nm_notex_ps.glsl
+ default_params
+ {
+ param_named colour float3 0.7 0.7 0.7
+ param_named specularity float 0.0
+ param_named normTex int 0
+ }
+}
+
+fragment_program DeferredShading/material/nm_notex_ps unified
+{
+ delegate DeferredShading/material/hlsl/nm_notex_ps
+ delegate DeferredShading/material/glsl/nm_notex_ps
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.material
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.material (rev 0)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.material 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,34 @@
+material DeferredShading/AmbientLight
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+
+ depth_write on
+ depth_check on
+
+ vertex_program_ref DeferredShading/post/vs
+ {
+
+ }
+ fragment_program_ref DeferredShading/post/Ambient_ps
+ {
+
+ }
+
+ texture_unit
+ {
+ tex_address_mode clamp
+ filtering none
+ }
+ texture_unit
+ {
+ tex_address_mode clamp
+ filtering none
+ }
+ }
+
+ }
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.program
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.program (rev 0)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.program 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,36 @@
+
+// HLSL
+fragment_program DeferredShading/post/hlsl/Ambient_ps hlsl
+{
+ source DeferredShading/post/hlsl/Ambient_ps.hlsl
+ target ps_2_0
+ entry_point main
+
+ default_params
+ {
+ param_named_auto ambientColor ambient_light_colour 0
+ param_named_auto proj projection_matrix
+ }
+}
+
+
+// GLSL
+fragment_program DeferredShading/post/glsl/Ambient_ps glsl
+{
+ source DeferredShading/post/glsl/Ambient_ps.glsl
+
+ default_params
+ {
+ param_named_auto ambientColor ambient_light_colour 0
+ param_named_auto proj projection_matrix
+ param_named tex0 int 0
+ param_named tex1 int 1
+ }
+}
+
+// Unified
+fragment_program DeferredShading/post/Ambient_ps unified
+{
+ delegate DeferredShading/post/hlsl/Ambient_ps
+ delegate DeferredShading/post/glsl/Ambient_ps
+}
Added: trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.program
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.program (rev 0)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.program 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,65 @@
+// HLSL
+fragment_program DeferredShading/post/hlsl/ShowNormal_ps hlsl
+{
+ source DeferredShading/post/hlsl/ShowNormal_ps.hlsl
+ target ps_2_0
+ entry_point main
+}
+fragment_program DeferredShading/post/hlsl/ShowDS_ps hlsl
+{
+ source DeferredShading/post/hlsl/ShowDS_ps.hlsl
+ target ps_2_0
+ entry_point main
+}
+fragment_program DeferredShading/post/hlsl/ShowColour_ps hlsl
+{
+ source DeferredShading/post/hlsl/ShowColour_ps.hlsl
+ target ps_2_0
+ entry_point main
+}
+
+// GLSL
+fragment_program DeferredShading/post/glsl/ShowNormal_ps glsl
+{
+ source DeferredShading/post/glsl/ShowNormal_ps.glsl
+ default_params
+ {
+ param_named tex0 int 0
+ param_named tex1 int 1
+ }
+}
+fragment_program DeferredShading/post/glsl/ShowDS_ps glsl
+{
+ source DeferredShading/post/glsl/ShowDS_ps.glsl
+ default_params
+ {
+ param_named tex0 int 0
+ param_named tex1 int 1
+ }
+}
+fragment_program DeferredShading/post/glsl/ShowColour_ps glsl
+{
+ source DeferredShading/post/glsl/ShowColour_ps.glsl
+ default_params
+ {
+ param_named tex0 int 0
+ param_named tex1 int 1
+ }
+}
+
+// Unified
+fragment_program DeferredShading/post/ShowNormal_ps unified
+{
+ delegate DeferredShading/post/hlsl/ShowNormal_ps
+ delegate DeferredShading/post/glsl/ShowNormal_ps
+}
+fragment_program DeferredShading/post/ShowDS_ps unified
+{
+ delegate DeferredShading/post/hlsl/ShowDS_ps
+ delegate DeferredShading/post/glsl/ShowDS_ps
+}
+fragment_program DeferredShading/post/ShowColour_ps unified
+{
+ delegate DeferredShading/post/hlsl/ShowColour_ps
+ delegate DeferredShading/post/glsl/ShowColour_ps
+}
Added: trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.program
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.program (rev 0)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.program 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,86 @@
+// Auxilary lights
+
+// N.B This is not used directly, since the mini light programs are set up in code.
+
+// HLSL
+vertex_program DeferredShading/post/hlsl/LightMaterial_vs hlsl
+{
+ source DeferredShading/post/hlsl/LightMaterial_vs.hlsl
+ target vs_1_1
+ entry_point main
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named_auto invProj inverse_projection_matrix
+ param_named_auto vpWidth viewport_width
+ param_named_auto vpHeight viewport_height
+ }
+}
+
+fragment_program DeferredShading/post/hlsl/LightMaterial_ps hlsl
+{
+ source DeferredShading/post/hlsl/LightMaterial_ps.hlsl
+ target ps_2_0
+ entry_point main
+ preprocessor_defines IS_ATTENUATED=1;IS_SPECULAR=1
+
+ default_params
+ {
+ param_named_auto worldView worldview_matrix
+
+ param_named lightDiffuseColor float4 0.0 0.0 0.0 0.0
+ param_named lightSpecularColor float4 0.0 0.0 0.0 0.0
+ param_named lightFalloff float4 0.0 0.0 0.0 0.0
+
+
+ //param_named_auto lightDiffuseColor custom 1
+ //param_named_auto lightSpecularColor custom 2
+ //param_named_auto lightFalloff custom 3
+ }
+}
+
+// GLSL
+vertex_program DeferredShading/post/glsl/LightMaterial_vs glsl
+{
+ source DeferredShading/post/glsl/LightMaterial_vs.glsl
+ default_params
+ {
+ param_named_auto invProj inverse_projection_matrix
+ param_named_auto vpWidth viewport_width
+ param_named_auto vpHeight viewport_height
+ }
+}
+fragment_program DeferredShading/post/glsl/LightMaterial_ps glsl
+{
+ source DeferredShading/post/glsl/LightMaterial_ps.glsl
+ preprocessor_defines IS_ATTENUATED=1,IS_SPECULAR=1
+ default_params
+ {
+ param_named_auto worldView worldview_matrix
+
+ param_named lightDiffuseColor float3 0.0 0.0 0.0 0.0
+ param_named lightSpecularColor float3 0.0 0.0 0.0 0.0
+ param_named lightFalloff float3 0.0 0.0 0.0 0.0
+
+
+ //param_named_auto lightDiffuseColor custom 1
+ //param_named_auto lightSpecularColor custom 2
+ //param_named_auto lightFalloff custom 3
+
+ param_named tex0 int 0
+ param_named tex1 int 1
+ }
+}
+
+// Unified
+vertex_program DeferredShading/post/LightMaterial_vs unified
+{
+ delegate DeferredShading/post/hlsl/LightMaterial_vs
+ delegate DeferredShading/post/glsl/LightMaterial_vs
+}
+
+fragment_program DeferredShading/post/LightMaterial_ps unified
+{
+ delegate DeferredShading/post/hlsl/LightMaterial_ps
+ delegate DeferredShading/post/glsl/LightMaterial_ps
+}
Added: trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_vs.program
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_vs.program (rev 0)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_vs.program 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,28 @@
+// HLSL
+vertex_program DeferredShading/post/hlsl/vs hlsl
+{
+ source DeferredShading/post/hlsl/vs.hlsl
+ target vs_1_1
+ entry_point main
+ default_params
+ {
+ param_named_auto invProj inverse_projection_matrix
+ }
+}
+
+// GLSL
+vertex_program DeferredShading/post/glsl/vs glsl
+{
+ source DeferredShading/post/glsl/vs.glsl
+ default_params
+ {
+ param_named_auto invProj inverse_projection_matrix
+ }
+}
+
+// Unified
+vertex_program DeferredShading/post/vs unified
+{
+ delegate DeferredShading/post/hlsl/vs
+ delegate DeferredShading/post/glsl/vs
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/materials/programs/ASCIIFP.cg
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/ASCIIFP.cg (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/ASCIIFP.cg 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,31 @@
+sampler RT : register(s0);
+sampler pattern : register(s1);
+
+float4 ASCII_ps( float2 TexCoord : TEXCOORD0,
+ uniform float2 numTiles,
+ uniform float2 iNumTiles,
+ uniform float2 iNumTiles2,
+ uniform float4 lum,
+ uniform float charBias) : COLOR
+{
+ float3 local;
+
+ //sample RT
+ local.xy = fmod(TexCoord, iNumTiles);
+ float2 middle = TexCoord - local.xy;
+ local.xy = local.xy * numTiles;
+
+ //iNumTiles2 = iNumTiles / 2
+ middle = middle + iNumTiles2;
+ float4 c = tex2D(RT, middle );
+
+ //multiply luminance by charbias , beacause not all slices of the ascii
+ //volume texture are used
+ local.z = dot(c , lum)*charBias;
+
+ //fix to brighten the dark pixels with small characters
+ //c *= lerp(2.0,1.0, local.z);
+
+ c *= tex3D(pattern,local);
+ return c;
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.glsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.glsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.glsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,27 @@
+//-------------------------------
+//Bloom_ps20.glsl
+// Blends using weights the blurred image with the sharp one
+// Params:
+// OriginalImageWeight
+// BlurWeight
+//-------------------------------
+
+uniform sampler2D RT;
+uniform sampler2D Blur1;
+
+uniform float OriginalImageWeight;
+uniform float BlurWeight;
+
+void main()
+{
+ vec4 sharp;
+ vec4 blur;
+
+ vec2 texCoord = vec2( gl_TexCoord[0] );
+
+ sharp = texture2D( RT, texCoord);
+ blur = texture2D( Blur1, texCoord);
+
+ gl_FragColor = ( (blur * BlurWeight) + (sharp * OriginalImageWeight) );
+ //gl_FragColor = vec4(0);
+}
Added: trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.hlsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.hlsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.hlsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,58 @@
+//---------------------------------------------
+// Bloom
+
+
+float4 main(float2 texCoord: TEXCOORD0,
+ uniform sampler RT: register(s0),
+ uniform sampler Blur1: register(s1),
+ uniform float OriginalImageWeight,
+ uniform float BlurWeight
+ ) : COLOR {
+
+
+ float4 sharp = tex2D(RT, texCoord);
+ float4 blur = tex2D(Blur1, texCoord);
+
+ //return blur*0.5+sharp*0.5;
+ return blur*BlurWeight+sharp*OriginalImageWeight;
+ //return blur;
+
+ //return ( sharp + blur * 1.8 ) / 2;
+
+// return (sharp*3/6 + (blur*4/6))*float4(1.5, 1.5, 1.5, 1);;
+
+// float4 color = lerp( sharp, blur, 0.4f );
+
+// return color;
+
+
+/*
+ return ( sharp + blur * 1.8 ) / 2 +
+ luminance(blur) *
+ float4( 0.5, 0.5, 0.5, 0) +
+ luminance(sharp) *
+ float4( 0.3, 0.3, 0.3, 0);
+*/
+/*
+ return ( sharp + blur * 0.9) / 2 +
+ luminance(blur) * float4(0.1, 0.15, 0.7, 0);
+*/
+
+/*
+ return ( sharp + blur * 0.9) / 2 +
+ luminance(blur) * float4(0.1, 0.15, 0.7, 0);
+*/
+
+// float4 retColor = luminance( sharp ) +
+// luminance( blur ) + blur / 2;
+// return retColor;
+}
+
+
+
+
+
+
+
+
+
Added: trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.glsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.glsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.glsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,56 @@
+//-------------------------------
+//BlurH_ps20.glsl
+// Horizontal Gaussian-Blur pass
+//-------------------------------
+
+uniform sampler2D Blur0;
+vec2 pos[11] =
+{
+ vec2( -5, 0),
+ vec2( -4, 0),
+ vec2( -3, 0),
+ vec2( -2, 0),
+ vec2( -1, 0),
+ vec2( 0, 0),
+ vec2( 1, 0),
+ vec2( 2, 0),
+ vec2( 3, 0),
+ vec2( 4, 0),
+ vec2( 5, 0)
+};
+
+//We use the Normal-gauss distribution formula
+//f(x) being the formula, we used f(0.5)-f(-0.5); f(1.5)-f(0.5)...
+float samples[11] =
+{//stddev=2.0
+0.01222447,
+0.02783468,
+0.06559061,
+0.12097757,
+0.17466632,
+
+0.19741265,
+
+0.17466632,
+0.12097757,
+0.06559061,
+0.02783468,
+0.01222447
+};
+
+void main()
+{
+ vec4 retVal;
+
+ vec4 sum;
+ vec2 texcoord = vec2( gl_TexCoord[0] );
+ int i = 0;
+
+ sum = vec4( 0 );
+ for( i=0;i < 11; i++ )
+ {
+ sum += texture2D( Blur0, texcoord + (pos[i] * 0.0100000) ) * samples[i];
+ }
+
+ gl_FragColor = sum;
+}
Added: trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.hlsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.hlsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.hlsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,51 @@
+//-------------------------------
+//BlurH_ps20.hlsl
+// Horizontal Gaussian-Blur pass
+//-------------------------------
+
+sampler Blur0: register(s0);
+// Simple blur filter
+
+//We use the Normal-gauss distribution formula
+//f(x) being the formula, we used f(0.5)-f(-0.5); f(1.5)-f(0.5)...
+static const float samples[11] =
+{//stddev=2.0
+0.01222447,
+0.02783468,
+0.06559061,
+0.12097757,
+0.17466632,
+
+0.19741265,
+
+0.17466632,
+0.12097757,
+0.06559061,
+0.02783468,
+0.01222447
+};
+
+static const float2 pos[11] =
+{
+-5, 0,
+-4, 0,
+-3, 0,
+-2, 0,
+-1, 0,
+ 0, 0,
+ 1, 0,
+ 2, 0,
+ 3, 0,
+ 4, 0,
+ 5, 0,
+};
+
+float4 main(float2 texCoord: TEXCOORD0) : COLOR
+{
+ float4 sum = 0;
+ for (int i = 0; i < 11; i++)
+ {
+ sum += tex2D(Blur0, texCoord + pos[i]*0.01) * samples[i];
+ }
+ return sum;
+}
Added: trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.glsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.glsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.glsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,60 @@
+// Note, this won't work on ATI which is why it's not used
+// the issue is with the array initializers
+// no card supports GL_3DL_array_objects but it does work on nvidia, not on ATI
+//#extension GL_3DL_array_objects : enable
+
+//-------------------------------
+//BlurV_ps20.glsl
+// Vertical Gaussian-Blur pass
+//-------------------------------
+
+uniform sampler2D Blur0;
+vec2 pos[11] = vec2[11](
+ vec2(0.0, -5.0),
+ vec2(0.0, -4.0),
+ vec2(0.0, -3.0),
+ vec2(0.0, -2.0),
+ vec2(0.0, -1.0),
+ vec2(0.0, 0.0),
+ vec2(0.0, 1.0),
+ vec2(0.0, 2.0),
+ vec2(0.0, 3.0),
+ vec2(0.0, 4.0),
+ vec2(0.0, 5.0)
+);
+
+//We use the Normal-gauss distribution formula
+//f(x) being the formula, we used f(0.5)-f(-0.5); f(1.5)-f(0.5)...
+float samples[11] = float[11]
+(//stddev=2.0
+0.01222447,
+0.02783468,
+0.06559061,
+0.12097757,
+0.17466632,
+
+0.19741265,
+
+0.17466632,
+0.12097757,
+0.06559061,
+0.02783468,
+0.01222447
+);
+
+void main()
+{
+ vec4 retVal;
+
+ vec4 sum;
+ vec2 texcoord = vec2(gl_TexCoord[0]);
+ int i = 0;
+
+ sum = vec4( 0 );
+ for( ;i < 11; i++ )
+ {
+ sum += texture2D( Blur0, texcoord + (pos[i] * 0.0100000) ) * samples[i];
+ }
+
+ gl_FragColor = sum;
+}
Added: trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.hlsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.hlsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.hlsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,51 @@
+//-------------------------------
+//BlurV_ps20.hlsl
+// Vertical Gaussian-Blur pass
+//-------------------------------
+
+sampler Blur0: register(s0);
+// Simple blur filter
+
+//We use the Normal-gauss distribution formula
+//f(x) being the formula, we used f(0.5)-f(-0.5); f(1.5)-f(0.5)...
+static const float samples[11] =
+{//stddev=2.0
+0.01222447,
+0.02783468,
+0.06559061,
+0.12097757,
+0.17466632,
+
+0.19741265,
+
+0.17466632,
+0.12097757,
+0.06559061,
+0.02783468,
+0.01222447
+};
+
+static const float2 pos[11] =
+{
+0, -5,
+0, -4,
+0, -3,
+0, -2,
+0, -1,
+0, 0,
+0, 1,
+0, 2,
+0, 3,
+0, 4,
+0, 5
+};
+
+float4 main(float2 texCoord: TEXCOORD0) : COLOR
+{
+ float4 sum = 0;
+ for (int i = 0; i < 11; i++)
+ {
+ sum += tex2D(Blur0, texCoord + pos[i]*0.01) * samples[i];
+ }
+ return sum;
+}
Added: trunk/python-ogre/demos/media/materials/programs/Blur_vs.glsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/Blur_vs.glsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/Blur_vs.glsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,14 @@
+void main()
+{
+ vec2 inPos = sign(gl_Vertex.xy);
+ gl_Position = vec4(inPos.xy, 0.0, 1.0);
+
+ vec2 uv = (vec2(inPos.x, -inPos.y) + 1.0)*0.5;
+ gl_TexCoord[0] = vec4( uv, 0, 0 );
+
+ const float size = 0.01;
+ gl_TexCoord[1] = vec4( uv + vec2(0.0, 1.0)*size, 0, 0);
+ gl_TexCoord[2] = vec4( uv + vec2(0.0, 2.0)*size, 0, 0);
+ gl_TexCoord[3] = vec4( uv + vec2(0.0, -1.0)*size, 0, 0);
+ gl_TexCoord[4] = vec4( uv + vec2(0.0, -2.0)*size, 0, 0);
+}
Added: trunk/python-ogre/demos/media/materials/programs/Blur_vs11.hlsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/Blur_vs11.hlsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/Blur_vs11.hlsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,19 @@
+struct VS_OUTPUT {
+ float4 Pos: POSITION;
+ float2 texCoord: TEXCOORD0;
+};
+
+VS_OUTPUT main(float4 Pos: POSITION){
+ VS_OUTPUT Out;
+
+ // Clean up inaccuracies
+ Pos.xy = sign(Pos.xy);
+
+ Out.Pos = float4(Pos.xy, 0, 1);
+ // Image-space
+ Out.texCoord.x = 0.5 * (1 + Pos.x);
+ Out.texCoord.y = 0.5 * (1 - Pos.y);
+
+ return Out;
+}
+
Added: trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.glsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.glsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.glsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,29 @@
+//-------------------------------
+//BrightBloom_ps20.glsl
+// High-pass filter for obtaining lumminance
+// We use an aproximation formula that is pretty fast:
+// f(x) = ( -3 * ( x - 1 )^2 + 1 ) * 2
+// Color += Grayscale( f(Color) ) + 0.6
+//
+// Special thanks to ATI for their great HLSL2GLSL utility
+// http://sourceforge.net/projects/hlsl2glsl
+//-------------------------------
+
+uniform sampler2D RT;
+
+void main()
+{
+ vec4 tex;
+ vec4 bright4;
+ float bright;
+
+ vec2 texCoord = vec2( gl_TexCoord[0] );
+
+ tex = texture2D( RT, texCoord);
+ tex -= 1.00000;
+ bright4 = -6.00000 * tex * tex + 2.00000;
+ bright = dot( bright4, vec4( 0.333333, 0.333333, 0.333333, 0.000000) );
+ tex += (bright + 0.600000);
+
+ gl_FragColor = tex;
+}
Added: trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.hlsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.hlsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.hlsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,20 @@
+//-------------------------------
+//BrightBloom_ps20.hlsl
+// High-pass filter for obtaining lumminance
+// We use an aproximation formula that is pretty fast:
+// f(x) = ( -3 * ( x - 1 )^2 + 1 ) * 2
+// Color += f(Color)
+//-------------------------------
+
+float4 main(float2 texCoord: TEXCOORD0,
+ uniform sampler RT: register(s0)
+ ) : COLOR {
+ float4 tex = tex2D(RT, texCoord);
+
+ tex -= 1;
+ float4 bright4= -6 * tex * tex + 2; //float4 bright4= ( -3 * tex * tex + 1 ) * 2;
+ float bright = dot( bright4, float4( 0.333333, 0.333333, 0.333333, 0) );
+ tex += bright + 0.6;
+
+ return tex;
+}
Added: trunk/python-ogre/demos/media/materials/programs/Common.cg
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/Common.cg (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/Common.cg 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,81 @@
+struct outPixel
+{
+ float4 colour : COLOR0;
+};
+
+// General functions
+
+// Expand a range-compressed vector
+half4 expand(half4 v)
+{
+ return v * 2 - 1;
+}
+half3 expand(half3 v)
+{
+ return v * 2 - 1;
+}
+half2 expand(half2 v)
+{
+ return v * 2 - 1;
+}
+half1 expand(half1 v)
+{
+ return v * 2 - 1;
+}
+
+// Returns light direction from light position and vertex position
+half3 getLightDirection(float4 lightPosition, float4 position)
+{
+ // calculate tangent space light vector
+ // Get object space light direction
+ // Non-normalised since we'll do that in the fragment program anyway
+ return lightPosition.xyz - (position.xyz * lightPosition.w);
+}
+
+// Returns eye direction from eye position and vertex position
+half3 getEyeDirection(float3 eyePosition, float4 position)
+{
+ return eyePosition - position.xyz;
+}
+
+// Returns a Tangent Binormal Normal matrix
+half3x3 getTBNMatrix(float3 tangent, float3 normal)
+{
+ // Calculate the binormal (NB we assume both normal and tangent are
+ // already normalised)
+ // NB looks like nvidia cross params are BACKWARDS to what you'd expect
+ // this equates to NxT, not TxN
+ float3 binormal = cross(tangent, normal);
+
+ // Form a rotation matrix out of the vectors
+ return half3x3(tangent, binormal, normal);
+}
+
+// Returns expanded normal vector from texture map
+half3 getNormalMapVector(sampler2D normalMap, float2 uv)
+{
+ // get bump map vector, again expand from range-compressed
+ return expand(tex2D(normalMap, uv).xyz);
+}
+
+// Returns displacement vector from normalmaps alpha channel
+half getDisplacement(sampler2D normalMap, float2 uv, half scale, half bias)
+{
+ // get the height using the tex coords
+ half height = tex2D(normalMap, uv).a;
+
+ // calculate displacement
+ return (height * scale) + bias;
+}
+
+// Returns a specular component from normal vector, specular colour and specular power
+half3 getSpecularComponent(float3 normal, float3 halfAngle, float3 specularcolour, float specularPower)
+{
+ return pow(saturate(dot(normal, halfAngle)), specularPower) * specularcolour;
+}
+
+// Returns a per-pixel lighted component from normal vector, lightdir and colour
+half3 getLightingComponent(float3 normal, float3 lightDir, float3 colour)
+{
+ return saturate(dot(normal, lightDir)) * colour;
+}
Added: trunk/python-ogre/demos/media/materials/programs/DitherFP.cg
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/DitherFP.cg (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/DitherFP.cg 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,18 @@
+sampler RT : register(s0);
+sampler pattern : register(s1);
+
+half4 Dither_ps( float2 TexCoord : TEXCOORD0) : COLOR
+{
+ half c = dot(tex2D(RT, TexCoord),half4(0.30,0.11,0.59,0.00));
+ half n = tex2D(pattern, TexCoord).a*2 - 1.0;
+ c += n;
+ if (c > 0.5)
+ {
+ c = 0.0;
+ }
+ else
+ {
+ c = 1.0;
+ }
+ return half4(c,c,c,1.0);
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/materials/programs/HalftoneFP.cg
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/HalftoneFP.cg (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/HalftoneFP.cg 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,18 @@
+sampler RT : register(s0);
+sampler pattern : register(s1);
+
+float4 Halftone_ps( float2 TexCoord : TEXCOORD0,
+ uniform float2 numTiles,
+ uniform float2 iNumTiles,
+ uniform float2 iNumTiles2,
+ uniform float4 lum) : COLOR
+{
+ float3 local;
+ local.xy = fmod(TexCoord, iNumTiles);
+ float2 middle = TexCoord - local.xy;
+ local.xy = local.xy * numTiles;
+ middle += iNumTiles2;
+ local.z = dot(tex2D(RT, middle ) , lum);
+ float4 c = tex3D(pattern,local).a;
+ return c;
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/materials/programs/NightVisionFP.cg
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/NightVisionFP.cg (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/NightVisionFP.cg 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,26 @@
+sampler RT : register(s0);
+sampler noiseVol : register(s1);
+
+float4 NightVision_ps( float2 TexCoord : TEXCOORD0,
+ uniform float4 lum,
+ uniform float time) : COLOR
+{
+ float4 oC;
+ oC = tex2D(RT, TexCoord);
+
+ //obtain luminence value
+ oC = dot(oC,lum);
+
+ //add some random noise
+ oC += 0.2 *(tex3D(noiseVol, float3(TexCoord*5,time)))- 0.05;
+
+ //add lens circle effect
+ //(could be optimised by using texture)
+ float dist = distance(TexCoord, float2(0.5,0.5));
+ oC *= smoothstep(0.5,0.45,dist);
+
+ //add rb to the brightest pixels
+ oC.rb = max (oC.r - 0.75, 0)*4;
+
+ return oC ;
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/materials/programs/ParticleGS.cg
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/ParticleGS.cg (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/ParticleGS.cg 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,324 @@
+//
+// Explanation of different particle types
+//
+#define PT_LAUNCHER 0 //Firework Launcher - launches a PT_SHELL every so many seconds
+#define PT_SHELL 1 //Unexploded shell - flies from the origin and explodes into many PT_EMBERXs
+#define PT_EMBER1 2 //basic particle - after it's emitted from the shell, it dies
+#define PT_EMBER2 3 //after it's emitted, it explodes again into many PT_EMBER1s
+#define PT_EMBER3 4 //just a differently colored ember1
+#define P_SHELLLIFE 3.0
+#define P_EMBER1LIFE 2.5
+#define P_EMBER2LIFE 1.5
+#define P_EMBER3LIFE 2.0
+
+//These two were originally shader params, but they caused runtime errors
+#define NUM_EMBER_1S 30
+#define NUM_EMBER_2S 15
+#define NUM_EMBER_3S 10
+//This one was originally a variant, but this also causes runtime errors
+//#define MAX_EMBER_2S 15.0
+
+//
+// Generic particle motion handler
+//
+
+void GSGenericHandler( float3 Pos, float3 Vel, float Timer, float Type,
+ float elapsedTime,
+ float3 frameGravity)
+{
+ Pos += Vel * elapsedTime;
+ Vel += frameGravity;
+ Timer -= elapsedTime;
+ if (Pos.y > -100)
+ {
+ emitVertex( Pos : POSITION, Vel : TEXCOORD2, Timer : TEXCOORD0, Type : TEXCOORD1);
+ }
+}
+
+//
+// Sample a random direction from our random texture
+//
+float3 RandomDir(float fOffset, float globalTime, sampler1D randomTex)
+{
+ float tCoord = (globalTime + fOffset) / 300.0;
+ return tex1D(randomTex, tCoord).rgb;
+}
+
+//
+// Launcher type particle handler
+//
+void GSLauncherHandler( float3 Pos, float3 Vel, float Timer, float Type,
+ float elapsedTime,
+ float globalTime,
+ sampler1D randomTex,
+ float secondsPerFirework)
+{
+ if(Timer <= 0)
+ {
+ float3 vRandom = normalize( RandomDir( Type, globalTime, randomTex) );
+ //Give it more of an up bias
+ vRandom = normalize(vRandom + float3(0,2.5,0));
+
+ //time to emit a new SHELL
+ float3 outputPos = Pos + Vel*elapsedTime;
+ float3 outputVel = Vel + vRandom*35.0;
+ float outputTimer = P_SHELLLIFE + vRandom.y*0.5;
+ float outputType = PT_SHELL;
+ emitVertex(outputPos : POSITION, outputVel : TEXCOORD2, outputTimer : TEXCOORD0, outputType : TEXCOORD1);
+
+ //reset our timer
+ Timer = secondsPerFirework + vRandom.x*0.4;
+ }
+ else
+ {
+ Timer -= elapsedTime;
+ }
+
+ //emit ourselves to keep us alive
+ emitVertex( Pos : POSITION, Vel : TEXCOORD2, Timer : TEXCOORD0, Type : TEXCOORD1);
+}
+
+//
+// Shell type particle handler
+//
+void GSShellHandler( float3 Pos, float3 Vel, float Timer, float Type,
+ float elapsedTime,
+ float globalTime,
+ sampler1D randomTex,
+ float3 frameGravity)
+{
+ if(Timer <= 0)
+ {
+ float3 outputPos;
+ float3 outputVel;
+ float outputTimer;
+ float outputType;
+
+ float3 vRandom = float3(0,0,0);
+
+ //time to emit a series of new Ember1s
+ for(int i=0; i<NUM_EMBER_1S; i++)
+ {
+ vRandom = normalize( RandomDir( Type+i, globalTime, randomTex ) );
+ outputPos = Pos + Vel*elapsedTime;
+ outputVel = Vel + vRandom*15.0;
+ outputTimer = P_EMBER1LIFE;
+ outputType = PT_EMBER1;
+ emitVertex(outputPos : POSITION, outputTimer : TEXCOORD0, outputType : TEXCOORD1, outputVel : TEXCOORD2);
+ }
+
+ //find out how many Ember2s to emit
+ //Not doing this because it causes a runtime error
+ //int numEmber2s = abs(vRandom.x)*MAX_EMBER_2S;
+ for(int i=0; i<NUM_EMBER_2S; i++)
+ {
+ vRandom = normalize( RandomDir( Type, globalTime, randomTex) );
+ outputPos = Pos + Vel*elapsedTime;
+ outputVel = Vel + vRandom*10.0;
+ outputTimer = P_EMBER2LIFE + 0.4*vRandom.x;
+ outputType = PT_EMBER2;
+ emitVertex(outputPos : POSITION, outputVel : TEXCOORD2, outputTimer : TEXCOORD0, outputType : TEXCOORD1);
+ }
+
+ }
+ else
+ {
+ GSGenericHandler(Pos, Vel, Timer, Type, elapsedTime, frameGravity );
+ }
+}
+
+//
+// Ember1 and Ember3 type particle handler
+//
+void GSEmber1Handler( float3 Pos, float3 Vel, float Timer, float Type,
+ float elapsedTime,
+ float3 frameGravity)
+{
+ if(Timer > 0)
+ {
+ GSGenericHandler(Pos, Vel, Timer, Type, elapsedTime, frameGravity );
+ }
+}
+
+//
+// Ember2 type particle handler
+//
+void GSEmber2Handler( float3 Pos, float3 Vel, float Timer, float Type,
+ float elapsedTime,
+ float globalTime,
+ sampler1D randomTex,
+ float3 frameGravity)
+{
+ if(Timer <= 0)
+ {
+ float3 outputPos;
+ float3 outputVel;
+ float outputTimer;
+ float outputType;
+
+ //time to emit a series of new Ember3s
+ for(int i=0; i<NUM_EMBER_3S; i++)
+ {
+ outputPos = Pos + Vel*elapsedTime;
+ outputVel = Vel + normalize( RandomDir( Type + i, globalTime, randomTex ) )*10.0;
+ outputTimer = P_EMBER3LIFE;
+ outputType = PT_EMBER3;
+ emitVertex(outputPos : POSITION, outputVel : TEXCOORD2, outputTimer : TEXCOORD0, outputType : TEXCOORD1);
+ }
+ }
+ else
+ {
+ GSGenericHandler(Pos, Vel, Timer, Type, elapsedTime, frameGravity );
+ }
+}
+
+struct FireworkData
+{
+ float3 Pos : POSITION;
+ float Timer : TEXCOORD0;
+ float Type : TEXCOORD1;
+ float3 Velocity : TEXCOORD2;
+};
+
+//The vertex shader that prepares the fireworks for display
+FireworkData GenerateParticles_VS(
+ in float3 inPos : POSITION,
+ in float inTimer : TEXCOORD0,
+ in float inType : TEXCOORD1,
+ in float3 inVelocity : TEXCOORD2
+ )
+{
+ FireworkData output;
+ output.Pos = inPos;
+ output.Timer = inTimer;
+ output.Type = inType;
+ output.Velocity = inVelocity;
+
+ return output;
+}
+
+POINT
+POINT_OUT
+void GenerateParticles_GS(
+ AttribArray<float3> Pos : POSITION,
+ AttribArray<float> Timer : TEXCOORD0,
+ AttribArray<float> Type : TEXCOORD1,
+ AttribArray<float3> Vel : TEXCOORD2,
+
+ uniform sampler1D randomTex : TEXUNIT0,
+ uniform float3 frameGravity,
+ uniform float globalTime,
+ uniform float elapsedTime,
+ uniform float secondsPerFirework
+ )
+{
+ if( Type[0] == PT_LAUNCHER )
+ GSLauncherHandler( Pos[0], Vel[0], Timer[0], Type[0],
+ elapsedTime, globalTime, randomTex, secondsPerFirework);
+ else if ( Type[0] == PT_SHELL )
+ GSShellHandler( Pos[0], Vel[0], Timer[0], Type[0],
+ elapsedTime, globalTime, randomTex, frameGravity);
+ else if ( Type[0] == PT_EMBER1 ||
+ Type[0] == PT_EMBER3 )
+ GSEmber1Handler( Pos[0], Vel[0], Timer[0], Type[0],
+ elapsedTime, frameGravity);
+ else if( Type[0] == PT_EMBER2 )
+ GSEmber2Handler( Pos[0], Vel[0], Timer[0], Type[0],
+ elapsedTime, globalTime, randomTex, frameGravity);
+}
+
+struct ColoredFirework
+{
+ float3 pos : POSITION;
+ float4 color : COLOR;
+ float radius : TEXCOORD0;
+};
+
+//The vertex shader that prepares the fireworks for display
+ColoredFirework DisplayParticles_VS
+(
+ in float3 inPos : POSITION,
+ in float inTimer : TEXCOORD0,
+ in float inType : TEXCOORD1,
+ in float3 inVelocity : TEXCOORD2
+
+
+ //uniform float4x4 worldViewProj
+)
+{
+ ColoredFirework output;
+ //
+ // Pass the point through
+ //
+ output.pos = inPos; //Multiply by world matrix?
+ output.radius = 1.5;
+
+ //
+ // calculate the color
+ //
+ if( inType == PT_LAUNCHER )
+ {
+ output.color = float4(1,0.1,0.1,1);
+ output.radius = 1.0;
+ }
+ else if( inType == PT_SHELL )
+ {
+ output.color = float4(0.1,1,1,1);
+ output.radius = 1.0;
+ }
+ else if( inType == PT_EMBER1 )
+ {
+ output.color = float4(1,1,0.1,1);
+ output.color *= (inTimer / P_EMBER1LIFE );
+ }
+ else if( inType == PT_EMBER2 )
+ {
+ output.color = float4(1,0.1,1,1);
+ }
+ else if( inType == PT_EMBER3 )
+ {
+ output.color = float4(1,0.1,0.1,1);
+ output.color *= (inTimer / P_EMBER3LIFE );
+ }
+
+ return output;
+}
+
+//The geometry shader that prepares the fireworks for display
+POINT
+TRIANGLE_OUT
+void DisplayParticles_GS( AttribArray<float3> Pos : POSITION,
+ AttribArray<float4> Color : COLOR,
+ AttribArray<float> Radius : TEXCOORD0,
+
+ uniform float4x4 inverseView,
+ uniform float4x4 worldViewProj)
+{
+ //float3 g_positions[4] = { float3( -1, 1, 0 ), float3( 1, 1, 0 ), float3( -1, -1, 0 ), float3( 1, -1, 0 ) };
+ float3 g_positions[4] = { float3( -1, 1, 0 ), float3( -1, -1, 0 ), float3( 1, 1, 0 ), float3( 1, -1, 0 ) };
+ float2 g_texcoords[4] = { float2(0,1), float2(1,1), float2(0,0), float2(1,0) };
+
+
+ //
+ // Emit two new triangles
+ //
+ for(int i=0; i<4; i++)
+ {
+ float3 position = -g_positions[i]*Radius[0];
+ position = mul( (float3x3)inverseView, position ) + Pos[0];
+ float4 outPos = mul( worldViewProj, float4(position,1.0) );
+
+ emitVertex(outPos : POSITION, Color[0] : COLOR0, g_texcoords[i] : TEXCOORD0);
+ }
+ restartStrip();
+}
+
+//The pixels shaders that colors the fireworks
+float4 DisplayParticles_PS( float2 iTexCoord : TEXCOORD0,
+ float4 iColor : COLOR0,
+ uniform sampler diffuseTex : register(s0)) : COLOR
+{
+ return tex2D(diffuseTex, iTexCoord) * iColor;
+ //return float4(iTexCoord.x, iTexCoord.y, 0, 1) + iColor * 0.01;
+ //return float4(iTexCoord.xy, 0, 1) * 0.3 + tex2D(diffuseTex, iTexCoord) * 0.7 + iColor * 0.01;
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/materials/programs/PassthroughVP.glsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/PassthroughVP.glsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/PassthroughVP.glsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,5 @@
+void main()
+{
+ //Transform the vertex (ModelViewProj matrix)
+ gl_Position = ftransform();
+}
Added: trunk/python-ogre/demos/media/materials/programs/Radial_Blur_FP.cg
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/Radial_Blur_FP.cg (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/Radial_Blur_FP.cg 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,57 @@
+//------------------------------------------------------
+//Radial_Blur_FP.cg
+// Implements radial blur to be used with the compositor
+// It's very dependant on screen resolution
+//------------------------------------------------------
+
+uniform sampler tex: register(s0);
+
+static const float samples[10] =
+{
+-0.08,
+-0.05,
+-0.03,
+-0.02,
+-0.01,
+0.01,
+0.02,
+0.03,
+0.05,
+0.08
+};
+
+float4 main(float2 texCoord: TEXCOORD0,
+ uniform float sampleDist,
+ uniform float sampleStrength
+ ) : COLOR
+{
+ //Vector from pixel to the center of the screen
+ float2 dir = 0.5 - texCoord;
+
+ //Distance from pixel to the center (distant pixels have stronger effect)
+ //float dist = distance( float2( 0.5, 0.5 ), texCoord );
+ float dist = sqrt( dir.x*dir.x + dir.y*dir.y );
+
+
+ //Now that we have dist, we can normlize vector
+ dir = normalize( dir );
+
+ //Save the color to be used later
+ float4 color = tex2D( tex, texCoord );
+
+ //Average the pixels going along the vector
+ float4 sum = color;
+ for (int i = 0; i < 10; i++)
+ {
+ sum += tex2D( tex, texCoord + dir * samples[i] * sampleDist );
+ }
+ sum /= 11;
+
+ //Calculate amount of blur based on
+ //distance and a strength parameter
+ float t = dist * sampleStrength;
+ t = saturate( t );//We need 0 <= t <= 1
+
+ //Blend the original color with the averaged pixels
+ return lerp( color, sum, t );
+}
Added: trunk/python-ogre/demos/media/materials/programs/Swizzle.gp
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/Swizzle.gp (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/Swizzle.gp 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,39 @@
+!!NVgp4.0
+PRIMITIVE_IN TRIANGLES;
+PRIMITIVE_OUT TRIANGLE_STRIP;
+VERTICES_OUT 6;
+# cgc version 2.0.0015, build date May 15 2008
+# command line args: -profile gpu_gp
+# source file: gs_simple.cg
+#vendor NVIDIA Corporation
+#version 2.0.0.15
+#profile gpu_gp
+#program geometry_swizzle
+#semantic geometry_swizzle.position : POSITION
+#var float4 position.__data[0] : $vin.VERTEX[0].POSITION : HPOS[0][32] : 0 : 1
+#var float4 position.__data[1] : $vin.VERTEX[1].POSITION : HPOS[1][32] : 0 : 1
+#var float4 position.__data[2] : $vin.VERTEX[2].POSITION : HPOS[2][32] : 0 : 1
+ATTRIB vertex_position = vertex.position;
+TEMP RC, HC;
+MOV.F result.position, vertex[0].position;
+MOV.F result.color, {1, 0}.xyyx;
+EMIT;
+MOV.F result.position, vertex[1].position;
+MOV.F result.color, {1, 0}.xyyx;
+EMIT;
+MOV.F result.position, vertex[2].position;
+MOV.F result.color, {1, 0}.xyyx;
+EMIT;
+ENDPRIM;
+MOV.F result.position, vertex[0].position.yxzw;
+MOV.F result.color, {0, 1}.xxyy;
+EMIT;
+MOV.F result.position, vertex[1].position.yxzw;
+MOV.F result.color, {0, 1}.xxyy;
+EMIT;
+MOV.F result.position, vertex[2].position.yxzw;
+MOV.F result.color, {0, 1}.xxyy;
+EMIT;
+ENDPRIM;
+END
+# 20 instructions, 0 R-regs
\ No newline at end of file
Added: trunk/python-ogre/demos/media/materials/programs/SwizzleGP.cg
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/SwizzleGP.cg (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/SwizzleGP.cg 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,14 @@
+// Geometry pass-through program for colored triangles
+TRIANGLE void gs_swizzle(AttribArray<float4> position : POSITION)
+{
+ for (int i=0; i<position.length; i++) {
+ emitVertex(position[i], float4(1,0.9,0.8,0.7):COLOR0);
+ }
+ restartStrip();
+ for (int i=0; i<position.length; i++) {
+ float4 newPosition = position[i].yxzw;
+ newPosition.z += 20;
+ emitVertex(newPosition:POSITION, float4(0.3,0.4,0.5,0.6):COLOR0);
+ }
+ restartStrip();
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/media/materials/programs/SwizzleGP.glsl
===================================================================
--- trunk/python-ogre/demos/media/materials/programs/SwizzleGP.glsl (rev 0)
+++ trunk/python-ogre/demos/media/materials/programs/SwizzleGP.glsl 2008-09-07 11:39:21 UTC (rev 736)
@@ -0,0 +1,40 @@
+#version 120
+#extension GL_EXT_geometry_shader4 : enable
+
+uniform vec4 origColor;
+uniform vec4 cloneColor;
+
+void main(void)
+{
+
+ //increment variable
+ int i;
+
+ /////////////////////////////////////////////////////////////
+ //This example has two parts
+ // step a) draw the primitive pushed down the pipeline
+ // there are gl_Vertices # of vertices
+ // put the vertex value into gl_Position
+ // use EmitVertex => 'create' a new vertex
+ // use EndPrimitive to signal that you are done creating a primitive!
+ // step b) create a new piece of geometry (I.E. WHY WE ARE USING A GEOMETRY SHADER!)
+ // I just do the same loop, but swizzle the x and y values
+ // result => the line we want to draw, and the same line, but along the other axis
+
+ //Pass-thru!
+ for(i=0; i< gl_VerticesIn; i++){
+ gl_Position = gl_PositionIn[i];
+ gl_FrontColor = origColor;
+ EmitVertex();
+ }
+ EndPrimitive();
+ //New piece of geometry! We just swizzle the x and y terms
+ for(i=0; i< gl_VerticesIn; i++){
+ gl_Position = gl_PositionIn[i];
+ gl_Position.xy = gl_Position.yx;
+ gl_FrontColor = cloneColor;
+ EmitVertex();
+ }
+ EndPrimitive(); ...
[truncated message content] |
|
From: <bha...@us...> - 2008-10-16 08:46:54
|
Revision: 759
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=759&view=rev
Author: bharling
Date: 2008-10-16 08:44:11 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
Added PSSM Demo
Added Paths:
-----------
trunk/python-ogre/demos/PSSM_demo/
trunk/python-ogre/demos/PSSM_demo/Media/
trunk/python-ogre/demos/PSSM_demo/Media/_ambient.cg
trunk/python-ogre/demos/PSSM_demo/Media/_diffuse.cg
trunk/python-ogre/demos/PSSM_demo/Media/_shadow_caster.cg
trunk/python-ogre/demos/PSSM_demo/Media/_shadow_caster.program
trunk/python-ogre/demos/PSSM_demo/Media/ambient.program
trunk/python-ogre/demos/PSSM_demo/Media/cement.dds
trunk/python-ogre/demos/PSSM_demo/Media/cementNRM.dds
trunk/python-ogre/demos/PSSM_demo/Media/cementSPEC.dds
trunk/python-ogre/demos/PSSM_demo/Media/city.material
trunk/python-ogre/demos/PSSM_demo/Media/city.mesh
trunk/python-ogre/demos/PSSM_demo/Media/cityAO.dds
trunk/python-ogre/demos/PSSM_demo/Media/diffuse.program
trunk/python-ogre/demos/PSSM_demo/plugins.cfg
trunk/python-ogre/demos/PSSM_demo/pssm_demo.py
trunk/python-ogre/demos/PSSM_demo/resources.cfg
Added: trunk/python-ogre/demos/PSSM_demo/Media/_ambient.cg
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/Media/_ambient.cg (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/Media/_ambient.cg 2008-10-16 08:44:11 UTC (rev 759)
@@ -0,0 +1,32 @@
+void ambient_vs(
+ float4 position : POSITION,
+ float2 diffuseUV : TEXCOORD0,
+ float2 aoUV : TEXCOORD1,
+
+ out float4 oPosition : POSITION,
+ out float2 oDiffuseUV : TEXCOORD0,
+ out float2 oAoUV : TEXCOORD1,
+
+ uniform float4x4 worldViewProj)
+{
+ oPosition = mul(worldViewProj, position);
+ oDiffuseUV = diffuseUV;
+ oAoUV = aoUV;
+}
+
+void ambient_ps(
+ float2 diffuseUV : TEXCOORD0,
+ float2 aoUV : TEXCOORD1,
+
+ out float4 colour : COLOR,
+
+ uniform float3 ambient,
+
+ uniform sampler2D diffuseMap,
+ uniform sampler2D AOMap
+ )
+{
+ colour = tex2D(diffuseMap, diffuseUV);
+ colour *= tex2D(AOMap, aoUV);
+ colour *= float4(ambient, 1);
+}
Added: trunk/python-ogre/demos/PSSM_demo/Media/_diffuse.cg
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/Media/_diffuse.cg (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/Media/_diffuse.cg 2008-10-16 08:44:11 UTC (rev 759)
@@ -0,0 +1,149 @@
+void diffuse_vs(
+ float4 position : POSITION,
+ float3 normal : NORMAL,
+ float2 uv : TEXCOORD0,
+ float4 tangentPar : TANGENT0,
+
+ out float4 oPosition : POSITION,
+ out float3 oUv : TEXCOORD0,
+ out float3 oTSLightDir : TEXCOORD1,
+ out float3 oTSHalfAngle : TEXCOORD2,
+ out float4 oLightPosition0 : TEXCOORD3,
+ out float4 oLightPosition1 : TEXCOORD4,
+ out float4 oLightPosition2 : TEXCOORD5,
+
+ uniform float4 lightPosition, // object space
+ uniform float3 eyePosition, // object space
+ uniform float4x4 worldViewProjMatrix,
+ uniform float4x4 texWorldViewProjMatrix0,
+ uniform float4x4 texWorldViewProjMatrix1,
+ uniform float4x4 texWorldViewProjMatrix2)
+{
+ // calculate output position
+ oPosition = mul(worldViewProjMatrix, position);
+
+ // pass the main uvs straight through unchanged
+ oUv.xy = uv;
+ oUv.z = oPosition.z;
+
+ // calculate tangent space light vector
+ // Get object space light direction
+ float3 lightDir = normalize(lightPosition.xyz - (position * lightPosition.w).xyz);
+
+ // Get the tangent component.
+ float3 tangent = tangentPar.xyz;
+
+ // Calculate the binormal (NB we assume both normal and tangent are
+ // already normalised)
+ // NB looks like nvidia cross params are BACKWARDS to what you'd expect
+ // this equates to NxT, not TxN
+ float3 binormal = cross(tangent, normal) * tangentPar.w;
+
+ // Form a rotation matrix out of the vectors
+ float3x3 rotation = float3x3(tangent, binormal, normal);
+
+ // Transform the light vector according to this matrix
+ oTSLightDir = mul(rotation, lightDir);
+
+ // Calculate half-angle in tangent space
+ float3 eyeDir = normalize(eyePosition - position.xyz);
+ oTSHalfAngle = mul(rotation, normalize(eyeDir + lightDir));
+
+ // Calculate the position of vertex in light space
+ oLightPosition0 = mul(texWorldViewProjMatrix0, position);
+ oLightPosition1 = mul(texWorldViewProjMatrix1, position);
+ oLightPosition2 = mul(texWorldViewProjMatrix2, position);
+}
+
+float shadowPCF(sampler2D shadowMap, float4 shadowMapPos, float2 offset)
+{
+ shadowMapPos = shadowMapPos / shadowMapPos.w;
+ float2 uv = shadowMapPos.xy;
+ float3 o = float3(offset, -offset.x) * 0.3f;
+
+ // Note: We using 2x2 PCF. Good enough and is alot faster.
+ float c = (shadowMapPos.z <= tex2D(shadowMap, uv.xy - o.xy).r) ? 1 : 0; // top left
+ c += (shadowMapPos.z <= tex2D(shadowMap, uv.xy + o.xy).r) ? 1 : 0; // bottom right
+ c += (shadowMapPos.z <= tex2D(shadowMap, uv.xy + o.zy).r) ? 1 : 0; // bottom left
+ c += (shadowMapPos.z <= tex2D(shadowMap, uv.xy - o.zy).r) ? 1 : 0; // top right
+ //float c = (shadowMapPos.z <= tex2Dlod(shadowMap, uv.xyyy - o.xyyy).r) ? 1 : 0; // top left
+ //c += (shadowMapPos.z <= tex2Dlod(shadowMap, uv.xyyy + o.xyyy).r) ? 1 : 0; // bottom right
+ //c += (shadowMapPos.z <= tex2Dlod(shadowMap, uv.xyyy + o.zyyy).r) ? 1 : 0; // bottom left
+ //c += (shadowMapPos.z <= tex2Dlod(shadowMap, uv.xyyy - o.zyyy).r) ? 1 : 0; // top right
+ return c / 4;
+}
+
+// to put it simply, this does 100% per pixel diffuse lighting
+void diffuse_ps(
+ float3 uv : TEXCOORD0,
+ float3 TSlightDir : TEXCOORD1,
+ float3 TShalfAngle : TEXCOORD2,
+ float4 LightPosition0 : TEXCOORD3,
+ float4 LightPosition1 : TEXCOORD4,
+ float4 LightPosition2 : TEXCOORD5,
+
+ out float4 oColour : COLOR,
+
+ uniform float4 invShadowMapSize0,
+ uniform float4 invShadowMapSize1,
+ uniform float4 invShadowMapSize2,
+ uniform float4 pssmSplitPoints,
+ uniform sampler2D diffuse,
+ uniform sampler2D specular,
+ uniform sampler2D normalMap,
+ uniform sampler2D shadowMap0,
+ uniform sampler2D shadowMap1,
+ uniform sampler2D shadowMap2,
+ uniform float4 lightDiffuse,
+ uniform float4 lightSpecular
+ )
+{
+ // calculate shadow
+ float shadowing = 1.0f;
+ float4 splitColour;
+ if (uv.z <= pssmSplitPoints.y)
+ {
+ splitColour = float4(0.1, 0, 0, 1);
+ shadowing = shadowPCF(shadowMap0, LightPosition0, invShadowMapSize0.xy);
+ }
+ else if (uv.z <= pssmSplitPoints.z)
+ {
+ splitColour = float4(0, 0.1, 0, 1);
+ shadowing = shadowPCF(shadowMap1, LightPosition1, invShadowMapSize1.xy);
+ }
+ else
+ {
+ splitColour = float4(0.1, 0.1, 0, 1);
+ shadowing = shadowPCF(shadowMap2, LightPosition2, invShadowMapSize2.xy);
+ }
+
+ // retrieve normalised light vector, expand from range-compressed
+ float3 lightVec = normalize(TSlightDir);
+
+ // retrieve half angle and normalise through cube map
+ float3 halfAngle = normalize(TShalfAngle);
+
+ // get diffuse colour
+ float4 diffuseColour = tex2D(diffuse, uv.xy);
+
+ // specular
+ float4 specularColour = tex2D(specular, uv.xy);
+ float shininess = specularColour.w;
+ specularColour.w = 1;
+
+ // get bump map vector, again expand from range-compressed
+ float3 bumpVec = (tex2D(normalMap, uv.xy).wyz - 0.5) * 2;
+ bumpVec.z = sqrt(1 - bumpVec.x * bumpVec.x - bumpVec.y * bumpVec.y);
+ bumpVec = normalize(bumpVec);
+
+ // calculate lit value.
+ float4 lighting = lit(dot(bumpVec, lightVec), dot(bumpVec, halfAngle), shininess * 128);
+
+ // final lighting with diffuse and spec
+ oColour = (diffuseColour * lightDiffuse * lighting.y) + (lightSpecular * specularColour * lighting.z);
+ oColour.w = diffuseColour.w;
+
+ // Apply shadowing
+ oColour *= float4(shadowing, shadowing, shadowing, 1);
+ //oColour += splitColour;
+}
Added: trunk/python-ogre/demos/PSSM_demo/Media/_shadow_caster.cg
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/Media/_shadow_caster.cg (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/Media/_shadow_caster.cg 2008-10-16 08:44:11 UTC (rev 759)
@@ -0,0 +1,29 @@
+void shadow_caster_vs(
+ float4 position : POSITION,
+
+ out float4 oPosition : POSITION,
+ out float2 oDepth : TEXCOORD0,
+
+ uniform float4x4 wvpMat)
+{
+ // this is the view space position
+ oPosition = mul(wvpMat, position);
+
+ // depth info for the fragment.
+ oDepth.x = oPosition.z;
+ oDepth.y = oPosition.w;
+
+ // clamp z to zero. seem to do the trick. :-/
+ //oPosition.z = max(oPosition.z, 0);
+}
+
+void shadow_caster_ps(
+ float2 depth : TEXCOORD0,
+
+ out float4 oColour : COLOR,
+
+ uniform float4 pssmSplitPoints)
+{
+ float finalDepth = depth.x / depth.y;
+ oColour = float4(finalDepth, finalDepth, finalDepth, 1);
+}
Added: trunk/python-ogre/demos/PSSM_demo/Media/_shadow_caster.program
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/Media/_shadow_caster.program (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/Media/_shadow_caster.program 2008-10-16 08:44:11 UTC (rev 759)
@@ -0,0 +1,51 @@
+// declare the vertex shader (CG for the language)
+vertex_program shadow_caster_vs cg
+{
+ // source file
+ source _shadow_caster.cg
+ // will run on vertex shader 1.1+
+ profiles vs_1_1 arbvp1
+ // entry function
+ entry_point shadow_caster_vs
+
+ default_params
+ {
+ param_named_auto wvpMat worldviewproj_matrix
+ // this is the scene's depth range
+ //param_named_auto depthRange scene_depth_range
+ //param_named_auto optimalAdustFactor custom 0
+ }
+}
+
+// declare the fragment shader (CG for the language)
+fragment_program shadow_caster_ps cg
+{
+ // source file
+ source _shadow_caster.cg
+ // will run on pixel shader 2.0+
+ profiles ps_2_0 arbfp1
+ // entry function
+ entry_point shadow_caster_ps
+
+ default_params
+ {
+ }
+}
+
+material shadow_caster
+{
+ technique
+ {
+ // all this will do is write depth and depth\xB2 to red and green
+ pass
+ {
+ vertex_program_ref shadow_caster_vs
+ {
+ }
+
+ fragment_program_ref shadow_caster_ps
+ {
+ }
+ }
+ }
+}
Added: trunk/python-ogre/demos/PSSM_demo/Media/ambient.program
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/Media/ambient.program (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/Media/ambient.program 2008-10-16 08:44:11 UTC (rev 759)
@@ -0,0 +1,23 @@
+vertex_program ambient_vs cg
+{
+ source _ambient.cg
+ profiles vs_1_1 arbvp1
+ entry_point ambient_vs
+
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ }
+}
+
+fragment_program ambient_ps cg
+{
+ source _ambient.cg
+ profiles ps_2_0 arbfp1
+ entry_point ambient_ps
+
+ default_params
+ {
+ param_named_auto ambient derived_ambient_light_colour
+ }
+}
Added: trunk/python-ogre/demos/PSSM_demo/Media/cement.dds
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/PSSM_demo/Media/cement.dds
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/PSSM_demo/Media/cementNRM.dds
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/PSSM_demo/Media/cementNRM.dds
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/PSSM_demo/Media/cementSPEC.dds
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/PSSM_demo/Media/cementSPEC.dds
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/PSSM_demo/Media/city.material
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/Media/city.material (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/Media/city.material 2008-10-16 08:44:11 UTC (rev 759)
@@ -0,0 +1,88 @@
+abstract material _base
+{
+ technique
+ {
+ pass AMBIENT
+ {
+ ambient 0.4 0.4 0.5
+
+ vertex_program_ref ambient_vs {}
+ fragment_program_ref ambient_ps {}
+
+ texture_unit diffuse_tex
+ {
+ texture $diffuse
+ filtering anisotropic
+ max_anisotropy 16
+ }
+ texture_unit
+ {
+ texture $ambientOcclusion
+ filtering anisotropic
+ max_anisotropy 16
+ }
+ }
+ pass DIFFUSE
+ {
+ scene_blend add
+ iteration once directional
+ alpha_rejection greater_equal 128
+
+ ambient 0 0 0
+ diffuse 1 1 1
+ specular 1 1 1 128
+
+ vertex_program_ref shadowDiffuse_vs {}
+ fragment_program_ref shadowDiffuse_ps {}
+
+ texture_unit shadow_tex0
+ {
+ content_type shadow
+ filtering anisotropic
+ max_anisotropy 16
+ tex_address_mode clamp
+ }
+ texture_unit shadow_tex1
+ {
+ content_type shadow
+ filtering anisotropic
+ max_anisotropy 16
+ tex_address_mode clamp
+ }
+ texture_unit shadow_tex2
+ {
+ content_type shadow
+ filtering anisotropic
+ max_anisotropy 16
+ tex_address_mode clamp
+ }
+
+ texture_unit diffuse_tex
+ {
+ texture $diffuse
+ filtering anisotropic
+ max_anisotropy 16
+ }
+ texture_unit specular_tex
+ {
+ texture $specular
+ filtering anisotropic
+ max_anisotropy 16
+ }
+ texture_unit normal_tex
+ {
+ texture $normal
+ filtering anisotropic
+ max_anisotropy 16
+ }
+ }
+ }
+}
+
+material city : _base
+{
+ set $diffuse cement.dds
+ set $specular cementSPEC.dds
+ set $normal cementNRM.dds
+ set $ambientOcclusion cityAO.dds
+}
Added: trunk/python-ogre/demos/PSSM_demo/Media/city.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/PSSM_demo/Media/city.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/PSSM_demo/Media/cityAO.dds
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/PSSM_demo/Media/cityAO.dds
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/PSSM_demo/Media/diffuse.program
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/Media/diffuse.program (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/Media/diffuse.program 2008-10-16 08:44:11 UTC (rev 759)
@@ -0,0 +1,37 @@
+vertex_program shadowDiffuse_vs cg
+{
+ source _diffuse.cg
+ profiles vs_1_1 arbvp1
+ entry_point diffuse_vs
+
+ default_params
+ {
+ param_named_auto lightPosition light_position_object_space 0
+ param_named_auto eyePosition camera_position_object_space
+ param_named_auto worldViewProjMatrix worldviewproj_matrix
+ param_named_auto texWorldViewProjMatrix0 texture_worldviewproj_matrix 0
+ param_named_auto texWorldViewProjMatrix1 texture_worldviewproj_matrix 1
+ param_named_auto texWorldViewProjMatrix2 texture_worldviewproj_matrix 2
+ //param_named_auto depthRange0 shadow_scene_depth_range 0
+ //param_named_auto depthRange1 shadow_scene_depth_range 1
+ //param_named_auto depthRange2 shadow_scene_depth_range 2
+ }
+}
+
+fragment_program shadowDiffuse_ps cg
+{
+ source _diffuse.cg
+ profiles ps_2_x arbfp1
+ //profiles ps_3_0 fp40
+ entry_point diffuse_ps
+
+ default_params
+ {
+ param_named_auto lightDiffuse light_diffuse_colour 0
+ param_named_auto lightSpecular light_specular_colour 0
+ param_named_auto invShadowMapSize0 inverse_texture_size 0
+ param_named_auto invShadowMapSize1 inverse_texture_size 1
+ param_named_auto invShadowMapSize2 inverse_texture_size 2
+ param_named_auto pssmSplitPoints custom 0
+ }
+}
Added: trunk/python-ogre/demos/PSSM_demo/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/plugins.cfg (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/plugins.cfg 2008-10-16 08:44:11 UTC (rev 759)
@@ -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
Added: trunk/python-ogre/demos/PSSM_demo/pssm_demo.py
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/pssm_demo.py (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/pssm_demo.py 2008-10-16 08:44:11 UTC (rev 759)
@@ -0,0 +1,158 @@
+# 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.
+# -----------------------------------------------------------------------------
+
+# NOTE:
+# This demo includes meshes and shaders by lf3thn4d
+# see below for more details:
+# http://www.ogre3d.org/phpBB2/viewtopic.php?t=41801&highlight=pssm
+
+# Authors Note:
+# This demo seems to perform much better on ATI cards than NVIDIA!
+
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as OIS
+import SampleFramework as sf
+
+class PSSMDemoFrameListener(sf.FrameListener):
+ def __init__(self, rw, cam, light):
+ sf.FrameListener.__init__(self, rw, cam)
+ self.light = light
+ self.angle = ogre.Math.PI / 2
+ self.radius = 1000
+
+ def frameStarted(self, evt):
+ self.angle += evt.timeSinceLastFrame
+ xpos = self.radius * ogre.Math.Sin( ogre.Degree( self.angle ) * 5.0 )
+ zpos = self.radius * ogre.Math.Cos( ogre.Degree( self.angle ) * 5.0 )
+ pos = ogre.Vector3( xpos, 400, zpos )
+ self.light.setPosition( pos )
+ dirvec = -self.light.getPosition()
+ dirvec.normalise()
+ self.light.setDirection( dirvec )
+
+ return sf.FrameListener.frameStarted(self, evt)
+
+
+
+class ApplicationPSSM(sf.Application):
+
+ def __del__(self):
+ del self.pssmSetup
+
+ def _createScene(self):
+ self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE_INTEGRATED)
+
+ # 3 textures per directional light
+ self.sceneManager.setShadowTextureCountPerLightType(ogre.Light.LT_DIRECTIONAL, 3);
+ self.sceneManager.setShadowTextureSettings(1024, 3, ogre.PF_FLOAT32_R);
+ self.sceneManager.setShadowTextureSelfShadow(True);
+ # Set up caster material - this is just a standard depth/shadow map caster
+ self.sceneManager.setShadowTextureCasterMaterial("shadow_caster");
+ self.camera.setNearClipDistance(1.0)
+ self.camera.setFarClipDistance(1000.0)
+
+ # shadow camera setup
+ self.pssmSetup = ogre.PSSMShadowCameraSetup()
+ self.pssmSetup.calculateSplitPoints(3, self.camera.getNearClipDistance(), self.camera.getFarClipDistance())
+ self.pssmSetup.setSplitPadding(5)
+ self.pssmSetup.setOptimalAdjustFactor(0, 2)
+ self.pssmSetup.setOptimalAdjustFactor(1, 1);
+ self.pssmSetup.setOptimalAdjustFactor(2, 0.5)
+
+ self.sceneManager.setShadowCameraSetup(self.pssmSetup)
+
+
+ # setup the sun light.
+ self.sceneManager.setAmbientLight(ogre.ColourValue(0.4, 0.4, 0.5));
+ self.mSunLight = self.sceneManager.createLight("_SunLight")
+ self.mSunLight.setType(ogre.Light.LT_DIRECTIONAL)
+ self.mSunLight.setDirection(ogre.Vector3(-1, -1, -1))
+ self.mSunLight.setDiffuseColour(ogre.ColourValue(1, 1, 1))
+ self.mSunLight.setSpecularColour(ogre.ColourValue(1,1,1))
+
+ # Create the Mesh -
+ # Note Mesh and Shaders courtesy of lf3thn4d
+ cityNode = self.sceneManager.getRootSceneNode().createChildSceneNode()
+ cityEntity = self.sceneManager.createEntity("City", "city.mesh")
+ cityNode.attachObject(cityEntity)
+ cityNode.setScale(10,10,10)
+
+ splitPoints = ogre.Vector4(0,0,0,0)
+ splitPointList = self.pssmSetup.getSplitPoints();
+ mat = ogre.MaterialManager.getSingleton().getByName("city")
+ splitPoints.y = splitPointList[1]
+ splitPoints.z = splitPointList[2]
+ mat.getTechnique(0).getPass(1).getFragmentProgramParameters().setNamedConstant("pssmSplitPoints", splitPoints)
+ self._createDebugShadowOverlays()
+
+ def _createDebugShadowOverlays(self):
+ baseWhite = ogre.MaterialManager.getSingletonPtr().getByName("BaseWhite")
+ DepthShadowTexture = baseWhite.clone("DepthShadowTexture0")
+ textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
+ tex = self.sceneManager.getShadowTexture(0)
+ textureUnit.setTextureName(tex.getName())
+
+ DepthShadowTexture = baseWhite.clone("DepthShadowTexture1")
+ textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
+ tex = self.sceneManager.getShadowTexture(1)
+ textureUnit.setTextureName(tex.getName())
+
+ DepthShadowTexture = baseWhite.clone("DepthShadowTexture2")
+ textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
+ tex = self.sceneManager.getShadowTexture(2)
+ textureUnit.setTextureName(tex.getName())
+
+ overlayManager = ogre.OverlayManager.getSingleton()
+ # Create an overlay
+ self.mDebugOverlay = overlayManager.create("OverlayName")
+
+ # Create a panel
+ panel = overlayManager.createOverlayElement("Panel", "PanelName0")
+ panel.setMetricsMode(ogre.GMM_PIXELS)
+ panel.setPosition(10, 10)
+ panel.setDimensions(100, 100)
+ panel.setMaterialName("DepthShadowTexture0") # Optional background material
+ self.mDebugOverlay.add2D(panel)
+ panel = overlayManager.createOverlayElement("Panel", "PanelName1")
+ panel.setMetricsMode(ogre.GMM_PIXELS)
+ panel.setPosition(120, 10)
+ panel.setDimensions(100, 100)
+ panel.setMaterialName("DepthShadowTexture1") # Optional background material
+ self.mDebugOverlay.add2D(panel)
+ panel = overlayManager.createOverlayElement("Panel", "PanelName2")
+ panel.setMetricsMode(ogre.GMM_PIXELS)
+ panel.setPosition(230, 10)
+ panel.setDimensions(100, 100)
+ panel.setMaterialName("DepthShadowTexture2") # Optional background material
+ self.mDebugOverlay.add2D(panel)
+ self.mDebugOverlay.show()
+
+ def _createFrameListener(self):
+ self.frameListener = PSSMDemoFrameListener(self.renderWindow, self.camera, self.mSunLight)
+ self.root.addFrameListener(self.frameListener)
+
+
+
+if __name__ == '__main__':
+ import exceptions,sys
+ try:
+ application = ApplicationPSSM()
+ application.go()
+ except ogre.OgreException, e:
+ print e
+
+
+
Added: trunk/python-ogre/demos/PSSM_demo/resources.cfg
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/resources.cfg (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/resources.cfg 2008-10-16 08:44:11 UTC (rev 759)
@@ -0,0 +1,5 @@
+[Bootstrap]
+Zip=../media/packs/OgreCore.zip
+
+[PSSMMedia]
+FileSystem=./Media
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-10-20 14:39:48
|
Revision: 763
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=763&view=rev
Author: andy_miller
Date: 2008-10-20 14:39:41 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
cleanup on Hikair demo and pssm
Modified Paths:
--------------
trunk/python-ogre/demos/hikari/Demo_Hikari_01.py
Added Paths:
-----------
trunk/python-ogre/demos/PSSM_demo/Demo_pssm.py
Removed Paths:
-------------
trunk/python-ogre/demos/PSSM_demo/pssm_demo.py
Copied: trunk/python-ogre/demos/PSSM_demo/Demo_pssm.py (from rev 759, trunk/python-ogre/demos/PSSM_demo/pssm_demo.py)
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/Demo_pssm.py (rev 0)
+++ trunk/python-ogre/demos/PSSM_demo/Demo_pssm.py 2008-10-20 14:39:41 UTC (rev 763)
@@ -0,0 +1,158 @@
+# 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.
+# -----------------------------------------------------------------------------
+
+# NOTE:
+# This demo includes meshes and shaders by lf3thn4d
+# see below for more details:
+# http://www.ogre3d.org/phpBB2/viewtopic.php?t=41801&highlight=pssm
+
+# Authors Note:
+# This demo seems to perform much better on ATI cards than NVIDIA!
+
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as OIS
+import SampleFramework as sf
+
+class PSSMDemoFrameListener(sf.FrameListener):
+ def __init__(self, rw, cam, light):
+ sf.FrameListener.__init__(self, rw, cam)
+ self.light = light
+ self.angle = ogre.Math.PI / 2
+ self.radius = 1000
+
+ def frameStarted(self, evt):
+ self.angle += evt.timeSinceLastFrame
+ xpos = self.radius * ogre.Math.Sin( ogre.Degree( self.angle ) * 5.0 )
+ zpos = self.radius * ogre.Math.Cos( ogre.Degree( self.angle ) * 5.0 )
+ pos = ogre.Vector3( xpos, 400, zpos )
+ self.light.setPosition( pos )
+ dirvec = -self.light.getPosition()
+ dirvec.normalise()
+ self.light.setDirection( dirvec )
+
+ return sf.FrameListener.frameStarted(self, evt)
+
+
+
+class ApplicationPSSM(sf.Application):
+
+ def __del__(self):
+ del self.pssmSetup
+
+ def _createScene(self):
+ self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE_INTEGRATED)
+
+ # 3 textures per directional light
+ self.sceneManager.setShadowTextureCountPerLightType(ogre.Light.LT_DIRECTIONAL, 3);
+ self.sceneManager.setShadowTextureSettings(1024, 3, ogre.PF_FLOAT32_R);
+ self.sceneManager.setShadowTextureSelfShadow(True);
+ # Set up caster material - this is just a standard depth/shadow map caster
+ self.sceneManager.setShadowTextureCasterMaterial("shadow_caster");
+ self.camera.setNearClipDistance(1.0)
+ self.camera.setFarClipDistance(1000.0)
+
+ # shadow camera setup
+ self.pssmSetup = ogre.PSSMShadowCameraSetup()
+ self.pssmSetup.calculateSplitPoints(3, self.camera.getNearClipDistance(), self.camera.getFarClipDistance())
+ self.pssmSetup.setSplitPadding(5)
+ self.pssmSetup.setOptimalAdjustFactor(0, 2)
+ self.pssmSetup.setOptimalAdjustFactor(1, 1);
+ self.pssmSetup.setOptimalAdjustFactor(2, 0.5)
+
+ self.sceneManager.setShadowCameraSetup(self.pssmSetup)
+
+
+ # setup the sun light.
+ self.sceneManager.setAmbientLight(ogre.ColourValue(0.4, 0.4, 0.5));
+ self.mSunLight = self.sceneManager.createLight("_SunLight")
+ self.mSunLight.setType(ogre.Light.LT_DIRECTIONAL)
+ self.mSunLight.setDirection(ogre.Vector3(-1, -1, -1))
+ self.mSunLight.setDiffuseColour(ogre.ColourValue(1, 1, 1))
+ self.mSunLight.setSpecularColour(ogre.ColourValue(1,1,1))
+
+ # Create the Mesh -
+ # Note Mesh and Shaders courtesy of lf3thn4d
+ cityNode = self.sceneManager.getRootSceneNode().createChildSceneNode()
+ cityEntity = self.sceneManager.createEntity("City", "city.mesh")
+ cityNode.attachObject(cityEntity)
+ cityNode.setScale(10,10,10)
+
+ splitPoints = ogre.Vector4(0,0,0,0)
+ splitPointList = self.pssmSetup.getSplitPoints();
+ mat = ogre.MaterialManager.getSingleton().getByName("city")
+ splitPoints.y = splitPointList[1]
+ splitPoints.z = splitPointList[2]
+ mat.getTechnique(0).getPass(1).getFragmentProgramParameters().setNamedConstant("pssmSplitPoints", splitPoints)
+ self._createDebugShadowOverlays()
+
+ def _createDebugShadowOverlays(self):
+ baseWhite = ogre.MaterialManager.getSingletonPtr().getByName("BaseWhite")
+ DepthShadowTexture = baseWhite.clone("DepthShadowTexture0")
+ textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
+ tex = self.sceneManager.getShadowTexture(0)
+ textureUnit.setTextureName(tex.getName())
+
+ DepthShadowTexture = baseWhite.clone("DepthShadowTexture1")
+ textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
+ tex = self.sceneManager.getShadowTexture(1)
+ textureUnit.setTextureName(tex.getName())
+
+ DepthShadowTexture = baseWhite.clone("DepthShadowTexture2")
+ textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
+ tex = self.sceneManager.getShadowTexture(2)
+ textureUnit.setTextureName(tex.getName())
+
+ overlayManager = ogre.OverlayManager.getSingleton()
+ # Create an overlay
+ self.mDebugOverlay = overlayManager.create("OverlayName")
+
+ # Create a panel
+ panel = overlayManager.createOverlayElement("Panel", "PanelName0")
+ panel.setMetricsMode(ogre.GMM_PIXELS)
+ panel.setPosition(10, 10)
+ panel.setDimensions(100, 100)
+ panel.setMaterialName("DepthShadowTexture0") # Optional background material
+ self.mDebugOverlay.add2D(panel)
+ panel = overlayManager.createOverlayElement("Panel", "PanelName1")
+ panel.setMetricsMode(ogre.GMM_PIXELS)
+ panel.setPosition(120, 10)
+ panel.setDimensions(100, 100)
+ panel.setMaterialName("DepthShadowTexture1") # Optional background material
+ self.mDebugOverlay.add2D(panel)
+ panel = overlayManager.createOverlayElement("Panel", "PanelName2")
+ panel.setMetricsMode(ogre.GMM_PIXELS)
+ panel.setPosition(230, 10)
+ panel.setDimensions(100, 100)
+ panel.setMaterialName("DepthShadowTexture2") # Optional background material
+ self.mDebugOverlay.add2D(panel)
+ self.mDebugOverlay.show()
+
+ def _createFrameListener(self):
+ self.frameListener = PSSMDemoFrameListener(self.renderWindow, self.camera, self.mSunLight)
+ self.root.addFrameListener(self.frameListener)
+
+
+
+if __name__ == '__main__':
+ import exceptions,sys
+ try:
+ application = ApplicationPSSM()
+ application.go()
+ except ogre.OgreException, e:
+ print e
+
+
+
Deleted: trunk/python-ogre/demos/PSSM_demo/pssm_demo.py
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/pssm_demo.py 2008-10-20 14:27:42 UTC (rev 762)
+++ trunk/python-ogre/demos/PSSM_demo/pssm_demo.py 2008-10-20 14:39:41 UTC (rev 763)
@@ -1,158 +0,0 @@
-# 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.
-# -----------------------------------------------------------------------------
-
-# NOTE:
-# This demo includes meshes and shaders by lf3thn4d
-# see below for more details:
-# http://www.ogre3d.org/phpBB2/viewtopic.php?t=41801&highlight=pssm
-
-# Authors Note:
-# This demo seems to perform much better on ATI cards than NVIDIA!
-
-import sys
-sys.path.insert(0,'..')
-import PythonOgreConfig
-
-import ogre.renderer.OGRE as ogre
-import ogre.io.OIS as OIS
-import SampleFramework as sf
-
-class PSSMDemoFrameListener(sf.FrameListener):
- def __init__(self, rw, cam, light):
- sf.FrameListener.__init__(self, rw, cam)
- self.light = light
- self.angle = ogre.Math.PI / 2
- self.radius = 1000
-
- def frameStarted(self, evt):
- self.angle += evt.timeSinceLastFrame
- xpos = self.radius * ogre.Math.Sin( ogre.Degree( self.angle ) * 5.0 )
- zpos = self.radius * ogre.Math.Cos( ogre.Degree( self.angle ) * 5.0 )
- pos = ogre.Vector3( xpos, 400, zpos )
- self.light.setPosition( pos )
- dirvec = -self.light.getPosition()
- dirvec.normalise()
- self.light.setDirection( dirvec )
-
- return sf.FrameListener.frameStarted(self, evt)
-
-
-
-class ApplicationPSSM(sf.Application):
-
- def __del__(self):
- del self.pssmSetup
-
- def _createScene(self):
- self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE_INTEGRATED)
-
- # 3 textures per directional light
- self.sceneManager.setShadowTextureCountPerLightType(ogre.Light.LT_DIRECTIONAL, 3);
- self.sceneManager.setShadowTextureSettings(1024, 3, ogre.PF_FLOAT32_R);
- self.sceneManager.setShadowTextureSelfShadow(True);
- # Set up caster material - this is just a standard depth/shadow map caster
- self.sceneManager.setShadowTextureCasterMaterial("shadow_caster");
- self.camera.setNearClipDistance(1.0)
- self.camera.setFarClipDistance(1000.0)
-
- # shadow camera setup
- self.pssmSetup = ogre.PSSMShadowCameraSetup()
- self.pssmSetup.calculateSplitPoints(3, self.camera.getNearClipDistance(), self.camera.getFarClipDistance())
- self.pssmSetup.setSplitPadding(5)
- self.pssmSetup.setOptimalAdjustFactor(0, 2)
- self.pssmSetup.setOptimalAdjustFactor(1, 1);
- self.pssmSetup.setOptimalAdjustFactor(2, 0.5)
-
- self.sceneManager.setShadowCameraSetup(self.pssmSetup)
-
-
- # setup the sun light.
- self.sceneManager.setAmbientLight(ogre.ColourValue(0.4, 0.4, 0.5));
- self.mSunLight = self.sceneManager.createLight("_SunLight")
- self.mSunLight.setType(ogre.Light.LT_DIRECTIONAL)
- self.mSunLight.setDirection(ogre.Vector3(-1, -1, -1))
- self.mSunLight.setDiffuseColour(ogre.ColourValue(1, 1, 1))
- self.mSunLight.setSpecularColour(ogre.ColourValue(1,1,1))
-
- # Create the Mesh -
- # Note Mesh and Shaders courtesy of lf3thn4d
- cityNode = self.sceneManager.getRootSceneNode().createChildSceneNode()
- cityEntity = self.sceneManager.createEntity("City", "city.mesh")
- cityNode.attachObject(cityEntity)
- cityNode.setScale(10,10,10)
-
- splitPoints = ogre.Vector4(0,0,0,0)
- splitPointList = self.pssmSetup.getSplitPoints();
- mat = ogre.MaterialManager.getSingleton().getByName("city")
- splitPoints.y = splitPointList[1]
- splitPoints.z = splitPointList[2]
- mat.getTechnique(0).getPass(1).getFragmentProgramParameters().setNamedConstant("pssmSplitPoints", splitPoints)
- self._createDebugShadowOverlays()
-
- def _createDebugShadowOverlays(self):
- baseWhite = ogre.MaterialManager.getSingletonPtr().getByName("BaseWhite")
- DepthShadowTexture = baseWhite.clone("DepthShadowTexture0")
- textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
- tex = self.sceneManager.getShadowTexture(0)
- textureUnit.setTextureName(tex.getName())
-
- DepthShadowTexture = baseWhite.clone("DepthShadowTexture1")
- textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
- tex = self.sceneManager.getShadowTexture(1)
- textureUnit.setTextureName(tex.getName())
-
- DepthShadowTexture = baseWhite.clone("DepthShadowTexture2")
- textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
- tex = self.sceneManager.getShadowTexture(2)
- textureUnit.setTextureName(tex.getName())
-
- overlayManager = ogre.OverlayManager.getSingleton()
- # Create an overlay
- self.mDebugOverlay = overlayManager.create("OverlayName")
-
- # Create a panel
- panel = overlayManager.createOverlayElement("Panel", "PanelName0")
- panel.setMetricsMode(ogre.GMM_PIXELS)
- panel.setPosition(10, 10)
- panel.setDimensions(100, 100)
- panel.setMaterialName("DepthShadowTexture0") # Optional background material
- self.mDebugOverlay.add2D(panel)
- panel = overlayManager.createOverlayElement("Panel", "PanelName1")
- panel.setMetricsMode(ogre.GMM_PIXELS)
- panel.setPosition(120, 10)
- panel.setDimensions(100, 100)
- panel.setMaterialName("DepthShadowTexture1") # Optional background material
- self.mDebugOverlay.add2D(panel)
- panel = overlayManager.createOverlayElement("Panel", "PanelName2")
- panel.setMetricsMode(ogre.GMM_PIXELS)
- panel.setPosition(230, 10)
- panel.setDimensions(100, 100)
- panel.setMaterialName("DepthShadowTexture2") # Optional background material
- self.mDebugOverlay.add2D(panel)
- self.mDebugOverlay.show()
-
- def _createFrameListener(self):
- self.frameListener = PSSMDemoFrameListener(self.renderWindow, self.camera, self.mSunLight)
- self.root.addFrameListener(self.frameListener)
-
-
-
-if __name__ == '__main__':
- import exceptions,sys
- try:
- application = ApplicationPSSM()
- application.go()
- except ogre.OgreException, e:
- print e
-
-
-
Modified: trunk/python-ogre/demos/hikari/Demo_Hikari_01.py
===================================================================
--- trunk/python-ogre/demos/hikari/Demo_Hikari_01.py 2008-10-20 14:27:42 UTC (rev 762)
+++ trunk/python-ogre/demos/hikari/Demo_Hikari_01.py 2008-10-20 14:39:41 UTC (rev 763)
@@ -27,9 +27,7 @@
sceneManager = self.sceneManager
camera = self.camera
- sceneManager.ambientLight = ogre.ColourValue(0.5, 0.5, 0.5)
-# sceneManager.ambientLight = ogre.ColourValue(ogre.ColourValue.White)
- print ogre.ColourValue.White
+ sceneManager.ambientLight = ogre.ColourValue().White
sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE)
self.setupHikari()
@@ -72,7 +70,8 @@
class HikariListener(sf.FrameListener, ois.MouseListener, ois.KeyListener):
def __init__(self, app):
- sf.FrameListener.__init__(self, app.renderWindow, app.camera, bufferedKeys = False)
+ print "INIT!!!"
+ sf.FrameListener.__init__(self, app.renderWindow, app.camera, bufferedMouse=True, bufferedKeys = True)
ois.KeyListener.__init__(self)
ois.MouseListener.__init__(self)
self.app = app
@@ -114,14 +113,14 @@
return [("x11_mouse_grab","false"), ("x11_mouse_hide", "false")] ## untested
- def frameStarted(self, frameEvent):
+ def frameRenderingQueued(self, frameEvent):
self.app.hikariMgr.update()
# root.renderOneFrame()
# Ogre::WindowEventUtilities::messagePump()
stats = self.renderWindow.getStatistics()
self.app.fps.callFunction("setFPS", hikari.Args(hikari.FlashValue(stats.lastFPS) ))
- return sf.FrameListener.frameStarted(self, frameEvent)
+ return sf.FrameListener.frameRenderingQueued(self, frameEvent)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-10-20 14:42:05
|
Revision: 764
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=764&view=rev
Author: andy_miller
Date: 2008-10-20 14:41:55 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
rename pssm demo directory
Added Paths:
-----------
trunk/python-ogre/demos/PSSM/
trunk/python-ogre/demos/PSSM/Demo_pssm.py
trunk/python-ogre/demos/PSSM/Media/
trunk/python-ogre/demos/PSSM/plugins.cfg
trunk/python-ogre/demos/PSSM/resources.cfg
Removed Paths:
-------------
trunk/python-ogre/demos/PSSM/Media/
trunk/python-ogre/demos/PSSM/plugins.cfg
trunk/python-ogre/demos/PSSM/pssm_demo.py
trunk/python-ogre/demos/PSSM/resources.cfg
trunk/python-ogre/demos/PSSM_demo/
Copied: trunk/python-ogre/demos/PSSM/Demo_pssm.py (from rev 763, trunk/python-ogre/demos/PSSM_demo/Demo_pssm.py)
===================================================================
--- trunk/python-ogre/demos/PSSM/Demo_pssm.py (rev 0)
+++ trunk/python-ogre/demos/PSSM/Demo_pssm.py 2008-10-20 14:41:55 UTC (rev 764)
@@ -0,0 +1,158 @@
+# 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.
+# -----------------------------------------------------------------------------
+
+# NOTE:
+# This demo includes meshes and shaders by lf3thn4d
+# see below for more details:
+# http://www.ogre3d.org/phpBB2/viewtopic.php?t=41801&highlight=pssm
+
+# Authors Note:
+# This demo seems to perform much better on ATI cards than NVIDIA!
+
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as OIS
+import SampleFramework as sf
+
+class PSSMDemoFrameListener(sf.FrameListener):
+ def __init__(self, rw, cam, light):
+ sf.FrameListener.__init__(self, rw, cam)
+ self.light = light
+ self.angle = ogre.Math.PI / 2
+ self.radius = 1000
+
+ def frameStarted(self, evt):
+ self.angle += evt.timeSinceLastFrame
+ xpos = self.radius * ogre.Math.Sin( ogre.Degree( self.angle ) * 5.0 )
+ zpos = self.radius * ogre.Math.Cos( ogre.Degree( self.angle ) * 5.0 )
+ pos = ogre.Vector3( xpos, 400, zpos )
+ self.light.setPosition( pos )
+ dirvec = -self.light.getPosition()
+ dirvec.normalise()
+ self.light.setDirection( dirvec )
+
+ return sf.FrameListener.frameStarted(self, evt)
+
+
+
+class ApplicationPSSM(sf.Application):
+
+ def __del__(self):
+ del self.pssmSetup
+
+ def _createScene(self):
+ self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE_INTEGRATED)
+
+ # 3 textures per directional light
+ self.sceneManager.setShadowTextureCountPerLightType(ogre.Light.LT_DIRECTIONAL, 3);
+ self.sceneManager.setShadowTextureSettings(1024, 3, ogre.PF_FLOAT32_R);
+ self.sceneManager.setShadowTextureSelfShadow(True);
+ # Set up caster material - this is just a standard depth/shadow map caster
+ self.sceneManager.setShadowTextureCasterMaterial("shadow_caster");
+ self.camera.setNearClipDistance(1.0)
+ self.camera.setFarClipDistance(1000.0)
+
+ # shadow camera setup
+ self.pssmSetup = ogre.PSSMShadowCameraSetup()
+ self.pssmSetup.calculateSplitPoints(3, self.camera.getNearClipDistance(), self.camera.getFarClipDistance())
+ self.pssmSetup.setSplitPadding(5)
+ self.pssmSetup.setOptimalAdjustFactor(0, 2)
+ self.pssmSetup.setOptimalAdjustFactor(1, 1);
+ self.pssmSetup.setOptimalAdjustFactor(2, 0.5)
+
+ self.sceneManager.setShadowCameraSetup(self.pssmSetup)
+
+
+ # setup the sun light.
+ self.sceneManager.setAmbientLight(ogre.ColourValue(0.4, 0.4, 0.5));
+ self.mSunLight = self.sceneManager.createLight("_SunLight")
+ self.mSunLight.setType(ogre.Light.LT_DIRECTIONAL)
+ self.mSunLight.setDirection(ogre.Vector3(-1, -1, -1))
+ self.mSunLight.setDiffuseColour(ogre.ColourValue(1, 1, 1))
+ self.mSunLight.setSpecularColour(ogre.ColourValue(1,1,1))
+
+ # Create the Mesh -
+ # Note Mesh and Shaders courtesy of lf3thn4d
+ cityNode = self.sceneManager.getRootSceneNode().createChildSceneNode()
+ cityEntity = self.sceneManager.createEntity("City", "city.mesh")
+ cityNode.attachObject(cityEntity)
+ cityNode.setScale(10,10,10)
+
+ splitPoints = ogre.Vector4(0,0,0,0)
+ splitPointList = self.pssmSetup.getSplitPoints();
+ mat = ogre.MaterialManager.getSingleton().getByName("city")
+ splitPoints.y = splitPointList[1]
+ splitPoints.z = splitPointList[2]
+ mat.getTechnique(0).getPass(1).getFragmentProgramParameters().setNamedConstant("pssmSplitPoints", splitPoints)
+ self._createDebugShadowOverlays()
+
+ def _createDebugShadowOverlays(self):
+ baseWhite = ogre.MaterialManager.getSingletonPtr().getByName("BaseWhite")
+ DepthShadowTexture = baseWhite.clone("DepthShadowTexture0")
+ textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
+ tex = self.sceneManager.getShadowTexture(0)
+ textureUnit.setTextureName(tex.getName())
+
+ DepthShadowTexture = baseWhite.clone("DepthShadowTexture1")
+ textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
+ tex = self.sceneManager.getShadowTexture(1)
+ textureUnit.setTextureName(tex.getName())
+
+ DepthShadowTexture = baseWhite.clone("DepthShadowTexture2")
+ textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
+ tex = self.sceneManager.getShadowTexture(2)
+ textureUnit.setTextureName(tex.getName())
+
+ overlayManager = ogre.OverlayManager.getSingleton()
+ # Create an overlay
+ self.mDebugOverlay = overlayManager.create("OverlayName")
+
+ # Create a panel
+ panel = overlayManager.createOverlayElement("Panel", "PanelName0")
+ panel.setMetricsMode(ogre.GMM_PIXELS)
+ panel.setPosition(10, 10)
+ panel.setDimensions(100, 100)
+ panel.setMaterialName("DepthShadowTexture0") # Optional background material
+ self.mDebugOverlay.add2D(panel)
+ panel = overlayManager.createOverlayElement("Panel", "PanelName1")
+ panel.setMetricsMode(ogre.GMM_PIXELS)
+ panel.setPosition(120, 10)
+ panel.setDimensions(100, 100)
+ panel.setMaterialName("DepthShadowTexture1") # Optional background material
+ self.mDebugOverlay.add2D(panel)
+ panel = overlayManager.createOverlayElement("Panel", "PanelName2")
+ panel.setMetricsMode(ogre.GMM_PIXELS)
+ panel.setPosition(230, 10)
+ panel.setDimensions(100, 100)
+ panel.setMaterialName("DepthShadowTexture2") # Optional background material
+ self.mDebugOverlay.add2D(panel)
+ self.mDebugOverlay.show()
+
+ def _createFrameListener(self):
+ self.frameListener = PSSMDemoFrameListener(self.renderWindow, self.camera, self.mSunLight)
+ self.root.addFrameListener(self.frameListener)
+
+
+
+if __name__ == '__main__':
+ import exceptions,sys
+ try:
+ application = ApplicationPSSM()
+ application.go()
+ except ogre.OgreException, e:
+ print e
+
+
+
Deleted: trunk/python-ogre/demos/PSSM/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/plugins.cfg 2008-10-16 08:44:11 UTC (rev 759)
+++ trunk/python-ogre/demos/PSSM/plugins.cfg 2008-10-20 14:41:55 UTC (rev 764)
@@ -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
Copied: trunk/python-ogre/demos/PSSM/plugins.cfg (from rev 763, trunk/python-ogre/demos/PSSM_demo/plugins.cfg)
===================================================================
--- trunk/python-ogre/demos/PSSM/plugins.cfg (rev 0)
+++ trunk/python-ogre/demos/PSSM/plugins.cfg 2008-10-20 14:41:55 UTC (rev 764)
@@ -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
Deleted: trunk/python-ogre/demos/PSSM/pssm_demo.py
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/pssm_demo.py 2008-10-16 08:44:11 UTC (rev 759)
+++ trunk/python-ogre/demos/PSSM/pssm_demo.py 2008-10-20 14:41:55 UTC (rev 764)
@@ -1,158 +0,0 @@
-# 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.
-# -----------------------------------------------------------------------------
-
-# NOTE:
-# This demo includes meshes and shaders by lf3thn4d
-# see below for more details:
-# http://www.ogre3d.org/phpBB2/viewtopic.php?t=41801&highlight=pssm
-
-# Authors Note:
-# This demo seems to perform much better on ATI cards than NVIDIA!
-
-import sys
-sys.path.insert(0,'..')
-import PythonOgreConfig
-
-import ogre.renderer.OGRE as ogre
-import ogre.io.OIS as OIS
-import SampleFramework as sf
-
-class PSSMDemoFrameListener(sf.FrameListener):
- def __init__(self, rw, cam, light):
- sf.FrameListener.__init__(self, rw, cam)
- self.light = light
- self.angle = ogre.Math.PI / 2
- self.radius = 1000
-
- def frameStarted(self, evt):
- self.angle += evt.timeSinceLastFrame
- xpos = self.radius * ogre.Math.Sin( ogre.Degree( self.angle ) * 5.0 )
- zpos = self.radius * ogre.Math.Cos( ogre.Degree( self.angle ) * 5.0 )
- pos = ogre.Vector3( xpos, 400, zpos )
- self.light.setPosition( pos )
- dirvec = -self.light.getPosition()
- dirvec.normalise()
- self.light.setDirection( dirvec )
-
- return sf.FrameListener.frameStarted(self, evt)
-
-
-
-class ApplicationPSSM(sf.Application):
-
- def __del__(self):
- del self.pssmSetup
-
- def _createScene(self):
- self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_TEXTURE_ADDITIVE_INTEGRATED)
-
- # 3 textures per directional light
- self.sceneManager.setShadowTextureCountPerLightType(ogre.Light.LT_DIRECTIONAL, 3);
- self.sceneManager.setShadowTextureSettings(1024, 3, ogre.PF_FLOAT32_R);
- self.sceneManager.setShadowTextureSelfShadow(True);
- # Set up caster material - this is just a standard depth/shadow map caster
- self.sceneManager.setShadowTextureCasterMaterial("shadow_caster");
- self.camera.setNearClipDistance(1.0)
- self.camera.setFarClipDistance(1000.0)
-
- # shadow camera setup
- self.pssmSetup = ogre.PSSMShadowCameraSetup()
- self.pssmSetup.calculateSplitPoints(3, self.camera.getNearClipDistance(), self.camera.getFarClipDistance())
- self.pssmSetup.setSplitPadding(5)
- self.pssmSetup.setOptimalAdjustFactor(0, 2)
- self.pssmSetup.setOptimalAdjustFactor(1, 1);
- self.pssmSetup.setOptimalAdjustFactor(2, 0.5)
-
- self.sceneManager.setShadowCameraSetup(self.pssmSetup)
-
-
- # setup the sun light.
- self.sceneManager.setAmbientLight(ogre.ColourValue(0.4, 0.4, 0.5));
- self.mSunLight = self.sceneManager.createLight("_SunLight")
- self.mSunLight.setType(ogre.Light.LT_DIRECTIONAL)
- self.mSunLight.setDirection(ogre.Vector3(-1, -1, -1))
- self.mSunLight.setDiffuseColour(ogre.ColourValue(1, 1, 1))
- self.mSunLight.setSpecularColour(ogre.ColourValue(1,1,1))
-
- # Create the Mesh -
- # Note Mesh and Shaders courtesy of lf3thn4d
- cityNode = self.sceneManager.getRootSceneNode().createChildSceneNode()
- cityEntity = self.sceneManager.createEntity("City", "city.mesh")
- cityNode.attachObject(cityEntity)
- cityNode.setScale(10,10,10)
-
- splitPoints = ogre.Vector4(0,0,0,0)
- splitPointList = self.pssmSetup.getSplitPoints();
- mat = ogre.MaterialManager.getSingleton().getByName("city")
- splitPoints.y = splitPointList[1]
- splitPoints.z = splitPointList[2]
- mat.getTechnique(0).getPass(1).getFragmentProgramParameters().setNamedConstant("pssmSplitPoints", splitPoints)
- self._createDebugShadowOverlays()
-
- def _createDebugShadowOverlays(self):
- baseWhite = ogre.MaterialManager.getSingletonPtr().getByName("BaseWhite")
- DepthShadowTexture = baseWhite.clone("DepthShadowTexture0")
- textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
- tex = self.sceneManager.getShadowTexture(0)
- textureUnit.setTextureName(tex.getName())
-
- DepthShadowTexture = baseWhite.clone("DepthShadowTexture1")
- textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
- tex = self.sceneManager.getShadowTexture(1)
- textureUnit.setTextureName(tex.getName())
-
- DepthShadowTexture = baseWhite.clone("DepthShadowTexture2")
- textureUnit = DepthShadowTexture.getTechnique(0).getPass(0).createTextureUnitState()
- tex = self.sceneManager.getShadowTexture(2)
- textureUnit.setTextureName(tex.getName())
-
- overlayManager = ogre.OverlayManager.getSingleton()
- # Create an overlay
- self.mDebugOverlay = overlayManager.create("OverlayName")
-
- # Create a panel
- panel = overlayManager.createOverlayElement("Panel", "PanelName0")
- panel.setMetricsMode(ogre.GMM_PIXELS)
- panel.setPosition(10, 10)
- panel.setDimensions(100, 100)
- panel.setMaterialName("DepthShadowTexture0") # Optional background material
- self.mDebugOverlay.add2D(panel)
- panel = overlayManager.createOverlayElement("Panel", "PanelName1")
- panel.setMetricsMode(ogre.GMM_PIXELS)
- panel.setPosition(120, 10)
- panel.setDimensions(100, 100)
- panel.setMaterialName("DepthShadowTexture1") # Optional background material
- self.mDebugOverlay.add2D(panel)
- panel = overlayManager.createOverlayElement("Panel", "PanelName2")
- panel.setMetricsMode(ogre.GMM_PIXELS)
- panel.setPosition(230, 10)
- panel.setDimensions(100, 100)
- panel.setMaterialName("DepthShadowTexture2") # Optional background material
- self.mDebugOverlay.add2D(panel)
- self.mDebugOverlay.show()
-
- def _createFrameListener(self):
- self.frameListener = PSSMDemoFrameListener(self.renderWindow, self.camera, self.mSunLight)
- self.root.addFrameListener(self.frameListener)
-
-
-
-if __name__ == '__main__':
- import exceptions,sys
- try:
- application = ApplicationPSSM()
- application.go()
- except ogre.OgreException, e:
- print e
-
-
-
Deleted: trunk/python-ogre/demos/PSSM/resources.cfg
===================================================================
--- trunk/python-ogre/demos/PSSM_demo/resources.cfg 2008-10-16 08:44:11 UTC (rev 759)
+++ trunk/python-ogre/demos/PSSM/resources.cfg 2008-10-20 14:41:55 UTC (rev 764)
@@ -1,5 +0,0 @@
-[Bootstrap]
-Zip=../media/packs/OgreCore.zip
-
-[PSSMMedia]
-FileSystem=./Media
Copied: trunk/python-ogre/demos/PSSM/resources.cfg (from rev 763, trunk/python-ogre/demos/PSSM_demo/resources.cfg)
===================================================================
--- trunk/python-ogre/demos/PSSM/resources.cfg (rev 0)
+++ trunk/python-ogre/demos/PSSM/resources.cfg 2008-10-20 14:41:55 UTC (rev 764)
@@ -0,0 +1,5 @@
+[Bootstrap]
+Zip=../media/packs/OgreCore.zip
+
+[PSSMMedia]
+FileSystem=./Media
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-10-20 15:13:32
|
Revision: 767
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=767&view=rev
Author: andy_miller
Date: 2008-10-20 15:13:26 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
Couple more tweaks to the demos
Modified Paths:
--------------
trunk/python-ogre/demos/ogrebullet/Demo_OgreCollision01.py
trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py
Modified: trunk/python-ogre/demos/ogrebullet/Demo_OgreCollision01.py
===================================================================
--- trunk/python-ogre/demos/ogrebullet/Demo_OgreCollision01.py 2008-10-20 15:08:45 UTC (rev 766)
+++ trunk/python-ogre/demos/ogrebullet/Demo_OgreCollision01.py 2008-10-20 15:13:26 UTC (rev 767)
@@ -44,11 +44,11 @@
# create the floor
plane = ogre.Plane()
- plane.normal = ogre.Vector3.UNIT_Y
+ plane.normal = ogre.Vector3().UNIT_Y
plane.d = 200
mm = ogre.MeshManager.getSingleton()
mm.createPlane('FloorPlane', 'General', plane, 200000.0, 200000.0,
- 20, 20, True, 1, 50, 50, ogre.Vector3.UNIT_Z)
+ 20, 20, True, 1, 50, 50, ogre.Vector3().UNIT_Z)
entity = sceneManager.createEntity('floor', 'FloorPlane')
entity.setMaterialName('Examples/RustySteel')
sceneManager.getRootSceneNode().createChildSceneNode().attachObject(entity)
Modified: trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py
===================================================================
--- trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py 2008-10-20 15:08:45 UTC (rev 766)
+++ trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py 2008-10-20 15:13:26 UTC (rev 767)
@@ -73,7 +73,7 @@
# (takes furthest hit)
updateRay = ogre.Ray()
updateRay.setOrigin(self.camera.getParentSceneNode().getPosition())
- updateRay.setDirection(self.camera.getParentSceneNode().getOrientation()*ogre.Vector3.NEGATIVE_UNIT_Z)
+ updateRay.setDirection(self.camera.getParentSceneNode().getOrientation()*ogre.Vector3().NEGATIVE_UNIT_Z)
self.raySceneQuery.setRay(updateRay)
zone = self.camera.getParentNode().getHomeZone()
self.raySceneQuery.setStartZone(zone)
@@ -143,7 +143,7 @@
corners[1] = aabb.getMaximum()
p.setCorner(0, corners[0])
p.setCorner(1, corners[1])
- p.setDirection(ogre.Vector3.NEGATIVE_UNIT_Z) # this indicates an "inward" pointing normal
+ p.setDirection(ogre.Vector3().NEGATIVE_UNIT_Z) # this indicates an "inward" pointing normal
# associate the portal with the terrain's main node
p.setNode(terrainZone.getEnclosureNode())
# IMPORTANT: Update the derived values of the portal
@@ -158,7 +158,7 @@
corners[1] = aabb.getMaximum()
p2.setCorner(0, corners[0])
p2.setCorner(1, corners[1])
- p2.setDirection(ogre.Vector3.UNIT_Z) # this indicates an "outward" pointing normal
+ p2.setDirection(ogre.Vector3().UNIT_Z) # this indicates an "outward" pointing normal
# associate the portal with the terrain's main node
p2.setNode(terrainZone.getEnclosureNode())
# IMPORTANT: Update the derived values of the portal
@@ -272,14 +272,14 @@
self.buildingNode = roomObj.createTestBuilding(self.sceneManager, "1")
self.buildingNode.setPosition(500, 165, 570)
#ogre.Radian r = Radian(3.1416/7.0)
- #self.buildingNode.rotate(ogre.Vector3.UNIT_Y, r)
+ #self.buildingNode.rotate(ogre.Vector3().UNIT_Y, r)
#
# # create another test buildinig
# roomObj2 = RoomObject.RoomObject()
# self.buildingNode = roomObj2.createTestBuilding(self.sceneManager, "2")
# self.buildingNode.setPosition(400, 165, 570)
# #ogre.Radian r = Radian(3.1416/7.0)
-# #self.buildingNode.rotate(ogre.Vector3.UNIT_Y, r)
+# #self.buildingNode.rotate(ogre.Vector3().UNIT_Y, r)
#
# Position camera in the center of the building
self.cameraNode.setPosition(self.buildingNode.getPosition())
@@ -290,7 +290,7 @@
# create the ray scene query
self.raySceneQuery = self.sceneManager.createRayQuery(
- ogre.Ray(self.camera.getParentNode().getPosition(), ogre.Vector3.NEGATIVE_UNIT_Z))
+ ogre.Ray(self.camera.getParentNode().getPosition(), ogre.Vector3().NEGATIVE_UNIT_Z))
self.raySceneQuery.setSortByDistance(True, 5)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-10-28 14:16:24
|
Revision: 780
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=780&view=rev
Author: andy_miller
Date: 2008-10-28 14:16:13 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Added updated Caelum media
Modified Paths:
--------------
trunk/python-ogre/demos/caelum/plugins.cfg
trunk/python-ogre/demos/hydrax/Demo_Hydrax01.py
Added Paths:
-----------
trunk/python-ogre/demos/caelum/media/AtmosphereDepth.png
trunk/python-ogre/demos/caelum/media/CaelumDemoTerrain.cfg
trunk/python-ogre/demos/caelum/media/CaelumGroundFog.cg
trunk/python-ogre/demos/caelum/media/CaelumLab.layout
trunk/python-ogre/demos/caelum/media/CaelumLayeredClouds.cg
trunk/python-ogre/demos/caelum/media/CaelumPhaseMoon.cg
trunk/python-ogre/demos/caelum/media/CaelumPointStarfield.cg
trunk/python-ogre/demos/caelum/media/CaelumSample.cg
trunk/python-ogre/demos/caelum/media/CaelumSample.material
trunk/python-ogre/demos/caelum/media/CaelumSkyDome.cg
trunk/python-ogre/demos/caelum/media/CloudCoverLookup.png
trunk/python-ogre/demos/caelum/media/DepthComposer.cg
trunk/python-ogre/demos/caelum/media/DepthComposer.compositor
trunk/python-ogre/demos/caelum/media/DepthComposer.material
trunk/python-ogre/demos/caelum/media/EarthClearSky2.png
trunk/python-ogre/demos/caelum/media/GroundFog.material
trunk/python-ogre/demos/caelum/media/GroundFog.program
trunk/python-ogre/demos/caelum/media/Haze.program
trunk/python-ogre/demos/caelum/media/LayeredClouds.material
trunk/python-ogre/demos/caelum/media/MinimalCompositorVP.cg
trunk/python-ogre/demos/caelum/media/MinimalCompositorVP.program
trunk/python-ogre/demos/caelum/media/PointStarfield.material
trunk/python-ogre/demos/caelum/media/Precipitation.cg
trunk/python-ogre/demos/caelum/media/Precipitation.compositor
trunk/python-ogre/demos/caelum/media/Precipitation.material
trunk/python-ogre/demos/caelum/media/SkyDome.material
trunk/python-ogre/demos/caelum/media/Starfield.jpg
trunk/python-ogre/demos/caelum/media/Starfield.material
trunk/python-ogre/demos/caelum/media/Sun.material
trunk/python-ogre/demos/caelum/media/SunGradient.png
trunk/python-ogre/demos/caelum/media/TudorHouse.jpg
trunk/python-ogre/demos/caelum/media/TudorHouse.mesh
trunk/python-ogre/demos/caelum/media/gui/
trunk/python-ogre/demos/caelum/media/gui/TaharezLook.imageset
trunk/python-ogre/demos/caelum/media/gui/TaharezLook.looknfeel
trunk/python-ogre/demos/caelum/media/gui/TaharezLook.tga
trunk/python-ogre/demos/caelum/media/gui/TaharezLookSkin.scheme
trunk/python-ogre/demos/caelum/media/gui/TaharezLookWidgetAliases.scheme
trunk/python-ogre/demos/caelum/media/gui/bluehighway-10.font
trunk/python-ogre/demos/caelum/media/gui/bluehighway-12.font
trunk/python-ogre/demos/caelum/media/gui/bluehighway-8.font
trunk/python-ogre/demos/caelum/media/moon.material
trunk/python-ogre/demos/caelum/media/moon_disc.dds
trunk/python-ogre/demos/caelum/media/noise1.dds
trunk/python-ogre/demos/caelum/media/noise2.dds
trunk/python-ogre/demos/caelum/media/noise3.dds
trunk/python-ogre/demos/caelum/media/noise4.dds
trunk/python-ogre/demos/caelum/media/precipitation_drizzle.png
trunk/python-ogre/demos/caelum/media/precipitation_hail.png
trunk/python-ogre/demos/caelum/media/precipitation_icecrystals.png
trunk/python-ogre/demos/caelum/media/precipitation_icepellets.png
trunk/python-ogre/demos/caelum/media/precipitation_rain.png
trunk/python-ogre/demos/caelum/media/precipitation_smallhail.png
trunk/python-ogre/demos/caelum/media/precipitation_snow.png
trunk/python-ogre/demos/caelum/media/precipitation_snowgrains.png
trunk/python-ogre/demos/caelum/media/sphere.mesh
trunk/python-ogre/demos/caelum/media/sun_disc.png
trunk/python-ogre/demos/caelum/media/terrain.png
trunk/python-ogre/demos/caelum/media/terrain_detail.jpg
trunk/python-ogre/demos/caelum/media/terrain_dirt-grass.jpg
trunk/python-ogre/demos/caelum/media/terrain_texture.jpg
Added: trunk/python-ogre/demos/caelum/media/AtmosphereDepth.png
===================================================================
(Binary files differ)
Property changes on: trunk/python-ogre/demos/caelum/media/AtmosphereDepth.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/python-ogre/demos/caelum/media/CaelumDemoTerrain.cfg
===================================================================
--- trunk/python-ogre/demos/caelum/media/CaelumDemoTerrain.cfg (rev 0)
+++ trunk/python-ogre/demos/caelum/media/CaelumDemoTerrain.cfg 2008-10-28 14:16:13 UTC (rev 780)
@@ -0,0 +1,36 @@
+# Heightmap source
+PageSource=Heightmap
+
+# Heightmap-source specific settings
+Heightmap.image=terrain.png
+
+# 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=1
+
+# 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
+
+# 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
+
+# Use vertex program to morph LODs, if available
+VertexProgramMorph=no
+
+# Custom material. Does use vertex normals.
+CustomMaterialName=CaelumSample/Terrain
+VertexNormals=yes
Added: trunk/python-ogre/demos/caelum/media/CaelumGroundFog.cg
===================================================================
--- trunk/python-ogre/demos/caelum/media/CaelumGroundFog.cg (rev 0)
+++ trunk/python-ogre/demos/caelum/media/CaelumGroundFog.cg 2008-10-28 14:16:13 UTC (rev 780)
@@ -0,0 +1,121 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2007 Caelum team. See Contributors.txt for details.
+
+Caelum is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Caelum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Caelum. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// Return fogging through a layer of fog which drops exponentially by height.
+// Foginess at a certain point is exp(-verticalDecay * (h - fogLevel));
+// A fogLevel from the ground fogginess is 1.
+float ExpGroundFog (float invSinView, float h1, float h2,
+ float density, float verticalDecay, float fogLevel)
+{
+ // Integrate fog on a vertical line from h1 to h2.
+ float vFog = (-1 / verticalDecay) *
+ (exp (-verticalDecay * (h2 - fogLevel)) -
+ exp (-verticalDecay * (h1 - fogLevel)));
+ return 1 - exp (-density * invSinView * vFog);
+}
+
+// Just like ExpGroundFog with infinite h2
+float ExpGroundFogInf (float invSinView, float h1,
+ float density, float verticalDecay, float fogLevel)
+{
+ // Integrate fog on a vertical line from h1 to h2.
+ float vFog = exp (-verticalDecay * (h1 - fogLevel)) / verticalDecay;
+ return 1 - exp (-density * invSinView * vFog);
+}
+
+// Entry point for GroundFog vertex program.
+void GroundFog_vp
+(
+ float4 position : POSITION,
+
+ out float4 oPosition : POSITION,
+ out float4 worldPos : TEXCOORD0,
+
+ uniform float4x4 worldViewProj,
+ uniform float4x4 world
+) {
+ oPosition = mul(worldViewProj, position);
+ worldPos = mul(world, position);
+}
+
+// Entry point for GroundFog fragment program.
+void GroundFog_fp
+(
+ float3 worldPos : TEXCOORD0,
+
+ uniform float3 camPos,
+ uniform float4 fogColour,
+ uniform float fogDensity,
+ uniform float fogVerticalDecay,
+ uniform float fogGroundLevel,
+
+ out float4 oCol : COLOR
+) {
+ float h1 = camPos.y;
+ float h2 = worldPos.y;
+ float invSinView = length(camPos - worldPos) / (h2 - h1);
+ float fog = ExpGroundFog(invSinView,
+ h1, h2, fogDensity, fogVerticalDecay, fogGroundLevel);
+
+ oCol.rgb = fogColour.rgb;
+ oCol.a = fog;
+}
+
+// Entry point for GroundFogDome vertex program.
+void GroundFogDome_vp
+(
+ in float4 position : POSITION,
+ out float4 oPosition : POSITION,
+ out float3 relPosition : TEXCOORD0,
+ uniform float4x4 worldViewProj
+) {
+ oPosition = mul(worldViewProj, position);
+ relPosition = normalize(position);
+}
+
+// Entry point for the GroundFogDome fragment program.
+void GroundFogDome_fp
+(
+ in float3 relPosition : TEXCOORD0,
+
+ uniform float cameraHeight,
+ uniform float4 fogColour,
+ uniform float fogDensity,
+ uniform float fogVerticalDecay,
+ uniform float fogGroundLevel,
+
+ out float4 oCol : COLOR
+) {
+ // Fog magic.
+ float invSinView = 1 / (relPosition.y);
+ float h1 = cameraHeight;
+ float aFog;
+
+ if (invSinView < 0) {
+ // Gazing into the abyss
+ aFog = 1;
+ } else {
+ aFog = saturate (ExpGroundFogInf (
+ invSinView, h1, fogDensity, fogVerticalDecay, fogGroundLevel));
+ }
+
+ oCol.a = aFog;
+ oCol.rgb = fogColour.rgb;
+}
\ No newline at end of file
Added: trunk/python-ogre/demos/caelum/media/CaelumLab.layout
===================================================================
--- trunk/python-ogre/demos/caelum/media/CaelumLab.layout (rev 0)
+++ trunk/python-ogre/demos/caelum/media/CaelumLab.layout 2008-10-28 14:16:13 UTC (rev 780)
@@ -0,0 +1,895 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="DefaultWindow" Name="CaelumLab" >
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+ <Window Type="TaharezLook/FrameWindow" Name="CaelumLab/Main" >
+ <Property Name="Font" Value="BlueHighway-10" />
+ <Property Name="Alpha" Value="0.5" />
+ <Property Name="TitlebarEnabled" Value="True" />
+ <Property Name="TitlebarFont" Value="BlueHighway-10" />
+ <Property Name="Text" Value="Double click to show/hide" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="SizingEnabled" Value="True" />
+ <Property Name="RollUpEnabled" Value="True" />
+ <Property Name="UnifiedAreaRect" Value="{{1,-400},{0,0},{1,0},{1,-110}}" />
+ <Property Name="UnifiedMinSize" Value="{{0,300},{0,300}}" />
+ <Property Name="CloseButtonEnabled" Value="False" />
+
+ <Window Type="TaharezLook/ScrollablePane" Name="CaelumLab/ScrollablePane">
+ <Property Name="UnifiedAreaRect" Value="{{0,15},{0,35},{1,-15},{1,-10}}" />
+ <Property Name="ContentPaneAutoSized" Value="True" />
+ <Property Name="ForceVertScrollBar" Value="True" />
+
+ <Window Type="TaharezLook/StaticImage" Name="CaelumLab/SceneSetup/GroupBox">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,35}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0,95}}" />
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/SceneSetup/Label" >
+ <Property Name="Text" Value="Scene setup:" />
+ <Property Name="TextColours" Value="FFFFFF77" />
+ <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,0},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundColours" Value="tl:FFFFFFFF tr:00000000 bl:FFFFFFFF br:00FFFFFF" />
+ <Property Name="FrameColours" Value="tl:FFFFFFFF tr:00FFFFFF bl:FFFFFFFF br:00FFFFFF" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/MaterialSchemeLabel" >
+ <Property Name="Text" Value="Material scheme:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ </Window>
+ <Window Type="TaharezLook/Combobox" Name="CaelumLab/MaterialSchemeCombo" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,35}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-130},{0,90}}" />
+ <Property Name="ClippedByParent" Value="false" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="ReadOnly" Value="True" />
+ </Window>
+
+ <Window Type="TaharezLook/Checkbox" Name="CaelumLab/ForceTerrainShadowsCheckbox" >
+ <Property Name="Text" Value="Force TerrainSceneManager shadows" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ </Window>
+
+
+ <Window Type="TaharezLook/StaticImage" Name="CaelumLab/TimeGroupBox">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,135}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0,125}}" />
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/TimeLabel" >
+ <Property Name="Text" Value="Time:" />
+ <Property Name="TextColours" Value="FFFFFF77" />
+ <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,0},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundColours" Value="tl:FFFFFFFF tr:00000000 bl:FFFFFFFF br:00FFFFFF" />
+ <Property Name="FrameColours" Value="tl:FFFFFFFF tr:00FFFFFF bl:FFFFFFFF br:00FFFFFF" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/UtcTimeLabel" >
+ <Property Name="Text" Value="UTC Time:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/UtcTimeEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="ReadOnly" Value="True" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-130},{0,25}}" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/JulianDayLabel" >
+ <Property Name="Text" Value="Julian Day:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/JulianDayEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-130},{0,25}}" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/TimeScaleLabel" >
+ <Property Name="Text" Value="Time multiplier:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/TimeScaleEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/TimeScaleScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,95}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ </Window>
+
+ <Window Type="TaharezLook/StaticImage" Name="CaelumLab/CameraGroup">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,265}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0,215}}" />
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CameraLabel" >
+ <Property Name="Text" Value="Camera:" />
+ <Property Name="TextColours" Value="FFFFFF77" />
+ <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,0},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundColours" Value="tl:FFFFFFFF tr:00000000 bl:FFFFFFFF br:00FFFFFF" />
+ <Property Name="FrameColours" Value="tl:FFFFFFFF tr:00FFFFFF bl:FFFFFFFF br:00FFFFFF" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CameraPositionLabel" >
+ <Property Name="Text" Value="Camera position:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CameraPositionEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="ReadOnly" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-130},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CameraDirectionLabel" >
+ <Property Name="Text" Value="Camera direction:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CameraDirectionEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="ReadOnly" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-130},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CameraSpeedLabel" >
+ <Property Name="Text" Value="Move speed:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CameraSpeedEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/CameraSpeedScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,95}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CameraFovLabel" >
+ <Property Name="Text" Value="Field of view:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,120}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CameraFovEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0, 120}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/CameraFovScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,125}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CameraNearClipLabel" >
+ <Property Name="Text" Value="Near clip distance:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,150}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CameraNearClipEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,150}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/CameraNearClipScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,155}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CameraFarClipLabel" >
+ <Property Name="Text" Value="Far clip distance:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,180}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CameraFarClipEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,180}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/CameraFarClipScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,185}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ </Window>
+
+ <Window Type="TaharezLook/StaticImage" Name="CaelumLab/SunMoonGroup">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,485}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0,155}}" />
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/SunMoonLabel" >
+ <Property Name="Text" Value="Sun and moon:" />
+ <Property Name="TextColours" Value="FFFFFF77" />
+ <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,0},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundColours" Value="tl:FFFFFFFF tr:00000000 bl:FFFFFFFF br:00FFFFFF" />
+ <Property Name="FrameColours" Value="tl:FFFFFFFF tr:00FFFFFF bl:FFFFFFFF br:00FFFFFF" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/SunDirectionLabel" >
+ <Property Name="Text" Value="Sun direction:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/SunDirectionEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="ReadOnly" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-165},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/Button" Name="CaelumLab/SunDirectionFocusButton" >
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{1.0,-35},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0,25},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/MoonDirectionLabel" >
+ <Property Name="Text" Value="Moon direction:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/MoonDirectionEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="ReadOnly" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-165},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/Button" Name="CaelumLab/MoonDirectionFocusButton" >
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{1.0,-35},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0,25},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/MoonPhaseLabel" >
+ <Property Name="Text" Value="Moon phase (0-2):" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/MoonPhaseEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="ReadOnly" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-130},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/MoonLightLabel" >
+ <Property Name="Text" Value="Moonlight:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,120}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/MoonLightEditbox" >
+ <Property Name="NormalTextColour" Value="FF999999" />
+ <Property Name="ReadOnly" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,120}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-130},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ </Window>
+
+ <Window Type="TaharezLook/StaticImage" Name="CaelumLab/CloudsGroup">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,645}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0,155}}" />
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CloudsLabel" >
+ <Property Name="Text" Value="Clouds:" />
+ <Property Name="TextColours" Value="FFFFFF77" />
+ <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,0},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundColours" Value="tl:FFFFFFFF tr:00000000 bl:FFFFFFFF br:00FFFFFF" />
+ <Property Name="FrameColours" Value="tl:FFFFFFFF tr:00FFFFFF bl:FFFFFFFF br:00FFFFFF" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CloudLayer1CoverLabel" >
+ <Property Name="Text" Value="Layer 1 coverage:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CloudLayer1CoverEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/CloudLayer1CoverScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,70},{0,35}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CloudLayer1HeightLabel" >
+ <Property Name="Text" Value="Layer 1 height:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CloudLayer1HeightEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/CloudLayer1HeightScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,70},{0,65}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CloudLayer2CoverLabel" >
+ <Property Name="Text" Value="Layer 2 coverage:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CloudLayer2CoverEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/CloudLayer2CoverScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,70},{0,95}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/CloudLayer2HeightLabel" >
+ <Property Name="Text" Value="Layer 2 height:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,120}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/CloudLayer2HeightEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,120}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/CloudLayer2HeightScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,70},{0,125}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ </Window>
+
+ <Window Type="TaharezLook/StaticImage" Name="CaelumLab/PointStarfieldGroup">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,805}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0,155}}" />
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/PointStarfieldLabel" >
+ <Property Name="Text" Value="Point starfield:" />
+ <Property Name="TextColours" Value="FFFFFF77" />
+ <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,0},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundColours" Value="tl:FFFFFFFF tr:00000000 bl:FFFFFFFF br:00FFFFFF" />
+ <Property Name="FrameColours" Value="tl:FFFFFFFF tr:00FFFFFF bl:FFFFFFFF br:00FFFFFF" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/StarMagScaleLabel" >
+ <Property Name="Text" Value="Magnitude scale:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/StarMagScaleEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/StarMagScaleScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,35}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/StarMag0SizeLabel" >
+ <Property Name="Text" Value="Mag 0 size (px):" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/StarMag0SizeEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/StarMag0SizeScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,65}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/StarMinSizeLabel" >
+ <Property Name="Text" Value="Min size (px):" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/StarMinSizeEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/StarMinSizeScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,95}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/StarMaxSizeLabel" >
+ <Property Name="Text" Value="Max size (px):" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,120}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/StarMaxSizeEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,120}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/StarMaxSizeScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,125}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ </Window>
+
+ <Window Type="TaharezLook/StaticImage" Name="CaelumLab/PrecipitationGroup">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,965}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0,125}}" />
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/PrecipitationLabel" >
+ <Property Name="Text" Value="Precipitation:" />
+ <Property Name="TextColours" Value="FFFFFF77" />
+ <Property Name="UnifiedPosition" Value="{{0,0},{0,0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,0},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="BackgroundColours" Value="tl:FFFFFFFF tr:00000000 bl:FFFFFFFF br:00FFFFFF" />
+ <Property Name="FrameColours" Value="tl:FFFFFFFF tr:00FFFFFF bl:FFFFFFFF br:00FFFFFF" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/PrecipitationTypeLabel" >
+ <Property Name="Text" Value="Type:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/PrecipitationTypeEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,30}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/PrecipitationTypeScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,35}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/PrecipitationSpeedLabel" >
+ <Property Name="Text" Value="Speed:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+ <Window Type="TaharezLook/Editbox" Name="CaelumLab/PrecipitationSpeedEditbox" >
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,120},{0,60}}" />
+ <Property Name="UnifiedSize" Value="{{0.4,-55},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ </Window>
+ <Window Type="TaharezLook/HorizontalScrollbar" Name="CaelumLab/PrecipitationSpeedScrollbar" >
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0.4,75},{0,65}}" />
+ <Property Name="UnifiedSize" Value="{{0.6,-85},{0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ </Window>
+
+ <Window Type="TaharezLook/StaticText" Name="CaelumLab/PrecipitationIntensityLabel" >
+ <Property Name="Text" Value="Intensity:" />
+ <Property Name="TextColours" Value="FFFFFF00" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedPosition" Value="{{0,10},{0,90}}" />
+ <Property Name="UnifiedSize" Value="{{0,120},{0,25}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ ...
[truncated message content] |
|
From: <and...@us...> - 2009-02-08 05:49:38
|
Revision: 880
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=880&view=rev
Author: andy_miller
Date: 2009-02-08 05:49:34 +0000 (Sun, 08 Feb 2009)
Log Message:
-----------
Update Sameplframework to load plugins.cfg.mac if on the mac
removed plugins.cfg from ogrenewt demo
Added Paths:
-----------
trunk/python-ogre/demos/plugins.cfg.mac
Removed Paths:
-------------
trunk/python-ogre/demos/OgreNewt/plugins.cfg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2010-05-05 08:36:07
|
Revision: 1117
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=1117&view=rev
Author: andy_miller
Date: 2010-05-05 08:36:01 +0000 (Wed, 05 May 2010)
Log Message:
-----------
renaming quickgui demo directory in anticipation of some auto packaging
Added Paths:
-----------
trunk/python-ogre/demos/quickgui/
Removed Paths:
-------------
trunk/python-ogre/demos/qgui/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-02-26 00:11:18
|
Revision: 906
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=906&view=rev
Author: andy_miller
Date: 2009-02-26 00:11:08 +0000 (Thu, 26 Feb 2009)
Log Message:
-----------
Update to ET and Physx Demos
Modified Paths:
--------------
trunk/python-ogre/demos/et/Demo_CEGUI_ET.py
trunk/python-ogre/demos/physx/Demo01_Simple.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-12-03 12:39:58
|
Revision: 1038
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=1038&view=rev
Author: andy_miller
Date: 2009-12-03 12:39:49 +0000 (Thu, 03 Dec 2009)
Log Message:
-----------
Added missing demo/tests for bullet/ogrebullet
Modified Paths:
--------------
trunk/python-ogre/demos/OgreNewt2/Demo04_RayCasting.py
trunk/python-ogre/demos/OgreNewt2/resources.cfg
Added Paths:
-----------
trunk/python-ogre/demos/bullet/test02.py
trunk/python-ogre/demos/bullet/test04.py
trunk/python-ogre/demos/bullet/test05.py
trunk/python-ogre/demos/bullet/test06.py
trunk/python-ogre/demos/ogrebullet/BulletUtils.py
trunk/python-ogre/demos/ogrebullet/Demo_01.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2010-03-15 07:07:41
|
Revision: 1104
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=1104&view=rev
Author: andy_miller
Date: 2010-03-15 07:07:35 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------
Initial demo for OgreOggSound Module
Added Paths:
-----------
trunk/python-ogre/demos/ogreoggsound/
trunk/python-ogre/demos/ogreoggsound/Demo_Sound1.py
trunk/python-ogre/demos/ogreoggsound/media/
trunk/python-ogre/demos/ogreoggsound/media/Siren.wav
trunk/python-ogre/demos/ogreoggsound/media/motor_b8.wav
trunk/python-ogre/demos/ogreoggsound/media/roar.wav
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
