Menu
▾
▴
[Opengate-svn] SF.net SVN: opengate: [905] trunk/src
|
From: <spo...@us...> - 2008-05-25 11:51:07
|
Revision: 905
http://opengate.svn.sourceforge.net/opengate/?rev=905&view=rev
Author: spom_spom
Date: 2008-05-25 04:51:13 -0700 (Sun, 25 May 2008)
Log Message:
-----------
ogEditor: integrate opengate as module
Modified Paths:
--------------
branches/ogEditor/ogEditor.py
branches/ogEditor/opengate-resources.cfg
branches/ogEditor/resources.cfg
branches/ogEditor/src/OgreWindowWx.py
branches/ogEditor/src/ResourceTreePane.py
trunk/resources.cfg
trunk/src/Entity.cpp
trunk/src/GameStateManager.cpp
trunk/src/ResourceManager.cpp
Modified: branches/ogEditor/ogEditor.py
===================================================================
--- branches/ogEditor/ogEditor.py 2008-05-25 09:10:42 UTC (rev 904)
+++ branches/ogEditor/ogEditor.py 2008-05-25 11:51:13 UTC (rev 905)
@@ -21,6 +21,7 @@
try:
import opengate as og
+ haveOpenGatePlugin = True
except:
haveOpenGatePlugin = False
pass
@@ -56,24 +57,27 @@
self.resourceManager_.ogreRoot = OgreWindow.ogreRoot
self.resourceManager_.renderWindow = OgreWindow.renderWindow
+ OgreWindow.AddResources( "opengate-resources.cfg" )
+ ogre.ResourceGroupManager.getSingleton().initialiseResourceGroup( "Opengate" )
+
+
for res in OgreWindow.resourceLocations:
self.resourceManager_.addResourceLocation( res[0], res[1] )
-
def initOpenGateResources_( self ):
self.resourceManager_.loadGlobalIDs( "ids.xml" )
entityManager = self.resourceManager_.entityManager
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "commodities" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "engines" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "capacitors" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "radars" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "shields" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "ecms" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "power_plants" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "guns" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "missiles" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "ships" );
- entityManager.load( self.resourceManager_.resourceLocations( "General" ), "stations" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "commodities" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "engines" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "capacitors" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "radars" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "shields" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "ecms" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "power_plants" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "guns" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "missiles" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "ships" );
+ entityManager.load( self.resourceManager_.resourceLocations( "Opengate" ), "stations" );
def getName( self ):
return "Opengate"
@@ -140,7 +144,9 @@
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.resourceTree.buildResourceTree( )
+ self.UpdateSceneGraphEvent()
+ self.og.AddToSceneGraph( self.sceneTree, self.sceneTree.GetRootItem() )
self.og.AddToResourcesTree( self.resourceTree, self.resourceTree.root_ )
else:
Modified: branches/ogEditor/opengate-resources.cfg
===================================================================
--- branches/ogEditor/opengate-resources.cfg 2008-05-25 09:10:42 UTC (rev 904)
+++ branches/ogEditor/opengate-resources.cfg 2008-05-25 11:51:13 UTC (rev 905)
@@ -1,14 +1,14 @@
-[General]
+[Opengate]
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/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
@@ -29,5 +29,5 @@
Zip=../../trunk/data/skybox/simpleSkybox.zip
-FileSystem=../../trunk/data/MediaFromOgre
-FileSystem=../../trunk/data/MediaFromOgre/AdvancedMaterials
+#FileSystem=../../trunk/data/MediaFromOgre
+#FileSystem=../../trunk/data/MediaFromOgre/AdvancedMaterials
Modified: branches/ogEditor/resources.cfg
===================================================================
--- branches/ogEditor/resources.cfg 2008-05-25 09:10:42 UTC (rev 904)
+++ branches/ogEditor/resources.cfg 2008-05-25 11:51:13 UTC (rev 905)
@@ -1,15 +1,14 @@
[Bootstrap]
-Zip=../../local/python-ogre/python-ogre/demos/media/packs/OgreCore.zip
+Zip=../../../../local/python-ogre/python-ogre/demos/media/packs/OgreCore.zip
[General]
-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
-
+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
Modified: branches/ogEditor/src/OgreWindowWx.py
===================================================================
--- branches/ogEditor/src/OgreWindowWx.py 2008-05-25 09:10:42 UTC (rev 904)
+++ branches/ogEditor/src/OgreWindowWx.py 2008-05-25 11:51:13 UTC (rev 905)
@@ -63,14 +63,10 @@
self.SceneInitialisation()
self.UpdateRender()
self.SetFocus() #Gives KeyboardFocus
-
- def _OgreInit(self,size,renderSystem):
- #Root creation
- self.ogreRoot = ogre.Root( getPluginPath(), "ogre.cfg" )
- # setup resources
+ def AddResources( self, resourceFile ):
config = ogre.ConfigFile()
- config.load( 'resources.cfg' )
+ config.load( resourceFile )
self.resourceLocations = []
section_iter = config.getSectionIterator()
@@ -80,6 +76,13 @@
for key, path in settings:
ogre.ResourceGroupManager.getSingleton().addResourceLocation( path, key, section_name, False)
self.resourceLocations.append( (path, section_name ) )
+
+ def _OgreInit(self,size,renderSystem):
+ #Root creation
+ self.ogreRoot = ogre.Root( getPluginPath(), "ogre.cfg" )
+
+ # setup resources
+ self.AddResources( "resources.cfg" );
if os.path.exists( "ogre.cfg" ):
self.ogreRoot.restoreConfig()
Modified: branches/ogEditor/src/ResourceTreePane.py
===================================================================
--- branches/ogEditor/src/ResourceTreePane.py 2008-05-25 09:10:42 UTC (rev 904)
+++ branches/ogEditor/src/ResourceTreePane.py 2008-05-25 11:51:13 UTC (rev 905)
@@ -33,6 +33,7 @@
return newNode
def buildResourceTree( self ):
+ self.DeleteAllItems()
self.root_ = root = self.AddRoot( "Resources" )
resManNode = self.AppendItem( root, "Ogre resource manager" )
Modified: trunk/resources.cfg
===================================================================
--- trunk/resources.cfg 2008-05-25 09:10:42 UTC (rev 904)
+++ trunk/resources.cfg 2008-05-25 11:51:13 UTC (rev 905)
@@ -1,7 +1,7 @@
[Bootstrap]
FileSystem=./data/startup
-[General]
+[Opengate]
FileSystem=./data/
FileSystem=./data/commodities
FileSystem=./data/capacitors
Modified: trunk/src/Entity.cpp
===================================================================
--- trunk/src/Entity.cpp 2008-05-25 09:10:42 UTC (rev 904)
+++ trunk/src/Entity.cpp 2008-05-25 11:51:13 UTC (rev 905)
@@ -105,7 +105,7 @@
CEGUI::Texture * texture = NULL;
try {
- texture = dynamic_cast< CEGUI::OgreCEGUIRenderer * >( ResourceManager::getSingleton().guiRenderer )->createTexture( imageName, "General");
+ texture = dynamic_cast< CEGUI::OgreCEGUIRenderer * >( ResourceManager::getSingleton().guiRenderer )->createTexture( imageName, "Opengate");
} catch( CEGUI::Exception & e ){
if ( verbose ) LogManager::getSingleton().warn( e.getMessage().c_str() );
fail = true;
@@ -201,7 +201,7 @@
meshName_ = meshName.substr( 0, meshName.rfind( ".mesh" ) ) + ".mesh" ;
pMesh_ = Ogre::MeshManager::getSingleton().load( meshName_,
- "General",
+ "Opengate",
Ogre::HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY,
Ogre::HardwareBuffer::HBU_STATIC_WRITE_ONLY,
true, true);
Modified: trunk/src/GameStateManager.cpp
===================================================================
--- trunk/src/GameStateManager.cpp 2008-05-25 09:10:42 UTC (rev 904)
+++ trunk/src/GameStateManager.cpp 2008-05-25 11:51:13 UTC (rev 905)
@@ -268,17 +268,17 @@
bool GameStateManager::initialiseEntityManager(){
resources_.entityManager = new EntityManager( );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "commodities" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "engines" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "capacitors" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "radars" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "shields" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "ecms" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "power_plants" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "guns" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "missiles" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "ships" );
- resources_.entityManager->load( resources_.resourceLocations( "General" ), "stations" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "commodities" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "engines" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "capacitors" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "radars" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "shields" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "ecms" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "power_plants" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "guns" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "missiles" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "ships" );
+ resources_.entityManager->load( resources_.resourceLocations( "Opengate" ), "stations" );
return true;
}
@@ -352,9 +352,9 @@
}
}
- Ogre::ResourceGroupManager::getSingleton().initialiseResourceGroup( "General" );
- std::cout << "Ogre::ResourceGroupManager::getSingleton().initialiseResourceGroup( General ); " << std::endl;
- Ogre::ResourceGroupManager::ResourceDeclarationList li = Ogre::ResourceGroupManager::getSingleton().getResourceDeclarationList( "General" );
+ Ogre::ResourceGroupManager::getSingleton().initialiseResourceGroup( "Opengate" );
+ std::cout << "Ogre::ResourceGroupManager::getSingleton().initialiseResourceGroup( Opengate ); " << std::endl;
+ Ogre::ResourceGroupManager::ResourceDeclarationList li = Ogre::ResourceGroupManager::getSingleton().getResourceDeclarationList( "Opengate" );
std::cout << li.size() << std::endl;
for ( std::list<Ogre::ResourceGroupManager::ResourceDeclaration>::iterator it = li.begin(); it != li.end(); it ++ ){
std::cout << (*it).resourceName << std::endl;
Modified: trunk/src/ResourceManager.cpp
===================================================================
--- trunk/src/ResourceManager.cpp 2008-05-25 09:10:42 UTC (rev 904)
+++ trunk/src/ResourceManager.cpp 2008-05-25 11:51:13 UTC (rev 905)
@@ -134,11 +134,11 @@
std::string ResourceManager::findFullFileName( const std::string & fileName ){
- Ogre::FileSystemArchive pArch = Ogre::FileSystemArchive( (*resourceLocations_["General"].begin()), "FileSystem" );
+ Ogre::FileSystemArchive pArch = Ogre::FileSystemArchive( (*resourceLocations_["Opengate"].begin()), "FileSystem" );
Ogre::StringVectorPtr file = pArch.find( fileName, true, false);
if ( (*file).size() > 0 ){
- return (*resourceLocations_["General"].begin() ) + "/" + (*file)[ 0 ] ;
+ return (*resourceLocations_["Opengate"].begin() ) + "/" + (*file)[ 0 ] ;
}
// for ( unsigned int i = 0; i < (*file).size(); i ++ ){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
