[Python-ogre-commit] SF.net SVN: python-ogre: [581] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [581] trunk/python-ogre
|
From: <and...@us...> - 2008-03-31 00:27:43
|
Revision: 581
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=581&view=rev
Author: andy_miller
Date: 2008-03-30 17:27:47 -0700 (Sun, 30 Mar 2008)
Log Message:
-----------
Further thirdparty updates and fixes to demos
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp
trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp
trunk/python-ogre/demos/caelum/media/LayeredClouds.material
trunk/python-ogre/demos/nxogre/CakeFramework.py
trunk/python-ogre/demos/ogre/Demo_Shadows.py
trunk/python-ogre/demos/ogre/tests/Test_RenderQueue.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp 2008-03-15 00:25:20 UTC (rev 580)
+++ trunk/python-ogre/ThirdParty/caelum/SkyDome.cpp 2008-03-31 00:27:47 UTC (rev 581)
@@ -170,14 +170,14 @@
"SkyDomeFP", RESOURCE_GROUP_NAME, "cg", Ogre::GPT_FRAGMENT_PROGRAM);
fp->setSourceFile ("CaelumSkyDome.cg");
fp->setParameter ("entry_point", "SkyDome_fp");
- fp->setParameter("compile_arguments", "-DHAZE=1");
+ fp->setParameter("compile_arguments", "-DHAZE");
fp->setParameter ("profiles", "ps_2_0 arbfp1");
fp = Ogre::HighLevelGpuProgramManager::getSingleton().createProgram (
"SkyDomeFP_NoHaze", RESOURCE_GROUP_NAME, "cg", Ogre::GPT_FRAGMENT_PROGRAM);
fp->setSourceFile ("CaelumSkyDome.cg");
fp->setParameter ("entry_point", "SkyDome_fp");
- fp->setParameter ("compile_arguments", "-DHAZE=0");
+ fp->setParameter ("compile_arguments", "");
fp->setParameter ("profiles", "ps_2_0 arbfp1");
}
Modified: trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp 2008-03-15 00:25:20 UTC (rev 580)
+++ trunk/python-ogre/ThirdParty/ogreal/OgreALSoundManager.cpp 2008-03-31 00:27:47 UTC (rev 581)
@@ -393,7 +393,7 @@
SoundList::iterator soundItr = mSoundsToDestroy.begin();
while(!mSoundsToDestroy.empty())
{
- destroySound(*soundItr);
+ delete (*soundItr);
soundItr = mSoundsToDestroy.erase(soundItr);
}
Modified: trunk/python-ogre/demos/caelum/media/LayeredClouds.material
===================================================================
--- trunk/python-ogre/demos/caelum/media/LayeredClouds.material 2008-03-15 00:25:20 UTC (rev 580)
+++ trunk/python-ogre/demos/caelum/media/LayeredClouds.material 2008-03-31 00:27:47 UTC (rev 581)
@@ -45,7 +45,7 @@
param_named sunColour float4 1 1 1 1
// Fog colour; used as the base cloud colour.
- param_named fogColour float4
+ param_named fogColour float4 0 0 0 0
// The inverse of the cloud forms scale
Modified: trunk/python-ogre/demos/nxogre/CakeFramework.py
===================================================================
--- trunk/python-ogre/demos/nxogre/CakeFramework.py 2008-03-15 00:25:20 UTC (rev 580)
+++ trunk/python-ogre/demos/nxogre/CakeFramework.py 2008-03-31 00:27:47 UTC (rev 581)
@@ -66,27 +66,27 @@
ogre.RenderQueueListener.__init__(self)
def renderQueueStarted(self, queueGroupId, invocation, skipThisInvocation):
- ##RenderQueue containing the object to be highlighted
- if (queueGroupId == 90):
-
- rendersys = ogre.Root.getSingleton().getRenderSystem()
-
- rendersys.clearFrameBuffer(ogre.FBT_STENCIL)
- rendersys.setStencilCheckEnabled(True)
- rendersys.setStencilBufferParams(ogre.CMPF_ALWAYS_PASS,1,0xFFFFFFFF,
+ ##RenderQueue containing the object to be highlighted
+ if (queueGroupId == 90):
+
+ rendersys = ogre.Root.getSingleton().getRenderSystem()
+
+ rendersys.clearFrameBuffer(ogre.FBT_STENCIL)
+ rendersys.setStencilCheckEnabled(True)
+ rendersys.setStencilBufferParams(ogre.CMPF_ALWAYS_PASS,1,0xFFFFFFFF,
ogre.SOP_KEEP,ogre.SOP_KEEP,ogre.SOP_REPLACE,False)
+
+ ##RenderQueue containing the outline
+ if (queueGroupId == 91):
+
+ rendersys = ogre.Root.getSingleton().getRenderSystem()
+
+ rendersys.setStencilCheckEnabled(True)
+ rendersys.setStencilBufferParams(ogre.CMPF_NOT_EQUAL,1,0xFFFFFFFF,
+ ogre.SOP_KEEP,ogre.SOP_KEEP,ogre.SOP_KEEP,False)
+ return skipThisInvocation
- ##RenderQueue containing the outline
- if (queueGroupId == 91):
- rendersys = ogre.Root.getSingleton().getRenderSystem()
-
- rendersys.setStencilCheckEnabled(True)
- rendersys.setStencilBufferParams(ogre.CMPF_NOT_EQUAL,1,0xFFFFFFFF,
- ogre.SOP_KEEP,ogre.SOP_KEEP,ogre.SOP_KEEP,False)
- return skipThisInvocation
-
-
def renderQueueEnded(self,queueGroupId, invocation,repeatThisInvocation):
if (( queueGroupId == 90 ) or ( queueGroupId == 91 )):
@@ -123,9 +123,7 @@
def pre(self):
self.getConfig()
- print "$$$$$$$ PRE 1"
self.Renderer = Renderer(self.RenderConfiguration)
- print "$$$$$$$ PRE 1"
self.InputHandler = InputHandler()
print "$$$$$$$ PRE 1"
window = self.Renderer.createWindow("NxOgre")
@@ -292,6 +290,7 @@
def getRoot(self):
return self.Root
+
def getWindow(self):
return self.Window
@@ -391,15 +390,19 @@
def frameStarted(self, evt):
+ print "FS"
self.InputHandler.onFrame(evt.timeSinceLastFrame)
+ print "FS1"
self.Cake.onFramePre(evt.timeSinceLastFrame)
-
+ print "FS2"
+
if (self.Shutdown):
return False
else :
return True
def frameEnded( self, evt):
+ print "FE"
if (self.Shutdown):
return False
if (self.Window.isClosed()) :
@@ -1183,7 +1186,7 @@
self.World = nxogre.World(nxogre.PhysXDriverParams("log: html"))
self.Scene = self.World.createScene("Main", self.SceneMgr, nxogre.SceneParams("gravity: yes, floor: yes, time-step-method: variable"))
- self.Scene.createBody("cube.1m.mesh", nxogre.CubeShape(1), ogre.Vector3(0,5,0), nxogre.ActorParams("mass: 10"))
+ self.Scene.createBody("cube.1m.mesh", nxogre.CubeShape(1), nxogre.Pose(ogre.Vector3(0,5,0)), nxogre.ActorParams("mass: 10"))
def stop(self):
del self.World
Modified: trunk/python-ogre/demos/ogre/Demo_Shadows.py
===================================================================
--- trunk/python-ogre/demos/ogre/Demo_Shadows.py 2008-03-15 00:25:20 UTC (rev 580)
+++ trunk/python-ogre/demos/ogre/Demo_Shadows.py 2008-03-31 00:27:47 UTC (rev 581)
@@ -172,12 +172,13 @@
class ShadowsListener ( SampleFramework.FrameListener, OIS.MouseListener, OIS.KeyListener ):
- def __init__ (self, win, cam, sm):
+ def __init__ (self, win, cam, sm, app):
SampleFramework.FrameListener.__init__(self, win, cam, True, True)
OIS.KeyListener.__init__(self)
OIS.MouseListener.__init__(self)
+ self.app = app
self.sceneManager = sm
- self.mMain = win
+ self.mWindow = win
self.camera=cam
self.mShutdownRequested = False
self.mLMBDown=False
@@ -191,9 +192,14 @@
self.mLastMousePositionSet=False
self.mAvgFrameTime =0.1
self.mWriteToFile = False
+ self.mTranslateVector = Ogre.Vector3.ZERO
+ self.mQuit = False
+ self.mSkipCount = 0
+ self.mUpdateFreq=10
+ self.mRotX = 0
+ self.mRotY = 0
-
-# # windowHnd = self.mMain.getRenderWindow().getCustomAttributeInt("WINDOW")
+# # windowHnd = self.mWindow.getRenderWindow().getCustomAttributeInt("WINDOW")
# # self.mInputManager = \
# # OIS.createPythonInputSystem([("WINDOW",str(windowHnd))])
# #
@@ -201,7 +207,7 @@
# # self.mKeyboard = self.mInputManager.createInputObjectKeyboard( OIS.OISKeyboard, True )
# # self.mMouse = self.mInputManager.createInputObjectMouse( OIS.OISMouse, True )
-# # width, height, depth, left, top = self.mMain.getRenderWindow().getMetrics()
+# # width, height, depth, left, top = self.mWindow.getRenderWindow().getMetrics()
# # ##Set Mouse Region.. if window resizes, we should alter this to reflect as well
# # ms = self.mMouse.getMouseState()
@@ -250,8 +256,7 @@
def frameStarted( self, evt):
self.Mouse.capture()
self.Keyboard.capture()
-
- if( self.mMain.getRenderWindow().isActive() == False ):
+ if( self.mWindow.isActive() == False ):
return False
if (self.mQuit):
@@ -260,7 +265,7 @@
self.mSkipCount+=1
if (self.mSkipCount >= self.mUpdateFreq):
self.mSkipCount = 0
- self.updateStats()
+# # # self.updateStats()
## update movement process
if(self.mProcessMovement or self.mUpdateMovement):
if self.mMoveLeft:
@@ -272,9 +277,9 @@
if self.mMoveBck:
self.mTranslateVector.z += self.mAvgFrameTime * MOVESPEED
- self.mMain.getCamera().yaw(Ogre.Degree(self.mRotX))
- self.mMain.getCamera().pitch(Ogre.Degree(self.mRotY))
- self.mMain.getCamera().moveRelative(self.mTranslateVector)
+ self.camera.yaw(Ogre.Degree(self.mRotX))
+ self.camera.pitch(Ogre.Degree(self.mRotY))
+ self.camera.moveRelative(self.mTranslateVector)
self.mUpdateMovement = False
self.mRotX = 0
@@ -283,17 +288,17 @@
if(self.mWriteToFile):
self.mNumScreenShots +=1
- self.mMain.getRenderWindow().writeContentsToFile("frame_" +
+ self.mWindow.writeContentsToFile("frame_" +
str(self.mNumScreenShots) + ".png")
return True
def frameEnded( self, evt):
- if (self.mAnimState):
- self.mAnimState.addTime(evt.timeSinceLastFrame)
+ if (self.app.mAnimState):
+ self.app.mAnimState.addTime(evt.timeSinceLastFrame)
if (self.mShutdownRequested):
return False
else:
- return ExampleFrameListener.frameEnded(self, evt)
+ return SampleFramework.FrameListener.frameEnded(self, evt)
##--------------------------------------------------------------------------
@@ -324,7 +329,7 @@
if (e.key == OIS.KC_SYSRQ ):
ss = "screenshot_" + str(self.mNumScreenShots) + ".png"
- self.mMain.getRenderWindow().writeContentsToFile(ss.str())
+ self.mWindow.writeContentsToFile(ss.str())
self.mDebugText = "Saved: " + ss.str()
##self.mTimeUntilNextToggle = 0.5
@@ -582,7 +587,7 @@
## Prepare athene mesh for normalmapping
pAthene = Ogre.MeshManager.getSingleton().load("athene.mesh",
Ogre.ResourceGroupManager.DEFAULT_RESOURCE_GROUP_NAME)
- ret, src, dest =pAthene.suggestTangentVectorBuildParams( Ogre.VES_TANGENT )
+ ret, src, dest =pAthene.suggestTangentVectorBuildParams( Ogre.VES_TANGENT , 1, 1)
if ( not ret):
pAthene.buildTangentVectors(VES_TANGENT, src, dest)
@@ -965,19 +970,20 @@
if (cbo.getSelectedItem()):
proj = cbo.getSelectedItem().getID()
if (proj != self.mCurrentProjection):
- ## AJM WRNIMG
+ ## AJM WARNING
if proj == self.UNIFORM:
self.mCurrentShadowCameraSetup = Ogre.ShadowCameraSetupPtr(Ogre.DefaultShadowCameraSetup())
elif proj == self.UNIFORM_FOCUSED:
+ self.focused = Ogre.FocusedShadowCameraSetup()
self.mCurrentShadowCameraSetup =\
- ShadowCameraSetupPtr(Ogre.FocusedShadowCameraSetup())
+ Ogre.ShadowCameraSetup(self.focused)
elif proj == self.LISPSM:
- self.mLiSPSMSetup = LiSPSMShadowCameraSetup()
+ self.mLiSPSMSetup = Ogre.LiSPSMShadowCameraSetup()
##self.mLiSPSMSetup.setUseAggressiveFocusRegion=False
self.mCurrentShadowCameraSetup = Ogre.ShadowCameraSetupPtr(self.mLiSPSMSetup)
elif proj == self.PLANE_OPTIMAL:
self.mCurrentShadowCameraSetup =\
- ShadowCameraSetupPtr(Ogre.PlaneOptimalShadowCameraSetup(self.mPlane))
+ Ogre.ShadowCameraSetupPtr(Ogre.PlaneOptimalShadowCameraSetup(self.mPlane))
self.mCurrentProjection = proj
self.sceneManager.setShadowCameraSetup(self.mCurrentShadowCameraSetup)
@@ -1131,7 +1137,7 @@
## Create new frame listener
def _createFrameListener(self):
- shadowListener = ShadowsListener(self.renderWindow, self.camera, self.sceneManager)
+ shadowListener = ShadowsListener(self.renderWindow, self.camera, self.sceneManager, self)
self.frameListener = shadowListener
self.frameListener.showDebugOverlay(True)
self.root.addFrameListener(self.frameListener)
Modified: trunk/python-ogre/demos/ogre/tests/Test_RenderQueue.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_RenderQueue.py 2008-03-15 00:25:20 UTC (rev 580)
+++ trunk/python-ogre/demos/ogre/tests/Test_RenderQueue.py 2008-03-31 00:27:47 UTC (rev 581)
@@ -12,15 +12,15 @@
print type (ogre.RENDER_QUEUE_OVERLAY)
if (id == ogre.RENDER_QUEUE_OVERLAY):
print "Queue Start Skip %i %i " % (id,ogre.RENDER_QUEUE_OVERLAY)
- return True
+ return 1 # True
print "returning false"
- return False
+ return 0 # False
def renderQueueEnded (self, id , invocation,repeatThisInvocation):
print "In QueueEnded"
if (id == ogre.RENDER_QUEUE_OVERLAY):
print "Queue End Repeat %i %i" % (id, ogre.RENDER_QUEUE_OVERLAY)
- return False
- return False
+ return 0 # False
+ return 0 # False
class EnvMapApplication(sf.Application):
def _createScene( self ):
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-03-15 00:25:20 UTC (rev 580)
+++ trunk/python-ogre/environment.py 2008-03-31 00:27:47 UTC (rev 581)
@@ -127,9 +127,11 @@
mv = "move /Y "
rm = "del /Q "
cp = "copy /Y "
- unzip = "unzip "
+ unzip = "unzip -o "
cvs = "cvs -z3 -q "
svn = "svn "
+ VCBUILD="'c:\\Program Files\\Microsoft Visual Studio 8\\vc\\vcpackages\\vcbuild.exe' /useenv "
+ VCBUILD = '"c:/Program Files/Microsoft Visual Studio 8/vc/vcpackages/vcbuild.exe" /useenv '
else:
mv = "mv "
rm = "rm -f "
@@ -534,16 +536,16 @@
class ois:
active = True
pythonModule = True
- version= "1.1"
+ version= "1.2"
name = 'ois'
cflags=''
parent = "ogre/io"
if isMac():
source=[]
if isLinux():
- base = "ois-1.0RC1"
+ base = "ois-1.2"
source=[
- [wget, "http://prdownloads.sourceforge.net/wgois/ois-1.0RC1.tar.gz", downloadPath]
+ [wget, "http://prdownloads.sourceforge.net/wgois/ois-1.2.tar.gz", downloadPath]
]
buildCmds = [
[0, tar + " zxf " + os.path.join(downloadPath,base)+".tar.gz --overwrite",os.getcwd() ],
@@ -563,6 +565,15 @@
[0,'make', os.path.join(os.getcwd(), base )],
[0,'make install', os.path.join(os.getcwd(), base )]
]
+ if isWindows():
+ base = "ois"
+ source = [ wget,"http://downloads.sourceforge.net/wgois/ois_1.2.0.zip", downloadPath]
+ buildCmds = [
+ [0, unzip + downloadPath + "/" + "ois_1.2.0.zip" ,os.getcwd() ],
+# [0, '"c:/Program Files/Microsoft Visual Studio 8/vc/vcpackages/vcbuild.exe" /useenv ois_VC8.sln ', os.path.join(os.getcwd(), base, 'Win32' )],
+# [0, VCBUILD + " ois_vc8.sln " + "\"Release|Win32\"", os.path.join(os.getcwd(), base, 'Win32' )]
+ ]
+
if os.name=='nt':
if _PreCompiled:
pchstop = 'OIS.h'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
