Menu
▾
▴
[Opengate-svn] SF.net SVN: opengate: [904] branches/ogEditor
|
From: <spo...@us...> - 2008-05-25 09:10:37
|
Revision: 904
http://opengate.svn.sourceforge.net/opengate/?rev=904&view=rev
Author: spom_spom
Date: 2008-05-25 02:10:42 -0700 (Sun, 25 May 2008)
Log Message:
-----------
separate opengate stuff from ogEditor base
Modified Paths:
--------------
branches/ogEditor/ogEditor.py
branches/ogEditor/plugins.cfg
branches/ogEditor/resources.cfg
branches/ogEditor/src/OgreWindowWx.py
branches/ogEditor/src/ResourceTreePane.py
Added Paths:
-----------
branches/ogEditor/opengate-resources.cfg
Removed Paths:
-------------
branches/ogEditor/ogEditor.sh
branches/ogEditor/ogre.cfg
Modified: branches/ogEditor/ogEditor.py
===================================================================
--- branches/ogEditor/ogEditor.py 2008-05-24 17:26:37 UTC (rev 903)
+++ branches/ogEditor/ogEditor.py 2008-05-25 09:10:42 UTC (rev 904)
@@ -19,7 +19,11 @@
from OgreWindowWx import *
-import opengate as og
+try:
+ import opengate as og
+except:
+ haveOpenGatePlugin = False
+ pass
ID_MB_FILE_EXIT = wx.NewId()
ID_MB_VIEW_SCENETREE = wx.NewId()
@@ -83,6 +87,24 @@
itemList = shaderSchemes,
cback = vp.setMaterialScheme )
+ def AddToResourcesTree( self, tree, node):
+
+ if self.resourceManager_:
+ ogResManNode = tree.AppendItem( node, "OpenGate resource manager" )
+
+ if self.resourceManager_.entityManager:
+ ogEntityManagerNode = tree.AppendItem( ogResManNode, "Entity manager" )
+ categories = self.resourceManager_.entityManager.categories();
+
+ for category in categories:
+ categoryNode = tree.AppendItem( ogEntityManagerNode, category )
+
+
+ def AddToSceneGraph( self, tree, node ):
+ opengateNode = tree.AppendItem( node, "Opengate" )
+ tree.SetPyData( opengateNode, self )
+
+
class OGEditorPane:
def __init__( self, ID, Name, mbShortcut, creator, defaultCheck ):
self.ID_ = ID
@@ -102,7 +124,7 @@
ws = WorkSpace
self.allPanes = []
self.allPanes.append( OGEditorPane( ID_MB_VIEW_SCENETREE, NAME_SCENETREE, "\tF1", None, True ) )
- self.allPanes.append( OGEditorPane( ID_MB_VIEW_OBJECT, NAME_OBJECT , "\tF2", None, False ) )
+ self.allPanes.append( OGEditorPane( ID_MB_VIEW_OBJECT, NAME_OBJECT , "\tF2", None, True ) )
self.allPanes.append( OGEditorPane( ID_MB_VIEW_RESOURCE, NAME_RESOURCE , "\tF3", None, False ) )
self.allPanes.append( OGEditorPane( ID_MB_VIEW_MATERIAL, NAME_MATERIAL , "\tF4", None, True ) )
self.allPanes.append( OGEditorPane( ID_MB_VIEW_PYCRUST, NAME_PYCRUST , "\tF9", None, False ) )
@@ -111,12 +133,21 @@
self.initToolBar_()
self.initStatusBar_()
self.initFrameManager_()
+ self.setDefaultProperties_();
- self.og = Opengate( self.ogreRenderWindow )
- self.og.initOpenGateResources_();
- self.og.sector = og.Sector( self.ogreRenderWindow.sceneManager, None );
+ if haveOpenGatePlugin:
+ print "Found opengate plugin"
+ self.og = Opengate( self.ogreRenderWindow )
+ self.og.initOpenGateResources_();
+ self.og.sector = og.Sector( self.ogreRenderWindow.sceneManager, None )
+ self.og.AddToSceneGraph( self.sceneTree, self.sceneTree.root_ )
+ self.og.AddToResourcesTree( self.resourceTree, self.resourceTree.root_ )
+
+ else:
+ ohNode = self.createObject( "ogreMesh", "ogrehead.mesh" )
+ ohNode.translate( ogre.Vector3( 0.0, 0.0, -100 ) );
- self.setDefaultProperties_();
+
self.auiMgr.Update()
def initMenuBar_( self ):
@@ -145,7 +176,8 @@
self.tb.AddLabelTool( ID_TB_EXIT, "Exit", wx.ArtProvider_GetBitmap(wx.ART_QUIT),
wx.NullBitmap, wx.ITEM_NORMAL, "", "")
self.tb.AddLabelTool( ID_TB_TMP, "Up", wx.ArtProvider_GetBitmap(wx.ART_QUESTION),
- wx.NullBitmap, wx.ITEM_NORMAL, "", "")
+ wx.NullBitmap, wx.ITEM_NORMAL, "tempary tool button to force scenegraph update", "")
+
self.Bind( wx.EVT_TOOL, self.doExit, id = ID_TB_EXIT )
self.Bind( wx.EVT_TOOL, self.UpdateSceneGraphEvent, id = ID_TB_TMP )
@@ -299,6 +331,7 @@
ws.activeResource = obj
event.Skip()
+ self.auiMgr.Update()
def doCheckTreeObject( self, event ):
obj = event.GetEventObject().GetPyData( event.GetItem() )
@@ -317,8 +350,10 @@
node = sceneManager.getRootSceneNode().createChildSceneNode( name );
entity = sceneManager.createEntity( name, meshname );
node.attachObject( entity );
+ self.UpdateSceneGraphEvent();
+ return node
- def UpdateSceneGraphEvent(self, event):
+ def UpdateSceneGraphEvent(self, event = None):
self.sceneTree.DeleteAllItems()
root = self.sceneTree.AddRoot( "SceneManager" )
self.sceneTree.SetPyData( root, self.ogreRenderWindow.sceneManager )
@@ -330,9 +365,6 @@
self.dumpSceneNode_( rootSceneNodeTreeNode, rootSceneNode )
self.sceneTree.Expand( root )
- opengateNode = self.sceneTree.AppendItem( root, "Opengate" )
- self.sceneTree.SetPyData( opengateNode, self.og )
-
if event != None:
event.Skip()
Deleted: branches/ogEditor/ogEditor.sh
===================================================================
--- branches/ogEditor/ogEditor.sh 2008-05-24 17:26:37 UTC (rev 903)
+++ branches/ogEditor/ogEditor.sh 2008-05-25 09:10:42 UTC (rev 904)
@@ -1,3 +0,0 @@
-export LD_LIBRARY_PATH=~/local/python-ogre.work/root/usr/lib
-export PYTHONPATH=/home/carsten/local/python-ogre.work/root/usr/lib64/python2.5/site-packages
-python ogEditor.py
Deleted: branches/ogEditor/ogre.cfg
===================================================================
--- branches/ogEditor/ogre.cfg 2008-05-24 17:26:37 UTC (rev 903)
+++ branches/ogEditor/ogre.cfg 2008-05-25 09:10:42 UTC (rev 904)
@@ -1,7 +0,0 @@
-Render System=OpenGL Rendering Subsystem
-
-[OpenGL Rendering Subsystem]
-FSAA=0
-Full Screen=Yes
-RTT Preferred Mode=FBO
-Video Mode=800 x 600
Added: branches/ogEditor/opengate-resources.cfg
===================================================================
--- branches/ogEditor/opengate-resources.cfg (rev 0)
+++ branches/ogEditor/opengate-resources.cfg 2008-05-25 09:10:42 UTC (rev 904)
@@ -0,0 +1,33 @@
+[General]
+FileSystem=../../trunk/data/
+FileSystem=../../trunk/data/capacitors
+FileSystem=../../trunk/data/commodities
+FileSystem=../../trunk/data/gui
+FileSystem=../../trunk/data/gui/fonts
+FileSystem=../../trunk/data/gui/layouts
+FileSystem=../../trunk/data/gui/imagesets
+FileSystem=../../trunk/data/gui/schemes
+FileSystem=../../trunk/data/gui/looknfeel
+FileSystem=../../trunk/data/gui/overlays
+FileSystem=../../trunk/data/ecms
+FileSystem=../../trunk/data/engines
+FileSystem=../../trunk/data/guns
+FileSystem=../../trunk/data/materials
+FileSystem=../../trunk/data/asteroids
+FileSystem=../../trunk/data/misc
+FileSystem=../../trunk/data/missiles
+FileSystem=../../trunk/data/power_plants
+FileSystem=../../trunk/data/radars
+FileSystem=../../trunk/data/shields
+FileSystem=../../trunk/data/ships/octavius/apteryx
+FileSystem=../../trunk/data/ships/quantar/storm
+FileSystem=../../trunk/data/ships/squadrok/squid
+FileSystem=../../trunk/data/ships/tauseti/lady_kickstart
+FileSystem=../../trunk/data/skybox
+FileSystem=../../trunk/data/stations
+FileSystem=../../trunk/data/textures
+
+Zip=../../trunk/data/skybox/simpleSkybox.zip
+
+FileSystem=../../trunk/data/MediaFromOgre
+FileSystem=../../trunk/data/MediaFromOgre/AdvancedMaterials
Modified: branches/ogEditor/plugins.cfg
===================================================================
--- branches/ogEditor/plugins.cfg 2008-05-24 17:26:37 UTC (rev 903)
+++ branches/ogEditor/plugins.cfg 2008-05-25 09:10:42 UTC (rev 904)
@@ -2,7 +2,6 @@
## Use this for Windows
# Define plugin folder
-#PluginFolder=/home/carsten/local/python-ogre.work/root/usr/lib/OGRE
PluginFolder=/usr/lib/OGRE
#Plugin=RenderSystem_GL.dll
#Plugin=RenderSystem_Direct3D9.dll
Modified: branches/ogEditor/resources.cfg
===================================================================
--- branches/ogEditor/resources.cfg 2008-05-24 17:26:37 UTC (rev 903)
+++ branches/ogEditor/resources.cfg 2008-05-25 09:10:42 UTC (rev 904)
@@ -1,38 +1,15 @@
[Bootstrap]
-#Zip=../../../python-ogre/python-ogre/demos/media/packs/OgreCore.zip
-FileSystem=../../trunk/data/startup
+Zip=../../local/python-ogre/python-ogre/demos/media/packs/OgreCore.zip
-# Resource locations to be added to the default path
[General]
-FileSystem=../../trunk/data/
-FileSystem=../../trunk/data/capacitors
-FileSystem=../../trunk/data/commodities
-FileSystem=../../trunk/data/gui
-FileSystem=../../trunk/data/gui/fonts
-FileSystem=../../trunk/data/gui/layouts
-FileSystem=../../trunk/data/gui/imagesets
-FileSystem=../../trunk/data/gui/schemes
-FileSystem=../../trunk/data/gui/looknfeel
-FileSystem=../../trunk/data/gui/overlays
-FileSystem=../../trunk/data/ecms
-FileSystem=../../trunk/data/engines
-FileSystem=../../trunk/data/guns
-FileSystem=../../trunk/data/materials
-FileSystem=../../trunk/data/asteroids
-FileSystem=../../trunk/data/misc
-FileSystem=../../trunk/data/missiles
-FileSystem=../../trunk/data/power_plants
-FileSystem=../../trunk/data/radars
-FileSystem=../../trunk/data/shields
-FileSystem=../../trunk/data/ships/octavius/apteryx
-FileSystem=../../trunk/data/ships/quantar/storm
-FileSystem=../../trunk/data/ships/squadrok/squid
-FileSystem=../../trunk/data/ships/tauseti/lady_kickstart
-FileSystem=../../trunk/data/skybox
-FileSystem=../../trunk/data/stations
-FileSystem=../../trunk/data/textures
+FileSystem=../../local/python-ogre/python-ogre/demos/imemodels
+FileSystem=../../local/python-ogre/python-ogre/demos/media
+FileSystem=../../local/python-ogre/python-ogre/demos/media/fonts
+FileSystem=../../local/python-ogre/python-ogre/demos/media/materials/programs
+FileSystem=../../local/python-ogre/python-ogre/demos/media/materials/scripts
+FileSystem=../../local/python-ogre/python-ogre/demos/media/materials/textures
+FileSystem=../../local/python-ogre/python-ogre/demos/media/models
+FileSystem=../../local/python-ogre/python-ogre/demos/media/overlays
+FileSystem=../../local/python-ogre/python-ogre/demos/media/particle
+FileSystem=../../local/python-ogre/python-ogre/demos/media/gui
-Zip=../../trunk/data/skybox/simpleSkybox.zip
-
-FileSystem=../../trunk/data/MediaFromOgre
-FileSystem=../../trunk/data/MediaFromOgre/AdvancedMaterials
Modified: branches/ogEditor/src/OgreWindowWx.py
===================================================================
--- branches/ogEditor/src/OgreWindowWx.py 2008-05-24 17:26:37 UTC (rev 903)
+++ branches/ogEditor/src/OgreWindowWx.py 2008-05-25 09:10:42 UTC (rev 904)
@@ -79,9 +79,6 @@
settings = section_iter.getNext()
for key, path in settings:
ogre.ResourceGroupManager.getSingleton().addResourceLocation( path, key, section_name, False)
- #if self.ogResourceMan:
- #self.ogResourceMan.addResourceLocation( path, section_name )
-
self.resourceLocations.append( (path, section_name ) )
if os.path.exists( "ogre.cfg" ):
@@ -141,7 +138,7 @@
renderWindow = self.ogreRoot.createRenderWindow('wxPython render window', size[ 0 ], size[ 1 ], False, renderParameters)
renderWindow.active = True
self.renderWindow = renderWindow
-
+
ogre.ResourceGroupManager.getSingleton().initialiseAllResourceGroups()
def _OnSize(self, event):
Modified: branches/ogEditor/src/ResourceTreePane.py
===================================================================
--- branches/ogEditor/src/ResourceTreePane.py 2008-05-24 17:26:37 UTC (rev 903)
+++ branches/ogEditor/src/ResourceTreePane.py 2008-05-25 09:10:42 UTC (rev 904)
@@ -1,6 +1,5 @@
import wx
import wx.lib.customtreectrl as CT
-import opengate as og
import ogre.renderer.OGRE as ogre
@@ -34,13 +33,12 @@
return newNode
def buildResourceTree( self ):
- root = self.AddRoot( "Resources" )
+ self.root_ = root = self.AddRoot( "Resources" )
resManNode = self.AppendItem( root, "Ogre resource manager" )
## Insert resources group managers (Material, Mesh, Texture etc. )
ogreResourceGroupManager = ogre.ResourceGroupManager.getSingleton()
- ogResourceManager = og.ResourceManager.getSingleton()
resManIter = ogreResourceGroupManager.getResourceManagerIterator()
while resManIter.hasMoreElements():
@@ -66,13 +64,14 @@
resGroupName = resGroups[ i ]
resGroupNode = self.addItem( resGroupManNode, resGroupName, None )
- if ogResourceManager:
- resLocNode = self.addItem( resGroupNode, "Resource group locations", None )
+ #ogResourceManager = og.ResourceManager.getSingleton()
+ #if ogResourceManager:
+ #resLocNode = self.addItem( resGroupNode, "Resource group locations", None )
- if not resGroupName == "Autodetect" and not resGroupName == "Internal":
- resLocationList = ogResourceManager.resourceLocations( resGroupName )
- for resLocation in resLocationList:
- self.addItem( resLocNode, resLocation, None )
+ #if not resGroupName == "Autodetect" and not resGroupName == "Internal":
+ #resLocationList = ogResourceManager.resourceLocations( resGroupName )
+ #for resLocation in resLocationList:
+ #self.addItem( resLocNode, resLocation, None )
## Insert resources for each groups
resNameNode = self.addItem( resGroupNode, "Resources", None )
@@ -83,19 +82,8 @@
# insert Opengate specific resources
- if ogResourceManager:
- ogResManNode = self.AppendItem( root, "OpenGate resource manager" )
-
-
- if ogResourceManager.entityManager:
- ogEntityManagerNode = self.AppendItem( ogResManNode, "Entity manager" )
- entityManager = ogResourceManager.entityManager
- categories = entityManager.categories();
+
- for category in categories:
- categoryNode = self.AppendItem( ogEntityManagerNode, category )
-
-
## Insert resources group managers (Material, Mesh, Texture etc. )
# this fails ???
#fileInfoList = ogre.ResourceGroupManager.getSingleton().findResourceFileInfo( "General", "*.png")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
