opengate-svn Mailing List for Open Jumpgate (Page 30)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 501
          http://svn.sourceforge.net/opengate/?rev=501&view=rev
Author:   egore
Date:     2007-05-20 14:28:41 -0700 (Sun, 20 May 2007)

Log Message:
-----------
add commodity manager (possibly memleaking)

Modified Paths:
--------------
    branches/ogsector/data/equipment.xml
    branches/ogsector/src/Entity.h
    branches/ogsector/src/EntityManager.cpp
    branches/ogsector/src/EntityManager.h
    branches/ogsector/src/GameStateManager.cpp
    branches/ogsector/src/GameStateManager.h

Added Paths:
-----------
    branches/ogsector/data/commodities.xml

Added: branches/ogsector/data/commodities.xml
===================================================================

--- branches/ogsector/data/commodities.xml	                        (rev 0)
+++ branches/ogsector/data/commodities.xml	2007-05-20 21:28:41 UTC (rev 501)
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+
+<commodities>
+	<Resource id="1" location="../../trunk/data/commodities/aluminium.xml"/>
+</commodities>

Modified: branches/ogsector/data/equipment.xml
===================================================================
--- branches/ogsector/data/equipment.xml	2007-05-20 21:27:12 UTC (rev 500)
+++ branches/ogsector/data/equipment.xml	2007-05-20 21:28:41 UTC (rev 501)
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 
-<capacitor>
-	<Resource id="1" location="../../trunk/data/capacitors/s_c_15.xml"/>
-</capacitor>
+<equipment>
+	<Resource id="1" location="../../trunk/data/capacitors/s_c_15.xml" />
+	<Resource id="2" location="../../trunk/data/ECMs/ghost.xml" />
+</equipment>

Modified: branches/ogsector/src/Entity.h
===================================================================
--- branches/ogsector/src/Entity.h	2007-05-20 21:27:12 UTC (rev 500)
+++ branches/ogsector/src/Entity.h	2007-05-20 21:28:41 UTC (rev 501)
@@ -21,8 +21,8 @@
 #ifndef _OPENGATE_ENTITY_H
 #define _OPENGATE_ENTITY_H
 
+#include <set>
 #include <string>
-#include <vector>
 
 namespace OpenGate{
 
@@ -72,8 +72,9 @@
 
   std::string className_;
 
+  /*! A unique ID to find this object \todo maybe push to a string and merge with Commodity.commodityID_ */
   int id_;
-
+  /*! The required tech level to interact with this object */
   int techLevel_;
   /*! The mass of this entity. */
   long mass_;
@@ -93,23 +94,37 @@
 class EquipmentTemplate : public EntityTemplate{
 public:
 
+  inline void setDescription( const std::string & description ) { description_ = description; }
+  inline std::string description( ) const { return description_; }
+
+  inline void setManufacturer( const std::string & manufacturer ) { manufacturer_ = manufacturer; }
+  inline std::string manufacturer( ) const { return manufacturer_; }
+
   inline void setSize( short size ){ size_ = size; }
   inline short size( ) const { return size_; }
 
+  inline void setProductionCenters( const std::set < std::string > & productionCenter ) { productionCenter_ = productionCenter; }
+  inline std::set < std::string> productionCenters( ) const { return productionCenter_; }
+
+  inline void setRequieredComponents( const std::set < Commodity * > & requieredComponents ) { requieredComponents_ = requieredComponents; }
+  inline std::set < Commodity * > requieredComponents( ) const { return requieredComponents_; }
+
 protected:
-  EquipmentTemplate(): EntityTemplate() {
+  EquipmentTemplate(): EntityTemplate(), description_( "none" ), manufacturer_( "unkown" ) {
     size_ = 0;
   }
 
-  std::string _description;
-  // TODO: Company* _manufacturer;
-  // TODO: std::vector<char*> _productioncenter;
-
+  /*! A rather long description of this component */
+  std::string description_;
+  /*! Name of the company that produces this equipment */
+  std::string manufacturer_;
   /*! The amount of slots necessary to plug in such a device. */
   short size_;
+  /*! The places where this part of equipment is built */
+  std::set < std::string > productionCenter_;
+  /*! The components required to build this equipment part */
+  std::set < Commodity * > requieredComponents_;
 
-  std::vector<Commodity> _requierd_component[];
-
 };
 
 /*!
@@ -210,28 +225,37 @@
 class Commodity : public EntityTemplate{
 public:
 
-  Commodity(): EntityTemplate(), id_( "unknown" ) {
+  Commodity(): EntityTemplate(), commodityID_( "unknown" ) {
     meltingPoint_ = 0;
+    size_ = 0;
     graviticSig_ = 0.0;
   }
 
-  inline void setProductionCenters( const std::vector<std::string> & productionCenter ) { productionCenter_ = productionCenter; }
-  inline std::vector<std::string> productionCenters( ) const { return productionCenter_; }
+  inline void setProductionCenters( const std::set < std::string > & productionCenters ) { productionCenters_ = productionCenters; }
+  inline std::set < std::string > productionCenters( ) const { return productionCenters_; }
 
-  inline void setId( const std::string & id ) { id_ = id; }
-  inline std::string id( ) const { return id_; }
-
   inline void setMeltingPoint( int meltingPoint ){ meltingPoint_ = meltingPoint; }
   inline int meltingPoint( ) const { return meltingPoint_; }
 
   inline void setGraviticSig( double graviticSig ){ graviticSig_ = graviticSig; }
   inline double graviticSig( ) const { return graviticSig_; }
 
+  inline void setCommodityID( const std::string & commodityID ) { commodityID_ = commodityID; }
+  inline std::string commodityID( ) const { return commodityID_; }
+
+  inline void setSize( short size ){ size_ = size; }
+  inline short size( ) const { return size_; }
+
 protected:
-  std::vector<std::string> productionCenter_;
-  std::string id_;
-
+  /*! A list of all stations that produce this commodity */
+  std::set < std::string > productionCenters_;
+  /*! The unique name of this commodity \todo check if that can be merged with EntityTemlpate.id_ */
+  std::string commodityID_;
+  /*! The specific melting point of this commodity */
   int meltingPoint_;
+  /*! The size this commodity requires in cargo unit (1 size = 1 cargo unit)*/
+  short size_;
+  /*! The specific atomic wheight of this commodity */
   double graviticSig_;
 };
 

Modified: branches/ogsector/src/EntityManager.cpp
===================================================================
--- branches/ogsector/src/EntityManager.cpp	2007-05-20 21:27:12 UTC (rev 500)
+++ branches/ogsector/src/EntityManager.cpp	2007-05-20 21:28:41 UTC (rev 501)
@@ -67,6 +67,26 @@
   }
 }
 
