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...> - 2009-01-28 06:10:09
|
Revision: 858
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=858&view=rev
Author: andy_miller
Date: 2009-01-28 06:10:03 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
Adding Physx Demo from Dermont
Added Paths:
-----------
trunk/python-ogre/demos/physx/Demo01_Simple.py
Added: trunk/python-ogre/demos/physx/Demo01_Simple.py
===================================================================
--- trunk/python-ogre/demos/physx/Demo01_Simple.py (rev 0)
+++ trunk/python-ogre/demos/physx/Demo01_Simple.py 2009-01-28 06:10:03 UTC (rev 858)
@@ -0,0 +1,736 @@
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+import ogre.renderer.OGRE as ogre
+import ogre.physics.PhysX as physx
+import ogre.physics.OgreOde as OgreOde
+import SampleFramework as sf
+import ctypes
+from ctypes import *
+from math import *
+
+# -------------------------------------------------------------------------------------------------
+# This code is based on a physx ogre tutorial by makiolo
+# http://blogricardo.wordpress.com/2008/07/22/como-hacer-juegos-profesionales-linux-ogre-physx-2a-parte/
+#
+# -------------------------------------------------------------------------------------------------
+#
+# class MyMemoryWriteBuffer(physx.MemoryWriteBuffer):
+# def __init__(self):
+# physx.MemoryWriteBuffer.__init__(self)
+# def storeFloat(self,f):
+# f = physx.MemoryWriteBuffer.storeFloat(self,f)
+# print f
+# return f
+# def storeDouble(self,f):
+# print "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+# f = physx.MemoryWriteBuffer.storeDouble(self,f)
+# print f
+# return f
+# def storeBuffer(self,buffer, size):
+# print "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+# physx.MemoryWriteBuffer.storeBuffer(self,buffer, size)
+# def storeDword(self,w):
+# print "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+# w = physx.MemoryWriteBuffer.storeDouble(self,w)
+# print w
+# return w
+
+
+
+
+# -------------------------------------------------------------------------------------------------
+# Nx to/from Ogre Conversion Utilitites
+# -------------------------------------------------------------------------------------------------
+class CMathUtilities():
+
+
+ def str2int(str):
+ return int(str)
+
+ def int2str(n):
+ return str(n)
+
+ def sphericalPolar(radio, pitch, yaw):
+ temp = physx.NxVec3()
+ temp.x=radio* physx.sinf(pitch)*physx.sinf(yaw)
+ temp.y=radio*physx.cosf(pitch)
+ temp.z=radio*physx.sinf(pitch)*physx.cosf(yaw)
+ return temp
+
+ def toNxVec3(ogreVec3):
+ return physx.NxVec3( ogreVec3.x, ogreVec3.y, ogreVec3.z)
+
+ def toVector3(nxVec3):
+ return ogre.Vector3( nxVec3.x, nxVec3.y, nxVec3.z)
+
+
+ def toNxQuat(q):
+ orientation = physx.NxQuat()
+ orientation.x = q.x
+ orientation.y = q.y
+ orientation.z = q.z
+ orientation.w = q.w
+ return orientation
+
+ def toQuaternion(q):
+ orientation = ogre.Quaternion()
+ orientation.x = q.x
+ orientation.y = q.y
+ orientation.z = q.z
+ orientation.w = q.w
+ return orientation
+
+ def getSizeofNxVec3():
+ return 12
+ def getSizeofNxU32():
+ return 4
+
+ str2int = staticmethod(str2int)
+ int2str = staticmethod(int2str)
+ sphericalPolar = staticmethod(sphericalPolar)
+ toNxVec3 = staticmethod(toNxVec3)
+ toVector3 = staticmethod(toVector3)
+ toNxQuat = staticmethod(toNxQuat)
+ toQuaternion = staticmethod(toQuaternion)
+ getSizeofNxVec3 = staticmethod(getSizeofNxVec3)
+ getSizeofNxU32 = staticmethod(getSizeofNxU32)
+
+
+
+# -------------------------------------------------------------------------------------------------
+# Mesh Utilities
+# -------------------------------------------------------------------------------------------------
+
+class CMeshUtilities():
+ def getExtents ( mesh ) :
+
+ vMin = ogre.Vector3(99999,99999,99999)
+ vMax = ogre.Vector3(-99999,-99999,-99999)
+ i = []
+ for m in range(mesh.numSubMeshes):
+ sm = mesh.getSubMesh(m)
+ pmesh = sm.parent
+ if pmesh and sm.useSharedVertices :
+ vertex_data = pmesh.sharedVertexData
+ else : vertex_data = sm.vertexData
+
+ # get the start of the element
+ posElem = vertex_data.vertexDeclaration.findElementBySemantic(ogre.VertexElementSemantic.VES_POSITION)
+ vbuf = vertex_data.vertexBufferBinding.getBuffer(posElem.getSource())
+
+ # get the start of the actual buffer
+ vertex = vbuf.lock(ogre.HardwareBuffer.HBL_READ_ONLY)
+
+ # what we need is the actual address of the buffer, so we have to check if there's an offset as well
+ # the is basically what baseVertexPointerToElement does
+ newaddress = posElem.getOffset() + ogre.CastInt(vertex) # note the cast to int to get the address
+
+ for i in range (vertex_data.vertexCount):
+ points = ogre.getFloat( ogre.CastVoidPtr ( newaddress), 3 ) # note the getFloat and Cast back to a pointer :)
+ print points
+ if (points[0]<vMin.x):
+ vMin.x = points[0]
+ if (points[1]<vMin.y):
+ vMin.y = points[1]
+ if (points[2]<vMin.z):
+ vMin.z = points[2]
+ if (points[0]>vMax.x):
+ vMax.x = points[0]
+ if (points[1]>vMax.y):
+ vMax.y = points[1]
+ if (points[2]>vMax.z):
+ vMax.z = points[2]
+
+ #outbuff.append(tuple(points))
+ newaddress += vbuf.getVertexSize()
+ return vMin, vMax
+
+ def getVertices ( sm, convertToNx = True ) :
+ outbuff = []
+ pmesh = sm.parent
+ if pmesh and sm.useSharedVertices :
+ vertex_data = pmesh.sharedVertexData
+ else : vertex_data = sm.vertexData
+
+ # get the start of the element
+ posElem = vertex_data.vertexDeclaration.findElementBySemantic(ogre.VertexElementSemantic.VES_POSITION)
+ vbuf = vertex_data.vertexBufferBinding.getBuffer(posElem.getSource())
+
+ # get the start of the actual buffer
+ vertex = vbuf.lock(ogre.HardwareBuffer.HBL_READ_ONLY)
+
+ # what we need is the actual address of the buffer, so we have to check if there's an offset as well
+ # the is basically what baseVertexPointerToElement does
+ newaddress = posElem.getOffset() + ogre.CastInt(vertex) # note the cast to int to get the address
+
+ for i in range (vertex_data.vertexCount):
+ points = ogre.getFloat( ogre.CastVoidPtr ( newaddress), 3 ) # note the getFloat and Cast back to a pointer :)
+ outbuff.append(physx.NxVec3(points[0], points[1], points[2]))
+ newaddress += vbuf.getVertexSize()
+ return outbuff
+
+ def getIndices ( sm ) :
+ outbuff = []
+
+ numTris = sm.indexData.indexCount
+ if numTris == 0 : return outbuff
+ else : numTris /= 3
+
+ ibuf = sm.indexData.indexBuffer
+
+ if ibuf.getType() == ogre.HardwareIndexBuffer.IT_32BIT:
+ Use32Bit = True
+ else: Use32Bit = False
+
+ buffer = ibuf.lock(ogre.HardwareBuffer.HBL_READ_ONLY)
+ address = ogre.CastInt ( buffer )
+
+ for i in range( numTris ):
+ if Use32Bit:
+ l = ogre.getUint32 ( ogre.CastVoidPtr ( address ), 3 )
+ address += ibuf.getIndexSize() * 3
+ else:
+ l = ogre.getUint16 ( ogre.CastVoidPtr ( address ), 3 )
+ address += ibuf.getIndexSize() * 3
+ outbuff.append(l[0])
+ outbuff.append(l[1])
+ outbuff.append(l[2])
+ #mMaterials[index_offset++] = currentMaterialIndex;
+ return outbuff
+
+ def getMeshInfo(mesh):
+ v = []
+ i = []
+ for m in range(mesh.numSubMeshes):
+ sm = mesh.getSubMesh(m)
+ v += CMeshUtilities.getVertices ( sm )
+ i += CMeshUtilities.getIndices ( sm )
+ return v, i
+
+
+ getExtents = staticmethod(getExtents)
+ getIndices = staticmethod(getIndices)
+ getVertices = staticmethod(getVertices)
+ getMeshInfo = staticmethod(getMeshInfo)
+
+# -------------------------------------------------------------------------------------------------
+# Densities
+# -------------------------------------------------------------------------------------------------
+class DENSITY():
+ Aluminium = 2700
+ Cork = 250
+ Copper = 8960
+ Ice = 920
+ Brick = 7900
+ SoftWood = 200
+ MediumWood = 500
+ HardWood = 800
+ Lead = 11300
+ Glass = 3000
+ LaminatedGlass = 3600
+
+ ##Liquidos
+ Acetone = 790
+ Oil = 920
+ Water = 1025
+ Water2 = 1000
+ Alcohol = 790
+ Gasoline = 680
+ Milk = 1030
+ Mercury = 13600
+ ##Gas
+ Air = 1
+ Butane = 3
+
+
+
+# -------------------------------------------------------------------------------------------------
+# PhysxListener
+# -------------------------------------------------------------------------------------------------
+class PhysxStepper():
+ def __init__(self, nxscene, bodies):
+ # timing
+ self.FPS = 30
+ maxIter = self.FPS / 15.0
+ self.timePerPass = 1.0 / self.FPS
+ maxTimestep = self.timePerPass / float(maxIter)
+ nxscene.setTiming( maxTimestep, int(maxIter), physx.NX_TIMESTEP_FIXED )
+
+ self.nxscene = nxscene
+ self.bodies = bodies
+
+ def step(self):
+ self.nxscene.simulate(self.timePerPass)
+ self.nxscene.flushStream()
+
+ def update(self):
+ #----------------------------------------------------------------
+ # TODO update self.nxscene.fetchResults to return errorNumber
+ #self.nxscene.fetchResults( physx.NX_ALL_FINISHED,
+ # True , ctypes.addressof(self.errorNumber) )
+ #--------------------------------------------------------------------------------
+ self.nxscene.fetchResults( physx.NX_ALL_FINISHED, True )
+ for body in self.bodies:
+ body.Update()
+
+
+# -------------------------------------------------------------------------------------------------
+# Body
+# -------------------------------------------------------------------------------------------------
+class Body():
+
+ def __init__(self, actorDesc, physXManager):
+ self.actor = None
+ self.dynamic = False
+ self.userDataList = []
+ self.physXManager = physXManager
+ self.actor = physXManager.getNxScene().createActor(actorDesc)
+ #actor.raiseBodyFlag(physx.NX_BF_KINEMATIC)
+ try:
+ if actorDesc.body is not None:
+ self.dynamic = True
+ except:
+ pass
+
+
+ # ------------------------------------------------------------------------------
+ def setUserData(self):
+ self.actor.setUserData(self.userDataList)
+ # ------------------------------------------------------------------------------
+ def addEntity(self, ent):
+ self.userDataList.append(ent)
+
+ # ------------------------------------------------------------------------------
+ # create a debug node and attach to actor's user data list
+ # ------------------------------------------------------------------------------
+ def addDebugNode(self, name, shape, radius = 5, parentNode = None):
+
+ # create debug object, fudge from ogreode
+ if shape.getType() == physx.NX_SHAPE_BOX:
+ size = CMathUtilities.toVector3(shape.dimensions)* 2 * 1.02
+ b = OgreOde.BoxDebugObject( size )
+ elif shape.getType() == physx.NX_SHAPE_SPHERE:
+ r = shape.radius*1.05
+ b = OgreOde.SphereDebugObject( r )
+ else:
+ b = OgreOde.SphereDebugObject(radius)
+
+ # attach debug object to main or parent node
+ if not parentNode:
+ parentNode = self.physXManager.sceneManager.getRootSceneNode()
+ debugNodeName = name + "_Debug"
+ _debug_node = parentNode.createChildSceneNode(debugNodeName)
+ _debug_node.attachObject( b )
+ _debug_node.setPosition( CMathUtilities.toVector3(shape.localPose.t ) )
+
+ # enable and add to actor's user data list
+ b.setMode(OgreOde.DebugObject.Mode_Enabled)
+ self.userDataList.append(b)
+
+ # ------------------------------------------------------------------------------
+ def cleanUp(self):
+ for s in self.actor.getUserData():
+ try:
+ sn = s.getParentSceneNode()
+ self.physXManager.sceneManager.destroySceneNode(sn.getName())
+ except:
+ pass
+ self.actor.setUserData(None)
+ self.userDataList = []
+ self.physXManager.gScene.releaseActor(self.actor)
+ self.actor = None
+
+ # ------------------------------------------------------------------------------
+ def position(self, position, transVec = physx.NxVec3(0,0,0) ):
+ self.actor.setGlobalPosition(position)
+ self.actor.moveGlobalPosition( self.actor.getGlobalPosition() + self.actor.getGlobalOrientation() * transVec )
+ print len(self.actor.getUserData())
+ for u in self.actor.getUserData():
+ self.setNodePosToActor(u.getParentNode() )
+
+ # ------------------------------------------------------------------------------
+ def setNodePosToActor(self, node):
+ node.setPosition( CMathUtilities.toVector3(self.actor.getGlobalPosition()) )
+ node.setOrientation( CMathUtilities.toQuaternion(self.actor.getGlobalOrientationQuat()) )
+
+ # ------------------------------------------------------------------------------
+ def Update(self):
+ if not self.dynamic:
+ return
+ for u in self.actor.getUserData():
+ if u:
+ self.setNodePosToActor(u.getParentNode() )
+
+
+# -------------------------------------------------------------------------------------------------
+# PhysxListener
+# -------------------------------------------------------------------------------------------------
+class PhysxFrameListener(sf.FrameListener, PhysxStepper):
+ def __init__(self, renderWindow, camera, nxscene, actors):
+ sf.FrameListener.__init__(self, renderWindow, camera)
+ PhysxStepper.__init__(self, nxscene, actors)
+
+ def frameRenderingQueued(self, frameEvent):
+ return sf.FrameListener.frameRenderingQueued(self, frameEvent)
+
+ def frameStarted(self, frameEvent):
+ PhysxStepper.step(self)
+ return sf.FrameListener.frameStarted(self, frameEvent)
+
+ def frameEnded(self, frameEvent):
+ PhysxStepper.update(self)
+ return sf.FrameListener.frameEnded(self, frameEvent)
+
+
+# -------------------------------------------------------------------------------------------------
+# PhysxManager
+# -------------------------------------------------------------------------------------------------
+class PhysxManager():
+ def __init__(self):
+
+ self.gphysxSDK = None
+ self.gScene = None
+ self.gCooking = None
+ # create our own actors list NxScene getActors() not working
+ self.bodies = []
+
+ self.sceneManager = None
+
+ def InitNX(self):
+ # initialise physx
+ gphysxSDK,errorCode = physx.NxCreatePhysicsSDK(physx.NX_PHYSICS_SDK_VERSION())
+
+ if (physx.NXCE_NO_ERROR != errorCode):
+ print "\nSDK create error (%d - %s).\nUnable to initialize the PhysX SDK, exiting the sample.\n\n" % (errorCode,"test")
+ self.DeInitNX()
+ return False
+
+ # get the sdk
+ self.gphysxSDK = physx.NxGetPhysicsSDK()
+
+ # Set the physx parameters
+ self.gphysxSDK.setParameter(physx.NX_SKIN_WIDTH, -0.01)
+ # Set the debug visualization parameters
+ self.gphysxSDK.setParameter(physx.NX_VISUALIZATION_SCALE, 1)
+ self.gphysxSDK.setParameter(physx.NX_VISUALIZE_COLLISION_SHAPES, 1)
+ self.gphysxSDK.setParameter(physx.NX_VISUALIZE_JOINT_LIMITS, 1)
+ self.gphysxSDK.setParameter(physx.NX_VISUALIZE_JOINT_LOCAL_AXES, 1)
+ self.gphysxSDK.setParameter(physx.NX_VISUALIZE_ACTOR_AXES, 1)
+ return True
+
+ # ------------------------------------------------------------------------------
+ def createScene(self, sceneManager):
+ self.sceneManager = sceneManager
+ # Create the physx scene
+ sceneDesc = physx.NxSceneDesc()
+ sceneDesc.gravity = physx.NxVec3(0.0,-9.8,0.0)
+ self.gScene = self.gphysxSDK.createScene(sceneDesc)
+ if (not self.gScene):
+ print "Error !!! Could not create the scene"
+ self.DeInitNX()
+ return False
+ sceneDesc.collisionDetection = True
+
+ # Create the default material
+ m = physx.NxMaterialDesc ()
+ m.restitution = 0.5
+ m.staticFriction = 0.2
+ m.dynamicFriction = 0.2
+ mat = self.gScene.getMaterialFromIndex(0)
+ mat.loadFromDesc(m)
+
+ self.gCooking = physx.NxGetCookingLib(physx.NX_PHYSICS_SDK_VERSION())
+ return True
+
+ # ------------------------------------------------------------------------------
+ def DeInitNX(self):
+ if self.gphysxSDK:
+ if not self.gScene is None:
+
+ # delete bodies
+ while len(self.bodies)>0:
+ body = self.bodies.pop()
+ body.cleanUp()
+ del body
+ print "Cleaned Up Bodies"
+ # delete scene
+ self.gphysxSDK.releaseScene(self.gScene)
+ self.gScene = 0
+ print "Deleted Scene"
+ # delete SDK
+ physx.NxReleasePhysicsSDK(self.gphysxSDK)
+ self.gphysxSDK = 0
+
+ print "Released PhysX SDK"
+
+ # ------------------------------------------------------------------------------
+ def getNxScene(self):
+ return self.gScene
+ def getPhysXSDK(self):
+ return self.gphysxSDK
+ def getPhysXCooking(self):
+ return self.gCooking
+ def getActors(self):
+ return self.actors
+ def getDebugObjects(self):
+ return self.debugs
+
+
+ # ------------------------------------------------------------------------------
+ def createCube(self, name, density , vec3Extents , position, dynamic = True):
+
+ # renderer
+ ent = self.sceneManager.createEntity(name,'cube.mesh')
+ ent.setQueryFlags(1<<2)
+ ent.setMaterialName("Examples/RustySteel")
+ node = self.sceneManager.getRootSceneNode().createChildSceneNode(name)
+ node.translate(0, vec3Extents.y/2.0, 0)
+ node.scale(vec3Extents/100.0)
+ node.attachObject(ent)
+
+ # dimesions half extents
+ shapeDimensions = CMathUtilities.toNxVec3( vec3Extents/2.0 )
+
+ # box shape description
+ boxShapeDesc = physx.NxBoxShapeDesc()
+ boxShapeDesc.name = "%sDesc" %(name)
+ boxShapeDesc.dimensions = shapeDimensions
+ #boxShapeDesc.localPose.t = physx.NxVec3(0, shapeDimensions.y ,0)
+ boxShapeDesc.density = density
+
+ # actor description
+ actorDesc = physx.NxActorDesc()
+ actorDesc.shapes.pushBack(boxShapeDesc)
+ actorDesc.density = density
+ actorDesc.globalPose.t = CMathUtilities.toNxVec3(position)
+
+ # add dynamic body
+ if dynamic:
+ bodyDesc = physx.NxBodyDesc()
+ bodyDesc.angularDamping = 0.0
+ bodyDesc.linearDamping = 0.0
+ actorDesc.body = bodyDesc
+
+
+ body = Body(actorDesc, self)
+ body.addEntity(ent)
+ body.addDebugNode( name, boxShapeDesc)
+ body.setUserData( )
+ body.position(position = CMathUtilities.toNxVec3(position))
+ self.bodies.append(body)
+
+ # ------------------------------------------------------------------------------
+ def createPlane(self, name, density , vec2Extents, position):
+
+ # Render
+ plane = ogre.Plane()
+ plane.normal = ogre.Vector3().UNIT_Y
+ plane.d = 0
+ mm = ogre.MeshManager.getSingleton()
+ mm.createPlane(name, 'General', plane, vec2Extents.x, vec2Extents.y,
+ 20, 20, True, 1, 200.0, 200.0, (0, 0, 1),
+ ogre.HardwareBuffer.HBU_STATIC_WRITE_ONLY, ogre.HardwareBuffer.HBU_STATIC_WRITE_ONLY,
+ True,True )
+
+ ent = self.sceneManager.createEntity(name, name)
+ ent.setMaterialName("Examples/GrassFloor")
+ sn = self.sceneManager.getRootSceneNode().createChildSceneNode()
+ sn.translate(vec2Extents.x/2.0 , 0 , vec2Extents.y / 2.0);
+ sn.attachObject(ent)
+
+ planeDesc = physx.NxPlaneShapeDesc()
+ planeDesc.name = "%sDesc" %(name)
+ planeDesc.d = 0
+ # actor description
+ actorDesc = physx.NxActorDesc()
+ actorDesc.shapes.pushBack(planeDesc)
+
+ body = Body(actorDesc, self)
+ body.addEntity(ent)
+ body.setUserData( )
+ body.position(position = CMathUtilities.toNxVec3(position))
+ self.bodies.append(body)
+
+ # ------------------------------------------------------------------------------
+ def createSphere(self, name, density , radius , position, dynamic = True):
+
+ # Render
+ ent = self.sceneManager.createEntity(name,'sphere.mesh')
+ ent.setQueryFlags(1<<2)
+ ent.setMaterialName("Examples/RustySteel")
+ node = self.sceneManager.getRootSceneNode().createChildSceneNode(name)
+ node.translate(0, radius, 0)
+ node.scale( radius/100.0, radius/100.0, radius/100.0 )
+ node.attachObject(ent)
+
+ # sphere shape description
+ sphereShapeDesc = physx.NxSphereShapeDesc()
+ sphereShapeDesc.radius = radius
+ #sphereShapeDesc.localPose.t = physx.NxVec3(0, radius ,0)
+ sphereShapeDesc.density = density
+
+ # actor description
+ actorDesc = physx.NxActorDesc()
+ actorDesc.shapes.pushBack(sphereShapeDesc)
+ actorDesc.density = density
+ actorDesc.globalPose.t = CMathUtilities.toNxVec3(position)
+
+ # add dynamic body
+ if dynamic:
+ bodyDesc = physx.NxBodyDesc()
+ bodyDesc.angularDamping = 0.0
+ bodyDesc.linearDamping = 0.0
+ actorDesc.body = bodyDesc
+
+ body = Body(actorDesc, self)
+ body.addEntity(ent)
+ body.addDebugNode( name, sphereShapeDesc)
+ body.setUserData( )
+ body.position(position = CMathUtilities.toNxVec3(position))
+ self.bodies.append(body)
+
+
+ # ------------------------------------------------------------------------------
+ def createMesh(self, name, mesh_name, density, position):
+
+ # Render
+ ent = self.sceneManager.createEntity(name, mesh_name)
+ ent.setQueryFlags(1<<2)
+ node = self.sceneManager.getRootSceneNode().createChildSceneNode('head')
+ node.attachObject(ent)
+ node.scale( 0.1, 0.1, 0.1 )
+ node.translate(position)
+
+ vertices,indices = CMeshUtilities.getMeshInfo(ent.mesh)
+
+ meshDesc = physx.NxTriangleMeshDesc()
+ meshDesc.name = "%sDesc" %(name)
+ meshDesc.setToDefault()
+ meshDesc.numVertices = len(vertices)
+ meshDesc.pointStrideBytes = CMathUtilities.getSizeofNxVec3()
+ meshDesc.setPoints(vertices, len(vertices))
+
+ if len(indices)>0:
+ meshDesc.numTriangles = int(len(indices)/3)
+ meshDesc.triangleStrideBytes = 3*CMathUtilities.getSizeofNxU32()
+ meshDesc.setFaces(indices, len(indices))
+ meshDesc.flags = 0
+
+ numIndices = len(indices)
+ numVerts = len(vertices)
+
+ # check mesh description is valid
+ if not meshDesc.isValid():
+ print "The mesh description created is not valid"
+ print "NumVerts %d NumIndices %d MeshDesc NumVerts %d NumIndices %d" %(numVerts, numIndices, meshDesc.numVertices, meshDesc.numTriangles)
+ sys.exit(1)
+ else:
+ print " NumVerts %d NumIndices %d MeshDesc NumVerts %d NumIndices %d" %(numVerts, numIndices, meshDesc.numVertices, meshDesc.numTriangles)
+
+ del vertices,indices
+
+ meshShapeDesc = physx.NxTriangleMeshShapeDesc()
+ #meshShapeDesc.shapeFlags|= physx.NX_SF_FEATURE_INDICES
+
+
+ # initilaise cooking
+ if not self.gCooking.NxInitCooking():
+ print("Unable to initialize the cooking library. Please make sure that you have correctly installed the latest version of the AGEIA PhysX SDK.")
+ sys.exit(1)
+
+ writeBuffer = physx.MemoryWriteBuffer()
+ status = self.gCooking.NxCookTriangleMesh(meshDesc, writeBuffer)
+ if not status:
+ print("Unable to cook a triangle mesh.")
+ sys.exit(1)
+
+ # don't call writeBuffer.data here, pass pointer to writeBuffer
+ # in ctor and it handles the assignment of the buffer data
+ memReadBuffer = physx.MemoryReadBuffer(writeBuffer)
+ meshShapeDesc.meshData = self.gphysxSDK.createTriangleMesh(memReadBuffer)
+ self.gCooking.NxCloseCooking()
+
+ # actor description
+ actorDesc = physx.NxActorDesc()
+ actorDesc.shapes.pushBack(meshShapeDesc)
+ actorDesc.density = 0.02
+ actorDesc.globalPose.t = CMathUtilities.toNxVec3(position)
+
+
+ body = Body(actorDesc, self)
+ body.addEntity(ent)
+ # sphere
+ body.addDebugNode( name, meshShapeDesc, 5)
+ body.setUserData( )
+ body.position(position = CMathUtilities.toNxVec3(position))
+ self.bodies.append(body)
+
+
+
+
+
+
+# -------------------------------------------------------------------------------------------------
+# Main Application
+# -------------------------------------------------------------------------------------------------
+class TutorialApplication (sf.Application):
+
+ def __init__(self):
+ sf.Application.__init__(self)
+ self.physxManager = PhysxManager()
+
+ # ------------------------------------------------------------------------------
+ def _createScene (self):
+
+ if not self.physxManager.InitNX():
+ del self.physxManager
+ sys.exit(1)
+
+ if not self.physxManager.createScene( self.sceneManager):
+ del self.physxManager
+ sys.exit(1)
+
+ self.physxManager.createCube( "cube1", DENSITY.Air , ogre.Vector3(20.0,20.0,20.0) , ogre.Vector3(0,400,0) ,True)
+ self.physxManager.createSphere( "sphere1", DENSITY.SoftWood , 10.0 , ogre.Vector3(30,400,0) ,True)
+ self.physxManager.createPlane( "plane1", DENSITY.HardWood , ogre.Vector2(2000.0, 2000.0), ogre.Vector3(0,0,0) )
+
+ # Not implemented since MemoryReadBuffer / MemoryWriteBuffer not wrapped in svn
+ #self.physxManager.createMesh( 'head','razor.mesh', DENSITY.SoftWood, ogre.Vector3(0,10,0))
+
+ # -------------------
+ # crash ?????????????
+ # -------------------
+ #print dir(self.physxManager.getNxScene().getActors())
+
+ def _createCamera(self):
+ self.camera = self.sceneManager.createCamera('PlayerCam')
+ self.camera.position =0,30,-90
+ self.camera.lookAt((0,0,0))
+ self.camera.nearClipDistance = 1
+
+ def _createFrameListener(self):
+ # pass self.actors list NxScene getActors() not working
+ self.frameListener = PhysxFrameListener( self.renderWindow,
+ self.camera,
+ self.physxManager.gScene,
+ self.physxManager.bodies )
+
+ self.frameListener.showDebugOverlay(True)
+ self.root.addFrameListener(self.frameListener)
+
+ def cleanUp(self):
+ self.physxManager.DeInitNX()
+ del self.physxManager
+
+ def __del__(self):
+ if self.root:
+ del self.root
+
+if __name__ == '__main__':
+ ta = TutorialApplication ()
+ ta.go ()
+ ta.cleanUp()
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-28 00:36:44
|
Revision: 857
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=857&view=rev
Author: andy_miller
Date: 2009-01-28 00:36:40 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
Further Mac updates - 4 more modules now building (et, noise, cadunetree, caelum)
Modified Paths:
--------------
trunk/python-ogre/SConstruct
trunk/python-ogre/code_generators/cadunetree/customization_data.py
trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h
trunk/python-ogre/code_generators/caelum/customization_data.py
trunk/python-ogre/code_generators/caelum/python_caelum.h
trunk/python-ogre/code_generators/et/customization_data.py
trunk/python-ogre/code_generators/et/python_et.h
trunk/python-ogre/code_generators/hydrax/customization_data.py
trunk/python-ogre/code_generators/hydrax/python_hydrax.h
trunk/python-ogre/code_generators/noise/customization_data.py
trunk/python-ogre/code_generators/noise/python_noise.h
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/SConstruct 2009-01-28 00:36:40 UTC (rev 857)
@@ -68,6 +68,7 @@
else:
CCFLAGS = ' -I./ -O3 -dynamic -fPIC -DBOOST_PYTHON_NO_PY_SIGNATURES -DBOOST_PYTHON_MAX_ARITY=19 '
CCFLAGS += ' -ftemplate-depth-128 -finline-functions -Wno-inline -Wall -no-cpp-precomp -gdwarf-2 -DNDEBUG '
+ CCFLAGS += ' -include strings.h -include Carbon/Carbon.h '
# -ftemplate-depth-128 -D_POSIX_C_SOURCE -no-cpp-precomp -gdwarf-2 -finline-functions -Wno-inline -Wall -DBOOST_ALL_NO_LIB=1 -DBOOST_PYTHON_SOURCE
# -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/
# -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/ CCFLAGS = ' -I -pipe -O3 -I./'
Modified: trunk/python-ogre/code_generators/cadunetree/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/cadunetree/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,7 +1,9 @@
-
+import os
def header_files( version ):
- return [ 'CaduneTree.h']
-
+ ret= [ 'CaduneTree.h']
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
def huge_classes( version ):
return []
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "CTParameters.h"
#include "CTSerializer.h"
//#include "CTSection.h"
Modified: trunk/python-ogre/code_generators/caelum/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/caelum/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,7 +1,9 @@
-
+import os
def header_files( version ):
- return [ 'Caelum.h']
-
+ ret = [ 'Caelum.h']
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
def huge_classes( version ):
return []
Modified: trunk/python-ogre/code_generators/caelum/python_caelum.h
===================================================================
--- trunk/python-ogre/code_generators/caelum/python_caelum.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/caelum/python_caelum.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "Caelum.h"
// First we create a magic namespace to hold all our aliases
Modified: trunk/python-ogre/code_generators/et/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/et/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/et/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,13 +1,16 @@
-
+import os
def header_files( version ):
- return ['ETTerrainInfo.h',
+ ret = ['ETTerrainInfo.h',
'ETTerrainManager.h',
'ETBrush.h',
'ETSplattingManager.h',
'Ogre.h',
'OgreColourValue.h',
'OgreImage.h'
-]
+ ]
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
##,
## 'OgreColourValue.h'
def huge_classes( version ):
Modified: trunk/python-ogre/code_generators/et/python_et.h
===================================================================
--- trunk/python-ogre/code_generators/et/python_et.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/et/python_et.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "ETTerrainInfo.h"
#include "ETTerrainManager.h"
Modified: trunk/python-ogre/code_generators/hydrax/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/hydrax/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/hydrax/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,11 +1,13 @@
-
+import os
def header_files( version ):
- return [ 'Hydrax.h',
+ ret= [ 'Hydrax.h',
"ProjectedGrid.h",
"SimpleGrid.h",
"Perlin.h"
]
-
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
def huge_classes( version ):
return []
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/hydrax/python_hydrax.h
===================================================================
--- trunk/python-ogre/code_generators/hydrax/python_hydrax.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/hydrax/python_hydrax.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "Hydrax.h"
#include "ProjectedGrid.h"
#include "SimpleGrid.h"
Modified: trunk/python-ogre/code_generators/noise/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/noise/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/noise/customization_data.py 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,8 +1,10 @@
-
+import os
def header_files( version ):
- return [ 'noise.h',
+ ret= [ 'noise.h',
'noiseutils.h']
-
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
def huge_classes( version ):
return []
Modified: trunk/python-ogre/code_generators/noise/python_noise.h
===================================================================
--- trunk/python-ogre/code_generators/noise/python_noise.h 2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/noise/python_noise.h 2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "noise.h"
#include "noiseutils.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-27 13:40:58
|
Revision: 856
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=856&view=rev
Author: andy_miller
Date: 2009-01-27 13:40:49 +0000 (Tue, 27 Jan 2009)
Log Message:
-----------
MAC specific updates for the 1.6.1 release -- Ogre, OIS and CEGUI working OK!
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/SConstruct
trunk/python-ogre/code_generators/cegui/customization_data.py
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/cegui/python_CEGUI.h
trunk/python-ogre/code_generators/ogre/custom_rvalue.cpp
trunk/python-ogre/code_generators/ogre/customization_data.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/python_ogre.h
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/patch/ogre_1.6.1_mac.patch
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -5,11 +5,8 @@
## lets assume that the base development directory is one level higher
BASE_DIR,ignore = os.path.split(module_dir) ## r'/home/andy/development'
-
-
SDK = False
-
# the base of the /usr/... dircetory structure that we are using
ROOT_DIR = os.path.join(BASE_DIR,'root')
LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')
@@ -31,14 +28,27 @@
# and the Py++ directory as sometimes we need access to the code repository there
pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
+isMAC = False
+if os.sys.platform == 'darwin': # for the Mac
+ isMAC = True
+ MAC_SDK_INCLUDE= '' #/Developer/SDKs/MacOSX10.5.sdk/Developer/Headers/FlatCarbon'
+ MAC_CCFLAGS = ' -D__ASSERTMACROS__ '
+ MAC_cflags = ' -D__APPLE_CC__ -DCF_OPEN_SOURCE \
+ -I. \
+ -F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks \
+ -DBOOST_PYTHON_NO_PY_SIGNATURES -DBOOST_PYTHON_MAX_ARITY=19 \
+ -I' + os.path.join(module_dir,'code_generators','ogre') + ' '
+ MAC_AdditionalFrameWorks=[ os.path.abspath(os.path.join(BASE_DIR,'ogre/Mac/build/Release')), # this one can be removed as Ogr eis now copied to the user frameworks area
+ os.path.abspath(os.path.join(os.path.expanduser('~'), 'Library','Frameworks'))]
+ LIB_Boost = 'libboost_python-xgcc42-mt'
+
+
+# SDK = True
+# FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac
+# MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon'
+# MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
+# MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
-if os.sys.platform == 'darwin': # we use the pre built sdk for OSX
- SDK = True
- FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac
- MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon'
- MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
- MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
-
# # ## Parent directories of the libraries
@@ -51,6 +61,9 @@
if SDK:
PATH_CEGUI = os.path.join(BASE_DIR, 'ogre','Dependencies')
PATH_OIS = os.path.join(BASE_DIR, 'ogre','Dependencies')
+if isMAC:
+ PATH_CEGUI = os.path.join(BASE_DIR, 'ogre','Dependencies')
+
PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK','sdk')
PATH_ODE = os.path.join(BASE_DIR, 'ode-0.10.1')
@@ -108,6 +121,10 @@
PATH_LIB_CEGUI = os.path.join( PATH_CEGUI,'lib', 'Release' ) #PATH_Ogre, r'Dependencies/lib/Release' )
PATH_LIB_Ogre_OgreMain= os.path.join( PATH_Ogre, 'OgreMain/lib/Release' )
+if isMAC:
+ PATH_LIB_OIS = os.path.join( PATH_OIS,'Mac', 'XCode-2.2', 'build', 'Release' ) #PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
+ PATH_LIB_CEGUI = os.path.join( PATH_CEGUI,'lib', 'Release' ) #PATH_Ogre, r'Dependencies/lib/Release' )
+
PATH_LIB_ODE = os.path.join( LOCAL_LIB ) #PATH_ODE, 'lib/releasedll')## probable releaselib for posix
PATH_LIB_OPCODE = os.path.join( PATH_OPCODE )
PATH_LIB_OgreOde = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'lib/Release')
@@ -138,12 +155,20 @@
PATH_INCLUDE_OIS = os.path.join(LOCAL_INCLUDE,'OIS') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_CEGUI = os.path.join(LOCAL_INCLUDE,'CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
-if SDK:
+
+if SDK :
PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'include','OIS') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_CEGUI = os.path.join(PATH_CEGUI,'include','CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/include')
+
+if isMAC:
+ PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
+ PATH_INCLUDE_CEGUI = os.path.join(PATH_Ogre, 'Dependencies','include', 'CEGUI' ) #PATH_CEGUI,'include','CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
+ PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain','include')
+ PATH_INCLUDE_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies','include')
+
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
PATH_INCLUDE_OgreNewt = os.path.join(LOCAL_INCLUDE,'OgreNewt') #os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
PATH_INCLUDE_ODE = os.path.join(LOCAL_INCLUDE,'ode') #os.path.join( PATH_ODE, 'include')
@@ -206,3 +231,5 @@
PATH_INCLUDE_mygui = os.path.join(PATH_mygui,'MyGUIEngine','include')
PATH_INCLUDE_canvas= PATH_canvas
+if os.sys.platform=='darwin':
+ pass
\ No newline at end of file
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/SConstruct 2009-01-27 13:40:49 UTC (rev 856)
@@ -66,7 +66,11 @@
CCFLAGS += ' '
else:
- CCFLAGS = ' -I -pipe -O3 -I./'
+ CCFLAGS = ' -I./ -O3 -dynamic -fPIC -DBOOST_PYTHON_NO_PY_SIGNATURES -DBOOST_PYTHON_MAX_ARITY=19 '
+ CCFLAGS += ' -ftemplate-depth-128 -finline-functions -Wno-inline -Wall -no-cpp-precomp -gdwarf-2 -DNDEBUG '
+ # -ftemplate-depth-128 -D_POSIX_C_SOURCE -no-cpp-precomp -gdwarf-2 -finline-functions -Wno-inline -Wall -DBOOST_ALL_NO_LIB=1 -DBOOST_PYTHON_SOURCE
+ # -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/
+ # -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/ CCFLAGS = ' -I -pipe -O3 -I./'
## change to ensure the source file is also in the include path due to indexing suite changes
CCFLAGS += ' -I' +cls._source + ' '
@@ -102,7 +106,8 @@
if os.sys.platform <> 'darwin':
LINKFLAGS = ' `pkg-config --libs OGRE` -lstdc++ '
if environment.isMac():
- LINKFLAGS = ' -Wl,-x -framework Python -framework Ogre -framework Carbon -F' + environment.Config.FRAMEWORK_DIR + ' '
+# LINKFLAGS = ' -Wl,-x -framework Python -framework Ogre -framework Carbon -F' + environment.Config.FRAMEWORK_DIR + ' '
+ LINKFLAGS = ' -dynamiclib -dynamic -framework Ogre -framework Carbon -framework Python '
return LINKFLAGS
def build_pch( cls, pchfile ):
@@ -223,9 +228,10 @@
if environment.isLinux() and "-g" not in _env["CCFLAGS"]:
_env.AddPostAction(package,\
'-strip -g -S -d --strip-debug -s %(name)s' % { 'name':package[index] } )
- if environment.isMac():
- _env.AddPostAction(package,\
- '-strip -s %(name)s' % { 'name':package[index] } )
+ if environment.isMac():
+ pass
+ #_env.AddPostAction(package,\
+ # '-strip -s %(name)s' % { 'name':package[index] } )
_env.InstallAs(os.path.join(environment.package_dir_name, cls.parent,
cls.ModuleName, cls.PydName),
Modified: trunk/python-ogre/code_generators/cegui/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/customization_data.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/cegui/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -1,6 +1,6 @@
-
+import os
def header_files( Version ):
- return [ "CEGUI.h"
+ ret= [ "CEGUI.h"
, "CEGUIXMLParser.h"
, "Ogre.h"
, "CEGUIXMLHandler.h"
@@ -8,8 +8,10 @@
, "CEGUIXMLSerializer.h"
, "OgreCEGUIRenderer.h"
,"OgreCEGUIResourceProvider.h"
- ]
+ ]
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
-
def huge_classes( Version ):
return []
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -274,7 +274,9 @@
, working_directory=environment.root_dir
, include_paths=environment.cegui.include_dirs
, define_symbols=defined_symbols
- , indexing_suite_version=2 )
+ , indexing_suite_version=2
+ , cflags=environment.ogre.cflags
+ )
filter_declarations (mb)
Modified: trunk/python-ogre/code_generators/cegui/python_CEGUI.h
===================================================================
--- trunk/python-ogre/code_generators/cegui/python_CEGUI.h 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/cegui/python_CEGUI.h 2009-01-27 13:40:49 UTC (rev 856)
@@ -3,7 +3,10 @@
#include <string>
#include <map>
#include <iostream>
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "CEGUI.h"
#include "CEGUIXMLParser.h" // needed for System
#include "CEGUIXMLHandler.h"
Modified: trunk/python-ogre/code_generators/ogre/custom_rvalue.cpp
===================================================================
--- trunk/python-ogre/code_generators/ogre/custom_rvalue.cpp 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/ogre/custom_rvalue.cpp 2009-01-27 13:40:49 UTC (rev 856)
@@ -1,3 +1,6 @@
+#if defined __APPLE_CC__
+ #include "Carbon/Carbon.h"
+#endif
#include "python_ogre_precompiled.h"
#include "boost/python/object.hpp" //len function
#include "boost/python/ssize_t.hpp" //ssize_t type definition
Modified: trunk/python-ogre/code_generators/ogre/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/customization_data.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/ogre/customization_data.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -1,14 +1,12 @@
-
+import os
def header_files( version ):
if not version.startswith("1.2"):
## 21Nov07; Change to precompiled header support
- return [ 'python_ogre_precompiled.h'
-# # ,'boost/python.hpp'
-# # ,'python_ogre_masterlist.h'
-# # ,'boost/python/ssize_t.hpp' ## needed for python2.4 as it doesn't define ssize_t
-
- ]
-
+ ret = [ 'python_ogre_precompiled.h'
+ ]
+ if os.sys.platform == 'darwin':
+ ret.insert(0,'Carbon/Carbon.h')
+ return ret
else: #1.2
return [ 'Ogre.h'
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -822,7 +822,7 @@
"""
## we could do more here if need be...
if sys.platform == 'darwin':
- pass
+ mb.global_ns.member_function('::Ogre::WindowEventUtilities::_CarbonWindowHandler').exclude()
elif sys.platform.startswith ('linux'):
pass
mb.global_ns.class_('vector<int, std::allocator<int> >').alias='VectorInt'
Modified: trunk/python-ogre/code_generators/ogre/python_ogre.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre.h 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/code_generators/ogre/python_ogre.h 2009-01-27 13:40:49 UTC (rev 856)
@@ -7,7 +7,10 @@
#include <vector>
#include <set>
#include <map>
-
+#if defined __APPLE_CC__
+ #include "strings.h"
+ #include "Carbon/Carbon.h"
+#endif
#include "python_ogre_masterlist.h"
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-26 12:03:56 UTC (rev 855)
+++ trunk/python-ogre/environment.py 2009-01-27 13:40:49 UTC (rev 856)
@@ -166,10 +166,10 @@
else:
sed_ = "sed --in-place "
-if isMac():
- Config.PATH_Boost = os.path.join(Config.LOCAL_INCLUDE, 'boost-1_34_1')
- Config.LIB_Boost = 'libboost_python-1_34_1'
- Config.RPATH=""
+#if isMac():
+# Config.PATH_Boost = os.path.join(Config.LOCAL_INCLUDE, 'boost-1_34_1')
+# Config.LIB_Boost = 'libboost_python-1_34_1'
+# Config.RPATH=""
## BIG assumption about where you want things put
if UseSystem:
@@ -454,6 +454,9 @@
if isLinux() or isMac():
buildCmds = [
[0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",'' ],
+ # note fix here as scons defaults to adding bundle to command line which stops us building dynamiclibs!!
+ [0, 'sed -i "" s/-bundle// applelink.py',
+ os.path.join (os.getcwd(), base, 'engine','SCons','Tool') ],
[0,"python setup.py install --prefix=%s" % PREFIX , os.path.join (os.getcwd(), base) ]
]
@@ -482,23 +485,19 @@
base = 'boost_1_37_0'
versionBase = '1_37' ## the version used on the library name
- if isLinux() or isMac():
+ if isLinux():
bjambase = 'boost-jam-3.1.17-1-linuxx86'
- if isMac():
- bjambuilddir = 'bin.macosxx86'
- bjambuildset = 'darwin'
+ if is64():
+ bjambuilddir = 'bin.linuxx86_64'
else:
- if is64():
- bjambuilddir = 'bin.linuxx86_64'
- else:
- bjambuilddir = ''
- bjambuildset = 'gcc'
+ bjambuilddir = ''
+ bjambuildset = 'gcc'
- if isLinux():
- source = [
- [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1-linuxx86.tgz', downloadPath],
- [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
- ]
+ source = [
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1-linuxx86.tgz', downloadPath],
+ [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
+ ]
+
buildCmds = [
## first handle bjam
[0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''],
@@ -516,7 +515,34 @@
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )],
]
+ if isMac():
+ bjambase = 'boost-jam-3.1.17-1-macosxx86'
+ bjambuilddir = 'bin.macosxx86'
+ bjambuildset = 'darwin'
+
+ source = [
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1-macosxx86.tgz', downloadPath],
+ [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
+ ]
+
+ buildCmds = [
+ ## first handle bjam
+ [0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''],
+ #[0,"./build.sh " + bjambuildset, os.path.join(os.getcwd(), bjambase )],
+ #[0,"mkdir -p %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase )],
+ [0,cp + " bjam %s/bin/" % PREFIX, os.path.join(os.getcwd(), bjambase )], ## may need to change on 64 bit systems
+ ## and now boost
+# [0, tar + ' zxf ' + os.path.join(downloadPath, base) + '.tar.gz', ''],
+ [0,'chmod -R +rw *', os.path.join(os.getcwd(), base ) ],
+# [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', '' ],
+ [0,"./configure --with-toolset=darwin --with-libraries=python,thread,date_time --prefix=%s --without-icu --with-bjam=../root/usr/bin/bjam" % PREFIX, os.path.join(os.getcwd(), base )],
+ [0,'make', os.path.join(os.getcwd(), base )],
+ [0,'make install', os.path.join(os.getcwd(), base )],
+ ]
+
if isWindows():
bjambase = 'boost-jam-3.1.17-1-ntx86'
source = [
@@ -544,7 +570,9 @@
gcc_version = re.search(r'([0-9]+?\.[0-9]+?\.[0-9]+?)', gccp.communicate()[0]).groups()[0].split('.')
# FIXME: Should this be the multithreaded version!?
lib = "boost_python-gcc%s%s-mt-%s" % (gcc_version[0], gcc_version[1], versionBase)
-
+ if isMac():
+ lib=Config.LIB_Boost
+
class boost_python_index:
""" only used for Linx
"""
@@ -667,8 +695,9 @@
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
[0, unzip + os.path.join(downloadPath,basedep)+".zip ",os.path.join(os.getcwd(), 'ogre') ],
[0, "mkdir ~/Library/Frameworks", ''], ## Note that this will fail if the directory exists !!!
- [0,cp + " -R "+os.path.join(os.getcwd(), 'ogre', '__MACOSX','Dependencies')+'/*.framework ' + Config.FRAMEWORK_DIR,''],
- #[0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()],
+ [0, 'mv OgreDependencies_OSX_Eihort_20080115/Dependencies .',os.path.join(os.getcwd(), 'ogre')],
+ #[0,cp + " -R "+os.path.join(os.getcwd(), 'ogre', '__MACOSX','Dependencies')+'/*.framework ',''],
+ [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.1.patch -p0 ", os.getcwd()],
[0, "mkdir Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
# need copies of these in an 'Ogre/..' directory due to includes in the OSX directory -- or get the framework right
[0, "cp OgreRoot.h Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
@@ -676,7 +705,7 @@
[0, "cp OgrePrerequisites.h Ogre",os.path.join(os.getcwd() ,'ogre','OgreMain', 'include') ],
[0, "xcodebuild -project ogre/Mac/Ogre/Ogre.xcodeproj -configuration Release", ''],
[0, "xcodebuild -project ogre/Mac/Samples/Samples.xcodeproj -configuration Release", ''],
- [0, "cp -R *.framework " + Config.FRAMEWORK_DIR, os.path.join(os.getcwd() ,'ogre',"Mac", "build", "Release") ]
+ [0, "cp -R *.framework ~/Library/Frameworks", os.path.join(os.getcwd() ,'ogre',"Mac", "build", "Release") ]
]
libs=[boost.lib]
@@ -700,7 +729,15 @@
cflags=''
parent = "ogre/io"
if isMac():
- source=[]
+ base = "ois"
+ source=[
+# [wget, "http://downloads.sourceforge.net/wgois/ois_1.2.0.tar.gz", downloadPath]
+ [cvs, "-z3 -d:pserver:ano...@wg...:/cvsroot/wgois co -D 01Jan2009 -P ois", os.getcwd()]
+ ]
+ buildCmds = [
+ [0, "xcodebuild -project ois/Mac/XCode-2.2/OIS.xcodeproj -configuration Release", ''],
+ [0,'cp -R ois/Mac/XCode-2.2/build/Release/OIS.Framework ~/Library/Frameworks ', '']
+ ]
if isLinux():
base = "ois"
source=[
@@ -761,7 +798,7 @@
CheckIncludes=['boost/python.hpp', 'OIS.h']
#externalFiles = ['OIS.dll']
if os.sys.platform == 'darwin':
- LINKFLAGS = '-framework Python -framework Carbon'
+ LINKFLAGS = '-framework OIS '
# else:
# LINKFLAGS = "-l%s" % boost_python_index.lib
@@ -823,10 +860,10 @@
[0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
#[0, "cp SConscript OgreNewt_Main", baseDir],
#[0, "rm SConscript", baseDir],
- [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
+ [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
[0, 'cp SConscript OgreNewt_Main', baseDir],
[0, "scons prefix=%s boost=%s/include/boost-1_37 build" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore)
- [0, "scons prefix=%s boost=%s/include/boost-1_37 install" % (PREFIX, PREFIX), baseDir],
+ [0, "scons prefix=%s boost=%s/include/boost-1_37 install" % (PREFIX, PREFIX), baseDir],
]
if isWindows():
buildCmds = [
@@ -868,7 +905,7 @@
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
# libs.append ( boost_python_index.lib )
- if isLinux():
+ if isLinux() or isMac():
if _STABLE:
base = "CEGUI-0.5.0"
source=[
@@ -1605,9 +1642,9 @@
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
- ]
- if isWindows():
+ , Config.PATH_INCLUDE_Ogre_Dependencies
+ ]
+ if isWindows():
include_dirs.append(os.path.join(Config.PATH_Bullet, 'Extras','GIMPACT','include'))
lib_dirs = [ boost.PATH_LIB
Added: trunk/python-ogre/patch/ogre_1.6.1_mac.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.6.1_mac.patch (rev 0)
+++ trunk/python-ogre/patch/ogre_1.6.1_mac.patch 2009-01-27 13:40:49 UTC (rev 856)
@@ -0,0 +1,627 @@
+--- /Users/andy/development/ogre/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm 2008-06-12 22:10:57.000000000 +0800
++++ ./src/OSX/OgreOSXCocoaWindow.mm 2009-01-10 10:02:43.000000000 +0800
+@@ -1,27 +1,27 @@
+ /*
+------------------------------------------------------------------------------
+-This source file is part of OGRE
+- (Object-oriented Graphics Rendering Engine)
+-For the latest info, see http://www.ogre3d.org/
+-
+-Copyright (c) 2000-2005 The OGRE Team
+-Also see acknowledgements in Readme.html
+-
+-This program is free software; you can redistribute it and/or modify it under
+-the terms of the GNU Lesser General Public License as published by the Free Software
+-Foundation; either version 2 of the License, or (at your option) any later
+-version.
+-
+-This program is distributed in the hope that it will be useful, but WITHOUT
+-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+-
+-You should have received a copy of the GNU Lesser General Public License along with
+-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+-http://www.gnu.org/copyleft/lesser.txt.
+------------------------------------------------------------------------------
+-*/
++ -----------------------------------------------------------------------------
++ This source file is part of OGRE
++ (Object-oriented Graphics Rendering Engine)
++ For the latest info, see http://www.ogre3d.org/
++
++ Copyright (c) 2000-2005 The OGRE Team
++ Also see acknowledgements in Readme.html
++
++ This program is free software; you can redistribute it and/or modify it under
++ the terms of the GNU Lesser General Public License as published by the Free Software
++ Foundation; either version 2 of the License, or (at your option) any later
++ version.
++
++ This program is distributed in the hope that it will be useful, but WITHOUT
++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public License along with
++ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
++ Place - Suite 330, Boston, MA 02111-1307, USA, or go to
++ http://www.gnu.org/copyleft/lesser.txt.
++ -----------------------------------------------------------------------------
++ */
+
+ #include "OgreOSXCocoaWindow.h"
+ #include "OgreRoot.h"
+@@ -39,16 +39,19 @@
+ #define GL_EXT_texture_env_combine 1
+ #include <OpenGL/glext.h>
+ #include <OpenGL/glu.h>
++#import <OpenGL/CGLMacro.h>
+
+ namespace Ogre {
+-
++
+ OSXCocoaWindow::OSXCocoaWindow()
+ {
+ mActive = false;
+ mContext = 0;
+ mWindow = 0;
++ mIsExternalGLControl = false;
++ mIsExternalGLContext = false;
+ }
+-
++
+ OSXCocoaWindow::~OSXCocoaWindow()
+ {
+ [glContext clearDrawable];
+@@ -58,32 +61,32 @@
+ }
+
+ void OSXCocoaWindow::create(const String& name, unsigned int width, unsigned int height,
+- bool fullScreen, const NameValuePairList *miscParams)
++ bool fullScreen, const NameValuePairList *miscParams)
+ {
+ NSAutoreleasePool *arp = [[NSAutoreleasePool alloc] init];
+ NSApplicationLoad();
+ //OgreWindowDelegate *delegate = [[OgreWindowDelegate alloc] initWithGLOSXCocoaWindow:this];
+ //[window setDelegate:delegate];
+ /*
+-***Key: "title" Description: The title of the window that will appear in the title bar Values: string Default: RenderTarget name
+-
+-Key: "colourDepth" Description: Colour depth of the resulting rendering window; only applies if fullScreen is set. Values: 16 or 32 Default: desktop depth Notes: [W32 specific]
+-
+-***Key: "left" Description: screen x coordinate from left Values: positive integers Default: 'center window on screen' Notes: Ignored in case of full screen
+-
+-***Key: "top" Description: screen y coordinate from top Values: positive integers Default: 'center window on screen' Notes: Ignored in case of full screen
+-
+-***Key: "depthBuffer" [DX9 specific] Description: Use depth buffer Values: false or true Default: true
+-
+-***Key: "externalWindowHandle" [API specific] Description: External window handle, for embedding the OGRE context Values: positive integer for W32 (HWND handle) poslong:posint:poslong (display*:screen:windowHandle) or poslong:posint:poslong:poslong (display*:screen:windowHandle:XVisualInfo*) for GLX Default: 0 (None)
+-
+-***Key: "FSAA" Description: Full screen antialiasing factor Values: 0,2,4,6,... Default: 0
+-
+-Key: "displayFrequency" Description: Display frequency rate, for fullscreen mode Values: 60...? Default: Desktop vsync rate
+-
+-Key: "vsync" Description: Synchronize buffer swaps to vsync Values: true, false Default: 0
+-*/
+-
++ ***Key: "title" Description: The title of the window that will appear in the title bar Values: string Default: RenderTarget name
++
++ Key: "colourDepth" Description: Colour depth of the resulting rendering window; only applies if fullScreen is set. Values: 16 or 32 Default: desktop depth Notes: [W32 specific]
++
++ ***Key: "left" Description: screen x coordinate from left Values: positive integers Default: 'center window on screen' Notes: Ignored in case of full screen
++
++ ***Key: "top" Description: screen y coordinate from top Values: positive integers Default: 'center window on screen' Notes: Ignored in case of full screen
++
++ ***Key: "depthBuffer" [DX9 specific] Description: Use depth buffer Values: false or true Default: true
++
++ ***Key: "externalWindowHandle" [API specific] Description: External window handle, for embedding the OGRE context Values: positive integer for W32 (HWND handle) poslong:posint:poslong (display*:screen:windowHandle) or poslong:posint:poslong:poslong (display*:screen:windowHandle:XVisualInfo*) for GLX Default: 0 (None)
++
++ ***Key: "FSAA" Description: Full screen antialiasing factor Values: 0,2,4,6,... Default: 0
++
++ Key: "displayFrequency" Description: Display frequency rate, for fullscreen mode Values: 60...? Default: Desktop vsync rate
++
++ Key: "vsync" Description: Synchronize buffer swaps to vsync Values: true, false Default: 0
++ */
++
+ BOOL hasDepthBuffer = YES;
+ int fsaa_samples = 0;
+ NSString *windowTitle = [NSString stringWithCString:name.c_str()];
+@@ -97,20 +100,20 @@
+ opt = miscParams->find("title");
+ if(opt != miscParams->end())
+ windowTitle = [NSString stringWithCString:opt->second.c_str()];
+-
++
+ opt = miscParams->find("left");
+ if(opt != miscParams->end())
+ winx = StringConverter::parseUnsignedInt(opt->second);
+-
++
+ opt = miscParams->find("top");
+ if(opt != miscParams->end())
+ winy = NSHeight([[NSScreen mainScreen] frame]) - StringConverter::parseUnsignedInt(opt->second) - height;
+-
+-
++
++
+ opt = miscParams->find("depthBuffer");
+ if(opt != miscParams->end())
+ hasDepthBuffer = StringConverter::parseBool(opt->second);
+-
++
+ opt = miscParams->find("FSAA");
+ if(opt != miscParams->end())
+ fsaa_samples = StringConverter::parseUnsignedInt(opt->second);
+@@ -118,228 +121,284 @@
+ opt = miscParams->find( "colourDepth" );
+ if( opt != miscParams->end() )
+ depth = StringConverter::parseUnsignedInt( opt->second );
+- }
+-
+-
+- NSOpenGLPixelFormat* openglFormat;
+- {
+- NSOpenGLPixelFormatAttribute attribs[30];
+- int i=0;
+-
+- if(fullScreen)
++
++ /*if ((opt = miscParams->find("externalGLContext")) != end)
++ {
++ mContext = new OSXCocoaContext(glContext);
++ mGlrc = (HGLRC)StringConverter::parseUnsignedLong(opt->second);
++ if( mGlrc )
++ mIsExternalGLContext = true;
++ }*/
++
++ opt = miscParams->find("currentGLContext");
++ if (opt != miscParams->end() && StringConverter::parseBool(opt->second))
+ {
+- GLRenderSystem *rs = static_cast<GLRenderSystem*>(Root::getSingleton().getRenderSystem());
+- OSXContext *mainContext = (OSXContext*)rs->_getMainContext();
+-
+- CGLContextObj share = NULL;
+- if(mainContext == 0)
++ LogManager::getSingleton().logMessage(String("OSX: Using CurrentGL Context"));
++ if (! CGLGetCurrentContext())
+ {
+- share = NULL;
++ LogManager::getSingleton().logMessage(String("OSX: CurrentGL Context does not exist"));
++ OGRE_EXCEPT(Exception::ERR_RENDERINGAPI_ERROR, "currentGLContext was specified with no current GL context", "GLXWindow::create");
+ }
+- else if(mainContext->getContextType() == "NSOpenGL")
+- {
+- OSXCocoaContext* cocoaContext = static_cast<OSXCocoaContext*>(mainContext);
+- NSOpenGLContext* nsShare = cocoaContext->getContext();
+- share = (CGLContextObj)[nsShare CGLContextObj];
+- }
+- else if(mainContext->getContextType() == "CGL")
+- {
+- OSXCGLContext* cglShare = static_cast<OSXCGLContext*>(mainContext);
+- share = cglShare->getContext();
+- }
+-
+- // create the context
+- createCGLFullscreen(width, height, depth, fsaa_samples, share);
+- }
+- else
+- {
+- // Specifying "NoRecovery" gives us a context that cannot fall back to the software renderer. This makes the View-based context a compatible with the fullscreen context, enabling us to use the "shareContext" feature to share textures, display lists, and other OpenGL objects between the two.
+- attribs[i++] = NSOpenGLPFANoRecovery;
+-
+- attribs[i++] = NSOpenGLPFAAccelerated;
+- attribs[i++] = NSOpenGLPFADoubleBuffer;
+-
+- attribs[i++] = NSOpenGLPFAAlphaSize;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
+-
+- attribs[i++] = NSOpenGLPFAStencilSize;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 1;
+-
+- attribs[i++] = NSOpenGLPFAAccumSize;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
+-
+- attribs[i++] = NSOpenGLPFADepthSize;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) (hasDepthBuffer? 16 : 0);
+-
+- if(fsaa_samples > 0)
+- {
+- attribs[i++] = NSOpenGLPFASampleBuffers;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 1;
+-
+- attribs[i++] = NSOpenGLPFASamples;
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) fsaa_samples;
+- }
+-
+- attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
+-
+- openglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes: attribs] autorelease];
+- }
+-
+- NameValuePairList::const_iterator opt2 = 0;
+- if(miscParams)
+- {
+- opt2 = miscParams->find("pixelFormat");
+- if(opt2 != miscParams->end())
+- openglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes: (NSOpenGLPixelFormatAttribute*)StringConverter::parseUnsignedLong(opt2->second)] autorelease];
+- }
+- GLRenderSystem *rs = static_cast<GLRenderSystem*>(Root::getSingleton().getRenderSystem());
+- OSXCocoaContext *mainContext = (OSXCocoaContext*)rs->_getMainContext();
+- NSOpenGLContext *shareContext = mainContext == 0? nil : mainContext->getContext();
+-
+- glContext = [[NSOpenGLContext alloc] initWithFormat: openglFormat shareContext:shareContext];
+-
+- NameValuePairList::const_iterator opt = 0;
+- if(miscParams)
+- opt = miscParams->find("externalWindowHandle");
+- if(!miscParams || opt == miscParams->end())
+- {
+- //Not sure why this should be but it is required for the window to work at fullscreen.
+- int styleMask = fullScreen? NSBorderlessWindowMask : NSResizableWindowMask;
+-
+- mWindow = [[OgreWindow alloc] initWithContentRect:NSMakeRect(winx, winy, width, height) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
+- [mWindow setTitle:windowTitle];
+-
+- if(winx == 0 && winy == 0) [mWindow center];
+-
+- mView = [[OgreView alloc] initWithGLOSXWindow:this];
+- [mWindow setContentView:mView];
+- }
+- else
+- {
+- mView = (OgreView*)StringConverter::parseUnsignedLong(opt->second);
+- [mView setOgreWindow:this];
+-
+- NSRect b = [mView bounds];
+- width = b.size.width;
+- height = b.size.height;
+- }
+-
+- [glContext setView:mView];
+-
+- mName = name;
+- mWidth = width;
+- mHeight = height;
+-
+- // Create register the context with the rendersystem and associate it with this window
+- mContext = new OSXCocoaContext(glContext);
+- /*rs->_registerContext(this, newContext);
+-
+- if (rs->_getMainContext() == 0)
+- [glContext makeCurrentContext];
+- */
+- //show window
+- if(mWindow)
+- [mWindow performSelectorOnMainThread:@selector(makeKeyAndOrderFront:) withObject:NULL waitUntilDone:NO];
++ mIsExternalGLContext = 1;
+
+- [arp release];
+- }
+-
+- // make active
+- mActive = true;
++ }
++
++
++ }
++
++
++ if ( !mIsExternalGLContext )
++ {
++ NSOpenGLPixelFormat* openglFormat;
++ NSOpenGLPixelFormatAttribute attribs[30];
++ int i=0;
++
++ if(fullScreen)
++ {
++ GLRenderSystem *rs = static_cast<GLRenderSystem*>(Root::getSingleton().getRenderSystem());
++ OSXContext *mainContext = (OSXContext*)rs->_getMainContext();
++
++ CGLContextObj share = NULL;
++ if(mainContext == 0)
++ {
++ share = NULL;
++ }
++ else if(mainContext->getContextType() == "NSOpenGL")
++ {
++ OSXCocoaContext* cocoaContext = static_cast<OSXCocoaContext*>(mainContext);
++ NSOpenGLContext* nsShare = cocoaContext->getContext();
++ share = (CGLContextObj)[nsShare CGLContextObj];
++ }
++ else if(mainContext->getContextType() == "CGL")
++ {
++ OSXCGLContext* cglShare = static_cast<OSXCGLContext*>(mainContext);
++ share = cglShare->getContext();
++ }
++
++ // create the context
++ createCGLFullscreen(width, height, depth, fsaa_samples, share);
++ }
++ else
++ {
++ // Specifying "NoRecovery" gives us a context that cannot fall back to the software renderer. This makes the View-based context a compatible with the fullscreen context, enabling us to use the "shareContext" feature to share textures, display lists, and other OpenGL objects between the two.
++ attribs[i++] = NSOpenGLPFANoRecovery;
++
++ attribs[i++] = NSOpenGLPFAAccelerated;
++ attribs[i++] = NSOpenGLPFADoubleBuffer;
++
++ attribs[i++] = NSOpenGLPFAAlphaSize;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
++
++ attribs[i++] = NSOpenGLPFAStencilSize;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 1;
++
++ attribs[i++] = NSOpenGLPFAAccumSize;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
++
++ attribs[i++] = NSOpenGLPFADepthSize;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) (hasDepthBuffer? 16 : 0);
++
++ if(fsaa_samples > 0)
++ {
++ attribs[i++] = NSOpenGLPFASampleBuffers;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 1;
++
++ attribs[i++] = NSOpenGLPFASamples;
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) fsaa_samples;
++ }
++
++ attribs[i++] = (NSOpenGLPixelFormatAttribute) 0;
++
++ openglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes: attribs] autorelease];
++ }
++
++ // Either full screen has been setup or we're setup the attributes for a window
++
++ NameValuePairList::const_iterator opt2 = 0;
++ if(miscParams)
++ {
++ opt2 = miscParams->find("pixelFormat");
++ if(opt2 != miscParams->end())
++ openglFormat = [[[NSOpenGLPixelFormat alloc] initWithAttributes: (NSOpenGLPixelFormatAttribute*)StringConverter::parseUnsignedLong(opt2->second)] autorelease];
++ }
++ LogManager::getSingleton().logMessage(String("OSX: Checking for Shared Context"));
++
++ // check if there is an existing context and use it as a shared context
++ GLRenderSystem *rs = static_cast<GLRenderSystem*>(Root::getSingleton().getRenderSystem());
++ OSXCocoaContext *mainContext = (OSXCocoaContext*)rs->_getMainContext();
++
++ NSOpenGLContext *shareContext = mainContext == 0? nil : mainContext->getContext();
++ glContext = [[NSOpenGLContext alloc] initWithFormat: openglFormat shareContext:shareContext];
++ LogManager::getSingleton().logMessage(String("OSX: Created base Context"));
++
++ NameValuePairList::const_iterator opt = 0;
++ if(miscParams)
++ opt = miscParams->find("externalWindowHandle");
++ if(!miscParams || opt == miscParams->end())
++ {
++ //Not sure why this should be but it is required for the window to work at fullscreen.
++ int styleMask = fullScreen? NSBorderlessWindowMask : NSResizableWindowMask;
++
++ mWindow = [[OgreWindow alloc] initWithContentRect:NSMakeRect(winx, winy, width, height) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
++ //[mWindow setTitle:windowTitle];
++
++ //if(winx == 0 && winy == 0) [mWindow center];
++
++ mView = [[OgreView alloc] initWithGLOSXWindow:this];
++ [mWindow setContentView:mView];
++ }
++ else
++ {
++ mView = (OgreView*)StringConverter::parseUnsignedLong(opt->second);
++ [mView setOgreWindow:this];
++
++ NSRect b = [mView bounds];
++ width = b.size.width;
++ height = b.size.height;
++ }
++
++ [glContext setView:mView];
++ mName = name;
++ mWidth = width;
++ mHeight = height;
++ }
++ else { // it's an external context
++ // we've let everything setup normally to this point -- now change context to the current one if needed
++ glContext = [NSOpenGLContext currentContext]; //[glContext currentContext];
++ LogManager::getSingleton().logMessage(String("OSX: Set to current Context"));
++ //[glContext setView:mView];
++ NSRect f = NSMakeRect(0,0,width,height );
++ mView = [[OgreView alloc] initWithFrame:f];
++ // could do everything from the context view
++ // mView = [glContext view];
++ //[mWindow setContentView:mView];
++ //[mView setOgreWindow:this];
++ mWindow=0;
++ //mWindow = [glContext view:window];
++ }
++
++ // Create register the context with the rendersystem and associate it with this window
++ LogManager::getSingleton().logMessage(String("OSX: Creating OSXCocoaContext"));
++
++ mContext = new OSXCocoaContext(glContext);
++ /*rs->_registerContext(this, newContext);
++
++ if (rs->_getMainContext() == 0)
++ [glContext makeCurrentContext];
++ */
++ //show window
++ if(mWindow)
++ [mWindow performSelectorOnMainThread:@selector(makeKeyAndOrderFront:) withObject:NULL waitUntilDone:NO];
++ LogManager::getSingleton().logMessage(String("OSX: Done creating !"));
++
++ [arp release];
++
++ // make active
++ mActive = true;
+ }
+-
++
+ void OSXCocoaWindow::destroy(void)
+ {
+- if(mIsFullScreen)
+- destroyCGLFullscreen();
+-
+- // Unregister and destroy OGRE GLContext
+- delete mContext;
+-
+- if(mWindow) [mWindow close];
+-
++ if(mIsFullScreen)
++ destroyCGLFullscreen();
++
++ // Unregister and destroy OGRE GLContext
++ delete mContext;
++
++ if(mWindow) [mWindow close];
++
+ mActive = false;
+-
++
+ Root::getSingleton().getRenderSystem()->detachRenderTarget( this->getName() );
+ }
+-
+- /*OgreView* OSXCocoaWindow::ogreView() const
+- {
+- return [window contentView];
+- }*/
+-
++
++ /*OgreView* OSXCocoaWindow::ogreView() const
++ {
++ return [window contentView];
++ }*/
++
+ bool OSXCocoaWindow::isActive() const
+ {
+ return mActive;
+ }
+-
++
+ bool OSXCocoaWindow::isClosed() const
+ {
+ return false;
+ }
+-
++
+ void OSXCocoaWindow::reposition(int left, int top)
+ {
+- if(!mWindow) return;
+-
+- NSRect frame = [mWindow frame];
+- frame.origin.x = left;
+- frame.origin.y = top-frame.size.height;
+- [mWindow setFrame:frame display:YES];
+- }
++ LogManager::getSingleton().logMessage(String("OSX::: Reposition !"));
+
++ if(!mWindow) return;
++
++ NSRect frame = [mWindow frame];
++ frame.origin.x = left;
++ frame.origin.y = top-frame.size.height;
++ [mWindow setFrame:frame display:YES];
++ }
++
+ void OSXCocoaWindow::resize(unsigned int width, unsigned int height)
+ {
+- if(!mWindow) return;
+-
+- NSRect frame = [mWindow frame];
+- frame.size.width = width;
+- frame.size.height = height;
+- [mWindow setFrame:frame display:YES];
+- /*SHOULD be called from delegate
+- for (ViewportList::iterator it = mViewportList.begin(); it != mViewportList.end(); ++it)
+- {
+- (*it).second->_updateDimensions();
+- }*/
++ LogManager::getSingleton().logMessage(String("OSX::: Resize !"));
++ if(!mWindow) return;
++
++ NSRect frame = [mWindow frame];
++ frame.size.width = width;
++ frame.size.height = height;
++ [mWindow setFrame:frame display:YES];
++ /*SHOULD be called from delegate
++ for (ViewportList::iterator it = mViewportList.begin(); it != mViewportList.end(); ++it)
++ {
++ (*it).second->_updateDimensions();
++ }*/
+ }
+-
++
+ void OSXCocoaWindow::windowMovedOrResized()
+ {
+- [glContext update];
+- NSRect frame = [mView frame];
+- mWidth = (unsigned int)frame.size.width;
+- mHeight = (unsigned int)frame.size.height;
++ LogManager::getSingleton().logMessage(String("OSX::: windowMovedOrResized !"));
++ [glContext update];
++ NSRect frame = [mView frame];
++ mWidth = (unsigned int)frame.size.width;
++ mHeight = (unsigned int)frame.size.height;
+ mLeft = (int)frame.origin.x;
+ mTop = (int)frame.origin.y+(unsigned int)frame.size.height;
+-
++
+ for (ViewportList::iterator it = mViewportList.begin(); it != mViewportList.end(); ++it)
+ {
+ (*it).second->_updateDimensions();
+ }
+ }
+-
++
+ void OSXCocoaWindow::swapBuffers(bool waitForVSync)
+ {
+- if(!mIsFullScreen)
+- [glContext flushBuffer];
+- else
+- swapCGLBuffers();
+-
+- /*if(![[[NSRunLoop currentRunLoop] currentMode] isEqualTo:NSEventTrackingRunLoopMode])
+- {
+- NSEvent *e = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
+- if(e)
+- [NSApp sendEvent:e];
+- }*/
++ LogManager::getSingleton().logMessage(String("OSX: swapBuffers 1"));
++ // return;
++ if ( mIsExternalGLContext ) {
++ //glFlush();
++ return;
++ }
++ if(!mIsFullScreen)
++ [glContext flushBuffer];
++ else
++ swapCGLBuffers();
++
++ /*if(![[[NSRunLoop currentRunLoop] currentMode] isEqualTo:NSEventTrackingRunLoopMode])
++ {
++ NSEvent *e = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
++ if(e)
++ [NSApp sendEvent:e];
++ }*/
++ }
++
++ //-------------------------------------------------------------------------------------------------//
++ void OSXCocoaWindow::getCustomAttribute( const String& name, void* pData )
++ {
++ if( name == "GLCONTEXT" )
++ {
++ *static_cast<OSXContext**>(pData) = mContext;
++ return;
++ }
+ }
+-
+- //-------------------------------------------------------------------------------------------------//
+- void OSXCocoaWindow::getCustomAttribute( const String& name, void* pData )
+- {
+- if( name == "GLCONTEXT" )
+- {
+- *static_cast<OSXContext**>(pData) = mContext;
+- return;
+- }
+- }
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-26 13:15:09
|
Revision: 855
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=855&view=rev
Author: andy_miller
Date: 2009-01-26 12:03:56 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
Final set of Linux updates before moving to branch (1.6.1)
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogrenewt/generate_code.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/ReportVersion.out.linux
trunk/python-ogre/demos/plugins.cfg.posix
Removed Paths:
-------------
trunk/python-ogre/demos/plugins.cfg.linux
Added: trunk/python-ogre/ReportVersion.out.linux
===================================================================
--- trunk/python-ogre/ReportVersion.out.linux (rev 0)
+++ trunk/python-ogre/ReportVersion.out.linux 2009-01-26 12:03:56 UTC (rev 855)
@@ -0,0 +1,94 @@
+Module OGRE ( ogre.renderer.OGRE )
+ PythonOgre Ver: 1.6.1
+ Module Version: 1.6.1
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 16:48:28 Jan 26 2009
+ Raw Detail : 1.6.1_853M_ogre_1.6.1_1
+Module OIS ( ogre.io.OIS )
+ PythonOgre Ver: 1.6.1
+ Module Version: 1.0
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:50:58 Jan 26 2009
+ Raw Detail : 1.6.1_853:854_ois_1.0_1
+Import failed: betagui
+Module OgreAL ( ogre.sound.OgreAL )
+ PythonOgre Ver: 1.6.1
+ Module Version: r115
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 17:48:43 Jan 26 2009
+ Raw Detail : 1.6.1_853_ogreal_r115_1
+Import failed: ODE
+Import failed: OgreRefApp
+Module OgreOde ( ogre.physics.OgreOde )
+ PythonOgre Ver: 1.6.1
+ Module Version: r2497
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:37:20 Jan 26 2009
+ Raw Detail : 1.6.1_853_ogreode_r2497_1
+Import failed: OgreNewt
+Import failed: Opcode
+Import failed: bullet
+Import failed: PhysX
+Import failed: NxOgre
+Import failed: OgreBulletC
+Import failed: OgreBulletD
+Import failed: theora
+Module plib ( ogre.addons.plib )
+ PythonOgre Ver: 1.6.1
+ Module Version: 1.6.1
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 18:53:22 Jan 26 2009
+ Raw Detail : 1.6.1_853_ogre_1.6.1_1
+Module ogreforests ( ogre.addons.ogreforests )
+ PythonOgre Ver: 1.6.1
+ Module Version: r2615
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 18:39:01 Jan 26 2009
+ Raw Detail : 1.6.1_853_ogreforests_r2615_1
+Module et ( ogre.addons.et )
+ PythonOgre Ver: 1.6.1
+ Module Version: 2.3.1
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 18:28:25 Jan 26 2009
+ Raw Detail : 1.6.1_853_et_2.3.1_1
+Module caelum ( ogre.addons.caelum )
+ PythonOgre Ver: 1.6.1
+ Module Version: 0.4
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 17:44:38 Jan 26 2009
+ Raw Detail : 1.6.1_853_caelum_0.4_1
+Module noise ( ogre.addons.noise )
+ PythonOgre Ver: 1.6.1
+ Module Version: r2486
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:41:07 Jan 26 2009
+ Raw Detail : 1.6.1_853_noise_r2486_1
+Import failed: watermesh
+Import failed: particleuniverse
+Module cadunetree ( ogre.addons.cadunetree )
+ PythonOgre Ver: 1.6.1
+ Module Version: 0.6
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:48:28 Jan 26 2009
+ Raw Detail : 1.6.1_853_cadunetree_0.6_1
+Import failed: ogrepcz
+Module hydrax ( ogre.addons.hydrax )
+ PythonOgre Ver: 1.6.1
+ Module Version: 0.4
+ Python Version: 2.5.2 (r252:60911, Oct 5 2008, 19:24:49) [GCC 4.3.2]
+ Code Generated: 1
+ Compiled : 19:57:00 Jan 26 2009
+ Raw Detail : 1.6.1_853_hydrax_0.4_1
+Import failed: hikari
+Import failed: canvas
+Import failed: mygui
Modified: trunk/python-ogre/code_generators/ogrenewt/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2009-01-26 09:34:29 UTC (rev 854)
+++ trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2009-01-26 12:03:56 UTC (rev 855)
@@ -220,7 +220,9 @@
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
defined_symbols.append('BOOST_HAS_WINTHREADS')
-
+ if environment.isLinux():
+ defined_symbols.append('BOOST_IS_ENUM')
+
mb = module_builder.module_builder_t( [ xml_cached_fc ]
, gccxml_path=environment.gccxml_bin
, working_directory=environment.root_dir
Deleted: trunk/python-ogre/demos/plugins.cfg.linux
===================================================================
--- trunk/python-ogre/demos/plugins.cfg.linux 2009-01-26 09:34:29 UTC (rev 854)
+++ trunk/python-ogre/demos/plugins.cfg.linux 2009-01-26 12:03:56 UTC (rev 855)
@@ -1,13 +0,0 @@
-# Defines plugins to load
-
-## Use this for Windows
-
-
-##
-## NOTE use this for MacOS or Linux
-PluginFolder=/home/andy/development/root/usr/lib/OGRE
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-Plugin=Plugin_CgProgramManager
Copied: trunk/python-ogre/demos/plugins.cfg.posix (from rev 853, trunk/python-ogre/demos/plugins.cfg.linux)
===================================================================
--- trunk/python-ogre/demos/plugins.cfg.posix (rev 0)
+++ trunk/python-ogre/demos/plugins.cfg.posix 2009-01-26 12:03:56 UTC (rev 855)
@@ -0,0 +1,13 @@
+# Defines plugins to load
+
+## Use this for Windows
+
+
+##
+## NOTE use this for MacOS or Linux
+PluginFolder=/home/andy/development/root/usr/lib/OGRE
+Plugin=RenderSystem_GL
+Plugin=Plugin_ParticleFX
+Plugin=Plugin_BSPSceneManager
+Plugin=Plugin_OctreeSceneManager
+Plugin=Plugin_CgProgramManager
Property changes on: trunk/python-ogre/demos/plugins.cfg.posix
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-26 09:34:29 UTC (rev 854)
+++ trunk/python-ogre/environment.py 2009-01-26 12:03:56 UTC (rev 855)
@@ -747,7 +747,7 @@
libs=['OIS_static',boost.lib]
else:
- libs=['OIS_static',boost.lib]
+ libs=['OIS',boost.lib]
#libs.append ( boost_python_index.lib )
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
@@ -823,8 +823,10 @@
[0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
#[0, "cp SConscript OgreNewt_Main", baseDir],
#[0, "rm SConscript", baseDir],
- [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
- [0, "scons prefix=%s boost=%s/include/boost-1_34_1 install" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore)
+ [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
+ [0, 'cp SConscript OgreNewt_Main', baseDir],
+ [0, "scons prefix=%s boost=%s/include/boost-1_37 build" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore)
+ [0, "scons prefix=%s boost=%s/include/boost-1_37 install" % (PREFIX, PREFIX), baseDir],
]
if isWindows():
buildCmds = [
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-26 09:34:38
|
Revision: 854
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=854&view=rev
Author: andy_miller
Date: 2009-01-26 09:34:29 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
Linux updates for the 1.6.1 build
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ois/generate_code.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-26 03:21:28 UTC (rev 853)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-26 09:34:29 UTC (rev 854)
@@ -76,7 +76,7 @@
PATH_NxOgre= os.path.join(PATH_THIRDPARTY, 'nxogre')
PATH_NxOgre_09= os.path.join(PATH_THIRDPARTY, 'nxogre_0.9')
# PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
-PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.72')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.73')
###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')
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 03:21:28 UTC (rev 853)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 09:34:29 UTC (rev 854)
@@ -849,9 +849,8 @@
for f in mb.member_functions():
if f.name == 'getChildIterator':
print "LINUX SPECIAL:", f
- ###f.exclude()
- #mb.member_function('::Ogre::Node::getChildIterator').exclude()
- # mb.member_functions('::Ogre::Bone::getChildIterator').exclude()
+ #f.exclude()
+ #mb.member_functions('::Ogre::Node::getChildIterator').exclude()
def Fix_NT ( mb ):
Modified: trunk/python-ogre/code_generators/ois/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-26 03:21:28 UTC (rev 853)
+++ trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-26 09:34:29 UTC (rev 854)
@@ -40,8 +40,8 @@
from pyplusplus.creators_factory import sort_algorithms
from pyplusplus.code_creators import include
-# import common_utils.extract_documentation as exdoc
-import testExtract as exdoc
+import common_utils.extract_documentation as exdoc
+#import testExtract as exdoc
import common_utils.var_checker as varchecker
import common_utils.ogre_properties as ogre_properties
from common_utils import docit
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-26 03:21:28 UTC (rev 853)
+++ trunk/python-ogre/environment.py 2009-01-26 09:34:29 UTC (rev 854)
@@ -645,7 +645,7 @@
[0, "make install", os.path.join(os.getcwd(), 'ogre')],
]
libs=[boost.lib, 'OgreMain']
- libs.append ( boost_python_index.lib )
+ #libs.append ( boost_python_index.lib )
lib_dirs=[Config.LOCAL_LIB]
include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre]
CCFLAGS = ' -D__PYTHONOGRE_BUILD_CODE '
@@ -748,7 +748,7 @@
else:
libs=['OIS_static',boost.lib]
- libs.append ( boost_python_index.lib )
+ #libs.append ( boost_python_index.lib )
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
include_dirs = [ Config.PATH_Boost
@@ -762,8 +762,8 @@
#externalFiles = ['OIS.dll']
if os.sys.platform == 'darwin':
LINKFLAGS = '-framework Python -framework Carbon'
- else:
- LINKFLAGS = "-l%s" % boost_python_index.lib
+# else:
+# LINKFLAGS = "-l%s" % boost_python_index.lib
class ogrerefapp:
active = False ## making this false as replaced by OgreODE etc..
@@ -784,7 +784,7 @@
libs=[boost.lib, 'OgreMain', 'ode_single', 'ReferenceAppLayer']
else:
libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_ODE
@@ -809,7 +809,7 @@
libs = ['Newton', boost.lib, 'OgreNewt_Main', 'OgreMain']
else:
libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
if _STABLE:
source = [
[cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
@@ -864,7 +864,7 @@
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ]
else:
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
if isLinux():
if _STABLE:
@@ -922,8 +922,8 @@
]
ModuleName = 'CEGUI'
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'CEGUI.h', 'OgreCEGUIRenderer.h']
- if isLinux():
- LINKFLAGS = "-l%s" % boost_python_index.lib
+# if isLinux():
+# LINKFLAGS = "-l%s" % boost_python_index.lib
class ode:
@@ -938,8 +938,8 @@
if isWindows():
odeLibraryName = 'ode_single'
libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function
- else:
- libs.append ( boost_python_index.lib )
+# else:
+# libs.append ( boost_python_index.lib )
lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_ODE
]
@@ -981,8 +981,8 @@
name = 'opcode'
parent = "ogre/physics"
libs=[boost.lib]
- if isLinux():
- libs.append ( boost_python_index.lib )
+ # if isLinux():
+ # libs.append ( boost_python_index.lib )
lib_dirs = [ boost.PATH_LIB
]
include_dirs = [ Config.PATH_Boost
@@ -1010,7 +1010,7 @@
]
CheckIncludes=[]
if isLinux():
- libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
else:
libs=[ boost.lib, 'OgreMain' ]
@@ -1060,7 +1060,7 @@
libs=[boost.lib, 'OgreMain', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
if isLinux():
libs.append('ode')
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
else:
libs.append('ode_single')
CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h',
@@ -1096,8 +1096,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="QuickGUI"
class navi:
@@ -1150,8 +1150,8 @@
libs=[ boost.lib, 'OgreMain', 'OIS_static' ]
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
- else:
- libs.append ( boost_python_index.lib )
+ # else:
+ # libs.append ( boost_python_index.lib )
ModuleName="betagui"
@@ -1171,8 +1171,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="ogreforests"
@@ -1203,8 +1203,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="particleuniverse"
class nxogre:
@@ -1240,7 +1240,7 @@
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain','NxOgre' ] #, 'NxOgreStatic'] #'NxExtensions',
else:
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ]
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
ModuleName="NxOgre"
@@ -1270,8 +1270,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="theora"
class plib:
@@ -1293,7 +1293,7 @@
libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ]
else:
libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
class physx:
active = True
@@ -1329,7 +1329,7 @@
]
elif isLinux():
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
source = [
[wget, "http://developer.download.nvidia.com/PhysX/2.8.1/PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz", downloadPath]
]
@@ -1451,11 +1451,11 @@
# [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', 'vorbisfile',
+ libs=[boost.lib, 'OgreMain', 'vorbisfile',
#'ogg',
#'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
@@ -1518,7 +1518,7 @@
name='et'
parent = "ogre/addons"
if isLinux():
- libs=[ boost.lib, boost_python_index.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
else:
libs=[ boost.lib, 'OgreMain' ]
@@ -1549,7 +1549,7 @@
# libs.append('LibBulletSoftBody')
#libs.append('libbulletcolladaconverter')
# libs.append('LibBulletMultiThreaded')
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
lib_dirs = [ boost.PATH_LIB
, Config.PATH_LIB_Bullet
@@ -1593,7 +1593,7 @@
cflags = ""
parent = "ogre/physics"
libs = [boost.lib, 'OgreMain',
- 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody','LibGIMPACT'
+ 'LibBulletCollision', 'LibBulletDynamics','LibBulletMultiThreaded','LibBulletSoftBody'
]
if isLinux():
libs.append('LibLinearMath')
@@ -1603,9 +1603,11 @@
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
- ,os.path.join(Config.PATH_Bullet, 'Extras','GIMPACT','include')
- ]
+ , Config.PATH_INCLUDE_Ogre_Dependencies
+ ]
+ if isWindows():
+ include_dirs.append(os.path.join(Config.PATH_Bullet, 'Extras','GIMPACT','include'))
+
lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Bullet
, Config.PATH_LIB_Ogre_OgreMain
@@ -1614,7 +1616,7 @@
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
CCFLAGS = ' -D_PRECOMP -fno-inline '
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletC'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
@@ -1654,7 +1656,7 @@
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
CCFLAGS = ' -D_PRECOMP -fno-inline '
- libs.append ( boost_python_index.lib )
+# libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletD'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
descText = "Ogre Bullet Dynamics (physics) implementation"
@@ -1675,8 +1677,8 @@
]
CheckIncludes=[]
libs=[ boost.lib]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="noise"
descText = "Generate 'noise'"
@@ -1696,8 +1698,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="watermesh"
descText = "C++ code from Ogre Water demo -- use Hydrax instead"
@@ -1717,8 +1719,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="ofusion"
descText = "Import Ogre 'Scenes' from 3dMax using the ofusion exporter"
@@ -1738,8 +1740,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="cadunetree"
descText = "Generate realistic trees"
@@ -1760,8 +1762,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="ogrepcz"
descText = "Portal SceneManager - seamlessly move from interior to exterior scene management"
@@ -1781,8 +1783,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'opensteer' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="opensteer"
class hydrax:
@@ -1801,8 +1803,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="hydrax"
descText = "Fantastic water/ocean effects"
@@ -1823,8 +1825,8 @@
]
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ]
- if isLinux():
- libs.append ( boost_python_index.lib )
+# if isLinux():
+# libs.append ( boost_python_index.lib )
ModuleName="hikari"
descText = "Use Flash controls within Ogre"
descLink = "http://hikari-library.googlecode.com/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-26 03:21:34
|
Revision: 853
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=853&view=rev
Author: andy_miller
Date: 2009-01-26 03:21:28 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
Adding modified header file for Mac build - Look at __PYTHON_BUILD_CODE for information on changes...
Only used during code generation, not build
Added Paths:
-----------
trunk/python-ogre/code_generators/ogre/CarbonCore/
trunk/python-ogre/code_generators/ogre/CarbonCore/MachineExceptions.h
Added: trunk/python-ogre/code_generators/ogre/CarbonCore/MachineExceptions.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/CarbonCore/MachineExceptions.h (rev 0)
+++ trunk/python-ogre/code_generators/ogre/CarbonCore/MachineExceptions.h 2009-01-26 03:21:28 UTC (rev 853)
@@ -0,0 +1,433 @@
+/*
+ File: CarbonCore/MachineExceptions.h
+
+ Contains: Processor Exception Handling Interfaces.
+
+ Version: CarbonCore-783~134
+
+ Copyright: \xA9 1993-2006 by Apple Computer, Inc., all rights reserved.
+
+ Bugs?: For bug reports, consult the following page on
+ the World Wide Web:
+
+ http://developer.apple.com/bugreporter/
+
+*/
+#ifndef __MACHINEEXCEPTIONS__
+#define __MACHINEEXCEPTIONS__
+
+#ifndef __MACTYPES__
+#include <CarbonCore/MacTypes.h>
+#endif
+
+#ifndef __MIXEDMODE__
+#include <CarbonCore/MixedMode.h>
+#endif
+
+
+#if (TARGET_CPU_X86 || TARGET_CPU_X86_64) && not defined (__PYTHONOGRE_BUILD_CODE)
+#include <xmmintrin.h>
+#endif
+
+
+#include <AvailabilityMacros.h>
+
+#if PRAGMA_ONCE
+#pragma once
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#pragma options align=power
+
+/* Some basic declarations used throughout the kernel */
+typedef struct OpaqueAreaID* AreaID;
+/* Machine Dependent types for PowerPC: */
+
+/* Because a number of sources do a #define CR 13 and this file contains a struct member named CR,
+ * an obscure compilation error gets spit out. Rename the field to CRRegister. To build old code
+ * which has the name CR in it, either update the code to use CRRegister or do a
+ * #define __MACHINEEXCEPTIONS_USE_OLD_CR_FIELD_NAME__ 1
+ * before #including <CoreServices/CoreServices.h> */
+#if __MACHINEEXCEPTIONS_USE_OLD_CR_FIELD_NAME__
+#define CRRegister CR
+#endif
+
+struct MachineInformationPowerPC {
+ UnsignedWide CTR;
+ UnsignedWide LR;
+ UnsignedWide PC;
+ unsigned long CRRegister; /* changed from CR since some folks had a #define CR 13 in their source code*/
+ unsigned long XER;
+ unsigned long MSR;
+ unsigned long MQ;
+ unsigned long ExceptKind;
+ unsigned long DSISR;
+ UnsignedWide DAR;
+ UnsignedWide Reserved;
+};
+typedef struct MachineInformationPowerPC MachineInformationPowerPC;
+struct RegisterInformationPowerPC {
+ UnsignedWide R0;
+ UnsignedWide R1;
+ UnsignedWide R2;
+ UnsignedWide R3;
+ UnsignedWide R4;
+ UnsignedWide R5;
+ UnsignedWide R6;
+ UnsignedWide R7;
+ UnsignedWide R8;
+ UnsignedWide R9;
+ UnsignedWide R10;
+ UnsignedWide R11;
+ UnsignedWide R12;
+ UnsignedWide R13;
+ UnsignedWide R14;
+ UnsignedWide R15;
+ UnsignedWide R16;
+ UnsignedWide R17;
+ UnsignedWide R18;
+ UnsignedWide R19;
+ UnsignedWide R20;
+ UnsignedWide R21;
+ UnsignedWide R22;
+ UnsignedWide R23;
+ UnsignedWide R24;
+ UnsignedWide R25;
+ UnsignedWide R26;
+ UnsignedWide R27;
+ UnsignedWide R28;
+ UnsignedWide R29;
+ UnsignedWide R30;
+ UnsignedWide R31;
+};
+typedef struct RegisterInformationPowerPC RegisterInformationPowerPC;
+struct FPUInformationPowerPC {
+ UnsignedWide Registers[32];
+ unsigned long FPSCR;
+ unsigned long Reserved;
+};
+typedef struct FPUInformationPowerPC FPUInformationPowerPC;
+union Vector128 {
+#ifdef __APPLE_ALTIVEC__
+ vector unsigned int v;
+#endif
+ unsigned long l[4];
+ unsigned short s[8];
+ unsigned char c[16];
+};
+typedef union Vector128 Vector128;
+struct VectorInformationPowerPC {
+ Vector128 Registers[32];
+ Vector128 VSCR;
+ UInt32 VRsave;
+};
+typedef struct VectorInformationPowerPC VectorInformationPowerPC;
+/* Exception related declarations */
+enum {
+ kWriteReference = 0,
+ kReadReference = 1,
+ kFetchReference = 2,
+ writeReference = kWriteReference, /* Obsolete name*/
+ readReference = kReadReference, /* Obsolete name*/
+ fetchReference = kFetchReference /* Obsolete name*/
+};
+
+
+typedef unsigned long MemoryReferenceKind;
+struct MemoryExceptionInformation {
+ AreaID theArea; /* The area related to the execption, same as MPAreaID.*/
+ LogicalAddress theAddress; /* The 32-bit address of the exception.*/
+ OSStatus theError; /* See enum below.*/
+ MemoryReferenceKind theReference; /* read, write, instruction fetch.*/
+};
+typedef struct MemoryExceptionInformation MemoryExceptionInformation;
+enum {
+ kUnknownException = 0,
+ kIllegalInstructionException = 1,
+ kTrapException = 2,
+ kAccessException = 3,
+ kUnmappedMemoryException = 4,
+ kExcludedMemoryException = 5,
+ kReadOnlyMemoryException = 6,
+ kUnresolvablePageFaultException = 7,
+ kPrivilegeViolationException = 8,
+ kTraceException = 9,
+ kInstructionBreakpointException = 10, /* Optional*/
+ kDataBreakpointException = 11, /* Optional*/
+ kIntegerException = 12,
+ kFloatingPointException = 13,
+ kStackOverflowException = 14, /* Optional, may be implemented as kAccessException on some systems.*/
+ kTaskTerminationException = 15, /* Obsolete*/
+ kTaskCreationException = 16, /* Obsolete*/
+ kDataAlignmentException = 17 /* May occur when a task is in little endian mode or created with kMPTaskTakesAllExceptions.*/
+};
+
+#if OLDROUTINENAMES
+enum {
+ unknownException = kUnknownException, /* Obsolete name*/
+ illegalInstructionException = kIllegalInstructionException, /* Obsolete name*/
+ trapException = kTrapException, /* Obsolete name*/
+ accessException = kAccessException, /* Obsolete name*/
+ unmappedMemoryException = kUnmappedMemoryException, /* Obsolete name*/
+ excludedMemoryException = kExcludedMemoryException, /* Obsolete name*/
+ readOnlyMemoryException = kReadOnlyMemoryException, /* Obsolete name*/
+ unresolvablePageFaultException = kUnresolvablePageFaultException, /* Obsolete name*/
+ privilegeViolationException = kPrivilegeViolationException, /* Obsolete name*/
+ traceException = kTraceException, /* Obsolete name*/
+ instructionBreakpointException = kInstructionBreakpointException, /* Obsolete name*/
+ dataBreakpointException = kDataBreakpointException, /* Obsolete name*/
+ integerException = kIntegerException, /* Obsolete name*/
+ floatingPointException = kFloatingPointException, /* Obsolete name*/
+ stackOverflowException = kStackOverflowException, /* Obsolete name*/
+ terminationException = kTaskTerminationException, /* Obsolete name*/
+ kTerminationException = kTaskTerminationException /* Obsolete name*/
+};
+
+#endif /* OLDROUTINENAMES */
+
+
+typedef unsigned long ExceptionKind;
+union ExceptionInfo {
+ MemoryExceptionInformation * memoryInfo;
+};
+typedef union ExceptionInfo ExceptionInfo;
+struct ExceptionInformationPowerPC {
+ ExceptionKind theKind;
+ MachineInformationPowerPC * machineState;
+ RegisterInformationPowerPC * registerImage;
+ FPUInformationPowerPC * FPUImage;
+ ExceptionInfo info;
+ VectorInformationPowerPC * vectorImage;
+};
+typedef struct ExceptionInformationPowerPC ExceptionInformationPowerPC;
+#if TARGET_CPU_PPC || TARGET_CPU_PPC64
+typedef ExceptionInformationPowerPC ExceptionInformation;
+typedef MachineInformationPowerPC MachineInformation;
+typedef RegisterInformationPowerPC RegisterInformation;
+typedef FPUInformationPowerPC FPUInformation;
+typedef VectorInformationPowerPC VectorInformation;
+#endif /* TARGET_CPU_PPC || TARGET_CPU_PPC64 */
+
+#ifdef __PYTHONOGRE_BUILD_CODE
+typedef float __m128 __attribute__ ((__vector_size__ (16)));
+typedef float __m128i __attribute__ ((__vector_size__ (16)));
+typedef float __m128d __attribute__ ((__vector_size__ (16)));
+#endif
+
+#if (TARGET_CPU_X86 || TARGET_CPU_X86_64)
+union Vector128Intel {
+ __m128 s;
+ __m128i si;
+ __m128d sd;
+ unsigned char c[16];
+};
+typedef union Vector128Intel Vector128Intel;
+#endif /* TARGET_CPU_X86 || TARGET_CPU_X86_64 */
+
+#if TARGET_CPU_X86
+struct MachineInformationIntel {
+ unsigned long CS;
+ unsigned long DS;
+ unsigned long SS;
+ unsigned long ES;
+ unsigned long FS;
+ unsigned long GS;
+ unsigned long EFLAGS;
+ unsigned long EIP;
+ unsigned long ExceptTrap;
+ unsigned long ExceptErr;
+ unsigned long ExceptAddr;
+};
+typedef struct MachineInformationIntel MachineInformationIntel;
+struct RegisterInformationIntel {
+ unsigned long EAX;
+ unsigned long EBX;
+ unsigned long ECX;
+ unsigned long EDX;
+ unsigned long ESI;
+ unsigned long EDI;
+ unsigned long EBP;
+ unsigned long ESP;
+};
+typedef struct RegisterInformationIntel RegisterInformationIntel;
+
+typedef unsigned char FPRegIntel[10];
+struct FPUInformationIntel {
+ FPRegIntel Registers[8];
+ unsigned short Control;
+ unsigned short Status;
+ unsigned short Tag;
+ unsigned short Opcode;
+ unsigned int EIP;
+ unsigned int DP;
+ unsigned int DS;
+};
+typedef struct FPUInformationIntel FPUInformationIntel;
+struct VectorInformationIntel {
+ Vector128Intel Registers[8];
+};
+typedef struct VectorInformationIntel VectorInformationIntel;
+
+typedef MachineInformationIntel MachineInformation;
+typedef RegisterInformationIntel RegisterInformation;
+typedef FPUInformationIntel FPUInformation;
+typedef VectorInformationIntel VectorInformation;
+#endif /* TARGET_CPU_X86 */
+
+#if TARGET_CPU_X86_64
+struct MachineInformationIntel64 {
+ unsigned long CS;
+ unsigned long FS;
+ unsigned long GS;
+ unsigned long RFLAGS;
+ unsigned long RIP;
+ unsigned long ExceptTrap;
+ unsigned long ExceptErr;
+ unsigned long ExceptAddr;
+};
+typedef struct MachineInformationIntel64 MachineInformationIntel64;
+struct RegisterInformationIntel64 {
+ unsigned long RAX;
+ unsigned long RBX;
+ unsigned long RCX;
+ unsigned long RDX;
+ unsigned long RDI;
+ unsigned long RSI;
+ unsigned long RBP;
+ unsigned long RSP;
+ unsigned long R8;
+ unsigned long R9;
+ unsigned long R10;
+ unsigned long R11;
+ unsigned long R12;
+ unsigned long R13;
+ unsigned long R14;
+ unsigned long R15;
+};
+typedef struct RegisterInformationIntel64 RegisterInformationIntel64;
+
+typedef unsigned char FPRegIntel[10];
+struct FPUInformationIntel64 {
+ FPRegIntel Registers[8];
+ unsigned short Control;
+ unsigned short Status;
+ unsigned short Tag;
+ unsigned short Opcode;
+ unsigned int IP;
+ unsigned int DP;
+ unsigned int DS;
+};
+typedef struct FPUInformationIntel64 FPUInformationIntel64;
+struct VectorInformationIntel64 {
+ Vector128Intel Registers[16];
+};
+typedef struct VectorInformationIntel64 VectorInformationIntel64;
+
+typedef MachineInformationIntel64 MachineInformation;
+typedef RegisterInformationIntel64 RegisterInformation;
+typedef FPUInformationIntel64 FPUInformation;
+typedef VectorInformationIntel64 VectorInformation;
+#endif /* TARGET_CPU_X86_64 */
+
+#if TARGET_CPU_X86 || TARGET_CPU_X86_64
+struct ExceptionInformation {
+ ExceptionKind theKind;
+ MachineInformation * machineState;
+ RegisterInformation * registerImage;
+ FPUInformation * FPUImage;
+ ExceptionInfo info;
+ VectorInformation * vectorImage;
+};
+typedef struct ExceptionInformation ExceptionInformation;
+#endif /* TARGET_CPU_X86 || TARGET_CPU_X86_64 */
+
+/*
+ Note: An ExceptionHandler is NOT a UniversalProcPtr, except in Carbon.
+ It must be a PowerPC function pointer with NO routine descriptor,
+ except on Carbon, where it must be a UniversalProcPtr (TPP actually)
+ to allow the interface to work from both CFM and Mach-O.
+*/
+typedef CALLBACK_API_C( OSStatus , ExceptionHandlerProcPtr )(ExceptionInformation * theException);
+typedef STACK_UPP_TYPE(ExceptionHandlerProcPtr) ExceptionHandlerUPP;
+/*
+ * NewExceptionHandlerUPP()
+ *
+ * Availability:
+ * Mac OS X: in version 10.0 and later in CoreServices.framework
+ * CarbonLib: in CarbonLib 1.1 and later
+ * Non-Carbon CFM: available as macro/inline
+ */
+extern ExceptionHandlerUPP
+NewExceptionHandlerUPP(ExceptionHandlerProcPtr userRoutine) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER;
+
+/*
+ * DisposeExceptionHandlerUPP()
+ *
+ * Availability:
+ * Mac OS X: in version 10.0 and later in CoreServices.framework
+ * CarbonLib: in CarbonLib 1.1 and later
+ * Non-Carbon CFM: available as macro/inline
+ */
+extern void
+DisposeExceptionHandlerUPP(ExceptionHandlerUPP userUPP) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER;
+
+/*
+ * InvokeExceptionHandlerUPP()
+ *
+ * Availability:
+ * Mac OS X: in version 10.0 and later in CoreServices.framework
+ * CarbonLib: in CarbonLib 1.1 and later
+ * Non-Carbon CFM: available as macro/inline
+ */
+extern OSStatus
+InvokeExceptionHandlerUPP(
+ ExceptionInformation * theException,
+ ExceptionHandlerUPP userUPP) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER;
+
+#if __MACH__
+ #ifdef __cplusplus
+ inline ExceptionHandlerUPP NewExceptionHandlerUPP(ExceptionHandlerProcPtr userRoutine) { return userRoutine; }
+ inline void DisposeExceptionHandlerUPP(ExceptionHandlerUPP) { }
+ inline OSStatus InvokeExceptionHandlerUPP(ExceptionInformation * theException, ExceptionHandlerUPP userUPP) { return (*userUPP)(theException); }
+ #else
+ #define NewExceptionHandlerUPP(userRoutine) ((ExceptionHandlerUPP)userRoutine)
+ #define DisposeExceptionHandlerUPP(userUPP)
+ #define InvokeExceptionHandlerUPP(theException, userUPP) (*userUPP)(theException)
+ #endif
+#endif
+
+/*
+ ExceptionHandler function pointers (TPP):
+ on classic PowerPC, use raw function pointers
+ on classic PowerPC with OPAQUE_UPP_TYPES=1, use UPP's
+ on Carbon, use UPP's
+*/
+/* use UPP's*/
+
+typedef ExceptionHandlerUPP ExceptionHandlerTPP;
+typedef ExceptionHandlerTPP ExceptionHandler;
+/* Routine for installing per-process exception handlers */
+/*
+ * InstallExceptionHandler()
+ *
+ * Availability:
+ * Mac OS X: in version 10.0 and later in CoreServices.framework
+ * CarbonLib: in CarbonLib 1.1 and later
+ * Non-Carbon CFM: in InterfaceLib 7.1 and later
+ */
+extern ExceptionHandlerTPP InstallExceptionHandler(ExceptionHandlerTPP theHandler) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER;
+
+
+
+
+#pragma options align=reset
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MACHINEEXCEPTIONS__ */
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-26 02:56:26
|
Revision: 852
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=852&view=rev
Author: andy_miller
Date: 2009-01-26 02:56:21 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
Linux fixes -- changes due to module rename in py++
Modified Paths:
--------------
trunk/python-ogre/code_generators/betagui/generate_code.py
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/bullet/generate_code_1.py
trunk/python-ogre/code_generators/cadunetree/generate_code.py
trunk/python-ogre/code_generators/caelum/generate_code.py
trunk/python-ogre/code_generators/canvas/generate_code.py
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/et/generate_code.py
trunk/python-ogre/code_generators/hikari/generate_code.py
trunk/python-ogre/code_generators/hydrax/generate_code.py
trunk/python-ogre/code_generators/mygui/generate_code.py
trunk/python-ogre/code_generators/navi/generate_code.py
trunk/python-ogre/code_generators/noise/generate_code.py
trunk/python-ogre/code_generators/nxogre/generate_code.py
trunk/python-ogre/code_generators/nxogre_09/generate_code.py
trunk/python-ogre/code_generators/ode/generate_code.py
trunk/python-ogre/code_generators/ofusion/generate_code.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/print_classes.py
trunk/python-ogre/code_generators/ogreal/generate_code.py
trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
trunk/python-ogre/code_generators/ogredshow/generate_code.py
trunk/python-ogre/code_generators/ogreforests/generate_code.py
trunk/python-ogre/code_generators/ogreode/generate_code.py
trunk/python-ogre/code_generators/ogrepcz/generate_code.py
trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
trunk/python-ogre/code_generators/ois/generate_code.py
trunk/python-ogre/code_generators/opcode/generate_code.py
trunk/python-ogre/code_generators/opensteer/generate_code.py
trunk/python-ogre/code_generators/particleuniverse/generate_code.py
trunk/python-ogre/code_generators/physx/generate_code.py
trunk/python-ogre/code_generators/plib/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/template/generate_code.py
trunk/python-ogre/code_generators/theora/generate_code.py
trunk/python-ogre/code_generators/theora_v2/generate_code.py
trunk/python-ogre/code_generators/watermesh/generate_code.py
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/patch/ogre_1.6.1.patch
Modified: trunk/python-ogre/code_generators/betagui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/betagui/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/betagui/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -36,7 +36,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/bullet/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/bullet/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -36,7 +36,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/bullet/generate_code_1.py
===================================================================
--- trunk/python-ogre/code_generators/bullet/generate_code_1.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/bullet/generate_code_1.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/cadunetree/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/cadunetree/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/caelum/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/caelum/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/canvas/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/canvas/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/canvas/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -22,7 +22,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
from pyplusplus.code_creators import include
import common_utils.extract_documentation as exdoc
Modified: trunk/python-ogre/code_generators/et/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/et/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/et/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/hikari/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/hikari/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/hikari/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/hydrax/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/hydrax/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/hydrax/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/mygui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/mygui/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/mygui/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/navi/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/noise/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/noise/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/noise/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/nxogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/nxogre/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -33,7 +33,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/nxogre_09/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre_09/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/nxogre_09/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ode/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ode/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -50,8 +50,8 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import call_policies_resolver
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import call_policies_resolver
+from pyplusplus.creators_factory import sort_algorithms
from pyplusplus import code_repository
Modified: trunk/python-ogre/code_generators/ofusion/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ofusion/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ofusion/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -43,7 +43,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogre/print_classes.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/print_classes.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogre/print_classes.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -20,7 +20,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogrebulletc/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogrebulletc/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogredshow/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogredshow/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogredshow/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogreforests/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogreforests/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogrepcz/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogrepcz/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -38,7 +38,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/ois/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
from pyplusplus.code_creators import include
# import common_utils.extract_documentation as exdoc
Modified: trunk/python-ogre/code_generators/opcode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/opcode/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/opcode/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/opensteer/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/opensteer/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/opensteer/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -33,7 +33,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/particleuniverse/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/particleuniverse/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -37,7 +37,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/physx/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/physx/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/physx/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/plib/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/plib/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/plib/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -33,7 +33,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -40,7 +40,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
from pyplusplus.code_creators import include
import common_utils.extract_documentation as exdoc
Modified: trunk/python-ogre/code_generators/template/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/template/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/template/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -33,7 +33,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/theora/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/theora/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/theora/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/theora_v2/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/theora_v2/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/theora_v2/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -28,7 +28,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/code_generators/watermesh/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/watermesh/generate_code.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/code_generators/watermesh/generate_code.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -36,7 +36,7 @@
from pyplusplus import function_transformers as ft
from pyplusplus.module_builder import call_policies
-from pyplusplus.module_creator import sort_algorithms
+from pyplusplus.creators_factory import sort_algorithms
import common_utils.extract_documentation as exdoc
import common_utils.var_checker as varchecker
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-26 00:08:10 UTC (rev 851)
+++ trunk/python-ogre/environment.py 2009-01-26 02:56:21 UTC (rev 852)
@@ -483,7 +483,7 @@
versionBase = '1_37' ## the version used on the library name
if isLinux() or isMac():
- bjambase = 'boost-jam-3.1.17'
+ bjambase = 'boost-jam-3.1.17-1-linuxx86'
if isMac():
bjambuilddir = 'bin.macosxx86'
bjambuildset = 'darwin'
@@ -491,13 +491,14 @@
if is64():
bjambuilddir = 'bin.linuxx86_64'
else:
- bjambuilddir = 'bin.linuxx86'
+ bjambuilddir = ''
bjambuildset = 'gcc'
- source = [
- [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1.tgz', downloadPath],
- [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
- ]
+ if isLinux():
+ source = [
+ [wget,'http://downloads.sourceforge.net/boost/boost-jam-3.1.17-1-linuxx86.tgz', downloadPath],
+ [wget,'http://downloads.sourceforge.net/boost/'+base+'.tar.gz',downloadPath]
+ ]
buildCmds = [
## first handle bjam
[0, tar + ' zxf ' + os.path.join(downloadPath, bjambase) + '.tgz --overwrite', ''],
@@ -635,7 +636,7 @@
base = "ogre-v1-6-1"
buildCmds = [
[0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ],
- #[0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
+ [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.1.patch -p0 ", os.getcwd()],
#[0, "sed --in-place -s 's|#define OGRE_THREAD_SUPPORT 1|#define OGRE_THREAD_SUPPORT 0|' OgreConfig.h",os.path.join(os.getcwd(),"ogre","OgreMain", "include")],
[0, "aclocal", os.path.join(os.getcwd(), 'ogre')],
[0, "./bootstrap", os.path.join(os.getcwd(), 'ogre')],
@@ -718,7 +719,7 @@
# ]
buildCmds = [
- [0, tar + " zxf " + os.path.join(downloadPath,'ois_1.2.0')+".tar.gz --overwrite",os.getcwd() ],
+# [0, tar + " zxf " + os.path.join(downloadPath,'ois_1.2.0')+".tar.gz --overwrite",os.getcwd() ],
[0, "./bootstrap" ,os.path.join(os.getcwd(), base )],
[0,"./configure --prefix=%s --includedir=%s/include" %(PREFIX,PREFIX) ,os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
@@ -872,13 +873,13 @@
[wget, "http://downloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz", downloadPath]
]
else:
- base = "CEGUI-0.6.1"
+ base = "CEGUI-0.6.2"
source=[
[wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.6.2b.tar.gz?download", downloadPath]
]
buildCmds = [
- [0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",os.getcwd() ],
+ [0, tar + " zxf " + os.path.join(downloadPath,base)+"b.tar.gz --overwrite",os.getcwd() ],
# [0, "patch -s -N -i ../python-ogre/patch/cegui.patch -p0", os.path.join(os.getcwd(),base)],
[0, "echo 'EMPTY' >>./INSTALL", os.path.join(os.getcwd(),base)],
[0, "echo 'EMPTY' >>./NEWS", os.path.join(os.getcwd(),base)],
Added: trunk/python-ogre/patch/ogre_1.6.1.patch
===================================================================
--- trunk/python-ogre/patch/ogre_1.6.1.patch (rev 0)
+++ trunk/python-ogre/patch/ogre_1.6.1.patch 2009-01-26 02:56:21 UTC (rev 852)
@@ -0,0 +1,74 @@
+Index: ogre/Samples/Common/include/ExampleFrameListener.h
+===================================================================
+--- ogre/Samples/Common/include/ExampleFrameListener.h (revision 8145)
++++ ogre/Samples/Common/include/ExampleFrameListener.h (working copy)
+@@ -41,7 +41,7 @@
+
+ //Use this define to signify OIS will be used as a DLL
+ //(so that dll import/export macros are in effect)
+-#define OIS_DYNAMIC_LIB
++//#define OIS_DYNAMIC_LIB
+ #include <OIS/OIS.h>
+
+ using namespace Ogre;
+Index: ogre/OgreMain/include/OgreAtomicWrappers.h
+===================================================================
+--- ogre/OgreMain/include/OgreAtomicWrappers.h (revision 8145)
++++ ogre/OgreMain/include/OgreAtomicWrappers.h (working copy)
+@@ -170,7 +170,7 @@
+
+ }
+
+- #elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_THREAD_SUPPORT
++ #elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_THREAD_SUPPORT && ! defined(__PYTHONOGRE_BUILD_CODE)
+
+ #undef NOMINMAX
+ #define NOMINMAX
+Index: ogre/OgreMain/include/OgreStdHeaders.h
+===================================================================
+--- ogre/OgreMain/include/OgreStdHeaders.h (revision 8145)
++++ ogre/OgreMain/include/OgreStdHeaders.h (working copy)
+@@ -36,7 +36,7 @@
+ // Note - not in the original STL, but exists in SGI STL and STLport
+ // For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
+ #if (OGRE_COMPILER == OGRE_COMPILER_GNUC) && !defined(STLPORT)
+-# if OGRE_COMP_VER >= 430
++# if OGRE_COMP_VER >= 430 && !(defined __PYTHONOGRE_BUILD_CODE)
+ # include <tr1/unordered_map>
+ # include <tr1/unordered_set>
+ # else
+Index: ogre/OgreMain/include/OgrePrerequisites.h
+===================================================================
+--- ogre/OgreMain/include/OgrePrerequisites.h (revision 8145)
++++ ogre/OgreMain/include/OgrePrerequisites.h (working copy)
+@@ -121,7 +121,7 @@
+ #endif
+
+ #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
+- # if OGRE_COMP_VER >= 430
++ # if OGRE_COMP_VER >= 430 && !defined(__PYTHONOGRE_BUILD_CODE)
+ # define HashMap ::std::tr1::unordered_map
+ # define HashSet ::std::tr1::unordered_set
+ # else
+Index: ogre/OgreMain/include/OgreString.h
+===================================================================
+--- ogre/OgreMain/include/OgreString.h (revision 8145)
++++ ogre/OgreMain/include/OgreString.h (working copy)
+@@ -35,7 +35,7 @@
+ #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
+
+ // For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
+-# if OGRE_COMP_VER >= 430
++# if OGRE_COMP_VER >= 430 && !defined (__PYTHONOGRE_BUILD_CODE)
+ # include <tr1/unordered_map>
+ # else
+ # include <ext/hash_map>
+@@ -158,7 +158,7 @@
+
+
+ #if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT)
+-# if OGRE_COMP_VER < 430
++# if OGRE_COMP_VER < 430 || defined (__PYTHONOGRE_BUILD_CODE)
+ typedef ::__gnu_cxx::hash< _StringBase > _StringHash;
+ # else
+ typedef ::std::tr1::hash< _StringBase > _StringHash;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-26 00:08:14
|
Revision: 851
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=851&view=rev
Author: andy_miller
Date: 2009-01-26 00:08:10 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
Version Update in build script
Modified Paths:
--------------
trunk/python-ogre/PythonOgreInstallCreator.iss
Modified: trunk/python-ogre/PythonOgreInstallCreator.iss
===================================================================
--- trunk/python-ogre/PythonOgreInstallCreator.iss 2009-01-25 12:44:39 UTC (rev 850)
+++ trunk/python-ogre/PythonOgreInstallCreator.iss 2009-01-26 00:08:10 UTC (rev 851)
@@ -37,12 +37,12 @@
Source: plugins\*; DestDir: {app}\plugins
Source: tools\*; DestDir: {app}\tools
Source: docs\*; DestDir: {app}\docs
-Source: SourceLibs\*; DestDir: {app}\SourceLibs; Flags: recursesubdirs
+;Source: SourceLibs\*; DestDir: {app}\SourceLibs; Flags: recursesubdirs
Source: ThirdParty\dxwebsetup.exe; DestDir: {app}\ThirdParty
Source: ThirdParty\vcredist_x86.exe; DestDir: {app}\ThirdParty
-Source: demos\*; DestDir: {app}\demos;
+Source: demos\*; DestDir: {app}\demos
Source: demos\bullet\*; DestDir: {app}\demos\bullet; Flags: recursesubdirs
Source: demos\caelum\*; DestDir: {app}\demos\caelum; Flags: recursesubdirs
Source: demos\cegui\*; DestDir: {app}\demos\cegui; Flags: recursesubdirs
@@ -51,7 +51,7 @@
Source: demos\media\*; DestDir: {app}\demos\media; Flags: recursesubdirs
Source: demos\media_extra\*; DestDir: {app}\demos\media_extra; Flags: recursesubdirs
Source: demos\noise\*; DestDir: {app}\demos\noise; Flags: recursesubdirs
-Source: demos\nxogre\*; DestDir: {app}\demos\nxogre; Flags: recursesubdirs
+;Source: demos\nxogre\*; DestDir: {app}\demos\nxogre; Flags: recursesubdirs
Source: demos\ode\*; DestDir: {app}\demos\ode; Flags: recursesubdirs
Source: demos\ogre\*; DestDir: {app}\demos\ogre; Flags: recursesubdirs
Source: demos\ogreal\*; DestDir: {app}\demos\ogreal; Flags: recursesubdirs
@@ -206,7 +206,7 @@
[Icons]
Name: {group}\Ogre Demos\Bezier; Filename: {code:GetPythonExe}; Parameters: Demo_Bezier.py; WorkingDir: {app}\Demos\Ogre
Name: {group}\Ogre Demos\BSP; Filename: {code:GetPythonExe}; Parameters: Demo_BSP.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\Ogre Demos\BSP_Collision; Filename: {code:GetPythonExe}; Parameters: Demo_BspCollision.py; WorkingDir: {app}\Demos\Ogre
+;Name: {group}\Ogre Demos\BSP_Collision; Filename: {code:GetPythonExe}; Parameters: Demo_BspCollision.py; WorkingDir: {app}\Demos\Ogre
Name: {group}\Ogre Demos\Camera Tracking; Filename: {code:GetPythonExe}; Parameters: Demo_CameraTracking.py; WorkingDir: {app}\Demos\Ogre
Name: {group}\Ogre Demos\CEL Shading; Filename: {code:GetPythonExe}; Parameters: Demo_CelShading.py; WorkingDir: {app}\Demos\Ogre
Name: {group}\Ogre Demos\Compositor; Filename: {code:GetPythonExe}; Parameters: Demo_Compositor.py; WorkingDir: {app}\Demos\Ogre
@@ -233,7 +233,7 @@
Name: {group}\GUI\CEGUI - Basic; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_Gui.py; WorkingDir: {app}\Demos\cegui
Name: {group}\GUI\CEGUI Drag and Drop; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_DragnDrop.py; WorkingDir: {app}\Demos\cegui
Name: {group}\GUI\CEGUI - Nice; Filename: {code:GetPythonExe}; Parameters: Demo_CEGUI_NewGui.py; WorkingDir: {app}\Demos\cegui
-Name: {group}\GUI\QuickGUI-01; Filename: {code:GetPythonExe}; Parameters: Demo_QuickGUI01.py; WorkingDir: {app}\Demos\qgui
+;Name: {group}\GUI\QuickGUI-01; Filename: {code:GetPythonExe}; Parameters: Demo_QuickGUI01.py; WorkingDir: {app}\Demos\qgui
;Name: {group}\GUI\Navi; Filename: {code:GetPythonExe}; Parameters: Demo_Navi.py; WorkingDir: {app}\Demos\navi
Name: {group}\ODE Demos\Multiple Scenes; Filename: {code:GetPythonExe}; Parameters: Demo_Scenes.py; WorkingDir: {app}\Demos\OgreOde
@@ -276,7 +276,7 @@
;Name: {group}\Python-Ogre API (Html); Filename: {app}\docs\html\index.html
[Run]
-Filename: {app}\ThirdParty\vcredist_x86.exe; Parameters: "/q"
+Filename: {app}\ThirdParty\vcredist_x86.exe; Parameters: /q
Filename: {app}\ThirdParty\dxwebsetup.exe; Description: DirectX Installer; StatusMsg: You probably NEED to update your Directx Drivers; Flags: postinstall
[Code]
@@ -347,7 +347,7 @@
//msgbox ( 'Is a supported version ' + Param + ' (' + SupportedVersions[i] + ') ' + Param , mbInformation, MB_OK);
end else begin
//msgbox ( 'Not a supported version ' + Param + ' (' +SupportedVersions[i] + ') ', mbInformation, MB_OK);
- end;
+ end;
end;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-25 13:22:08
|
Revision: 848
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=848&view=rev
Author: andy_miller
Date: 2009-01-25 12:09:45 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
missing variable from linux config file...
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-25 11:35:21 UTC (rev 847)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-25 12:09:45 UTC (rev 848)
@@ -129,8 +129,10 @@
PATH_LIB_opensteer = os.path.join(LOCAL_LIB)
PATH_LIB_hikari = os.path.join(PATH_hikari ) #, 'lib')
PATH_LIB_mygui = os.path.join(PATH_mygui, 'MyGUIEngine','lib','Release')
-PATH_LIB_canvas = os.path.join(PATH_canvas )
+PATH_LIB_canvas = os.path.join(PATH_canvas )
+PATH_LIB_pcz = os.path.join(PATH_LIB_Ogre_OgreMain, 'OGRE')
+
PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_Ogre_Dependencies = PATH_INCLUDE_Ogre # os.path.join( PATH_Ogre, 'Dependencies/include')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-25 12:44:45
|
Revision: 850
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=850&view=rev
Author: andy_miller
Date: 2009-01-25 12:44:39 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Updates for the 1.6.1 release
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/PythonOgreInstallCreator.iss
trunk/python-ogre/demos/ogrepcz/plugins.cfg
trunk/python-ogre/environment.py
trunk/python-ogre/patch/navi.patch
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/ChangeLog.txt 2009-01-25 12:44:39 UTC (rev 850)
@@ -1,18 +1,25 @@
-xxx : Release SVN
-=================
+Janurary 25 2009 : Release 1.6.1
+================================
+Latest build using Ogre 1.6.1 -- Note that the underlying Ogre C++ is NOT Patched!!
+
Fix: Improved extract_document functions to improve pydoc stings - remove excess leading whitespace and wraps at 100 chars
Fix: PhysX library exposes various NxArray objects that previously were excluded due to compile issues
Fix: Ogre library excludes xxxMutex variables from a few classes (Pass etc) as these are not correctly exposed
Update: PhysX can now be 'retrieved' and 'built' from windows (BuildModule.py -r -b physx)
Update: Extend the PhysX demo a little
-Update: Update Bullet libraries to bullet 2.72
+Update: Update Bullet libraries to bullet 2.73
Update: SampleFramework now uses a 'PythonOgre' overlay
Update: SampleFramework will now look for plugins.cfg or plugins.cfg.<platform name> ('nt' or 'linux') in the current and
parent directories -- this will allow a single demo tree to automatically work on any platform unstead of the
current suitation of having to manually edit the plugins file..
-Update: Plib ssgLoaderOptions (ssgLoad) can now be subclassed and createBranch/createState used as callback functions
+Update: Plib ssgLoaderOptions (ssgLoad) can now be subclassed and createBranch/createState used as callback functions
+Update: Latest QuickGUI, OgreForest (Paging), OgreBullet
+Update/Fix: Using OIS CVS version as it fixes issues with joystick/slider 'drivers'...
+Change: Using latest Py++ which has boost indexing implemented as header files (BOOST is NOT Patched!)
+Change: Added Canvas module
+Change: Removed OgreRefApp and Watermesh modules
November 14 2008 : Release 1.6.0
==================================
Modified: trunk/python-ogre/PythonOgreInstallCreator.iss
===================================================================
--- trunk/python-ogre/PythonOgreInstallCreator.iss 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/PythonOgreInstallCreator.iss 2009-01-25 12:44:39 UTC (rev 850)
@@ -3,19 +3,19 @@
;
[Setup]
AppName=Python-Ogre
-AppVerName=Python-Ogre 1.6.0
+AppVerName=Python-Ogre 1.6.1
DefaultDirName=C:\PythonOgre
DefaultGroupName=Python-Ogre
OutputBaseFilename=PythonOgreInstaller
OutputDir=C:\temp
SourceDir=C:\Development\PythonOgreRelease
-VersionInfoDescription=Release 1.6.0 of Python-Ogre
+VersionInfoDescription=Release 1.6.1 of Python-Ogre
AllowNoIcons=true
AppPublisher=OpenSource (Andy and Team)
AppPublisherURL=http://www.python-ogre.org
AppSupportURL=http://www.python-ogre.org
AppUpdatesURL=http://www.python-ogre.org
-AppVersion=1.6.0
+AppVersion=1.6.1
LicenseFile=LICENSE.GPL
Compression=lzma
InfoBeforeFile=InstallWarning.rtf
@@ -23,13 +23,13 @@
SolidCompression=yes
AppCopyright=LPGL
VersionInfoCompany=OpenSource (Andy and Team)
-VersionInfoTextVersion=1.6.0
+VersionInfoTextVersion=1.6.1
VersionInfoCopyright=PythonOgre Development Team
RestartIfNeededByRun=false
UninstallDisplayName=PythonOgre
WizardImageFile=compiler:WizModernImage-IS.bmp
WizardSmallImageFile=compiler:WizModernSmallImage-IS.bmp
-VersionInfoVersion=1.6.0
+VersionInfoVersion=1.6.1
[Files]
; base files, demos and tools
Modified: trunk/python-ogre/demos/ogrepcz/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/ogrepcz/plugins.cfg 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/demos/ogrepcz/plugins.cfg 2009-01-25 12:44:39 UTC (rev 850)
@@ -2,24 +2,24 @@
## Use this for Windows
# Define plugin folder
-#PluginFolder=../../plugins
-#Plugin=RenderSystem_GL.dll
-#Plugin=RenderSystem_Direct3D9.dll
-#Plugin=Plugin_ParticleFX.dll
+PluginFolder=../../plugins
+Plugin=RenderSystem_GL.dll
+Plugin=RenderSystem_Direct3D9.dll
+Plugin=Plugin_ParticleFX.dll
#Plugin=Plugin_BSPSceneManager.dll
#Plugin=Plugin_CgProgramManager.dll
-#Plugin=Plugin_PCZSceneManager.dll
-#Plugin=Plugin_OctreeZone.dll
-#Plugin=Plugin_OctreeSceneManager.dll
+Plugin=Plugin_PCZSceneManager.dll
+Plugin=Plugin_OctreeZone.dll
+Plugin=Plugin_OctreeSceneManager.dll
##
## NOTE use this for MacOS or Linux
-PluginFolder=/home/andy/development/root/usr/lib/OGRE
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=libPlugin_PCZSceneManager
+#PluginFolder=/home/andy/development/root/usr/lib/OGRE
+#Plugin=RenderSystem_GL
+#Plugin=Plugin_ParticleFX
+#Plugin=Plugin_BSPSceneManager
+#Plugin=libPlugin_PCZSceneManager
#Plugin=Plugin_OctreeZone
-Plugin=Plugin_OctreeSceneManager
-#Plugin=Plugin_CgProgramManager
+#Plugin=Plugin_OctreeSceneManager
+#Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/environment.py 2009-01-25 12:44:39 UTC (rev 850)
@@ -1116,7 +1116,7 @@
lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain
,Config.PATH_LIB_navi
- ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','lib')
+ ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','lib', 'release')
]
CheckIncludes=[]
libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Awesomium', 'user32',
Modified: trunk/python-ogre/patch/navi.patch
===================================================================
--- trunk/python-ogre/patch/navi.patch 2009-01-25 12:32:37 UTC (rev 849)
+++ trunk/python-ogre/patch/navi.patch 2009-01-25 12:44:39 UTC (rev 850)
@@ -1,45 +1,72 @@
---- Navi/Include/Navi.h (revision 25)
-+++ Navi/Include/Navi.h (working copy)
-@@ -34,7 +34,7 @@
- {
- class _NaviExport Navi : public LLEmbeddedBrowserWindowObserver, public Ogre::WindowEventListener, public Ogre::ManualResourceLoader
- {
-- friend NaviManager;
-+ friend class NaviManager;
+Index: NaviDemo/Source/InputManager.cpp
+===================================================================
+--- NaviDemo/Source/InputManager.cpp (revision 43)
++++ NaviDemo/Source/InputManager.cpp (working copy)
+@@ -64,13 +64,13 @@
+ mInputSystem = OIS::InputManager::createInputSystem( paramList );
- std::string naviName;
- unsigned short naviWidth;
-@@ -69,8 +69,8 @@
- std::multimap<std::string, NaviDelegate> delegateMap;
- std::multimap<std::string, NaviDelegate>::iterator delegateIter;
- std::pair<std::multimap<std::string, NaviDelegate>::iterator, std::multimap<std::string, NaviDelegate>::iterator> dmBounds;
-- std::map<std::string, std::vector<std::string>> ensureKeysMap;
-- std::map<std::string, std::vector<std::string>>::iterator ensureKeysMapIter;
-+ std::map<std::string, std::vector<std::string> > ensureKeysMap;
-+ std::map<std::string, std::vector<std::string> >::iterator ensureKeysMapIter;
- bool okayToDelete;
- bool isVisible;
- bool fadingOut;
-
---- Navi/Include/NaviMouse.h (revision 25)
-+++ Navi/Include/NaviMouse.h (working copy)
-@@ -41,7 +41,7 @@
- class _NaviExport NaviMouse : public Singleton<NaviMouse>, public Ogre::ManualResourceLoader
- {
- friend class NaviManager;
-- friend NaviCursor;
-+ friend class NaviCursor;
- int mouseX, mouseY;
- unsigned short width, height;
- unsigned short texWidth, texHeight;
-
---- Navi/Include/NaviManager.h (revision 25)
+ // If possible create a buffered keyboard
+- if( mInputSystem->numKeyboards() > 0 ) {
++// if( mInputSystem->numKeyboards() > 0 ) {
+ mKeyboard = static_cast<OIS::Keyboard*>( mInputSystem->createInputObject( OIS::OISKeyboard, true ) );
+ mKeyboard->setEventCallback( this );
+- }
++// }
+
+ // If possible create a buffered mouse
+- if( mInputSystem->numMice() > 0 ) {
++// if( mInputSystem->numMice() > 0 ) {
+ mMouse = static_cast<OIS::Mouse*>( mInputSystem->createInputObject( OIS::OISMouse, true ) );
+ mMouse->setEventCallback( this );
+
+@@ -81,10 +81,10 @@
+
+ // Set mouse region
+ this->setWindowExtents( width, height );
+- }
++// }
+
+ // If possible create all joysticks in buffered mode
+- if( mInputSystem->numJoySticks() > 0 ) {
++/* if( 0 ) { //mInputSystem->numJoySticks() > 0 ) {
+ mJoysticks.resize( mInputSystem->numJoySticks() );
+
+ itJoystick = mJoysticks.begin();
+@@ -93,7 +93,7 @@
+ (*itJoystick) = static_cast<OIS::JoyStick*>( mInputSystem->createInputObject( OIS::OISJoyStick, true ) );
+ (*itJoystick)->setEventCallback( this );
+ }
+- }
++ } */
+ }
+ }
+
+Index: Navi/Include/NaviManager.h
+===================================================================
+--- Navi/Include/NaviManager.h (revision 43)
+++ Navi/Include/NaviManager.h (working copy)
-@@ -37,6 +37,7 @@
-
+@@ -30,6 +30,16 @@
+ #include "NaviUtilities.h"
+ #include "NaviSingleton.h"
+ #include "WebCore.h"
++
++#ifdef min
++#undef min
++#endif
++
++#ifdef max
++#undef max
++#endif
++
++
+ #include "Ogre.h"
+ #include "OgrePanelOverlayElement.h"
+ #include "KeyboardHook.h"
+@@ -39,6 +49,7 @@
+ */
namespace NaviLibrary
{
-+ class Navi; // needed for Python-Ogre gccxml processing
++ class Navi; // need to delcare to make gccxml happy
/**
* Enumerates relative positions. Used by NaviManager::NaviPosition
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-25 12:32:47
|
Revision: 849
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=849&view=rev
Author: andy_miller
Date: 2009-01-25 12:32:37 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Adjusting QuickGUI demo media
Modified Paths:
--------------
trunk/python-ogre/demos/qgui/resources.cfg
Added Paths:
-----------
trunk/python-ogre/demos/qgui/media/Button.skinTypes
trunk/python-ogre/demos/qgui/media/CheckBox.skinTypes
trunk/python-ogre/demos/qgui/media/ComboBox.skinTypes
trunk/python-ogre/demos/qgui/media/Console.skinTypes
trunk/python-ogre/demos/qgui/media/Example.material
trunk/python-ogre/demos/qgui/media/HScrollBar.skinTypes
trunk/python-ogre/demos/qgui/media/Image.skinTypes
trunk/python-ogre/demos/qgui/media/Label.skinTypes
trunk/python-ogre/demos/qgui/media/List.skinTypes
trunk/python-ogre/demos/qgui/media/ListTextItem.skinTypes
trunk/python-ogre/demos/qgui/media/Menu.skinTypes
trunk/python-ogre/demos/qgui/media/MenuLabel.skinTypes
trunk/python-ogre/demos/qgui/media/MenuPanel.skinTypes
trunk/python-ogre/demos/qgui/media/ModalWindow .skinTypes
trunk/python-ogre/demos/qgui/media/MouseCursor.skinTypes
trunk/python-ogre/demos/qgui/media/Panel.skinTypes
trunk/python-ogre/demos/qgui/media/ProgressBar.skinTypes
trunk/python-ogre/demos/qgui/media/Sheet.skinTypes
trunk/python-ogre/demos/qgui/media/Tab.skinTypes
trunk/python-ogre/demos/qgui/media/TabControl.skinTypes
trunk/python-ogre/demos/qgui/media/TabPage.skinTypes
trunk/python-ogre/demos/qgui/media/Test.sheet
trunk/python-ogre/demos/qgui/media/TextArea.skinTypes
trunk/python-ogre/demos/qgui/media/TextBox.skinTypes
trunk/python-ogre/demos/qgui/media/TextCursor.skinTypes
trunk/python-ogre/demos/qgui/media/TitleBar.skinTypes
trunk/python-ogre/demos/qgui/media/ToolBar.skinTypes
trunk/python-ogre/demos/qgui/media/TreeView.skinTypes
trunk/python-ogre/demos/qgui/media/VScrollBar.skinTypes
trunk/python-ogre/demos/qgui/media/Window.skinTypes
trunk/python-ogre/demos/qgui/media/fonts/
trunk/python-ogre/demos/qgui/media/lobby.panel.background.png
trunk/python-ogre/demos/qgui/media/lobby.textbox.png
trunk/python-ogre/demos/qgui/media/materials/
trunk/python-ogre/demos/qgui/media/materials/scripts/
trunk/python-ogre/demos/qgui/media/materials/textures/
trunk/python-ogre/demos/qgui/media/micross.fontdef
trunk/python-ogre/demos/qgui/media/micross.ttf
trunk/python-ogre/demos/qgui/media/models/
trunk/python-ogre/demos/qgui/media/ninja.mesh
trunk/python-ogre/demos/qgui/media/nskingr.jpg
trunk/python-ogre/demos/qgui/media/packs/
trunk/python-ogre/demos/qgui/media/qgui.button.down.png
trunk/python-ogre/demos/qgui/media/qgui.button.over.png
trunk/python-ogre/demos/qgui/media/qgui.button.png
trunk/python-ogre/demos/qgui/media/qgui.button.round.down.png
trunk/python-ogre/demos/qgui/media/qgui.button.round.over.png
trunk/python-ogre/demos/qgui/media/qgui.button.round.png
trunk/python-ogre/demos/qgui/media/qgui.checkbox.checked.down.png
trunk/python-ogre/demos/qgui/media/qgui.checkbox.checked.over.png
trunk/python-ogre/demos/qgui/media/qgui.checkbox.checked.png
trunk/python-ogre/demos/qgui/media/qgui.checkbox.unchecked.down.png
trunk/python-ogre/demos/qgui/media/qgui.checkbox.unchecked.over.png
trunk/python-ogre/demos/qgui/media/qgui.checkbox.unchecked.png
trunk/python-ogre/demos/qgui/media/qgui.checkbox.x-ed.down.png
trunk/python-ogre/demos/qgui/media/qgui.checkbox.x-ed.over.png
trunk/python-ogre/demos/qgui/media/qgui.checkbox.x-ed.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.button.down.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.button.over.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.button.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.down.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.highlight.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.list.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.listitem.down.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.listitem.over.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.listitem.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.over.png
trunk/python-ogre/demos/qgui/media/qgui.combobox.png
trunk/python-ogre/demos/qgui/media/qgui.console.inputbox.png
trunk/python-ogre/demos/qgui/media/qgui.console.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.cross.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.grabable.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.grabbed.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.resize.diagonal1.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.resize.diagonal2.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.resize.leftright.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.resize.updown.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.textselect.png
trunk/python-ogre/demos/qgui/media/qgui.cursor.textselect2.png
trunk/python-ogre/demos/qgui/media/qgui.image.png
trunk/python-ogre/demos/qgui/media/qgui.label.png
trunk/python-ogre/demos/qgui/media/qgui.panel.png
trunk/python-ogre/demos/qgui/media/qgui.progressbar.horizontal.bar.png
trunk/python-ogre/demos/qgui/media/qgui.progressbar.horizontal.png
trunk/python-ogre/demos/qgui/media/qgui.progressbar.vertical.bar.png
trunk/python-ogre/demos/qgui/media/qgui.progressbar.vertical.png
trunk/python-ogre/demos/qgui/media/qgui.progressbar1.background.png
trunk/python-ogre/demos/qgui/media/qgui.progressbar1.bar.png
trunk/python-ogre/demos/qgui/media/qgui.progressbar1.clipbox.png
trunk/python-ogre/demos/qgui/media/qgui.radiobutton.selected.down.png
trunk/python-ogre/demos/qgui/media/qgui.radiobutton.selected.over.png
trunk/python-ogre/demos/qgui/media/qgui.radiobutton.selected.png
trunk/python-ogre/demos/qgui/media/qgui.radiobutton.unselected.down.png
trunk/python-ogre/demos/qgui/media/qgui.radiobutton.unselected.over.png
trunk/python-ogre/demos/qgui/media/qgui.radiobutton.unselected.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.left.down.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.left.over.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.left.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.right.down.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.right.over.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.right.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.slider.down.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.slider.over.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.horizontal.slider.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.bottom.down.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.bottom.over.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.bottom.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.slider.down.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.slider.over.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.slider.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.top.down.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.top.over.png
trunk/python-ogre/demos/qgui/media/qgui.scrollbar.vertical.top.png
trunk/python-ogre/demos/qgui/media/qgui.tab.front.png
trunk/python-ogre/demos/qgui/media/qgui.tab.main.png
trunk/python-ogre/demos/qgui/media/qgui.textbox.over.png
trunk/python-ogre/demos/qgui/media/qgui.textbox.png
trunk/python-ogre/demos/qgui/media/qgui.toolbar.background.png
trunk/python-ogre/demos/qgui/media/qgui.toolbar.highlight.png
trunk/python-ogre/demos/qgui/media/qgui.toolbar.icons.expander.png
trunk/python-ogre/demos/qgui/media/qgui.toolbar.icons.mover.png
trunk/python-ogre/demos/qgui/media/qgui.toolbar.separator.png
trunk/python-ogre/demos/qgui/media/qgui.toolbar.window.background.png
trunk/python-ogre/demos/qgui/media/qgui.trackbar.horizontal.png
trunk/python-ogre/demos/qgui/media/qgui.trackbar.horizontal.slider.down.png
trunk/python-ogre/demos/qgui/media/qgui.trackbar.horizontal.slider.over.png
trunk/python-ogre/demos/qgui/media/qgui.trackbar.horizontal.slider.png
trunk/python-ogre/demos/qgui/media/qgui.trackbar.vertical.png
trunk/python-ogre/demos/qgui/media/qgui.trackbar.vertical.slider.down.png
trunk/python-ogre/demos/qgui/media/qgui.trackbar.vertical.slider.over.png
trunk/python-ogre/demos/qgui/media/qgui.trackbar.vertical.slider.png
trunk/python-ogre/demos/qgui/media/qgui.window.png
trunk/python-ogre/demos/qgui/media/qgui.window.tiled.png
trunk/python-ogre/demos/qgui/media/qgui.window.titlebar.close.down.png
trunk/python-ogre/demos/qgui/media/qgui.window.titlebar.close.over.png
trunk/python-ogre/demos/qgui/media/qgui.window.titlebar.close.png
trunk/python-ogre/demos/qgui/media/qgui.window.titlebar.png
trunk/python-ogre/demos/qgui/media/skins/
trunk/python-ogre/demos/qgui/media/skins/qgui/
trunk/python-ogre/demos/qgui/media/skins/qgui_demo/
trunk/python-ogre/demos/qgui/media/test.material
trunk/python-ogre/demos/qgui/media/tiledbackground_55.png
trunk/python-ogre/demos/qgui/media/tiledbackground_75.png
Removed Paths:
-------------
trunk/python-ogre/demos/qgui/media/fonts/
trunk/python-ogre/demos/qgui/media/materials/
trunk/python-ogre/demos/qgui/media/models/
trunk/python-ogre/demos/qgui/media/packs/
trunk/python-ogre/demos/qgui/media/skins/
Added: trunk/python-ogre/demos/qgui/media/Button.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/Button.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Button.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,336 @@
+SkinClass Button
+{
+ SkinType default
+ {
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.button.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.button.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.button.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+ SkinType default.close
+ {
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.window.titlebar.close.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.window.titlebar.close.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.window.titlebar.close.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+ SkinType default.vscrollup
+ {
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.vertical.top.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.vertical.top.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.vertical.top.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+ SkinType default.vscrolldown
+ {
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.vertical.bottom.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.vertical.bottom.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.vertical.bottom.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+ SkinType default.vslider
+ {
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.vertical.slider.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.vertical.slider.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.vertical.slider.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+ SkinType default.hscrollleft
+ {
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.horizontal.left.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.horizontal.left.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.horizontal.left.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+ SkinType default.hscrollright
+ {
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.horizontal.right.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.horizontal.right.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.horizontal.right.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+ SkinType default.hslider
+ {
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.horizontal.slider.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.horizontal.slider.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.scrollbar.horizontal.slider.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+ SkinType default.comboboxdropdown
+ {
+ SkinElement default
+ {
+ Border_Bottom 1
+ Border_Left 1
+ Border_Right 1
+ Border_Top 1
+ Texture qgui.combobox.button.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 1
+ Border_Left 1
+ Border_Right 1
+ Border_Top 1
+ Texture qgui.combobox.button.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 1
+ Border_Left 1
+ Border_Right 1
+ Border_Top 1
+ Texture qgui.combobox.button.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/CheckBox.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/CheckBox.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/CheckBox.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,72 @@
+SkinClass CheckBox
+{
+ SkinType default
+ {
+ SkinElement checked
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.checkbox.x-ed.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement checked_down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.checkbox.x-ed.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement checked_over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.checkbox.x-ed.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement unchecked
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.checkbox.unchecked.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement unchecked_down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.checkbox.unchecked.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement unchecked_over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.checkbox.unchecked.over.png
+ TileBackground false
+ TileBorders true
+ }
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/ComboBox.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/ComboBox.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/ComboBox.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,52 @@
+SkinClass ComboBox
+{
+ SkinType default
+ {
+ ComponentType dropdownbutton
+ {
+ ClassName Button
+ SkinType default.comboboxdropdown
+ }
+
+ ComponentType dropdownmenupanel
+ {
+ ClassName MenuPanel
+ SkinType default.dropdownlist
+ }
+
+ SkinElement default
+ {
+ Border_Bottom 1
+ Border_Left 1
+ Border_Right 1
+ Border_Top 1
+ Texture qgui.combobox.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 1
+ Border_Left 1
+ Border_Right 1
+ Border_Top 1
+ Texture qgui.combobox.down.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 1
+ Border_Left 1
+ Border_Right 1
+ Border_Top 1
+ Texture qgui.combobox.over.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/Console.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/Console.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Console.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,30 @@
+SkinClass Console
+{
+ SkinType default
+ {
+ SkinElement background
+ {
+ Border_Bottom 5
+ Border_Left 5
+ Border_Right 5
+ Border_Top 5
+ Texture qgui.panel.png
+ TileBackground true
+ TileBorders false
+ }
+
+ ComponentType textbox
+ {
+ ClassName TextBox
+ SkinType default
+ }
+
+ ComponentType textarea
+ {
+ ClassName TextArea
+ SkinType default
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/Example.material
===================================================================
--- trunk/python-ogre/demos/qgui/media/Example.material (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Example.material 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,31 @@
+
+material Examples/OgreLogo
+{
+ technique
+ {
+ pass
+ {
+ ambient 0.8 0.8 0.8
+
+ texture_unit
+ {
+ texture ogrelogo.png
+ }
+ }
+ }
+}
+
+material Examples/Ninja
+{
+ technique
+ {
+ pass
+ {
+
+ texture_unit
+ {
+ texture nskingr.jpg
+ }
+ }
+ }
+}
Added: trunk/python-ogre/demos/qgui/media/HScrollBar.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/HScrollBar.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/HScrollBar.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,47 @@
+SkinClass HScrollBar
+{
+ SkinType default
+ {
+ ComponentType left1
+ {
+ ClassName Button
+ SkinType default.hscrollleft
+ }
+
+ ComponentType left2
+ {
+ ClassName Button
+ SkinType default.hscrollleft
+ }
+
+ ComponentType right1
+ {
+ ClassName Button
+ SkinType default.hscrollright
+ }
+
+ ComponentType right2
+ {
+ ClassName Button
+ SkinType default.hscrollright
+ }
+
+ ComponentType slider
+ {
+ ClassName Button
+ SkinType default.hslider
+ }
+
+ SkinElement bar
+ {
+ Border_Bottom 1
+ Border_Left 1
+ Border_Right 1
+ Border_Top 1
+ Texture qgui.scrollbar.horizontal.png
+ TileBackground false
+ TileBorders true
+ }
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/Image.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/Image.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Image.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,10 @@
+SkinClass Image
+{
+ SkinType default
+ {
+ SkinElement background
+ {
+ }
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/Label.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/Label.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Label.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,17 @@
+SkinClass Label
+{
+ SkinType default
+ {
+ SkinElement background
+ {
+ Border_Bottom 1
+ Border_Left 1
+ Border_Right 1
+ Border_Top 1
+ Texture qgui.label.png
+ TileBackground false
+ TileBorders true
+ }
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/List.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/List.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/List.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,30 @@
+SkinClass List
+{
+ SkinType default
+ {
+ ComponentType hscrollbar
+ {
+ ClassName HScrollBar
+ SkinType default
+ }
+
+ ComponentType vscrollbar
+ {
+ ClassName VScrollBar
+ SkinType default
+ }
+
+ SkinElement background
+ {
+ Border_Bottom 10
+ Border_Left 10
+ Border_Right 10
+ Border_Top 10
+ Texture qgui.panel.png
+ TileBackground true
+ TileBorders false
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/ListTextItem.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/ListTextItem.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/ListTextItem.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,33 @@
+SkinClass ListTextItem
+{
+ SkinType default
+ {
+ SkinElement default
+ {
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.toolbar.highlight.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement selected
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.toolbar.background.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/Menu.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/Menu.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Menu.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,46 @@
+SkinClass Menu
+{
+ SkinType default
+ {
+ ComponentType menupanel
+ {
+ ClassName MenuPanel
+ SkinType default
+ }
+
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.toolbar.background.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.toolbar.background.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.toolbar.highlight.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/MenuLabel.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/MenuLabel.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/MenuLabel.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,40 @@
+SkinClass MenuLabel
+{
+ SkinType default
+ {
+ SkinElement default
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.toolbar.background.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement down
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.toolbar.background.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement over
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.toolbar.highlight.png
+ TileBackground false
+ TileBorders true
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/MenuPanel.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/MenuPanel.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/MenuPanel.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,57 @@
+SkinClass MenuPanel
+{
+ SkinType default
+ {
+ ComponentType hscrollbar
+ {
+ ClassName HScrollBar
+ SkinType default
+ }
+
+ ComponentType vscrollbar
+ {
+ ClassName VScrollBar
+ SkinType default
+ }
+
+ SkinElement background
+ {
+ Border_Bottom 10
+ Border_Left 10
+ Border_Right 10
+ Border_Top 10
+ Texture qgui.window.png
+ TileBackground true
+ TileBorders true
+ }
+
+ }
+
+ SkinType default.dropdownlist
+ {
+ ComponentType hscrollbar
+ {
+ ClassName HScrollBar
+ SkinType default
+ }
+
+ ComponentType vscrollbar
+ {
+ ClassName VScrollBar
+ SkinType default
+ }
+
+ SkinElement background
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.combobox.list.png
+ TileBackground true
+ TileBorders true
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/ModalWindow .skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/ModalWindow .skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/ModalWindow .skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,36 @@
+SkinClass ModalWindow
+{
+ SkinType default
+ {
+ ComponentType hscrollbar
+ {
+ ClassName HScrollBar
+ SkinType default
+ }
+
+ ComponentType vscrollbar
+ {
+ ClassName VScrollBar
+ SkinType default
+ }
+
+ ComponentType titlebar
+ {
+ ClassName TitleBar
+ SkinType default
+ }
+
+ SkinElement background
+ {
+ Border_Bottom 10
+ Border_Left 10
+ Border_Right 10
+ Border_Top 10
+ Texture qgui.window.png
+ TileBackground true
+ TileBorders true
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/MouseCursor.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/MouseCursor.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/MouseCursor.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,108 @@
+SkinClass MouseCursor
+{
+ SkinType default
+ {
+ SkinElement texture
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.cursor.png
+ TileBackground false
+ TileBorders false
+ }
+
+ }
+
+ SkinType hresize
+ {
+ SkinElement texture
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.cursor.resize.leftright.png
+ TileBackground false
+ TileBorders false
+ }
+
+ }
+
+ SkinType vresize
+ {
+ SkinElement texture
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.cursor.resize.updown.png
+ TileBackground false
+ TileBorders false
+ }
+
+ }
+
+ SkinType diag1resize
+ {
+ SkinElement texture
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.cursor.resize.diagonal1.png
+ TileBackground false
+ TileBorders false
+ }
+
+ }
+
+ SkinType diag2resize
+ {
+ SkinElement texture
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.cursor.resize.diagonal2.png
+ TileBackground false
+ TileBorders false
+ }
+
+ }
+
+ SkinType grabable
+ {
+ SkinElement texture
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.cursor.grabable.png
+ TileBackground false
+ TileBorders false
+ }
+
+ }
+
+ SkinType grabbed
+ {
+ SkinElement texture
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.cursor.grabbed.png
+ TileBackground false
+ TileBorders false
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/Panel.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/Panel.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Panel.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,30 @@
+SkinClass Panel
+{
+ SkinType default
+ {
+ ComponentType hscrollbar
+ {
+ ClassName HScrollBar
+ SkinType default
+ }
+
+ ComponentType vscrollbar
+ {
+ ClassName VScrollBar
+ SkinType default
+ }
+
+ SkinElement background
+ {
+ Border_Bottom 10
+ Border_Left 10
+ Border_Right 10
+ Border_Top 10
+ Texture qgui.panel.png
+ TileBackground true
+ TileBorders false
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/ProgressBar.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/ProgressBar.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/ProgressBar.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,40 @@
+SkinClass ProgressBar
+{
+ SkinType default
+ {
+ SkinElement background
+ {
+ Border_Bottom 2
+ Border_Left 2
+ Border_Right 2
+ Border_Top 2
+ Texture qgui.progressbar1.background.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement bar
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.progressbar1.bar.png
+ TileBackground false
+ TileBorders false
+ }
+
+ SkinElement clipmap
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.progressbar1.clipbox.png
+ TileBackground false
+ TileBorders false
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/Sheet.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/Sheet.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Sheet.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,23 @@
+SkinClass Sheet
+{
+ SkinType default
+ {
+ ComponentType hscrollbar
+ {
+ ClassName HScrollBar
+ SkinType default
+ }
+
+ ComponentType vscrollbar
+ {
+ ClassName VScrollBar
+ SkinType default
+ }
+
+ SkinElement background
+ {
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/Tab.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/Tab.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Tab.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,28 @@
+SkinClass Tab
+{
+ SkinType default
+ {
+ SkinElement front
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.tab.front.png
+ TileBackground false
+ TileBorders true
+ }
+
+ SkinElement main
+ {
+ Border_Bottom 0
+ Border_Left 0
+ Border_Right 0
+ Border_Top 0
+ Texture qgui.tab.main.png
+ TileBackground false
+ TileBorders true
+ }
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/TabControl.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/TabControl.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/TabControl.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,18 @@
+SkinClass TabControl
+{
+ SkinType default
+ {
+ SkinElement background
+ {
+ Border_Bottom 10
+ Border_Left 10
+ Border_Right 10
+ Border_Top 10
+ Texture qgui.panel.png
+ TileBackground true
+ TileBorders false
+ }
+
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/TabPage.skinTypes
===================================================================
--- trunk/python-ogre/demos/qgui/media/TabPage.skinTypes (rev 0)
+++ trunk/python-ogre/demos/qgui/media/TabPage.skinTypes 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,36 @@
+SkinClass TabPage
+{
+ SkinType default
+ {
+ ComponentType tab
+ {
+ ClassName Tab
+ SkinType default
+ }
+
+ ComponentType tab_disabled
+ {
+ ClassName Tab
+ SkinType default
+ }
+
+ ComponentType tab_over
+ {
+ ClassName Tab
+ SkinType default
+ }
+
+ ComponentType tab_selected
+ {
+ ClassName Tab
+ SkinType default
+ }
+
+ ComponentType page
+ {
+ ClassName Panel
+ SkinType default
+ }
+ }
+
+}
Added: trunk/python-ogre/demos/qgui/media/Test.sheet
===================================================================
--- trunk/python-ogre/demos/qgui/media/Test.sheet (rev 0)
+++ trunk/python-ogre/demos/qgui/media/Test.sheet 2009-01-25 12:32:37 UTC (rev 849)
@@ -0,0 +1,1405 @@
+Sheet DefaultSheet
+{
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ConsumeKeyboardEvents false
+ Dimensions 0 0 800 600
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT_RIGHT
+ HorzBarScrollPercent 0.2
+ HorzButtonScrollPercent 0.1
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarThickness 15
+ Scrollable true
+ SkinType default
+ SupportScrolling false
+ TransparencyPicking true
+ VertBarScrollPercent 0.2
+ VertButtonScrollPercent 0.1
+ VerticalAnchor ANCHOR_VERTICAL_TOP_BOTTOM
+ Visible true
+ XScrollOffset 0
+ YScrollOffset 0
+
+ Child Windows
+ {
+ Window Window1
+ {
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ConsumeKeyboardEvents false
+ Dimensions 550 50 225 200
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HorizontalTextAlignment TEXT_ALIGNMENT_HORIZONTAL_LEFT
+ HorzBarScrollPercent 0.2
+ HorzButtonScrollPercent 0.1
+ HoverTime 3
+ MaxSize 300 300
+ MinSize 50 50
+ Resizable true
+ ScrollBarThickness 15
+ Scrollable true
+ SkinType default
+ SupportScrolling true
+ TextBrushFilterMode BRUSHFILTER_LINEAR
+ TitleBar true
+ TitleBarCloseButton true
+ TitleBarCloseButtonPadding 2
+ TitleBarDragable true
+ TitleBarSkinType default
+ TitlebarVerticalTextAlignment TEXT_ALIGNMENT_VERTICAL_CENTER
+ TransparencyPicking true
+ VertBarScrollPercent 0.2
+ VertButtonScrollPercent 0.1
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ VerticalLineSpacing 2
+ Visible true
+ XScrollOffset 0
+ YScrollOffset 0
+
+ Child widgets
+ {
+ HScrollBar TestHSD1
+ {
+ BarScrollPercent 0.2
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ButtonScrollPercent 0.1
+ ConsumeKeyboardEvents false
+ Dimensions 50 160 100 15
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarButtonLayout HSCROLL_BAR_BUTTON_LAYOUT_OPPOSITE
+ Scrollable true
+ SkinType default
+ SliderPercentage 0
+ SliderWidth 15
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ Visible true
+ }
+
+ VScrollBar TestVSD1
+ {
+ BarScrollPercent 0.2
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ButtonScrollPercent 0.1
+ ConsumeKeyboardEvents false
+ Dimensions 50 50 15 100
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarButtonLayout VSCROLL_BAR_BUTTON_LAYOUT_OPPOSITE
+ Scrollable true
+ SkinType default
+ SliderHeight 15
+ SliderPercentage 0
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ Visible true
+ }
+
+ VScrollBar TestVSD2
+ {
+ BarScrollPercent 0.2
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ButtonScrollPercent 0.1
+ ConsumeKeyboardEvents false
+ Dimensions 70 50 15 100
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarButtonLayout VSCROLL_BAR_BUTTON_LAYOUT_ADJACENT_UP
+ Scrollable true
+ SkinType default
+ SliderHeight 15
+ SliderPercentage 0
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ Visible true
+ }
+
+ VScrollBar TestVSD3
+ {
+ BarScrollPercent 0.2
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ButtonScrollPercent 0.1
+ ConsumeKeyboardEvents false
+ Dimensions 90 50 15 100
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarButtonLayout VSCROLL_BAR_BUTTON_LAYOUT_ADJACENT_DOWN
+ Scrollable true
+ SkinType default
+ SliderHeight 15
+ SliderPercentage 0
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ Visible true
+ }
+
+ VScrollBar TestVSD4
+ {
+ BarScrollPercent 0.2
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ButtonScrollPercent 0.1
+ ConsumeKeyboardEvents false
+ Dimensions 110 50 15 100
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarButtonLayout VSCROLL_BAR_BUTTON_LAYOUT_MULTIPLE_BOTH
+ Scrollable true
+ SkinType default
+ SliderHeight 15
+ SliderPercentage 0
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ Visible true
+ }
+
+ VScrollBar TestVSD5
+ {
+ BarScrollPercent 0.2
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ButtonScrollPercent 0.1
+ ConsumeKeyboardEvents false
+ Dimensions 130 50 15 100
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarButtonLayout VSCROLL_BAR_BUTTON_LAYOUT_MULTIPLE_DOWN
+ Scrollable true
+ SkinType default
+ SliderHeight 15
+ SliderPercentage 0
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ Visible true
+ }
+
+ VScrollBar TestVSD6
+ {
+ BarScrollPercent 0.2
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ButtonScrollPercent 0.1
+ ConsumeKeyboardEvents false
+ Dimensions 150 50 15 100
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarButtonLayout VSCROLL_BAR_BUTTON_LAYOUT_MULTIPLE_UP
+ Scrollable true
+ SkinType default
+ SliderHeight 15
+ SliderPercentage 0
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ Visible true
+ }
+
+ VScrollBar TestVSD7
+ {
+ BarScrollPercent 0.2
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ButtonScrollPercent 0.1
+ ConsumeKeyboardEvents false
+ Dimensions 170 50 15 100
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarButtonLayout VSCROLL_BAR_BUTTON_LAYOUT_NONE
+ Scrollable true
+ SkinType default
+ SliderHeight 15
+ SliderPercentage 0
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ Visible true
+ }
+
+ }
+
+ Text segments
+ {
+ Segment0 micross.12 1 1 0 0 Test
+ }
+
+ }
+
+ }
+
+ Child widgets
+ {
+ Button Minus
+ {
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ConsumeKeyboardEvents false
+ Dimensions 100 440 100 35
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HorizontalTextAlignment TEXT_ALIGNMENT_HORIZONTAL_CENTER
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ Scrollable true
+ SkinType default
+ TextBrushFilterMode BRUSHFILTER_LINEAR
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ VerticalLineSpacing 2
+ VerticalTextAlignment TEXT_ALIGNMENT_VERTICAL_CENTER
+ Visible true
+
+ Text segments
+ {
+ Segment0 micross.12 1 0 1 0 Minus
+ }
+
+ }
+
+ Button Plus
+ {
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ConsumeKeyboardEvents false
+ Dimensions 200 440 100 35
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HorizontalTextAlignment TEXT_ALIGNMENT_HORIZONTAL_CENTER
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ Scrollable true
+ SkinType default
+ TextBrushFilterMode BRUSHFILTER_LINEAR
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ VerticalLineSpacing 2
+ VerticalTextAlignment TEXT_ALIGNMENT_VERTICAL_CENTER
+ Visible true
+
+ Text segments
+ {
+ Segment0 micross.12 1 0 1 0 Plus
+ }
+
+ }
+
+ CheckBox TestCheckBox
+ {
+ BrushFilterMode BRUSHFILTER_LINEAR
+ Checked false
+ ConsumeKeyboardEvents false
+ Dimensions 50 550 25 25
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HoverTime 3
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ Scrollable true
+ SkinType default
+ TransparencyPicking true
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ Visible true
+ }
+
+ ComboBox ComboBox96
+ {
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ConsumeKeyboardEvents false
+ Dimensions 400 100 125 20
+ DisabledSkinType
+ Dragable false
+ DropDownButton true
+ DropDownMaxHeight 60
+ DropDownWidth 125
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HorizontalTextAlignment TEXT_ALIGNMENT_HORIZONTAL_LEFT
+ HorzBarScrollPercent 0.2
+ HorzButtonScrollPercent 0.1
+ HoverTime 3
+ ItemHeight 25
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarThickness 15
+ Scrollable true
+ SkinType default
+ SupportScrolling false
+ TextBrushFilterMode BRUSHFILTER_LINEAR
+ TransparencyPicking true
+ VertBarScrollPercent 0.2
+ VertButtonScrollPercent 0.1
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ VerticalLineSpacing 2
+ VerticalTextAlignment TEXT_ALIGNMENT_VERTICAL_CENTER
+ Visible true
+ XScrollOffset 0
+ YScrollOffset 0
+
+ Child widgets
+ {
+ ListTextItem ComboBox960
+ {
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ConsumeKeyboardEvents false
+ Dimensions 0 0 106 25
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HorizontalTextAlignment TEXT_ALIGNMENT_HORIZONTAL_CENTER
+ HorzBarScrollPercent 0.2
+ HorzButtonScrollPercent 0.1
+ HoverTime 3
+ Index 0
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarThickness 15
+ Scrollable true
+ Selected false
+ SkinType default
+ SupportScrolling false
+ TextBrushFilterMode BRUSHFILTER_LINEAR
+ TransparencyPicking false
+ VertBarScrollPercent 0.2
+ VertButtonScrollPercent 0.1
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ VerticalLineSpacing 2
+ VerticalTextAlignment TEXT_ALIGNMENT_VERTICAL_CENTER
+ Visible true
+ XScrollOffset 0
+ YScrollOffset 0
+
+ Child widgets
+ {
+ }
+
+ Text segments
+ {
+ Segment0 micross.12 1 1 1 1 CB Item 1
+ }
+
+ }
+
+ ListTextItem ComboBox961
+ {
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ConsumeKeyboardEvents false
+ Dimensions 0 25 106 25
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HorizontalTextAlignment TEXT_ALIGNMENT_HORIZONTAL_CENTER
+ HorzBarScrollPercent 0.2
+ HorzButtonScrollPercent 0.1
+ HoverTime 3
+ Index 1
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarThickness 15
+ Scrollable true
+ Selected false
+ SkinType default
+ SupportScrolling false
+ TextBrushFilterMode BRUSHFILTER_LINEAR
+ TransparencyPicking false
+ VertBarScrollPercent 0.2
+ VertButtonScrollPercent 0.1
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ VerticalLineSpacing 2
+ VerticalTextAlignment TEXT_ALIGNMENT_VERTICAL_CENTER
+ Visible true
+ XScrollOffset 0
+ YScrollOffset 0
+
+ Child widgets
+ {
+ }
+
+ Text segments
+ {
+ Segment0 micross.12 1 1 1 1 CB Item 2
+ }
+
+ }
+
+ ListTextItem ComboBox962
+ {
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ConsumeKeyboardEvents false
+ Dimensions 0 50 106 25
+ DisabledSkinType
+ Dragable false
+ Enabled true
+ HorizontalAnchor ANCHOR_HORIZONTAL_LEFT
+ HorizontalTextAlignment TEXT_ALIGNMENT_HORIZONTAL_CENTER
+ HorzBarScrollPercent 0.2
+ HorzButtonScrollPercent 0.1
+ HoverTime 3
+ Index 2
+ MaxSize 0 0
+ MinSize 0 0
+ Resizable false
+ ScrollBarThickness 15
+ Scrollable true
+ Selected false
+ SkinType default
+ SupportScrolling false
+ TextBrushFilterMode BRUSHFILTER_LINEAR
+ TransparencyPicking false
+ VertBarScrollPercent 0.2
+ VertButtonScrollPercent 0.1
+ VerticalAnchor ANCHOR_VERTICAL_TOP
+ VerticalLineSpacing 2
+ VerticalTextAlignment TEXT_ALIGNMENT_VERTICAL_CENTER
+ Visible true
+ XScrollOffset 0
+ YScrollOffset 0
+
+ Child widgets
+ {
+ }
+
+ Text segments
+ {
+ Segment0 micross.12 1 1 1 1 CB Item 3
+ }
+
+ }
+
+ }
+
+ Text segments
+ {
+ Segment0 micross.12 0 0 0 0
+ }
+
+ }
+
+ List TestList
+ {
+ BrushFilterMode BRUSHFILTER_LINEAR
+ ConsumeKeyboardEvents false
+ Dimensions 375 500 200 100
+ ...
[truncated message content] |
|
From: <and...@us...> - 2009-01-25 12:22:24
|
Revision: 847
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=847&view=rev
Author: andy_miller
Date: 2009-01-25 11:35:21 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Further QuickGui updates
Fixes to OgreBulletD generation due to newer C++ source
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
trunk/python-ogre/code_generators/navi/generate_code.py
trunk/python-ogre/code_generators/navi/python_navi_aliases.h
trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/UpdateDLLs.bat
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -5,22 +5,22 @@
## lets assume that the base development directory is one level higher
BASE_DIR,ignore = os.path.split(module_dir) ## r'/home/andy/development'
-FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac
-MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon'
-MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
-MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
+
+SDK = False
+
+
# the base of the /usr/... dircetory structure that we are using
ROOT_DIR = os.path.join(BASE_DIR,'root')
LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')
LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
-PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_36')
+PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_37')
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = LOCAL_LIB
## and the name of the boost python library
-LIB_Boost = 'libboost_python-gcc42-mt-1_36'
+LIB_Boost = 'libboost_python-gcc42-mt-1_37'
# in Linux we need to code in the Relative path for the library
RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\''
@@ -31,16 +31,22 @@
# and the Py++ directory as sometimes we need access to the code repository there
pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
-SDK = False
+
if os.sys.platform == 'darwin': # we use the pre built sdk for OSX
- SDK = True
+ SDK = True
+ FRAMEWORK_DIR = os.path.abspath(os.path.join(BASE_DIR, '..', 'Library','Frameworks')) ## need this for the Mac
+ MAC_SDK_INCLUDE= '/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/CFMCarbon'
+ MAC_CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19 -D_POSIX_C_SOURCE -DCF_OPEN_SOURCE'
+ MAC_cflags = ' --gccxml-cxxflags "-DCF_OPEN_SOURCE -D_POSIX_C_SOURCE -isysroot /Developer/SDKs/MacOSX10.4u.sdk"'
+
+
# # ## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR,'ogre')
PATH_OgreAddons = os.path.join(BASE_DIR, 'ogreaddons')
-PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.1' )
-PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
+PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.2' )
+PATH_OIS = os.path.join(BASE_DIR, 'ois')
if SDK:
PATH_CEGUI = os.path.join(BASE_DIR, 'ogre','Dependencies')
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp 2009-01-25 11:35:21 UTC (rev 847)
@@ -2,7 +2,9 @@
#include "QuickGUIText.h"
namespace QuickGUI
-{
+{
+ Character::Character( ) {} ;
+
Character::Character(Ogre::UTFString::code_point cp, Ogre::FontPtr fp, Ogre::ColourValue cv) :
codePoint(cp),
fontPtr(fp),
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h 2009-01-25 11:35:21 UTC (rev 847)
@@ -56,7 +56,7 @@
/// UV coords of glyph, retreived from Font texture generated by Ogre::Font class.
UVRect uvCoords;
- protected:
+// protected:
Character();
bool mHighlighted;
Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h 2009-01-25 11:35:21 UTC (rev 847)
@@ -31,7 +31,7 @@
public:
template<typename BaseClassType>
friend class Factory;
- protected:
+// protected:
WidgetDesc(const Ogre::String& id);
virtual ~WidgetDesc() {}
public:
@@ -494,7 +494,7 @@
*/
virtual void updateTexturePosition();
- protected:
+// protected:
Widget(const Ogre::String& widget_name);
virtual ~Widget();
Modified: trunk/python-ogre/code_generators/navi/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/navi/generate_code.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -121,8 +121,8 @@
# cls.variable("StaticFunction").exclude()
#
- excludes = ['::NaviLibrary::Singleton<NaviLibrary::NaviMouse>::instance'
- ,'::NaviLibrary::Singleton<NaviLibrary::NaviManager>::instance'
+ excludes = [ # '::NaviLibrary::Singleton<NaviLibrary::NaviMouse>::instance',
+ '::NaviLibrary::Singleton<NaviLibrary::NaviManager>::instance'
]
for e in excludes:
print "Excluding Var", e
Modified: trunk/python-ogre/code_generators/navi/python_navi_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/navi/python_navi_aliases.h 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/navi/python_navi_aliases.h 2009-01-25 11:35:21 UTC (rev 847)
@@ -7,5 +7,5 @@
// typedef NaviLibrary::NaviUtilities::InlineVector<std::string> InlineVectorStrings;
typedef NaviLibrary::NaviUtilities::InlineVector<NaviLibrary::NaviUtilities::MultiValue> InlineVectorArgs;
typedef NaviLibrary::Singleton< NaviLibrary::NaviManager > SingletonManager;
-typedef NaviLibrary::Singleton< NaviLibrary::NaviMouse > SingletonMouse;
-typedef NaviLibrary::FastDelegate1< NaviLibrary::NaviData const&, void > FastDelegateNaviData;
\ No newline at end of file
+// typedef NaviLibrary::Singleton< NaviLibrary::NaviMouse > SingletonMouse;
+// typedef NaviLibrary::FastDelegate1< NaviLibrary::NaviData const&, void > FastDelegateNaviData;
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/ogrebulletd/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/ogrebulletd/generate_code.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -64,6 +64,20 @@
for e in excludes:
print "excluding class", e
global_ns.class_(e).exclude()
+
+ ## these are not yet implemented...
+ excludes = ['::OgreBulletDynamics::RagDoll::rigidityEnable',
+ '::OgreBulletDynamics::RagDoll::ragdollEnable',
+ '::OgreBulletDynamics::RagDoll::isRigidityEnable',
+ '::OgreBulletDynamics::RagDoll::isRagdollEnabled',
+ '::OgreBulletDynamics::RagDoll::isConstraintEnabled',
+ '::OgreBulletDynamics::RagDoll::isCollisionEnabled',
+ '::OgreBulletDynamics::RagDoll::constraintEnable',
+ '::OgreBulletDynamics::RagDoll::collisionEnable'
+ ]
+ for e in excludes:
+ global_ns.member_functions(e).exclude()
+
# for c in global_ns.classes():
# #if not c.ignore:
# print c
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -120,7 +120,9 @@
,'::QuickGUI::Widget::getChildWidget'
,'::QuickGUI::Quad::_update'
,'::QuickGUI::Window::getTitleBarText'
- ,'::QuickGUI::Tab::getPadding'
+ ,'::QuickGUI::Tab::getPadding'
+ ,'::QuickGUI::ComboBox::_clearSelection' ## not implemented
+ ,'::QuickGUI::ComboBox::addComboBoxEventHandler' ## TODO: needs to be wrapped
]
for e in excludes:
print "excluding function", e
Modified: trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h 2009-01-25 11:35:21 UTC (rev 847)
@@ -6,13 +6,12 @@
typedef QuickGUI::Factory<QuickGUI::WidgetDesc> FactoryWidgetDesc;
typedef QuickGUI::WidgetFactory<QuickGUI::Widget> WidgetFactoryWidget;
-// typedef std::list<QuickGUI::DefinitionProperty*> ListDefinitionProperty;
-// typedef std::list<QuickGUI::ListItem*> ListListItem;
-// typedef std::list<QuickGUI::ScriptDefinition*> ListScriptDefinition;
-// typedef std::vector<QuickGUI::TextSegment> VectorTextSegment;
+typedef std::list<QuickGUI::DefinitionProperty*> ListDefinitionProperty;
+typedef std::list<QuickGUI::ListItem*> ListListItem;
+typedef std::list<QuickGUI::ScriptDefinition*> ListScriptDefinition;
+typedef std::vector<QuickGUI::TextSegment> VectorTextSegment;
-
//typedef std::vector<Ogre::Image> VectorImage;
//typedef std::list<QuickGUI::RenderObject*, std::allocator<QuickGUI::RenderObject*> > ListRenderObject;
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/environment.py 2009-01-25 11:35:21 UTC (rev 847)
@@ -1111,15 +1111,15 @@
include_dirs = [ Config.PATH_Boost
,Config.PATH_INCLUDE_Ogre
,Config.PATH_INCLUDE_navi
- ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','astral','include')
+ ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','include')
]
lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain
,Config.PATH_LIB_navi
- ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','astral','lib')
+ ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','awesomium','lib')
]
CheckIncludes=[]
- libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Astral', 'user32',
+ libs=[ boost.lib, 'Navi_DLL', 'OgreMain','Awesomium', 'user32',
'kernel32.lib', 'gdi32.lib', 'winspool.lib', 'comdlg32.lib', 'advapi32.lib',
'shell32.lib','ole32.lib','oleaut32.lib','uuid.lib' ]
ModuleName="navi"
Modified: trunk/python-ogre/scripts/UpdateDLLs.bat
===================================================================
--- trunk/python-ogre/scripts/UpdateDLLs.bat 2009-01-25 10:08:11 UTC (rev 846)
+++ trunk/python-ogre/scripts/UpdateDLLs.bat 2009-01-25 11:35:21 UTC (rev 847)
@@ -22,8 +22,8 @@
set physx="c:\program files\NVIDIA Corporation\NVIDIA PhysX SDK\v2.8.1\bin\win32"
set theora=%root%\ogreaddons\videoplugin\TheoraVideo\bin\Release
set ffmpeg=%root%\ffmpeg
-set naviextra=%root%\navi\Dependencies\win32\astral\runtime\Release
-set navi=%root%\navi\lib
+set naviextra=%root%\navi\Dependencies\win32\awesomium\bin\release
+set navi=%root%\navi\navi\lib
set boost=%root%\boost_1_37_0\bin.v2\libs\python\build\msvc-9.0\release\threading-multi
set boostlib=%boost%\boost_python-vc90-mt-1_37.dll
set particleuniverse=%root%\ogre\lib
@@ -99,6 +99,8 @@
rem navi
copy /y %navi%\*.dll %package%\gui\navi
+copy /y %naviextra%\*.dll %package%\gui\navi
+
rem plib
copy /y %boostlib% %package%\addons\plib
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-25 10:08:17
|
Revision: 846
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=846&view=rev
Author: andy_miller
Date: 2009-01-25 10:08:11 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Updated to latest QuickGui
Needed to add GIMPACT library to OgreBullet build
Update to latest OgreBullet
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
trunk/python-ogre/ThirdParty/forests/ImpostorPage.h
trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp
trunk/python-ogre/ThirdParty/forests/PagedGeometry.h
trunk/python-ogre/ThirdParty/forests/TreeLoader2D.cpp
trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
trunk/python-ogre/ThirdParty/forests/TreeLoader3D.cpp
trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugDrawer.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugLines.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisions.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObject.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObject.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPreRequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsPrecompiled.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsRay.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/OgreBulletCollisionsWorld.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsBoxShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCompoundShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConeShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsConvexHullShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsCylinderShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMinkowskiSumShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsMultiSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsSphereShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsStaticPlaneShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTriangleShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Shapes/OgreBulletCollisionsTrimeshShape.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletCollisionsMeshToShapeConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Utils/OgreBulletConverter.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamics6DofConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsConeTwistConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsHingeConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsPoint2pointConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/Constraints/OgreBulletDynamicsRaycastVehicle.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamics.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsConstraint.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsConstraint.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsObjectState.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsObjectState.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPreRequisites.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsPrecompiled.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRigidBody.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsRigidBody.h
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.cpp
trunk/python-ogre/ThirdParty/ogrebullet/Dynamics/OgreBulletDynamicsWorld.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBaseDesc.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBrush.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIBrush.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIButton.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICharacter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUICheckBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComponentWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComponentWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsole.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIContainerWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIContainerWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIEventTypes.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIException.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIExportDLL.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIForwardDeclaredDesc.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIHScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIImage.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUILabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIList.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIListTextItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenu.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuLabel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMenuPanel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIModalWindow.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIModalWindow.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIMouseCursor.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPanel.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPoint.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIPoint.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIProgressBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRoot.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIRoot.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptDefinition.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptDefinition.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptReader.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptReader.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptWriter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIScriptWriter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialBase.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialReader.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISerialWriter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheet.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISize.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISize.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinDefinitionManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinDefinitionManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinElement.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinType.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinTypeManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISkinTypeManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIStringConverter.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITab.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITab.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITabControl.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITabControl.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITabPage.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITabPage.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIText.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextArea.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextCursor.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextCursor.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextLine.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITextLine.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimer.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimer.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimerManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITimerManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITitleBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBarItem.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIToolBarItem.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVScrollBar.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIVScrollBar.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidget.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWindow.h
trunk/python-ogre/code_generators/ogreforests/python_forests_sizeof.h
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
trunk/python-ogre/code_generators/quickgui/python_quickgui_sizeof.h
trunk/python-ogre/environment.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIComboBox.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsoleEnums.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIConsoleInputHandler.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIFactory.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIFactoryManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIFactoryManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheetManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUISheetManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeView.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUITreeView.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetFactory.h
Removed Paths:
-------------
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetDescFactoryManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetDescFactoryManager.h
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetFactoryManager.cpp
trunk/python-ogre/ThirdParty/quickgui/QuickGUIWidgetFactoryManager.h
Modified: trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/BatchedGeometry.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -32,8 +32,14 @@
#include <OgreHardwareBuffer.h>
#include <OgreMaterialManager.h>
#include <OgreMaterial.h>
+#include <string>
using namespace Ogre;
+#ifndef max
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
+
namespace Forests {
//-------------------------------------------------------------------------------------
@@ -350,7 +356,7 @@
//Calculate camera distance
Vector3 camVec = _convertToLocal(cam->getDerivedPosition()) - center;
Real centerDistanceSquared = camVec.squaredLength();
- minDistanceSquared = std::max(0.0f, centerDistanceSquared - (radius * radius));
+ minDistanceSquared = max(0.0f, centerDistanceSquared - (radius * radius));
//Note: centerDistanceSquared measures the distance between the camera and the center of the GeomBatch,
//while minDistanceSquared measures the closest distance between the camera and the closest edge of the
//geometry's bounding sphere.
@@ -380,7 +386,7 @@
// Material must always exist
Material *origMat = ((MaterialPtr)MaterialManager::getSingleton().getByName(ent->getMaterialName())).getPointer();
if (origMat) {
- material = MaterialManager::getSingleton().getByName(getMaterialClone(*origMat)->getName());
+ material = MaterialManager::getSingleton().getByName(getMaterialClone(*origMat)->getName());
} else {
MaterialManager::ResourceCreateOrRetrieveResult result = MaterialManager::getSingleton().createOrRetrieve("PagedGeometry_Batched_Material", "General");
if (result.first.isNull()) {
@@ -762,7 +768,7 @@
if (built){
//Update material technique based on camera distance
assert(!material.isNull());
- bestTechnique = material->getBestTechnique(material->getLodIndexSquaredDepth(parent->minDistanceSquared));
+ bestTechnique = material->getBestTechnique(material->getLodIndex(parent->minDistanceSquared * parent->minDistanceSquared));
//Add to render queue
queue->addRenderable(this, group);
Modified: trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/ImpostorPage.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -50,6 +50,7 @@
//Set up a single instance of a scene node which will be used when rendering impostor textures
geom->getSceneNode()->createChildSceneNode("ImpostorPage::renderNode");
geom->getSceneNode()->createChildSceneNode("ImpostorPage::cameraNode");
+ ResourceGroupManager::getSingleton().createResourceGroup("Impostors");
}
}
@@ -65,6 +66,7 @@
if (--selfInstances == 0){
sceneMgr->destroySceneNode("ImpostorPage::renderNode");
sceneMgr->destroySceneNode("ImpostorPage::cameraNode");
+ ResourceGroupManager::getSingleton().destroyResourceGroup("Impostors");
}
}
@@ -251,20 +253,29 @@
void ImpostorBatch::setAngle(float pitchDeg, float yawDeg)
{
//Calculate pitch material index
- Ogre::uint16 newPitchIndex;
- if (pitchDeg > 0){
- newPitchIndex = static_cast<Ogre::uint16>(IMPOSTOR_PITCH_ANGLES * (pitchDeg / 67.5f));
+ int newPitchIndex;
+#ifdef IMPOSTOR_RENDER_ABOVE_ONLY
+ if (pitchDeg > 0) {
+ float maxPitchIndexDeg = (90.0f * (IMPOSTOR_PITCH_ANGLES-1)) / IMPOSTOR_PITCH_ANGLES;
+ newPitchIndex = (int)(IMPOSTOR_PITCH_ANGLES * (pitchDeg / maxPitchIndexDeg));
if (newPitchIndex > IMPOSTOR_PITCH_ANGLES-1) newPitchIndex = IMPOSTOR_PITCH_ANGLES-1;
} else {
newPitchIndex = 0;
}
+#else
+ float minPitchIndexDeg = -90.0f;
+ float maxPitchIndexDeg = ((180.0f * (IMPOSTOR_PITCH_ANGLES-1)) / IMPOSTOR_PITCH_ANGLES) - 90.0f;
+ newPitchIndex = (int)(IMPOSTOR_PITCH_ANGLES * ((pitchDeg - minPitchIndexDeg) / (maxPitchIndexDeg - minPitchIndexDeg)));
+ if (newPitchIndex > IMPOSTOR_PITCH_ANGLES-1) newPitchIndex = IMPOSTOR_PITCH_ANGLES-1;
+ if (newPitchIndex < 0) newPitchIndex = 0;
+#endif
//Calculate yaw material index
- Ogre::uint16 newYawIndex;
- if (yawDeg > 0){
- newYawIndex = static_cast<Ogre::uint16>(IMPOSTOR_YAW_ANGLES * (yawDeg / 360.0f) + 0.5f) % IMPOSTOR_YAW_ANGLES;
+ int newYawIndex;
+ if (yawDeg > 0) {
+ newYawIndex = (int)(IMPOSTOR_YAW_ANGLES * (yawDeg / 360.0f) + 0.5f) % IMPOSTOR_YAW_ANGLES;
} else {
- newYawIndex = static_cast<Ogre::uint16>(IMPOSTOR_YAW_ANGLES + IMPOSTOR_YAW_ANGLES * (yawDeg / 360.0f) + 0.5f) % IMPOSTOR_YAW_ANGLES;
+ newYawIndex = (int)(IMPOSTOR_YAW_ANGLES + IMPOSTOR_YAW_ANGLES * (yawDeg / 360.0f) + 0.5f) % IMPOSTOR_YAW_ANGLES;
}
//Change materials if necessary
@@ -292,6 +303,10 @@
for (uint32 i = 0; i < entity->getNumSubEntities(); ++i){
entityKey << "-" << entity->getSubEntity(i)->getMaterialName();
}
+ entityKey << "-" << IMPOSTOR_YAW_ANGLES << "_" << IMPOSTOR_PITCH_ANGLES;
+#ifdef IMPOSTOR_RENDER_ABOVE_ONLY
+ entityKey << "_RAO";
+#endif
return entityKey.str();
}
@@ -381,7 +396,6 @@
Material *m = material[i][o].getPointer();
Pass *p = m->getTechnique(0)->getPass(0);
-// int x = p->getNumTextureUnitStates();
TextureUnitState *t = p->getTextureUnitState(0);
t->setTextureName(texture->getName());
@@ -437,7 +451,7 @@
void ImpostorTexture::renderTextures(bool force)
{
-#if IMPOSTOR_FILE_SAVE
+#ifdef IMPOSTOR_FILE_SAVE
TexturePtr renderTexture;
#else
TexturePtr renderTexture(texture);
@@ -521,8 +535,8 @@
entity->setRenderingDistance(0);
bool needsRegen = true;
-#if IMPOSTOR_FILE_SAVE
- //Calculate the filename used to uniquely identity this render
+#ifdef IMPOSTOR_FILE_SAVE
+ //Calculate the filename hash used to uniquely identity this render
String strKey = entityKey;
char key[32] = {0};
uint32 i = 0;
@@ -560,17 +574,19 @@
const float xDivFactor = 1.0f / IMPOSTOR_YAW_ANGLES;
const float yDivFactor = 1.0f / IMPOSTOR_PITCH_ANGLES;
for (int o = 0; o < IMPOSTOR_PITCH_ANGLES; ++o){ //4 pitch angle renders
+#ifdef IMPOSTOR_RENDER_ABOVE_ONLY
Radian pitch = Degree((90.0f * o) * yDivFactor); //0, 22.5, 45, 67.5
+#else
+ Radian pitch = Degree((180.0f * o) * yDivFactor - 90.0f);
+#endif
for (int i = 0; i < IMPOSTOR_YAW_ANGLES; ++i){ //8 yaw angle renders
Radian yaw = Degree((360.0f * i) * xDivFactor); //0, 45, 90, 135, 180, 225, 270, 315
//Position camera
- renderCamera->setPosition(0, 0, 0);
- renderCamera->setOrientation(Quaternion::IDENTITY);
- renderCamera->pitch(-pitch);
- renderCamera->yaw(yaw);
- renderCamera->moveRelative(Vector3(0, 0, objDist));
+ camNode->setPosition(0, 0, 0);
+ camNode->setOrientation(Quaternion(yaw, Vector3::UNIT_Y) * Quaternion(-pitch, Vector3::UNIT_X));
+ camNode->translate(Vector3(0, 0, objDist), Node::TS_LOCAL);
//Render the impostor
renderViewport->setDimensions((float)(i) * xDivFactor, (float)(o) * yDivFactor, xDivFactor, yDivFactor);
@@ -578,7 +594,7 @@
}
}
-#if IMPOSTOR_FILE_SAVE
+#ifdef IMPOSTOR_FILE_SAVE
//Save RTT to file
renderTarget->writeContentsToFile(fileNamePNG);
@@ -612,7 +628,7 @@
if (oldSceneNode) {
oldSceneNode->attachObject(entity);
}
-#if IMPOSTOR_FILE_SAVE
+#ifdef IMPOSTOR_FILE_SAVE
//Delete RTT texture
assert(!renderTexture.isNull());
String texName2(renderTexture->getName());
Modified: trunk/python-ogre/ThirdParty/forests/ImpostorPage.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/ImpostorPage.h 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/ImpostorPage.h 2009-01-25 10:08:11 UTC (rev 846)
@@ -23,11 +23,24 @@
#include <OgreTextureManager.h>
#include <OgreRenderTexture.h>
+//The number of angle increments around the yaw axis to render impostor "snapshots" of trees
+#define IMPOSTOR_YAW_ANGLES 8
-#define IMPOSTOR_YAW_ANGLES 8
+//The number of angle increments around the pitch axis to render impostor "snapshots" of trees
#define IMPOSTOR_PITCH_ANGLES 4
-//If set to 1, imposter textures will be read and saved to disc; if set to 0 they will stay in memory and need to be regenerated each time the application is run.
-#define IMPOSTOR_FILE_SAVE 1
+
+//When IMPOSTOR_RENDER_ABOVE_ONLY is defined, impostor images will only be rendered from angles around and
+//above entities. If this is disabled, bottom views of the entities will be rendered to the impostor atlas
+//and therefore allow those angles to be viewed from a distance. However, this requires the IMPOSTOR_PITCH_ANGLES
+//to be doubled to maintain an equal level of impostor angle correctness compared to when impostors are rendered
+//from above only.
+#define IMPOSTOR_RENDER_ABOVE_ONLY
+
+//When IMPOSTOR_FILE_SAVE is defined, impostor textures will be read and saved to disc; if not, they will stay
+//in memory and need to be regenerated each time the application is run (remove or comment out the line below if this
+//is desired)
+#define IMPOSTOR_FILE_SAVE
+
namespace Forests {
class ImpostorBatch;
Modified: trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/PagedGeometry.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -62,6 +62,7 @@
//Misc.
pageLoader = NULL;
+ geometryAllowedVisible = true;
}
PagedGeometry::~PagedGeometry()
@@ -349,27 +350,26 @@
managerList.push_back(mgr);
}
-void PagedGeometry::setCustomParam( string entity, string paramName, float paramValue )
+void PagedGeometry::setCustomParam(string entity, string paramName, float paramValue)
{
- setCustomParam( entity + "." + paramName, paramValue );
+ setCustomParam(entity + "." + paramName, paramValue);
}
-void PagedGeometry::setCustomParam( string paramName, float paramValue )
+void PagedGeometry::setCustomParam(string paramName, float paramValue)
{
- customParam[ paramName ] = paramValue;
+ customParam[paramName] = paramValue;
}
-float PagedGeometry::getCustomParam( string entity, string paramName, float defaultParamValue ) const
+float PagedGeometry::getCustomParam(string entity, string paramName, float defaultParamValue) const
{
- return getCustomParam( entity + "." + paramName, defaultParamValue );;
+ return getCustomParam(entity + "." + paramName, defaultParamValue);
}
-float PagedGeometry::getCustomParam( string paramName, float defaultParamValue ) const
+float PagedGeometry::getCustomParam(string paramName, float defaultParamValue) const
{
map<string, float>::const_iterator it;
- it = customParam.find( paramName );
- if ( it != customParam.end() )
- {
+ it = customParam.find(paramName);
+ if (it != customParam.end()) {
float x = it->second;
return x;
}
@@ -631,6 +631,9 @@
//Non-fade visibility
if (distSq >= nearDistSq && distSq < farDistSq)
visible = true;
+ //Hide all?
+ if (!mainGeom->getVisible())
+ visible = false;
//Update visibility
if (visible){
Modified: trunk/python-ogre/ThirdParty/forests/PagedGeometry.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/PagedGeometry.h 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/PagedGeometry.h 2009-01-25 10:08:11 UTC (rev 846)
@@ -633,6 +633,23 @@
*/
void resetPreloadedGeometry();
+ /**
+ \brief Hides or unhides all geometry managed by this PagedGeometry instance
+ \params visible Whether or not you want this PagedGeometry to be visible
+
+ By default everything is visible. This can be used to hide an entire PagedGeometry
+ "group" of geometry if desired.
+ */
+ void setVisible(bool visible) { geometryAllowedVisible = visible; }
+
+ /**
+ \brief Returns whether or not geometry managed by this PagedGeometry instance is visible
+
+ By default, everything will be visible of course. This function simply returns the
+ visible/invisible state as set by the setVisible() command.
+ */
+ bool getVisible() { return geometryAllowedVisible; }
+
/*
\brief Immediately loads visible geometry.
\param maxTime The maximum amount of time (in milliseconds) which cacheGeometry()
@@ -719,34 +736,36 @@
//Internal function - do not use
void _addDetailLevel(GeometryPageManager *mgr, Ogre::Real maxRange, Ogre::Real transitionLength);
- Ogre::SceneManager* sceneMgr;
- Ogre::SceneNode* rootNode; //PagedGeometry's own "root" node
+ Ogre::SceneManager *sceneMgr;
+ Ogre::SceneNode *rootNode; //PagedGeometry's own "root" node
+ bool geometryAllowedVisible; //If set to false, all geometry managed by this PagedGeometry is hidden
+
#ifdef PAGEDGEOMETRY_ALTERNATE_COORDSYSTEM
- Ogre::Quaternion coordinateSystemQuat; //The orientation of rootNode
+ Ogre::Quaternion coordinateSystemQuat; //The orientation of rootNode
#endif
//Camera data
- Ogre::Camera* sceneCam;
- Ogre::Vector3 oldCamPos;
+ Ogre::Camera *sceneCam;
+ Ogre::Vector3 oldCamPos;
- Ogre::Camera* lastSceneCam;
- Ogre::Vector3 lastOldCamPos;
+ Ogre::Camera *lastSceneCam;
+ Ogre::Vector3 lastOldCamPos;
//This list keeps track of all the GeometryPageManager's added with addPageManager()
- std::list<GeometryPageManager *> managerList;
+ std::list<GeometryPageManager*> managerList;
//The assigned PageLoader used to load entities
- PageLoader* pageLoader;
+ PageLoader *pageLoader;
//The bounds and page size
- TBounds m_bounds;
+ TBounds m_bounds;
//The page size
- Ogre::Real pageSize;
+ Ogre::Real pageSize;
//Time-related data
- Ogre::Timer timer;
- unsigned long lastTime;
+ Ogre::Timer timer;
+ unsigned long lastTime;
private:
std::map<std::string, float> customParam;
@@ -897,7 +916,7 @@
Do not leave any remains of the entities in memory after this function is called.
One of the advantages of using paged geometry is that you can have near-infinite
game worlds, which would normally exceed a computer's RAM capacity. This advantage
- would completely dissappear if you did not clean up properly when the page manager
+ would completely disappear if you did not clean up properly when the page manager
calls this function.
*/
virtual void removeEntities() = 0;
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader2D.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader2D.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader2D.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -143,7 +143,7 @@
#else
void
#endif
-TreeLoader2D::deleteTrees(const Ogre::Vector3 &position, Real radius, Entity *type)
+TreeLoader2D::deleteTrees(const Ogre::Vector3 &position, Ogre::Real radius, Entity *type)
{
//First convert the coordinate to PagedGeometry's local system
#ifdef PAGEDGEOMETRY_ALTERNATE_COORDSYSTEM
@@ -504,6 +504,13 @@
{
TreeIterator2D::trees = trees;
+ //Test if the GridList has anything in it
+ if (trees->pageGridList.empty()) {
+ // If not, set hasMore to false and return.
+ hasMore = false;
+ return;
+ }
+
//Setup iterators
currentGrid = trees->pageGridList.begin();
currentX = 0; currentZ = 0;
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader2D.h 2009-01-25 10:08:11 UTC (rev 846)
@@ -92,7 +92,7 @@
#else
void
#endif
- deleteTrees(const Ogre::Vector3 &position, float radius = 0.001f, Ogre::Entity *type = NULL);
+ deleteTrees(const Ogre::Vector3 &position, Ogre::Real radius = 0.001f, Ogre::Entity *type = NULL);
/** \brief Deletes trees within a certain rectangular area.
\param area The area where trees are to be deleted
@@ -162,6 +162,8 @@
to this TreeLoader fairly efficiently.
\see The TreeIterator class documentation for more info.
+ \warning Be sure to test TreeIterator3D::hasMoreElements() before calling other members of the
+ TreeIterator3D class.
*/
TreeIterator2D getTrees();
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader3D.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader3D.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader3D.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -135,7 +135,7 @@
#else
void
#endif
-TreeLoader3D::deleteTrees(const Ogre::Vector3 &position, Real radius, Entity *type)
+TreeLoader3D::deleteTrees(const Vector3 &position, Real radius, Entity *type)
{
//First convert the coordinate to PagedGeometry's local system
#ifdef PAGEDGEOMETRY_ALTERNATE_COORDSYSTEM
@@ -488,6 +488,13 @@
{
TreeIterator3D::trees = trees;
+ //Test if the GridList has anything in it
+ if (trees->pageGridList.empty()) {
+ // If not, set hasMore to false and return.
+ hasMore = false;
+ return;
+ }
+
//Setup iterators
currentGrid = trees->pageGridList.begin();
currentX = 0; currentZ = 0;
Modified: trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h
===================================================================
--- trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/forests/TreeLoader3D.h 2009-01-25 10:08:11 UTC (rev 846)
@@ -72,7 +72,7 @@
#else
void
#endif
- deleteTrees(const Ogre::Vector3 &position, float radius, Ogre::Entity *type = NULL);
+ deleteTrees(const Ogre::Vector3 &position, Ogre::Real radius, Ogre::Entity *type = NULL);
#ifdef PAGEDGEOMETRY_USER_DATA
/** \brief Find trees within a certain radius of the given coordinates.
@@ -105,7 +105,8 @@
to this TreeLoader3D fairly efficiently.
\see The TreeIterator class documentation for more info.
- */
+ \warning Be sure to test TreeIterator3D::hasMoreElements() before calling other members of the
+ TreeIterator3D class. */
TreeIterator3D getTrees();
/** \brief Sets the color map used to color trees
Modified: trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp 2009-01-25 03:51:12 UTC (rev 845)
+++ trunk/python-ogre/ThirdParty/ogrebullet/Collisions/Debug/OgreBulletCollisionsDebugContact.cpp 2009-01-25 10:08:11 UTC (rev 846)
@@ -1,650 +1,650 @@
-/***************************************************************************
-
-This source file is part of OGREBULLET
-(Object-oriented Graphics Rendering Engine Bullet Wrapper)
-For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
-
-Copyright (c) 2007 tua...@gm...
-
-
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
------------------------------------------------------------------------------
-*/
-
-
-#include "OgreBulletCollisions.h"
-
-#include "Ogre.h"
-#include "OgreFontManager.h"
-
-#include "Debug/OgreBulletCollisionsDebugContact.h"
-#include "OgreBulletCollisionsShape.h"
-#include "OgreBulletCollisionsObject.h"
-#include "OgreBulletCollisionsWorld.h"
-
-using namespace Ogre;
-
-#define POS_TEX_BINDING 0
-#define COLOUR_BINDING 1
-
-namespace OgreBulletCollisions
-{
- //------------------------------------------------------------------------------------------------
- DebugContact::DebugContact(const String &name, CollisionsWorld *world) :
- _name(name),
- _world(world),
- _enabled(false)
- {
- // scene node
- _node = _world->getSceneManager()->getRootSceneNode ()->createChildSceneNode ();
-
- // sphere attach to contact point
- _point = _world->getSceneManager()->createEntity(name + String("_debug_point"), "sphere.mesh");
- _point_node = _node->createChildSceneNode ();
- _point_node->attachObject (_point);
- _point_node->setScale(0.001, 0.001, 0.001);
-
- // normal direction debug
- _normal = new DebugNormal();
- _node->attachObject (_normal);
-
- // text info on contact
- _text = new DebugContactText(name + String("_debug_text"), _node->createChildSceneNode ());
- _text->setPosition (Vector3(0,5,0));
- _text->setCaption ("-");
- _text->setVisible (false);
-
- _node->setVisible (false);
- }
- //------------------------------------------------------------------------------------------------
- DebugContact::~DebugContact()
- {
- delete _text;
-
- _point_node->detachObject (_point->getName ());
- _node->detachObject (_normal->getName ());
-
- _world->getSceneManager()->destroyEntity (_point->getName ());
-
- _node->detachAllObjects ();
- _node->removeAndDestroyAllChildren ();
-
- delete _normal;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContact::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
- {
- _node->setPosition (pt);
-
- _point_node->setPosition (depth * normal);
-
- //String contactLabel("p: ");
- //contactLabel = contactLabel + StringConverter::toString(contact->getPosition());
- //contactLabel = contactLabel + ", n: ";
- //contactLabel = contactLabel + StringConverter::toString(contact->getNormal());
- //_text->setCaption (contactLabel);
- //_text->setVisible (false);
-
- //_text->setPosition (contact->getPosition () + Vector3(0,5,0));
-
- _normal->update (normal, pt, depth);
- }
- //------------------------------------------------------------------------------------------------
- bool DebugContact::isEnabled () const
- {
- return _enabled;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContact::setEnabled (bool enable)
- {
- _enabled = enable;
- _node->setVisible (_enabled);
- };
- //------------------------------------------------------------------------------------------------
- void DebugNormal::update(const Ogre::Vector3 &normal, const Ogre::Vector3 &pt, const Ogre::Real depth)
- {
- DebugLines::clear ();
- // set normal following contact normal
- //contact->_normal
- //contact->_position
- DebugLines::addLine (Vector3::ZERO,
- 5*normal);
- DebugLines::draw ();
- }
- //------------------------------------------------------------------------------------------------
- DebugContactText::DebugContactText(const String &name,
- SceneNode *node,
- const String &caption,
- const String &fontName,
- int charHeight,
- const ColourValue &color)
- : mpCam(NULL)
- , mpWin(NULL)
- , mpFont(NULL)
- , mName(name)
- , mCaption(caption)
- , mFontName(fontName)
- , mCharHeight(charHeight)
- , mColor(color)
- , mType("DebugContact")
- , mTimeUntilNextToggle(0)
- , mSpaceWidth(0)
- , mUpdateColors(true)
- , mOnTop(false)
- , mHorizontalAlignment(H_LEFT)
- , mVerticalAlignment(V_BELOW)
- , mAdditionalHeight(0.0)
- , mNode(node)
-
- {
- if (name.empty())
- Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without name", "DebugContact::DebugContact");
-//
-// if (caption.empty())
-// Exception(Exception::ERR_INVALIDPARAMS, "Trying to create DebugContact without caption", "DebugContact::DebugContact");
-
- mRenderOp.vertexData = NULL;
- this->setFontName(mFontName);
- //this->_setupGeometry();
- mNode->attachObject(this);
- }
- //------------------------------------------------------------------------------------------------
- DebugContactText::~DebugContactText()
- {
- mNode->detachObject(this->getName());
- if (mRenderOp.vertexData)
- delete mRenderOp.vertexData;
- }
-#if (OGRE_VERSION >= ((1 << 16) | (5 << 8) | 0)) // must have at least shoggoth (1.5.0)
- void DebugContactText::visitRenderables(Renderable::Visitor* visitor,
- bool debugRenderables)
- {
- visitor->visit(this, 0, false);
- }
-#endif
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setPosition(const Vector3 &pos)
- {
- mNode->setPosition (pos);
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setFontName(const String &fontName)
- {
- if((Ogre::MaterialManager::getSingletonPtr()->resourceExists(mName + "Material")))
- {
- Ogre::MaterialManager::getSingleton().remove(mName + "Material");
- }
-
- if (mFontName != fontName || mpMaterial.isNull() || !mpFont)
- {
- mFontName = fontName;
- mpFont = (Font *)FontManager::getSingleton().getByName(mFontName).getPointer();
- if (!mpFont)
- Exception(Exception::ERR_ITEM_NOT_FOUND, "Could not find font " + fontName, "DebugContact::setFontName");
-
- mpFont->load();
- if (!mpMaterial.isNull())
- {
- MaterialManager::getSingletonPtr()->remove(mpMaterial->getName());
- mpMaterial.setNull();
- }
-
- mpMaterial = mpFont->getMaterial()->clone(mName + "Material");
- if (!mpMaterial->isLoaded())
- mpMaterial->load();
-
- mpMaterial->setDepthCheckEnabled(!mOnTop);
- //mpMaterial->setDepthBias(!mOnTop);
- mpMaterial->setDepthBias(0,!mOnTop);
- mpMaterial->setDepthWriteEnabled(mOnTop);
- mpMaterial->setLightingEnabled(false);
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setCaption(const String &caption)
- {
- if (caption != mCaption)
- {
- mCaption = caption;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setColor(const ColourValue &color)
- {
- if (color != mColor)
- {
- mColor = color;
- mUpdateColors = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setCharacterHeight(unsigned int height)
- {
- if (height != mCharHeight)
- {
- mCharHeight = height;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setSpaceWidth(unsigned int width)
- {
- if (width != mSpaceWidth)
- {
- mSpaceWidth = width;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setTextAlignment(const HorizontalAlignment& horizontalAlignment, const VerticalAlignment& verticalAlignment)
- {
- if(mHorizontalAlignment != horizontalAlignment)
- {
- mHorizontalAlignment = horizontalAlignment;
- mNeedUpdate = true;
- }
- if(mVerticalAlignment != verticalAlignment)
- {
- mVerticalAlignment = verticalAlignment;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::setAdditionalHeight( Real height )
- {
- if( mAdditionalHeight != height )
- {
- mAdditionalHeight = height;
- mNeedUpdate = true;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::showOnTop(bool show)
- {
- if( mOnTop != show && !mpMaterial.isNull() )
- {
- mOnTop = show;
- mpMaterial->setDepthBias(0,!mOnTop);
- mpMaterial->setDepthCheckEnabled(!mOnTop);
- mpMaterial->setDepthWriteEnabled(mOnTop);
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_setupGeometry()
- {
- assert(mpFont);
- assert(!mpMaterial.isNull());
-
- unsigned int vertexCount = static_cast<unsigned int>(mCaption.size() * 6);
-
- if (mRenderOp.vertexData)
- {
- // Removed this test as it causes problems when replacing a caption
- // of the same size: replacing "Hello" with "hello"
- // as well as when changing the text alignment
- //if (mRenderOp.vertexData->vertexCount != vertexCount)
- {
- delete mRenderOp.vertexData;
- mRenderOp.vertexData = NULL;
- mUpdateColors = true;
- }
- }
-
- if (!mRenderOp.vertexData)
- mRenderOp.vertexData = new VertexData();
-
- mRenderOp.indexData = 0;
- mRenderOp.vertexData->vertexStart = 0;
- mRenderOp.vertexData->vertexCount = vertexCount;
- mRenderOp.operationType = RenderOperation::OT_TRIANGLE_LIST;
- mRenderOp.useIndexes = false;
-
- VertexDeclaration *decl = mRenderOp.vertexData->vertexDeclaration;
- VertexBufferBinding *bind = mRenderOp.vertexData->vertexBufferBinding;
- size_t offset = 0;
-
- // create/bind positions/tex.ccord. buffer
- if (!decl->findElementBySemantic(VES_POSITION))
- decl->addElement(POS_TEX_BINDING, offset, VET_FLOAT3, VES_POSITION);
-
- offset += VertexElement::getTypeSize(VET_FLOAT3);
-
- if (!decl->findElementBySemantic(VES_TEXTURE_COORDINATES))
- decl->addElement(POS_TEX_BINDING, offset, Ogre::VET_FLOAT2, Ogre::VES_TEXTURE_COORDINATES, 0);
-
- HardwareVertexBufferSharedPtr ptbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(POS_TEX_BINDING),
- mRenderOp.vertexData->vertexCount,
- HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
- bind->setBinding(POS_TEX_BINDING, ptbuf);
-
- // Colours - store these in a separate buffer because they change less often
- if (!decl->findElementBySemantic(VES_DIFFUSE))
- decl->addElement(COLOUR_BINDING, 0, VET_COLOUR, VES_DIFFUSE);
-
- HardwareVertexBufferSharedPtr cbuf = HardwareBufferManager::getSingleton().createVertexBuffer(decl->getVertexSize(COLOUR_BINDING),
- mRenderOp.vertexData->vertexCount,
- HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY);
- bind->setBinding(COLOUR_BINDING, cbuf);
-
- size_t charlen = mCaption.size();
- Real *pPCBuff = static_cast<Real*>(ptbuf->lock(HardwareBuffer::HBL_DISCARD));
-
- float largestWidth = 0;
- float left = 0 * 2.0 - 1.0;
- float top = -((0 * 2.0) - 1.0);
-
- // Derive space width from a capital A
- if (mSpaceWidth == 0)
- mSpaceWidth = mpFont->getGlyphAspectRatio('A') * mCharHeight * 2.0;
-
- // for calculation of AABB
- Ogre::Vector3 min, max, currPos;
- Ogre::Real maxSquaredRadius;
- bool first = true;
-
- // Use iterator
- String::iterator i, iend;
- iend = mCaption.end();
- bool newLine = true;
- Real len = 0.0f;
-
- if(mVerticalAlignment == DebugContactText::V_ABOVE)
- {
- // Raise the first line of the caption
- top += mCharHeight;
- for (i = mCaption.begin(); i != iend; ++i)
- {
- if (*i == '\n')
- top += mCharHeight * 2.0;
- }
- }
-
- for (i = mCaption.begin(); i != iend; ++i)
- {
- if (newLine)
- {
- len = 0.0f;
- for (String::iterator j = i; j != iend && *j != '\n'; j++)
- {
- if (*j == ' ')
- len += mSpaceWidth;
- else
- len += mpFont->getGlyphAspectRatio(*j) * mCharHeight * 2.0;
- }
- newLine = false;
- }
-
- if (*i == '\n')
- {
- left = 0 * 2.0 - 1.0;
- top -= mCharHeight * 2.0;
- newLine = true;
- continue;
- }
-
- if (*i == ' ')
- {
- // Just leave a gap, no tris
- left += mSpaceWidth;
- // Also reduce tri count
- mRenderOp.vertexData->vertexCount -= 6;
- continue;
- }
-
- Real horiz_height = mpFont->getGlyphAspectRatio(*i);
-
- //mpFont->getGlyphTexCoords(*i, u1, v1, u2, v2);
- const Font::UVRect &uvRect = mpFont->getGlyphTexCoords(*i);
- const Real u1 = uvRect.left;
- const Real u2 = uvRect.right;
- const Real v1 = uvRect.top;
- const Real v2 = uvRect.bottom;
-
- // each vert is (x, y, z, u, v)
- //-------------------------------------------------------------------------------------
- // First tri
- //
- // Upper left
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u1;
- *pPCBuff++ = v1;
-
- // Deal with bounds
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- currPos = Ogre::Vector3(left, top, -1.0);
- else
- currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
- if (first)
- {
- min = max = currPos;
- maxSquaredRadius = currPos.squaredLength();
- first = false;
- }
- else
- {
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
- }
-
- top -= mCharHeight * 2.0;
-
- // Bottom left
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u1;
- *pPCBuff++ = v2;
-
- // Deal with bounds
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- currPos = Ogre::Vector3(left, top, -1.0);
- else
- currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- top += mCharHeight * 2.0;
- left += horiz_height * mCharHeight * 2.0;
-
- // Top right
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u2;
- *pPCBuff++ = v1;
- //-------------------------------------------------------------------------------------
-
- // Deal with bounds
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- currPos = Ogre::Vector3(left, top, -1.0);
- else
- currPos = Ogre::Vector3(left - (len / 2), top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- //-------------------------------------------------------------------------------------
- // Second tri
- //
- // Top right (again)
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u2;
- *pPCBuff++ = v1;
-
- currPos = Ogre::Vector3(left, top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- top -= mCharHeight * 2.0;
- left -= horiz_height * mCharHeight * 2.0;
-
- // Bottom left (again)
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u1;
- *pPCBuff++ = v2;
-
- currPos = Ogre::Vector3(left, top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- left += horiz_height * mCharHeight * 2.0;
-
- // Bottom right
- if(mHorizontalAlignment == DebugContactText::H_LEFT)
- *pPCBuff++ = left;
- else
- *pPCBuff++ = left - (len / 2);
- *pPCBuff++ = top;
- *pPCBuff++ = -1.0;
- *pPCBuff++ = u2;
- *pPCBuff++ = v2;
- //-------------------------------------------------------------------------------------
-
- currPos = Ogre::Vector3(left, top, -1.0);
- min.makeFloor(currPos);
- max.makeCeil(currPos);
- maxSquaredRadius = std::max(maxSquaredRadius, currPos.squaredLength());
-
- // Go back up with top
- top += mCharHeight * 2.0;
-
- float currentWidth = (left + 1)/2 - 0;
- if (currentWidth > largestWidth)
- largestWidth = currentWidth;
- }
-
- // Unlock vertex buffer
- ptbuf->unlock();
-
- // update AABB/Sphere radius
- mAABB = Ogre::AxisAlignedBox(min, max);
- mRadius = Ogre::Math::Sqrt(maxSquaredRadius);
-
- if (mUpdateColors)
- this->_updateColors();
-
- mNeedUpdate = false;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_updateColors(void)
- {
- assert(mpFont);
- assert(!mpMaterial.isNull());
-
- // Convert to system-specific
- RGBA color;
- Root::getSingleton().convertColourValue(mColor, &color);
- HardwareVertexBufferSharedPtr vbuf = mRenderOp.vertexData->vertexBufferBinding->getBuffer(COLOUR_BINDING);
- RGBA *pDest = static_cast<RGBA*>(vbuf->lock(HardwareBuffer::HBL_DISCARD));
- for (unsigned int i = 0; i < mRenderOp.vertexData->vertexCount; ++i)
- *pDest++ = color;
- vbuf->unlock();
- mUpdateColors = false;
- }
- //------------------------------------------------------------------------------------------------
- const Quaternion& DebugContactText::getWorldOrientation(void) const
- {
- assert(mpCam);
- return const_cast<Quaternion&>(mpCam->getDerivedOrientation());
- }
- //------------------------------------------------------------------------------------------------
- const Vector3& DebugContactText::getWorldPosition(void) const
- {
- assert(mParentNode);
- return mParentNode->_getDerivedPosition();
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::getWorldTransforms(Matrix4 *xform) const
- {
- if (this->isVisible() && mpCam)
- {
- Matrix3 rot3x3, scale3x3 = Matrix3::IDENTITY;
-
- // store rotation in a matrix
- mpCam->getDerivedOrientation().ToRotationMatrix(rot3x3);
-
- // parent node position
- Vector3 ppos = mParentNode->_getDerivedPosition() + Vector3::UNIT_Y*mAdditionalHeight;
-
- // apply scale
- scale3x3[0][0] = mParentNode->_getDerivedScale().x / 2;
- scale3x3[1][1] = mParentNode->_getDerivedScale().y / 2;
- scale3x3[2][2] = mParentNode->_getDerivedScale().z / 2;
-
- // apply all transforms to xform
- *xform = (rot3x3 * scale3x3);
- xform->setTrans(ppos);
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::getRenderOperation(RenderOperation &op)
- {
- if (this->isVisible())
- {
- if (mNeedUpdate)
- this->_setupGeometry();
- if (mUpdateColors)
- this->_updateColors();
- op = mRenderOp;
- }
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_notifyCurrentCamera(Camera *cam)
- {
- mpCam = cam;
- }
- //------------------------------------------------------------------------------------------------
- void DebugContactText::_updateRenderQueue(RenderQueue* queue)
- {
- if (this->isVisible())
- {
- if (mNeedUpdate)
- this->_setupGeometry();
- if (mUpdateColors)
- this->_updateColors();
-
- queue->addRenderable(this, mRenderQueueID, OGRE_RENDERABLE_DEFAULT_PRIORITY);
- // queue->addRenderable(this, mRenderQueueID, RENDER_QUEUE_SKIES_LATE);
- }
- }
-}
+/***************************************************************************
+
+This source file is part of OGREBULLET
+(Object-oriented Graphics Rendering Engine Bullet Wrapper)
+For the latest info, see http://www.ogre3d.org/phpBB2addons/viewforum.php?f=10
+
+Copyright (c) 2007 tua...@gm... (Use it Freely, even Statically, but have to contribute any changes)
+
+
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GPL General Public License with runtime exception as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GPL General Public License with runtime exception for more details.
+
+You should have received a copy of the GPL General Public License with runtime exception along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+-----------------------------------------------------------------------------
+*/
+
+
+#include "OgreBulletCollisions.h"
+
+#include "Ogre.h"
+#include "OgreFontManager.h"
+
+#include "Debug/OgreBulletCollisionsDebugContact.h"
+#include "OgreBulletCollisionsShape.h"
+#include "OgreBulletCollisionsObject.h"
+#include "OgreBulletCollisionsWorld.h"
+
+using namespace Ogre;
+
+#define POS_TEX_BINDING 0
+#define COLOUR_BINDING 1
+
+namespace OgreBulletCollisions
+{
+ //--------------------------------------------------...
[truncated message content] |
|
From: <and...@us...> - 2009-01-25 03:51:18
|
Revision: 845
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=845&view=rev
Author: andy_miller
Date: 2009-01-25 03:51:12 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
Updated to Caelum 0.4
Small fixes for Ogre 1.6.1 (exposed a missing class)
Added Mac changes to environment.py
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/ThirdParty/caelum/Caelum.h
trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
trunk/python-ogre/ThirdParty/caelum/CaelumSystem.cpp
trunk/python-ogre/ThirdParty/caelum/CaelumSystem.h
trunk/python-ogre/ThirdParty/caelum/CloudSystem.cpp
trunk/python-ogre/ThirdParty/caelum/CloudSystem.h
trunk/python-ogre/ThirdParty/caelum/DepthComposer.cpp
trunk/python-ogre/ThirdParty/caelum/DepthComposer.h
trunk/python-ogre/ThirdParty/caelum/FlatCloudLayer.cpp
trunk/python-ogre/ThirdParty/caelum/FlatCloudLayer.h
trunk/python-ogre/ThirdParty/caelum/GeometryFactory.cpp
trunk/python-ogre/ThirdParty/caelum/GeometryFactory.h
trunk/python-ogre/ThirdParty/caelum/GroundFog.cpp
trunk/python-ogre/ThirdParty/caelum/GroundFog.h
trunk/python-ogre/ThirdParty/caelum/Moon.h
trunk/python-ogre/ThirdParty/caelum/OwnedPtr.h
trunk/python-ogre/ThirdParty/caelum/PointStarfield.cpp
trunk/python-ogre/ThirdParty/caelum/PointStarfield.h
trunk/python-ogre/ThirdParty/caelum/PrecipitationController.cpp
trunk/python-ogre/ThirdParty/caelum/PrecipitationController.h
trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp
trunk/python-ogre/ThirdParty/caelum/SkyDome.h
trunk/python-ogre/ThirdParty/caelum/SkyLight.cpp
trunk/python-ogre/ThirdParty/caelum/SkyLight.h
trunk/python-ogre/ThirdParty/caelum/Sun.cpp
trunk/python-ogre/ThirdParty/caelum/UniversalClock.h
trunk/python-ogre/code_generators/caelum/generate_code.py
trunk/python-ogre/code_generators/caelum/python_caelum_aliases.h
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h
trunk/python-ogre/code_generators/ogre/python_ogre_masterlist.h
trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/UpdateDLLs.bat
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/caelum/CaelumDefaultTypeDescriptorData.cpp
trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.cpp
trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.h
trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.cpp
trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.h
trunk/python-ogre/ThirdParty/caelum/TypeDescriptor.cpp
trunk/python-ogre/ThirdParty/caelum/TypeDescriptor.h
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2009-01-24 05:00:41 UTC (rev 844)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2009-01-25 03:51:12 UTC (rev 845)
@@ -1,6 +1,6 @@
import os
-SDK=True # Changes Ogre include path settings
+SDK=False # Changes Ogre include path settings
## The root directory is where this module is located
module_dir = os.path.abspath(os.path.dirname(__file__) )
@@ -31,7 +31,8 @@
## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR, 'ogre')
-PATH_Ogre = "C:\\OgreSDK"
+if SDK:
+ PATH_Ogre = "C:\\OgreSDK"
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.2')
@@ -96,7 +97,7 @@
###
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/lib')
PATH_LIB_Ogre_OgreMain= os.path.join( PATH_Ogre, 'lib' )
-PATH_LIB_Ogre_Dependencies = ""# os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
+PATH_LIB_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
PATH_LIB_OgreRefApp = os.path.join( PATH_Ogre, 'lib')
PATH_LIB_OgreNewt = os.path.join( PATH_OgreAddons, 'ogrenewt/OgreNewt_Main/lib/Release')
PATH_LIB_Newton = os.path.join( PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
@@ -140,7 +141,7 @@
PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_NEDMALLOC= "" #os.path.join(PATH_Ogre,'OgreMain', 'src', 'nedmalloc')
-PATH_INCLUDE_Ogre_Dependencies = "" #os.path.join( PATH_Ogre, 'Dependencies/include')
+PATH_INCLUDE_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/include')
PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
PATH_INCLUDE_OgreNewt = os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
Modified: trunk/python-ogre/ThirdParty/caelum/Caelum.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/Caelum.h 2009-01-24 05:00:41 UTC (rev 844)
+++ trunk/python-ogre/ThirdParty/caelum/Caelum.h 2009-01-25 03:51:12 UTC (rev 845)
@@ -22,6 +22,9 @@
#define CAELUM_H
#include "CaelumPrerequisites.h"
+#include "CaelumScriptTranslator.h"
+#include "TypeDescriptor.h"
+#include "CaelumPlugin.h"
#include "CaelumExceptions.h"
#include "CaelumSystem.h"
#include "CameraBoundElement.h"
Added: trunk/python-ogre/ThirdParty/caelum/CaelumDefaultTypeDescriptorData.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumDefaultTypeDescriptorData.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumDefaultTypeDescriptorData.cpp 2009-01-25 03:51:12 UTC (rev 845)
@@ -0,0 +1,419 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2008 Caelum team. See Contributors.txt for details.
+
+Caelum is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Caelum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Caelum. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "CaelumPrecompiled.h"
+#include "CaelumPrerequisites.h"
+
+#if CAELUM_TYPE_DESCRIPTORS
+
+#include "TypeDescriptor.h"
+#include "CaelumSystem.h"
+#include "FlatCloudLayer.h"
+
+using namespace Ogre;
+
+namespace Caelum
+{
+ CaelumDefaultTypeDescriptorData::CaelumDefaultTypeDescriptorData ():
+ CaelumSystemTypeDescriptor(0),
+ PointStarfieldTypeDescriptor(0),
+ BaseSkyLightTypeDescriptor(0),
+ GroundFogTypeDescriptor(0),
+ PrecipitationTypeDescriptor(0),
+ DepthComposerTypeDescriptor(0),
+ FlatCloudLayerTypeDescriptor(0),
+ SkyDomeTypeDescriptor(0)
+ {
+ try {
+ load ();
+ } catch (...) {
+ unload ();
+ throw;
+ }
+ }
+
+ CaelumDefaultTypeDescriptorData::~CaelumDefaultTypeDescriptorData ()
+ {
+ unload ();
+ }
+
+ template<class T>
+ inline void delete_zero(T*& member) {
+ // Remember: delete 0 is a legal no-op.
+ delete member;
+ member = 0;
+ }
+
+ void CaelumDefaultTypeDescriptorData::unload ()
+ {
+ delete_zero(CaelumSystemTypeDescriptor);
+ delete_zero(PointStarfieldTypeDescriptor);
+ delete_zero(BaseSkyLightTypeDescriptor);
+ delete_zero(GroundFogTypeDescriptor);
+ delete_zero(PrecipitationTypeDescriptor);
+ delete_zero(DepthComposerTypeDescriptor);
+ delete_zero(FlatCloudLayerTypeDescriptor);
+ delete_zero(SkyDomeTypeDescriptor);
+ }
+
+ void CaelumDefaultTypeDescriptorData::load ()
+ {
+ if (!CaelumSystemTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+
+ // Timing settings.
+ td->add("time_scale",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Real, Real, Real>(
+ &Caelum::CaelumSystem::getTimeScale,
+ &Caelum::CaelumSystem::setTimeScale));
+ td->add("julian_day",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, LongReal, LongReal, LongReal>(
+ &Caelum::CaelumSystem::getJulianDay,
+ &Caelum::CaelumSystem::setJulianDay));
+
+ // Latitude/longitude
+ td->add("latitude",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Degree, Degree, const Degree>(
+ &Caelum::CaelumSystem::getObserverLatitude,
+ &Caelum::CaelumSystem::setObserverLatitude));
+ td->add("longitude",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Degree, Degree, const Degree>(
+ &Caelum::CaelumSystem::getObserverLongitude,
+ &Caelum::CaelumSystem::setObserverLongitude));
+
+ // Fog settings.
+ td->add("global_fog_density_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Real, Real, Real>(
+ &Caelum::CaelumSystem::getGlobalFogDensityMultiplier,
+ &Caelum::CaelumSystem::setGlobalFogDensityMultiplier));
+ td->add("global_fog_colour_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, ColourValue>(
+ &Caelum::CaelumSystem::getGlobalFogColourMultiplier,
+ &Caelum::CaelumSystem::setGlobalFogColourMultiplier));
+ td->add("manage_scene_fog",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, bool, bool, bool>(
+ &Caelum::CaelumSystem::getManageSceneFog,
+ &Caelum::CaelumSystem::setManageSceneFog));
+ td->add("scene_fog_density_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Real, Real, Real>(
+ &Caelum::CaelumSystem::getSceneFogDensityMultiplier,
+ &Caelum::CaelumSystem::setSceneFogDensityMultiplier));
+ td->add("scene_fog_colour_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, ColourValue>(
+ &Caelum::CaelumSystem::getSceneFogColourMultiplier,
+ &Caelum::CaelumSystem::setSceneFogColourMultiplier));
+ td->add("ground_fog_density_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, Real, Real, Real>(
+ &Caelum::CaelumSystem::getGroundFogDensityMultiplier,
+ &Caelum::CaelumSystem::setGroundFogDensityMultiplier));
+ td->add("ground_fog_colour_multiplier",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, ColourValue>(
+ &Caelum::CaelumSystem::getGroundFogColourMultiplier,
+ &Caelum::CaelumSystem::setGroundFogColourMultiplier));
+
+ // Lighting settings.
+ td->add("manage_ambient_light",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, bool, bool, bool>(
+ &Caelum::CaelumSystem::getManageAmbientLight,
+ &Caelum::CaelumSystem::setManageAmbientLight));
+ td->add("minimum_ambient_light",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, ColourValue>(
+ &Caelum::CaelumSystem::getMinimumAmbientLight,
+ &Caelum::CaelumSystem::setMinimumAmbientLight));
+ td->add("ensure_single_light_source",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, bool, bool, bool>(
+ &Caelum::CaelumSystem::getEnsureSingleLightSource,
+ &Caelum::CaelumSystem::setEnsureSingleLightSource));
+ td->add("ensure_single_shadow_source",
+ new AccesorPropertyDescriptor<Caelum::CaelumSystem, bool, bool, bool>(
+ &Caelum::CaelumSystem::getEnsureSingleShadowSource,
+ &Caelum::CaelumSystem::setEnsureSingleShadowSource));
+
+ CaelumSystemTypeDescriptor = td.release ();
+ }
+
+ if (!PointStarfieldTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+ td->add("magnitude_scale",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Real, Real, Real>(
+ &Caelum::PointStarfield::getMagnitudeScale,
+ &Caelum::PointStarfield::setMagnitudeScale));
+ td->add("mag0_pixel_size",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Real, Real, Real>(
+ &Caelum::PointStarfield::getMag0PixelSize,
+ &Caelum::PointStarfield::setMag0PixelSize));
+ td->add("min_pixel_size",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Real, Real, Real>(
+ &Caelum::PointStarfield::getMinPixelSize,
+ &Caelum::PointStarfield::setMinPixelSize));
+ td->add("max_pixel_size",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Real, Real, Real>(
+ &Caelum::PointStarfield::getMaxPixelSize,
+ &Caelum::PointStarfield::setMaxPixelSize));
+ td->add("latitude",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Degree, Degree, Degree>(
+ &Caelum::PointStarfield::getObserverLatitude,
+ &Caelum::PointStarfield::setObserverLatitude));
+ td->add("longitude",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Degree, Degree, Degree>(
+ &Caelum::PointStarfield::getObserverLongitude,
+ &Caelum::PointStarfield::setObserverLongitude));
+ td->add("observer_position_rebuild_delta",
+ new AccesorPropertyDescriptor<Caelum::PointStarfield, Degree, Degree, Degree>(
+ &Caelum::PointStarfield::getObserverPositionRebuildDelta,
+ &Caelum::PointStarfield::setObserverPositionRebuildDelta));
+ PointStarfieldTypeDescriptor = td.release ();
+ }
+
+ if (!BaseSkyLightTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+ td->add("ambient_multiplier",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getAmbientMultiplier,
+ &Caelum::BaseSkyLight::setAmbientMultiplier));
+ td->add("specular_multiplier",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getSpecularMultiplier,
+ &Caelum::BaseSkyLight::setSpecularMultiplier));
+ td->add("diffuse_multiplier",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getDiffuseMultiplier,
+ &Caelum::BaseSkyLight::setDiffuseMultiplier));
+ td->add("light_colour",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getLightColour,
+ &Caelum::BaseSkyLight::setLightColour));
+ td->add("body_colour",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, ColourValue>(
+ &Caelum::BaseSkyLight::getBodyColour,
+ &Caelum::BaseSkyLight::setBodyColour));
+ td->add("auto_disable_threshold",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, Real, Real, Real>(
+ &Caelum::BaseSkyLight::getAutoDisableThreshold,
+ &Caelum::BaseSkyLight::setAutoDisableThreshold));
+ td->add("auto_disable",
+ new AccesorPropertyDescriptor<Caelum::BaseSkyLight, bool, bool, bool>(
+ &Caelum::BaseSkyLight::getAutoDisable,
+ &Caelum::BaseSkyLight::setAutoDisable));
+ BaseSkyLightTypeDescriptor = td.release ();
+ }
+
+ if (!GroundFogTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+ td->add("density",
+ new AccesorPropertyDescriptor<Caelum::GroundFog, Real, Real, Real>(
+ &Caelum::GroundFog::getDensity,
+ &Caelum::GroundFog::setDensity));
+ td->add("vertical_decay",
+ new AccesorPropertyDescriptor<Caelum::GroundFog, Real, Real, Real>(
+ &Caelum::GroundFog::getVerticalDecay,
+ &Caelum::GroundFog::setVerticalDecay));
+ td->add("ground_level",
+ new AccesorPropertyDescriptor<Caelum::GroundFog, Real, Real, Real>(
+ &Caelum::GroundFog::getGroundLevel,
+ &Caelum::GroundFog::setGroundLevel));
+ td->add("colour",
+ new AccesorPropertyDescriptor<Caelum::GroundFog, ColourValue>(
+ &Caelum::GroundFog::getColour,
+ &Caelum::GroundFog::setColour));
+ GroundFogTypeDescriptor = td.release ();
+ }
+
+ if (!DepthComposerTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+ td->add("debug_depth_render",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, bool, bool, bool>(
+ &Caelum::DepthComposer::getDebugDepthRender,
+ &Caelum::DepthComposer::setDebugDepthRender));
+
+ // Legacy haze
+ td->add("haze_enabled",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, bool, bool, bool>(
+ &Caelum::DepthComposer::getSkyDomeHazeEnabled,
+ &Caelum::DepthComposer::setSkyDomeHazeEnabled));
+ td->add("haze_colour",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, ColourValue>(
+ &Caelum::DepthComposer::getHazeColour,
+ &Caelum::DepthComposer::setHazeColour));
+ td->add("haze_sun_direction",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, Vector3>(
+ &Caelum::DepthComposer::getSunDirection,
+ &Caelum::DepthComposer::setSunDirection));
+
+ // Ground fog
+ td->add("ground_fog_enabled",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, bool, bool, bool>(
+ &Caelum::DepthComposer::getGroundFogEnabled,
+ &Caelum::DepthComposer::setGroundFogEnabled));
+ td->add("ground_fog_density",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, Real, Real, Real>(
+ &Caelum::DepthComposer::getGroundFogDensity,
+ &Caelum::DepthComposer::setGroundFogDensity));
+ td->add("ground_fog_vertical_decay",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, Real, Real, Real>(
+ &Caelum::DepthComposer::getGroundFogVerticalDecay,
+ &Caelum::DepthComposer::setGroundFogVerticalDecay));
+ td->add("ground_fog_base_level",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, Real, Real, Real>(
+ &Caelum::DepthComposer::getGroundFogBaseLevel,
+ &Caelum::DepthComposer::setGroundFogBaseLevel));
+ td->add("ground_fog_colour",
+ new AccesorPropertyDescriptor<Caelum::DepthComposer, ColourValue>(
+ &Caelum::DepthComposer::getGroundFogColour,
+ &Caelum::DepthComposer::setGroundFogColour));
+
+ DepthComposerTypeDescriptor = td.release ();
+ }
+
+ if (!PrecipitationTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+
+ td->add("texture",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, String>(
+ &Caelum::PrecipitationController::getTextureName,
+ &Caelum::PrecipitationController::setTextureName));
+ td->add("precipitation_colour",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, ColourValue>(
+ &Caelum::PrecipitationController::getColour,
+ &Caelum::PrecipitationController::setColour));
+ td->add("falling_speed",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Real, Real, Real>(
+ &Caelum::PrecipitationController::getSpeed,
+ &Caelum::PrecipitationController::setSpeed));
+ td->add("wind_speed",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Vector3>(
+ &Caelum::PrecipitationController::getWindSpeed,
+ &Caelum::PrecipitationController::setWindSpeed));
+ td->add("camera_speed_scale",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Vector3>(
+ &Caelum::PrecipitationController::getCameraSpeedScale,
+ &Caelum::PrecipitationController::setCameraSpeedScale));
+ td->add("intensity",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Real, Real, Real>(
+ &Caelum::PrecipitationController::getIntensity,
+ &Caelum::PrecipitationController::setIntensity));
+ td->add("auto_disable_intensity",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Real, Real, Real>(
+ &Caelum::PrecipitationController::getAutoDisableThreshold,
+ &Caelum::PrecipitationController::setAutoDisableThreshold));
+ td->add("falling_direction",
+ new AccesorPropertyDescriptor<Caelum::PrecipitationController, Vector3>(
+ &Caelum::PrecipitationController::getFallingDirection,
+ &Caelum::PrecipitationController::setFallingDirection));
+
+ PrecipitationTypeDescriptor = td.release ();
+ }
+
+ if (!FlatCloudLayerTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+
+ td->add("height",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getHeight,
+ &Caelum::FlatCloudLayer::setHeight));
+ td->add("coverage",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getCloudCover,
+ &Caelum::FlatCloudLayer::setCloudCover));
+ td->add("cloud_speed",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Vector2>(
+ &Caelum::FlatCloudLayer::getCloudSpeed,
+ &Caelum::FlatCloudLayer::setCloudSpeed));
+ td->add("blend_time",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getCloudBlendTime,
+ &Caelum::FlatCloudLayer::setCloudBlendTime));
+ td->add("mesh_width",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getMeshWidth,
+ &Caelum::FlatCloudLayer::setMeshWidth));
+ td->add("mesh_height",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getMeshHeight,
+ &Caelum::FlatCloudLayer::setMeshHeight));
+ td->add("mesh_width_segments",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, int, int, int>(
+ &Caelum::FlatCloudLayer::getMeshWidthSegments,
+ &Caelum::FlatCloudLayer::setMeshWidthSegments));
+ td->add("mesh_height_segments",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, int, int, int>(
+ &Caelum::FlatCloudLayer::getMeshHeightSegments,
+ &Caelum::FlatCloudLayer::setMeshHeightSegments));
+ td->add("cloud_uv_factor",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getCloudUVFactor,
+ &Caelum::FlatCloudLayer::setCloudUVFactor));
+ td->add("height_red_factor",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getHeightRedFactor,
+ &Caelum::FlatCloudLayer::setHeightRedFactor));
+ td->add("near_fade_dist",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getNearFadeDist,
+ &Caelum::FlatCloudLayer::setNearFadeDist));
+ td->add("far_fade_dist",
+ new AccesorPropertyDescriptor<Caelum::FlatCloudLayer, Real, Real, Real>(
+ &Caelum::FlatCloudLayer::getFarFadeDist,
+ &Caelum::FlatCloudLayer::setFarFadeDist));
+
+ FlatCloudLayerTypeDescriptor = td.release ();
+ }
+
+ if (!SkyDomeTypeDescriptor)
+ {
+ std::auto_ptr<DefaultTypeDescriptor> td (new DefaultTypeDescriptor ());
+
+ // SkyDome is slightly special because most properties are write-only.
+
+ // Reset by CaelumSystem every frame anyway
+ td->add("sun_direction",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, Ogre::Vector3>(
+ 0, &Caelum::SkyDome::setSunDirection));
+ td->add("haze_colour",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, Ogre::ColourValue>(
+ 0, &Caelum::SkyDome::setHazeColour));
+
+ // Different files not supported anyway
+ td->add("sky_gradients_image",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, Ogre::String>(
+ 0, &Caelum::SkyDome::setSkyGradientsImage));
+ td->add("atmosphere_depth_image",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, Ogre::String>(
+ 0, &Caelum::SkyDome::setAtmosphereDepthImage));
+
+ // This does actually make sense.
+ td->add("haze_enabled",
+ new AccesorPropertyDescriptor<Caelum::SkyDome, bool, bool, bool>(
+ &Caelum::SkyDome::getHazeEnabled,
+ &Caelum::SkyDome::setHazeEnabled));
+
+ SkyDomeTypeDescriptor = td.release ();
+ }
+ }
+}
+
+#endif // CAELUM_TYPE_DESCRIPTORS
Added: trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.cpp 2009-01-25 03:51:12 UTC (rev 845)
@@ -0,0 +1,162 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2008 Caelum team. See Contributors.txt for details.
+
+Caelum is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Caelum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Caelum. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "CaelumPrecompiled.h"
+#include "CaelumPlugin.h"
+
+template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;
+
+namespace Caelum
+{
+ CaelumPlugin* CaelumPlugin::getSingletonPtr () {
+ return ms_Singleton;
+ }
+
+ CaelumPlugin& CaelumPlugin::getSingleton () {
+ assert (ms_Singleton);
+ return *ms_Singleton;
+ }
+
+ extern "C" void CAELUM_EXPORT dllStartPlugin () {
+ assert (CaelumPlugin::getSingletonPtr () == 0);
+ CaelumPlugin* plugin = new CaelumPlugin();
+ assert (CaelumPlugin::getSingletonPtr () == plugin);
+ Ogre::Root::getSingleton ().installPlugin (CaelumPlugin::getSingletonPtr ());
+ }
+
+ extern "C" void CAELUM_EXPORT dllStopPlugin () {
+ assert (CaelumPlugin::getSingletonPtr () != 0);
+ Ogre::Root::getSingleton ().uninstallPlugin (CaelumPlugin::getSingletonPtr ());
+ delete CaelumPlugin::getSingletonPtr ();
+ assert (CaelumPlugin::getSingletonPtr () == 0);
+ }
+
+#if CAELUM_SCRIPT_SUPPORT
+ CaelumPlugin::CaelumPlugin(): mScriptTranslatorManager(&mTypeDescriptorData)
+#else
+ CaelumPlugin::CaelumPlugin()
+#endif
+ {
+ mIsInstalled = false;
+ }
+
+ CaelumPlugin::~CaelumPlugin() {
+ }
+
+ const Ogre::String CaelumPlugin::CAELUM_PLUGIN_NAME = "Caelum";
+
+ const Ogre::String& CaelumPlugin::getName () const {
+ return CAELUM_PLUGIN_NAME;
+ }
+
+ void CaelumPlugin::install ()
+ {
+ assert(!mIsInstalled && "Already installed");
+
+ Ogre::LogManager::getSingleton ().logMessage("Caelum plugin version " +
+ Ogre::StringConverter::toString (CAELUM_VERSION_MAIN) + "." +
+ Ogre::StringConverter::toString (CAELUM_VERSION_SEC) + "." +
+ Ogre::StringConverter::toString (CAELUM_VERSION_TER) + " "
+ "installed");
+
+#if CAELUM_SCRIPT_SUPPORT
+ Ogre::ScriptCompilerManager::getSingleton ().addTranslatorManager (
+ getScriptTranslatorManager ());
+ Ogre::ResourceGroupManager::getSingleton()._registerResourceManager (
+ getPropScriptResourceManager ()->getResourceType (),
+ getPropScriptResourceManager ());
+
+ getScriptTranslatorManager()->_setPropScriptResourceManager (
+ &mPropScriptResourceManager);
+#endif // CAELUM_SCRIPT_SUPPORT
+
+ mIsInstalled = true;
+ }
+
+ void CaelumPlugin::initialise () {
+ }
+
+ void CaelumPlugin::shutdown () {
+ }
+
+ void CaelumPlugin::uninstall ()
+ {
+ assert(mIsInstalled && "Not installed");
+
+#if CAELUM_SCRIPT_SUPPORT
+ getScriptTranslatorManager()->_setPropScriptResourceManager (0);
+
+ Ogre::ResourceGroupManager::getSingleton ()._unregisterResourceManager (
+ getPropScriptResourceManager ()->getResourceType ());
+ Ogre::ScriptCompilerManager::getSingleton ().removeTranslatorManager (
+ getScriptTranslatorManager ());
+#endif // CAELUM_SCRIPT_SUPPORT
+
+ Ogre::LogManager::getSingleton ().logMessage("Caelum plugin uninstalled");
+
+ mIsInstalled = false;
+ }
+
+#if CAELUM_SCRIPT_SUPPORT
+ void CaelumPlugin::loadCaelumSystemFromScript (
+ CaelumSystem* sys,
+ const Ogre::String& objectName,
+ const Ogre::String& groupName)
+ {
+ assert (sys);
+ assert (this->isInstalled () && "Must install CaelumPlugin before loading scripts");
+
+ // Fetch raw resource ptr. Attempt to support explicit resource groups currently in Ogre trunk.
+#if OGRE_VERSION >= 0x00010700
+ Ogre::ResourcePtr res = getPropScriptResourceManager ()->getByName (objectName, groupName);
+#else
+ Ogre::ResourcePtr res = getPropScriptResourceManager ()->getByName (objectName);
+#endif
+
+ // Check a PropScriptResource was found.
+ PropScriptResource* propRes = static_cast<PropScriptResource*> (res.get ());
+ if (!propRes) {
+ OGRE_EXCEPT (Ogre::Exception::ERR_ITEM_NOT_FOUND,
+ "Could not find caelum_sky_system " + objectName,
+ "CaelumPlugin::loadCaelumSystemFromScript");
+ }
+
+ // Fetch the resource stream. Look in the actual group of the resource!
+ const Ogre::String& scriptFileName = propRes->getOrigin();
+ const Ogre::String& scriptFileGroup = propRes->getGroup();
+ Ogre::DataStreamPtr streamPtr = Ogre::ResourceGroupManager::getSingleton ().openResource (
+ scriptFileName, scriptFileGroup, false);
+
+ // Feed it into the compiler.
+ this->getScriptTranslatorManager()->getCaelumSystemTranslator()->setTranslationTarget (sys, objectName);
+ Ogre::ScriptCompilerManager::getSingleton ().parseScript (streamPtr, Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+ bool found = this->getScriptTranslatorManager()->getCaelumSystemTranslator()->foundTranslationTarget ();
+
+ // This shouldn't normally happen.
+ if (!found) {
+ OGRE_EXCEPT (Ogre::Exception::ERR_ITEM_NOT_FOUND,
+ "Could not find caelum_sky_system " + objectName + " in file " + scriptFileName + " on reparsing. "
+ "Perhaps information in PropScriptResourceManager is out of date?",
+ "CaelumPlugin::loadCaelumSystemFromScript");
+ }
+ this->getScriptTranslatorManager()->getCaelumSystemTranslator()->clearTranslationTarget ();
+ }
+#endif // CAELUM_SCRIPT_SUPPORT
+}
Added: trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.h (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPlugin.h 2009-01-25 03:51:12 UTC (rev 845)
@@ -0,0 +1,97 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2008 Caelum team. See Contributors.txt for details.
+
+Caelum is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Caelum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Caelum. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CAELUM__CAELUM_PLUGIN_H
+#define CAELUM__CAELUM_PLUGIN_H
+
+#include "CaelumPrerequisites.h"
+#include "CaelumScriptTranslator.h"
+#include "TypeDescriptor.h"
+#include "OgrePlugin.h"
+
+namespace Caelum
+{
+ /** Implement an Ogre::Plugin for Caelum.
+ *
+ * Ogre plugins are usually loaded from config files and they register
+ * various stuff in ogre managers. But you can also just link to the
+ * library normally and call install functions manually.
+ */
+ class CAELUM_EXPORT CaelumPlugin: public Ogre::Singleton<CaelumPlugin>, public Ogre::Plugin
+ {
+ public:
+ /// Get reference to singleton instance; or crash if N/A.
+ static CaelumPlugin& getSingleton(void);
+ /// Get pointer to singleton instance; or pointer if N/A.
+ static CaelumPlugin* getSingletonPtr(void);
+
+ CaelumPlugin();
+ ~CaelumPlugin();
+
+ virtual void install ();
+ virtual void initialise ();
+ virtual void shutdown ();
+ virtual void uninstall ();
+
+ static const Ogre::String CAELUM_PLUGIN_NAME;
+ virtual const String& getName () const;
+
+ // Determine if the plugin was installed (if install was called).
+ inline bool isInstalled () const { return mIsInstalled; }
+
+ private:
+ bool mIsInstalled;
+
+#if CAELUM_TYPE_DESCRIPTORS
+ public:
+ /// Get default type descriptor data for caelum components.
+ CaelumDefaultTypeDescriptorData* getTypeDescriptorData () { return &mTypeDescriptorData; }
+
+ private:
+ CaelumDefaultTypeDescriptorData mTypeDescriptorData;
+#endif
+
+#if CAELUM_SCRIPT_SUPPORT
+ public:
+ /** Load CaelumSystem and it's components from a script file.
+ * @param sys Target CaelumSystem.
+ * This is cleared using CaelumSystem::clear before loading.
+ * If scripting data is not found then this is not modified.
+ * @param objectName Name of caelum_sky_system from *.os file.
+ * @param scriptFileGroup The group to search in (unused in Ogre 1.6)
+ */
+ void loadCaelumSystemFromScript (
+ CaelumSystem* sys,
+ const Ogre::String& objectName,
+ const Ogre::String& scriptFileGroup = Ogre::ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME
+ );
+
+ /// @see PropScriptResourceManager
+ PropScriptResourceManager* getPropScriptResourceManager () { return &mPropScriptResourceManager; }
+ CaelumScriptTranslatorManager* getScriptTranslatorManager () { return &mScriptTranslatorManager; }
+
+ private:
+ PropScriptResourceManager mPropScriptResourceManager;
+ CaelumScriptTranslatorManager mScriptTranslatorManager;
+#endif
+ };
+}
+
+#endif // CAELUM__CAELUM_PLUGIN_H
Modified: trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2009-01-24 05:00:41 UTC (rev 844)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumPrerequisites.h 2009-01-25 03:51:12 UTC (rev 845)
@@ -31,21 +31,21 @@
#include <memory>
// Define the dll export qualifier if compiling for Windows
-// #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-// #ifdef CAELUM_LIB
-// #define CAELUM_EXPORT __declspec (dllexport)
-// #else
-// #ifdef __MINGW32__
-// #define CAELUM_EXPORT
-// #else
-// #define CAELUM_EXPORT __declspec (dllimport)
-// #endif
-// #endif
-// #elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-// #define CAELUM_EXPORT __attribute__ ((visibility("default")))
-// #else
+/*#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+ #ifdef CAELUM_LIB
+ #define CAELUM_EXPORT __declspec (dllexport)
+ #else
+ #ifdef __MINGW32__
+ #define CAELUM_EXPORT
+ #else
+ #define CAELUM_EXPORT __declspec (dllimport)
+ #endif
+ #endif
+#elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+ #define CAELUM_EXPORT __attribute__ ((visibility("default")))
+#else */
#define CAELUM_EXPORT
-// #endif
+//#endif
// Define the version code
#define CAELUM_VERSION_MAIN 0
@@ -53,6 +53,35 @@
#define CAELUM_VERSION_TER 0
#define CAELUM_VERSION = (CAELUM_VERSION_MAIN << 16) | (CAELUM_VERSION_SEC << 8) | CAELUM_VERSION_TER
+// By default only compile type descriptors for scripting.
+#ifndef CAELUM_TYPE_DESCRIPTORS
+ #if (OGRE_VERSION >= 0x00010600) && OGRE_USE_NEW_COMPILERS
+ #define CAELUM_TYPE_DESCRIPTORS 1
+ #else
+ #define CAELUM_TYPE_DESCRIPTORS 0
+ #endif
+#endif
+
+// Scripting support requires Ogre 1.6
+// Can be also configured on compiler command line
+#ifndef CAELUM_SCRIPT_SUPPORT
+ #if (OGRE_VERSION >= 0x00010600) && OGRE_USE_NEW_COMPILERS
+ #define CAELUM_SCRIPT_SUPPORT 1
+ #else
+ #define CAELUM_SCRIPT_SUPPORT 0
+ #endif
+#else
+ #if !(OGRE_VERSION > 0x00010600)
+ #error "Caelum script support requires Ogre 1.6."
+ #endif
+ #if !(OGRE_USE_NEW_COMPILERS)
+ #error "Caelum script support requires Ogre 1.6 with OGRE_USE_NEW_COMPILERS."
+ #endif
+ #if !(CAELUM_TYPE_DESCRIPTORS)
+ #error "Caelum script support also requires type descriptors."
+ #endif
+#endif
+
/// @file
/** @mainpage
@@ -62,8 +91,11 @@
* Caelum::CaelumSystem class which ties them all together in an easy-to-use
* way.
*
- * For more information see the great %Caelum thread in the ogre forum:
- * http://www.ogre3d.org/phpBB2/viewtopic.php?t=24961&postorder=desc
+ * More information is available on the wiki page:
+ * http://www.ogre3d.org/wiki/index.php/Caelum
+ *
+ * You can discuss and report issues in the forum:
+ * http://www.ogre3d.org/addonforums/viewforum.php?f=21
*/
/** Caelum namespace
@@ -114,6 +146,7 @@
class ImageStarfield;
class PointStarfield;
class CloudSystem;
+ class CaelumSystem;
class FlatCloudLayer;
class PrecipitationController;
class PrecipitationInstance;
@@ -123,4 +156,17 @@
class DepthRenderer;
}
+namespace Ogre {
+ // Write an Ogre::Degree to a stream.
+ //
+ // Ogre::Any requires that the wrapped type can be written to a stream;
+ // otherwise it will fail on instantation. This function was placed here
+ // so it's available everywhere.
+ //
+ // This can't be placed in namespace Caelum.
+ inline std::ostream& operator << (std::ostream& out, Ogre::Degree deg) {
+ return out << deg.valueDegrees();
+ }
+}
+
#endif // CAELUM__CAELUM_PREREQUISITES_H
Added: trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/caelum/CaelumScriptTranslator.cpp 2009-01-25 03:51:12 UTC (rev 845)
@@ -0,0 +1,635 @@
+/*
+This file is part of Caelum.
+See http://www.ogre3d.org/wiki/index.php/Caelum
+
+Copyright (c) 2006-2008 Caelum team. See Contributors.txt for details.
+
+Caelum is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Caelum is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with Caelum. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "CaelumPrecompiled.h"
+#include "CaelumPrerequisites.h"
+
+#if CAELUM_SCRIPT_SUPPORT
+
+#include "CaelumScriptTranslator.h"
+#include "CaelumSystem.h"
+#include "CaelumExceptions.h"
+
+using namespace Ogre;
+
+namespace Caelum
+{
+ PropScriptResource::PropScriptResource
+ (
+ Ogre::ResourceManager* creator, const Ogre::String& name, Ogre::ResourceHandle handle,
+ const Ogre::String& group, bool isManual, Ogre::ManualResourceLoader* loader
+ ):
+ Ogre::Resource (creator, name, handle, group, isManual, loader)
+ {
+ //Ogre::LogManager::getSingleton().logMessage(
+ // "PropScriptResource::PropScriptResource");
+ }
+
+ PropScriptResource::~PropScriptResource() {
+ //Ogre::LogManager::getSingleton().logMessage(
+ // "PropScriptResource::~PropScriptResource");
+ }
+
+ PropScriptResourceManager::PropScriptResourceManager() {
+ mLoadOrder = 1000;
+ mResourceType = "PropertyScript";
+ }
+
+ PropScriptResource* PropScriptResourceManager::createImpl(
+ const String& name, ResourceHandle handle, const String& group,
+ bool isManual, ManualResourceLoader* loader, const NameValuePairList* createParams)
+ {
+ //Ogre::LogManager::getSingleton().logMessage(
+ // "PropScriptResourceManager::createImpl");
+ return new PropScriptResource (this, name, handle, group, isManual, loader);
+ }
+
+ TypeDescriptorScriptTranslator::TypeDescriptorScriptTranslator (TypeDescriptor* typeDescriptor):
+ mTypeDescriptor(typeDescriptor)
+ {
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ bool& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 argument");
+ return false;
+ }
+ if (!Ogre::ScriptTranslator::getBoolean(prop->values.front(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid number");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ ColourValue& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 4) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 4 arguments");
+ return false;
+ }
+ if (prop->values.size () < 3) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at least 3 arguments");
+ }
+ if (!getColour(prop->values.begin(), prop->values.end(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->name + " requires a colour argument");
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ float& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 argument");
+ return false;
+ }
+ if (!Ogre::ScriptTranslator::getFloat(prop->values.front(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid number");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ int& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 argument");
+ return false;
+ }
+ if (!Ogre::ScriptTranslator::getInt(prop->values.front(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid integer");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ double& value)
+ {
+ if (prop->values.empty ()) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 argument");
+ return false;
+ }
+ // We do need a string stream here for the extra precision.
+ std::stringstream strStream (std::string(prop->values.front()->getValue()));
+ strStream >> value;
+ if (strStream.fail()) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid number");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ Ogre::Degree& value)
+ {
+ if (prop->values.size () == 0) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 3) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 3 arguments");
+ return false;
+ }
+ // Allow 3 components.
+ float degMinSec[3] = { 0, 0, 0 };
+ int k = 0;
+ for (AbstractNodeList::const_iterator it = prop->values.begin(), endIt = prop->values.end(); it != endIt; ++it, ++k) {
+ if (!Ogre::ScriptTranslator::getFloat(*it, °MinSec[k])) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ (*it)->getValue () + " is not a valid number");
+ return false;
+ }
+ }
+ value = Ogre::Degree(degMinSec[0] + degMinSec[1] / 60.0 + degMinSec[2] / 3600);
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ Ogre::String& value)
+ {
+ if (prop->values.size () == 0) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 1) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 1 arguments");
+ return false;
+ }
+ if (!Ogre::ScriptTranslator::getString(prop->values.front(), &value)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ prop->values.front()->getValue() + " is not a valid string");
+ return false;
+ }
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ Ogre::Vector3& value)
+ {
+ if (prop->values.size () == 0) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 3) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 3 arguments");
+ return false;
+ }
+ float floats[3];
+ if (!Ogre::ScriptTranslator::getFloats(prop->values.begin(), prop->values.end(), floats, 3)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ "incorrect vector parameters.");
+ return false;
+ }
+ value.x = floats[0];
+ value.y = floats[1];
+ value.z = floats[2];
+ return true;
+ }
+
+ bool TypeDescriptorScriptTranslator::getPropValueOrAddError (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ Ogre::Vector2& value)
+ {
+ if (prop->values.size () == 0) {
+ compiler->addError (ScriptCompiler::CE_STRINGEXPECTED, prop->file, prop->line);
+ return false;
+ }
+ if (prop->values.size () > 2) {
+ compiler->addError (ScriptCompiler::CE_FEWERPARAMETERSEXPECTED, prop->file, prop->line,
+ prop->name + " must have at most 3 arguments");
+ return false;
+ }
+ float floats[2];
+ if (!Ogre::ScriptTranslator::getFloats(prop->values.begin(), prop->values.end(), floats, 2)) {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line,
+ "incorrect vector parameters.");
+ return false;
+ }
+ value.x = floats[0];
+ value.y = floats[1];
+ return true;
+ }
+
+ template<class T>
+ static bool tryHandlePropertyType (
+ ScriptCompiler* compiler, PropertyAbstractNode* propNode,
+ void* targetObject, const ValuePropertyDescriptor* propDesc)
+ {
+ if (propDesc->getValueTypeId () == typeid(T)) {
+ T val;
+ if (TypeDescriptorScriptTranslator::getPropValueOrAddError (compiler, propNode, val)) {
+ propDesc->setValue (targetObject, Ogre::Any(val));
+ }
+ return true;
+ }
+ return false;
+ }
+
+ void TypeDescriptorScriptTranslator::translateProperty (
+ ScriptCompiler* compiler,
+ PropertyAbstractNode* prop,
+ void* targetObject,
+ const TypeDescriptor* typeDescriptor)
+ {
+ const ValuePropertyDescriptor* propDesc = typeDescriptor->getPropertyDescriptor (prop->name);
+ if (!propDesc) {
+ compiler->addError (ScriptCompiler::CE_UNEXPECTEDTOKEN, prop->file, prop->line,
+ "property \"" + prop->name + "\" not recognized; missing from type descriptor.");
+ return;
+ }
+ if (!propDesc->canSetValue ()) {
+ compiler->addError (ScriptCompiler::CE_UNEXPECTEDTOKEN, prop->file, prop->line,
+ "property \"" + prop->name + "\" is read-only and can't be set from a script.");
+ return;
+ }
+
+ //LogManager::getSingleton ().logMessage ("TypeDescriptorScriptTranslator::translateProperty"
+ // " name '" + prop->name + "'");
+
+ bool handled = false
+ || tryHandlePropertyType<int> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<float> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<double> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<bool> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::Degree> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::String> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::Vector3> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::Vector2> (compiler, prop, targetObject, propDesc)
+ || tryHandlePropertyType<Ogre::ColourValue> (compiler, prop, targetObject, propDesc);
+
+ if (!handled) {
+ compiler->addError (ScriptCompiler::CE_UNEXPECTEDTOKEN, prop->file, prop->line,
+ "property \"" + prop->name + "\" is found in type descriptor but has "
+ "unsupported type. Mangled typeid is '" + propDesc->getValueTypeId().name() + "'");
+ }
+ }
+
+ void TypeDescriptorScriptTranslator::translate (ScriptCompiler* compiler, const AbstractNodePtr& node)
+ {
+ //LogManager::getSingleton ().logMessage ("TypeDescriptorScriptTranslator::translate begin");
+
+ // Check type descriptor was set.
+ assert (getTypeDescriptor () && "Type descriptor must be set before we can translate.");
+
+ // Fetch target object.
+ ObjectAbstractNode *objNode = reinterpret_cast<ObjectAbstractNode*>(node.get());
+ assert (!objNode->context.isEmpty ());
+ void* targetObject = any_cast<void*> (objNode->context);
+ assert (targetObject);
+
+ for (AbstractNodeList::iterator i = objNode->children.begin(); i != objNode->children.end(); ++i)
+ {
+ if ((*i)->type == ANT_PROPERTY)
+ {
+ PropertyAbstractNode *prop = reinterpret_cast<PropertyAbstractNode*>((*i).get());
+
+ translateProperty (compiler, prop, targetObject, getTypeDescriptor());
+ }
+ else if((*i)->type == ANT_OBJECT)
+ {
+ compiler->addError (ScriptCompiler::CE_INVALIDPARAMETERS, (*i)->file, (*i)->line);
+ }
+ }
+
+ //LogManager::getSingleton ().logMessage ("TypeDescriptorScriptTranslator::translate end");
+ }
+
+ CaelumSystemScriptTranslator::CaelumSystemScriptTranslator ():
+ mResourceManager(false),
+ mTranslationTarget(0),
+ mTranslationTargetFound(false),
+ mTypeDescriptor(0)
+ {
+ }
+
+ void CaelumSystemScriptTranslator::setTranslationTarget (CaelumSystem* target, const Ogre::String& name)
+ {
+ assert (target != 0);
+ this->mTranslationTarget = target;
+ this->mTranslationTargetName = name;
+ this->mTranslationTargetFound = false;
+ }
+
+ void CaelumSystemScriptTranslator::clearTranslationTarget () {
+ this->mTranslationTarget = 0;
+ this->mTranslationTargetName.clear();
+ this->mTranslationTargetFound = false;
+ }
+
+ void CaelumSystemScriptTranslator::translate (ScriptCompiler* compiler, const AbstractNodePtr& node)
+ {
+ //LogManager::getSingleton ().logMessage ("CaelumSystemScriptTranslator::translate begin");
+
+ ObjectAbstractNode *objNode = reinterpret_cast<ObjectAbstractNode*>(node.get());
+
+ CaelumSystem* sys = 0;
+
+ // Check for a translation target.
+ if (this->getTran...
[truncated message content] |
|
From: <and...@us...> - 2009-01-24 05:00:48
|
Revision: 844
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=844&view=rev
Author: andy_miller
Date: 2009-01-24 05:00:41 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
Updates to support Oger 1.6.1 SDK
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/SConstruct
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/cegui/python_CEGUI.h
trunk/python-ogre/code_generators/cegui/python_CEGUI_aliases.h
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ois/generate_code.py
trunk/python-ogre/environment.py
trunk/python-ogre/patch/ParticleUniverse_0.8.patch
Added Paths:
-----------
trunk/python-ogre/demos/ogre/tofix/Demo_BspCollision.py
Removed Paths:
-------------
trunk/python-ogre/demos/ogre/Demo_BspCollision.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -1,6 +1,6 @@
import os
-SDK=False # True ## set to true if buiding from 1.4 release source...
+SDK=True # Changes Ogre include path settings
## The root directory is where this module is located
module_dir = os.path.abspath(os.path.dirname(__file__) )
@@ -17,7 +17,7 @@
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/threading-multi')
-PATH_LIB_Boost_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/link-static/threading-multi')
+#PATH_LIB_Boost_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/python/build/msvc-9.0/release/link-static/threading-multi')
PATH_LIB_Thread_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/thread/build/msvc-9.0/release/link-static/threading-multi')
PATH_LIB_date_time_STATIC = os.path.join(PATH_Boost, 'bin.v2/libs/date_time/build/msvc-9.0/release/link-static/threading-multi')
# in Linux we need to code in the Relative path for the library
@@ -31,6 +31,7 @@
## Parent directories of the libraries
PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR, 'ogre')
+PATH_Ogre = "C:\\OgreSDK"
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.2')
@@ -84,16 +85,18 @@
# it's time for the SDK version
if SDK:
- PATH_CEGUI = os.path.join(BASE_DIR, 'ogre')
- PATH_OIS = os.path.join(BASE_DIR, 'ogre')
+ PATH_CEGUI = PATH_Ogre
+ PATH_OIS = PATH_Ogre
+
+
###
### these paths assume you've left all the directory structure as standard
### Override anything that is different
###
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/lib')
PATH_LIB_Ogre_OgreMain= os.path.join( PATH_Ogre, 'lib' )
-PATH_LIB_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
+PATH_LIB_Ogre_Dependencies = ""# os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
PATH_LIB_OgreRefApp = os.path.join( PATH_Ogre, 'lib')
PATH_LIB_OgreNewt = os.path.join( PATH_OgreAddons, 'ogrenewt/OgreNewt_Main/lib/Release')
PATH_LIB_Newton = os.path.join( PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
@@ -114,26 +117,30 @@
PATH_LIB_Bullet = os.path.join(PATH_Bullet, 'out/release8/libs' )
PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
-# PATH_LIB_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg', 'lib')
PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
-
PATH_LIB_plib = PATH_plib
PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
PATH_LIB_ogredshow = PATH_ogredshow
PATH_LIB_particleuniverse = os.path.join(PATH_particleuniverse, 'bin', 'release')
+PATH_LIB_opensteer = os.path.join(PATH_opensteer, 'win32','release')
+PATH_LIB_hikari = os.path.join(PATH_hikari ) # , 'lib')
+PATH_LIB_mygui = os.path.join(PATH_mygui, 'MyGUIEngine','lib','Release')
+PATH_LIB_canvas = os.path.join(PATH_canvas )
+PATH_LIB_pcz = os.path.join(PATH_LIB_Ogre_OgreMain, 'OGRE')
+
if SDK:
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'lib')
- PATH_LIB_OIS = os.path.join( PATH_Ogre, 'Dependencies/lib/Release') ## NOTE Posix platforms this lives in'lib' not 'dll'
+ PATH_LIB_OIS = os.path.join( PATH_Ogre, 'lib')
PATH_LIB_CEGUI = os.path.join( PATH_Ogre, 'lib' )
+ PATH_LIB_pcz = os.path.join( PATH_Ogre, 'lib','opt' )
-PATH_LIB_opensteer = os.path.join(PATH_opensteer, 'win32','release')
-PATH_LIB_hikari = os.path.join(PATH_hikari ) # , 'lib')
-PATH_LIB_mygui = os.path.join(PATH_mygui, 'MyGUIEngine','lib','Release')
-PATH_LIB_canvas = os.path.join(PATH_canvas )
+
+
+
PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
-PATH_INCLUDE_NEDMALLOC= os.path.join(PATH_Ogre,'OgreMain', 'src', 'nedmalloc')
-PATH_INCLUDE_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/include')
+PATH_INCLUDE_NEDMALLOC= "" #os.path.join(PATH_Ogre,'OgreMain', 'src', 'nedmalloc')
+PATH_INCLUDE_Ogre_Dependencies = "" #os.path.join( PATH_Ogre, 'Dependencies/include')
PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
PATH_INCLUDE_OgreNewt = os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
@@ -202,7 +209,10 @@
PATH_INCLUDE_opensteer_opensteer = os.path.join(PATH_opensteer, 'include', 'OpenSteer')
if SDK:
- PATH_INCLUDE_OIS = os.path.join(PATH_Ogre,'Dependencies/include/OIS') ## Note the plural include's
- PATH_INCLUDE_CEGUI = os.path.join(PATH_Ogre, 'Dependencies/include/CEGUI')
+ PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'include')
+ PATH_INCLUDE_OIS = os.path.join(PATH_Ogre,'include/OIS')
+ PATH_INCLUDE_CEGUI = os.path.join(PATH_Ogre, 'include/CEGUI')
+ PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'samples','include')
+ PATH_INCLUDE_ogrepcz = os.path.join(PATH_Ogre,'include', 'opt')
\ No newline at end of file
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/SConstruct 2009-01-24 05:00:41 UTC (rev 844)
@@ -50,7 +50,7 @@
def get_ccflags(cls):
if os.name=='nt':
CCFLAGS=''
- CCFLAGS += ' /DBOOST_PYTHON_MAX_ARITY=19 '
+ CCFLAGS += ' /DBOOST_PYTHON_MAX_ARITY=19 /DBOOST_PYTHON_NO_PY_SIGNATURES '
CCFLAGS += ' /nologo -Zm200 '
CCFLAGS += ' /W3 /wd4675' # warning level -Zc:wchar_t
CCFLAGS += ' /TP /MD /Zc:forScope /EHs /c /Ox /Ob2 /Oi /Ot /Oy /GS- /GR '
@@ -59,6 +59,7 @@
CCFLAGS = ' `pkg-config --cflags OGRE` ' ## needs to change I think :)
CCFLAGS += ' -I'
CCFLAGS += ' -O3 -I./ '
+ CCFLAGS += ' -DBOOST_PYTHON_MAX_ARITY=19 -DBOOST_PYTHON_NO_PY_SIGNATURES '
if cls.ModuleName == 'OGRE':
##### -fvisibility=hidden -finline-limit=20 '
#CCFLAGS += ' -fvisibility=hidden -fvisibility-inlines-hidden -DOGRE_GCC_VISIBILITY '
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -131,8 +131,11 @@
if 'iterator' in cls.name.lower() :
cls.exclude()
print "Excluding Iterator", cls.name
- CEGUI_ns.class_('OgreCEGUIResourceProvider').exclude() # it's _ogrePrivate..
-
+
+ try: # this is in the newer version of cegui so I'm OK if it fails
+ CEGUI_ns.class_('OgreCEGUIResourceProvider').exclude() # it's _ogrePrivate..
+ except:
+ pass
## Replaced these with 'useful' functions in the handwrappers - take and return python objects
CEGUI_ns.class_( "Window" ).member_functions("setUserData").exclude()
CEGUI_ns.class_( "Window" ).member_functions("getUserData").exclude()
Modified: trunk/python-ogre/code_generators/cegui/python_CEGUI.h
===================================================================
--- trunk/python-ogre/code_generators/cegui/python_CEGUI.h 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/cegui/python_CEGUI.h 2009-01-24 05:00:41 UTC (rev 844)
@@ -10,8 +10,11 @@
#include "CEGUIXMLAttributes.h" // needed for FontManager
#include "CEGUIXMLSerializer.h"
#include "OgreCEGUIRenderer.h"
-#include "OgreCEGUIResourceProvider.h"
+#if ( CEGUI_VERSION_MINOR > 5 )
+ #include "OgreCEGUIResourceProvider.h"
+#endif
+
#include "Ogre.h" // we need this to fix unexposed stuff..
// First we create a magic namespace to hold all our aliases
Modified: trunk/python-ogre/code_generators/cegui/python_CEGUI_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/cegui/python_CEGUI_aliases.h 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/cegui/python_CEGUI_aliases.h 2009-01-24 05:00:41 UTC (rev 844)
@@ -6,15 +6,16 @@
// typedef std::vector<CEGUI::Scheme::UIElementFactory> UIElementFactoryVector;
// typedef std::vector<CEGUI::Scheme::UIModule> UIModuleVector;
+#if ( CEGUI_VERSION_MINOR > 5 )
+ typedef std::list<CEGUI::OgreCEGUITexture*> OgreCEGUITextureList;
+#endif
-
-
typedef ::CEGUI::Event::Connection Connection;
typedef ::CEGUI::Event::Subscriber Subscriber;
typedef ::CEGUI::EventSet::Iterator EventIterator;
-typedef std::list<CEGUI::OgreCEGUITexture*> OgreCEGUITextureList;
+
typedef ::CEGUI::FontManager::FontIterator FontIterator ;
typedef ::CEGUI::Imageset::ImageIterator ImageIterator;
typedef ::CEGUI::ImagesetManager::ImagesetIterator ImagesetIterator;
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -271,14 +271,14 @@
# print "MC:", cls
if private_decls.is_private( cls ):
cls.exclude()
- print '{*} class "%s" is marked as private' % cls.decl_string
+ print '{*} Excluding class "%s" as marked as private' % cls.decl_string
for func in main_ns.calldefs():
if private_decls.is_private( func ):
if func.virtuality == declarations.VIRTUALITY_TYPES.PURE_VIRTUAL:
continue
func.exclude()
- print '{*} function "%s" is marked as internal' % declarations.full_name( func )
+ print '{*} Excluding function "%s" as marked as internal' % declarations.full_name( func )
# this change was for 1.7 but also needed for 1.4
noncopy=['Camera','Frustum', 'Log' ]
Modified: trunk/python-ogre/code_generators/ois/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/code_generators/ois/generate_code.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -40,7 +40,8 @@
from pyplusplus.module_creator import sort_algorithms
from pyplusplus.code_creators import include
-import common_utils.extract_documentation as exdoc
+# import common_utils.extract_documentation as exdoc
+import testExtract as exdoc
import common_utils.var_checker as varchecker
import common_utils.ogre_properties as ogre_properties
from common_utils import docit
Deleted: trunk/python-ogre/demos/ogre/Demo_BspCollision.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_BspCollision.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/demos/ogre/Demo_BspCollision.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -1,212 +0,0 @@
-# This code is in the Public Domain
-# -----------------------------------------------------------------------------
-# This source file is part of Python-Ogre
-# For the latest info, see http://python-ogre.org/
-#
-# It is likely based on original code from OGRE and/or PyOgre
-# For the latest info, see http://www.ogre3d.org/
-#
-# You may use this sample code for anything you like, it is not covered by the
-# LGPL.
-# -----------------------------------------------------------------------------
-
-## -----------------------------------------------------------------------------
-## Filename: BspCollision.py
-## Description: Test the OgreRefApp module
-## -----------------------------------------------------------------------------
-import sys
-sys.path.insert(0,'..')
-import PythonOgreConfig
-
-
-import ogre.renderer.OGRE as ogre
-import SampleFramework as sf ## note that we are forcing the OIS sample framework
-import ogre.physics.OgreRefApp as OgreRefApp
-
-## As this demo does it's own key input, AND we want to support Ogre 1.2.x we need to cope with the
-## change to OIS in ogre 1.3.x (current CVS version)
-
-if ogre.OgreVersionString[:2]=="12":
- KC_SPACE = ogre.KC_SPACE
-else:
- import ogre.io.OIS as OIS
- KC_SPACE = OIS.KC_SPACE
-
-
-## Hacky globals
-gBall = None
-gTargetNode = None
-gRsq = 0
-
-
-class BspCollisionListener (sf.FrameListener):
-
- def __init__(self, renderWindow, camera):
- """ Initialise the frame listener"""
- sf.FrameListener.__init__(self, renderWindow, camera)
- self.camera = camera
- self.timeUntilNextToggle = 0
- self.MAX_TIME_INCREMENT = 0.5
-
- def _UpdateSimulation ( self, Event ):
- OgreRefApp.World.getSingleton().simulationStep(Event.timeSinceLastFrame)
-
- def frameEnded(self, evt):
- global gBall, gTargetNode, gRsq
- ## Deal with time delays that are too large
- ## If we exceed this limit, we ignore
- if evt.timeSinceLastEvent > self.MAX_TIME_INCREMENT:
- return True
-
- if self.timeUntilNextToggle >= 0:
- self.timeUntilNextToggle -= evt.timeSinceLastFrame
-
- ## Call superclass
- ret = sf.FrameListener.frameEnded(self, evt)
-
- if self._isToggleKeyDown(KC_SPACE):
- self.timeUntilNextToggle = 2
- gBall.setPosition(self.camera.getPosition() +
- self.camera.getDirection() * self.camera.getNearClipDistance() * 2)
- gBall.setLinearVelocity(self.camera.getDirection() * 200)
- gBall.setAngularVelocity(ogre.Vector3().ZERO)
-
- ## Move the targeter
- gRsq.setRay(self.camera.getRealCamera().getCameraToViewportRay(0.5, 0.5))
- for queryResult in gRsq.execute():
- gTargetNode.setPosition(gRsq.getRay().getPoint(queryResult.distance))
- return ret
-
- def _moveCamera(self):
- self.camera.yaw(self.rotationX)
- self.camera.pitch(self.rotationY)
- self.camera.translate(self.translateVector) # for using OgreRefApp
-
-class BspCollisionApplication (sf.Application):
- def __init__(self):
- "Init Render Application"
- sf.Application.__init__(self)
- self.BOX_SIZE = 15.0
- self.num_rows = 3
-
- def __del__(self):
- global gBall, gTargetNode, gRsq
- "Close Render Application"
- del ( gRsq )
-
- # Override scene manager (use indoor instead of generic)
- def _chooseSceneManager(self):
- self.sceneManager = self.root.createSceneManager("BspSceneManager")
-
- def _createWorld(self):
- ## Create BSP-specific world
- self.world = OgreRefApp.World(self.sceneManager, OgreRefApp.World.WT_REFAPP_BSP)
-
-
- def _createCamera(self):
- """ when doing collisions with OgreRefApp Framework the camera is linked to the 'WORLD'
- not to the scene manager"""
- self.camera = self.world.createCamera('PlayerCam')
- self.camera.setPosition( (0, 0, 500) )
- self.camera.lookAt( (0, 0, -300) )
- self.camera.NearClipDistance = 5
-
-
- def _createScene(self):
- global gBall, gTargetNode, gRsq
- self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_STENCIL_MODULATIVE)
- ## Set ambient light
- self.sceneManager.setAmbientLight( (0.2, 0.2, 0.2) )
-
- ## Create a point light
- l = self.sceneManager.createLight("MainLight")
- l.setPosition(-100,50,100)
- l.setAttenuation(8000,1,0,0)
-
- ## Setup World
- self.world.setGravity( (0, 0, -60) )
- self.world.getSceneManager().setWorldGeometry("ogretestmap.bsp")
-
- ## modify camera for close work
- self.camera.setNearClipDistance(10)
- self.camera.setFarClipDistance(20000)
-
- ## Also change position, and set Quake-type orientation
- ## Get random player start point
- vp = self.sceneManager.getSuggestedViewpoint(True)
- self.camera.setPosition(vp.position)
- self.camera.pitch(ogre.Degree(d=90)) ## Quake uses X/Y horizon, Z up
- self.camera.rotate(vp.orientation)
- ## Don't yaw along variable axis, causes leaning
- self.camera.setFixedYawAxis(True, ogre.Vector3().UNIT_Z)
- ## Look at the boxes
- self.camera.lookAt(-150,40,30)
-
- gBall = self.world.createBall("Ball", 7, vp.position + ogre.Vector3(0,0,80))
- gBall.setDynamicsEnabled(True)
- gBall.getEntity().setMaterialName("Ogre/Eyes")
-
- box = self.world.createBox("shelf", 75, 125, 5, ogre.Vector3(-150, 40, 30))
- box.getEntity().setMaterialName("Examples/Rocky")
-
-
-
- for row in range (self.num_rows):
- for i in range (self.num_rows-row):
- row_size = (self.num_rows - row) * self.BOX_SIZE * 1.25
- name = "box"
- name += str((row*self.num_rows) + i)
- box = self.world.createBox(name, self.BOX_SIZE,self.BOX_SIZE,self.BOX_SIZE ,
- ogre.Vector3(-150,
- 40 - (row_size * 0.5) + (i * self.BOX_SIZE * 1.25) ,
- 32.5 + (self.BOX_SIZE / 2) + (row * self.BOX_SIZE)))
- box.setDynamicsEnabled(False, True)
- box.getEntity().setMaterialName("Examples/10PointBlock")
-
- self.camera.setCollisionEnabled(False)
- self.camera.getRealCamera().setQueryFlags(0)
-
- ## Create the targeting sphere
- targetEnt = self.sceneManager.createEntity("testray", "sphere.mesh")
- mat = ogre.MaterialManager.getSingleton().create("targeter",
- ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
- Pass = mat.getTechnique(0).getPass(0)
- tex = Pass.createTextureUnitState()
- tex.setColourOperationEx(ogre.LBX_SOURCE1, ogre.LBS_MANUAL, ogre.LBS_CURRENT,
- ogre.ColourValue().Red)
- Pass.setLightingEnabled(False)
- Pass.setSceneBlending(ogre.SBT_ADD)
- Pass.setDepthWriteEnabled(False)
-
-
- targetEnt.setMaterialName("targeter")
- targetEnt.setCastShadows(False)
- targetEnt.setQueryFlags(0)
- gTargetNode = self.sceneManager.getRootSceneNode().createChildSceneNode()
- gTargetNode.setScale(0.025, 0.025, 0.025)
- gTargetNode.attachObject(targetEnt)
-
- gRsq = self.sceneManager.createRayQuery(ogre.Ray())
- gRsq.setSortByDistance(True, 1)
- gRsq.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
-
- ## Create new frame listener
- def _createFrameListener(self):
- self.frameListener = BspCollisionListener(self.renderWindow, self.camera)
- self.root.addFrameListener(self.frameListener)
-
-
-if __name__ == '__main__':
- try:
- application = BspCollisionApplication()
- application.go()
- except ogre.OgreException, e:
- print e
-
-
-
-
-
-
-
-
Copied: trunk/python-ogre/demos/ogre/tofix/Demo_BspCollision.py (from rev 840, trunk/python-ogre/demos/ogre/Demo_BspCollision.py)
===================================================================
--- trunk/python-ogre/demos/ogre/tofix/Demo_BspCollision.py (rev 0)
+++ trunk/python-ogre/demos/ogre/tofix/Demo_BspCollision.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -0,0 +1,212 @@
+# This code is in the Public Domain
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre
+# For the latest info, see http://python-ogre.org/
+#
+# It is likely based on original code from OGRE and/or PyOgre
+# For the latest info, see http://www.ogre3d.org/
+#
+# You may use this sample code for anything you like, it is not covered by the
+# LGPL.
+# -----------------------------------------------------------------------------
+
+## -----------------------------------------------------------------------------
+## Filename: BspCollision.py
+## Description: Test the OgreRefApp module
+## -----------------------------------------------------------------------------
+import sys
+sys.path.insert(0,'..')
+import PythonOgreConfig
+
+
+import ogre.renderer.OGRE as ogre
+import SampleFramework as sf ## note that we are forcing the OIS sample framework
+import ogre.physics.OgreRefApp as OgreRefApp
+
+## As this demo does it's own key input, AND we want to support Ogre 1.2.x we need to cope with the
+## change to OIS in ogre 1.3.x (current CVS version)
+
+if ogre.OgreVersionString[:2]=="12":
+ KC_SPACE = ogre.KC_SPACE
+else:
+ import ogre.io.OIS as OIS
+ KC_SPACE = OIS.KC_SPACE
+
+
+## Hacky globals
+gBall = None
+gTargetNode = None
+gRsq = 0
+
+
+class BspCollisionListener (sf.FrameListener):
+
+ def __init__(self, renderWindow, camera):
+ """ Initialise the frame listener"""
+ sf.FrameListener.__init__(self, renderWindow, camera)
+ self.camera = camera
+ self.timeUntilNextToggle = 0
+ self.MAX_TIME_INCREMENT = 0.5
+
+ def _UpdateSimulation ( self, Event ):
+ OgreRefApp.World.getSingleton().simulationStep(Event.timeSinceLastFrame)
+
+ def frameEnded(self, evt):
+ global gBall, gTargetNode, gRsq
+ ## Deal with time delays that are too large
+ ## If we exceed this limit, we ignore
+ if evt.timeSinceLastEvent > self.MAX_TIME_INCREMENT:
+ return True
+
+ if self.timeUntilNextToggle >= 0:
+ self.timeUntilNextToggle -= evt.timeSinceLastFrame
+
+ ## Call superclass
+ ret = sf.FrameListener.frameEnded(self, evt)
+
+ if self._isToggleKeyDown(KC_SPACE):
+ self.timeUntilNextToggle = 2
+ gBall.setPosition(self.camera.getPosition() +
+ self.camera.getDirection() * self.camera.getNearClipDistance() * 2)
+ gBall.setLinearVelocity(self.camera.getDirection() * 200)
+ gBall.setAngularVelocity(ogre.Vector3().ZERO)
+
+ ## Move the targeter
+ gRsq.setRay(self.camera.getRealCamera().getCameraToViewportRay(0.5, 0.5))
+ for queryResult in gRsq.execute():
+ gTargetNode.setPosition(gRsq.getRay().getPoint(queryResult.distance))
+ return ret
+
+ def _moveCamera(self):
+ self.camera.yaw(self.rotationX)
+ self.camera.pitch(self.rotationY)
+ self.camera.translate(self.translateVector) # for using OgreRefApp
+
+class BspCollisionApplication (sf.Application):
+ def __init__(self):
+ "Init Render Application"
+ sf.Application.__init__(self)
+ self.BOX_SIZE = 15.0
+ self.num_rows = 3
+
+ def __del__(self):
+ global gBall, gTargetNode, gRsq
+ "Close Render Application"
+ del ( gRsq )
+
+ # Override scene manager (use indoor instead of generic)
+ def _chooseSceneManager(self):
+ self.sceneManager = self.root.createSceneManager("BspSceneManager")
+
+ def _createWorld(self):
+ ## Create BSP-specific world
+ self.world = OgreRefApp.World(self.sceneManager, OgreRefApp.World.WT_REFAPP_BSP)
+
+
+ def _createCamera(self):
+ """ when doing collisions with OgreRefApp Framework the camera is linked to the 'WORLD'
+ not to the scene manager"""
+ self.camera = self.world.createCamera('PlayerCam')
+ self.camera.setPosition( (0, 0, 500) )
+ self.camera.lookAt( (0, 0, -300) )
+ self.camera.NearClipDistance = 5
+
+
+ def _createScene(self):
+ global gBall, gTargetNode, gRsq
+ self.sceneManager.setShadowTechnique(ogre.SHADOWTYPE_STENCIL_MODULATIVE)
+ ## Set ambient light
+ self.sceneManager.setAmbientLight( (0.2, 0.2, 0.2) )
+
+ ## Create a point light
+ l = self.sceneManager.createLight("MainLight")
+ l.setPosition(-100,50,100)
+ l.setAttenuation(8000,1,0,0)
+
+ ## Setup World
+ self.world.setGravity( (0, 0, -60) )
+ self.world.getSceneManager().setWorldGeometry("ogretestmap.bsp")
+
+ ## modify camera for close work
+ self.camera.setNearClipDistance(10)
+ self.camera.setFarClipDistance(20000)
+
+ ## Also change position, and set Quake-type orientation
+ ## Get random player start point
+ vp = self.sceneManager.getSuggestedViewpoint(True)
+ self.camera.setPosition(vp.position)
+ self.camera.pitch(ogre.Degree(d=90)) ## Quake uses X/Y horizon, Z up
+ self.camera.rotate(vp.orientation)
+ ## Don't yaw along variable axis, causes leaning
+ self.camera.setFixedYawAxis(True, ogre.Vector3().UNIT_Z)
+ ## Look at the boxes
+ self.camera.lookAt(-150,40,30)
+
+ gBall = self.world.createBall("Ball", 7, vp.position + ogre.Vector3(0,0,80))
+ gBall.setDynamicsEnabled(True)
+ gBall.getEntity().setMaterialName("Ogre/Eyes")
+
+ box = self.world.createBox("shelf", 75, 125, 5, ogre.Vector3(-150, 40, 30))
+ box.getEntity().setMaterialName("Examples/Rocky")
+
+
+
+ for row in range (self.num_rows):
+ for i in range (self.num_rows-row):
+ row_size = (self.num_rows - row) * self.BOX_SIZE * 1.25
+ name = "box"
+ name += str((row*self.num_rows) + i)
+ box = self.world.createBox(name, self.BOX_SIZE,self.BOX_SIZE,self.BOX_SIZE ,
+ ogre.Vector3(-150,
+ 40 - (row_size * 0.5) + (i * self.BOX_SIZE * 1.25) ,
+ 32.5 + (self.BOX_SIZE / 2) + (row * self.BOX_SIZE)))
+ box.setDynamicsEnabled(False, True)
+ box.getEntity().setMaterialName("Examples/10PointBlock")
+
+ self.camera.setCollisionEnabled(False)
+ self.camera.getRealCamera().setQueryFlags(0)
+
+ ## Create the targeting sphere
+ targetEnt = self.sceneManager.createEntity("testray", "sphere.mesh")
+ mat = ogre.MaterialManager.getSingleton().create("targeter",
+ ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
+ Pass = mat.getTechnique(0).getPass(0)
+ tex = Pass.createTextureUnitState()
+ tex.setColourOperationEx(ogre.LBX_SOURCE1, ogre.LBS_MANUAL, ogre.LBS_CURRENT,
+ ogre.ColourValue().Red)
+ Pass.setLightingEnabled(False)
+ Pass.setSceneBlending(ogre.SBT_ADD)
+ Pass.setDepthWriteEnabled(False)
+
+
+ targetEnt.setMaterialName("targeter")
+ targetEnt.setCastShadows(False)
+ targetEnt.setQueryFlags(0)
+ gTargetNode = self.sceneManager.getRootSceneNode().createChildSceneNode()
+ gTargetNode.setScale(0.025, 0.025, 0.025)
+ gTargetNode.attachObject(targetEnt)
+
+ gRsq = self.sceneManager.createRayQuery(ogre.Ray())
+ gRsq.setSortByDistance(True, 1)
+ gRsq.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
+
+ ## Create new frame listener
+ def _createFrameListener(self):
+ self.frameListener = BspCollisionListener(self.renderWindow, self.camera)
+ self.root.addFrameListener(self.frameListener)
+
+
+if __name__ == '__main__':
+ try:
+ application = BspCollisionApplication()
+ application.go()
+ except ogre.OgreException, e:
+ print e
+
+
+
+
+
+
+
+
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/environment.py 2009-01-24 05:00:41 UTC (rev 844)
@@ -474,28 +474,13 @@
if isWindows():
PATH_LIB_THREAD=Config.PATH_LIB_Thread_STATIC
PATH_LIB_DATETIME=Config.PATH_LIB_date_time_STATIC
- if _STABLE:
- base = 'boost_1_36_0'
- lib = 'boost_python-vc90-mt-1_36'
- versionBase = '1_36' ## the version used on the library name
- else:
- base = 'boost_1_37_0'
- lib = 'boost_python-vc90-mt-1_37'
- PATH_LIB = Config.PATH_LIB_Boost
-
- # change to handle static boost linking...
- if BOOST_STATIC:
- lib = 'libboost_python-vc90-mt-1_37'
- PATH_LIB = Config.PATH_LIB_Boost_STATIC
-
- versionBase = '1_37' ## the version used on the library name
+ base = 'boost_1_37_0'
+ lib = 'boost_python-vc90-mt-1_37'
+ PATH_LIB = Config.PATH_LIB_Boost
+ versionBase = '1_37' ## the version used on the library name
else:
- if _STABLE:
- base = 'boost_1_34_1'
- versionBase = '1_34' ## the version used on the library name
- else:
- base = 'boost_1_37_0'
- versionBase = '1_37' ## the version used on the library name
+ base = 'boost_1_37_0'
+ versionBase = '1_37' ## the version used on the library name
if isLinux() or isMac():
bjambase = 'boost-jam-3.1.17'
@@ -523,9 +508,9 @@
## and now boost
[0, tar + ' zxf ' + os.path.join(downloadPath, base) + '.tar.gz', ''],
[0,'chmod -R +rw *', os.path.join(os.getcwd(), base ) ],
- [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', '' ],
+# [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', '' ],
[0,"./configure --with-libraries=python,thread,date_time --prefix=%s --without-icu --with-bjam=../root/usr/bin/bjam" % PREFIX, os.path.join(os.getcwd(), base )],
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )],
@@ -546,7 +531,7 @@
# [0,'sed -i s/"BOOST_PYTHON_MAX_ARITY 15"/"BOOST_PYTHON_MAX_ARITY 19"/ '+base+'/boost/python/detail/preprocessor.hpp', ''],
# [0,'sed -i 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', '' ],
# [0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
-# [0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
+ [0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python --with-thread --with-date_time ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
]
if not isWindows():
@@ -600,34 +585,19 @@
libraries = myLibraries
if isWindows():
+ version="1.6.1"
+ source = [
+ [ wget, "http://downloads.sourceforge.net/ogre/OgreSDKSetup1.6.1_VC90.exe", downloadPath],
+ #[ wget, "http://downloads.sourceforge.net/ogre/ogre-v1-6-0.zip", downloadPath],
+ ]
+ buildCmds = [
+ [0, os.path.join(downloadPath, "OgreSDKSetup1.6.1_VC90.exe"), '' ]
+ #[0, unzip + os.path.join(downloadPath,"OgreDependencies_VC9_Eihort_20080203.zip"),
+ # os.path.join(os.getcwd(), 'ogre') ],
+ #[0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
+ #[0,'echo Please use MSVC Express Edition to build Ogre Release.','']
+ ]
- if _STABLE or not _STABLE: ## temp force to this version...
- version="1.6.0"
- source = [
- [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath],
- [ wget, "http://downloads.sourceforge.net/ogre/ogre-v1-6-0.zip", downloadPath],
- ]
- buildCmds = [
- [0, unzip + os.path.join(downloadPath,"ogre-v1-6-0.zip"),os.getcwd() ],
- [0, unzip + os.path.join(downloadPath,"OgreDependencies_VC9_Eihort_20080203.zip"),
- os.path.join(os.getcwd(), 'ogre') ],
- [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.0.patch -p0 ", os.getcwd()],
- [0,'echo Please use MSVC Express Edition to build Ogre Release.','']
- ]
-# else:
-#
-# version="trunk"
-# source = [
-# [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath],
-# [ svn, "https://svn.ogre3d.org/svnroot/ogre/trunk", os.path.join(os.getcwd(), 'ogre')]
-# ]
-# buildCmds = [
-# [0, unzip + os.path.join(downloadPath,"OgreDependencies_VC9_Eihort_20080203.zip"),
-# os.path.join(os.getcwd(), 'ogre') ],
-# [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.patch -p0 ", os.getcwd()],
-# [0,'echo Please use MSVC Express Edition to build Ogre Release.','']
-# ]
-
# requirements to build a precompiled header on the fly
if _PreCompiled:
pchstop = 'python_ogre_precompiled.h'
@@ -636,17 +606,17 @@
libs=[boost.lib, 'OgreMain']
lib_dirs = [ boost.PATH_LIB
- , Config.PATH_LIB_Ogre_CEGUIRenderer
+# , Config.PATH_LIB_Ogre_CEGUIRenderer
, Config.PATH_LIB_Ogre_OgreMain
- , Config.PATH_LIB_Ogre_Dependencies #needed for ceguibase.lib etc
- , Config.PATH_LIB_CEGUI
+# , Config.PATH_LIB_Ogre_Dependencies #needed for ceguibase.lib etc
+# , Config.PATH_LIB_CEGUI
]
include_dirs = [ Config.PATH_Boost
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_NEDMALLOC
+ #, Config.PATH_INCLUDE_NEDMALLOC
]
LINKFLAGS = ''
- externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', boost.lib+'.dll']
+
elif isLinux():
if _STABLE:
version = "1.4"
@@ -718,13 +688,13 @@
LINKFLAGS = ''
cflags += ''
- CheckIncludes=['boost/python.hpp', 'Ogre.h']
+ #CheckIncludes=['boost/python.hpp', 'Ogre.h']
class ois:
active = True
pythonModule = True
- version= "1.2"
+ version= "1.0"
name = 'ois'
cflags=''
parent = "ogre/io"
@@ -768,7 +738,8 @@
pchbuild = 'buildpch.cpp'
pchincludes = ['boost/python.hpp', 'OIS.h']
- libs=['OIS_Static',boost.lib]
+ libs=['OIS',boost.lib]
+
else:
libs=['OIS',boost.lib]
libs.append ( boost_python_index.lib )
@@ -789,7 +760,7 @@
LINKFLAGS = "-l%s" % boost_python_index.lib
class ogrerefapp:
- active = True
+ active = False ## making this false as replaced by OgreODE etc..
pythonModule = True
version = ogre.version # same as the Ogre version
name = 'ogrerefapp'
@@ -859,7 +830,7 @@
, Config.PATH_Newton # only one path for Newton
, Config.PATH_INCLUDE_Ogre
, Config.PATH_INCLUDE_OgreNewt
- , Config.PATH_INCLUDE_Ogre_Dependencies #needed for OIS/OIS.h
+ # , Config.PATH_INCLUDE_Ogre_Dependencies #needed for OIS/OIS.h
]
lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Newton
@@ -880,6 +851,7 @@
else:
version = "0.6.2b"
if isWindows():
+ version = "0.5.0b" ### I'm forceing this as using the Ogre SDK
if _PreCompiled:
pchstop = 'cegui.h'
pchbuild = 'buildpch.cpp'
@@ -934,7 +906,7 @@
,Config.PATH_CEGUI
, Config.PATH_INCLUDE_Ogre_CEGUIRenderer
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies ## needed as OgreCEGUI uses CEGUI/.. in #includes
+ #, Config.PATH_INCLUDE_Ogre_Dependencies ## needed as OgreCEGUI uses CEGUI/.. in #includes
]
lib_dirs = [ boost.PATH_LIB
@@ -976,7 +948,7 @@
baseDir = os.path.join(os.getcwd(),"ode-0.10.1")
if not isWindows():
source = [
- ["wget", "http://downloads.sourceforge.net/opende/ode-0.10.1.tar.gz",downloadPath]
+ [wget, "http://downloads.sourceforge.net/opende/ode-0.10.1.tar.gz",downloadPath]
]
buildCmds = [
# FIXME: Should this untar not use the unTarGz method mentioned above?
@@ -990,7 +962,7 @@
]
else:
source = [
- ["wget", "http://downloads.sourceforge.net/opende/ode-0.10.1.zip",downloadPath]
+ [wget, "http://downloads.sourceforge.net/opende/ode-0.10.1.zip",downloadPath]
]
buildCmds = [
[0, unzip + os.path.join(downloadPath,"ode-src-0.10.1.zip"), ''],
@@ -1170,7 +1142,7 @@
Config.PATH_LIB_OIS
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain', 'OIS_Static' ]
+ libs=[ boost.lib, 'OgreMain', 'OIS' ]
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
else:
@@ -1206,6 +1178,16 @@
name='particleuniverse'
parent="ogre/addons"
cflags=""
+ source = [
+ [wget, "http://www.fxpression.com/files/download/ParticleUniverseV0.81.zip", downloadPath]
+ ]
+
+ buildCmds = [
+# [0, unzip + os.path.join(downloadPath, "ParticleUniverseV0.81.zip"), Config.PATH_Ogre],
+ [0, "patch -s -N -i " + os.path.join(os.getcwd(),"python-ogre","patch","ParticleUniverse_0.8.patch") + " -p0 ", os.path.join(Config.PATH_Ogre, 'Plugins','ParticleUniverse') ],
+
+ [0, "echo *** NOW build ParticleUniverse with MSVC from " + Config.PATH_Ogre, '']
+ ]
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
Config.PATH_INCLUDE_particleuniverse
@@ -1221,7 +1203,7 @@
ModuleName="particleuniverse"
class nxogre:
- active = True
+ active = False
pythonModule = True
version="0.22T5"
name='nxogre'
@@ -1549,7 +1531,7 @@
class bullet:
active = True
pythonModule = True
- version= "2.72"
+ version= "2.73"
name='bullet'
base = "bullet-" + version
baseDir = os.path.join(os.getcwd(), base)
@@ -1572,10 +1554,10 @@
]
if not isWindows():
source=[
- [wget, "http://bullet.googlecode.com/files/"+base+".tgz", downloadPath]
+ [wget, "http://bullet.googlecode.com/files/"+base+"-sp1.tgz", downloadPath]
]
buildCmds = [
- [0, "tar zxf " +os.path.join(downloadPath, base)+".tgz", ''],
+ [0, "tar zxf " +os.path.join(downloadPath, base)+"-sp1.tgz", ''],
# [0, "./autogen.sh", baseDir],
# [0, "./configure --prefix=%s " %(PREFIX), baseDir],
[0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
@@ -1588,10 +1570,10 @@
]
else:
source=[
- [wget, "http://bullet.googlecode.com/files/"+base+".zip", downloadPath]
+ [wget, "http://bullet.googlecode.com/files/"+base+"-sp1.zip", downloadPath]
]
buildCmds = [
- [0, unzip +os.path.join(downloadPath, base)+".zip", ''],
+ [0, unzip +os.path.join(downloadPath, base)+"-sp1.zip", ''],
]
ModuleName = 'bullet'
@@ -1616,7 +1598,7 @@
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
+# , Config.PATH_INCLUDE_Ogre_Dependencies
]
lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Bullet
@@ -1654,7 +1636,7 @@
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
, os.path.join(Config.PATH_OgreBullet, 'Dynamics' )
, Config.PATH_INCLUDE_Ogre
- , Config.PATH_INCLUDE_Ogre_Dependencies
+# , Config.PATH_INCLUDE_Ogre_Dependencies
]
lib_dirs = [ boost.PATH_LIB
,Config.PATH_LIB_Bullet
@@ -1766,7 +1748,7 @@
]
lib_dirs = [boost.PATH_LIB,
Config.PATH_LIB_Ogre_OgreMain,
- os.path.join(Config.PATH_LIB_Ogre_OgreMain, 'OGRE')
+ Config.PATH_LIB_pcz
]
CheckIncludes=[]
libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
Modified: trunk/python-ogre/patch/ParticleUniverse_0.8.patch
===================================================================
--- trunk/python-ogre/patch/ParticleUniverse_0.8.patch 2009-01-24 03:44:38 UTC (rev 843)
+++ trunk/python-ogre/patch/ParticleUniverse_0.8.patch 2009-01-24 05:00:41 UTC (rev 844)
@@ -9,10 +9,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_prepare(technique);
@@ -20,10 +20,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_notifyStart();
@@ -31,10 +31,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_notifyStop();
@@ -42,10 +42,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_preProcessParticles(technique, timeElapsed);
@@ -53,10 +53,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_processParticle(particleTechnique, particle, timeElapsed, firstParticle);
@@ -64,10 +64,10 @@
if (list->empty())
return;
-- typename std::vector<T*>::iterator it;
-- typename std::vector<T*>::iterator itEnd = list->end();
-+ std::vector<T*>::iterator it;
-+ std::vector<T*>::iterator itEnd = list->end();
+- std::vector<T*>::iterator it;
+- std::vector<T*>::iterator itEnd = list->end();
++ typename std::vector<T*>::iterator it;
++ typename std::vector<T*>::iterator itEnd = list->end();
for (it = list->begin(); it != itEnd; ++it)
{
(*it)->_postProcessParticles(technique, timeElapsed);
@@ -78,8 +78,8 @@
SpatialHashTable(void) :
mTableSize(50),
mCellDimension(15),
-- mCellOverlap(5)
-+ mCellOverlap(5),
+- mCellOverlap(5),
++ mCellOverlap(5)
{
_initialise();
};
@@ -93,8 +93,8 @@
if (isAttached())
{
// Use the position of the parent node in this case.
-- position = getParentNode()->getPosition();
-+ position = getParentNode()->getWorldPosition();
+- position = getParentNode()->getWorldPosition();
++ position = getParentNode()->getPosition();
mDerivedPosition = position;
populateAlignedBox(mBox, mDerivedPosition, mWidth, mHeight, mDepth);
_calculateBounds();
@@ -105,8 +105,8 @@
// Use the position of the parent node in this case.
if (isAttached())
{
-- position = getParentNode()->getPosition();
-+ position = getParentNode()->getWorldPosition();
+- position = getParentNode()->getWorldPosition();
++ position = getParentNode()->getPosition();
mDerivedPosition = position;
}
}
@@ -117,8 +117,8 @@
if (isAttached())
{
// Use the position of the parent node in this case.
-- position = getParentNode()->getPosition();
-+ position = getParentNode()->getWorldPosition();
+- position = getParentNode()->getWorldPosition();
++ position = getParentNode()->getPosition();
mDerivedPosition = position;
mSphere.setCenter(mDerivedPosition);
}
@@ -129,8 +129,8 @@
{
if (isAttached())
{
-- position = getParentNode()->getPosition();
-+ position = getParentNode()->getWorldPosition();
+- position = getParentNode()->getWorldPosition();
++ position = getParentNode()->getPosition();
mDerivedPosition = position;
}
}
@@ -141,8 +141,8 @@
if (!mTimeController)
{
mTimeSinceLastVisible = 0;
-- mLastVisibleFrame = Ogre::Root::getSingleton().getNextFrameNumber();
-+ mLastVisibleFrame = Ogre::Root::getSingleton().getCurrentFrameNumber();
+- mLastVisibleFrame = Ogre::Root::getSingleton().getCurrentFrameNumber();
++ mLastVisibleFrame = Ogre::Root::getSingleton().getNextFrameNumber();
Ogre::ControllerManager& controllerManager = Ogre::ControllerManager::getSingleton();
Ogre::ControllerValueRealPtr particleSystemUpdateValue(new ParticleSystemUpdateValue(this));
mTimeController = controllerManager.createFrameTimePassthroughController(particleSystemUpdateValue);
@@ -150,8 +150,8 @@
void ParticleSystem::_notifyCurrentCamera(Ogre::Camera* cam)
{
Ogre::MovableObject::_notifyCurrentCamera(cam);
-- mLastVisibleFrame = Ogre::Root::getSingleton().getNextFrameNumber();
-+ mLastVisibleFrame = Ogre::Root::getSingleton().getCurrentFrameNumber();
+- mLastVisibleFrame = Ogre::Root::getSingleton().getCurrentFrameNumber();
++ mLastVisibleFrame = Ogre::Root::getSingleton().getNextFrameNumber();
mTimeSinceLastVisible = 0.0f;
// Notify all techniques
@@ -159,8 +159,8 @@
{
if (mNonvisibleUpdateTimeoutSet)
{
-- long frameDiff = Ogre::Root::getSingleton().getNextFrameNumber() - mLastVisibleFrame;
-+ long frameDiff = Ogre::Root::getSingleton().getCurrentFrameNumber() - mLastVisibleFrame;
+- long frameDiff = Ogre::Root::getSingleton().getCurrentFrameNumber() - mLastVisibleFrame;
++ long frameDiff = Ogre::Root::getSingleton().getNextFrameNumber() - mLastVisibleFrame;
if (frameDiff > 1 || frameDiff < 0)
{
mTimeSinceLastVisible += timeElapsed;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-24 03:44:44
|
Revision: 843
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=843&view=rev
Author: andy_miller
Date: 2009-01-24 03:44:38 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
Sync media to the 1.6.1 SDK
Modified Paths:
--------------
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/notex_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/vs.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/Ambient_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/GlobalLight_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_vs.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/ShowColour_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/ShowDS_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/ShowNormal_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/SinglePass_ps.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/glsl/vs.glsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/Ambient_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/GlobalLight_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_vs.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowColour_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowDS_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowNormal_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/SinglePass_ps.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/post/hlsl/vs.hlsl
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.compositor
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.glsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.hlsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.material
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.material
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_ambient.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.glsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.hlsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.material
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_debug.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.glsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.hlsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.material
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_minilight.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_multipass.glsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_multipass.hlsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_multipass.material
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_onepass.glsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_onepass.hlsl.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_onepass.material
trunk/python-ogre/demos/media/DeferredShadingMedia/deferred_post_vs.program
trunk/python-ogre/demos/media/DeferredShadingMedia/deferreddemo.material
trunk/python-ogre/demos/media/PCZAppMedia/room.material
trunk/python-ogre/demos/media/PCZAppMedia/terrain2.cfg
trunk/python-ogre/demos/media/fonts/read_me.html
trunk/python-ogre/demos/media/fonts/sample.fontdef
trunk/python-ogre/demos/media/gui/CompositorDemo.layout
trunk/python-ogre/demos/media/gui/CompositorDemoCegui.config
trunk/python-ogre/demos/media/gui/CrowdDemo.layout
trunk/python-ogre/demos/media/gui/Falagard.xsd
trunk/python-ogre/demos/media/gui/Font.xsd
trunk/python-ogre/demos/media/gui/GUILayout.xsd
trunk/python-ogre/demos/media/gui/GUIScheme.xsd
trunk/python-ogre/demos/media/gui/Imageset.xsd
trunk/python-ogre/demos/media/gui/InstancingDemo.layout
trunk/python-ogre/demos/media/gui/OceanDemoCegui.config
trunk/python-ogre/demos/media/gui/OceanDemoLayout.xml
trunk/python-ogre/demos/media/gui/TaharezLook.imageset
trunk/python-ogre/demos/media/gui/TaharezLook.looknfeel
trunk/python-ogre/demos/media/gui/TaharezLookSkin.scheme
trunk/python-ogre/demos/media/gui/TaharezLookWidgetAliases.scheme
trunk/python-ogre/demos/media/gui/bluehighway-10.font
trunk/python-ogre/demos/media/gui/bluehighway-12.font
trunk/python-ogre/demos/media/gui/bluehighway-8.font
trunk/python-ogre/demos/media/gui/cegui8.layout
trunk/python-ogre/demos/media/gui/facial.layout
trunk/python-ogre/demos/media/gui/ogregui.layout
trunk/python-ogre/demos/media/gui/shadows.layout
trunk/python-ogre/demos/media/materials/programs/ASCIIFP.cg
trunk/python-ogre/demos/media/materials/programs/AmbientOneTexture.glsl
trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.glsl
trunk/python-ogre/demos/media/materials/programs/Bloom2_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/Bloom_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/Bloom_vs11.hlsl
trunk/python-ogre/demos/media/materials/programs/Blur0_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/Blur0_vs.glsl
trunk/python-ogre/demos/media/materials/programs/Blur0_vs11.hlsl
trunk/python-ogre/demos/media/materials/programs/Blur1_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/Blur1_vs.glsl
trunk/python-ogre/demos/media/materials/programs/Blur1_vs11.hlsl
trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.glsl
trunk/python-ogre/demos/media/materials/programs/BlurH_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.glsl
trunk/python-ogre/demos/media/materials/programs/BlurV_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/Blur_ps.glsl
trunk/python-ogre/demos/media/materials/programs/Blur_vs.glsl
trunk/python-ogre/demos/media/materials/programs/Blur_vs11.hlsl
trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.glsl
trunk/python-ogre/demos/media/materials/programs/BrightBloom2_ps20.hlsl
trunk/python-ogre/demos/media/materials/programs/Combine_fp.cg
trunk/python-ogre/demos/media/materials/programs/Common.cg
trunk/python-ogre/demos/media/materials/programs/DOF_ps.cg
trunk/python-ogre/demos/media/materials/programs/DepthShadowmap.hlsl
trunk/python-ogre/demos/media/materials/programs/DepthShadowmapCasterFp.glsl
trunk/python-ogre/demos/media/materials/programs/DepthShadowmapCasterVp.glsl
trunk/python-ogre/demos/media/materials/programs/DepthShadowmapNormalMapReceiverFp.glsl
trunk/python-ogre/demos/media/materials/programs/DepthShadowmapNormalMapReceiverVp.glsl
trunk/python-ogre/demos/media/materials/programs/DepthShadowmapReceiverFp.glsl
trunk/python-ogre/demos/media/materials/programs/DepthShadowmapReceiverVp.glsl
trunk/python-ogre/demos/media/materials/programs/DitherFP.cg
trunk/python-ogre/demos/media/materials/programs/Example_Basic.cg
trunk/python-ogre/demos/media/materials/programs/Example_Basic.hlsl
trunk/python-ogre/demos/media/materials/programs/Example_BumpMapping.cg
trunk/python-ogre/demos/media/materials/programs/Example_CelShading.cg
trunk/python-ogre/demos/media/materials/programs/Example_Fresnel.cg
trunk/python-ogre/demos/media/materials/programs/Example_FresnelPS.asm
trunk/python-ogre/demos/media/materials/programs/Example_Projection.cg
trunk/python-ogre/demos/media/materials/programs/GlassFP.cg
trunk/python-ogre/demos/media/materials/programs/Grass.cg
trunk/python-ogre/demos/media/materials/programs/GrayScale.cg
trunk/python-ogre/demos/media/materials/programs/HalftoneFP.cg
trunk/python-ogre/demos/media/materials/programs/HeatVision.cg
trunk/python-ogre/demos/media/materials/programs/InvertFP.cg
trunk/python-ogre/demos/media/materials/programs/LaplaceFP.cg
trunk/python-ogre/demos/media/materials/programs/NightVisionFP.cg
trunk/python-ogre/demos/media/materials/programs/Ocean2GLSL.frag
trunk/python-ogre/demos/media/materials/programs/Ocean2GLSL.vert
trunk/python-ogre/demos/media/materials/programs/Ocean2HLSL_Cg.frag
trunk/python-ogre/demos/media/materials/programs/Ocean2HLSL_Cg.vert
trunk/python-ogre/demos/media/materials/programs/OffsetMapping.cg
trunk/python-ogre/demos/media/materials/programs/OffsetMapping.hlsl
trunk/python-ogre/demos/media/materials/programs/OffsetMappingFp.glsl
trunk/python-ogre/demos/media/materials/programs/OffsetMappingVp.glsl
trunk/python-ogre/demos/media/materials/programs/OffsetMapping_specular.asm
trunk/python-ogre/demos/media/materials/programs/OldMovieFP.cg
trunk/python-ogre/demos/media/materials/programs/OldTV.cg
trunk/python-ogre/demos/media/materials/programs/ParticleGS.cg
trunk/python-ogre/demos/media/materials/programs/PassthroughVP.glsl
trunk/python-ogre/demos/media/materials/programs/PosterizeFP.cg
trunk/python-ogre/demos/media/materials/programs/Radial_Blur_FP.cg
trunk/python-ogre/demos/media/materials/programs/SharpenEdgesFP.cg
trunk/python-ogre/demos/media/materials/programs/StdQuad_vp.cg
trunk/python-ogre/demos/media/materials/programs/StdQuad_vp.glsl
trunk/python-ogre/demos/media/materials/programs/Swizzle.gp
trunk/python-ogre/demos/media/materials/programs/SwizzleGP.cg
trunk/python-ogre/demos/media/materials/programs/SwizzleGP.glsl
trunk/python-ogre/demos/media/materials/programs/TilingFP.cg
trunk/python-ogre/demos/media/materials/programs/crowdVp.glsl
trunk/python-ogre/demos/media/materials/programs/hdr.cg
trunk/python-ogre/demos/media/materials/programs/hdr.hlsl
trunk/python-ogre/demos/media/materials/programs/hdr_bloom.glsl
trunk/python-ogre/demos/media/materials/programs/hdr_downscale2x2luminence.glsl
trunk/python-ogre/demos/media/materials/programs/hdr_downscale3x3.glsl
trunk/python-ogre/demos/media/materials/programs/hdr_downscale3x3brightpass.glsl
trunk/python-ogre/demos/media/materials/programs/hdr_finalToneMapping.glsl
trunk/python-ogre/demos/media/materials/programs/hdr_tonemap_util.glsl
trunk/python-ogre/demos/media/materials/programs/hdrutils.hlsl
trunk/python-ogre/demos/media/materials/programs/instancing.cg
trunk/python-ogre/demos/media/materials/programs/instancingVp.glsl
trunk/python-ogre/demos/media/materials/programs/isosurf.cg
trunk/python-ogre/demos/media/materials/programs/mrttestfp.hlsl
trunk/python-ogre/demos/media/materials/programs/mrttestfp_quad.glsl
trunk/python-ogre/demos/media/materials/programs/mrttestfp_scene.glsl
trunk/python-ogre/demos/media/materials/programs/oceanGLSL.frag
trunk/python-ogre/demos/media/materials/programs/oceanGLSL.vert
trunk/python-ogre/demos/media/materials/programs/oceanHLSL_Cg.frag
trunk/python-ogre/demos/media/materials/programs/oceanHLSL_Cg.vert
trunk/python-ogre/demos/media/materials/programs/pssm.cg
trunk/python-ogre/demos/media/materials/programs/skinningTwoWeightsShadowCasterVp.glsl
trunk/python-ogre/demos/media/materials/programs/skinningTwoWeightsVp.glsl
trunk/python-ogre/demos/media/materials/programs/varianceshadowcasterfp.cg
trunk/python-ogre/demos/media/materials/programs/varianceshadowcastervp.cg
trunk/python-ogre/demos/media/materials/programs/varianceshadowreceiverfp.cg
trunk/python-ogre/demos/media/materials/programs/varianceshadowreceivervp.cg
trunk/python-ogre/demos/media/overlays/BasicOgreGuiTemplates.inc
trunk/python-ogre/demos/media/overlays/Compositor.overlay
trunk/python-ogre/demos/media/overlays/DP3.overlay
trunk/python-ogre/demos/media/overlays/Example-CubeMapping.overlay
trunk/python-ogre/demos/media/overlays/Example-DynTex.overlay
trunk/python-ogre/demos/media/overlays/Example-Water.overlay
trunk/python-ogre/demos/media/overlays/Shadows.overlay
trunk/python-ogre/demos/media/packs/chiropteraDM.txt
trunk/python-ogre/demos/media/particle/Example-Water.particle
trunk/python-ogre/demos/media/particle/Example.particle
trunk/python-ogre/demos/media/particle/emitted_emitter.particle
trunk/python-ogre/demos/media/particle/smoke.particle
trunk/python-ogre/demos/media/terrain.cfg
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,46 +1,46 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Single colour normal mapped
-*/
-
-varying vec3 normal;
-varying vec3 tangent_;
-varying vec3 binormal;
-
-varying vec2 texCoord0;
-varying float depth;
-
-uniform sampler2D normTex;
-uniform float specularity;
-uniform vec3 colour;
-void main()
-{
- // Frame for normal mapping
- mat3 rotation = mat3(tangent_, binormal, normal);
- vec3 texnormal = (vec3(texture2D(normTex, texCoord0))-0.5)*2.0;
-
- gl_FragData[0].rgb = colour;
- gl_FragData[0].a = specularity;
- // rotation*texnormal is reversed for GL because matrices are stored transposed internally
- // compared to HLSL
- gl_FragData[1].xyz = normalize(rotation*texnormal); // Do normalisation here, saves an operation per light
- gl_FragData[1].w = depth;
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Single colour normal mapped
+*/
+
+varying vec3 normal;
+varying vec3 tangent_;
+varying vec3 binormal;
+
+varying vec2 texCoord0;
+varying float depth;
+
+uniform sampler2D normTex;
+uniform float specularity;
+uniform vec3 colour;
+void main()
+{
+ // Frame for normal mapping
+ mat3 rotation = mat3(tangent_, binormal, normal);
+ vec3 texnormal = (vec3(texture2D(normTex, texCoord0))-0.5)*2.0;
+
+ gl_FragData[0].rgb = colour;
+ gl_FragData[0].a = specularity;
+ // rotation*texnormal is reversed for GL because matrices are stored transposed internally
+ // compared to HLSL
+ gl_FragData[1].xyz = normalize(rotation*texnormal); // Do normalisation here, saves an operation per light
+ gl_FragData[1].w = depth;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,44 +1,44 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Textured normal mapped
-*/
-
-varying vec3 normal;
-varying vec3 tangent_;
-varying vec3 binormal;
-varying vec2 texCoord0;
-varying float depth;
-uniform sampler2D tex0;
-uniform sampler2D normTex;
-uniform float specularity;
-void main()
-{
- // Frame for normal mapping
- mat3 rotation = mat3(tangent_, binormal, normal);
- vec3 texnormal = (vec3(texture2D(normTex, texCoord0))-0.5)*2.0;
-
- gl_FragData[0].rgb = vec3(texture2D(tex0, texCoord0));
- gl_FragData[0].a = specularity;
- // rotation*texnormal is reversed for GL because matrices are stored transposed internally
- // compared to HLSL
- gl_FragData[1].xyz = normalize(rotation*texnormal); // Do normalisation here, saves an operation per light
- gl_FragData[1].w = depth;
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Textured normal mapped
+*/
+
+varying vec3 normal;
+varying vec3 tangent_;
+varying vec3 binormal;
+varying vec2 texCoord0;
+varying float depth;
+uniform sampler2D tex0;
+uniform sampler2D normTex;
+uniform float specularity;
+void main()
+{
+ // Frame for normal mapping
+ mat3 rotation = mat3(tangent_, binormal, normal);
+ vec3 texnormal = (vec3(texture2D(normTex, texCoord0))-0.5)*2.0;
+
+ gl_FragData[0].rgb = vec3(texture2D(tex0, texCoord0));
+ gl_FragData[0].a = specularity;
+ // rotation*texnormal is reversed for GL because matrices are stored transposed internally
+ // compared to HLSL
+ gl_FragData[1].xyz = normalize(rotation*texnormal); // Do normalisation here, saves an operation per light
+ gl_FragData[1].w = depth;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,41 +1,41 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Normal mapped
-*/
-varying vec3 normal;
-varying vec3 tangent_;
-varying vec3 binormal;
-varying vec2 texCoord0;
-varying float depth;
-attribute vec3 tangent;
-void main()
-{
- vec4 projPos = gl_ModelViewProjectionMatrix * gl_Vertex;
-
- gl_Position = projPos;
- depth = projPos.w;
- texCoord0 = vec2(gl_MultiTexCoord0);
-
- normal = vec3(gl_ModelViewMatrix*vec4(gl_Normal,0));
- tangent_ = vec3(gl_ModelViewMatrix*vec4(tangent,0));
- binormal = cross(normal, tangent_);
-
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Normal mapped
+*/
+varying vec3 normal;
+varying vec3 tangent_;
+varying vec3 binormal;
+varying vec2 texCoord0;
+varying float depth;
+attribute vec3 tangent;
+void main()
+{
+ vec4 projPos = gl_ModelViewProjectionMatrix * gl_Vertex;
+
+ gl_Position = projPos;
+ depth = projPos.w;
+ texCoord0 = vec2(gl_MultiTexCoord0);
+
+ normal = vec3(gl_ModelViewMatrix*vec4(gl_Normal,0));
+ tangent_ = vec3(gl_ModelViewMatrix*vec4(tangent,0));
+ binormal = cross(normal, tangent_);
+
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,35 +1,35 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Single colour phong
-*/
-
-varying vec3 normal;
-varying vec2 texCoord0;
-varying float depth;
-uniform float specularity;
-uniform vec3 colour;
-void main()
-{
- gl_FragData[0].rgb = colour;
- gl_FragData[0].a = specularity;
- gl_FragData[1].xyz = normalize(normal); // Do normalisation here, saves an operation per light
- gl_FragData[1].w = depth;
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Single colour phong
+*/
+
+varying vec3 normal;
+varying vec2 texCoord0;
+varying float depth;
+uniform float specularity;
+uniform vec3 colour;
+void main()
+{
+ gl_FragData[0].rgb = colour;
+ gl_FragData[0].a = specularity;
+ gl_FragData[1].xyz = normalize(normal); // Do normalisation here, saves an operation per light
+ gl_FragData[1].w = depth;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,37 +1,37 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Textured phongs
-*/
-
-varying vec3 normal;
-varying vec2 texCoord0;
-varying float depth;
-
-uniform sampler2D Tex0;
-uniform float specularity;
-
-void main()
-{
- gl_FragData[0].rgb = vec3(texture2D(Tex0, texCoord0));
- gl_FragData[0].a = specularity;
- gl_FragData[1].xyz = normalize(normal); // Do normalisation here, saves an operation per light
- gl_FragData[1].w = depth;
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Textured phongs
+*/
+
+varying vec3 normal;
+varying vec2 texCoord0;
+varying float depth;
+
+uniform sampler2D Tex0;
+uniform float specularity;
+
+void main()
+{
+ gl_FragData[0].rgb = vec3(texture2D(Tex0, texCoord0));
+ gl_FragData[0].a = specularity;
+ gl_FragData[1].xyz = normalize(normal); // Do normalisation here, saves an operation per light
+ gl_FragData[1].w = depth;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,39 +1,39 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Phong material vertex shader
-*/
-varying vec3 normal;
-varying vec2 texCoord0;
-varying float depth;
-
-void main()
-{
- vec4 projPos = gl_ModelViewProjectionMatrix * gl_Vertex;
-
- gl_Position = projPos;
- depth = projPos.w;
- texCoord0 = vec2(gl_MultiTexCoord0);
-
- normal = vec3(gl_ModelViewMatrix*vec4(gl_Normal,0));
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Phong material vertex shader
+*/
+varying vec3 normal;
+varying vec2 texCoord0;
+varying float depth;
+
+void main()
+{
+ vec4 projPos = gl_ModelViewProjectionMatrix * gl_Vertex;
+
+ gl_Position = projPos;
+ depth = projPos.w;
+ texCoord0 = vec2(gl_MultiTexCoord0);
+
+ normal = vec3(gl_ModelViewMatrix*vec4(gl_Normal,0));
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,56 +1,56 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Single colour normal mapped
-*/
-sampler Tex0: register(s0);
-
-struct OUTPUT
-{
- float4 color0 : COLOR0; // Diffuse color + ?
- float4 color1 : COLOR1; // Normal + depth
-};
-
-float3 colour;
-float specularity;
-
-OUTPUT main(
- float3 normal: TEXCOORD0,
- float4 texCoord0: TEXCOORD1,
- float depth: TEXCOORD2,
- float3 tangent: TEXCOORD3,
- float3 binormal: TEXCOORD4
-)
-{
- OUTPUT output;
- // Frame for normal mapping
- float3x3 rotation = float3x3(tangent, binormal, normal);
- float3 texnormal = (tex2D(Tex0, texCoord0)-0.5)*2;
-
- output.color0.rgb = colour;
- output.color0.a = specularity;
- output.color1.xyz = normalize(mul(texnormal,rotation)); // Do normalisation here, saves an operation per light
- output.color1.w = depth;
-
- return output;
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Single colour normal mapped
+*/
+sampler Tex0: register(s0);
+
+struct OUTPUT
+{
+ float4 color0 : COLOR0; // Diffuse color + ?
+ float4 color1 : COLOR1; // Normal + depth
+};
+
+float3 colour;
+float specularity;
+
+OUTPUT main(
+ float3 normal: TEXCOORD0,
+ float4 texCoord0: TEXCOORD1,
+ float depth: TEXCOORD2,
+ float3 tangent: TEXCOORD3,
+ float3 binormal: TEXCOORD4
+)
+{
+ OUTPUT output;
+ // Frame for normal mapping
+ float3x3 rotation = float3x3(tangent, binormal, normal);
+ float3 texnormal = (tex2D(Tex0, texCoord0)-0.5)*2;
+
+ output.color0.rgb = colour;
+ output.color0.a = specularity;
+ output.color1.xyz = normalize(mul(texnormal,rotation)); // Do normalisation here, saves an operation per light
+ output.color1.w = depth;
+
+ return output;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,56 +1,56 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Textured normal mapped
-*/
-sampler Tex0: register(s0);
-sampler Tex1: register(s1);
-
-struct OUTPUT
-{
- float4 color0 : COLOR0; // Diffuse color + ?
- float4 color1 : COLOR1; // Normal + depth
-};
-
-float specularity;
-
-OUTPUT main(
- float3 normal: TEXCOORD0,
- float4 texCoord0: TEXCOORD1,
- float depth: TEXCOORD2,
- float3 tangent: TEXCOORD3,
- float3 binormal: TEXCOORD4
-)
-{
- OUTPUT output;
- // Frame for normal mapping
- float3x3 rotation = float3x3(tangent, binormal, normal);
- float3 texnormal = (tex2D(Tex1, texCoord0)-0.5)*2;
-
- output.color0.rgb = tex2D(Tex0, texCoord0);
- output.color0.a = specularity;
- output.color1.xyz = normalize(mul(texnormal,rotation)); // Do normalisation here, saves an operation per light
- output.color1.w = depth;
-
- return output;
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Textured normal mapped
+*/
+sampler Tex0: register(s0);
+sampler Tex1: register(s1);
+
+struct OUTPUT
+{
+ float4 color0 : COLOR0; // Diffuse color + ?
+ float4 color1 : COLOR1; // Normal + depth
+};
+
+float specularity;
+
+OUTPUT main(
+ float3 normal: TEXCOORD0,
+ float4 texCoord0: TEXCOORD1,
+ float depth: TEXCOORD2,
+ float3 tangent: TEXCOORD3,
+ float3 binormal: TEXCOORD4
+)
+{
+ OUTPUT output;
+ // Frame for normal mapping
+ float3x3 rotation = float3x3(tangent, binormal, normal);
+ float3 texnormal = (tex2D(Tex1, texCoord0)-0.5)*2;
+
+ output.color0.rgb = tex2D(Tex0, texCoord0);
+ output.color0.a = specularity;
+ output.color1.xyz = normalize(mul(texnormal,rotation)); // Do normalisation here, saves an operation per light
+ output.color1.w = depth;
+
+ return output;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,56 +1,56 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Normal mapped
-*/
-struct VS_OUTPUT
-{
- float4 pos: POSITION;
- float4 normal: TEXCOORD0;
- float2 texCoord0: TEXCOORD1;
- float depth: TEXCOORD2;
- float3 tangent: TEXCOORD3;
- float3 binormal: TEXCOORD4;
-};
-float4x4 worldViewProj;
-float4x4 world;
-float4x4 worldView;
-VS_OUTPUT main(
- float4 Pos: POSITION,
- float3 normal: NORMAL,
- float2 texCoord0: TEXCOORD0,
- float3 tangent: TANGENT0
-)
-{
- VS_OUTPUT Out;
-
- Out.normal = mul(worldView, normal);
- float4 projPos = mul(worldViewProj, Pos);
-
- Out.tangent = mul(worldView, tangent);
- Out.binormal = cross(Out.normal, Out.tangent);
-
- Out.pos = projPos;
- Out.texCoord0 = texCoord0;
- Out.depth = projPos.w;
- //Out.depth = projPos.z/projPos.w;
- return Out;
-}
-
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Normal mapped
+*/
+struct VS_OUTPUT
+{
+ float4 pos: POSITION;
+ float4 normal: TEXCOORD0;
+ float2 texCoord0: TEXCOORD1;
+ float depth: TEXCOORD2;
+ float3 tangent: TEXCOORD3;
+ float3 binormal: TEXCOORD4;
+};
+float4x4 worldViewProj;
+float4x4 world;
+float4x4 worldView;
+VS_OUTPUT main(
+ float4 Pos: POSITION,
+ float3 normal: NORMAL,
+ float2 texCoord0: TEXCOORD0,
+ float3 tangent: TANGENT0
+)
+{
+ VS_OUTPUT Out;
+
+ Out.normal = mul(worldView, normal);
+ float4 projPos = mul(worldViewProj, Pos);
+
+ Out.tangent = mul(worldView, tangent);
+ Out.binormal = cross(Out.normal, Out.tangent);
+
+ Out.pos = projPos;
+ Out.texCoord0 = texCoord0;
+ Out.depth = projPos.w;
+ //Out.depth = projPos.z/projPos.w;
+ return Out;
+}
+
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/notex_ps.hlsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/notex_ps.hlsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/notex_ps.hlsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,47 +1,47 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Single colour phong
-*/
-struct OUTPUT
-{
- float4 color0 : COLOR0; // Diffuse color
- float4 color1 : COLOR1; // Position
-};
-
-float3 colour;
-float specularity;
-
-OUTPUT main(
- float4 normal: TEXCOORD0,
- float4 texCoord0: TEXCOORD1,
- float depth: TEXCOORD2
-)
-{
- OUTPUT output;
- output.color0.rgb = colour;
- output.color0.a = specularity;
- output.color1.xyz = normal;
- output.color1.w = depth;
- return output;
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+/** Deferred shading framework
+ // W.J. :wumpus: van der Laan 2005 //
+
+ Material shader: Single colour phong
+*/
+struct OUTPUT
+{
+ float4 color0 : COLOR0; // Diffuse color
+ float4 color1 : COLOR1; // Position
+};
+
+float3 colour;
+float specularity;
+
+OUTPUT main(
+ float4 normal: TEXCOORD0,
+ float4 texCoord0: TEXCOORD1,
+ float depth: TEXCOORD2
+)
+{
+ OUTPUT output;
+ output.color0.rgb = colour;
+ output.color0.a = specularity;
+ output.color1.xyz = normal;
+ output.color1.w = depth;
+ return output;
+}
Modified: trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/ps.hlsl
===================================================================
--- trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/ps.hlsl 2009-01-24 03:17:30 UTC (rev 842)
+++ trunk/python-ogre/demos/media/DeferredShadingMedia/DeferredShading/material/hlsl/ps.hlsl 2009-01-24 03:44:38 UTC (rev 843)
@@ -1,48 +1,48 @@
-/******************************************************************************
-Copyright (c) W.J. van der Laan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies
-or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-/** Deferred shading framework
- // W.J. :wumpus: van der Laan 2005 //
-
- Material shader: Textured phongs
-*/
-sampler Tex0: register(s0);
-
-struct OUTPUT
-{
- float4 color0 : COLOR0; // Diffuse color
- float4 color1 : COLOR1; // Position
-};
-
-float specularity;
-
-OUTPUT main(
- float4 normal: TEXCOORD0,
- float4 texCoord0: TEXCOORD1,
- float depth: TEXCOORD2
-)
-{
- OUTPUT output;
- output.color0.rgb = tex2D(Tex0, texCoord0);
- output.color0.a = specularity;
- output.color1.xyz = normalize(normal); // Do normalisation here, saves an operation per light
- output.color1.w = depth;
- return output;
-}
+/******************************************************************************
+Copyright (c) W.J. van der Laan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OU...
[truncated message content] |
|
From: <and...@us...> - 2009-01-24 03:17:37
|
Revision: 842
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=842&view=rev
Author: andy_miller
Date: 2009-01-24 03:17:30 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
removed extra copy of PU media
Removed Paths:
-------------
trunk/python-ogre/demos/media/ParticleUniverse/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-01-22 04:26:45
|
Revision: 841
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=841&view=rev
Author: andy_miller
Date: 2009-01-22 04:26:40 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Added the 'generated source' directory to the include path for compiling - required for the new indexing system
Modified Paths:
--------------
trunk/python-ogre/SConstruct
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2009-01-19 10:31:39 UTC (rev 840)
+++ trunk/python-ogre/SConstruct 2009-01-22 04:26:40 UTC (rev 841)
@@ -66,6 +66,10 @@
else:
CCFLAGS = ' -I -pipe -O3 -I./'
+
+ ## change to ensure the source file is also in the include path due to indexing suite changes
+ CCFLAGS += ' -I' +cls._source + ' '
+
return CCFLAGS
def get_source_files(cls, _dir, usepch = False):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ks...@us...> - 2009-01-19 10:31:51
|
Revision: 840
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=840&view=rev
Author: kspes
Date: 2009-01-19 10:31:39 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
removed ogre.log from showcase_01, unnecessary
Removed Paths:
-------------
trunk/python-ogre/demos/showcase_01/Ogre.log
Deleted: trunk/python-ogre/demos/showcase_01/Ogre.log
===================================================================
--- trunk/python-ogre/demos/showcase_01/Ogre.log 2009-01-16 07:03:00 UTC (rev 839)
+++ trunk/python-ogre/demos/showcase_01/Ogre.log 2009-01-19 10:31:39 UTC (rev 840)
@@ -1,491 +0,0 @@
-17:46:34: Creating resource group General
-17:46:34: Creating resource group Internal
-17:46:34: Creating resource group Autodetect
-17:46:34: SceneManagerFactory for type 'DefaultSceneManager' registered.
-17:46:34: Registering ResourceManager for type Material
-17:46:34: Registering ResourceManager for type Mesh
-17:46:34: Registering ResourceManager for type Skeleton
-17:46:34: MovableObjectFactory for type 'ParticleSystem' registered.
-17:46:34: OverlayElementFactory for type Panel registered.
-17:46:34: OverlayElementFactory for type BorderPanel registered.
-17:46:34: OverlayElementFactory for type TextArea registered.
-17:46:34: Registering ResourceManager for type Font
-17:46:34: ArchiveFactory for archive type FileSystem registered.
-17:46:34: ArchiveFactory for archive type Zip registered.
-17:46:34: FreeImage version: 3.9.2
-17:46:34: This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details
-17:46:34: Supported formats: bmp,ico,jpg,jif,jpeg,jpe,jng,koa,iff,lbm,mng,pbm,pbm,pcd,pcx,pgm,pgm,png,ppm,ppm,ras,tga,targa,tif,tiff,wap,wbmp,wbm,psd,cut,xbm,xpm,gif,hdr,g3,sgi
-17:46:34: DDS codec registering
-17:46:34: Registering ResourceManager for type HighLevelGpuProgram
-17:46:34: Registering ResourceManager for type Compositor
-17:46:34: MovableObjectFactory for type 'Entity' registered.
-17:46:34: MovableObjectFactory for type 'Light' registered.
-17:46:34: MovableObjectFactory for type 'BillboardSet' registered.
-17:46:34: MovableObjectFactory for type 'ManualObject' registered.
-17:46:34: MovableObjectFactory for type 'BillboardChain' registered.
-17:46:34: MovableObjectFactory for type 'RibbonTrail' registered.
-17:46:34: Loading library ../../plugins\RenderSystem_GL.dll
-17:46:34: Installing plugin: GL RenderSystem
-17:46:34: OpenGL Rendering Subsystem created.
-17:46:35: Plugin successfully installed
-17:46:35: Loading library ../../plugins\RenderSystem_Direct3D9.dll
-17:46:35: Installing plugin: D3D9 RenderSystem
-17:46:35: D3D9 : Direct3D9 Rendering Subsystem created.
-17:46:36: D3D9: Driver Detection Starts
-17:46:36: D3D9: Driver Detection Ends
-17:46:36: Plugin successfully installed
-17:46:36: Loading library ../../plugins\Plugin_ParticleFX.dll
-17:46:36: Installing plugin: ParticleFX
-17:46:36: Particle Emitter Type 'Point' registered
-17:46:36: Particle Emitter Type 'Box' registered
-17:46:36: Particle Emitter Type 'Ellipsoid' registered
-17:46:36: Particle Emitter Type 'Cylinder' registered
-17:46:36: Particle Emitter Type 'Ring' registered
-17:46:36: Particle Emitter Type 'HollowEllipsoid' registered
-17:46:36: Particle Affector Type 'LinearForce' registered
-17:46:36: Particle Affector Type 'ColourFader' registered
-17:46:36: Particle Affector Type 'ColourFader2' registered
-17:46:36: Particle Affector Type 'ColourImage' registered
-17:46:36: Particle Affector Type 'ColourInterpolator' registered
-17:46:36: Particle Affector Type 'Scaler' registered
-17:46:36: Particle Affector Type 'Rotator' registered
-17:46:36: Particle Affector Type 'DirectionRandomiser' registered
-17:46:36: Particle Affector Type 'DeflectorPlane' registered
-17:46:36: Plugin successfully installed
-17:46:36: Loading library ../../plugins\Plugin_BSPSceneManager.dll
-17:46:36: Installing plugin: BSP Scene Manager
-17:46:36: Plugin successfully installed
-17:46:36: Loading library ../../plugins\Plugin_OctreeSceneManager.dll
-17:46:36: Installing plugin: Octree & Terrain Scene Manager
-17:46:36: Plugin successfully installed
-17:46:36: Loading library ../../plugins\Plugin_CgProgramManager.dll
-17:46:36: Installing plugin: Cg Program Manager
-17:46:36: Plugin successfully installed
-17:46:36: *-*-* OGRE Initialising
-17:46:36: *-*-* Version 1.4.5 (Eihort)
-17:46:36: Creating resource group Bootstrap
-17:46:36: Added resource location '../media/packs/OgreCore.zip' of type 'Zip' to resource group 'Bootstrap'
-17:46:36: Creating resource group Caelum
-17:46:36: Added resource location '../caelum/media' of type 'FileSystem' to resource group 'Caelum'
-17:46:36: Added resource location '../media' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/fonts' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/sounds' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/Audio' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/materials/programs' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/materials/scripts' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/materials/textures' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/models' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/overlays' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/particle' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/gui' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location './media/trees' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location './media/grass' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location './media/terrains' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location './media/Triplanar' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location './media/SkyManager' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location './media/sounds' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location './media/water' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location './media/Characters' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location './media/perPixel' of type 'FileSystem' to resource group 'General'
-17:46:36: Added resource location '../media/packs/cubemap.zip' of type 'Zip' to resource group 'General'
-17:46:36: Added resource location '../media/packs/cubemapsJS.zip' of type 'Zip' to resource group 'General'
-17:46:36: Added resource location '../media/packs/dragon.zip' of type 'Zip' to resource group 'General'
-17:46:36: Added resource location '../media/packs/fresneldemo.zip' of type 'Zip' to resource group 'General'
-17:46:36: Added resource location '../media/packs/ogretestmap.zip' of type 'Zip' to resource group 'General'
-17:46:36: Added resource location '../media/packs/skybox.zip' of type 'Zip' to resource group 'General'
-17:46:36: D3D9 : RenderSystem Option: Allow NVPerfHUD = No
-17:46:36: D3D9 : RenderSystem Option: Anti aliasing = None
-17:46:36: D3D9 : RenderSystem Option: Floating-point mode = Fastest
-17:46:36: D3D9 : RenderSystem Option: Full Screen = Yes
-17:46:36: D3D9 : RenderSystem Option: Rendering Device = Radeon X1650 Series
-17:46:36: D3D9 : RenderSystem Option: VSync = No
-17:46:36: D3D9 : RenderSystem Option: Video Mode = 1024 x 768 @ 32-bit colour
-17:46:37: CPU Identifier & Features
-17:46:37: -------------------------
-17:46:37: * CPU ID: GenuineIntel: Intel(R) Pentium(R) 4 CPU 2.80GHz
-17:46:37: * SSE: yes
-17:46:37: * SSE2: yes
-17:46:37: * SSE3: no
-17:46:37: * MMX: yes
-17:46:37: * MMXEXT: yes
-17:46:37: * 3DNOW: no
-17:46:37: * 3DNOWEXT: no
-17:46:37: * CMOV: yes
-17:46:37: * TSC: yes
-17:46:37: * FPU: yes
-17:46:37: * PRO: no
-17:46:37: * HT: yes
-17:46:37: -------------------------
-17:46:37: D3D9 : Subsystem Initialising
-17:46:37: D3D9RenderSystem::createRenderWindow "OGRE Render Window", 1024x768 fullscreen miscParams: FSAA=0 FSAAQuality=0 colourDepth=32 useNVPerfHUD=false vsync=false
-17:46:37: D3D9 : Created D3D9 Rendering Window 'OGRE Render Window' : 1024x768, 32bpp
-17:46:37: Registering ResourceManager for type Texture
-17:46:37: Registering ResourceManager for type GpuProgram
-17:46:37: RenderSystem capabilities
-17:46:37: -------------------------
-17:46:37: * Hardware generation of mipmaps: yes
-17:46:37: * Texture blending: yes
-17:46:37: * Anisotropic texture filtering: yes
-17:46:38: * Dot product texture operation: yes
-17:46:38: * Cube mapping: yes
-17:46:38: * Hardware stencil buffer: yes
-17:46:38: - Stencil depth: 8
-17:46:38: - Two sided stencil support: yes
-17:46:38: - Wrap stencil values: yes
-17:46:38: * Hardware vertex / index buffers: yes
-17:46:38: * Vertex programs: yes
-17:46:38: - Max vertex program version: vs_3_0
-17:46:38: * Fragment programs: yes
-17:46:38: - Max fragment program version: ps_3_0
-17:46:38: * Texture Compression: yes
-17:46:38: - DXT: yes
-17:46:38: - VTC: no
-17:46:38: * Scissor Rectangle: yes
-17:46:38: * Hardware Occlusion Query: yes
-17:46:38: * User clip planes: yes
-17:46:38: * VET_UBYTE4 vertex element type: yes
-17:46:38: * Infinite far plane projection: yes
-17:46:38: * Hardware render-to-texture: yes
-17:46:38: * Floating point textures: yes
-17:46:38: * Non-power-of-two textures: yes (limited)
-17:46:38: * Volume textures: yes
-17:46:38: * Multiple Render Targets: 4
-17:46:38: * Point Sprites: yes
-17:46:38: * Extended point parameters: yes
-17:46:38: * Max Point Size: 256
-17:46:38: * Vertex texture fetch: no
-17:46:38: ***************************************
-17:46:38: *** D3D9 : Subsystem Initialised OK ***
-17:46:38: ***************************************
-17:46:38: ResourceBackgroundQueue - threading disabled
-17:46:38: Particle Renderer Type 'billboard' registered
-17:46:38: SceneManagerFactory for type 'BspSceneManager' registered.
-17:46:38: Registering ResourceManager for type BspLevel
-17:46:38: SceneManagerFactory for type 'OctreeSceneManager' registered.
-17:46:38: SceneManagerFactory for type 'TerrainSceneManager' registered.
-17:46:38: TerrainSceneManager: Registered a new PageSource for type Heightmap
-17:46:38: Creating viewport on target 'OGRE Render Window', rendering from camera 'PlayerCam', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
-17:46:38: Parsing scripts for resource group Autodetect
-17:46:38: Finished parsing scripts for resource group Autodetect
-17:46:38: Parsing scripts for resource group Bootstrap
-17:46:38: Parsing script OgreCore.material
-17:46:38: Parsing script OgreProfiler.material
-17:46:38: Parsing script Ogre.fontdef
-17:46:38: Parsing script OgreDebugPanel.overlay
-17:46:38: Texture: New_Ogre_Border_Center.png: Loading 1 faces(PF_A8R8G8B8,256x128x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x128x1.
-17:46:38: Texture: New_Ogre_Border.png: Loading 1 faces(PF_A8R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x256x1.
-17:46:38: Texture: New_Ogre_Border_Break.png: Loading 1 faces(PF_A8R8G8B8,32x32x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,32x32x1.
-17:46:38: Font BlueHighwayusing texture size 512x512
-17:46:38: Info: Freetype returned null for character 127 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 128 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 129 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 130 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 131 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 132 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 133 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 134 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 135 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 136 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 137 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 138 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 139 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 140 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 141 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 142 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 143 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 144 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 145 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 146 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 147 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 148 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 149 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 150 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 151 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 152 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 153 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 154 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 155 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 156 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 157 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 158 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 159 in font BlueHighway
-17:46:38: Info: Freetype returned null for character 160 in font BlueHighway
-17:46:38: Texture: BlueHighwayTexture: Loading 1 faces(PF_BYTE_LA,512x512x1) with 0 generated mipmaps from Image. Internal format is PF_BYTE_LA,512x512x1.
-17:46:38: Texture: ogretext.png: Loading 1 faces(PF_A8R8G8B8,256x128x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x128x1.
-17:46:38: Parsing script OgreLoadingPanel.overlay
-17:46:38: Finished parsing scripts for resource group Bootstrap
-17:46:38: Parsing scripts for resource group Caelum
-17:46:38: Parsing script GroundFog.program
-17:46:38: Parsing script Haze.program
-17:46:38: Parsing script GroundFog.material
-17:46:38: Parsing script LayeredClouds.material
-17:46:39: OGRE EXCEPTION(2:InvalidParametersException): Parameter called sunDirection does not exist. in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
-17:46:39: Error at line 53 of LayeredClouds.material: Invalid param_named attribute - Parameter called sunDirection does not exist.
-17:46:39: Error at line 53 of LayeredClouds.material: Invalid param_named attribute - expected at least 3 parameters.
-17:46:39: Parsing script Terrain.material
-17:46:39: Finished parsing scripts for resource group Caelum
-17:46:39: Parsing scripts for resource group General
-17:46:39: Parsing script Examples.program
-17:46:39: Parsing script StdQuad_vp.program
-17:46:39: Parsing script BlackAndWhite.material
-17:46:39: Parsing script Bloom.material
-17:46:39: Parsing script Civic.material
-17:46:39: Parsing script creature.material
-17:46:39: Parsing script CustomShadows.material
-17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: High-level program CustomShadows/ShadowCasterVP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: High-level program CustomShadows/ShadowCasterFP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: High-level program CustomShadows/ShadowCasterVP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: High-level program CustomShadows/ShadowCasterFP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: High-level program CustomShadows/ShadowReceiverVP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: High-level program CustomShadows/ShadowReceiverFP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:39: High-level program CustomShadows/ShadowReceiverVP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: High-level program CustomShadows/ShadowReceiverFP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderVP.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: High-level program CustomShadows/SimpleShaderVP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderVP.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderVP.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: High-level program CustomShadows/SimpleShaderVP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderVP.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderFP.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: High-level program CustomShadows/SimpleShaderFP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderFP.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderFP.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: High-level program CustomShadows/SimpleShaderFP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource SimpleShaderFP.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:40: Parsing script DepthShadowmap.material
-17:46:40: Parsing script DOF.material
-17:46:40: Parsing script Embossed.material
-17:46:40: Parsing script Example-DynTex.material
-17:46:40: Parsing script Example-Water.material
-17:46:40: Parsing script Example.material
-17:46:40: Parsing script Examples-Advanced.material
-17:46:41: Parsing script facial.material
-17:46:41: Parsing script Glass.material
-17:46:41: Parsing script hdr.material
-17:46:41: Parsing script HeatVision.material
-17:46:42: Parsing script Hurt.material
-17:46:42: Parsing script instancing.material
-17:46:42: Parsing script Invert.material
-17:46:42: Parsing script Laplace.material
-17:46:42: Parsing script MotionBlur.material
-17:46:42: Parsing script Ocean.material
-17:46:42: Error in material OceanCg at line 176 of Ocean.material: Invalid texture option - combineduvw.
-17:46:43: Parsing script OffsetMapping.material
-17:46:43: Parsing script Ogre.material
-17:46:43: Parsing script OldMovie.material
-17:46:43: Parsing script OldTV.material
-17:46:43: Parsing script PlaneOptimalShadows.material
-17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: High-level program PlaneOptimalShadows/ShadowCasterVP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: High-level program PlaneOptimalShadows/ShadowCasterFP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: High-level program PlaneOptimalShadows/ShadowCasterVP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcastervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: High-level program PlaneOptimalShadows/ShadowCasterFP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowcasterfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: High-level program PlaneOptimalShadows/ShadowReceiverVP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: High-level program PlaneOptimalShadows/ShadowReceiverFP/Cg encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.cg in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: High-level program PlaneOptimalShadows/ShadowReceiverVP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceivervp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: High-level program PlaneOptimalShadows/ShadowReceiverFP/HLSL encountered an error during loading and is thus not supported.
-OGRE EXCEPTION(6:FileNotFoundException): Cannot locate resource customshadowreceiverfp.hlsl in resource group General or any other group. in ResourceGroupManager::openResource at ..\src\OgreResourceGroupManager.cpp (line 604)
-17:46:43: Parsing script Posterize.material
-17:46:43: Parsing script RZR-002.material
-17:46:43: Parsing script Scene.material
-17:46:43: Parsing script SharpenEdges.material
-17:46:43: Parsing script smoke.material
-17:46:43: Parsing script Tiling.material
-17:46:43: Parsing script Tower.material
-17:46:43: Parsing script VarianceShadowmap.material
-17:46:44: Parsing script zombie.material
-17:46:44: Parsing script beech.material
-17:46:44: Parsing script birch.material
-17:46:44: Parsing script blenTree.material
-17:46:44: Parsing script boulder.material
-17:46:44: Parsing script CloudyNoonSkyBox.material
-17:46:44: Parsing script LOTTreeLeaves.material
-17:46:44: Parsing script LOTTreeTrunk.material
-17:46:44: Parsing script Materials.material
-17:46:44: Parsing script palms.material
-17:46:44: Parsing script Pine.material
-17:46:44: Parsing script spotted_shroom.material
-17:46:44: Parsing script tipi.material
-17:46:44: Parsing script tree.material
-17:46:44: Parsing script TreeNew.material
-17:46:44: Parsing script BdBush.material
-17:46:44: Parsing script grass.material
-17:46:44: Parsing script grass1.material
-17:46:44: Parsing script shortgrass.material
-17:46:44: Parsing script OverhangTerrainSceneManager.material
-17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightSpecular does not exist. in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
-17:46:44: Error at line 21 of OverhangTerrainSceneManager.material: Invalid param_named_auto attribute - Parameter called lightSpecular does not exist.
-17:46:44: Parsing script sky.material
-17:46:44: Parsing script ocean_new.material
-17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightSpecular does not exist. in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
-17:46:44: Error at line 38 of ocean_new.material: Invalid param_named_auto attribute - Parameter called lightSpecular does not exist.
-17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightDiffuse does not exist. in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
-17:46:44: Error at line 38 of ocean_new.material: Invalid param_named_auto attribute - Parameter called lightDiffuse does not exist.
-17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called exponent does not exist. in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
-17:46:44: Error at line 38 of ocean_new.material: Invalid param_named attribute - Parameter called exponent does not exist.
-17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called ambient does not exist. in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
-17:46:44: Error at line 38 of ocean_new.material: Invalid param_named attribute - Parameter called ambient does not exist.
-17:46:44: OGRE EXCEPTION(2:InvalidParametersException): Parameter called lightPosition does not exist. in GpuProgramParameters::_findNamedConstantDefinition at ..\src\OgreGpuProgram.cpp (line 883)
-17:46:44: Error at line 38 of ocean_new.material: Invalid param_named_auto attribute - Parameter called lightPosition does not exist.
-17:46:44: Error in material MrBenSea at line 59 of ocean_new.material: Invalid param_named attribute - expected at least 3 parameters.
-17:46:44: Parsing script Ocean_rtt.material
-17:46:44: Parsing script Whale.material
-17:46:44: Parsing script perpixel.material
-17:46:44: OGRE EXCEPTION(4:ItemIdentityException): Resource with the name Ogre/BasicVertexPrograms/AmbientOneTexture already exists. in ResourceManager::add at ..\src\OgreResourceManager.cpp (line 113)
-17:46:44: Error at line 47 of perpixel.material: Could not create GPU program 'Ogre/BasicVertexPrograms/AmbientOneTexture', error reported was: Resource with the name Ogre/BasicVertexPrograms/AmbientOneTexture already exists.
-17:46:45: Parsing script plane.material
-17:46:45: Parsing script RomanBath.material
-17:46:45: Parsing script Examples.compositor
-17:46:45: Parsing script test.fontdef
-17:46:45: Parsing script sample.fontdef
-17:46:45: Parsing script Arial.fontdef
-17:46:45: Parsing script emitted_emitter.particle
-17:46:45: Parsing script Example-Water.particle
-17:46:45: Parsing script Example.particle
-17:46:45: Parsing script smoke.particle
-17:46:45: Parsing script Compositor.overlay
-17:46:45: Parsing script DP3.overlay
-17:46:45: Parsing script Example-CubeMapping.overlay
-17:46:45: Parsing script Example-DynTex.overlay
-17:46:45: Parsing script Example-Water.overlay
-17:46:45: Parsing script Shadows.overlay
-17:46:45: Finished parsing scripts for resource group General
-17:46:45: Parsing scripts for resource group Internal
-17:46:45: Finished parsing scripts for resource group Internal
-17:46:45: TerrainSceneManager: Activated PageSource Heightmap
-17:46:45: Texture: terrain_texture.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
-17:46:45: Texture: grass_1024.jpg: Loading 1 faces(PF_R8G8B8,1024x1024x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,1024x1024x1.
-17:46:45: Texture: terr_rock6.jpg: Loading 1 faces(PF_R8G8B8,1024x1024x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,1024x1024x1.
-17:46:45: Texture: sand.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
-17:46:45: WARNING: Texture instance 'RttTex' was defined as manually loaded, but no manual loader was provided. This Resource will be lost if it has to be reloaded.
-17:46:45: Creating viewport on target 'rtt/3391360', rendering from camera 'ReflectCam', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
-17:46:45: D3D9 : Loading 3D Texture, image name : 'NoiseVolume.dds' with 5 mip map levels
-17:46:45: Initialising Caelum system...
-17:46:45: System attributes set up.
-17:46:45: Generating sky dome material...
-17:46:46: Material not found; creating...
-17:46:46: Material [OK]
-17:46:46: Pass [OK]
-17:46:46: TextureUnit - Sky gradient [OK]
-17:46:46: TextureUnit - Atmosphere depth [OK]
-17:46:46: Texture: EarthClearSky2.png: Loading 1 faces(PF_A8R8G8B8,64x64x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,64x64x1.
-17:46:46: Texture: AtmosphereDepth.png: Loading 1 faces(PF_R8G8B8,32x1x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,32x1x1.
-17:46:46: DONE
-17:46:46: DONE
-17:46:46: Creating CaelumSphericDome sphere mesh resource...
-17:46:46: WARNING: Mesh instance 'CaelumSphericDome' was defined as manually loaded, but no manual loader was provided. This Resource will be lost if it has to be reloaded.
-17:46:46: DONE
-17:46:46: Generating sun material...
-17:46:46: Material not found; creating...
-17:46:46: Material [OK]
-17:46:46: Pass [OK]
-17:46:46: DONE
-17:46:46: DONE
-17:46:46: Mesh: Loading sphere.mesh.
-17:46:46: Generating starfield material...
-17:46:46: Material not found; creating...
-17:46:46: Material [OK]
-17:46:46: Pass [OK]
-17:46:46: TextureUnit [OK]
-17:46:46: DONE
-17:46:46: DONE
-17:46:46: Texture: Starfield.jpg: Loading 1 faces(PF_R8G8B8,1024x1024x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,1024x1024x1.
-17:46:46: Creating CaelumStarfieldDome sphere mesh resource...
-17:46:46: WARNING: Mesh instance 'CaelumStarfieldDome' was defined as manually loaded, but no manual loader was provided. This Resource will be lost if it has to be reloaded.
-17:46:46: DONE
-17:46:46: Texture: noise1.png: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:46: Texture: noise2.png: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:46: Texture: noise3.png: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:46: Texture: noise4.png: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:46: Texture: Noise1.png: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:46: Texture: Noise2.png: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:46: Texture: Noise3.png: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:46: Texture: Noise4.png: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:46: DONE
-17:46:46: Mesh: Loading KinkyPalm.mesh.
-17:46:46: Texture: palmtree_palmtexture_2.t.bmp: Loading 1 faces(PF_A8R8G8B8,512x512x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,512x512x1.
-17:46:46: Mesh: Loading StraightPalm.mesh.
-17:46:46: Mesh: Loading BendyPalm.mesh.
-17:46:46: Mesh: Loading BigDarkBush.mesh.
-17:46:46: Texture: bush3_IMG_1409.png: Loading 1 faces(PF_A8R8G8B8,512x512x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,512x512x1.
-17:46:46: Mesh: Loading birch.mesh.
-17:46:46: Texture: LEAFS.PNG: Loading 1 faces(PF_A8R8G8B8,512x512x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,512x512x1.
-17:46:46: Texture: PLANTS09.JPG: Loading 1 faces(PF_R8G8B8,512x512x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
-17:46:46: Mesh: Loading benTree.mesh.
-17:46:46: D3D9 : ***** Dimensions altered by the render system
-17:46:46: D3D9 : ***** Source image dimensions : 600x600
-17:46:46: D3D9 : ***** Texture dimensions : 1024x1024
-17:46:46: Texture: wood7.jpg: Loading 1 faces(PF_R8G8B8,600x600x1) with 5 generated mipmaps from Image. Internal format is PF_X8R8G8B8,1024x1024x1.
-17:46:46: Texture: tree_bush.png: Loading 1 faces(PF_A8R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x256x1.
-17:46:47: Mesh: Loading spotty_shroom.mesh.
-17:46:47: Texture: spotty_shroom.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:47: Mesh: Loading blue_shroom.mesh.
-17:46:47: Texture: blue_shroom.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:47: Mesh: Loading beech_tree.mesh.
-17:46:47: Texture: branches.png: Loading 1 faces(PF_A8R8G8B8,128x128x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,128x128x1.
-17:46:47: Mesh: Loading Pine.mesh.
-17:46:47: D3D9 : ***** Dimensions altered by the render system
-17:46:47: D3D9 : ***** Source image dimensions : 500x500
-17:46:47: D3D9 : ***** Texture dimensions : 512x512
-17:46:47: Texture: leaves5.png: Loading 1 faces(PF_A8R8G8B8,500x500x1) with 5 generated mipmaps from Image. Internal format is PF_A8R8G8B8,512x512x1.
-17:46:47: D3D9 : ***** Dimensions altered by the render system
-17:46:47: D3D9 : ***** Source image dimensions : 1536x1024
-17:46:47: D3D9 : ***** Texture dimensions : 2048x1024
-17:46:47: Texture: bark23.jpg: Loading 1 faces(PF_R8G8B8,1536x1024x1) with 5 generated mipmaps from Image. Internal format is PF_X8R8G8B8,2048x1024x1.
-17:46:50: Texture: terrain_grass.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
-17:46:50: D3D9 : ***** Dimensions altered by the render system
-17:46:50: D3D9 : ***** Source image dimensions : 513x513
-17:46:50: D3D9 : ***** Texture dimensions : 1024x1024
-17:46:50: Texture: densitymap.png: Loading 1 faces(PF_A8R8G8B8,513x513x1) with 5 generated mipmaps from Image. Internal format is PF_A8R8G8B8,1024x1024x1.
-17:46:51: Mesh: Loading robot.mesh.
-17:46:51: Skeleton: Loading robot.skeleton
-17:46:51: Texture: r2skin.jpg: Loading 1 faces(PF_R8G8B8,512x512x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,512x512x1.
-17:46:51: Mesh: Loading whale.mesh.
-17:46:51: Skeleton: Loading Whale-whalebone.skeleton
-17:46:51: Texture: Whale.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:51: WARNING: the mesh 'whale.mesh' includes vertices without bone assignments. Those vertices will transform to wrong position when skeletal animation enabled. To eliminate this, assign at least one bone assignment per vertex on your mesh.
-17:46:51: Mesh: Loading tipi.mesh.
-17:46:51: Texture: tipi.jpg: Loading 1 faces(PF_R8G8B8,256x256x1) with hardware generated mipmaps from Image. Internal format is PF_X8R8G8B8,256x256x1.
-17:46:51: Creating viewport on target 'rtt/214041824', rendering from camera 'ImpostorCam2', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
-17:46:51: Creating resource group BinFolder
-17:46:51: Added resource location '.' of type 'FileSystem' to resource group 'BinFolder'
-17:46:51: Texture: Impostor.General.BigDarkBush.mesh.png: Loading 1 faces(PF_A8R8G8B8,1024x512x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,1024x512x1.
-17:46:51: Render Target 'rtt/214041824' Average FPS: 0 Best FPS: 0 Worst FPS: 999
-17:46:51: Creating viewport on target 'rtt/214045024', rendering from camera 'ImpostorCam36', relative dimensions L: 0.00 T: 0.00 W: 1.00 H: 1.00 ZOrder: 0
-17:46:51: Added resource location '.' of type 'FileSystem' to resource group 'BinFolder'
-17:46:51: Texture: Impostor.General.Pine.mesh.png: Loading 1 faces(PF_A8R8G8B8,1024x512x1) with hardware generated mipmaps from Image. Internal format is PF_A8R8G8B8,1024x512x1.
-17:46:51: Render Target 'rtt/214045024' Average FPS: 0 Best FPS: 0 Worst FPS: 999
-17:46:52: D3D9 : ***** Dimensions altered by the render system
-17:46:52: D3D9 : ***** Source image dimensions : 253x253
-17:46:52: D3D9 : ***** Texture dimensions : 256x256
-17:46:52: Texture: grass2.png: Loading 1 faces(PF_A8R8G8B8,253x253x1) with 5 generated mipmaps from Image. Internal format is PF_A8R8G8B8,256x256x1.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2009-01-16 07:03:03
|
Revision: 839
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=839&view=rev
Author: mithro
Date: 2009-01-16 07:03:00 +0000 (Fri, 16 Jan 2009)
Log Message:
-----------
Fix the deps.
I'll get this right soon.
Modified Paths:
--------------
trunk/python-ogre/debs/pyplusplus-debian/control
Modified: trunk/python-ogre/debs/pyplusplus-debian/control
===================================================================
--- trunk/python-ogre/debs/pyplusplus-debian/control 2009-01-15 05:06:53 UTC (rev 838)
+++ trunk/python-ogre/debs/pyplusplus-debian/control 2009-01-16 07:03:00 UTC (rev 839)
@@ -9,7 +9,7 @@
Package: pyplusplus
Architecture: all
-Depends: ${python:Depends}, pygccxml (= 0.9.0+svn%%SHORTDATE%%-0), libboost-python1.36.1-index
+Depends: ${python:Depends}, pygccxml (= 0.9.0+svn%%SHORTDATE%%-0), libboost-python1.36-index
XB-Python-Version: ${python:Versions}
Description: Py++ is a code generator for Boost.Python that simplifies writing
Python bindings of a C/C++ library. The tool is implemented as a Python
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2009-01-15 05:06:56
|
Revision: 838
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=838&view=rev
Author: mithro
Date: 2009-01-15 05:06:53 +0000 (Thu, 15 Jan 2009)
Log Message:
-----------
Update the control file for boost 1.36.
Modified Paths:
--------------
trunk/python-ogre/debs/pyplusplus-debian/control
Modified: trunk/python-ogre/debs/pyplusplus-debian/control
===================================================================
--- trunk/python-ogre/debs/pyplusplus-debian/control 2009-01-14 05:52:16 UTC (rev 837)
+++ trunk/python-ogre/debs/pyplusplus-debian/control 2009-01-15 05:06:53 UTC (rev 838)
@@ -9,7 +9,7 @@
Package: pyplusplus
Architecture: all
-Depends: ${python:Depends}, pygccxml (= 0.9.0+svn%%SHORTDATE%%-0), libboost-python1.34.1-index
+Depends: ${python:Depends}, pygccxml (= 0.9.0+svn%%SHORTDATE%%-0), libboost-python1.36.1-index
XB-Python-Version: ${python:Versions}
Description: Py++ is a code generator for Boost.Python that simplifies writing
Python bindings of a C/C++ library. The tool is implemented as a Python
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2009-01-14 05:52:30
|
Revision: 837
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=837&view=rev
Author: mithro
Date: 2009-01-14 05:52:16 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
Force the compatibility level for the build service.
Modified Paths:
--------------
trunk/python-ogre/debs/gccxml-debian/rules
trunk/python-ogre/debs/pygccxml-debian/rules
trunk/python-ogre/debs/pyplusplus-debian/rules
Modified: trunk/python-ogre/debs/gccxml-debian/rules
===================================================================
--- trunk/python-ogre/debs/gccxml-debian/rules 2009-01-13 10:40:55 UTC (rev 836)
+++ trunk/python-ogre/debs/gccxml-debian/rules 2009-01-14 05:52:16 UTC (rev 837)
@@ -2,7 +2,8 @@
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+export DH_COMPAT=5
BUILDDIR=build
Modified: trunk/python-ogre/debs/pygccxml-debian/rules
===================================================================
--- trunk/python-ogre/debs/pygccxml-debian/rules 2009-01-13 10:40:55 UTC (rev 836)
+++ trunk/python-ogre/debs/pygccxml-debian/rules 2009-01-14 05:52:16 UTC (rev 837)
@@ -4,7 +4,8 @@
# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+export DH_COMPAT=5
PYTHON := /usr/bin/python
#PYVER := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
Modified: trunk/python-ogre/debs/pyplusplus-debian/rules
===================================================================
--- trunk/python-ogre/debs/pyplusplus-debian/rules 2009-01-13 10:40:55 UTC (rev 836)
+++ trunk/python-ogre/debs/pyplusplus-debian/rules 2009-01-14 05:52:16 UTC (rev 837)
@@ -4,7 +4,8 @@
# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+export DH_COMPAT=5
PYTHON := /usr/bin/python
#PYVER := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2009-01-13 10:40:57
|
Revision: 836
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=836&view=rev
Author: mithro
Date: 2009-01-13 10:40:55 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
Update the deps.
Modified Paths:
--------------
trunk/python-ogre/debs/pyplusplus-debian/control
Modified: trunk/python-ogre/debs/pyplusplus-debian/control
===================================================================
--- trunk/python-ogre/debs/pyplusplus-debian/control 2009-01-13 10:17:57 UTC (rev 835)
+++ trunk/python-ogre/debs/pyplusplus-debian/control 2009-01-13 10:40:55 UTC (rev 836)
@@ -4,7 +4,7 @@
Priority: optional
Maintainer: Tim 'Mithro' Ansell <mi...@mi...>
Build-Depends-Indep: python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all
-Build-Depends: debhelper (>= 5.0.38), pygccxml (= 0.9.0+svn%%SHORTDATE%%-0), libboost-python1.34.1-index-dev, python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all
+Build-Depends: debhelper (>= 5.0.38), pygccxml (= 0.9.0+svn%%SHORTDATE%%-0), libboost-python1.36-index-dev, python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-all
Standards-Version: 3.7.2
Package: pyplusplus
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2009-01-13 10:18:07
|
Revision: 835
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=835&view=rev
Author: mithro
Date: 2009-01-13 10:17:57 +0000 (Tue, 13 Jan 2009)
Log Message:
-----------
Make the build-maketar script even more brutal.
Modified Paths:
--------------
trunk/python-ogre/scripts/build-maketar.sh
Modified: trunk/python-ogre/scripts/build-maketar.sh
===================================================================
--- trunk/python-ogre/scripts/build-maketar.sh 2009-01-12 07:49:50 UTC (rev 834)
+++ trunk/python-ogre/scripts/build-maketar.sh 2009-01-13 10:17:57 UTC (rev 835)
@@ -13,26 +13,33 @@
cp -rvf python-ogre-pristine/ python-ogre/
rm -rvf \
- python-ogre/boost \
- python-ogre/debs \
- python-ogre/debian \
- python-ogre/demos \
- python-ogre/docs \
- python-ogre/packages_2.6 \
+ python-ogre/boost \
+ python-ogre/debs \
+ python-ogre/debian \
+ python-ogre/demos \
+ python-ogre/docs \
+ python-ogre/packages_2.6 \
python-ogre/patch \
- python-ogre/ogre_cvs.sh \
- python-ogre/scripts \
- python-ogre/SourceSnapShots \
- python-ogre/ThirdParty/extra \
- python-ogre/ThirdParty/dshow \
- python-ogre/ThirdParty/History \
- python-ogre/ThirdParty/vcredist_x86.exe \
+ python-ogre/ogre_cvs.sh \
+ python-ogre/scripts \
+ python-ogre/SourceSnapShots \
+ python-ogre/ThirdParty/extra \
+ python-ogre/ThirdParty/dshow \
+ python-ogre/ThirdParty/History \
+ python-ogre/ThirdParty/vcredist_x86.exe \
+ python-ogre/convertonew.sed \
+ python-ogre/convert.py \
+ python-ogre/convert.sed \
+ python-ogre/test.nsi \
+ python-ogre/postinstall.rtf \
+ python-ogre/installWarning.rtf \
+ python-ogre/makehelp.bat \
+ python-ogre/config.ini \
+ python-ogre/PythonOgreInstallCreator.iss \
find python-ogre -name .svn | xargs rm -rf
-touch python-ogre/STABLE
-
tar -czvf python-ogre.tar.gz python-ogre
md5sum python-ogre.tar.gz
du -k python-ogre.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mi...@us...> - 2009-01-12 07:49:55
|
Revision: 834
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=834&view=rev
Author: mithro
Date: 2009-01-12 07:49:50 +0000 (Mon, 12 Jan 2009)
Log Message:
-----------
Make this potentially dangerous script a little safer.
Modified Paths:
--------------
trunk/python-ogre/scripts/build-maketar.sh
Modified: trunk/python-ogre/scripts/build-maketar.sh
===================================================================
--- trunk/python-ogre/scripts/build-maketar.sh 2009-01-12 07:37:43 UTC (rev 833)
+++ trunk/python-ogre/scripts/build-maketar.sh 2009-01-12 07:49:50 UTC (rev 834)
@@ -1,5 +1,10 @@
#! /bin/sh
+if [ ! -e python-ogre-pristine ]; then
+ echo "I need a clean checkout of python-ogre in python-ogre-pristine"
+ exit 1
+fi
+
rm -rvf python-ogre
cd python-ogre-pristine
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
