Changeset 7105 for code/branches/presentation3/src/libraries/core

Timestamp:

Jun 3, 2010, 2:24:14 AM (14 years ago)

Author:

scheusso

Message:

std::set<T> is now synchronisable
this was neccessary to synchronise templates (now used in the Level class)
this was neccessary to synchronise lod templates and configuration

Location:

code/branches/presentation3/src/libraries/core

Files:

• BaseObject.cc (modified) (1 diff)
• BaseObject.h (modified) (1 diff)
• Template.h (modified) (1 diff)

code/branches/presentation3/src/libraries/core/BaseObject.cc

@@ -196 +196 @@
     {
         this->templates_.insert(temp);
+        if( temp->isLink() )
+        {
+          this->networkTemplateNames_.insert(temp->getLink());
+          assert( !Template::getTemplate(temp->getLink())->isLink() );
+        }
+        else
+          this->networkTemplateNames_.insert(temp->getName());
         temp->applyOn(this);
     }

code/branches/presentation3/src/libraries/core/BaseObject.h

@@ -191 +191 @@
             EventState* getEventState(const std::string& name) const;
 
-            std::string name_;                                 //!< The name of the object
-            std::string oldName_;                              //!< The old name of the object
-            mbool       bActive_;                              //!< True = the object is active
-            mbool       bVisible_;                             //!< True = the object is visible
-            std::string mainStateName_;
-            Functor*    mainStateFunctor_;
+            std::string             name_;                     //!< The name of the object
+            std::string             oldName_;                  //!< The old name of the object
+            mbool                   bActive_;                  //!< True = the object is active
+            mbool                   bVisible_;                 //!< True = the object is visible
+            std::string             mainStateName_;
+            Functor*                mainStateFunctor_;
+            std::set<std::string>   networkTemplateNames_;
 
         private:

code/branches/presentation3/src/libraries/core/Template.h

@@ -51 +51 @@
             inline const std::string& getLink() const
                 { return this->link_; }
+            inline bool isLink() const
+                { return this->bIsLink_; }
 
             inline void setLoadDefaults(bool bLoadDefaults)