+template<> EquipmentManager * Ogre::Singleton< EquipmentManager >::ms_Singleton = 0;
+
+EquipmentManager::EquipmentManager(): EntityManager(){
+}
+
+EquipmentManager::~EquipmentManager() {
+}
+
+EquipmentManager & EquipmentManager::getSingleton( ){
+  assert( ms_Singleton );
+  return ( *ms_Singleton );
+}
+
+EquipmentManager * EquipmentManager::getSingletonPtr( ){
+  if ( ms_Singleton == NULL ){
+    LogManager::getSingleton().fatal( "CommodityManager not initialized." );
+  }
+  return ms_Singleton;
+}
+
 EntityTemplate * EquipmentManager::loadAndCreate( int id, const std::string & fileName ){
 
   TiXmlDocument doc( fileName );
@@ -161,6 +181,28 @@
     //! \todo Add logic for things other than capacitors and ECMs
   }
 
+  // Production Data
+  std::set < std::string > productionCenters;
+  for ( pElem = hRoot.FirstChild( "production-center" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
+    productionCenters.insert( pElem->FirstChild()->Value() ); //!< \todo check return value!
+  }
+  entity->setProductionCenters( productionCenters );
+  CommodityManager* commodityMgr = CommodityManager::getSingletonPtr();
+  if ( !commodityMgr ) {
+    log_->fatal( "Cannot find the commodity manager, no production data available" );
+    return NULL;
+  }
+  std::set < Commodity * > commodities;
+  for ( pElem = hRoot.FirstChild( "required-component" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
+    Commodity *commodity = commodityMgr->findByName ( pElem->FirstChild()->Value() ); //!< \todo check return value!
+    if ( commodity ) {
+      commodities.insert( commodity );
+    } else {
+      log_->warn( fileName + " has unsatisfied commodities." );
+    }
+  }
+  entity->setRequieredComponents( commodities );
+
   if ( templatesByName_.count( entity->name() ) == 0 ){
     entity->setID( id );
     templatesByName_[ entity->name() ] = entity;
@@ -170,19 +212,111 @@
     log_->info( std::string( "Loaded " ) + equipmentType + std::string( ": ") + entity->factionName() + "/" + entity->name() );
   } else {
     log_->warn( std::string( "Equipment with name: " ) + entity->factionName() + "/" + entity->name() +
-               " allready loaded" );
+               " already loaded" );
   }
   return entity;
 }
 
