|
From: <mi...@us...> - 2008-08-20 15:27:54
|
Revision: 707
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=707&view=rev
Author: mithro
Date: 2008-08-20 15:28:00 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Solve my AMD64 problem!!!!
Only took 3 weeks and countless hours :/
I do know how to bring up Python-Ogre, Boost and Python all up in gdb with full
source tracing now however.
Modified Paths:
--------------
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
Modified: trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-08-20 10:12:37 UTC (rev 706)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-08-20 15:28:00 UTC (rev 707)
@@ -239,9 +239,19 @@
self.windowClosed(self.renderWindow)
def _setupInput(self):
- # ignore buffered input
+ # ignore buffered input
- windowHnd = self.renderWindow.getCustomAttributeInt("WINDOW")
+ # FIXME: This should be fixed in C++ propbably
+ import platform
+ int64 = False
+ for bit in platform.architecture():
+ if '64' in bit:
+ int64 = True
+ if int64:
+ windowHnd = self.renderWindow.getCustomAttributeUnsignedLong("WINDOW")
+ else:
+ windowHnd = self.renderWindow.getCustomAttributeInt("WINDOW")
+
self.InputManager = \
OIS.createPythonInputSystem([("WINDOW",str(windowHnd))])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-10-07 13:43:47
|
Revision: 755
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=755&view=rev
Author: andy_miller
Date: 2008-10-07 13:42:46 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
Fix to sample framework - minor bug in keyboard handling
Modified Paths:
--------------
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
Modified: trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-10-07 09:44:57 UTC (rev 754)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-10-07 13:42:46 UTC (rev 755)
@@ -205,7 +205,7 @@
"""A default frame listener, which takes care of basic mouse and keyboard
input."""
- def __init__(self, renderWindow, camera, bufferedKeys = False, bufferedMouse = True, bufferedJoy = False):
+ def __init__(self, renderWindow, camera, bufferedKeys = False, bufferedMouse = False, bufferedJoy = False):
ogre.FrameListener.__init__(self)
ogre.WindowEventListener.__init__(self)
self.camera = camera
@@ -287,6 +287,8 @@
#Register as a Window listener
ogre.WindowEventUtilities.addWindowEventListener(self.renderWindow, self);
+
+
def setMenuMode(self, mode):
self.MenuMode = mode
@@ -327,7 +329,7 @@
buffJ = self.Joy.buffered()
##Check if one of the devices is not buffered
- if self.Mouse.buffered() or self.Keyboard.buffered() or not buffJ :
+ if not self.Mouse.buffered() or not self.Keyboard.buffered() or not buffJ :
## one of the input modes is immediate, so setup what is needed for immediate movement
if self.timeUntilNextToggle >= 0:
self.timeUntilNextToggle -= evt.timeSinceLastFrame
@@ -339,14 +341,14 @@
self.rotationX = ogre.Degree(0.0)
self.rotationY = ogre.Degree(0.0)
- self.translateVector = ogre.Vector3.ZERO
+ self.translateVector = ogre.Vector3(0,0,0)
##Check to see which device is not buffered, and handle it
if not self.Keyboard.buffered():
- if self._processUnbufferedKeyInput(evt) == False:
+ if not self._processUnbufferedKeyInput(evt):
return False
if not self.Mouse.buffered():
- if self._processUnbufferedMouseInput(evt) == False:
+ if not self._processUnbufferedMouseInput(evt):
return False
if not self.Mouse.buffered() or not self.Keyboard.buffered() or not buffJ:
@@ -355,34 +357,34 @@
return True
- def frameStarted(self, frameEvent):
- return True
-
- if self.timeUntilNextToggle >= 0:
- self.timeUntilNextToggle -= frameEvent.timeSinceLastFrame
-
- if frameEvent.timeSinceLastFrame == 0:
- self.moveScale = 1
- self.rotationScale = 0.1
- else:
- self.moveScale = self.moveSpeed * frameEvent.timeSinceLastFrame
- self.rotationScale = self.rotationSpeed * frameEvent.timeSinceLastFrame
-
- self.rotationX = ogre.Degree(0.0)
- self.rotationY = ogre.Degree(0.0)
- self.translateVector = ogre.Vector3(0.0, 0.0, 0.0)
- if not self._processUnbufferedKeyInput(frameEvent):
- return False
-
- if not self.MenuMode: # if we are in Menu mode we don't move the camera..
- self._processUnbufferedMouseInput(frameEvent)
- self._moveCamera()
- # Perform simulation step only if using OgreRefApp. For simplicity create a function that simply does
- ### "OgreRefApp.World.getSingleton().simulationStep(frameEvent.timeSinceLastFrame)"
-
- if self.RefAppEnable:
- self._UpdateSimulation( frameEvent )
- return True
+# def frameStarted(self, frameEvent):
+# return True
+#
+# if self.timeUntilNextToggle >= 0:
+# self.timeUntilNextToggle -= frameEvent.timeSinceLastFrame
+#
+# if frameEvent.timeSinceLastFrame == 0:
+# self.moveScale = 1
+# self.rotationScale = 0.1
+# else:
+# self.moveScale = self.moveSpeed * frameEvent.timeSinceLastFrame
+# self.rotationScale = self.rotationSpeed * frameEvent.timeSinceLastFrame
+#
+# self.rotationX = ogre.Degree(0.0)
+# self.rotationY = ogre.Degree(0.0)
+# self.translateVector = ogre.Vector3(0.0, 0.0, 0.0)
+# if not self._processUnbufferedKeyInput(frameEvent):
+# return False
+#
+# if not self.MenuMode: # if we are in Menu mode we don't move the camera..
+# self._processUnbufferedMouseInput(frameEvent)
+# self._moveCamera()
+# # Perform simulation step only if using OgreRefApp. For simplicity create a function that simply does
+# ### "OgreRefApp.World.getSingleton().simulationStep(frameEvent.timeSinceLastFrame)"
+#
+# if self.RefAppEnable:
+# self._UpdateSimulation( frameEvent )
+# return True
def frameEnded(self, frameEvent):
self._updateStatistics()
@@ -501,14 +503,15 @@
else:
self.rotationX = ogre.Degree(- ms.X.rel * 0.13)
self.rotationY = ogre.Degree(- ms.Y.rel * 0.13)
-
+ return True
+
def _moveCamera(self):
self.camera.yaw(self.rotationX)
self.camera.pitch(self.rotationY)
- try:
- self.camera.translate(self.translateVector) # for using OgreRefApp
- except AttributeError:
- self.camera.moveRelative(self.translateVector)
+# try:
+# self.camera.translate(self.translateVector) # for using OgreRefApp
+# except AttributeError:
+ self.camera.moveRelative(self.translateVector)
def _updateStatistics(self):
statistics = self.renderWindow
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2008-11-28 12:39:12
|
Revision: 825
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=825&view=rev
Author: andy_miller
Date: 2008-11-28 12:39:02 +0000 (Fri, 28 Nov 2008)
Log Message:
-----------
Added comments to the sample framework showing alternate ways to use OIS
Modified Paths:
--------------
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
Modified: trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
===================================================================
--- trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-11-28 12:12:52 UTC (rev 824)
+++ trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py 2008-11-28 12:39:02 UTC (rev 825)
@@ -313,15 +313,23 @@
else:
windowHnd = self.renderWindow.getCustomAttributeInt("WINDOW")
+ #
+ # Here is where we create the OIS input system using a helper function that takes python list of tuples
+ #
t= self._inputSystemParameters()
params = [("WINDOW",str(windowHnd))]
params.extend(t)
self.InputManager = OIS.createPythonInputSystem( params )
- #pl = OIS.ParamList()
- #windowHndStr = str ( windowHnd)
- #pl.insert("WINDOW", windowHndStr)
- #im = OIS.InputManager.createInputSystem( pl )
+ #
+ # an alternate way is to use a multimap which is exposed in ogre
+ #
+# pl = ogre.SettingsMultiMap()
+# windowHndStr = str(windowHnd)
+# pl.insert("WINDOW", windowHndStr)
+# for v in self._inputSystemParameters():
+# pl.insert(v[0],v[1])
+# im = OIS.InputManager.createInputSystem( pl )
#Create all devices (We only catch joystick exceptions here, as, most people have Key/Mouse)
self.Keyboard = self.InputManager.createInputObjectKeyboard( OIS.OISKeyboard, self.bufferedKeys )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
