[Python-ogre-commit] SF.net SVN: python-ogre:[762] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre:[762] trunk/python-ogre
|
From: <and...@us...> - 2008-10-20 14:27:50
|
Revision: 762
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=762&view=rev
Author: andy_miller
Date: 2008-10-20 14:27:42 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
Small fix to Ogre Forests -- setHeightFunction on Loader2D works
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogreforests/hand_made_wrappers.py
trunk/python-ogre/demos/ogreforests/Demo_Forest_01.py
trunk/python-ogre/demos/ogreforests/Demo_Forest_02.py
trunk/python-ogre/demos/qgui/Demo_QuickGUI01.py
Modified: trunk/python-ogre/code_generators/ogreforests/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/hand_made_wrappers.py 2008-10-20 13:48:25 UTC (rev 761)
+++ trunk/python-ogre/code_generators/ogreforests/hand_made_wrappers.py 2008-10-20 14:27:42 UTC (rev 762)
@@ -14,7 +14,7 @@
return y;
}
-void TreeLoader2D_setHeightFunction( TreeLoader2D & me, PyObject* function, std::string name="" ) {
+void TreeLoader2D_setHeightFunction( Forests::TreeLoader2D & me, PyObject* function, std::string name="" ) {
mSubscriber_tree = function;
mName_tree = name;
me.setHeightFunction ( &HelperHeightFunction_Tree2D );
@@ -34,7 +34,7 @@
return y;
}
-void GrassLoader_setHeightFunction( GrassLoader & me, PyObject* function, std::string name="" ) {
+void GrassLoader_setHeightFunction( Forests::GrassLoader & me, PyObject* function, std::string name="" ) {
mSubscriber_grass = function;
mName_grass = name;
me.setHeightFunction ( &HelperHeightFunction_Grass );
@@ -86,9 +86,9 @@
# rt.add_declaration_code( WRAPPER_DEFINITION_GrassLoader )
# apply_reg (rt, WRAPPER_REGISTRATION_GrassLoader )
-# rt = mb.class_( 'TreeLoader2D' )
-# rt.add_declaration_code( WRAPPER_DEFINITION_TreeLoader2D )
-# apply_reg (rt, WRAPPER_REGISTRATION_TreeLoader2D )
+ rt = mb.class_( 'TreeLoader2D' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_TreeLoader2D )
+ apply_reg (rt, WRAPPER_REGISTRATION_TreeLoader2D )
rt = mb.class_( 'PagedGeometry' )
rt.add_declaration_code( WRAPPER_DEFINITION_PagedGeometry )
Modified: trunk/python-ogre/demos/ogreforests/Demo_Forest_01.py
===================================================================
--- trunk/python-ogre/demos/ogreforests/Demo_Forest_01.py 2008-10-20 13:48:25 UTC (rev 761)
+++ trunk/python-ogre/demos/ogreforests/Demo_Forest_01.py 2008-10-20 14:27:42 UTC (rev 762)
@@ -34,8 +34,8 @@
self.initialized = True
# self.MyRaySceneQueryListener = self.MyRaySceneQueryListener()
self.raySceneQuery = ogre.RaySceneQuery( sceneMgr )
- self.updateRay.setOrigin(ogre.Vector3.ZERO)
- self.updateRay.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+ self.updateRay.setOrigin(ogre.Vector3().ZERO)
+ self.updateRay.setDirection(ogre.Vector3().NEGATIVE_UNIT_Y)
self.raySceneQuery = sceneMgr.createRayQuery(self.updateRay)
self.raySceneQuery.setQueryTypeMask(ogre.SceneManager.WORLD_GEOMETRY_TYPE_MASK)
self.raySceneQuery.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
@@ -46,7 +46,7 @@
##there's no need for extra data other than the x/z coordinates.
def getTerrainHeight(self, x, z, userData = None):
self.updateRay.setOrigin(ogre.Vector3(x, 0.0, z))
- self.updateRay.setDirection(ogre.Vector3.UNIT_Y)
+ self.updateRay.setDirection(ogre.Vector3().UNIT_Y)
self.raySceneQuery.setRay(self.updateRay)
self.raySceneQuery.execute(self.raySceneQueryListener)
@@ -61,7 +61,7 @@
def getTerrainHeight( self, x, z, UserData=None ):
if ( x < 0 or z < 0 or x > 1500 or z > 1500 ): return 0
self.updateRay.setOrigin( ogre.Vector3(x, 0.0, z) )
- self.updateRay.setDirection( ogre.Vector3.UNIT_Y )
+ self.updateRay.setDirection( ogre.Vector3().UNIT_Y )
self.raySceneQuery.setRay( self.updateRay )
self.raySceneQuery.execute( self.raySceneQueryListener )
return self.raySceneQueryListener.resultDistance
@@ -101,7 +101,7 @@
#
# ##RaySceneQuery for terrain height check
# self.updateRay.setOrigin(camera.getPosition())
-# self.updateRay.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+# self.updateRay.setDirection(ogre.Vector3().NEGATIVE_UNIT_Y)
# self.raySceneQuery = self.sceneManager.createRayQuery(self.updateRay)
# self.raySceneQuery.setQueryTypeMask(ogre.SceneManager.WORLD_GEOMETRY_TYPE_MASK )
# self.raySceneQuery.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
@@ -197,7 +197,7 @@
self.app = app
# use this to tweak the persons position
self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
- ogre.Vector3.NEGATIVE_UNIT_Y))
+ ogre.Vector3().NEGATIVE_UNIT_Y))
def frameStarted(self, frameEvent):
@@ -207,7 +207,7 @@
#
# updateRay = ogre.Ray()
# updateRay.setOrigin (self.camera.getPosition() + ogre.Vector3(0.0, 10.0, 0.0))
-# updateRay.setDirection (ogre.Vector3.NEGATIVE_UNIT_Y)
+# updateRay.setDirection (ogre.Vector3().NEGATIVE_UNIT_Y)
# self.raySceneQuery.Ray = updateRay
# for queryResult in self.raySceneQuery.execute():
# if queryResult.worldFragment is not None:
Modified: trunk/python-ogre/demos/ogreforests/Demo_Forest_02.py
===================================================================
--- trunk/python-ogre/demos/ogreforests/Demo_Forest_02.py 2008-10-20 13:48:25 UTC (rev 761)
+++ trunk/python-ogre/demos/ogreforests/Demo_Forest_02.py 2008-10-20 14:27:42 UTC (rev 762)
@@ -34,8 +34,8 @@
self.initialized = True
# self.MyRaySceneQueryListener = self.MyRaySceneQueryListener()
self.raySceneQuery = ogre.RaySceneQuery( sceneMgr )
- self.updateRay.setOrigin(ogre.Vector3.ZERO)
- self.updateRay.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+ self.updateRay.setOrigin(ogre.Vector3().ZERO)
+ self.updateRay.setDirection(ogre.Vector3().NEGATIVE_UNIT_Y)
self.raySceneQuery = sceneMgr.createRayQuery(self.updateRay)
self.raySceneQuery.setQueryTypeMask(ogre.SceneManager.WORLD_GEOMETRY_TYPE_MASK)
self.raySceneQuery.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
@@ -46,7 +46,7 @@
##there's no need for extra data other than the x/z coordinates.
def getTerrainHeight(self, x, z, userData = None):
self.updateRay.setOrigin(ogre.Vector3(x, 0.0, z))
- self.updateRay.setDirection(ogre.Vector3.UNIT_Y)
+ self.updateRay.setDirection(ogre.Vector3().UNIT_Y)
self.raySceneQuery.setRay(self.updateRay)
self.raySceneQuery.execute(self.raySceneQueryListener)
@@ -61,7 +61,7 @@
def getTerrainHeight( self, x, z, UserData=None ):
if ( x < 0 or z < 0 or x > 1500 or z > 1500 ): return 0
self.updateRay.setOrigin( ogre.Vector3(x, 0.0, z) )
- self.updateRay.setDirection( ogre.Vector3.UNIT_Y )
+ self.updateRay.setDirection( ogre.Vector3().UNIT_Y )
self.raySceneQuery.setRay( self.updateRay )
self.raySceneQuery.execute( self.raySceneQueryListener )
return self.raySceneQueryListener.resultDistance
@@ -101,7 +101,7 @@
#
# ##RaySceneQuery for terrain height check
# self.updateRay.setOrigin(camera.getPosition())
-# self.updateRay.setDirection(ogre.Vector3.NEGATIVE_UNIT_Y)
+# self.updateRay.setDirection(ogre.Vector3().NEGATIVE_UNIT_Y)
# self.raySceneQuery = self.sceneManager.createRayQuery(self.updateRay)
# self.raySceneQuery.setQueryTypeMask(ogre.SceneManager.WORLD_GEOMETRY_TYPE_MASK )
# self.raySceneQuery.setWorldFragmentType(ogre.SceneQuery.WFT_SINGLE_INTERSECTION)
@@ -130,11 +130,12 @@
self.HeightFunction = HeightFunction()
self.HeightFunction.initialize( self.sceneManager )
+ print dir(self.treeLoader)
self.treeLoader.setHeightFunction ( self.HeightFunction, "getTerrainHeight" )
##And add 20,000 trees to the scene through the "easy-to-use" TreeLoader class
myTree = self.sceneManager.createEntity("Tree", "tree2.mesh")
- position = ogre.Vector3(ogre.Vector3.ZERO)
+ position = ogre.Vector3().ZERO
for i in range (20000):
yaw = ogre.Degree(random.randrange(0, 360))
@@ -196,7 +197,7 @@
self.app = app
# use this to tweak the persons position
self.raySceneQuery = app.sceneManager.createRayQuery(ogre.Ray(app.camera.getPosition(),
- ogre.Vector3.NEGATIVE_UNIT_Y))
+ ogre.Vector3().NEGATIVE_UNIT_Y))
def frameStarted(self, frameEvent):
@@ -206,7 +207,7 @@
#
# updateRay = ogre.Ray()
# updateRay.setOrigin (self.camera.getPosition() + ogre.Vector3(0.0, 10.0, 0.0))
-# updateRay.setDirection (ogre.Vector3.NEGATIVE_UNIT_Y)
+# updateRay.setDirection (ogre.Vector3().NEGATIVE_UNIT_Y)
# self.raySceneQuery.Ray = updateRay
# for queryResult in self.raySceneQuery.execute():
# if queryResult.worldFragment is not None:
Modified: trunk/python-ogre/demos/qgui/Demo_QuickGUI01.py
===================================================================
--- trunk/python-ogre/demos/qgui/Demo_QuickGUI01.py 2008-10-20 13:48:25 UTC (rev 761)
+++ trunk/python-ogre/demos/qgui/Demo_QuickGUI01.py 2008-10-20 14:27:42 UTC (rev 762)
@@ -30,10 +30,10 @@
import ogre.gui.QuickGUI as gui
import SampleFramework as sf
-class CallBack ( gui.MemberFunctionSlot ):
+class CallBack ( gui.EventHandlerSlot ):
""" Callback class for user events in QuickGUI"""
def __init__(self, function=""):
- gui.MemberFunctionSlot.__init__(self)
+ gui.EventHandlerSlot.__init__(self)
self.function=function
def execute(self, args):
if self.function:
@@ -173,10 +173,10 @@
#3 However we do the same thing by setting MenuMode to True in the frameListerner further down
# # # self.camera.setAutoTracking(True, robotNode)
- plane = Ogre.Plane( Ogre.Vector3.UNIT_Y, 0 )
+ plane = Ogre.Plane( Ogre.Vector3().UNIT_Y, 0 )
Ogre.MeshManager.getSingleton().createPlane("ground",
Ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME, plane,
- 1500,1500,20,20,True,1,5,5,Ogre.Vector3.UNIT_Z)
+ 1500,1500,20,20,True,1,5,5,Ogre.Vector3().UNIT_Z)
ground = self.sceneManager.createEntity( "GroundEntity", "ground" )
self.sceneManager.getRootSceneNode().createChildSceneNode().attachObject(ground)
ground.setMaterialName("Examples/Rockwall")
@@ -206,7 +206,7 @@
##Viewport *v = self.rttTex.addViewport( self.camera )
v.setOverlaysEnabled( False )
v.setClearEveryFrame( True )
- v.setBackgroundColour( Ogre.ColourValue.Black )
+ v.setBackgroundColour( Ogre.ColourValue().Black )
self.guiroot = gui.Root()
gui.SkinSetManager.getSingleton().loadSkin("qgui",gui.SkinSet.IMAGE_TYPE_PNG,self.ResourceGroup);
@@ -547,7 +547,7 @@
return True
def evtHndlr_setTextWhite(self, args):
- self.stWindow.getTitleBar().getText().setColor(Ogre.ColourValue.White)
+ self.stWindow.getTitleBar().getText().setColor(Ogre.ColourValue().White)
return True
def evtHndlr_showSetTextDialog(self, args):
@@ -570,11 +570,11 @@
def evtHndlr_setTextColor(self, args):
s = self.stWindow.getComboBox(0).getText().getCaption()
- if( s == "Red" ): c = Ogre.ColourValue.Red
- elif( s == "Green" ): c = Ogre.ColourValue.Green
- elif( s == "Blue" ): c = Ogre.ColourValue.Blue
- elif( s == "Black" ): c = Ogre.ColourValue.Black
- elif( s == "White" ): c = Ogre.ColourValue.White
+ if( s == "Red" ): c = Ogre.ColourValue().Red
+ elif( s == "Green" ): c = Ogre.ColourValue().Green
+ elif( s == "Blue" ): c = Ogre.ColourValue().Blue
+ elif( s == "Black" ): c = Ogre.ColourValue().Black
+ elif( s == "White" ): c = Ogre.ColourValue().White
self.stWindow.getTitleBar().getText().setColor(c)
return True
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