-template<> EquipmentManager * Ogre::Singleton< EquipmentManager >::ms_Singleton = 0;
+template<> CommodityManager * Ogre::Singleton< CommodityManager >::ms_Singleton = 0;
 
-EquipmentManager::EquipmentManager(): EntityManager(){
+CommodityManager::CommodityManager(): EntityManager(){
 }
 
-EquipmentManager::~EquipmentManager() {
+CommodityManager::~CommodityManager() {
 }
 
+CommodityManager & CommodityManager::getSingleton( ){
+  assert( ms_Singleton );
+  return ( *ms_Singleton );
 }
 
+CommodityManager * CommodityManager::getSingletonPtr( ){
+  if ( ms_Singleton == NULL ){
+    LogManager::getSingleton().fatal( "CommodityManager not initialized." );
+  }
+  return ms_Singleton;
+}
 
+EntityTemplate * CommodityManager::loadAndCreate( int id, const std::string & fileName ){
+
+  TiXmlDocument doc( fileName );
+  bool loadOkay = doc.LoadFile();
+
+  if ( !loadOkay ) {
+    log_->fatal( std::string( "Failed to load commodity file: " + fileName ) );
+    return NULL;
+  }
+
+  TiXmlHandle docHandle( &doc );
+  TiXmlElement* pElem;
+  TiXmlNode* pNode;
+  TiXmlHandle hRoot( 0 );
+
+  //** block: equipment;
+  pElem = docHandle.FirstChildElement().Element();
+  hRoot = TiXmlHandle( pElem );
+
+  if ( !pElem ) {
+    log_->fatal( fileName + " cannot read first node." );
+    return NULL;
+  }
+
+  if ( strcmp( "component", pElem->Value() ) != 0 ){
+    log_->fatal( fileName + " is no commodity description" );
+    return NULL;
+  }
+
+  Commodity *entity = new Commodity;
+
+  // Naming
+  pElem = hRoot.ChildElement( "name_en", 0 ).Element();
+  if ( pElem ) {
+    entity->setName( pElem->FirstChild()->Value() );
+  } else {
+    log_->fatal( fileName + " has no name (mandatory)." );
+    return NULL;
+  }
+
+  // Generic Data
+  pElem = hRoot.ChildElement( "class", 0 ).Element();
+  if ( pElem ) entity->setClassName( pElem->FirstChild()->Value() );
+  pElem = hRoot.ChildElement( "techlevel", 0 ).Element();
+  if ( pElem ) entity->setTechLevel( toInt( pElem->FirstChild()->Value() ) );
+  pElem = hRoot.ChildElement( "size", 0 ).Element();
+  if ( pElem ) entity->setSize( toInt( pElem->FirstChild()->Value() ) );
+  pElem = hRoot.ChildElement( "mass", 0 ).Element();
+  if ( pElem ) entity->setMass( toInt( pElem->FirstChild()->Value() ) );
+
+  // Specific Data
+  pElem = hRoot.ChildElement( "id", 0 ).Element();
+  if ( pElem ) entity->setCommodityID( pElem->FirstChild()->Value() );
+  pElem = hRoot.ChildElement( "melting-point", 0 ).Element();
+  if ( pElem ) entity->setMeltingPoint( toInt( pElem->FirstChild()->Value() ) );
+  pElem = hRoot.ChildElement( "gravitic-sig", 0 ).Element();
+  if ( pElem ) entity->setGraviticSig( toFloat( pElem->FirstChild()->Value() ) );
+
+  // Production Data
+  std::set < std::string > productionCenters;
+  for ( pElem = hRoot.FirstChild( "production-center" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
+    productionCenters.insert( pElem->FirstChild()->Value() ); //!< \todo check return value!
+  }
+  entity->setProductionCenters( productionCenters );
+  //! \todo Add required components
+
+  if ( templatesByName_.count( entity->name() ) == 0 ){
+    entity->setID( id );
+    templatesByName_[ entity->name() ] = entity;
+    templatesByID_[ id ] = entity;
+
+    factions_.insert( entity->factionName() );
+    log_->info( std::string( "Loaded Commodity: " ) + entity->factionName() + "/" + entity->name() );
+  } else {
+    log_->warn( std::string( "Equipment with name: " ) + entity->factionName() + "/" + entity->name() +
+               " allready loaded" );
+  }
+  return entity;
+}
+
+}
+
+

Modified: branches/ogsector/src/EntityManager.h
===================================================================
--- branches/ogsector/src/EntityManager.h	2007-05-20 21:27:12 UTC (rev 500)
+++ branches/ogsector/src/EntityManager.h	2007-05-20 21:28:41 UTC (rev 501)
@@ -92,6 +92,40 @@
 
 };
 
+/*!
+ * \brief This class is able to load equipment (reactors, engines, guns, etc.)
+ *        from XML files.
+ * \author Christoph Brill <eg...@us...>
+ */
+class CommodityManager : public Ogre::Singleton< CommodityManager >, public EntityManager{
+public:
+
+  /*! Get the single instance of the EquipmentManager */
+  static CommodityManager & getSingleton( );
+
+  /*! Get the pointer to single instance of the EquipmentManager */
+  static CommodityManager * getSingletonPtr( );
+
+  /*! Constructor */
+  CommodityManager();
+
+  /*! Destructor that free's all loaded vessels */
+  virtual ~CommodityManager();
+
+  virtual EntityTemplate * loadAndCreate( int id, const std::string & filename );
+
+  /*! This returns a commodity by it's given name \remarks The commodity needs to be loaded before \param commodityName The name of a commodity */
+  Commodity * findByName( const std::string & commodityName ){
+    if ( templatesByName_.count( commodityName ) ){
+      return static_cast<Commodity *>(templatesByName_[ commodityName ]);
+    } else {
+      log_->fatal( std::string( "Unknown commodity with name :" ) + commodityName );
+      return NULL;
+    }
+  }
+
+};
+
 } // namespace OpenGate
 
 #endif //_OPENGATE_ENTITYMANAGER_H

Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp	2007-05-20 21:27:12 UTC (rev 500)
+++ branches/ogsector/src/GameStateManager.cpp	2007-05-20 21:28:41 UTC (rev 501)
@@ -310,6 +310,9 @@
   vesselManager_ = new VesselManager( );
   vesselManager_->load( resourcePaths_, "ships.xml" );
 
