|
From: <and...@us...> - 2008-10-20 15:08:54
|
Revision: 766
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=766&view=rev
Author: andy_miller
Date: 2008-10-20 15:08:45 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
Updates to OgreOde demos
Modified Paths:
--------------
trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
trunk/python-ogre/demos/ogreode/Demo_Scenes.py
trunk/python-ogre/demos/ogreode/SimpleScenes.py
trunk/python-ogre/demos/ogreode/SimpleScenes_Chain.py
trunk/python-ogre/demos/ogreode/SimpleScenes_Joints.py
trunk/python-ogre/demos/ogreode/SimpleScenes_TriMesh.py
Modified: trunk/python-ogre/demos/ogreode/Demo_GranTurism.py
===================================================================
--- trunk/python-ogre/demos/ogreode/Demo_GranTurism.py 2008-10-20 15:00:39 UTC (rev 765)
+++ trunk/python-ogre/demos/ogreode/Demo_GranTurism.py 2008-10-20 15:08:45 UTC (rev 766)
@@ -207,8 +207,7 @@
toCam.x -= camDistance * q.zAxis().x
self.camera.move( (toCam - self.camera.getPosition()) * followFactor )
- self.camera.lookAt(self.vehicle.getSceneNode().getPosition() + ((self.vehicle.getSceneNode().getOrientation() * ogre.Vector3.UNIT_Z) * camLookAhead))
- print "*** FrameStarted End" , ret
+ self.camera.lookAt(self.vehicle.getSceneNode().getPosition() + ((self.vehicle.getSceneNode().getOrientation() * ogre.Vector3().UNIT_Z) * camLookAhead))
return ret
#------------------------------------------------------------------------------------------------
@@ -251,7 +250,6 @@
#------------------------------------------------------------------------------------------------
# Just override the mandatory create scene method
def _createScene(self):
- print "** _CreateScene"
# Set ambient light
self.sceneManager.setAmbientLight(ogre.ColourValue(0.5, 0.5, 0.5))
self.sceneManager.setSkyBox(True,"GranTurismOgre/Skybox")
@@ -283,11 +281,7 @@
track_node.attachObject(track_mesh)
ei = OgreOde.EntityInformer(track_mesh)
- print "** Done 1"
- print ei
- print self._world.getDefaultSpace()
self._track = ei.createStaticTriangleMesh(self._world, self._world.getDefaultSpace())
- print "****"
#------------------------------------------------------------------------------------------------
# Create new frame listener
@@ -296,7 +290,6 @@
self.root.addFrameListener(self.FrameListener)
#------------------------------------------------------------------------------------------------
def collision(self, contact):
- print "** Collision "
if not OgreOde.Vehicle.handleTyreCollision(contact):
contact.setBouncyness(0.0)
contact.setCoulombFriction(18.0)
Modified: trunk/python-ogre/demos/ogreode/Demo_Scenes.py
===================================================================
--- trunk/python-ogre/demos/ogreode/Demo_Scenes.py 2008-10-20 15:00:39 UTC (rev 765)
+++ trunk/python-ogre/demos/ogreode/Demo_Scenes.py 2008-10-20 15:08:45 UTC (rev 766)
@@ -191,7 +191,7 @@
s = sceneManager.createStaticGeometry("StaticFloor")
s.setRegionDimensions((160.0, 100.0, 160.0))
## Set the region origin so the center is at 0 world
- s.setOrigin(ogre.Vector3.ZERO)
+ s.setOrigin(ogre.Vector3().ZERO)
## Use a load of meshes to represent the floor
i = 0
Modified: trunk/python-ogre/demos/ogreode/SimpleScenes.py
===================================================================
--- trunk/python-ogre/demos/ogreode/SimpleScenes.py 2008-10-20 15:00:39 UTC (rev 765)
+++ trunk/python-ogre/demos/ogreode/SimpleScenes.py 2008-10-20 15:08:45 UTC (rev 766)
@@ -13,11 +13,8 @@
STEP_RATE = 0.01
def __init__ ( self, world ):
global KEY_DELAY
- print "** SimpleScenes Init"
OgreOde.CollisionListener.__init__(self)
- print "1"
OgreOde.StepListener.__init__(self)
- print "Ode Created"
self._world = world
self._mgr = self._world.getSceneManager()
self._world.setCollisionListener(self)
@@ -25,29 +22,17 @@
self._key_delay = 1.0 # KEY_DELAY
self._last_node = 0
self.RagdollList=[]
- print "3"
self.dotOgreOdeLoader = OgreOde.DotLoader( world )
- print "3.1"
self._bodies=[] # an array to keep objects around in (like c++ "new" )
self._geoms=[]
self._joints=[]
- print "3.2"
self._ragdollFactory = OgreOde.RagdollFactory()
- print dir (OgreOde)
- print dir ( self._ragdollFactory)
# print self._ragdollFactory.Type
- print "Type is:", self._ragdollFactory.getType()
- print "Flags:", self._ragdollFactory.requestTypeFlags()
- print "3.3"
- print self._ragdollFactory
- print ogre.Root.getSingletonPtr()
ogre.Root.getSingletonPtr().addMovableObjectFactory(self._ragdollFactory)
- print "3.4"
self.setInfoText("")
- print "4"
self.xmlNames = [
"zombie",
"zombie",
@@ -82,14 +67,13 @@
]
self.sSelectedMesh = 0
self._ragdoll_count = 0
- print "SimpleScenes Init Done"
#
# Called by OgreOde whenever a collision occurs, so
# that we can modify the contact parameters
#
def collision( self, contact) :
-# print "Simple Scenes Collision"
+# "Simple Scenes Collision"
## Check for collisions between things that are connected and ignore them
g1 = contact.getFirstGeometry()
g2 = contact.getSecondGeometry()
@@ -210,7 +194,6 @@
typeName = "gun"
else:
typeName = "unknown"
- print "2", typeName
## Create the visual representation (the Ogre entity and scene node)
name = typeName + str(len(self._bodies))
entity = self._mgr.createEntity(name, typeName + ".mesh")
@@ -218,19 +201,13 @@
node.attachObject(entity)
# entity.setNormaliseNormals(True)
entity.setCastShadows(True)
- print "3"
## Pick a size
size = ogre.Vector3((OgreOde.Utility.randomReal() * 0.5 + 0.1) * 2.0,
(OgreOde.Utility.randomReal() * 0.5 + 0.1) * 2.0,
(OgreOde.Utility.randomReal() * 0.5 + 0.1) * 2.0)
- print size
## Create a body associated with the node we created
body = OgreOde.Body(self._world) ##AJM
- print body
- print "About to attach"
- print node
node.attachObject(body)
- print "node:", node
## Set the mass and geometry to match the visual representation
@@ -245,21 +222,17 @@
body.setMass(mass)
elif objectClass == OgreOde.Geometry.Class_Sphere:
- print "setting spehere"
mass= OgreOde.SphereMass(1.0,size.x)
mass.setDensity(5.0,size.x)
- print mass
geom = OgreOde.SphereGeometry(size.x,self._world,self._space)
- print geom
node.setScale(size.x * 0.2,size.x * 0.2,size.x * 0.2)
body.setMass(mass)
- print body
elif objectClass == OgreOde.Geometry.Class_Cylinder:
size.x *= 0.5
- mass = OgreOde.CapsuleMass(1.0,size.x,ogre.Vector3.UNIT_Z,size.y)
- mass.setDensity(5.0,size.x,ogre.Vector3.UNIT_Z,size.y)
+ mass = OgreOde.CapsuleMass(1.0,size.x,ogre.Vector3().UNIT_Z,size.y)
+ mass.setDensity(5.0,size.x,ogre.Vector3().UNIT_Z,size.y)
geom = OgreOde.CapsuleGeometry(size.x,size.y,self._world, self._space)
node.setScale(size.x,size.x,(size.y + (size.x * 2.0)) * 0.25)
@@ -276,7 +249,6 @@
body.setMass(mass)
## Tie the collision geometry to the physical body
- print "5"
geom.setBody(body)
## Keep track of the body
@@ -284,7 +256,6 @@
self._geoms.append(geom)
self._key_delay = 0.0
- print "body is: ", body
## If we created something position and orient it randomly
if (body) :
body.setOrientation(ogre.Quaternion(ogre.Radian(OgreOde.Utility.randomReal() * 10.0 - 5.0),
Modified: trunk/python-ogre/demos/ogreode/SimpleScenes_Chain.py
===================================================================
--- trunk/python-ogre/demos/ogreode/SimpleScenes_Chain.py 2008-10-20 15:00:39 UTC (rev 765)
+++ trunk/python-ogre/demos/ogreode/SimpleScenes_Chain.py 2008-10-20 15:08:45 UTC (rev 766)
@@ -21,7 +21,7 @@
self._first_body = None
self._box_body = None
self._force = 0
- self._force_to_apply = ogre.Vector3.ZERO
+ self._force_to_apply = ogre.Vector3().ZERO
## Set up the sizes of stuff
link_size = 0.4
@@ -76,13 +76,13 @@
def frameEnded(self, time, input, mouse):
SimpleScenes.frameEnded(self, time, input, mouse)
- self._force_to_apply = ogre.Vector3.ZERO
+ self._force_to_apply = ogre.Vector3().ZERO
right = self._mgr.getCamera("PlayerCam").getRight()
- forward = right.crossProduct(ogre.Vector3.UNIT_Y)
+ forward = right.crossProduct(ogre.Vector3().UNIT_Y)
## Up
- if (input.isKeyDown(OIS.KC_X)): self._force_to_apply += ogre.Vector3.UNIT_Y * self._force
+ if (input.isKeyDown(OIS.KC_X)): self._force_to_apply += ogre.Vector3().UNIT_Y * self._force
## Left/right
elif (input.isKeyDown(OIS.KC_J)): self._force_to_apply -= right * self._force
@@ -91,7 +91,7 @@
## Forward/back
elif (input.isKeyDown(OIS.KC_K)): self._force_to_apply += forward * self._force
elif (input.isKeyDown(OIS.KC_I)): self._force_to_apply -= forward * self._force
- else: self._force_to_apply = ogre.Vector3.ZERO
+ else: self._force_to_apply = ogre.Vector3().ZERO
self._mgr.getCamera("PlayerCam")
Modified: trunk/python-ogre/demos/ogreode/SimpleScenes_Joints.py
===================================================================
--- trunk/python-ogre/demos/ogreode/SimpleScenes_Joints.py 2008-10-20 15:00:39 UTC (rev 765)
+++ trunk/python-ogre/demos/ogreode/SimpleScenes_Joints.py 2008-10-20 15:08:45 UTC (rev 766)
@@ -75,7 +75,7 @@
joint = OgreOde.HingeJoint(self._world)
joint.attach(body)
- joint.setAxis(ogre.Vector3.UNIT_Y)
+ joint.setAxis(ogre.Vector3().UNIT_Y)
joint.setAnchor(ogre.Vector3(-10,4.01,3.5))
self._bodies.append(body)
@@ -100,7 +100,7 @@
joint = OgreOde.HingeJoint(self._world)
joint.attach(body)
- joint.setAxis(ogre.Vector3.UNIT_Y)
+ joint.setAxis(ogre.Vector3().UNIT_Y)
joint.setAnchor(ogre.Vector3(-15,4.01,-3.5))
self._bodies.append(body)
@@ -125,7 +125,7 @@
joint = OgreOde.HingeJoint(self._world)
joint.attach(body)
- joint.setAxis(ogre.Vector3.UNIT_Z)
+ joint.setAxis(ogre.Vector3().UNIT_Z)
joint.setAnchor(ogre.Vector3(10,8.1,0))
self._bodies.append(body)
Modified: trunk/python-ogre/demos/ogreode/SimpleScenes_TriMesh.py
===================================================================
--- trunk/python-ogre/demos/ogreode/SimpleScenes_TriMesh.py 2008-10-20 15:00:39 UTC (rev 765)
+++ trunk/python-ogre/demos/ogreode/SimpleScenes_TriMesh.py 2008-10-20 15:08:45 UTC (rev 766)
@@ -22,7 +22,7 @@
node.attachObject(entity)
node.setScale(ogre.Vector3(0.4,0.3,0.4))
node.setPosition(ogre.Vector3(0,3,0))
- node.setOrientation(ogre.Quaternion(ogre.Degree(30),ogre.Vector3.UNIT_Y))
+ node.setOrientation(ogre.Quaternion(ogre.Degree(30),ogre.Vector3().UNIT_Y))
# entity.setNormaliseNormals(True)
##entity.setCastShadows(False)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
