Changeset 696 for code/branches/FICN

Timestamp:

Dec 27, 2007, 4:59:55 AM (17 years ago)

Author:

landauf

Message:

IdentifierMap works now on tardis (this pre-main() stuff is s* and ! f* !)

Location:

code/branches/FICN

Files:

• bin/ogre.cfg-init (modified) (1 diff)
• src/orxonox/core/Identifier.cc (modified) (2 diffs)
• src/orxonox/core/Identifier.h (modified) (3 diffs)

code/branches/FICN/bin/ogre.cfg-init

@@ -2 +2 @@
 
 [OpenGL Rendering Subsystem]
-FSAA=4
+FSAA=0
 Full Screen=No
 RTT Preferred Mode=PBuffer
-Video Mode=1280 x 1024
+Video Mode=1024 x 768

code/branches/FICN/src/orxonox/core/Identifier.cc

@@ -40 +40 @@
     int Identifier::hierarchyCreatingCounter_s = 0; // Set the static member variable hierarchyCreatingCounter_s to zero
     unsigned int Identifier::classIDcounter_s = 0;  // Set the static member variable classIDcounter_s to zero
-    std::map<std::string, Identifier*> Identifier::identifierMap_s;
 
     /**
@@ -115 +114 @@
 
     /**
+        @returns a reference to the Identifier map, containing all Identifiers.
+    */
+    std::map<std::string, Identifier*>& Identifier::getIdentifierMap()
+    {
+        static std::map<std::string, Identifier*> identifierMapStaticReference = std::map<std::string, Identifier*>();
+        return identifierMapStaticReference;
+    }
+
+    /**
         @returns true, if the Identifier is at least of the given type.
         @param identifier The identifier to compare with

code/branches/FICN/src/orxonox/core/Identifier.h

@@ -137 +137 @@
                 { this->configValues_[varname] = container; }
 
+            std::map<std::string, Identifier*>& getIdentifierMap();
+
         private:
             Identifier();
@@ -172 +174 @@
             unsigned int classID_;                                      //!< The network ID to identify a class through the network
             std::map<std::string, ConfigValueContainer*> configValues_; //!< A map to link the string of configurable variables with their ConfigValueContainer
-            static std::map<std::string, Identifier*> identifierMap_s;  //!< A map, containing all existing ClassIdentifiers
     };
 
@@ -282 +283 @@
         {
             this->name_ = name;
-            this->identifierMap_s[name] = this;
+            this->getIdentifierMap().insert(std::pair<std::string, Identifier*>(name, this));
             this->bSetName_ = true;
         }