+  commodityManager_ = new CommodityManager( );
+  commodityManager_->load( resourcePaths_, "commodities.xml" );
+
   equipmentManager_ = new EquipmentManager( );
   equipmentManager_->load( resourcePaths_, "equipment.xml" );
 

Modified: branches/ogsector/src/GameStateManager.h
===================================================================
--- branches/ogsector/src/GameStateManager.h	2007-05-20 21:27:12 UTC (rev 500)
+++ branches/ogsector/src/GameStateManager.h	2007-05-20 21:28:41 UTC (rev 501)
@@ -33,6 +33,7 @@
 class VesselManager;
 class ConfigDialog;
 class EquipmentManager;
+class CommodityManager;
 
 /*!
  * \brief The class defines the gamestate manager.
@@ -44,7 +45,8 @@
 class GameStateManager : public GameStateListener {
 public:
 
-  /*! \brief Holds information about the states in order to manage them properly and provide access. */
+  /*! \brief Holds information about the states in order to manage them properly
+   *         and provide access. */
   typedef struct {
     std::string name;
     GameState * state;
@@ -62,7 +64,11 @@
   /*! Store a game state to manage. */
   void manageGameState( const std::string & stateName, GameState * state );
 
-  /*!  Start game state. This is used to start the game state  manager functioning with a particular state. This function also does the main game loop and takes care of the Windows message pump.*/
+  /*! \brief Start game state.
+   *
+   * This is used to start the game state  manager functioning with a particular
+   * state. This function also does the main game loop and takes care of the
+   * Windows message pump.*/
   void start( GameState * state );
 
   /*! capture network, called every frame. */
@@ -105,6 +111,7 @@
   LogManager           * log_;
   VesselManager        * vesselManager_;
   EquipmentManager     * equipmentManager_;
+  CommodityManager     * commodityManager_;
 
   std::set < std::string > resourcePaths_;
   std::vector< GameState * > stateStack_;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar (11)	Apr (47)	May (14)	Jun	Jul (73)	Aug (4)	Sep (2)	Oct (60)	Nov (48)	Dec (66)
2007	Jan	Feb (1)	Mar (27)	Apr (82)	May (89)	Jun (91)	Jul (44)	Aug (53)	Sep (113)	Oct (20)	Nov (37)	Dec (10)
2008	Jan	Feb (2)	Mar	Apr (2)	May (21)	Jun (3)	Jul	Aug	Sep	Oct	Nov	Dec (1)
2009	Jan (76)	Feb (89)	Mar (52)	Apr (11)	May (1)	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec (27)
2010	Jan (11)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (9)	Sep	Oct	Nov	Dec (14)
2012	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (2)	Sep (11)	Oct (3)	Nov	Dec
2013	Jan (4)	Feb	Mar (2)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

opengate-svn Mailing List for Open Jumpgate (Page 30)

Opengate is a Jumpgate remake

opengate-svn — List for Subversion commits