You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(30) |
Oct
(60) |
Nov
(17) |
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(33) |
Feb
(18) |
Mar
(3) |
Apr
(5) |
May
(6) |
Jun
(34) |
Jul
(54) |
Aug
(33) |
Sep
(36) |
Oct
(33) |
Nov
(40) |
Dec
(6) |
| 2009 |
Jan
(37) |
Feb
(38) |
Mar
(31) |
Apr
(23) |
May
(24) |
Jun
(2) |
Jul
(6) |
Aug
(5) |
Sep
(1) |
Oct
(14) |
Nov
(12) |
Dec
(26) |
| 2010 |
Jan
(23) |
Feb
(17) |
Mar
(17) |
Apr
(2) |
May
(10) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
| 2011 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
|
From: <and...@us...> - 2008-07-30 04:14:08
|
Revision: 680
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=680&view=rev
Author: andy_miller
Date: 2008-07-30 04:14:17 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
Expose 'points' and 'triangles' void * variables in PhysX
Modified Paths:
--------------
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2008-07-29 13:49:17 UTC (rev 679)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2008-07-30 04:14:17 UTC (rev 680)
@@ -135,7 +135,15 @@
def ManualFixes ( mb ):
global_ns = mb.global_ns
-
+ known = ['points', 'triangles']
+ for c in global_ns.classes():
+ if c.name.startswith ('Nx'):
+ print "Checking", c
+ for v in c.variables(allow_empty = True ):
+ if v.name in known:
+ v.expose_address = True
+ print "Exposing Address: ", v.name, " of class: ", c.name
+ sys.exit()
############################################################
##
Modified: trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py
===================================================================
--- trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py 2008-07-29 13:49:17 UTC (rev 679)
+++ trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py 2008-07-30 04:14:17 UTC (rev 680)
@@ -35,80 +35,84 @@
Global_targetMO = None #ogre.MovableObject()
-# # class PCZTestFrameListener ( sf.ExampleFrameListener)
-# #
-# # public:
-# # PCZTestFrameListener(RenderWindow* win, Camera* cam) : ExampleFrameListener( win, cam )
-# #
-# # self.MoveSpeed = 15.0
-# # self.updateRay=ogre.Ray()
-# #
-# #
-# # void moveCamera()
-# #
-# # # Make all the spatial changes to the camera's scene node
-# # # Note that YAW direction is around a fixed axis (freelook style) rather than a natural YAW
-# # #(e.g. airplane)
-# # self.camera.getParentSceneNode().translate(self.translateVector, Node.TS_LOCAL)
-# # self.camera.getParentSceneNode().pitch(mRotY)
-# # self.camera.getParentSceneNode().yaw(mRotX, Node.TS_WORLD)
-# # Global_buildingNode.translate(Global_buildingTranslate, Node.TS_LOCAL)
-# #
-# #
-# # bool frameRenderingQueued( const FrameEvent& evt )
-# #
-# # if( ExampleFrameListener.frameRenderingQueued( evt ) == False )
-# # return False
-# #
-# # Global_buildingTranslate = ogre.Vector3(0,0,0)
-# # if( self.keyboard.isKeyDown( ois.KC_LBRACKET ) )
-# #
-# # Global_buildingTranslate = ogre.Vector3(0,-10,0)
-# #
-# # if( self.keyboard.isKeyDown( ois.KC_RBRACKET ) )
-# #
-# # Global_buildingTranslate = ogre.Vector3(0,10,0)
-# #
-# #
-# # if( self.keyboard.isKeyDown( ois.KC_LSHIFT ) ||
-# # self.keyboard.isKeyDown( ois.KC_RSHIFT ))
-# #
-# # self.MoveSpeed = 150
-# #
-# # else
-# #
-# # self.MoveSpeed = 15
-# #
-# #
-# # # test the ray scene query by showing bounding box of whatever the camera is pointing directly at
-# # # (takes furthest hit)
-# # self.updateRay.setOrigin(self.camera.getParentSceneNode().getPosition())
-# # self.updateRay.setDirection(self.camera.getParentSceneNode().getOrientation()*ogre.Vector3.NEGATIVE_UNIT_Z)
-# # Global_raySceneQuery.setRay(updateRay)
-# # zone = ((PCZSceneNode*)(self.camera.getParentSceneNode())).getHomeZone()
-# # ((PCZRaySceneQuery*)Global_raySceneQuery).setStartZone(zone)
-# # ((PCZRaySceneQuery*)Global_raySceneQuery).setExcludeNode(self.camera.getParentSceneNode())
-# # RaySceneQueryResult& qryResult = Global_raySceneQuery.execute()
-# # RaySceneQueryResult.iterator i = qryResult.begin()
-# # if (i != qryResult.end())
-# #
-# # RaySceneQueryResult.reverse_iterator ri = qryResult.rbegin()
-# # MovableObject * mo = ri.movable
-# # if (Global_targetMO != mo)
-# #
-# # if (Global_targetMO != 0)
-# #
-# # Global_targetMO.getParentSceneNode().showBoundingBox(False)
-# #
-# # Global_targetMO = mo
-# # Global_targetMO.getParentSceneNode().showBoundingBox(True)
-# #
-# #
-# #
-# # return True
+class PCZTestFrameListener ( sf.ExampleFrameListener):
+ def __init__(self, renderWindow, camera ):
+ sf.FrameListener.__init__(self, renderWindow, camera)
+ self.moveSpeed = 15.0
+ self.raySceneQueue = sceneManager.createRayQuery(ogre.Ray(camera.getPosition(),
+ ogre.Vector3.NEGATIVE_UNIT_Y))
+ self.camera = camera
+ self.updateRay=ogre.Ray()
+ self.pczCameraParentNode = pcz.castAsPCZSceneNode(self.camera.getParentSceneNode())
+
+ def moveCamera( self ):
+ # Make all the spatial changes to the camera's scene node
+ # Note that YAW direction is around a fixed axis (freelook style) rather than a natural YAW
+ #(e.g. airplane)
+ self.camera.getParentSceneNode().translate(self.translateVector, ogre.Node.TS_LOCAL)
+ self.camera.getParentSceneNode().pitch(self.rotationY)
+ self.camera.getParentSceneNode().yaw(self.rotationX, ogre.Node.TS_WORLD)
+
+ Global_buildingNode.translate(Global_buildingTranslate, ogre.Node.TS_LOCAL)
+ def frameRenderingQueued( self, evt ):
+ if sf.FrameListener.frameRenderingQueued( evt ) == False:
+ return False
+ Global_buildingTranslate = ogre.Vector3(0,0,0)
+ if self.keyboard.isKeyDown( ois.KC_LBRACKET ):
+ Global_buildingTranslate = ogre.Vector3(0,-10,0)
+ if self.keyboard.isKeyDown( ois.KC_RBRACKET ):
+ Global_buildingTranslate = ogre.Vector3(0,10,0)
+ if self.keyboard.isKeyDown( ois.KC_LSHIFT ) or self.keyboard.isKeyDown( ois.KC_RSHIFT ):
+ self.moveSpeed = 150
+ else
+ self.moveSpeed = 15
+ # test the ray scene query by showing bounding box of whatever the camera is pointing directly at
+ # (takes furthest hit)
+ self.updateRay.setOrigin(self.camera.getParentSceneNode().getPosition())
+ self.updateRay.setDirection(self.camera.getParentSceneNode().getOrientation()*ogre.Vector3.NEGATIVE_UNIT_Z)
+ Global_raySceneQuery.setRay(updateRay)
+ zone = self.pczCameraParentNode.getHomeZone()
+ pcz.castAsPCZRaySceneQuery(Global_raySceneQuery).setStartZone(zone)
+ pcz.castAsPCZRaySceneQuery(Global_raySceneQuery).setExcludeNode(self.camera.getParentSceneNode())
+ for queryResult in Global_raySceneQuery.execute():
+ ri = qryResult.rbegin()
+ mo = ri.movable
+ if Global_targetMO != mo:
+ if Global_targetMO != 0:
+ Global_targetMO.getParentSceneNode().showBoundingBox(False)
+ Global_targetMO = mo
+ Global_targetMO.getParentSceneNode().showBoundingBox(True)
+ return True
+
+class TerrainListener(sf.FrameListener):
+ def __init__(self, renderWindow, camera, sceneManager):
+ sf.FrameListener.__init__(self, renderWindow, camera)
+ self.sceneManager = sceneManager
+ self.moveSpeed = 50.0
+
+ self.raySceneQuery = sceneManager.createRayQuery(ogre.Ray(camera.getPosition(),
+ ogre.Vector3.NEGATIVE_UNIT_Y))
+ self.camera = camera
+ #self.camera.setPosition (self.camera.getPosition() + ogre.Vector3(0.0, 10.0, 0.0))
+
+ def frameStarted(self, frameEvent):
+ # clamp to terrain
+ updateRay = ogre.Ray()
+ updateRay.setOrigin (self.camera.getPosition() + ogre.Vector3(0.0, 10.0, 0.0))
+ updateRay.setDirection (ogre.Vector3.NEGATIVE_UNIT_Y)
+ self.raySceneQuery.Ray = updateRay
+ for queryResult in self.raySceneQuery.execute():
+ if queryResult.worldFragment is not None:
+ pos = self.camera.getPosition()
+ self.camera.setPosition (pos.x, pos.y - queryResult.distance + 15.0, pos.z)
+ break
+
+ return sf.FrameListener.frameStarted(self, frameEvent)
+
+
class PCZTestApplication (sf.Application):
def __del__(self):
del Global_raySceneQuery
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-07-29 12:56:11
|
Revision: 678
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=678&view=rev
Author: andy_miller
Date: 2008-07-29 12:56:20 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
further Portal work (not finished with the demo)
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogrepcz/generate_code.py
trunk/python-ogre/code_generators/ogrepcz/hand_made_wrappers.py
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
Added Paths:
-----------
trunk/python-ogre/demos/ogrepcz/
trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py
trunk/python-ogre/demos/ogrepcz/RoomObject.py
trunk/python-ogre/demos/plugins.cfg
trunk/python-ogre/demos/resources.cfg
Removed Paths:
-------------
trunk/python-ogre/demos/ogre/resources.cfg
trunk/python-ogre/packages_2.6/
Modified: trunk/python-ogre/code_generators/ogrepcz/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2008-07-29 10:25:07 UTC (rev 677)
+++ trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2008-07-29 12:56:20 UTC (rev 678)
@@ -86,7 +86,14 @@
if MAIN_NAMESPACE:
main_ns = global_ns.namespace( MAIN_NAMESPACE )
else:
- main_ns = global_ns
+ main_ns = global_ns
+
+ includes = ['::Ogre::Portal::PORTAL_TYPE',
+ '::Ogre::Portal::PortalIntersectResult',
+# '::Ogre::PCZone::NODE_LIST_TYPE'
+ ]
+ for i in includes:
+ main_ns.enum(i).include()
############################################################
##
@@ -277,9 +284,17 @@
main_ns = global_ns.namespace( MAIN_NAMESPACE )
# main_ns.include()
for c in main_ns.classes():
- if c.name.startswith ('PCZ'):
+ if c.name.startswith ('PCZ') or c.name.startswith ('PCPlane') or c.name.startswith ('Portal'):
+ c.include()
print "Including ", c
- c.include()
+
+ for c in ['Portal','PCPlane']:
+ main_ns.class_(c).include()
+ print "Including ", c
+# for e in c.enums(allow_empty=True):
+# e.include()
+# for v in c.variables(allow_empty=True):
+# v.include()
common_utils.AutoExclude ( mb, MAIN_NAMESPACE )
ManualExclude ( mb )
Modified: trunk/python-ogre/code_generators/ogrepcz/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/hand_made_wrappers.py 2008-07-29 10:25:07 UTC (rev 677)
+++ trunk/python-ogre/code_generators/ogrepcz/hand_made_wrappers.py 2008-07-29 12:56:20 UTC (rev 678)
@@ -1,7 +1,47 @@
import os
import environment
+WRAPPER_DEFINITION_General = \
+"""
+// The following helper functions are a start and possibly need to be extended to include
+// additional scene queries..
+Ogre::PCZSceneNode * General_castAsPCZSceneNode( Ogre::SceneNode * in ){
+ return (Ogre::PCZSceneNode*) in;
+ }
+Ogre::PCZSceneManager * General_castAsPCZSceneManager( Ogre::SceneManager * in ){
+ return (Ogre::PCZSceneManager*) in;
+ }
+Ogre::PCZRaySceneQuery * General_castAsPCZRaySceneQuery( Ogre::RaySceneQuery * in ){
+ return (Ogre::PCZRaySceneQuery*) in;
+ }
+
+/// TO HANDLE ??
+/* PCZAxisAlignedBoxSceneQuery : public DefaultAxisAlignedBoxSceneQuery
+PCZRaySceneQuery : public DefaultRaySceneQuery
+PCZSphereSceneQuery : public DefaultSphereSceneQuery
+PCZPlaneBoundedVolumeListSceneQuery : public DefaultPlaneBoundedVolumeListSceneQuery
+*/
+
+
+"""
+WRAPPER_REGISTRATION_General = [
+ """bp::def( "castAsPCZSceneNode", &General_castAsPCZSceneNode,
+ "Python-Ogre Helper Function: Casts a SceneNode as a PCZSceneNode.\\n\\
+ Input: SceneNode\\n\\
+ Ouput: PCZSceneNode",\
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());""",
+ """bp::def( "castAsPCZSceneManager", &General_castAsPCZSceneManager,
+ "Python-Ogre Helper Function: Casts a SceneManager as a PCZSceneManager.\\n\\
+ Input: SceneManager\\n\\
+ Ouput: PCZSceneManager",\
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());""",
+ """bp::def( "castAsPCZRaySceneQuery", &General_castAsPCZRaySceneQuery,
+ "Python-Ogre Helper Function: Casts a RaySceneQuery as a PCZRaySceneQuery.\\n\\
+ Input: RaySceneQuery\\n\\
+ Ouput: PCZRaySceneQuery",\
+ bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());""",
+]
#################################################################################################
#################################################################################################
@@ -11,5 +51,6 @@
class_.add_registration_code ( c )
def apply( mb ):
- pass
+ mb.add_declaration_code( WRAPPER_DEFINITION_General )
+ apply_reg (mb, WRAPPER_REGISTRATION_General )
\ No newline at end of file
Deleted: trunk/python-ogre/demos/ogre/resources.cfg
===================================================================
--- trunk/python-ogre/demos/ogre/resources.cfg 2008-07-29 10:25:07 UTC (rev 677)
+++ trunk/python-ogre/demos/ogre/resources.cfg 2008-07-29 12:56:20 UTC (rev 678)
@@ -1,24 +0,0 @@
-[Bootstrap]
-Zip=../media/packs/OgreCore.zip
-
-# Resource locations to be added to the default path
-[General]
-FileSystem=../media
-FileSystem=../media/fonts
-FileSystem=../media/sounds
-FileSystem=../media/Audio
-FileSystem=../media/materials/programs
-FileSystem=../media/materials/scripts
-FileSystem=../media/materials/textures
-FileSystem=../media/models
-FileSystem=../media/overlays
-FileSystem=../media/particle
-FileSystem=../media/gui
-Zip=../media/packs/cubemap.zip
-Zip=../media/packs/cubemapsJS.zip
-Zip=../media/packs/dragon.zip
-Zip=../media/packs/fresneldemo.zip
-Zip=../media/packs/ogretestmap.zip
-Zip=../media/packs/skybox.zip
-#Zip=../media/packs/chiropteraDM.pk3
-
Added: trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py
===================================================================
--- trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py (rev 0)
+++ trunk/python-ogre/demos/ogrepcz/Demo_PCZ01.py 2008-07-29 12:56:20 UTC (rev 678)
@@ -0,0 +1,327 @@
+# 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/
+#
+# Specialisation of OGRE's framework application to test/demo the
+# Portal Connected Zone (PCZ) Scene Manager Plugin.
+#
+# You may use this sample code for anything you like, it is not covered by the
+# LGPL.
+# -----------------------------------------------------------------------------
+import sys
+import os
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+## this here becase the Plug_PCZSceneManager.dll needs to be accessed by both the python module and the ogre plugins
+if sys.platform == 'win32':
+ newpath = os.path.join ( os.path.abspath(os.path.dirname(__file__)), '../../plugins')
+ os.environ['PATH'] = newpath +';' + os.environ['PATH']
+
+import ogre.renderer.OGRE as ogre
+import SampleFramework as sf
+import ogre.io.OIS as ois
+import ogre.renderer.ogrepcz as pcz
+
+# import RoomObject
+
+Global_buildingNode = None #pcz.PCZSceneNode()
+Global_buildingTranslate = None # ogre.Vector3()
+Global_raySceneQuery = None # ogre.RaySceneQuery()
+Global_targetMO = None #ogre.MovableObject()
+
+
+# # class PCZTestFrameListener ( sf.ExampleFrameListener)
+# #
+# # public:
+# # PCZTestFrameListener(RenderWindow* win, Camera* cam) : ExampleFrameListener( win, cam )
+# #
+# # self.MoveSpeed = 15.0
+# # self.updateRay=ogre.Ray()
+# #
+# #
+# # void moveCamera()
+# #
+# # # Make all the spatial changes to the camera's scene node
+# # # Note that YAW direction is around a fixed axis (freelook style) rather than a natural YAW
+# # #(e.g. airplane)
+# # self.camera.getParentSceneNode().translate(self.translateVector, Node.TS_LOCAL)
+# # self.camera.getParentSceneNode().pitch(mRotY)
+# # self.camera.getParentSceneNode().yaw(mRotX, Node.TS_WORLD)
+# # Global_buildingNode.translate(Global_buildingTranslate, Node.TS_LOCAL)
+# #
+# #
+# # bool frameRenderingQueued( const FrameEvent& evt )
+# #
+# # if( ExampleFrameListener.frameRenderingQueued( evt ) == False )
+# # return False
+# #
+# # Global_buildingTranslate = ogre.Vector3(0,0,0)
+# # if( self.keyboard.isKeyDown( ois.KC_LBRACKET ) )
+# #
+# # Global_buildingTranslate = ogre.Vector3(0,-10,0)
+# #
+# # if( self.keyboard.isKeyDown( ois.KC_RBRACKET ) )
+# #
+# # Global_buildingTranslate = ogre.Vector3(0,10,0)
+# #
+# #
+# # if( self.keyboard.isKeyDown( ois.KC_LSHIFT ) ||
+# # self.keyboard.isKeyDown( ois.KC_RSHIFT ))
+# #
+# # self.MoveSpeed = 150
+# #
+# # else
+# #
+# # self.MoveSpeed = 15
+# #
+# #
+# # # test the ray scene query by showing bounding box of whatever the camera is pointing directly at
+# # # (takes furthest hit)
+# # self.updateRay.setOrigin(self.camera.getParentSceneNode().getPosition())
+# # self.updateRay.setDirection(self.camera.getParentSceneNode().getOrientation()*ogre.Vector3.NEGATIVE_UNIT_Z)
+# # Global_raySceneQuery.setRay(updateRay)
+# # zone = ((PCZSceneNode*)(self.camera.getParentSceneNode())).getHomeZone()
+# # ((PCZRaySceneQuery*)Global_raySceneQuery).setStartZone(zone)
+# # ((PCZRaySceneQuery*)Global_raySceneQuery).setExcludeNode(self.camera.getParentSceneNode())
+# # RaySceneQueryResult& qryResult = Global_raySceneQuery.execute()
+# # RaySceneQueryResult.iterator i = qryResult.begin()
+# # if (i != qryResult.end())
+# #
+# # RaySceneQueryResult.reverse_iterator ri = qryResult.rbegin()
+# # MovableObject * mo = ri.movable
+# # if (Global_targetMO != mo)
+# #
+# # if (Global_targetMO != 0)
+# #
+# # Global_targetMO.getParentSceneNode().showBoundingBox(False)
+# #
+# # Global_targetMO = mo
+# # Global_targetMO.getParentSceneNode().showBoundingBox(True)
+# #
+# #
+# #
+# # return True
+
+
+
+class PCZTestApplication (sf.Application):
+ def __del__(self):
+ del Global_raySceneQuery
+
+
+ def _chooseSceneManager ( self ):
+
+ # Create the SceneManager, in this case a generic one
+ self.sceneManager = self.root.createSceneManager("PCZSceneManager", "PCZSceneManager")
+ # initialize the scene manager using terrain as default zone
+ zoneTypeName = "ZoneType_Default"
+ self.pczSM = pcz.castAsPCZSceneManager( self.sceneManager ) # store this for future reference
+ self.pczSM.init(zoneTypeName)
+ #self.sceneManager.showBoundingBoxes(True)
+
+# def _createFrameListener( self ):
+# self.frameListener= PCZTestFrameListener(self.renderWindow, self.camera)
+# self.root.addFrameListener(self.frameListener)
+
+ def _createCamera(self):
+ # Create the camera
+ self.camera = self.sceneManager.createCamera("PlayerCam")
+
+ # NEW: create a node for the camera and control that instead of camera directly.
+ # We do this because PCZSceneManager requires camera to have a node
+ self.cameraNode = self.sceneManager.getRootSceneNode().createChildSceneNode("PlayerCamNode")
+ # attach the camera to the node
+ self.cameraNode.attachObject(self.camera)
+ # fix the yaw axis of the camera
+ self.cameraNode.setFixedYawAxis(True)
+
+ self.camera.setNearClipDistance(2)
+ self.camera.setFarClipDistance( 1000 )
+ # set camera zone
+# ((PCZSceneNode*)(self.cameraNode)).setHomeZone(((PCZSceneManager*)(self.sceneManager)).getDefaultZone())
+
+
+ # utility function to create terrain zones easily
+ def createTerrainZone(self, zoneName, terrain_cfg):
+ # load terrain into the terrain zone
+ terrainZone = self.pczSM.createZone("ZoneType_Terrain", zoneName)
+ terrainZone.notifyCameraCreated(self.camera)
+ self.pczSM.setZoneGeometry( zoneName, pcz.castAsPCZSceneNode(self.sceneManager.getRootSceneNode()), terrain_cfg )
+
+ # create aab portal(s) around the terrain
+ corners =[]
+ aabb = ogre.AxisAlignedBox()
+
+ # make portal from terrain to default
+ terrainZone.getAABB(aabb)
+ portalName = "PortalFrom"+zoneName+"ToDefault_Zone"
+ p = self.pczSM.createPortal(portalName, pcz.Portal.PORTAL_TYPE_AABB)
+ corners[0] = aabb.getMinimum()
+ 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
+ # associate the portal with the terrain's main node
+ p.setNode(terrainZone.getEnclosureNode())
+ # IMPORTANT: Update the derived values of the portal
+ p.updateDerivedValues()
+ # add the portal to the zone
+ terrainZone._addPortal(p)
+
+ # make portal from default to terrain
+ portalName = "PortalFromDefault_ZoneTo"+zoneName
+ p2 = self.pczSM.createPortal(portalName, pcz.Portal.PORTAL_TYPE_AABB)
+ corners[0] = aabb.getMinimum()
+ 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
+ # associate the portal with the terrain's main node
+ p2.setNode(terrainZone.getEnclosureNode())
+ # IMPORTANT: Update the derived values of the portal
+ p2.updateDerivedValues()
+ # add the portal to the zone
+ self.pczSM.getDefaultZone()._addPortal(p2)
+
+ # connect the portals manually
+ p.setTargetPortal(p2)
+ p2.setTargetPortal(p)
+ p.setTargetZone(self.pczSM.getDefaultZone())
+ p2.setTargetZone(terrainZone)
+
+ return terrainZone
+
+
+ # Just override the mandatory create scene method
+ def _createScene( self ):
+
+ # Set ambient light
+ self.sceneManager.setAmbientLight(ogre.ColourValue(0.25, 0.25, 0.25))
+
+ # Create a skybox
+ self.sceneManager.setSkyBox(True, "Examples/CloudyNoonSkyBox", 500 )
+ # put the skybox node in the default zone
+# self.pczSM.setSkyZone(None)
+
+ # Create a light
+ l = self.sceneManager.createLight("MainLight")
+ l.setPosition(0,0,0)
+ l.setAttenuation(500, 0.5, 1.0, 0.0)
+ # Accept default settings: point light, white diffuse, just set position
+ # attach light to a scene node so the PCZSM can handle it properly (zone-wise)
+ # IMPORTANT: Lights (just like cameras) MUST be connected to a scene node!
+ lightNode = self.cameraNode.createChildSceneNode("light_Node")
+ lightNode.attachObject(l)
+
+ # Fog
+ # NB it's VERY important to set this before calling setWorldGeometry
+ # because the vertex program picked will be different
+ fadeColour= ogre.ColourValue(0.101, 0.125, 0.1836)
+ self.sceneManager.setFog( ogre.FOG_LINEAR, fadeColour, .001, 500, 1000)
+ self.renderWindow.getViewport(0).setBackgroundColour(fadeColour)
+
+ # create a terrain zone
+ terrain_cfg = "terrain.cfg"
+ zoneName ="Terrain1_Zone"
+ terrainZone = self.createTerrainZone(zoneName, terrain_cfg)
+
+# # /* # Create another terrain zone
+# # terrain_cfg = "terrain.cfg"
+# # zoneName = "Terrain2_Zone"
+# # terrainZone = createTerrainZone(zoneName, terrain_cfg)
+# # # move second terrain next to first terrain
+# # terrainZone.getEnclosureNode().setPosition(1500, 0, 0)
+# #
+# # # Create another terrain zone
+# # terrain_cfg = "terrain.cfg"
+# # zoneName = "Terrain3_Zone"
+# # terrainZone = createTerrainZone(zoneName, terrain_cfg)
+# # # move terrain next to first terrain
+# # terrainZone.getEnclosureNode().setPosition(0, 0, 1500)
+# #
+# # # Create another terrain zone
+# # terrain_cfg = "terrain.cfg"
+# # zoneName = "Terrain4_Zone"
+# # terrainZone = createTerrainZone(zoneName, terrain_cfg)
+# # # move terrain next to first terrain
+# # terrainZone.getEnclosureNode().setPosition(-1500, 0, 0)
+# #
+# # # Create another terrain zone
+# # terrain_cfg = "terrain.cfg"
+# # zoneName = "Terrain5_Zone"
+# # terrainZone = createTerrainZone(zoneName, terrain_cfg)
+# # # move terrain next to first terrain
+# # terrainZone.getEnclosureNode().setPosition(0, 0, -1500)
+# #
+# # # Create another terrain zone
+# # terrain_cfg = "terrain.cfg"
+# # zoneName = "Terrain6_Zone"
+# # terrainZone = createTerrainZone(zoneName, terrain_cfg)
+# # # move terrain next to first terrain
+# # terrainZone.getEnclosureNode().setPosition(1500, 0, 1500)
+# #
+# # # Create another terrain zone
+# # terrain_cfg = "terrain.cfg"
+# # zoneName = "Terrain7_Zone"
+# # terrainZone = createTerrainZone(zoneName, terrain_cfg)
+# # # move terrain next to first terrain
+# # terrainZone.getEnclosureNode().setPosition(-1500, 0, -1500)
+# #
+# # # Create another terrain zone
+# # terrain_cfg = "terrain.cfg"
+# # zoneName = "Terrain8_Zone"
+# # terrainZone = createTerrainZone(zoneName, terrain_cfg)
+# # # move terrain next to first terrain
+# # terrainZone.getEnclosureNode().setPosition(-1500, 0, 1500)
+# #
+# # # Create another terrain zone
+# # terrain_cfg = "terrain.cfg"
+# # zoneName = "Terrain9_Zone"
+# # terrainZone = createTerrainZone(zoneName, terrain_cfg)
+# # # move terrain next to first terrain
+# # terrainZone.getEnclosureNode().setPosition(1500, 0, -1500)
+# # */
+ # set far clip plane to one terrain zone width (we have a LOT of terrain here, so we need to do far clipping!)
+ self.camera.setFarClipDistance(1500)
+
+# # create test buildinig
+# RoomObject roomObj
+# Global_buildingNode = roomObj.createTestBuilding(self.sceneManager, String("1"))
+# Global_buildingNode.setPosition(500, 165, 570)
+# #ogre.Radian r = Radian(3.1416/7.0)
+# #Global_buildingNode.rotate(ogre.Vector3.UNIT_Y, r)
+#
+# # create another test buildinig
+# RoomObject roomObj2
+# Global_buildingNode = roomObj2.createTestBuilding(self.sceneManager, String("2"))
+# Global_buildingNode.setPosition(400, 165, 570)
+# #ogre.Radian r = Radian(3.1416/7.0)
+# #Global_buildingNode.rotate(ogre.Vector3.UNIT_Y, r)
+#
+# # Position camera in the center of the building
+# self.cameraNode.setPosition(Global_buildingNode.getPosition())
+# # Look back along -Z
+# self.camera.lookAt(self.cameraNode._getDerivedPosition() + ogre.Vector3(0,0,-300))
+# # Update bounds for camera
+# self.cameraNode._updateBounds()
+#
+# # create the ray scene query
+# Global_raySceneQuery = self.sceneManager.createRayQuery(
+# Ray(self.camera.getParentNode().getPosition(), ogre.Vector3.NEGATIVE_UNIT_Z))
+# Global_raySceneQuery.setSortByDistance(True, 5)
+
+
+
+if __name__ == '__main__':
+ import exceptions,sys
+ try:
+ application = PCZTestApplication()
+ application.go()
+ except ogre.OgreException, e:
+ print e
+
Added: trunk/python-ogre/demos/ogrepcz/RoomObject.py
===================================================================
--- trunk/python-ogre/demos/ogrepcz/RoomObject.py (rev 0)
+++ trunk/python-ogre/demos/ogrepcz/RoomObject.py 2008-07-29 12:56:20 UTC (rev 678)
@@ -0,0 +1,1009 @@
+##
+##
+##
+## Filename : RoomObject.cpp
+
+# #
+# #
+# # class RoomObject
+# #
+# # private:
+# # Ogre::Vector3 points[32];
+# # int mPortalCount;
+# # public:
+
+DOOR_NONE = 0x00
+DOOR_TOP = 0x01
+DOOR_BOT = 0x02
+DOOR_FRONT = 0x04
+DOOR_BACK = 0x08
+DOOR_LEFT = 0x10
+DOOR_RIGHT = 0x20
+DOOR_ALL = 0xFF
+
+# #
+# #
+#include "Ogre.h"
+#include "OgreMaterial.h"
+#include "RoomObject.h"
+#include "OgrePortal.h"
+
+using namespace Ogre
+static int count = 0
+
+PCZSceneNode * RoomObject.createTestBuilding(Ogre::SceneManager *scene, String & name)
+
+ count++
+ mPortalCount = 0
+ Ogre.PCZSceneManager * pczSM = (Ogre::PCZSceneManager*)scene
+
+ ## set points to building exterior size
+ createPoints(Vector3(60.0, 40.0, 60.0), Vector3(4.0, 10.0, 4.0))
+
+ ## create the building exterior
+ Entity *exterior = pczSM->createEntity( name + "_building_exterior", "building_exterior.mesh" )
+
+ ## make the enclosure a child node of the root scene node
+ PCZSceneNode * exteriorNode
+ exteriorNode = (PCZSceneNode*)scene->getRootSceneNode()->createChildSceneNode(name +"_building_exterior_node", Vector3( 0.0, 0.0f, 0.0f ) )
+ exteriorNode->attachObject(exterior)
+ pczSM->addPCZSceneNode(exteriorNode, pczSM->getDefaultZone())
+
+ ## create portals for the building exterior
+ createPortals(scene,
+ exterior,
+ exteriorNode,
+ pczSM->getDefaultZone(),
+ DOOR_FRONT|DOOR_BACK|DOOR_LEFT|DOOR_RIGHT,
+ True)
+
+ ## reset points to room size
+ createPoints(Vector3(20.0, 10.0, 20.0), Vector3(4.0, 10.0, 4.0))
+
+ ## create an interior room
+ Entity *room = pczSM->createEntity( name +"_room1", "room_nzpz.mesh" )
+
+ ## add the room as a child node to the enclosure node
+ PCZSceneNode * roomNode
+ roomNode = (PCZSceneNode*)exteriorNode->createChildSceneNode( name +"_room1_node", Vector3( 0.0, 0.0f, 20.0f ) )
+ roomNode->attachObject(room)
+
+ ## room needs it's own zone
+ Ogre.String zoneType = "ZoneType_Default"
+ Ogre.String zoneName = name +"_room1_zone"
+ PCZone * newZone = pczSM->createZone(zoneType, zoneName)
+ newZone->setEnclosureNode(roomNode)
+ pczSM->addPCZSceneNode(roomNode, newZone)
+
+ ## create portals for the room
+ createPortals(scene,
+ room,
+ roomNode,
+ newZone,
+ DOOR_FRONT|DOOR_BACK,
+ False)
+
+ ## create another interior room
+ room = pczSM->createEntity( name +"_room2", "room_nxpxnypynzpz.mesh" )
+
+ ## add the room as a child node to the enclosure node
+ roomNode = (PCZSceneNode*)exteriorNode->createChildSceneNode( name +"_room2_node", Vector3( 0.0, 0.0f, 0.0f ) )
+ roomNode->attachObject(room)
+
+ ## room needs it's own zone
+ zoneName = name +"_room2_zone"
+ newZone = pczSM->createZone(zoneType, zoneName)
+ newZone->setEnclosureNode(roomNode)
+ pczSM->addPCZSceneNode(roomNode, newZone)
+
+ ## create portals for the room
+ createPortals(scene,
+ room,
+ roomNode,
+ newZone,
+ DOOR_FRONT|DOOR_BACK|DOOR_LEFT|DOOR_RIGHT|DOOR_TOP|DOOR_BOT,
+ False)
+
+ ## create another interior room
+ room = pczSM->createEntity( name +"_room3", "room_nzpz.mesh" )
+
+ ## add the room as a child node to the enclosure node
+ roomNode = (PCZSceneNode*)exteriorNode->createChildSceneNode( name +"_room3_node", Vector3( 0.0, 0.0f, -20.0f ) )
+ roomNode->attachObject(room)
+
+ ## room needs it's own zone
+ zoneName = name +"_room3_zone"
+ newZone = pczSM->createZone(zoneType, zoneName)
+ newZone->setEnclosureNode(roomNode)
+ pczSM->addPCZSceneNode(roomNode, newZone)
+
+ ## create portals for the room
+ createPortals(scene,
+ room,
+ roomNode,
+ newZone,
+ DOOR_FRONT|DOOR_BACK,
+ False)
+
+ ## create another interior room
+ room = pczSM->createEntity( name +"_room4", "room_nxpx.mesh" )
+
+ ## add the room as a child node to the enclosure node
+ roomNode = (PCZSceneNode*)exteriorNode->createChildSceneNode( name +"_room4_node", Vector3( -20.0, 0.0f, 0.0f ) )
+ roomNode->attachObject(room)
+
+ ## room needs it's own zone
+ zoneName = name +"_room4_zone"
+ newZone = pczSM->createZone(zoneType, zoneName)
+ newZone->setEnclosureNode(roomNode)
+ pczSM->addPCZSceneNode(roomNode, newZone)
+
+ ## create portals for the room
+ createPortals(scene,
+ room,
+ roomNode,
+ newZone,
+ DOOR_LEFT|DOOR_RIGHT,
+ False)
+
+ ## create another interior room
+ room = pczSM->createEntity( name +"_room5", "room_nxpx.mesh" )
+
+ ## add the room as a child node to the enclosure node
+ roomNode = (PCZSceneNode*)exteriorNode->createChildSceneNode( name +"_room5_node", Vector3( 20.0, 0.0f, 0.0f ) )
+ roomNode->attachObject(room)
+
+ ## room needs it's own zone
+ zoneName = name +"_room5_zone"
+ newZone = pczSM->createZone(zoneType, zoneName)
+ newZone->setEnclosureNode(roomNode)
+ pczSM->addPCZSceneNode(roomNode, newZone)
+
+ ## create portals for the room
+ createPortals(scene,
+ room,
+ roomNode,
+ newZone,
+ DOOR_LEFT|DOOR_RIGHT,
+ False)
+
+ ## create another interior room
+ room = pczSM->createEntity( name +"_room6", "room_ny.mesh" )
+
+ ## add the room as a child node to the enclosure node
+ roomNode = (PCZSceneNode*)exteriorNode->createChildSceneNode( name +"_room6_node", Vector3( 0.0, 10.0f, 0.0f ) )
+ roomNode->attachObject(room)
+
+ ## room needs it's own zone
+ zoneName = name +"_room6_zone"
+ newZone = pczSM->createZone(zoneType, zoneName)
+ newZone->setEnclosureNode(roomNode)
+ pczSM->addPCZSceneNode(roomNode, newZone)
+
+ ## create portals for the room
+ createPortals(scene,
+ room,
+ roomNode,
+ newZone,
+ DOOR_BOT,
+ False)
+
+ ## create another interior room
+ room = pczSM->createEntity( name +"_room7", "room_py.mesh" )
+
+ ## add the room as a child node to the enclosure node
+ roomNode = (PCZSceneNode*)exteriorNode->createChildSceneNode( name +"_room7_node", Vector3( 0.0, -50.0f, 0.0f ) )
+ roomNode->attachObject(room)
+
+ ## room needs it's own zone
+ zoneName = name +"_room7_zone"
+ newZone = pczSM->createZone(zoneType, zoneName)
+ newZone->setEnclosureNode(roomNode)
+ pczSM->addPCZSceneNode(roomNode, newZone)
+
+ ## create portals for the room
+ createPortals(scene,
+ room,
+ roomNode,
+ newZone,
+ DOOR_TOP,
+ False)
+
+ ## reset points to tall room size
+ createPoints(Vector3(20.0, 40.0, 20.0), Vector3(4.0, 10.0, 4.0))
+
+ ## create another interior room
+ room = pczSM->createEntity( name +"_room8", "room_nypy_4y.mesh" )
+
+ ## add the room as a child node to the enclosure node
+ roomNode = (PCZSceneNode*)exteriorNode->createChildSceneNode( name +"_room8_node", Vector3( 0.0, -25.0f, 0.0f ) )
+ roomNode->attachObject(room)
+
+ ## room needs it's own zone
+ zoneName = name +"_room8_zone"
+ newZone = pczSM->createZone(zoneType, zoneName)
+ newZone->setEnclosureNode(roomNode)
+ pczSM->addPCZSceneNode(roomNode, newZone)
+
+ ## create portals for the room
+ createPortals(scene,
+ room,
+ roomNode,
+ newZone,
+ DOOR_BOT|DOOR_TOP,
+ False)
+
+
+ ## resolve portal zone pointers
+ pczSM->connectPortalsToTargetZonesByLocation()
+
+ return exteriorNode
+
+
+
+Ogre.ManualObject* RoomObject::createRoom(Ogre::SceneManager *scene,
+ Ogre.String &name,
+ short doorFlags,
+ bool isEnclosure,
+ Ogre.Vector3 dimensions,
+ Ogre.Vector3 doorDimensions)
+
+ addMaterial(name, Ogre.ColourValue(1,1,1,.75), Ogre::SBT_TRANSPARENT_ALPHA)
+
+ Ogre.ManualObject* room = scene->createManualObject(name)
+
+ room->begin(name, Ogre.RenderOperation::OT_TRIANGLE_LIST)
+
+ ## create points
+ createPoints(dimensions, doorDimensions)
+
+ Ogre.Real fade=.5
+ Ogre.Real solid=.8
+ Ogre.ColourValue color = ColourValue(0, 0, solid, solid)
+
+ ## copy to room
+ for (int i=0 i<32;i++)
+
+ room->position(points[i])
+ room->colour(color)
+
+
+ createWalls(room, doorFlags, isEnclosure)
+
+ room->end()
+
+ return room
+
+
+void RoomObject.addMaterial( Ogre::String &mat,
+ Ogre.ColourValue &clr,
+ Ogre.SceneBlendType sbt)
+
+ static int init=False
+ if(init):
+ return
+ else:
+ init=True
+
+ Ogre.MaterialPtr matptr = Ogre::MaterialManager::getSingleton().create(mat, "General")
+ matptr->setReceiveShadows(False)
+ matptr->getTechnique(0)->setLightingEnabled(True)
+ matptr->getTechnique(0)->getPass(0)->setDiffuse(clr)
+ matptr->getTechnique(0)->getPass(0)->setAmbient(clr)
+ matptr->getTechnique(0)->getPass(0)->setSelfIllumination(clr)
+ matptr->getTechnique(0)->getPass(0)->setSceneBlending(sbt)
+ matptr->getTechnique(0)->getPass(0)->setLightingEnabled(False)
+ matptr->getTechnique(0)->getPass(0)->setVertexColourTracking(Ogre.TVC_DIFFUSE)
+
+
+void RoomObject.createPoints(Ogre::Vector3 dimensions,
+ Ogre.Vector3 doorDimensions)
+
+ Ogre.Real l = dimensions.x/2
+ Ogre.Real h = dimensions.y/2
+ Ogre.Real w = dimensions.z/2
+
+## 4 7
+## *-------*
+## /| /|
+## / | / | y
+## / 5| 3/ 6| |
+## 0*---*---*---* *-- x
+## | / | / /
+## | / | / z
+## |/ |/
+## 1*-------*2
+
+ points[0] = Ogre.Vector3(-l, h, w) ##0
+ points[1] = Ogre.Vector3(-l, -h, w) ##1
+ points[2] = Ogre.Vector3(l, -h, w) ##2
+ points[3] = Ogre.Vector3(l, h, w) ##3
+
+ points[4] = Ogre.Vector3(-l, h, -w) ##4
+ points[5] = Ogre.Vector3(-l, -h, -w) ##5
+ points[6] = Ogre.Vector3(l, -h, -w) ##6
+ points[7] = Ogre.Vector3(l, h, -w) ##7
+
+ ## doors
+ Ogre.Real l2 = doorDimensions.x/2
+ Ogre.Real h2 = doorDimensions.y/2
+ Ogre.Real w2 = doorDimensions.z/2
+
+ ## front door
+ points[8] = Ogre.Vector3(-l2, h2, w) ##8
+ points[9] = Ogre.Vector3(-l2, -h2, w) ##9
+ points[10] = Ogre.Vector3(l2, -h2, w) ##10
+ points[11] = Ogre.Vector3(l2, h2, w) ##11
+
+ ## back door
+ points[12] = Ogre.Vector3(-l2, h2, -w) ##12
+ points[13] = Ogre.Vector3(-l2, -h2, -w) ##13
+ points[14] = Ogre.Vector3(l2, -h2, -w) ##14
+ points[15] = Ogre.Vector3(l2, h2, -w) ##15
+
+ ## top door
+ points[16] = Ogre.Vector3(-l2, h, -w2) ##16
+ points[17] = Ogre.Vector3(-l2, h, w2) ##17
+ points[18] = Ogre.Vector3(l2, h, w2) ##18
+ points[19] = Ogre.Vector3(l2, h, -w2) ##19
+
+ ## bottom door
+ points[20] = Ogre.Vector3(-l2, -h, -w2) ##20
+ points[21] = Ogre.Vector3(-l2, -h, w2) ##21
+ points[22] = Ogre.Vector3(l2, -h, w2) ##22
+ points[23] = Ogre.Vector3(l2, -h, -w2) ##23
+
+ ## left door
+ points[24] = Ogre.Vector3(-l, h2, w2) ##24
+ points[25] = Ogre.Vector3(-l, -h2, w2) ##25
+ points[26] = Ogre.Vector3(-l, -h2, -w2) ##26
+ points[27] = Ogre.Vector3(-l, h2, -w2) ##27
+
+ ## right door
+ points[28] = Ogre.Vector3(l, h2, w2) ##28
+ points[29] = Ogre.Vector3(l, -h2, w2) ##29
+ points[30] = Ogre.Vector3(l, -h2, -w2) ##30
+ points[31] = Ogre.Vector3(l, h2, -w2) ##31
+
+
+void RoomObject.createWalls(Ogre::ManualObject* room,
+ short doorFlags,
+ bool isEnclosure)
+
+
+ if (isEnclosure):
+
+ if(doorFlags & DOOR_FRONT):
+
+ ## make front wall outward facing with door
+ room->quad(0, 8, 11, 3)
+ room->quad(1, 9, 8, 0)
+ room->quad(2, 10, 9, 1)
+ room->quad(3, 11, 10, 2)
+
+ else:
+
+ ## make front wall outward facing without door
+ room->quad(0, 1, 2, 3)
+
+ if(doorFlags & DOOR_BACK):
+
+ ## make back wall outward facing with door
+ room->quad(7, 15, 12, 4)
+ room->quad(6, 14, 15, 7)
+ room->quad(5, 13, 14, 6)
+ room->quad(4, 12, 13, 5)
+
+ else:
+
+ ## make back wall outward facing without door
+ room->quad(7, 6, 5, 4)
+
+ if(doorFlags & DOOR_TOP):
+
+ ## make top wall outward facing with door
+ room->quad(0, 17, 16, 4)
+ room->quad(4, 16, 19, 7)
+ room->quad(7, 19, 18, 3)
+ room->quad(3, 18, 17, 0)
+
+ else:
+
+ ## make top wall outward facing without door
+ room->quad(0, 3, 7, 4)
+
+ if(doorFlags & DOOR_BOT):
+
+ ## make bottom wall outward facing with door
+ room->quad(5, 20, 21, 1)
+ room->quad(6, 23, 20, 5)
+ room->quad(2, 22, 23, 6)
+ room->quad(1, 21, 22, 2)
+
+ else:
+
+ ## make bottom wall outward facing without door
+ room->quad(2, 1, 5, 6)
+
+ if(doorFlags & DOOR_LEFT):
+
+ ## make left wall outward facing with door
+ room->quad(0, 24, 25, 1)
+ room->quad(4, 27, 24, 0)
+ room->quad(5, 26, 27, 4)
+ room->quad(1, 25, 26, 5)
+
+ else:
+
+ ## make left side wall outward facing without door
+ room->quad(1, 0, 4, 5)
+
+ if(doorFlags & DOOR_RIGHT):
+
+ ## make right wall outward facing with door
+ room->quad(2, 29, 28, 3)
+ room->quad(6, 30, 29, 2)
+ room->quad(7, 31, 30, 6)
+ room->quad(3, 28, 31, 7)
+
+ else:
+
+ ## make right side wall outward facing without door
+ room->quad(3, 2, 6, 7)
+
+
+ else:
+
+ ## front back
+ if(doorFlags & DOOR_FRONT):
+
+ ## make front wall inward facing with door
+ room->quad(3, 11, 8, 0)
+ room->quad(0, 8, 9, 1)
+ room->quad(1, 9, 10, 2)
+ room->quad(2, 10, 11, 3)
+
+ else:
+
+ ## make front wall inward facing without door
+ room->quad(3, 2, 1, 0)
+
+ if(doorFlags & DOOR_BACK):
+
+ ## make back wall inward facing with door
+ room->quad(4, 12, 15, 7)
+ room->quad(7, 15, 14, 6)
+ room->quad(6, 14, 13, 5)
+ room->quad(5, 13, 12, 4)
+
+ else:
+
+ ## make back wall inward facing without door
+ room->quad(4, 5, 6, 7)
+
+ ## top bottom
+ if(doorFlags & DOOR_TOP):
+
+ ## make top wall inward facing with door
+ room->quad(4, 16, 17, 0)
+ room->quad(7, 19, 16, 4)
+ room->quad(3, 18, 19, 7)
+ room->quad(0, 17, 18, 3)
+
+ else:
+
+ ## make top wall inward facing without door
+ room->quad(4, 7, 3, 0)
+
+ if(doorFlags & DOOR_BOT):
+
+ ## make bottom wall inward facing with door
+ room->quad(1, 21, 20, 5)
+ room->quad(5, 20, 23, 6)
+ room->quad(6, 23, 22, 2)
+ room->quad(2, 22, 21, 1)
+
+ else:
+
+ ## make bottom wall inward facing without door
+ room->quad(6, 5, 1, 2)
+
+ ## end caps
+ if(doorFlags & DOOR_LEFT):
+
+ ## make left wall inward facing with door
+ room->quad(1, 25, 24, 0)
+ room->quad(0, 24, 27, 4)
+ room->quad(4, 27, 26, 5)
+ room->quad(5, 26, 25, 1)
+
+ else:
+
+ ## make left side wall inward facing without door
+ room->quad(5, 4, 0, 1)
+
+ if(doorFlags & DOOR_RIGHT):
+
+ ## make right wall inward facing with door
+ room->quad(3, 28, 29, 2)
+ room->quad(2, 29, 30, 6)
+ room->quad(6, 30, 31, 7)
+ room->quad(7, 31, 28, 3)
+
+ else:
+
+ ## make right side wall inward facing without door
+ room->quad(7, 6, 2, 3)
+
+
+
+
+## Create portals for every door
+void RoomObject.createPortals(Ogre::SceneManager *scene,
+ Ogre.ManualObject* room,
+ Ogre.SceneNode * roomNode,
+ Ogre.PCZone * zone,
+ short doorFlags,
+ bool isEnclosure)
+
+ Ogre.String portalName
+ Vector3 corners[4]
+
+ if (isEnclosure):
+
+ if(doorFlags & DOOR_FRONT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[8]
+ corners[1] = points[9]
+ corners[2] = points[10]
+ corners[3] = points[11]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_FrontDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_BACK):
+
+ ## set the corners to the front door corners
+ corners[0] = points[15]
+ corners[1] = points[14]
+ corners[2] = points[13]
+ corners[3] = points[12]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_BackDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_TOP):
+
+ ## set the corners to the front door corners
+ corners[0] = points[16]
+ corners[1] = points[17]
+ corners[2] = points[18]
+ corners[3] = points[19]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_TopDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_BOT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[23]
+ corners[1] = points[22]
+ corners[2] = points[21]
+ corners[3] = points[20]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_BottomDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_LEFT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[27]
+ corners[1] = points[26]
+ corners[2] = points[25]
+ corners[3] = points[24]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_LeftDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_RIGHT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[28]
+ corners[1] = points[29]
+ corners[2] = points[30]
+ corners[3] = points[31]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_RightDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+
+ else:
+
+ if(doorFlags & DOOR_FRONT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[11]
+ corners[1] = points[10]
+ corners[2] = points[9]
+ corners[3] = points[8]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_FrontDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_BACK):
+
+ ## set the corners to the front door corners
+ corners[0] = points[12]
+ corners[1] = points[13]
+ corners[2] = points[14]
+ corners[3] = points[15]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_BackDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_TOP):
+
+ ## set the corners to the front door corners
+ corners[0] = points[19]
+ corners[1] = points[18]
+ corners[2] = points[17]
+ corners[3] = points[16]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_TopDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_BOT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[20]
+ corners[1] = points[21]
+ corners[2] = points[22]
+ corners[3] = points[23]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_BottomDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_LEFT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[24]
+ corners[1] = points[25]
+ corners[2] = points[26]
+ corners[3] = points[27]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_LeftDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_RIGHT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[31]
+ corners[1] = points[30]
+ corners[2] = points[29]
+ corners[3] = points[28]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_RightDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+
+
+
+## Create portals for every door
+void RoomObject.createPortals(Ogre::SceneManager *scene,
+ Ogre.Entity* room,
+ Ogre.SceneNode * roomNode,
+ Ogre.PCZone * zone,
+ short doorFlags,
+ bool isEnclosure)
+
+ Ogre.String portalName
+ Vector3 corners[4]
+
+ if (isEnclosure):
+
+ if(doorFlags & DOOR_FRONT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[8]
+ corners[1] = points[9]
+ corners[2] = points[10]
+ corners[3] = points[11]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_FrontDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_BACK):
+
+ ## set the corners to the front door corners
+ corners[0] = points[15]
+ corners[1] = points[14]
+ corners[2] = points[13]
+ corners[3] = points[12]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_BackDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_TOP):
+
+ ## set the corners to the front door corners
+ corners[0] = points[16]
+ corners[1] = points[17]
+ corners[2] = points[18]
+ corners[3] = points[19]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_TopDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_BOT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[23]
+ corners[1] = points[22]
+ corners[2] = points[21]
+ corners[3] = points[20]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_BottomDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_LEFT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[27]
+ corners[1] = points[26]
+ corners[2] = points[25]
+ corners[3] = points[24]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_LeftDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_RIGHT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[28]
+ corners[1] = points[29]
+ corners[2] = points[30]
+ corners[3] = points[31]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_RightDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+
+ else:
+
+ if(doorFlags & DOOR_FRONT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[11]
+ corners[1] = points[10]
+ corners[2] = points[9]
+ corners[3] = points[8]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_FrontDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_BACK):
+
+ ## set the corners to the front door corners
+ corners[0] = points[12]
+ corners[1] = points[13]
+ corners[2] = points[14]
+ corners[3] = points[15]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_BackDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_TOP):
+
+ ## set the corners to the front door corners
+ corners[0] = points[19]
+ corners[1] = points[18]
+ corners[2] = points[17]
+ corners[3] = points[16]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_TopDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_BOT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[20]
+ corners[1] = points[21]
+ corners[2] = points[22]
+ corners[3] = points[23]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_BottomDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_LEFT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[24]
+ corners[1] = points[25]
+ corners[2] = points[26]
+ corners[3] = points[27]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_LeftDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+ if(doorFlags & DOOR_RIGHT):
+
+ ## set the corners to the front door corners
+ corners[0] = points[31]
+ corners[1] = points[30]
+ corners[2] = points[29]
+ corners[3] = points[28]
+ ## create the portal
+ portalName = room->getName() + Ogre.String("_RightDoorPortal")
+ Portal * p = ((PCZSceneManager*)scene)->createPortal(portalName)
+ p->setCorners(corners)
+ ## associate the portal with the roomnode
+ p->setNode(roomNode)
+ ## add the portal to the zone
+ zone->_addPortal(p)
+ ## update derived values for the portal
+ p->updateDerivedValues()
+
+
+
Added: trunk/python-ogre/demos/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/plugins.cfg (rev 0)
+++ trunk/python-ogre/demos/plugins.cfg 2008-07-29 12:56:20 UTC (rev 678)
@@ -0,0 +1,21 @@
+# Defines plugins to load
+
+## Use this for Windows
+# Define plugin folder
+PluginFolder=../../plugins
+#home/andy/development/root/usr/lib/OGRE
+Plugin=RenderSystem_GL.dll
+Plugin=RenderSystem_Direct3D9.dll
+Plugin=Plugin_ParticleFX.dll
+Plugin=Plugin_BSPSceneManager.dll
+Plugin=Plugin_OctreeSceneManager.dll
+Plugin=Plugin_CgProgramManager.dll
+Plugin=Plugin_PCZSceneManager.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/resources.cfg
===================================================================
--- trunk/python-ogre/demos/resources.cfg (rev 0)
+++ trunk/python-ogre/demos/resources.cfg 2008-07-29 12:56:20 UTC (rev 678)
@@ -0,0 +1,24 @@
+[Bootstrap]
+Zip=../media/packs/OgreCore.zip
+
+# Resource locations to be added to the default path
+[General]
+FileSystem=../media
+FileSystem=../media/fonts
+FileSystem=../media/sounds
+FileSystem=../media/Audio
+FileSystem=../media/materials/programs
+FileSystem=../media/materials/scripts
+FileSystem=../media/materials/textures
+FileSystem=../media/models
+FileSystem=../media/overlays
+FileSystem=../media/particle
+FileSystem=../media/gui
+Zip=../media/packs/cubemap.zip
+Zip=../media/packs/cubemapsJS.zip
+Zip=../media/packs/dragon.zip
+Zip=../media/packs/fresneldemo.zip
+Zip=../media/packs/ogretestmap.zip
+Zip=../media/packs/skybox.zip
+#Zip=../media/packs/chiropteraDM.pk3
+
Modified: trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-07-29 10:25:07 UTC (rev 677)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-07-29 12:56:20 UTC (rev 678)
@@ -9,6 +9,11 @@
# You may use this sample code for anything you like, it is not covered by the
# LGPL.
# -----------------------------------------------------------------------------
+
+#
+# 29 July 2008: Ensured that resources.cfg and plugins.cfg can exist in the parent directory
+#
+
import ogre.renderer.OGRE as ogre
import ogre.io.OIS as OIS
###import OgreRefApp
@@ -20,7 +25,7 @@
import os.path
paths = [os.path.join(os.getcwd(), 'plugins.cfg'),
- os.path.join(os.getcwd(), '../plugins.cfg'),
+ os.path.join(os.getcwd(), '..','plugins.cfg'),
'/etc/OGRE/plugins.cfg',
os.path.join(os.path.dirname(os.path.abspath(__file__)),
'plugins.cfg')]
@@ -107,7 +112,16 @@
"""This sets up Ogre's resources, which are required to be in
resources.cfg."""
config = ogre.ConfigFile()
- config.load('resources.cfg' )
+ try:
+ config.load('resources.cfg')
+ except ogre.OgreFileNotFoundException:
+ try:
+ config.load('../resources.cfg')
+ except:
+ raise
+ except:
+ raise
+
seci = config.getSectionIterator()
while seci.hasMoreElements():
SectionName = seci.peekNextKey()
@@ -276,7 +290,9 @@
self.InputManager.destroyInputObjectJoyStick( self.Joy )
OIS.InputManager.destroyInputSystem(self.InputManager)
self.InputManager=None
-
+
+ ## NOTE the in Ogre 1.6 (1.7) this is changed to frameRenderingQueued !!!
+
def frameStarted(self, frameEvent):
if(self.renderWindow.isClosed()):
return False
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-07-29 10:24:57
|
Revision: 677
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=677&view=rev
Author: andy_miller
Date: 2008-07-29 10:25:07 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Add the ogrepcz module to setup.py and the packages directory
Modified Paths:
--------------
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/packages_2.5/ogre/renderer/ogrepcz/
trunk/python-ogre/packages_2.5/ogre/renderer/ogrepcz/__init__.py
Added: trunk/python-ogre/packages_2.5/ogre/renderer/ogrepcz/__init__.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/ogrepcz/__init__.py (rev 0)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/ogrepcz/__init__.py 2008-07-29 10:25:07 UTC (rev 677)
@@ -0,0 +1,13 @@
+import sys, os
+import warnings
+warnings.simplefilter('ignore', RuntimeWarning)
+
+# Note that we put the Python-Ogre path first to ensure we don't get strange problems with windows
+# picking up the wrong dlls -- Thanks to Pelle for tracking down this issue..
+if sys.platform == 'win32':
+ os.environ['PATH'] = __path__[0] +';' + os.environ['PATH']
+
+from _ogrepcz_ import *
+
+warnings.resetwarnings( )
+
Modified: trunk/python-ogre/setup.py
===================================================================
--- trunk/python-ogre/setup.py 2008-07-29 09:34:29 UTC (rev 676)
+++ trunk/python-ogre/setup.py 2008-07-29 10:25:07 UTC (rev 677)
@@ -71,7 +71,8 @@
'ogre.addons.plib','ogre.gui.navi',
'ogre.addons.ogreforests', 'ogre.addons.et', 'ogre.addons.caelum',
'ogre.addons.noise', 'ogre.addons.watermesh', 'ogre.addons.ofusion',
- 'ogre.addons.particleuniverse', 'ogre.addons.cadunetree' ],
+ 'ogre.addons.particleuniverse', 'ogre.addons.cadunetree',
+ 'ogre.renderer.ogrepcz' ],
"package_dir": {'': 'packages_'+ PythonVersionString },
"package_data": {'': ['*.pyd', '*.dll', '*.so']}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-07-29 09:34:21
|
Revision: 676
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=676&view=rev
Author: andy_miller
Date: 2008-07-29 09:34:29 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Initial Implementation for the PCZ Portal Scene Manager
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/demos/theora/demo_video.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/code_generators/ogrepcz/
trunk/python-ogre/code_generators/ogrepcz/customization_data.py
trunk/python-ogre/code_generators/ogrepcz/generate_code.py
trunk/python-ogre/code_generators/ogrepcz/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h
trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz_aliases.h
trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz_sizeof.h
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-07-28 06:56:57 UTC (rev 675)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-07-29 09:34:29 UTC (rev 676)
@@ -81,6 +81,7 @@
PATH_navi = os.path.join(BASE_DIR, 'navi', 'navi')
PATH_particleuniverse = os.path.join(PATH_Ogre, 'PlugIns', 'ParticleUniverse' )
+PATH_ogrepcz = os.path.join(PATH_Ogre, 'PlugIns', 'PCZSceneManager' )
# it's time for the SDK version
if SDK:
@@ -174,6 +175,7 @@
##PATH_INCLUDE_ogreforests = os.path.join (PATH_ogreforests,'include')
PATH_INCLUDE_ogreforests = PATH_ogreforests
PATH_INCLUDE_particleuniverse = os.path.join(PATH_particleuniverse, 'include' )
+PATH_INCLUDE_ogrepcz = os.path.join(PATH_ogrepcz,'include')
PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
,os.path.join(BASE_DIR, 'vorbis', 'include')
Added: trunk/python-ogre/code_generators/ogrepcz/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/customization_data.py (rev 0)
+++ trunk/python-ogre/code_generators/ogrepcz/customization_data.py 2008-07-29 09:34:29 UTC (rev 676)
@@ -0,0 +1,17 @@
+
+def header_files( version ):
+ return ["Ogre.h",
+ "OgrePortal.h",
+ "OgrePCZSceneNode.h",
+ "OgrePCZone.h",
+ "OgrePCZSceneManager.h",
+ "OgrePCZSceneQuery.h",
+ "OgrePCZLight.h",
+ "OgrePCPlane.h",
+ "OgrePCZFrustum.h"
+
+ ]
+
+def huge_classes( version ):
+ return []
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/ogrepcz/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/generate_code.py (rev 0)
+++ trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2008-07-29 09:34:29 UTC (rev 676)
@@ -0,0 +1,341 @@
+#!/usr/bin/env python
+# -----------------------------------------------------------------------------
+# This source file is part of Python-MAIN_NAMESPACE and is covered by the LGPL
+# For the latest info, see http://python-ogre.org/
+#
+# -----------------------------------------------------------------------------
+
+## STARTER TEMPLATE..
+## replace ogrepcz with lowercase project name
+## set MAIN_NAMESPACE
+## rename and configure .h files
+
+
+import os, sys, time, shutil
+
+#add environment to the path
+sys.path.append( os.path.join( '..', '..' ) )
+#add common utils to the pass
+sys.path.append( '..' )
+sys.path.append( '.' )
+
+import environment
+import common_utils
+import customization_data
+import hand_made_wrappers
+
+
+from pygccxml import parser
+from pygccxml import declarations
+from pyplusplus import messages
+from pyplusplus import module_builder
+from pyplusplus import decl_wrappers
+
+from pyplusplus import function_transformers as ft
+from pyplusplus.module_builder import call_policies
+from pyplusplus.module_creator import sort_algorithms
+
+import common_utils.extract_documentation as exdoc
+import common_utils.var_checker as varchecker
+import common_utils.ogre_properties as ogre_properties
+from common_utils import docit
+
+MAIN_NAMESPACE = 'Ogre'
+
+############################################################
+##
+## Here is where we manually exclude stuff
+##
+############################################################
+
+def ManualExclude ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+ excludes=['::Ogre::PCZCamera',
+ '::Ogre::PCZSceneManagerFactory'
+ ]
+ for e in excludes:
+ main_ns.class_(e).exclude()
+ print "Excluded Class:", e
+
+ excludes=['::Ogre::PCZSceneManagerFactory::initMetaData',
+ '::Ogre::PCZSceneManagerFactory::createInstance',
+ '::Ogre::PCZSceneManagerFactory::destroyInstance'
+ ]
+ for e in excludes:
+ main_ns.member_functions(e).exclude()
+ print "Excluded Member Function:", e
+
+ excludes=['::Ogre::PCZSceneManagerFactory::FACTORY_TYPE_NAME'
+ ]
+ for e in excludes:
+ main_ns.variable(e).exclude()
+ print "Excluded Variable:", e
+
+############################################################
+##
+## And there are things that manually need to be INCLUDED
+##
+############################################################
+
+def ManualInclude ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+############################################################
+##
+## And things that need manual fixes, but not necessarly hand wrapped
+##
+############################################################
+def ManualFixes ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+ for c in global_ns.classes():
+ if c.decl_string.startswith("::std::vector<Ogre::PlaneBoundedVolume, std::allocator<Ogre::PlaneBoundedVolume> >"):
+ print "Excluding:", c
+ c.include(already_exposed=True)
+ try:
+ global_ns.namespace("std").class_('vector<Ogre::PlaneBoundedVolume>, std::allocator<Ogre::BoundedVolume> >').exclude()
+ print "OK1"
+ except:
+ print "FAIL1"
+ try:
+ main_ns.class_("std::vector<Ogre::PlaneBoundedVolume, std::allocator<Ogre::PlaneBoundedVolume> >").exclude()
+ print "OK2"
+ except:
+ print "FAIL2"
+ try:
+ main_ns.class_("::std::vector<Ogre::PlaneBoundedVolume, std::allocator<Ogre::PlaneBoundedVolume> >").exclude()
+ print "OK3"
+ except:
+ print "FAIL3"
+
+############################################################
+##
+## And things that need to have their argument and call values fixed.
+## ie functions that pass pointers in the argument list and of course we need
+## to read the updated values - so instead we pass them back
+## as new values in a tuple (ETC ETC)
+##
+############################################################
+
+def ManualTransformations ( mb ):
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+ def create_output( size ):
+ return [ ft.output( i ) for i in range( size ) ]
+
+# # # this is from the Ogre generate wrapper and is needed to remove vertexData from the camera
+# # known = ['indexBuffer', 'vertexData', 'indexData']
+# # for c in mb.classes():
+# # for v in c.variables(allow_empty = True ):
+# # if v.name in known:
+# # v.apply_smart_ptr_wa = True
+# # print "Applying Smart Pointer (know): ", v.name, " of class: ", c.name
+
+
+###############################################################################
+##
+## Now for the AUTOMATIC stuff that should just work
+##
+###############################################################################
+
+def AutoFixes ( mb, MAIN_NAMESPACE ):
+ """ now we fix a range of things automatically - typically by going through
+ the entire name space trying to guess stuff and fix it:)
+ """
+ global_ns = mb.global_ns
+ if MAIN_NAMESPACE:
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ else:
+ main_ns = global_ns
+
+ # Functions that have void pointers in their argument list need to change to unsigned int's
+ pointee_types=[]
+ ignore_names=[]
+ common_utils.Fix_Void_Ptr_Args ( main_ns ) # , pointee_types, ignore_names )
+
+ # and change functions that return a variety of pointers to instead return unsigned int's
+ pointee_types=[]
+ ignore_names=[] # these are function names we know it's cool to exclude
+ common_utils.Fix_Pointer_Returns ( main_ns ) # , pointee_types, ignore_names )
+
+ # functions that need to have implicit conversions turned off
+ ImplicitClasses=[]
+ common_utils.Fix_Implicit_Conversions ( main_ns, ImplicitClasses )
+
+ if os.name =='nt':
+ Fix_NT( mb )
+ elif os.name =='posix':
+ Fix_Posix( mb )
+
+ common_utils.Auto_Document( mb, MAIN_NAMESPACE )
+
+
+###############################################################################
+##
+## here are the helper functions that do much of the work
+##
+###############################################################################
+def Fix_Posix ( mb ):
+ """ fixup for posix specific stuff -- note only expect to be called on a posix machine
+ """
+ ## we could do more here if need be...
+ if sys.platform == 'darwin':
+ pass
+ elif sys.platform.startswith ('linux'):
+ pass
+
+
+def Fix_NT ( mb ):
+ """ fixup for NT systems
+ """
+
+
+#
+# the 'main'function
+#
+def generate_code():
+ messages.disable(
+# Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
+ messages.W1020
+ , messages.W1021
+ , messages.W1022
+ , messages.W1023
+ , messages.W1024
+ , messages.W1025
+ , messages.W1026
+ , messages.W1027
+ , messages.W1028
+ , messages.W1029
+ , messages.W1030
+ , messages.W1031
+ , messages.W1035
+ , messages.W1040
+ , messages.W1038
+ , messages.W1041
+ , messages.W1036 # pointer to Python immutable member
+ , messages.W1033 # unnamed variables
+ , messages.W1018 # expose unnamed classes
+ , messages.W1049 # returns reference to local variable
+ , messages.W1014 # unsupported '=' operator
+ )
+ #
+ # Use GCCXML to create the controlling XML file.
+ # If the cache file (../cache/*.xml) doesn't exist it gets created, otherwise it just gets loaded
+ # NOTE: If you update the source library code you need to manually delete the cache .XML file
+ #
+ xml_cached_fc = parser.create_cached_source_fc(
+ os.path.join( environment.ogrepcz.root_dir, "python_ogrepcz.h" )
+ , environment.ogrepcz.cache_file )
+
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY']
+ defined_symbols.append( 'VERSION_' + environment.ogrepcz.version )
+
+ #
+ # build the core Py++ system from the GCCXML created source
+ #
+ mb = module_builder.module_builder_t( [ xml_cached_fc ]
+ , gccxml_path=environment.gccxml_bin
+ , working_directory=environment.root_dir
+ , include_paths=environment.ogrepcz.include_dirs
+ , define_symbols=defined_symbols
+ , indexing_suite_version=2
+ , cflags=environment.ogrepcz.cflags
+ )
+
+ # if this module depends on another set it here
+ mb.register_module_dependency ( environment.ogre.generated_dir )
+
+ # normally implicit conversions work OK, however they can cause strange things to happen so safer to leave off
+ mb.constructors().allow_implicit_conversion = False
+
+ mb.BOOST_PYTHON_MAX_ARITY = 25
+ mb.classes().always_expose_using_scope = True
+
+ #
+ # We filter (both include and exclude) specific classes and functions that we want to wrap
+ #
+ global_ns = mb.global_ns
+ global_ns.exclude()
+
+ # We don't include all of MAIN_NAMESPACE otherwise we get the same full wrapper
+ # so instead we include classes with names that start with PCZ
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+# main_ns.include()
+ for c in main_ns.classes():
+ if c.name.startswith ('PCZ'):
+ print "Including ", c
+ c.include()
+
+ common_utils.AutoExclude ( mb, MAIN_NAMESPACE )
+ ManualExclude ( mb )
+ common_utils.AutoInclude ( mb, MAIN_NAMESPACE )
+ ManualInclude ( mb )
+ # here we fixup functions that expect to modifiy their 'passed' variables
+ ManualTransformations ( mb )
+ AutoFixes ( mb, MAIN_NAMESPACE )
+ ManualFixes ( mb )
+ #
+ # We need to tell boost how to handle calling (and returning from) certain functions
+ #
+ common_utils.Set_DefaultCall_Policies ( mb.global_ns.namespace ( MAIN_NAMESPACE ) )
+
+ #
+ # the manual stuff all done here !!!
+ #
+ hand_made_wrappers.apply( mb )
+
+ NoPropClasses = [""]
+ for cls in main_ns.classes():
+ if cls.name not in NoPropClasses:
+ cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
+
+ common_utils.add_constants( mb, { 'ogrepcz_version' : '"%s"' % environment.ogrepcz.version.replace("\n", "\\\n")
+ , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
+
+ ## need to create a welcome doc string for this...
+ common_utils.add_constants( mb, { '__doc__' : '"ogrepcz DESCRIPTION"' } )
+
+
+ ##########################################################################################
+ #
+ # Creating the code. After this step you should not modify/customize declarations.
+ #
+ ##########################################################################################
+ extractor = exdoc.doc_extractor() # I'm excluding the UTFstring docs as lots about nothing
+ mb.build_code_creator (module_name='_ogrepcz_' , doc_extractor= extractor )
+
+ for inc in environment.ogrepcz.include_dirs:
+ mb.code_creator.user_defined_directories.append(inc )
+ mb.code_creator.user_defined_directories.append( environment.ogrepcz.generated_dir )
+ mb.code_creator.replace_included_headers( customization_data.header_files( environment.ogrepcz.version ) )
+
+ huge_classes = map( mb.class_, customization_data.huge_classes( environment.ogrepcz.version ) )
+
+ mb.split_module(environment.ogrepcz.generated_dir, huge_classes, use_files_sum_repository=False)
+
+ ## now we need to ensure a series of headers and additional source files are
+ ## copied to the generated directory..
+
+# common_utils.copyTree ( sourcePath = environment.Config.PATH_INCLUDE_ogrepcz,
+# destPath = environment.ogrepcz.generated_dir,
+# recursive=False )
+
+if __name__ == '__main__':
+ start_time = time.clock()
+ generate_code()
+ print 'Source code was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
Added: trunk/python-ogre/code_generators/ogrepcz/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/hand_made_wrappers.py (rev 0)
+++ trunk/python-ogre/code_generators/ogrepcz/hand_made_wrappers.py 2008-07-29 09:34:29 UTC (rev 676)
@@ -0,0 +1,15 @@
+import os
+import environment
+
+
+
+#################################################################################################
+#################################################################################################
+
+def apply_reg ( class_, code ):
+ for c in code:
+ class_.add_registration_code ( c )
+
+def apply( mb ):
+ pass
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h (rev 0)
+++ trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h 2008-07-29 09:34:29 UTC (rev 676)
@@ -0,0 +1,27 @@
+#include "Ogre.h"
+#include "OgrePortal.h"
+#include "OgrePCZSceneNode.h"
+#include "OgrePCZone.h"
+#include "OgrePCZSceneManager.h"
+#include "OgrePCZSceneQuery.h"
+#include "OgrePCZLight.h"
+#include "OgrePCPlane.h"
+#include "OgrePCZFrustum.h"
+
+
+// First we create a magic namespace to hold all our aliases
+namespace pyplusplus { namespace aliases {
+
+ #include "python_ogrepcz_aliases.h"
+} }
+
+// then we exposed everything needed (and more) to ensure GCCXML makes them visible to Py++
+//
+namespace python_ogrepcz{ namespace details{
+inline void instantiate(){
+ using namespace Ogre;
+ #include "python_ogrepcz_sizeof.h"
+
+} } }
+
+
Added: trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz_aliases.h (rev 0)
+++ trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz_aliases.h 2008-07-29 09:34:29 UTC (rev 676)
@@ -0,0 +1 @@
+// typedef name nicename;
Added: trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz_sizeof.h (rev 0)
+++ trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz_sizeof.h 2008-07-29 09:34:29 UTC (rev 676)
@@ -0,0 +1 @@
+// sizeof ( variable );
Modified: trunk/python-ogre/demos/theora/demo_video.py
===================================================================
--- trunk/python-ogre/demos/theora/demo_video.py 2008-07-28 06:56:57 UTC (rev 675)
+++ trunk/python-ogre/demos/theora/demo_video.py 2008-07-29 09:34:29 UTC (rev 676)
@@ -42,12 +42,12 @@
if not self.Control:
print "\n\nClip not found\n"
sys.exit()
- self.Control.setInputName( '../media_extra/fish.ogg' )
+ self.Control.setInputName( '../media_extra/konqi_ad1_nl.avi.ogg') ##fish.ogg' )
self.Control.setPlayMode(theora.TextureEffectPause )
self.Control.setTextureTecPassStateLevel( 0, 0, 0 )
self.Control.setSeekEnabled( False )
-# self.Control.setAutoAudioUpdate ( True )
+ self.Control.setAutoAudioUpdate ( True )
mat = ogre.MaterialManager.getSingleton().getByName("Example/TheoraVideoPlayer/Play")
#Create the material the first time through this method
@@ -97,7 +97,6 @@
ret = sf.FrameListener.frameStarted(self, frameEvent)
if self.video and ret:
self.video.blitFrameCheck()
- self.video.getAudioDriver().autoUpdate()
return ret
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-28 06:56:57 UTC (rev 675)
+++ trunk/python-ogre/environment.py 2008-07-29 09:34:29 UTC (rev 676)
@@ -1569,6 +1569,24 @@
libs=[ boost.lib, 'OgreMain' ]
ModuleName="cadunetree"
+class ogrepcz:
+ active = False
+ pythonModule = True
+ version="1.0"
+ name='ogrepcz'
+ parent="ogre/renderer"
+ cflags = ""
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_INCLUDE_Ogre,
+ Config.PATH_INCLUDE_ogrepcz
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost,
+ Config.PATH_LIB_Ogre_OgreMain
+ ]
+ CheckIncludes=[]
+ libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
+ ModuleName="ogrepcz"
+
class opensteer:
active = False
pythonModule = True
@@ -1647,6 +1665,7 @@
, 'particleuniverse' : particleuniverse
, 'cadunetree' : cadunetree
,'opensteer' : opensteer
+ ,'ogrepcz' : ogrepcz
}
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-07-28 06:56:49
|
Revision: 675
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=675&view=rev
Author: andy_miller
Date: 2008-07-28 06:56:57 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
Minor change to windows build messages and Physx wrapper
Modified Paths:
--------------
trunk/python-ogre/code_generators/physx/python_physx_sizeof.h
trunk/python-ogre/demos/theora/demo_video.py
trunk/python-ogre/demos/theora/resources.cfg
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/code_generators/physx/python_physx_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/physx/python_physx_sizeof.h 2008-07-24 12:45:21 UTC (rev 674)
+++ trunk/python-ogre/code_generators/physx/python_physx_sizeof.h 2008-07-28 06:56:57 UTC (rev 675)
@@ -4,4 +4,10 @@
sizeof(_Nx3F32);
sizeof(NxUserEntityReport<unsigned int>);
sizeof(NxUserEntityReport<NxShape*>);
+sizeof ( NxForceFieldShapeGroup );
+sizeof ( NxArray<NxForceFieldShapeGroup*, NxAllocatorDefault> );
+sizeof ( NxArray<NxShapeDesc*, NxAllocatorDefault> );
+sizeof ( NxArray<NxFluidEmitterDesc, NxAllocatorDefault> );
+sizeof ( NxArray<NxForceFieldShapeDesc*, NxAllocatorDefault> );
+sizeof ( _Nx3F32 );
Modified: trunk/python-ogre/demos/theora/demo_video.py
===================================================================
--- trunk/python-ogre/demos/theora/demo_video.py 2008-07-24 12:45:21 UTC (rev 674)
+++ trunk/python-ogre/demos/theora/demo_video.py 2008-07-28 06:56:57 UTC (rev 675)
@@ -47,7 +47,7 @@
self.Control.setTextureTecPassStateLevel( 0, 0, 0 )
self.Control.setSeekEnabled( False )
- self.Control.setAutoAudioUpdate ( True )
+# self.Control.setAutoAudioUpdate ( True )
mat = ogre.MaterialManager.getSingleton().getByName("Example/TheoraVideoPlayer/Play")
#Create the material the first time through this method
@@ -97,6 +97,7 @@
ret = sf.FrameListener.frameStarted(self, frameEvent)
if self.video and ret:
self.video.blitFrameCheck()
+ self.video.getAudioDriver().autoUpdate()
return ret
Modified: trunk/python-ogre/demos/theora/resources.cfg
===================================================================
--- trunk/python-ogre/demos/theora/resources.cfg 2008-07-24 12:45:21 UTC (rev 674)
+++ trunk/python-ogre/demos/theora/resources.cfg 2008-07-28 06:56:57 UTC (rev 675)
@@ -3,6 +3,7 @@
# Resource locations to be added to the default path
[General]
+FileSystem=.
FileSystem=../media
FileSystem=../media_extra
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-24 12:45:21 UTC (rev 674)
+++ trunk/python-ogre/environment.py 2008-07-28 06:56:57 UTC (rev 675)
@@ -849,7 +849,8 @@
]
buildCmds = [
[0, unzip + " " + os.path.join(downloadPath,base)+".zip", os.getcwd()],
- [0, 'echo Please use MSVC to build the CEGUI Release project',''],
+ [0, 'echo Now run build_vs2008.bat from the CEGUI makefiles\premake directory',''],
+ [0, 'echo then use MSVC to build the CEGUI Release project',''],
[0, 'echo WARNING - Check that RTTI is enabled in the compiler options',''],
[0, 'echo Then ensure that OgreGUIRender is compiled with this version of CEGUI','']
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-24 12:45:12
|
Revision: 674
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=674&view=rev
Author: mithro
Date: 2008-07-24 12:45:21 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
Remove nvidia-cg as a dependency.
Modified Paths:
--------------
trunk/python-ogre/debian/control
Modified: trunk/python-ogre/debian/control
===================================================================
--- trunk/python-ogre/debian/control 2008-07-23 12:08:42 UTC (rev 673)
+++ trunk/python-ogre/debian/control 2008-07-24 12:45:21 UTC (rev 674)
@@ -6,7 +6,6 @@
Build-Depends-Indep: python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all
Build-Depends: debhelper (>= 5.0.38),
cmake (>= 2.4.0), scons,
- nvidia-cg-toolkit,
zziplib-bin,
libboost-dev (>= 1.34), libboost-dev (<= 1.35),
libboost-python-dev (>= 1.34), libboost-dev (<= 1.35),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-23 12:08:35
|
Revision: 673
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=673&view=rev
Author: mithro
Date: 2008-07-23 12:08:42 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Added support for ffmpeg module.
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_system.py
trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h
trunk/python-ogre/debian/changelog
trunk/python-ogre/debian/control
trunk/python-ogre/debian/rules
Modified: trunk/python-ogre/PythonOgreConfig_system.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_system.py 2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/PythonOgreConfig_system.py 2008-07-23 12:08:42 UTC (rev 673)
@@ -57,7 +57,7 @@
PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.66')
###PATH_PhysX= os.path.join(BASE_DIR, 'Physx/v2.7.3/SDKs')
PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
-PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
+PATH_ffmpeg= os.path.join(BASE_DIR) #, 'ffmpeg')
PATH_navi = os.path.join(BASE_DIR, 'navi','Navi')
PATH_particleuniverse = os.path.join(PATH_Ogre, 'PlugIns', 'ParticleUniverse' )
PATH_cadunetree= os.path.join(PATH_THIRDPARTY, 'cadunetree')
@@ -136,7 +136,7 @@
PATH_INCLUDE_TheoraDemo = os.path.join (PATH_Theora,'..', 'CEGUI_TheoraDemo','include')
PATH_INCLUDE_ogrevideoffmpeg = PATH_ogrevideoffmpeg
-PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
+PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include', 'ffmpeg')
PATH_INCLUDE_plib = PATH_plib
PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
PATH_INCLUDE_noise = PATH_noise
Modified: trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h
===================================================================
--- trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h 2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h 2008-07-23 12:08:42 UTC (rev 673)
@@ -5,13 +5,13 @@
#include "Ogre.h"
// // ffmpeg includes
-// #include <ffmpeg/avcodec.h>
-// #include <ffmpeg/avformat.h>
extern "C" {
#define __STDC_CONSTANT_MACROS
#define __STDC_LIMIT_MACROS
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
+#include <ffmpeg/avcodec.h>
+#include <ffmpeg/avformat.h>
+//#include <libavformat/avformat.h>
+//#include <libavcodec/avcodec.h>
}
using namespace Ogre;
Modified: trunk/python-ogre/debian/changelog
===================================================================
--- trunk/python-ogre/debian/changelog 2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/debian/changelog 2008-07-23 12:08:42 UTC (rev 673)
@@ -1,3 +1,8 @@
+python-ogre (0.0.0-5) unstable; urgency=low
+
+ * Fixed the ffmpeg package.
+
+ -- Tim 'Mithro' Ansell <mi...@mi...> Wed, 23 Jul 2008 22:06:51 +1000
python-ogre (0.0.0-4) unstable; urgency=low
* Fixed ogreal to link against boost_python_index.
Modified: trunk/python-ogre/debian/control
===================================================================
--- trunk/python-ogre/debian/control 2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/debian/control 2008-07-23 12:08:42 UTC (rev 673)
@@ -16,6 +16,7 @@
libceguiogre-dev (>= 1.4) | libogre-dev (<< 1.4.5),
libogre-dev (< 1.5),
libopenal-dev, libogg-dev, libvorbis-dev,
+ libavformat-dev, libavcodec-dev,
gccxml (>=0.7.0),
pygccxml, pyplusplus
Standards-Version: 3.7.2
Modified: trunk/python-ogre/debian/rules
===================================================================
--- trunk/python-ogre/debian/rules 2008-07-23 11:44:41 UTC (rev 672)
+++ trunk/python-ogre/debian/rules 2008-07-23 12:08:42 UTC (rev 673)
@@ -27,6 +27,7 @@
LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c plib
LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c ogreforests
LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c ogreal
+ LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c ogrevideoffmpeg
LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c watermesh
touch $@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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: <mi...@us...> - 2008-07-23 11:38:54
|
Revision: 671
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=671&view=rev
Author: mithro
Date: 2008-07-23 11:39:02 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Fixed some packages missing boost_python_index.
Fixed some excess linking for ogreal.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-23 10:04:31 UTC (rev 670)
+++ trunk/python-ogre/environment.py 2008-07-23 11:39:02 UTC (rev 671)
@@ -945,7 +945,7 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ]
ModuleName="caelum"
class ogreode:
@@ -1197,7 +1197,7 @@
if os.name == "nt":
libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ]
else:
- libs = [ boost.lib ] # Note sure what linux libraries are needed
+ libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
class physx:
active = True
@@ -1320,9 +1320,9 @@
[0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")],
[0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
]
- libs=[boost.lib, boost_python_index.lib, 'OgreMain',
- 'ogg',
- 'vorbis','vorbisfile','vorbisenc',
+ libs=[boost.lib, boost_python_index.lib, 'OgreMain', 'vorbisfile',
+ #'ogg',
+ #'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
ModuleName = 'OgreAL'
@@ -1386,7 +1386,7 @@
version= "2.2"
name='et'
parent = "ogre/addons"
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ]
lib_dirs = [ Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-23 10:04:31
|
Revision: 670
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=670&view=rev
Author: mithro
Date: 2008-07-23 10:04:31 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
More fixes to OgreAL.
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogreal/generate_code.py
trunk/python-ogre/debian/changelog
trunk/python-ogre/debian/rules
trunk/python-ogre/demos/ogreal/Demo_AL_01.py
Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-07-23 06:12:17 UTC (rev 669)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-07-23 10:04:31 UTC (rev 670)
@@ -107,7 +107,14 @@
context = main_ns.decl("ALCcontext_struct")
context.opaque = True
-
+
+ # These symbols are missing from the lib even though they are defined in
+ # the header file!
+ main_ns.decl("alSource3i").exclude()
+ main_ns.decl("alSourceiv").exclude()
+ main_ns.decl("alGetSource3i").exclude()
+ main_ns.decl("alGetSourceiv").exclude()
+
############################################################
##
## And things that need to have their argument and call values fixed.
@@ -304,9 +311,9 @@
## now we need to ensure a series of headers and additional source files are
## copied to the generated directory..
-# common_utils.copyTree ( sourcePath = environment.Config.PATH_Config.PATH_OGREAL,
-# destPath = environment.ogreal.generated_dir,
-# recursive=False )
+ common_utils.copyTree ( sourcePath = environment.Config.PATH_OGREAL,
+ destPath = environment.ogreal.generated_dir,
+ recursive=False )
if __name__ == '__main__':
start_time = time.clock()
Modified: trunk/python-ogre/debian/changelog
===================================================================
--- trunk/python-ogre/debian/changelog 2008-07-23 06:12:17 UTC (rev 669)
+++ trunk/python-ogre/debian/changelog 2008-07-23 10:04:31 UTC (rev 670)
@@ -1,3 +1,13 @@
+python-ogre (0.0.0-4) unstable; urgency=low
+
+ * Fixed ogreal to link against boost_python_index.
+
+ -- Tim 'Mithro' Ansell <mi...@mi...> Wed, 23 Jul 2008 16:13:51 +1000
+python-ogre (0.0.0-3) unstable; urgency=low
+
+ * Really fixed the CEGUI.loadWindowLayout method (now with defaults!).
+
+ -- Tim 'Mithro' Ansell <mi...@mi...> Wed, 16 Jul 2008 18:19:51 +1000
python-ogre (0.0.0-2) unstable; urgency=low
* Fixed the CEGUI.loadWindowLayout method.
Modified: trunk/python-ogre/debian/rules
===================================================================
--- trunk/python-ogre/debian/rules 2008-07-23 06:12:17 UTC (rev 669)
+++ trunk/python-ogre/debian/rules 2008-07-23 10:04:31 UTC (rev 670)
@@ -26,7 +26,7 @@
LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c et
LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c plib
LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c ogreforests
-# LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c ogreal
+ LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c ogreal
LD_PRELOAD='' python BuildModule.py --usesystem --failhard -g -c watermesh
touch $@
Modified: trunk/python-ogre/demos/ogreal/Demo_AL_01.py
===================================================================
--- trunk/python-ogre/demos/ogreal/Demo_AL_01.py 2008-07-23 06:12:17 UTC (rev 669)
+++ trunk/python-ogre/demos/ogreal/Demo_AL_01.py 2008-07-23 10:04:31 UTC (rev 670)
@@ -135,7 +135,7 @@
OgreAL.SoundManager.getSingleton().getSound("Roar").play()
- bgSound = self.soundManager.createSound("ZeroFactor", "Zero Factor - Untitled.ogg", True, True)
+ bgSound = self.soundManager.createSound("ZeroFactor", "6chan.ogg", True, True)
node = sceneManager.getRootSceneNode().createChildSceneNode("CameraNode")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-23 06:12:08
|
Revision: 669
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=669&view=rev
Author: mithro
Date: 2008-07-23 06:12:17 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Link OgreAL against boost_python_index.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-23 06:08:39 UTC (rev 668)
+++ trunk/python-ogre/environment.py 2008-07-23 06:12:17 UTC (rev 669)
@@ -1320,7 +1320,7 @@
[0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")],
[0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")]
]
- libs=[boost.lib, 'OgreMain',
+ libs=[boost.lib, boost_python_index.lib, 'OgreMain',
'ogg',
'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-23 06:08:30
|
Revision: 668
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=668&view=rev
Author: mithro
Date: 2008-07-23 06:08:39 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Mark the structures as opaque.
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogreal/generate_code.py
Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-07-22 12:18:39 UTC (rev 667)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2008-07-23 06:08:39 UTC (rev 668)
@@ -101,6 +101,13 @@
else:
main_ns = global_ns
+ # Mark both these types are opaque
+ device = main_ns.decl("ALCdevice_struct")
+ device.opaque = True
+
+ context = main_ns.decl("ALCcontext_struct")
+ context.opaque = True
+
############################################################
##
## And things that need to have their argument and call values fixed.
@@ -247,7 +254,7 @@
global_ns.exclude()
main_ns = global_ns.namespace( MAIN_NAMESPACE )
main_ns.include()
-
+
common_utils.AutoExclude ( mb, MAIN_NAMESPACE )
ManualExclude ( mb )
common_utils.AutoInclude ( mb, MAIN_NAMESPACE )
@@ -276,8 +283,7 @@
## need to create a welcome doc string for this...
common_utils.add_constants( mb, { '__doc__' : '"ogreal DESCRIPTION"' } )
-
-
+
##########################################################################################
#
# Creating the code. After this step you should not modify/customize declarations.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-22 12:18:31
|
Revision: 667
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=667&view=rev
Author: mithro
Date: 2008-07-22 12:18:39 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Fix '"ode" return values as opaque is missing'.
Thanks dermont.
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogreode/generate_code.py
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-07-22 09:52:48 UTC (rev 666)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-07-22 12:18:39 UTC (rev 667)
@@ -272,7 +272,11 @@
# We filter (both include and exclude) specific classes and functions that we want to wrap
#
global_ns = mb.global_ns
- global_ns.exclude()
+ global_ns.exclude()
+
+ query = lambda decl: isinstance( decl, ( declarations.class_t, declarations.class_declaration_t ) ) \
+ and decl.name.startswith( 'dx' )
+ mb.global_ns.decls( query ).opaque = True
for ns in MAIN_NAMESPACE:
main_ns = global_ns.namespace( ns )
main_ns.include()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-22 09:52:42
|
Revision: 666
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=666&view=rev
Author: mithro
Date: 2008-07-22 09:52:48 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Remove the boost python indexing extras as they are now in a seperate build target.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-22 09:51:07 UTC (rev 665)
+++ trunk/python-ogre/environment.py 2008-07-22 09:52:48 UTC (rev 666)
@@ -481,7 +481,6 @@
## and now boost
[0, tar + ' zxf ' + os.path.join(downloadPath, base) + '.tar.gz', ''],
[0,'chmod -R +rw *', os.path.join(os.getcwd(), base ) ],
- [0,cp + ' -R '+os.path.join('python-ogre','boost','*') +' ' + base , ''], # need to overwrite the boost with our files
[0, sed_ + " 's/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/' "+base+"/configure", '' ],
[0, sed_ + " s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ "+base+"/boost/python/detail/preprocessor.hpp", ''],
[0, sed_ + ' s/"# include <boost\/preprocessor\/cat.hpp>"/"\\n#define BOOST_PYTHON_NO_PY_SIGNATURES\\n# include <boost\/preprocessor\/cat.hpp>"/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-22 09:50:58
|
Revision: 665
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=665&view=rev
Author: mithro
Date: 2008-07-22 09:51:07 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Fixed boost_python_index for non-deb builds.
Modified Paths:
--------------
trunk/python-ogre/boost/debian/rules
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/boost/Makefile
Added: trunk/python-ogre/boost/Makefile
===================================================================
--- trunk/python-ogre/boost/Makefile (rev 0)
+++ trunk/python-ogre/boost/Makefile 2008-07-22 09:51:07 UTC (rev 665)
@@ -0,0 +1,25 @@
+
+export GCC_VERSION=`gcc --version | head -1 | sed -e's/.*) \([0-9]\)\.\([0-9]\).*/\1\2/'`
+export PYTHON_VERSION=`python -V 2>&1 | sed -e's/Python \(2\.[45]\).*/\1/'`
+
+all: libs/python/src/indexing/indexing_slice.cpp libs/python/src/indexing/python_iterator.cpp
+ g++ $? \
+ -I . \
+ -I /usr/include/python${PYTHON_VERSION} \
+ -shared -Wl,-soname,libboost_python_index-gcc${GCC_VERSION}-1_34_1.so -o libboost_python_index-gcc${GCC_VERSION}-1_34_1.so -fPIC \
+ -lboost_python \
+ -lpython${PYTHON_VERSION}
+
+install:
+ mkdir -p ${PREFIX}/usr/lib
+ cp libboost_python_index-gcc${GCC_VERSION}-1_34_1.so ${PREFIX}/usr/lib
+ ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-1_34_1.so ${PREFIX}/usr/lib/libboost_python_index.so
+
+ mkdir -p ${PREFIX}/usr/include
+ cp -rvf boost ${PREFIX}/usr/include
+ rm -rf `find ${PREFIX}/usr/include -name .svn -type d`
+
+clean:
+ rm *.so
+
+.PHONY: install clean
Modified: trunk/python-ogre/boost/debian/rules
===================================================================
--- trunk/python-ogre/boost/debian/rules 2008-07-22 04:45:24 UTC (rev 664)
+++ trunk/python-ogre/boost/debian/rules 2008-07-22 09:51:07 UTC (rev 665)
@@ -8,7 +8,9 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
+export DH_COMPAT=2
export GCC_VERSION=`gcc --version | head -1 | sed -e's/.*) \([0-9]\)\.\([0-9]\).*/\1\2/'`
+export PYTHON_VERSION=`python -V 2>&1 | sed -e's/Python \(2\.[45]\).*/\1/'`
# shared library versions, option 1
#version=2.0.5
@@ -23,25 +25,15 @@
configure-stamp:
dh_testdir
# Add here commands to configure the package.
-
+
touch configure-stamp
-
build: build-stamp
build-stamp: configure-stamp
dh_testdir
-
-
- # Add here commands to compile the package.
- g++ \
- ./libs/python/src/indexing/indexing_slice.cpp \
- ./libs/python/src/indexing/python_iterator.cpp \
- -I . \
- -I /usr/include/python2.5 \
- -shared -Wl,-soname,libboost_python_index-gcc${GCC_VERSION}-1_34_1.so -o libboost_python_index-gcc${GCC_VERSION}-1_34_1.so -fPIC \
- -lboost_python \
- -lpython2.5
-
+
+ make all
+
touch $@
clean:
@@ -51,7 +43,7 @@
# Add here commands to clean up after the build process.
rm *.so || true
-
+
dh_clean
install: build
@@ -59,17 +51,10 @@
dh_testroot
dh_clean -k
dh_installdirs
-
+
# Add here commands to install the package into debian/tmp
- mkdir -p $(CURDIR)/debian/tmp/usr/lib
- cp libboost_python_index-gcc${GCC_VERSION}-1_34_1.so $(CURDIR)/debian/tmp/usr/lib
- ln -sf /usr/lib/libboost_python_index-gcc${GCC_VERSION}-1_34_1.so $(CURDIR)/debian/tmp/usr/lib/libboost_python_index.so
+ PREFIX=$(CURDIR)/debian/tmp make install
- mkdir -p $(CURDIR)/debian/tmp/usr/include
- cp -rvf boost $(CURDIR)/debian/tmp/usr/include
- rm -rf `find $(CURDIR)/debian/tmp/usr/include -name .svn -type d`
-
-
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -84,7 +69,7 @@
dh_movefiles -plibboost-python1.34.1-index-dev /usr/include/boost
dh_movefiles -plibboost-python1.34.1-index /usr/lib
-
+
# dh_install
# dh_installmenu
# dh_installdebconf
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-22 04:45:24 UTC (rev 664)
+++ trunk/python-ogre/environment.py 2008-07-22 09:51:07 UTC (rev 665)
@@ -528,8 +528,10 @@
["rm","-rf %s" % (base,), os.getcwd()],
["cp",'-rvf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()],
]
- # FIXME: This should have build commands!
- buildCmds = []
+ buildCmds = [
+ [0,'make all', os.path.join(os.getcwd(), base)],
+ [0,'PREFIX=%s make install' % PREFIX, os.path.join(os.getcwd(), base)],
+ ]
lib = boost.lib.replace("python", "python_index")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-22 04:45:14
|
Revision: 664
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=664&view=rev
Author: mithro
Date: 2008-07-22 04:45:24 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Clean the directory before retreiving the boost-python-index package.
Fixed the base name for boost.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-18 13:58:55 UTC (rev 663)
+++ trunk/python-ogre/environment.py 2008-07-22 04:45:24 UTC (rev 664)
@@ -455,7 +455,7 @@
base = 'boost_1_34_1'
lib= 'boost_python-vc90-mt-1_34_1'
else:
- base = 'boost_1_35_0'
+ base = 'boost_1_35'
lib = 'boost_python-vc90-mt-1_36'
if isLinux() or isMac():
@@ -525,7 +525,8 @@
base = "libboost-python%s-index" % boost.base[6:].replace("_",".")
if isLinux() or isMac():
source = [
- ["cp",'-rf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()],
+ ["rm","-rf %s" % (base,), os.getcwd()],
+ ["cp",'-rvf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()],
]
# FIXME: This should have build commands!
buildCmds = []
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-07-18 13:58:46
|
Revision: 663
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=663&view=rev
Author: andy_miller
Date: 2008-07-18 13:58:55 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
updatedtheora video patch
Modified Paths:
--------------
trunk/python-ogre/patch/theoravideo.patch
Modified: trunk/python-ogre/patch/theoravideo.patch
===================================================================
--- trunk/python-ogre/patch/theoravideo.patch 2008-07-17 10:38:12 UTC (rev 662)
+++ trunk/python-ogre/patch/theoravideo.patch 2008-07-18 13:58:55 UTC (rev 663)
@@ -328,7 +328,7 @@
+ <Tool
+ Name="VCCLCompilerTool"
+ InlineFunctionExpansion="1"
-+ AdditionalIncludeDirectories="..\..\TheoraVideo\include;..\include;..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;"..\..\ptypes-1.8.3\include";..\..\..\..\ogrenew\OgreMain\include;..\..\theora\include;"..\..\ptypes-1.8.3\include";..\..\..\..\ogrenew\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogrenew\Dependencies\include"
++ AdditionalIncludeDirectories="..\..\..\..\vorbis\include;..\..\..\..\ogg\include;..\..\TheoraVideo\include;..\include;..\..\..\..\ogre\OgreMain\include;..\..\theora\include;"..\..\ptypes-1.8.3\include";..\..\..\..\ogre\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogre\Dependencies\include"
+ PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
+ StringPooling="true"
+ RuntimeLibrary="2"
@@ -871,7 +871,7 @@
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
-+ AdditionalIncludeDirectories="c:\development\vorbis\include;c:\development\ogg\include;"c:\development\FMOD SoundSystem\FMOD Programmers API Win32\api\inc";..\..\..\..\theora\include;..\..\TheoraVideo\include;..\include;..\..\..\..\ogre\OgreMain\include;"..\..\ptypes-1.8.3\include";..\..\..\..\ogre\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogre\Dependencies\include"
++ AdditionalIncludeDirectories="c:\development\vorbis\include;c:\development\ogg\include;c:\development\fmodapi375win\api\inc\;..\..\..\..\theora\include;..\..\TheoraVideo\include;..\include;..\..\..\..\ogre\OgreMain\include;"..\..\ptypes-1.8.3\include";..\..\..\..\ogre\Samples\Common\CEGUIRenderer\include;..\..\..\..\ogre\Dependencies\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FMOD_MOD_EXPORTS"
+ StringPooling="true"
+ RuntimeLibrary="2"
@@ -1397,6 +1397,39 @@
delete [] mAudioBuffer;
}
+Index: CEGUI_TheoraDemo/src/SoundModules/FmodSoundModule.cpp
+===================================================================
+--- CEGUI_TheoraDemo/src/SoundModules/FmodSoundModule.cpp (revision 2450)
++++ CEGUI_TheoraDemo/src/SoundModules/FmodSoundModule.cpp (working copy)
+@@ -1,10 +1,11 @@
+ #include "OgrePrerequisites.h"
+ #include "FmodSoundModule.h"
++#include "fmoddyn.h"
+
+ #include "OgreTimer.h"
+ #include "OgreLogManager.h"
+ #include "OgreStringConverter.h"
+-#include "OgrePlatformManager.h"
++//#include "OgrePlatformManager.h"
+ #include "OgreException.h"
+
+ #include <sstream>
+@@ -25,13 +26,13 @@
+ pauseTimeAdjustmentStop = 0;
+ pauseTimeAdjustmentTotal = 0;
+
+- mTimer = mTimer = PlatformManager::getSingleton().createTimer();
++ mTimer = new Ogre::Timer();
+ }
+
+ //---------------------------------------------------------------//
+ AudioClip::~AudioClip()
+ {
+- PlatformManager::getSingleton().destroyTimer( mTimer );
++ delete ( mTimer );
+ }
+
+ //---------------------------------------------------------------//
Index: CEGUI_TheoraDemo/src/SoundModules/FmodSoundModule.h
===================================================================
--- CEGUI_TheoraDemo/src/SoundModules/FmodSoundModule.h (revision 2450)
@@ -1414,7 +1447,7 @@
===================================================================
--- TheoraVideo/scripts/VC8_TheoraVideo.sln (revision 2450)
+++ TheoraVideo/scripts/VC8_TheoraVideo.sln (working copy)
-@@ -1,56 +1,48 @@
+@@ -1,56 +1,47 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PTypes_Lib", "..\..\ptypes-1.8.3\win32\VC8_PTypes_Lib.vcproj", "{8D0E0535-B27C-42D9-83AA-9A0FDBB53C1E}"
@@ -1513,7 +1546,6 @@
+ {74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Debug|Win32.ActiveCfg = Debug|Win32
+ {74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Debug|Win32.Build.0 = Debug|Win32
+ {74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Release|Win32.ActiveCfg = Release|Win32
-+ {74DDB799-AD94-42F2-A99C-B89EA8A01AD9}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-07-17 10:38:42
|
Revision: 662
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=662&view=rev
Author: andy_miller
Date: 2008-07-17 10:38:12 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
CEGUI Demo updates thanks to Dermont
Changes to support CEGUI 0.6.1
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/demos/cegui/CEGUI_framework.py
trunk/python-ogre/demos/cegui/resources.cfg
trunk/python-ogre/demos/ogreode/SimpleScenes.py
trunk/python-ogre/demos/ogreode/SimpleScenes_Buggy.py
trunk/python-ogre/demos/ogreode/SimpleScenes_Chain.py
trunk/python-ogre/demos/ogreode/SimpleScenes_Joints.py
trunk/python-ogre/demos/ogreode/SimpleScenes_TriMesh.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/demos/cegui/Demo_CEGUI_DragnDropv061.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_Falgard1v061.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_FirstWindowv061.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_FontDemov061.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_ScrollablePanev061.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_TabControlv061.py
trunk/python-ogre/demos/cegui/Demo_CEGUI_Treev061.py
trunk/python-ogre/demos/cegui/datafiles/
trunk/python-ogre/demos/cegui/datafiles/configs/
trunk/python-ogre/demos/cegui/datafiles/configs/CEGUIConfig.xsd
trunk/python-ogre/demos/cegui/datafiles/fonts/
trunk/python-ogre/demos/cegui/datafiles/fonts/Commonv2c.ttf
trunk/python-ogre/demos/cegui/datafiles/fonts/Commonwealth-10.font
trunk/python-ogre/demos/cegui/datafiles/fonts/DejaVuSans-10.font
trunk/python-ogre/demos/cegui/datafiles/fonts/DejaVuSans.ttf
trunk/python-ogre/demos/cegui/datafiles/fonts/FairChar-30.font
trunk/python-ogre/demos/cegui/datafiles/fonts/Font.xsd
trunk/python-ogre/demos/cegui/datafiles/fonts/Iconified-12.font
trunk/python-ogre/demos/cegui/datafiles/fonts/Iconiv2.ttf
trunk/python-ogre/demos/cegui/datafiles/fonts/Legal.txt
trunk/python-ogre/demos/cegui/datafiles/fonts/README
trunk/python-ogre/demos/cegui/datafiles/fonts/common.txt
trunk/python-ogre/demos/cegui/datafiles/fonts/fkp-16.font
trunk/python-ogre/demos/cegui/datafiles/fonts/fkp.de.pcf
trunk/python-ogre/demos/cegui/datafiles/fonts/icon.txt
trunk/python-ogre/demos/cegui/datafiles/imagesets/
trunk/python-ogre/demos/cegui/datafiles/imagesets/DriveIcons.imageset
trunk/python-ogre/demos/cegui/datafiles/imagesets/DriveIcons.png
trunk/python-ogre/demos/cegui/datafiles/imagesets/FairChar.imageset
trunk/python-ogre/demos/cegui/datafiles/imagesets/FairChar.tga
trunk/python-ogre/demos/cegui/datafiles/imagesets/GPN-2000-001437.tga
trunk/python-ogre/demos/cegui/datafiles/imagesets/Imageset.xsd
trunk/python-ogre/demos/cegui/datafiles/imagesets/ReadMe.txt
trunk/python-ogre/demos/cegui/datafiles/imagesets/TaharezLook.imageset
trunk/python-ogre/demos/cegui/datafiles/imagesets/TaharezLook.tga
trunk/python-ogre/demos/cegui/datafiles/imagesets/Vanilla.imageset
trunk/python-ogre/demos/cegui/datafiles/imagesets/WindowsLook.imageset
trunk/python-ogre/demos/cegui/datafiles/imagesets/WindowsLook.tga
trunk/python-ogre/demos/cegui/datafiles/imagesets/vanilla.tga
trunk/python-ogre/demos/cegui/datafiles/layouts/
trunk/python-ogre/demos/cegui/datafiles/layouts/Console.wnd
trunk/python-ogre/demos/cegui/datafiles/layouts/Demo7Windows.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/Demo8.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/DragDropDemo.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/FontDemo.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/GUILayout.xsd
trunk/python-ogre/demos/cegui/datafiles/layouts/TabControlDemo.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/TabPage.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/TabPage1.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/TabPage2.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/TextDemo.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/TreeDemoTaharez.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/VanillaConsole.layout
trunk/python-ogre/demos/cegui/datafiles/layouts/VanillaWindows.layout
trunk/python-ogre/demos/cegui/datafiles/looknfeel/
trunk/python-ogre/demos/cegui/datafiles/looknfeel/Falagard.xsd
trunk/python-ogre/demos/cegui/datafiles/looknfeel/TaharezLook.looknfeel
trunk/python-ogre/demos/cegui/datafiles/looknfeel/Vanilla.looknfeel
trunk/python-ogre/demos/cegui/datafiles/looknfeel/WindowsLook.looknfeel
trunk/python-ogre/demos/cegui/datafiles/lua_scripts/
trunk/python-ogre/demos/cegui/datafiles/lua_scripts/IConsole.lua
trunk/python-ogre/demos/cegui/datafiles/lua_scripts/InstancedInit.lua
trunk/python-ogre/demos/cegui/datafiles/lua_scripts/demo8.lua
trunk/python-ogre/demos/cegui/datafiles/schemes/
trunk/python-ogre/demos/cegui/datafiles/schemes/Demo8.scheme
trunk/python-ogre/demos/cegui/datafiles/schemes/GUIScheme.xsd
trunk/python-ogre/demos/cegui/datafiles/schemes/TaharezLook.scheme
trunk/python-ogre/demos/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme
trunk/python-ogre/demos/cegui/datafiles/schemes/TaharezLookWidgets.scheme
trunk/python-ogre/demos/cegui/datafiles/schemes/VanillaSkin.scheme
trunk/python-ogre/demos/cegui/datafiles/schemes/WindowsLook.scheme
trunk/python-ogre/demos/cegui/datafiles/schemes/WindowsLookWidgets.scheme
trunk/python-ogre/demos/cegui/v061/
trunk/python-ogre/demos/cegui/v061/TreeDemoMaterial.layout
trunk/python-ogre/demos/cegui/v061/TreeDemoTaharez.layout
trunk/python-ogre/demos/cegui/v061/TreeDemoVanilla.layout
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2008-07-17 08:53:19 UTC (rev 661)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2008-07-17 10:38:12 UTC (rev 662)
@@ -38,8 +38,7 @@
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR, 'ogre')
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
-PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
-PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.0')
+PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.1')
PATH_OIS = os.path.join(BASE_DIR, 'ois' ) ##'ois-1.0RC1')
PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk','sdk')
@@ -56,7 +55,7 @@
PATH_ogreforests= os.path.join(PATH_THIRDPARTY,'forests')
PATH_OGREAL= os.path.join(PATH_THIRDPARTY,'ogreal')
-PATH_OGREAL= os.path.join(BASE_DIR,'ogreal')
+# PATH_OGREAL= os.path.join(BASE_DIR,'ogreal')
PATH_OPCODE= os.path.join(PATH_THIRDPARTY,'opcode')
PATH_quickgui= os.path.join(PATH_THIRDPARTY,'quickgui')
@@ -107,7 +106,7 @@
PATH_LIB_OgreOdePrefab = os.path.join( PATH_OgreOde, 'prefab/lib/Release' )
PATH_LIB_OgreOdeLoader = os.path.join( PATH_OgreOde, 'loader/lib/Release' )
-PATH_LIB_OgreAL = os.path.join( PATH_OGREAL, 'lib/Release' )
+PATH_LIB_OgreAL = os.path.join( PATH_OGREAL ) # , 'lib/Release' )
PATH_LIB_betagui = PATH_betagui
PATH_LIB_quickgui = PATH_quickgui
PATH_LIB_NxOgre= os.path.join(PATH_NxOgre, 'lib')
@@ -140,7 +139,7 @@
PATH_INCLUDE_OPCODE = PATH_OPCODE
PATH_INCLUDE_ODESOURCE = os.path.join( PATH_ODE, 'ode/src')
-PATH_INCLUDE_OgreAL = os.path.join( PATH_OGREAL, 'include' )
+PATH_INCLUDE_OgreAL = os.path.join( PATH_OGREAL ) #, 'include' )
PATH_INCLUDE_OPENAL = os.path.join( PATH_OPENAL, 'include')
PATH_INCLUDE_OGG= os.path.join( PATH_OGG, 'include' )
PATH_INCLUDE_VORBIS= os.path.join( PATH_VORBIS, 'include' )
Modified: trunk/python-ogre/demos/cegui/CEGUI_framework.py
===================================================================
--- trunk/python-ogre/demos/cegui/CEGUI_framework.py 2008-07-17 08:53:19 UTC (rev 661)
+++ trunk/python-ogre/demos/cegui/CEGUI_framework.py 2008-07-17 10:38:12 UTC (rev 662)
@@ -1,96 +1,96 @@
-import ctypes
-
-# 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..
-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
+import ctypes
+
+# 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..
+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/cegui/Demo_CEGUI_DragnDropv061.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_DragnDropv061.py (rev 0)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_DragnDropv061.py 2008-07-17 10:38:12 UTC (rev 662)
@@ -0,0 +1,167 @@
+#/***************************************************************************
+# * Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+# *
+# * Permission is hereby granted, free of charge, to any person obtaining
+# * a copy of this software and associated documentation files (the
+# * "Software"), to deal in the Software without restriction, including
+# * without limitation the rights to use, copy, modify, merge, publish,
+# * distribute, sublicense, and/or sell copies of the Software, and to
+# * permit persons to whom the Software is furnished to do so, subject to
+# * the following conditions:
+# *
+# * The above copyright notice and this permission notice shall be
+# * included in all copies or substantial portions of the Software.
+# *
+# * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# * OTHER DEALINGS IN THE SOFTWARE.
+# ***************************************************************************/
+
+
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as OIS
+import ogre.gui.CEGUI as CEGUI
+import SampleFramework
+
+from CEGUI_framework import *
+
+
+def createUVector2( x, y):
+ return CEGUI.UVector2(CEGUI.UDim(x,0), CEGUI.UDim(y,0))
+
+def handle_ItemDropped(args):
+ if not args.window.getChildCount():
+ # add dragdrop item as child of target if target has no item already
+ args.window.addChildWindow(args.dragDropItem)
+ # Now we must reset the item position from it's 'dropped' location,
+ # since we're now a child of an entirely different window
+ args.dragDropItem.setPosition(
+ createUVector2(0.05, 0.05) )
+ return True
+
+
+
+
+class GEUIApplication(SampleFramework.Application):
+
+ def __init__(self):
+ SampleFramework.Application.__init__(self)
+ self.CEGUIRenderer = 0
+ self.CEGUISystem = 0
+
+ def _createScene(self):
+
+ sceneManager = self.sceneManager
+ sceneManager.ambientLight = ogre.ColourValue(0.25, 0.25, 0.25)
+
+ # initiaslise CEGUI Renderer
+ self.CEGUIRenderer = CEGUI.OgreCEGUIRenderer(self.renderWindow,
+ ogre.RenderQueueGroupID.RENDER_QUEUE_OVERLAY,
+ False, 3000,
+ self.sceneManager)
+
+ self.CEGUISystem = CEGUI.System(self.CEGUIRenderer)
+ CEGUI.Logger.getSingleton().loggingLevel = CEGUI.Insane
+
+ # load TaharezLook scheme
+ CEGUI.SchemeManager.getSingleton().loadScheme("WindowsLook.scheme")
+
+ # load font and setup default if not loaded via scheme
+ if not CEGUI.FontManager.getSingleton().isFontPresent("DejaVuSans-10.font"):
+ try:
+ CEGUI.FontManager.getSingleton().createFont("DejaVuSans-10.font")
+ except:
+ ## assume font is defined in loaded scheme
+ pass
+
+ ## set up defaults
+ CEGUI.System.getSingleton().setDefaultMouseCursor("WindowsLook", "MouseArrow")
+ CEGUI.System.getSingleton().setDefaultFont("DejaVuSans-10")
+
+ # load the drive icons imageset
+ CEGUI.ImagesetManager.getSingleton().createImageset("DriveIcons.imageset")
+
+ ## load the initial layout
+ CEGUI.System.getSingleton().setGUISheet(
+ CEGUI.WindowManager.getSingleton().loadWindowLayout("DragDropDemo.layout", False))
+
+ ## setup events
+ self._subscribeEvents()
+
+
+ def _subscribeEvents(self):
+ wmgr = CEGUI.WindowManager.getSingleton()
+
+
+ # Subscribe the same handler to each of the twelve slots
+ base_name = "Root/MainWindow/Slot"
+ for i in range(1,13):
+ try:
+ # get the window pointer for this slot
+ wnd = wmgr.getWindow(base_name + CEGUI.PropertyHelper.intToString(i))
+ wnd.subscribeEvent(
+ CEGUI.Window.EventDragDropItemDropped, handle_ItemDropped,"")
+ except CEGUI.Exception, e:
+ print e
+
+ def _createCamera(self):
+ self.camera = self.sceneManager.createCamera("PlayerCam")
+ self.camera.nearClipDistance = 5
+
+ def _createFrameListener(self):
+ self.frameListener = CEGUIFrameListener(self.renderWindow, self.camera, self.sceneManager)
+ self.root.addFrameListener(self.frameListener)
+ self.frameListener.showDebugOverlay(True)
+
+ def __del__(self):
+ "Clear variables, this is needed to ensure the correct order of deletion"
+ del self.camera
+ del self.sceneManager
+ del self.frameListener
+ del self.CEGUISystem
+ del self.CEGUIRenderer
+ del self.root
+ del self.renderWindow
+
+class CEGUIFrameListener(GuiFrameListener):
+
+ def __init__(self, renderWindow, camera, sceneManager):
+ GuiFrameListener.__init__(self, renderWindow, camera, sceneManager)
+
+ self.keepRendering = True # whether to continue rendering or not
+
+ # Subscribe handler to deal with user closing the frame window
+ try:
+ main_wnd = CEGUI.WindowManager.getSingleton().getWindow("Root/MainWindow")
+ main_wnd.subscribeEvent(
+ CEGUI.FrameWindow.EventCloseClicked, self, "handle_CloseButton")
+
+ # if something goes wrong, log the issue but do not bomb!
+ except CEGUI.Exception, e:
+ print e
+
+ def handle_CloseButton(self, args):
+ self.keepRendering = False
+ return True
+
+ def frameStarted(self, evt):
+ if not self.keepRendering:
+ return False
+ else:
+ return GuiFrameListener.frameStarted(self,evt)
+
+
+if __name__ == '__main__':
+ try:
+ ta = GEUIApplication()
+ ta.go()
+ except ogre.OgreException, e:
+ print e
Added: trunk/python-ogre/demos/cegui/Demo_CEGUI_Falgard1v061.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_Falgard1v061.py (rev 0)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_Falgard1v061.py 2008-07-17 10:38:12 UTC (rev 662)
@@ -0,0 +1,283 @@
+#/***************************************************************************
+# * Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+# *
+# * Permission is hereby granted, free of charge, to any person obtaining
+# * a copy of this software and associated documentation files (the
+# * "Software"), to deal in the Software without restriction, including
+# * without limitation the rights to use, copy, modify, merge, publish,
+# * distribute, sublicense, and/or sell copies of the Software, and to
+# * permit persons to whom the Software is furnished to do so, subject to
+# * the following conditions:
+# *
+# * The above copyright notice and this permission notice shall be
+# * included in all copies or substantial portions of the Software.
+# *
+# * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# * OTHER DEALINGS IN THE SOFTWARE.
+# ***************************************************************************/
+
+
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as OIS
+import ogre.gui.CEGUI as CEGUI
+import SampleFramework
+
+from CEGUI_framework import *
+
+
+def cegui_reldim ( x ) :
+ return CEGUI.UDim((x),0)
+
+def ceguimax ( x, y ) :
+ if x>y: return x
+ return y
+def ceguimin ( x, y ) :
+ if x<y: return x
+ return y
+
+
+
+
+class DemoConsole():
+
+ SubmitButtonID = 1
+ EntryBoxID = 2
+ HistoryID = 3
+
+ def __init__(self, id_name, parent=None):
+
+ d_root = CEGUI.WindowManager.getSingleton().loadWindowLayout("VanillaConsole.layout", id_name, 'General')
+ self.d_historyPos = 0
+ self.d_root = d_root
+ self.d_history = []
+
+ # we will destroy the console box windows ourselves
+ d_root.setDestroyedByParent(False)
+
+
+
+ # Do events wire-up
+ d_root.subscribeEvent(
+ CEGUI.Window.EventKeyDown, self, "handleKeyDown")
+
+ d_root.getChild(self.SubmitButtonID).subscribeEvent(
+ CEGUI.PushButton.EventClicked, self, "handleSubmit")
+ d_root.getChild(self.EntryBoxID).subscribeEvent(
+ CEGUI.Editbox.EventTextAccepted, self, "handleSubmit")
+
+ # decide where to attach the console main window
+ def attachTo(parent, sheet):
+ if parent : return parent
+ return sheet
+
+ parent = attachTo(parent , CEGUI.System.getSingleton().getGUISheet() )
+
+ # attach this window if parent is valid
+ if parent:
+ parent.addChildWindow(d_root)
+
+
+ def __del__(self):
+ # destroy the windows that we loaded earlier
+ CEGUI.WindowManager.getSingleton().destroyWindow(self.d_root)
+ self.d_root = 0
+
+
+ def toggleVisibility(self):
+ if self.d_root.isVisible(True):
+ self.d_root.hide()
+ else:
+ self.d_root.show()
+
+
+ def isVisible(self):
+ return self.d_root.isVisible()
+
+ def handleSubmit(self, args):
+
+ # get the text entry editbox
+ editbox = self.d_root.getChild(self.EntryBoxID)
+
+ # get text out of the editbox
+ edit_text = editbox.getText()
+
+ # if the string is not empty
+ if len(edit_text.c_str())>0:
+ # add this entry to the command history buffer
+ self.d_history.append(edit_text)
+ # reset history position
+ self.d_historyPos = len(self.d_history)
+ # append newline to this entry
+ edit_text += '\n'
+ # get history window
+ history = self.d_root.getChild(self.HistoryID)
+ print dir(history)
+ # append new text to history output
+ history.setText(history.getText() + edit_text)
+ # scroll to bottom of history output
+ history.setCaratIndex(-1)
+ # erase text in text entry box.
+ editbox.setText("")
+
+ # re-activate the text entry box
+ editbox.activate()
+
+ return True
+
+ def handleKeyDown(self, args):
+
+ # get the text entry editbox
+ editbox = self.d_root.getChild(self.EntryBoxID)
+
+ if args.scancode == CEGUI.Key.ArrowUp :
+ self.d_historyPos = ceguimax(self.d_historyPos - 1, -1)
+ if self.d_historyPos >= 0:
+ editbox.setText(self.d_history[self.d_historyPos])
+ editbox.setCaratIndex(-1)
+ else:
+ editbox.setText("")
+ editbox.activate()
+
+ elif args.scancode == CEGUI.Key.ArrowDown :
+ self.d_historyPos = ceguimin(self.d_historyPos + 1, len(self.d_history) )
+ if self.d_historyPos < len(self.d_history):
+ editbox.setText(self.d_history[self.d_historyPos])
+ editbox.setCaratIndex(-1)
+ else:
+ editbox.setText("")
+
+ editbox.activate()
+
+ else:
+ return False
+
+ return True
+
+
+class GEUIApplication(SampleFramework.Application):
+
+ def __init__(self):
+ SampleFramework.Application.__init__(self)
+ self.CEGUIRenderer = 0
+ self.CEGUISystem = 0
+ self.d_console = None
+
+ def _createScene(self):
+
+ sceneManager = self.sceneManager
+ sceneManager.ambientLight = ogre.ColourValue(0.25, 0.25, 0.25)
+
+ # initiaslise OgreCEGUI Renderer
+
+ self.CEGUIRenderer = CEGUI.OgreCEGUIRenderer(self.renderWindow,
+ ogre.RenderQueueGroupID.RENDER_QUEUE_OVERLAY,
+ False, 3000,
+ self.sceneManager)
+ self.CEGUISystem = CEGUI.System(self.CEGUIRenderer)
+
+ ## set the logging level
+ CEGUI.Logger.getSingleton().loggingLevel = CEGUI.Insane
+
+ ## we will make extensive use of the WindowManager.
+ winMgr = CEGUI.WindowManager.getSingleton()
+
+ # Load the scheme to initialse the VanillaSkin which we use in this sample
+ CEGUI.SchemeManager.getSingleton().loadScheme("VanillaSkin.scheme")
+ # set default mouse image
+ CEGUI.System.getSingleton().setDefaultMouseCursor("Vanilla-Images", "MouseArrow")
+
+ # load an image to use as a background
+ CEGUI.ImagesetManager.getSingleton().createImagesetFromImageFile("BackgroundImage", "GPN-2000-001437.tga")
+
+ # here we will use a StaticImage as the root, then we can use
+ # it to place a background image
+ background = winMgr.createWindow("Vanilla/StaticImage")
+ # set area rectangle
+ background.setArea(CEGUI.URect(cegui_reldim(0), cegui_reldim(0),
+ cegui_reldim(1), cegui_reldim(1)))
+ # disable frame and standard background
+ background.setProperty("FrameEnabled", "false")
+ background.setProperty("BackgroundEnabled", "false")
+ # set the background image
+ background.setProperty("Image", "set:BackgroundImage image:full_image")
+ # install this as the root GUI sheet
+ CEGUI.System.getSingleton().setGUISheet(background)
+
+ if not CEGUI.FontManager.getSingleton().isFontPresent("Iconified-12"):
+ CEGUI.FontManager.getSingleton().createFont("Iconified-12.font")
+
+ # load some demo windows and attach to the background 'root'
+ background.addChildWindow(winMgr.loadWindowLayout("VanillaWindows.layout", False))
+
+ # create an instance of the console class.
+ self.d_console = DemoConsole("Demo")
+
+ # listen for key presses on the root window.
+ background.subscribeEvent(
+ CEGUI.Window.EventKeyDown,
+ self, 'handleRootKeyDown')
+
+ # activate the background window
+ background.activate()
+
+ def handleRootKeyDown(self, args):
+ keyArgs = args
+
+ if keyArgs.scancode == CEGUI.Key.F12:
+ self.d_console.toggleVisibility()
+
+ else:
+ return False
+ return True
+
+
+
+ def _createCamera(self):
+ self.camera = self.sceneManager.createCamera("PlayerCam")
+ self.camera.nearClipDistance = 5
+
+ def _createFrameListener(self):
+ self.frameListener = CEGUIFrameListener(self.renderWindow, self.camera, self.sceneManager)
+ self.root.addFrameListener(self.frameListener)
+ self.frameListener.showDebugOverlay(True)
+
+ def cleanUp(self):
+ print "Cleaning Up"
+ del self.d_console
+
+ def __del__(self):
+ "Clear variables, this is needed to ensure the correct order of deletion"
+ del self.camera
+ del self.sceneManager
+ del self.frameListener
+ del self.CEGUISystem
+ del self.CEGUIRenderer
+ del self.root
+ del self.renderWindow
+
+class CEGUIFrameListener(GuiFrameListener):
+
+ def __init__(self, renderWindow, camera, sceneManager):
+ GuiFrameListener.__init__(self, renderWindow, camera, sceneManager)
+ self.MenuMode=True
+ self.keepRendering = True # whether to continue rendering or not
+
+
+
+if __name__ == '__main__':
+ try:
+ ta = GEUIApplication()
+ ta.go()
+ ta.cleanUp()
+ except ogre.OgreException, e:
+ print e
+
Added: trunk/python-ogre/demos/cegui/Demo_CEGUI_FirstWindowv061.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_FirstWindowv061.py (rev 0)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_FirstWindowv061.py 2008-07-17 10:38:12 UTC (rev 662)
@@ -0,0 +1,273 @@
+#/***************************************************************************
+# * Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+# *
+# * Permission is hereby granted, free of charge, to any person obtaining
+# * a copy of this software and associated documentation files (the
+# * "Software"), to deal in the Software without restriction, including
+# * without limitation the rights to use, copy, modify, merge, publish,
+# * distribute, sublicense, and/or sell copies of the Software, and to
+# * permit persons to whom the Software is furnished to do so, subject to
+# * the following conditions:
+# *
+# * The above copyright notice and this permission notice shall be
+# * included in all copies or substantial portions of the Software.
+# *
+# * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# * OTHER DEALINGS IN THE SOFTWARE.
+# ***************************************************************************/
+
+
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as OIS
+import ogre.gui.CEGUI as CEGUI
+import SampleFramework
+
+from CEGUI_framework import *
+
+
+
+def cegui_reldim ( x ) :
+ return CEGUI.UDim((x),0)
+
+class GEUIApplication(SampleFramework.Application):
+
+ def __init__(self):
+ SampleFramework.Application.__init__(self)
+ self.CEGUIRenderer = 0
+ self.CEGUISystem = 0
+ self.MenuMode = True
+ self.menuItems = []
+
+ def _createScene(self):
+
+ sceneManager = self.sceneManager
+ sceneManager.ambientLight = ogre.ColourValue(0.25, 0.25, 0.25)
+
+ # initiaslise OgreCEGUI Renderer
+ ## Parameters are:
+ ## a) OgreRenderWindow object.
+ ## b) param post_queue
+ ## set to True to have GUI rendered after render queue
+ ## queue_id, or False to have the GUI rendered before
+ ## render queue
+ ## c) render queue_id.
+ ## where ogre.RenderQueueGroupID.RENDER_QUEUE_OVERLAY indicates
+ ## ceguiogre window is rendered above all else
+ ## d) param max_quads
+ ## obsolete
+ ## e) sceneManager
+
+ self.CEGUIRenderer = CEGUI.OgreCEGUIRenderer(self.renderWindow,
+ ogre.RenderQueueGroupID.RENDER_QUEUE_OVERLAY,
+ False, 3000,
+ self.sceneManager)
+
+ ## Note it is also possible to initialise the OgreCEGUI renderer
+ ## with out the scenemanager, e.g:
+ ## self.CEGUIRenderer = CEGUI.OgreCEGUIRenderer(self.renderWindow,
+ ## ogre.RenderQueueGroupID.RENDER_QUEUE_OVERLAY,
+ ## False, 3000)
+ ##
+ ## However you must call setTargetSceneManager before rendering
+ ## self.CEGUIRenderer.setTargetSceneManager(self.sceneManager)
+
+ self.CEGUISystem = CEGUI.System(self.CEGUIRenderer)
+
+ ## set the logging level
+ CEGUI.Logger.getSingleton().loggingLevel = CEGUI.Insane
+
+ ## CEGUI relies on various systems being set-up, so this is what we do
+ ## here first.
+ ##
+ ## Note that is is possible, and even usual, for most of these steps to
+ ## be done automatically via a "scheme" definition, or even from the
+ ## cegui.conf configuration file, however for completeness, and as an
+ ## example, virtually everything is being done manually in this example
+ ## code.
+ ##
+ ## Imagesets area a collection of named areas within a texture or image
+ ## file. Each area becomes an Image, and has a unique name by which it
+ ## can be referenced. This sample is using the TaharezLook widgets, and
+ ## these rely upon the TaharezLook Imageset; so we must load this in
+ ## before doing anything else. Note that the Imageset would normally be
+ ## specified as part of a scheme file, although as this example is
+ ## demonstrating, it is not a requirement.
+ ##
+ ## Load TaharezLook imageset by making use of the ImagesetManager
+ ## singleton.
+
+ taharezImages = CEGUI.ImagesetManager.getSingleton().createImageset("TaharezLook.imageset")
+
+ ## The next thing we do is to set a default mouse cursor image. This is
+ ## not strictly essential, although it is nice to always have a visible
+ ## cursor if a window or widget does not explicitly set one of its own.
+ ##
+ ## The TaharezLook Imageset contains an Image named "MouseArrow"
+ ## which is the ideal thing to have as a defult mouse cursor image.
+
+ CEGUI.System.getSingleton().setDefaultMouseCursor(taharezImages.getImage("MouseArrow"))
+
+
+ ## Now we have the gui imagery side of thigs set up, we should load
+ ## in a font.
+ ## You should always load in at least one font, this is to ensure
+ ## that there is a default available for any gui element which
+ ## needs to draw text.
+ ## The first font you load is automatically set as the initial
+ ## default font, although you can change the default later on
+ ## if so desired. Again, it is possible to list fonts to be
+ ## automatically loaded as part of a scheme, so
+ ## this step may not usually be performed explicitly.
+ ##
+ ## Fonts are loaded via the FontManager singleton.
+
+ CEGUI.FontManager.getSingleton().createFont("Commonwealth-10.font")
+
+ ## The widgets that we will be using for this sample are the
+ ## TaharezLook widgets,
+ ## and to enable us to use this 'skin' we must load the xml
+ ## specification - which within cegui is known as a "looknfeel" file.
+ ##
+ ## We load the looknfeel via the WidgetLookManager singleton.
+
+ CEGUI.WidgetLookManager.getSingleton().parseLookNFeelSpecification("TaharezLook.looknfeel")
+
+
+ ## The final step of basic initialisation that is usually peformed is
+ ## registering some widgets with the system via a scheme file.
+ ## The scheme basically states the name of a dynamically loaded module
+ ## that contains the widget classes that we wish to use.
+ ## As stated previously, a scheme can actually conatin much more
+ ## information, though for the sake of this first example, we
+ ## load a scheme which only contains what is required to register
+ ## some widgets.
+ ##
+ ## Use the SchemeManager singleton to load in a scheme that
+ ## registers widgets, for TaharezLook.
+
+ CEGUI.SchemeManager.getSingleton().loadScheme("TaharezLookWidgets.scheme")
+
+
+ ## Now the system is initialised, we can actually create some
+ ## UI elements, for this first example, a full-screen 'root' window
+ ## is set as the active GUI sheet, and then a simple frame window
+ ## will be created and attached to it.
+
+ ## All windows and widgets are created via the WindowManager singleton.
+
+ winMgr = CEGUI.WindowManager.getSingleton()
+
+ ## Here we create a "DeafultWindow". This is a native type, that is,
+ ## it does not have to be loaded via a scheme, it is always available.
+ ## One common use for the DefaultWindow is as a generic container for
+ ## other windows. Its size defaults to 1.0 x 1.0 using the Relative
+ ## metrics mode, which means when it is set as the root GUI sheet
+ ## window, it will cover the entire display.
+ ## The DefaultWindow does not perform any rendering of its own,
+ ## so is invisible.
+ ##
+ ## Create a DefaultWindow called 'Root'.
+
+ root = winMgr.createWindow("DefaultWindow", "Root")
+
+ # set the GUI root window (also known as the GUI "sheet"),
+ # so the gui we set up will be visible.
+
+ CEGUI.System.getSingleton().setGUISheet(root)
+
+ ## A FrameWindow is a window with a frame and a titlebar which
+ ## may be moved around and resized.
+ ##
+ ## Create a FrameWindow in the TaharezLook style, and name it
+ ## 'Demo Window'
+
+ wnd = winMgr.createWindow("TaharezLook/FrameWindow", "Demo Window")
+
+ ## Here we attach the newly created FrameWindow to the previously
+ ## created DefaultWindow which we will be using as the root of the
+ ## displayed gui.
+
+ root.addChildWindow(wnd)
+
+ ## Windows are in Relative metrics mode by default. This means that
+ ## we can specify sizes and positions without having to know the
+ ## exact pixel size of the elements in advance. The relative
+ ## metrics mode co-ordinates are relative to the parent of the
+ ## window where the co-ordinates are being set.
+ ## This means that if 0.5 is specified as the width for a window,
+ ## that window will be half as its parent window.
+ ##
+ ## Here we set the FrameWindow so that it is half the size of
+ ## the display, and centered within the display.
+ ## Note that cegui_reldim in python is a convenience method specified
+ ## at the strat of this program
+
+ wnd.setPosition(CEGUI.UVector2( cegui_reldim(0.25),
+ cegui_reldim(0.25)))
+ wnd.setSize(CEGUI.UVector2( cegui_reldim(0.5),
+ cegui_reldim(0.5)))
+
+ ## now we set the maximum and minum sizes for the new window.
+ ## These are specified using relative co-ordinates, but the
+ ## important thing to note is that these settings are aways
+ ## relative to the display rather than the parent window.
+ ##
+ ## here we set a maximum size for the FrameWindow which is
+ ## equal to the size of the display, and a minimum size of
+ ##one tenth of the display.
+
+ wnd.setMaxSize(CEGUI.UVector2( cegui_reldim( 1.0),
+ cegui_reldim( 1.0)))
+ wnd.setMinSize(CEGUI.UVector2( cegui_reldim( 0.1),
+ cegui_reldim( 0.1)))
+
+ ## As a final step in the initialisation of our sample window,
+ ## we set the window's text to "Hello World!", so that this text
+ ## will appear as the caption in the FrameWindow's titlebar.
+ wnd.setText("Hello World!")
+
+
+ def _createCamera(self):
+ self.camera = self.sceneManager.createCamera("PlayerCam")
+ self.camera.nearClipDistance = 5
+
+ def _createFrameListener(self):
+ self.frameListener = CEGUIFrameListener(self.renderWindow, self.camera, self.sceneManager)
+ self.root.addFrameListener(self.frameListener)
+ self.frameListener.showDebugOverlay(True)
+
+ def __del__(self):
+ "Clear variables, this is needed to ensure the correct order of deletion"
+ del self.camera
+ del self.sceneManager
+ del self.frameListener
+ del self.CEGUISystem
+ del self.CEGUIRenderer
+ del self.root
+ del self.renderWindow
+
+class CEGUIFrameListener(GuiFrameListener):
+
+ def __init__(self, renderWindow, camera, sceneManager):
+ GuiFrameListener.__init__(self, renderWindow, camera, sceneManager)
+ self.MenuMode=True
+
+ def frameStarted(self, evt):
+ return GuiFrameListener.frameStarted(self,evt)
+
+
+if __name__ == '__main__':
+ try:
+ ta = GEUIApplication()
+ ta.go()
+ except ogre.OgreException, e:
+ print e
Added: trunk/python-ogre/demos/cegui/Demo_CEGUI_FontDemov061.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_FontDemov061.py (rev 0)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_FontDemov061.py 2008-07-17 10:38:12 UTC (rev 662)
@@ -0,0 +1,302 @@
+# -*- coding: utf-8 -*-
+
+#/***************************************************************************
+# * Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+# *
+# * Permission is hereby granted, free of charge, to any person obtaining
+# * a copy of this software and associated documentation files (the
+# * "Software"), to deal in the Software without restriction, including
+# * without limitation the rights to use, copy, modify, merge, publish,
+# * distribute, sublicense, and/or sell copies of the Software, and to
+# * permit persons to whom the Software is furnished to do so, subject to
+# * the following conditions:
+# *
+# * The above copyright notice and this permission notice shall be
+# * included in all copies or substantial portions of the Software.
+# *
+# * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# * OTHER DEALINGS IN THE SOFTWARE.
+#/////# -*- coding: latin-1 -*-
+# ***************************************************************************/
+
+
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as OIS
+import ogre.gui.CEGUI as CEGUI
+import SampleFramework
+
+from CEGUI_framework import *
+
+
+def createUVector2( x, y):
+ return CEGUI.UVector2(CEGUI.UDim(x,0), CEGUI.UDim(y,0))
+def cegui_reldim ( x ) :
+ return CEGUI.UDim((x),0)
+
+def getFontDict():
+ SCHEME_FONT = {}
+ SCHEME_FONT['Commonwealth-10'] = "Commonwealth-10.font"
+ SCHEME_FONT['BlueHighway-12'] = "bluehighway-12.font"
+ SCHEME_FONT['BlueHighway-10'] = "bluehighway-10.font"
+ SCHEME_FONT['BlueHighway-8'] = "bluehighway-8.font"
+ SCHEME_FONT['DejaVuSans-10'] = "DejaVuSans-10.font"
+ SCHEME_FONT['Commonwealth-10'] = "Commonwealth-10.font"
+ SCHEME_FONT['Iconified-12'] = "Iconified-12.font"
+ SCHEME_FONT['fkp-16'] = "fkp-16.font"
+ SCHEME_FONT['FairChar-30'] = "FairChar-30.font"
+ return SCHEME_FONT
+
+
+def getLanguageDict():
+ LANGUAGE_DICT = {}
+ LANGUAGE_DICT['English'] = "THIS IS SOME TEXT IN UPPERCASE\n and this is lowercase...\n Try Catching The Brown Fox While It's Jumping Over The Lazy Dog"
+ LANGUAGE_DICT['Russian'] = u"Всё ускоряющаяся эволюция компьютерных технологий предъявила жёсткие требования к производителям как собственно вычислительной техники, так и периферийных устройств.\n"
+ LANGUAGE_DICT['Romanian'] = u"CEI PATRU APOSTOLI\n au fost trei:\n Luca şi Matfei\n"
+ LANGUAGE_DICT['Danish'] = u"FARLIGE STORE BOGSTAVER\n og flere men små...\n Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Walther spillede på xylofon\n"
+ LANGUAGE_DICT['French'] = u'La Peña'
+ return LANGUAGE_DICT
+
+global MIN_POINT_SIZE
+MIN_POINT_SIZE=6.0
+
+
+class GEUIApplication(SampleFramework.Application):
+
+ def __init__(self):
+ SampleFramework.Application.__init__(self)
+ self.CEGUIRenderer = 0
+ self.CEGUISystem = 0
+ self.MenuMode = True
+ self.ListItems = []
+
+ def _createScene(self):
+
+ sceneManager = self.sceneManager
+ sceneManager.ambientLight = ogre.ColourValue(0.25, 0.25, 0.25)
+
+ # initiaslise CEGUI Renderer
+ self.CEGUIRenderer = CEGUI.OgreCEGUIRenderer(self.renderWindow,
+ ogre.RenderQueueGroupID.RENDER_QUEUE_OVERLAY,
+ False, 3000,
+ self.sceneManager)
+
+ self.CEGUISystem = CEGUI.System(self.CEGUIRenderer)
+ CEGUI.Logger.getSingleton().loggingLevel = CEGUI.Insane
+
+ winMgr = CEGUI.WindowManager.getSingleton()
+
+ # load scheme and set up defaults
+ CEGUI.SchemeManager.getSingleton().loadScheme ("TaharezLook.scheme")
+ CEGUI.System.getSingleton().setDefaultMouseCursor ("TaharezLook", "MouseArrow")
+
+ # load all the fonts except Commonwealth which has been already loaded
+ fontDict = getFontDict()
+ for f in fontDict.keys():
+ if not CEGUI.FontManager.getSingleton().isFontPresent(f):
+ CEGUI.FontManager.getSingleton().createFont(fontDict[f])
+
+
+ # load an image to use as a background
+ CEGUI.ImagesetManager.getSingleton().createImagesetFromImageFile("BackgroundImage", "GPN-2000-001437.tga")
+
+ # here we will use a StaticImage as the root, then we
+ # can use it to place a background image
+ background = winMgr.createWindow ("TaharezLook/StaticImage")
+ # set area rectangle
+ background.setArea (CEGUI.URect(cegui_reldim (0), cegui_reldim (0),
+ cegui_reldim (1), cegui_reldim (1)))
+ # disable frame and standard background
+ background.setProperty ("FrameEnabled", "false")
+ background.setProperty ("BackgroundEnabled", "false")
+ # set the background image
+ background.setProperty ("Image", "set:BackgroundImage image:full_image")
+ # install this as the root GUI sheet
+ CEGUI.System.getSingleton().setGUISheet (background)
+
+ #/ set tooltip styles (by default there is none)
+ CEGUI.System.getSingleton().setDefaultTooltip ("TaharezLook/Tooltip")
+
+ # load some demo windows and attach to the background 'root'
+ background.addChildWindow (winMgr.loadWindowLayout ("FontDemo.layout", False))
+
+ # Add the font names to the listbox
+ fontDict = getFontDict()
+ lbox = winMgr.getWindow ("FontDemo/FontList")
+ for f in fontDict.keys():
+ item = CEGUI.ListboxTextItem(f)
+ item.setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+ # ensure Python is in control of it's "deletion"
+ item.AutoDeleted = False
+ lbox.addItem( item)
+ self.ListItems.append(item)
+
+ # set up the font listbox callback
+ lbox.subscribeEvent(
+ CEGUI.Listbox.EventSelectionChanged, self, "handleFontSelection")
+ # select the first font
+ lbox.setItemSelectState(0, True)
+
+ # Add language list to the listbox
+ lbox = winMgr.getWindow ("FontDemo/LangList")
+ languageDict = getLanguageDict()
+ for l in languageDict.keys():
+ item = CEGUI.ListboxTextItem(l)
+ item.setSelectionBrushImage("TaharezLook", "MultiListSelectionBrush")
+ # ensure Python is in control of it's "deletion"
+ item.AutoDeleted = False
+ lbox.addItem( item)
+ self.ListItems.append(item)
+
+ # set up the language listbox callback
+ lbox.subscribeEvent(
+ CEGUI.Listbox.EventSelectionChanged, self, "handleLangSelection")
+ # select the first language
+ lbox.setItemSelectState(0, True)
+
+ winMgr.getWindow("FontDemo/AutoScaled").subscribeEvent(
+ CEGUI.Checkbox.EventCheckStateChanged,
+ self, 'handleAutoScaled')
+ winMgr.getWindow("FontDemo/Antialiased").subscribeEvent (
+ CEGUI.Checkbox.EventCheckStateChanged,
+ self, 'handleAntialiased')
+ winMgr.getWindow("FontDemo/PointSize").subscribeEvent (
+ CEGUI.Scrollbar.EventScrollPositionChanged,
+ self, 'handlePointSize')
+
+
+
+ ## Event Handlers ##
+ def setFontDesc(self):
+ winMgr = CEGUI.WindowManager.getSingleton()
+ mle = winMgr.getWindow("FontDemo/FontSample")
+ f = mle.getFont()
+ s = f.getProperty("Name")
+ if f.isPropertyPresent("PointSize"):
+ s += "." + f.getProperty("PointSize")
+ winMgr.getWindow("FontDemo/FontDesc").setText(s)
+
+ def handleFontSelection(self,e):
+ lbox = e.window
+ if lbox.getFirstSelectedItem():
+ f = CEGUI.FontManager.getSingleton().getFont(
+ lbox.getFirstSelectedItem().getText())
+
+ winMgr = CEGUI.WindowManager.getSingleton()
+ winMgr.getWindow("FontDemo/FontSample").setFont(f)
+ b = f.isPropertyPresent("AutoScaled")
+ cb = winMgr.getWindow("FontDemo/AutoScaled")
+ cb.setEnabled(b)
+ if b:
+ cb.setSelected(CEGUI.PropertyHelper.stringToBool(f.getProperty ("AutoScaled")))
+
+ b = f.isPropertyPresent("Antialiased")
+ cb = winMgr.getWindow("FontDemo/Antialiased")
+ cb.setEnabled (b)
+ if b:
+ cb.setSelected(CEGUI.PropertyHelper.stringToBool(f.getProperty ("Antialiased")))
+
+ b = f.isPropertyPresent ("PointSize")
+ sb = winMgr.getWindow("FontDemo/PointSize")
+ sb.setEnabled(b)
+ if b:
+ sb.setScrollPosition ( CEGUI.PropertyHelper.stringToFloat(f.getProperty("PointSize")) - MIN_POINT_SIZE)
+
+ self.setFontDesc()
+
+ return True
+
+
+ def handleAutoScaled (self, e):
+ winMgr = CEGUI.WindowManager.getSingleton()
+ cb = e.window
+ mle = winMgr.getWindow("FontDemo/FontSample")
+ f = mle.getFont()
+ f.setProperty("AutoScaled",
+ CEGUI.PropertyHelper.boolToString(cb.isSelected()))
+
+ return True
+
+
+ def handleAntialiased(self, e):
+ winMgr = CEGUI.WindowManager.getSingleton()
+ cb = e.window
+ mle = winMgr.getWindow("FontDemo/FontSample")
+ f = mle.getFont()
+ f.setProperty ("Antialiased",
+ CEGUI.PropertyHelper.boolToString(cb.isSelected()))
+
+ return True
+
+ def handlePointSize(self, e):
+ winMgr = CEGUI.WindowManager.getSingleton()
+ sb = e.window
+ f = winMgr.getWindow("FontDemo/FontSample").getFont()
+ f.setProperty ("PointSize",
+ CEGUI.PropertyHelper.intToString (
+ int(MIN_POINT_SIZE + sb.getScrollPosition ())))
+ self.setFontDesc()
+
+ return True
+
+ def handleLangSelection(self, e):
+ lbox = e.window
+ if lbox.getFirstSelectedItem():
+ idx = lbox.getItemIndex(lbox.getFirstSelectedItem())
+ winMgr = CEGUI.WindowManager.getSingleton()
+
+ cs = CEGUI.String()
+ cs.assign( getLanguageDict().values()[idx].encode("utf-8") )
+ winMgr.getWindow("FontDemo/FontSample").setText(cs)
+
+ return True
+
+
+ def _createCamera(self):
+ self.camera = self.sceneManager.createCamera("PlayerCam")
+ self.camera.nearClipDistance = 5
+
+ def _createFrameListener(self):
+ self.frameListener = CEGUIFrameListener(self.renderWindow, self.camera, self.sceneManager)
+ self.root.addFrameListener(self.frameListener)
+ self.frameListener.showDebugOverlay(True)
+
+ def __del__(self):
+ "Clear variables, this is needed to ensure the correct order of deletion"
+ del self.camera
+ del self.sceneManager
+ del self.frameListener
+ del self.CEGUISystem
+ del self.CEGUIRenderer
+ del self.root
+ del self.renderWindow
+
+class CEGUIFrameListener(GuiFrameListener):
+
+ def __init__(self, renderWindow, camera, sceneManager):
+ GuiFrameListener.__init__(self, renderWindow, camera, sceneManager)
+
+ self.keepRendering = True # whether to continue rendering or not
+
+
+ def frameStarted(self, evt):
+ if not self.keepRendering:
+ return False
+ else:
+ return GuiFrameListener.frameStarted(self,evt)
+
+
+if __name__ == '__main__':
+ try:
+ ta = GEUIApplication()
+ ta.go()
+ except ogre.OgreException, e:
+ print e
Added: trunk/python-ogre/demos/cegui/Demo_CEGUI_ScrollablePanev061.py
===================================================================
--- trunk/python-ogre/demos/cegui/Demo_CEGUI_ScrollablePanev061.py (rev 0)
+++ trunk/python-ogre/demos/cegui/Demo_CEGUI_ScrollablePanev061.py 2008-07-17 10:38:12 UTC (rev 662)
@@ -0,0 +1,252 @@
+#/***************************************************************************
+# * Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+# *
+# * Permission is hereby granted, free of charge, to any person obtaining
+# * a copy of this software and associated documentation files (the
+# * "Software"), to deal in the Software without restriction, including
+# * without limitation the rights to use, copy, modify, merge, publish,
+# * distribute, sublicense, and/or sell copies of the Software, and to
+# * permit persons to whom the Software is furnished to do so, subject to
+# * the following conditions:
+# *
+# * The above copyright notice and this permission notice shall be
+# * included in all copies or substantial portions of the Software.
+# *
+# * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# * OTHER DEALINGS IN THE SOFTWARE.
+# ***************************************************************************/
+
+
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.io.OIS as OIS
+import ogre.gui.CEGUI as CEGUI
+import SampleFramework
+
+from CEGUI_framework import *
+
+
+def createUVector2( x, y):
+ return CEGUI.UVector2(CEGUI.UDim(x,0), CEGUI.UDim(y,0))
+
+# Handler for the 'Demo -> New dialog' menu item
+def demoNewDialog(args):
+ # add a dialog to this pane so we have some more stuff to drag around :)
+ dlg = CEGUI.WindowManager.getSingletonPtr().createWindow("WindowsLook/FrameWindow")
+ dlg.setMinSize(CEGUI.UVector2(CEGUI.UDim(0,200),CEGUI.UDim(0,100)))
+ dlg.setText("Drag me around too!")
+
+ # we put this in the center of the viewport into the scrollable pane
+ uni_center = CEGUI.UVector2( CEGUI.UDim(0.5,0), CEGUI.UDim(0.5,0) )
+ d_root = CEGUI.WindowManager.getSingletonPtr().getWindow("RootWindow")
+ d_pane = CEGUI.WindowManager.getSingletonPtr().getWindow("DialogPane")
+
+ center = CEGUI.CoordConverter.windowToScreen(d_root, uni_center)
+ target = CEGUI.CoordConverter.screenToWindow(d_pane.getContentPane(), center)
+ dlg.setPosition(CEGUI.UVector2( CEGUI.UDim(0,target.d_x-100),
+ CEGUI.UDim(0,target.d_y-50)))
+
+ d_pane.addChildWindow(dlg)
+
+ return True
+
+#Handler for global hotkeys
+def hotkeysHandler(e):
+ k = e
+ if k.scancode == CEGUI.Key.Space:
+ # space is a hotkey for demo -> new dialog
+ # this handler does not use the event args at all so this is fine :)
+ # though maybe a bit hackish...
+ demoNewDialog(e)
+ else:
+ return False
+ return True
+
+class GEUIApplication(SampleFramework.Application):
+
+ def __init__(self):
+ SampleFramework.Application.__init__(self)
+ self.CEGUIRenderer = 0
+ self.CEGUISystem = 0
+ self.menuItems = []
+
+ def _createScene(self):
+
+ sceneManager = self.sceneManager
+ sceneManager.ambientLight = ogre.ColourValue(0.25, 0.25, 0.25)
+
+ # initiaslise CEGUI Renderer
+ self.CEGUIRenderer = CEGUI.OgreCEGUIRenderer(self.renderWindow,
+ ogre.Rende...
[truncated message content] |
|
From: <and...@us...> - 2008-07-17 08:53:12
|
Revision: 661
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=661&view=rev
Author: andy_miller
Date: 2008-07-17 08:53:19 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
Further fixes to ogreOde wrapper
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogreode/generate_code.py
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-07-17 05:47:03 UTC (rev 660)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2008-07-17 08:53:19 UTC (rev 661)
@@ -50,10 +50,53 @@
def ManualExclude ( mb ):
global_ns = mb.global_ns
-# if MAIN_NAMESPACE:
-# main_ns = global_ns.namespace( MAIN_NAMESPACE )
-# else:
-# main_ns = global_ns
+
+ #
+ # Exclude problem functions
+ #
+ excludes=[ '::OgreOde_Loader::DotLoader::loadFile',
+ '::OgreOde::EntityInformer::getIndices', # returns const * to TriangleIndex
+ '::OgreOde_Prefab::Vehicle::load',
+ '::OgreOde::Geometry::setUserObject', #hand wrapped
+ '::OgreOde::Geometry::getUserObject', #hand wrapped
+ '::OgreOde::PlaneBoundedRegionGeometry::_planeCallback',
+ '::OgreOde::TerrainGeometry::_heightCallback',
+ '::OgreOde::EntityInformer::getIndices', ## unsigned int const *
+# '::OgreOde::RagdollFactory::requestTypeFlags', # causes issues with moveableobjectfactory
+
+ ]
+ for e in excludes:
+ print "Excluding:", e
+ global_ns.member_functions(e).exclude()
+
+ global_ns.namespace( 'OgreOde' ).class_("CircularBuffer<OgreOde::BodyState*>").exclude()
+ #
+ # Exclude problem variables
+ #
+ excludes = ['::OgreOde::Body::MovableType',
+ '::OgreOde::Utility::Infinity'
+ ]
+ for e in excludes:
+ print "Excluding:", e
+ global_ns.variable(e).exclude()
+
+ #
+ # Exclude problem classes
+ #
+ # Unfortunately the classes here being used with Maintainedlist don't implement ALL of
+ # maintaintlist's functions - hence Py++ has tried to expose them all and it fails at
+ # compile time. Probably need to patch the source to implement null functions.
+ excludes =['MaintainedList<OgreOde::Body>',
+ 'MaintainedList<OgreOde::Geometry>',
+ 'MaintainedList<OgreOde::Joint>',
+ 'MaintainedList<OgreOde::JointGroup>',
+ 'MaintainedList<OgreOde::Space>'
+ ]
+ for e in excludes:
+ print "Excluding:", e
+ global_ns.namespace( 'OgreOde' ).class_(e).exclude()
+
+ global_ns.namespace("std").class_('list<Ogre::Plane, std::allocator<Ogre::Plane> >').include(already_exposed=True)
############################################################
##
@@ -61,7 +104,7 @@
##
############################################################
-def ManualInclude ( mb ):
+def ManualInclude ( mb, ns ):
global_ns = mb.global_ns
# if MAIN_NAMESPACE:
# main_ns = global_ns.namespace( MAIN_NAMESPACE )
@@ -73,20 +116,21 @@
## And things that need manual fixes, but not necessarly hand wrapped
##
############################################################
-def ManualFixes ( mb ):
+def ManualFixes ( mb, ns ):
global_ns = mb.global_ns
# if MAIN_NAMESPACE:
# main_ns = global_ns.namespace( MAIN_NAMESPACE )
# else:
# main_ns = global_ns
- ## here we adjust for functions that return poiners to ODE "ID's", which are really C structs
- ## I may have been over agressive in identifing these functions but hopefully not...
- for func in mb.namespace( 'OgreOde' ).member_functions():
- if func.return_type.decl_string.endswith('ID'):
- print "Setting ", func.name, "to Opaque"
- func.opaque = True
- func.call_policies = call_policies.return_value_policy(
- call_policies.return_opaque_pointer )
+ if ns == 'OgreOde': # we only need to do this once
+ ## here we adjust for functions that return poiners to ODE "ID's", which are really C structs
+ ## I may have been over agressive in identifing these functions but hopefully not...
+ for func in mb.namespace( 'OgreOde' ).member_functions():
+ if func.return_type.decl_string.endswith('ID'):
+ print "Setting ", func.name, "to Opaque"
+ func.opaque = True
+ func.call_policies = call_policies.return_value_policy(
+ call_policies.return_opaque_pointer )
############################################################
##
@@ -97,7 +141,7 @@
##
############################################################
-def ManualTransformations ( mb ):
+def ManualTransformations ( mb, ns ):
global_ns = mb.global_ns
# if MAIN_NAMESPACE:
# main_ns = global_ns.namespace( MAIN_NAMESPACE )
@@ -234,17 +278,17 @@
main_ns.include()
common_utils.AutoExclude ( mb, ns )
- ManualExclude ( mb )
common_utils.AutoInclude ( mb, ns )
- ManualInclude ( mb )
+ ManualInclude ( mb, ns )
# here we fixup functions that expect to modifiy their 'passed' variables
- ManualTransformations ( mb )
+ ManualTransformations ( mb, ns )
AutoFixes ( mb, ns )
- ManualFixes ( mb )
+ ManualFixes ( mb, ns )
#
# We need to tell boost how to handle calling (and returning from) certain functions
#
common_utils.Set_DefaultCall_Policies ( mb.global_ns.namespace ( ns ) )
+ ManualExclude ( mb )
#
# the manual stuff all done here !!!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-17 05:46:54
|
Revision: 660
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=660&view=rev
Author: mithro
Date: 2008-07-17 05:47:03 +0000 (Thu, 17 Jul 2008)
Log Message:
-----------
Fixed the src command for boost_index_python.
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-07-16 08:18:07 UTC (rev 659)
+++ trunk/python-ogre/environment.py 2008-07-17 05:47:03 UTC (rev 660)
@@ -525,7 +525,7 @@
base = "libboost-python%s-index" % boost.base[6:].replace("_",".")
if isLinux() or isMac():
source = [
- ["cp",'-rf %s %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()],
+ ["cp",'-rf %s/ %s' % (os.path.join('python-ogre','boost'), base), os.getcwd()],
]
# FIXME: This should have build commands!
buildCmds = []
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-16 08:17:57
|
Revision: 659
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=659&view=rev
Author: mithro
Date: 2008-07-16 01:18:07 -0700 (Wed, 16 Jul 2008)
Log Message:
-----------
Make the default arguments of loadLayout work much better.
Modified Paths:
--------------
trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
Modified: trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2008-07-16 07:44:57 UTC (rev 658)
+++ trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2008-07-16 08:18:07 UTC (rev 659)
@@ -399,24 +399,17 @@
WRAPPER_DEFINITION_WindowManager=\
"""
CEGUI::Window*
-WindowManager_loadWindowLayoutWithPrefix(::CEGUI::WindowManager & me,
+WindowManager_loadWindowLayout(::CEGUI::WindowManager & me,
const CEGUI::String& filename, const CEGUI::String& name_prefix = "", const CEGUI::String& resourceGroup = "") {
return me.loadWindowLayout( filename, name_prefix , resourceGroup);
}
-CEGUI::Window*
-WindowManager_loadWindowLayout(::CEGUI::WindowManager & me,
- const CEGUI::String& filename) {
- return me.loadWindowLayout( filename );
- }
-
"""
WRAPPER_REGISTRATION_WindowManager =[
- 'def ("loadWindowLayoutPrefix", &::WindowManager_loadWindowLayoutWithPrefix,\
- bp::return_value_policy< bp::reference_existing_object,bp::default_call_policies >());',
'def ("loadWindowLayout", &::WindowManager_loadWindowLayout,\
- bp::return_value_policy< bp::reference_existing_object,bp::default_call_policies >());'
+ ( bp::arg("filename"), bp::arg("name_prefix")="", bp::arg("resourceGroup")="" ), \
+ bp::return_value_policy< bp::reference_existing_object,bp::default_call_policies >());',
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-16 07:44:47
|
Revision: 658
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=658&view=rev
Author: mithro
Date: 2008-07-16 00:44:57 -0700 (Wed, 16 Jul 2008)
Log Message:
-----------
Changed the way the WindowLayout works.
Modified Paths:
--------------
trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
Modified: trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2008-07-16 06:28:23 UTC (rev 657)
+++ trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2008-07-16 07:44:57 UTC (rev 658)
@@ -399,13 +399,22 @@
WRAPPER_DEFINITION_WindowManager=\
"""
CEGUI::Window*
-WindowManager_loadWindowLayout(::CEGUI::WindowManager & me,
+WindowManager_loadWindowLayoutWithPrefix(::CEGUI::WindowManager & me,
const CEGUI::String& filename, const CEGUI::String& name_prefix = "", const CEGUI::String& resourceGroup = "") {
return me.loadWindowLayout( filename, name_prefix , resourceGroup);
}
+
+CEGUI::Window*
+WindowManager_loadWindowLayout(::CEGUI::WindowManager & me,
+ const CEGUI::String& filename) {
+ return me.loadWindowLayout( filename );
+ }
+
"""
WRAPPER_REGISTRATION_WindowManager =[
+ 'def ("loadWindowLayoutPrefix", &::WindowManager_loadWindowLayoutWithPrefix,\
+ bp::return_value_policy< bp::reference_existing_object,bp::default_call_policies >());',
'def ("loadWindowLayout", &::WindowManager_loadWindowLayout,\
bp::return_value_policy< bp::reference_existing_object,bp::default_call_policies >());'
]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-16 06:28:12
|
Revision: 657
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=657&view=rev
Author: mithro
Date: 2008-07-15 23:28:23 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
This should say any not all.
Modified Paths:
--------------
trunk/python-ogre/debian/control
Modified: trunk/python-ogre/debian/control
===================================================================
--- trunk/python-ogre/debian/control 2008-07-16 05:05:28 UTC (rev 656)
+++ trunk/python-ogre/debian/control 2008-07-16 06:28:23 UTC (rev 657)
@@ -21,7 +21,7 @@
Standards-Version: 3.7.2
Package: python-ogre
-Architecture: all
+Architecture: any
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
XB-Python-Version: ${python:Versions}
Description: Python Ogre.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2008-07-16 05:05:19
|
Revision: 656
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=656&view=rev
Author: mithro
Date: 2008-07-15 22:05:28 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Enable building for all architectures.
Modified Paths:
--------------
trunk/python-ogre/debian/control
Modified: trunk/python-ogre/debian/control
===================================================================
--- trunk/python-ogre/debian/control 2008-07-16 05:01:33 UTC (rev 655)
+++ trunk/python-ogre/debian/control 2008-07-16 05:05:28 UTC (rev 656)
@@ -21,7 +21,7 @@
Standards-Version: 3.7.2
Package: python-ogre
-Architecture: i386
+Architecture: all
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
XB-Python-Version: ${python:Versions}
Description: Python Ogre.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
