|
From: <and...@us...> - 2008-02-16 01:21:21
|
Revision: 566
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=566&view=rev
Author: andy_miller
Date: 2008-02-15 17:21:27 -0800 (Fri, 15 Feb 2008)
Log Message:
-----------
Various Updates for the 1.2 release
Modified Paths:
--------------
trunk/python-ogre/demos/nxogre/BetaGui.py
trunk/python-ogre/demos/nxogre/CakeFramework.py
trunk/python-ogre/demos/nxogre/config.yaml
trunk/python-ogre/demos/nxogre/plugins.cfg
trunk/python-ogre/demos/ogre/tests/Test_ConfigFile.py
trunk/python-ogre/demos/ogre/tests/Test_Corners.py
trunk/python-ogre/demos/ogre/tests/Test_RenderQueue.py
trunk/python-ogre/demos/ogre/tests/Test_TextureGetByName.py
trunk/python-ogre/demos/ogre/tests/Test_WriteToTexture.py
trunk/python-ogre/demos/ogre/tests/test.material
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.button.down.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.button.over.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.button.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.checked.down.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.checked.over.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.checked.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.image.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.horizontal.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.horizontal.slider.down.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.horizontal.slider.over.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.horizontal.slider.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.vertical.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.vertical.slider.down.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.vertical.slider.over.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.vertical.slider.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.window.border.bottom.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.window.border.left.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.window.border.right.png
trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.window.border.top.png
trunk/python-ogre/demos/qgui/plugins.cfg
Modified: trunk/python-ogre/demos/nxogre/BetaGui.py
===================================================================
--- trunk/python-ogre/demos/nxogre/BetaGui.py 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/nxogre/BetaGui.py 2008-02-16 01:21:27 UTC (rev 566)
@@ -69,7 +69,7 @@
mDragWindowX + (x - self.mDragX),
mDragWindowY + (y - self.mDragY)
)
- return True
+ return True
elif (self.mDragWindowAction != WA_NONE):
self.mDragWindowAction = WA_NONE
self.mActiveDraggedWindow = None
Modified: trunk/python-ogre/demos/nxogre/CakeFramework.py
===================================================================
--- trunk/python-ogre/demos/nxogre/CakeFramework.py 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/nxogre/CakeFramework.py 2008-02-16 01:21:27 UTC (rev 566)
@@ -443,11 +443,11 @@
##/////////////////////////////////////////////////////////////////////////////
-class Frosting ( Decoration, BetaGUI.BetaGUIListener ):
+class Frosting ( Decoration, BetaGUI.GUIListener ):
def __init__(self, r, i, t) :
- BetaGUI.BetaGUIListener.__init__(self)
+ BetaGUI.GUIListener.__init__(self)
Decoration.__init__(self,r,i,t)
self.SceneMgr = r.createSceneMgr("Main")
self.Camera = self.SceneMgr.createCamera("Main")
@@ -513,13 +513,16 @@
self.SceneMgr.setShadowCameraSetup(self.shadowCamera)
- self.Gui = BetaGUI.GUI("SandBoxGUI", "nxogrefont", 14, self.Renderer.getWindow())
+# self.Gui = BetaGUI.GUI("SandBoxGUI", "nxogrefont", 14, self.Renderer.getWindow())
+ self.Gui = BetaGUI.GUI( self.Renderer.getWindow())
- self.Cursor = self.Gui.createMousePointer(ogre.Vector2(24, 24), "bgui.pointer")
+# self.Cursor = self.Gui.createMousePointer(ogre.Vector2(24, 24), "bgui.pointer")
+ self.Cursor = self.Gui.createMousePointer("bgui.pointer",24,24)
self.Gui.injectMouse(200,200, False)
self.Cursor.hide()
- self.WidgetMenu = self.Gui.createWindow(ogre.Vector4(100,100,64,128), "widget.mm", BetaGUI.WindowFeatureType.WFT_NONE, "")
+# self.WidgetMenu = self.Gui.createWindow(ogre.Vector4(100,100,64,128), "widget.mm", BetaGUI.WindowFeatureType.WFT_NONE, "")
+ self.WidgetMenu = self.Gui.createWindow(100,100,64,128, "widget.mm", BetaGUI.WindowFeatureType.WFT_NONE, "", self)
self.callback = BetaGUI.Callback(self)
self.WidgetMenuButton=[]
Modified: trunk/python-ogre/demos/nxogre/config.yaml
===================================================================
--- trunk/python-ogre/demos/nxogre/config.yaml 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/nxogre/config.yaml 2008-02-16 01:21:27 UTC (rev 566)
@@ -6,4 +6,5 @@
aa:0
vsync:No
fullscreen:No
-pluginspath:../../../root/usr/lib/OGRE
+pluginspath:../../plugins
+#pluginspath:../../../root/usr/lib/OGRE
Modified: trunk/python-ogre/demos/nxogre/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/nxogre/plugins.cfg 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/nxogre/plugins.cfg 2008-02-16 01:21:27 UTC (rev 566)
@@ -2,18 +2,19 @@
## Use this for Windows
# Define plugin folder
-PluginFolder=../../../root/usr/lib/OGRE
-#Plugin=RenderSystem_GL.dll
-#Plugin=RenderSystem_Direct3D9.dll
-#Plugin=Plugin_ParticleFX.dll
-#Plugin=Plugin_BSPSceneManager.dll
-#Plugin=Plugin_OctreeSceneManager.dll
-#Plugin=Plugin_CgProgramManager.dll
+PluginFolder=../../plugins
+Plugin=RenderSystem_GL.dll
+Plugin=RenderSystem_Direct3D9.dll
+Plugin=Plugin_ParticleFX.dll
+Plugin=Plugin_BSPSceneManager.dll
+Plugin=Plugin_OctreeSceneManager.dll
+Plugin=Plugin_CgProgramManager.dll
##
## NOTE use this for MacOS or Linux
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-Plugin=Plugin_CgProgramManager
+#PluginFolder=../../../root/usr/lib/OGRE
+#Plugin=RenderSystem_GL
+#Plugin=Plugin_ParticleFX
+#Plugin=Plugin_BSPSceneManager
+#Plugin=Plugin_OctreeSceneManager
+#Plugin=Plugin_CgProgramManager
Modified: trunk/python-ogre/demos/ogre/tests/Test_ConfigFile.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_ConfigFile.py 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/ogre/tests/Test_ConfigFile.py 2008-02-16 01:21:27 UTC (rev 566)
@@ -23,7 +23,3 @@
for item in Section:
print SectionName, item.key, item.value
-config = Ogre.ConfigFile()
-config.load_special('resources.cfg' ) #, '', False )
-for section, key, path in config.values:
- print section, key, path
\ No newline at end of file
Modified: trunk/python-ogre/demos/ogre/tests/Test_Corners.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_Corners.py 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/ogre/tests/Test_Corners.py 2008-02-16 01:21:27 UTC (rev 566)
@@ -8,42 +8,14 @@
import SampleFramework
import math
-class FilePtr ( ogre.DataStream ):
- def __init__ ( self, filename ):
- ogre.DataStream.__init__(self)
- datain = file(filename, 'r').read() # should put error checking etc here
- self.length = len ( datain )
- self.source = ctypes.create_string_buffer( datain ) ## Note it allocates one extra byte
- def read ( self, dest, size ):
- if size <= self.length:
- print ogre.CastInt(dest)
- ctypes.memmove ( ogre.CastInt(dest), self.source, size ) # again should check here for
- def size ( self ):
- return self.length
-
+
class TutorialApplication(SampleFramework.Application):
def _createScene(self):
sm = self.sceneManager
-# f= file("test.material", 'r')
-# MatString = f.read()
-# RawMemBuffer = ctypes.create_string_buffer( MatString ) ## Note it allocates one extra byte
-# dataptr = ogre.MemoryDataStream ( ctypes.addressof ( RawMemBuffer ), len (MatString) + 1 )
-# ogre.MaterialManager.getSingleton().parseScript( dataptr, "General" )
-# print "MATERIAL OK"
- fp = FilePtr ( "test.material")
- print "##", fp
- dataptr = ogre.MemoryDataStream ( fp )
- ogre.MaterialManager.getSingleton().parseScript( dataptr, "General" )
- print "MATERIAL OK"
-
-
try:
-
-
-
entity = self.sceneManager.getEntity("Junk")
except ogre.OgreItemIdentityException, e:
print"\nException OK: OgreItemIdentityException \n",e, "\n"
@@ -67,7 +39,12 @@
node1.attachObject(ent1) # should fail as you can only attach once
except ogre.OgreInvalidParametersException, e:
print "Exception OK\n", e, "\n"
- dummy = node1.getAttachedObject ("doesnt_exist")
+
+ try:
+ dummy = node1.getAttachedObject ("doesnt_exist")
+ except ogre.OgreItemIdentityException, e:
+ print "Exception OK\n", e, "\n"
+
ent2 = sm.createEntity("Robot2",'robot.mesh')
Modified: trunk/python-ogre/demos/ogre/tests/Test_RenderQueue.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_RenderQueue.py 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/ogre/tests/Test_RenderQueue.py 2008-02-16 01:21:27 UTC (rev 566)
@@ -6,12 +6,17 @@
ogre.RenderQueueListener.__init__(self)
def renderQueueStarted (self, id , invocation, skipThisInvocation):
-
+ print "In Queue Started", id, invocation, skipThisInvocation
+ print ogre.RENDER_QUEUE_OVERLAY
+ print type (id)
+ 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
+ print "returning false"
return 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
Modified: trunk/python-ogre/demos/ogre/tests/Test_TextureGetByName.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_TextureGetByName.py 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/ogre/tests/Test_TextureGetByName.py 2008-02-16 01:21:27 UTC (rev 566)
@@ -6,7 +6,9 @@
class TestApplication(sf.Application):
def _createScene(self):
sceneManager = self.sceneManager
-
+# # result = materialManager.createOrRetrieve(texture, group)
+# # created = result.second
+# # material = materialManager.getByName(texture)
## getByName returns a 'Resource' object
tm=ogre.TextureManager.getSingleton()
for r in tm.getResourceIterator():
Modified: trunk/python-ogre/demos/ogre/tests/Test_WriteToTexture.py
===================================================================
--- trunk/python-ogre/demos/ogre/tests/Test_WriteToTexture.py 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/ogre/tests/Test_WriteToTexture.py 2008-02-16 01:21:27 UTC (rev 566)
@@ -13,8 +13,6 @@
import SampleFramework as sf
import ctypes
-
-
def WriteToTexture(in_string, destTexture, destRectangle, font, color, justify = 'l', wordwrap = True):
if destTexture.getHeight() < destRectangle.bottom:
destRectangle.bottom = destTexture.getHeight()
Modified: trunk/python-ogre/demos/ogre/tests/test.material
===================================================================
--- trunk/python-ogre/demos/ogre/tests/test.material 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/ogre/tests/test.material 2008-02-16 01:21:27 UTC (rev 566)
@@ -13,4 +13,4 @@
}
}
}
-}
+}
\ No newline at end of file
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.button.down.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.button.over.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.button.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.checked.down.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.checked.over.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.checked.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.image.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.horizontal.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.horizontal.slider.down.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.horizontal.slider.over.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.horizontal.slider.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.vertical.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.vertical.slider.down.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.vertical.slider.over.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.scrollbar.vertical.slider.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.window.border.bottom.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.window.border.left.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.window.border.right.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/media/skins/qgui/qgui.window.border.top.png
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/demos/qgui/plugins.cfg
===================================================================
--- trunk/python-ogre/demos/qgui/plugins.cfg 2008-02-15 10:55:55 UTC (rev 565)
+++ trunk/python-ogre/demos/qgui/plugins.cfg 2008-02-16 01:21:27 UTC (rev 566)
@@ -2,18 +2,18 @@
## Use this for Windows
# Define plugin folder
-PluginFolder=/home/andy/development/root/usr/lib/OGRE
-#Plugin=RenderSystem_GL.dll
-#Plugin=RenderSystem_Direct3D9.dll
-#Plugin=Plugin_ParticleFX.dll
-#Plugin=Plugin_BSPSceneManager.dll
-#Plugin=Plugin_OctreeSceneManager.dll
-#Plugin=Plugin_CgProgramManager.dll
+PluginFolder=../../plugins
+Plugin=RenderSystem_GL.dll
+Plugin=RenderSystem_Direct3D9.dll
+Plugin=Plugin_ParticleFX.dll
+Plugin=Plugin_BSPSceneManager.dll
+Plugin=Plugin_OctreeSceneManager.dll
+Plugin=Plugin_CgProgramManager.dll
##
## NOTE use this for MacOS or Linux
- Plugin=RenderSystem_GL
- Plugin=Plugin_ParticleFX
- Plugin=Plugin_BSPSceneManager
- Plugin=Plugin_OctreeSceneManager
- Plugin=Plugin_CgProgramManager
+# Plugin=RenderSystem_GL
+# Plugin=Plugin_ParticleFX
+# Plugin=Plugin_BSPSceneManager
+# Plugin=Plugin_OctreeSceneManager
+# Plugin=Plugin_CgProgramManager
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
