Changeset 1989 for code/branches/objecthierarchy/src/core

Timestamp:

Oct 21, 2008, 4:56:41 PM (16 years ago)

Author:

landauf

Message:

• added ControllableEntity, the baseclass of all players, vehicles and ships.
• moved Template to core
• some changes in Camera
• added 6 constants to WorldEntity to identify relative directions
• changed vom Radian to Degree as default angle unit

Location:

code/branches/objecthierarchy/src/core

Files:

• BaseObject.cc (modified) (3 diffs)
• BaseObject.h (modified) (2 diffs)
• CMakeLists.txt (modified) (1 diff)
• CorePrereqs.h (modified) (1 diff)
• Template.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Template.cc) (2 diffs, 1 prop)
• Template.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Template.h) (2 diffs, 1 prop)
• XMLPort.h (modified) (2 diffs)

code/branches/objecthierarchy/src/core/BaseObject.cc

@@ -37 +37 @@
 #include "XMLPort.h"
 #include "Level.h"
+#include "Template.h"
 
 namespace orxonox
@@ -76 +77 @@
         XMLPortParam(BaseObject, "visible", setVisible, isVisible, xmlelement, mode);
         XMLPortParam(BaseObject, "active", setActive, isActive, xmlelement, mode);
+
+        XMLPortObjectTemplate(BaseObject, Template, "templates", addTemplate, getTemplate, xmlelement, mode, const std::string&);
     }
 
@@ -86 +89 @@
         return this->level_->getFile();
     }
+
+    /**
+        @brief Adds a Template to the object.
+        @param name The name of the Template
+    */
+    void BaseObject::addTemplate(const std::string& name)
+    {
+        Template* temp = Template::getTemplate(name);
+        if (temp)
+            this->addTemplate(temp);
+        else
+            COUT(1) << "Error: \"" << name << "\" is not a valid Template name (in class: " << this->getIdentifier()->getName() << ", name: " << this->getName() << ")." << std::endl;
+    }
+
+    /**
+        @brief Adds a Template to the object.
+        @param temp The Template
+    */
+    void BaseObject::addTemplate(Template* temp)
+    {
+        this->templates_.insert(temp);
+        temp->applyOn(this);
+    }
+
+    /**
+        @brief Returns the Template with the given index.
+        @param index The index
+    */
+    Template* BaseObject::getTemplate(unsigned int index) const
+    {
+        unsigned int i = 0;
+        for (std::set<Template*>::const_iterator it = this->templates_.begin(); it != this->templates_.end(); ++it)
+        {
+            if (i == index)
+                return (*it);
+            i++;
+        }
+        return 0;
+    }
 }

code/branches/objecthierarchy/src/core/BaseObject.h

@@ -87 +87 @@
             const std::string& getLevelfile() const;
 
+            void addTemplate(const std::string& name);
+            void addTemplate(Template* temp);
+            /** @brief Returns the set of all aplied templates. */
+            inline const std::set<Template*>& getTemplates() const
+                { return this->templates_; }
+
             virtual inline void setNamespace(Namespace* ns) { this->namespace_ = ns; }
             inline Namespace* getNamespace() const { return this->namespace_; }
@@ -102 +108 @@
 
         private:
+            Template* getTemplate(unsigned int index) const;
+
             bool bInitialized_;                         //!< True if the object was initialized (passed the object registration)
             const Level* level_;                        //!< The level that loaded this object
             std::string loaderIndentation_;             //!< Indentation of the debug output in the Loader
             Namespace* namespace_;
+            std::set<Template*> templates_;
     };
 

code/branches/objecthierarchy/src/core/CMakeLists.txt

@@ -31 +31 @@
   Namespace.cc
   NamespaceNode.cc
+  Template.cc
   XMLPort.cc
 

code/branches/objecthierarchy/src/core/CorePrereqs.h

@@ -153 +153 @@
   struct TclInterpreterBundle;
   class TclThreadManager;
+  class Template;
   class Tickable;
   template <class T, class O>

code/branches/objecthierarchy/src/core/Template.cc

@@ -49 +49 @@
     Template::~Template()
     {
+        Template::getTemplateMap().erase(this->getName());
     }
 
@@ -59 +60 @@
 
         this->setXMLElement(*xmlelement.FirstChildElement(false));
+    }
+
+    void Template::changedName()
+    {
+        if (this->getName() != "")
+        {
+            std::map<std::string, Template*>::iterator it;
+            it = Template::getTemplateMap().find(this->getOldName());
+            if (it != Template::getTemplateMap().end())
+                Template::getTemplateMap().erase(it);
+
+            it = Template::getTemplateMap().find(this->getName());
+            if (it != Template::getTemplateMap().end())
+                COUT(2) << "Warning: Template with name \"" << this->getName() << "\" already exists." << std::endl;
+            else
+                Template::getTemplateMap()[this->getName()] = this;
+        }
     }
 

code/branches/objecthierarchy/src/core/Template.h

@@ -32 +32 @@
 #include <map>
 
-#include "OrxonoxPrereqs.h"
-#include "core/BaseObject.h"
+#include "CorePrereqs.h"
+
+#include "BaseObject.h"
 #include "tinyxml/ticpp.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Template : public BaseObject
+    class _CoreExport Template : public BaseObject
     {
         public:
@@ -45 +46 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void changedName();
 
             inline void setLink(const std::string& link)

code/branches/objecthierarchy/src/core/XMLPort.h

@@ -219 +219 @@
 */
 #define XMLPortObjectExtendedTemplate(classname, objectclass, sectionname, loadfunction, savefunction, xmlelement, mode, bApplyLoaderMask, bLoadBefore, ...) \
-    XMLPortObjectGeneric(xmlcontainer##loadfunction##savefunction, classname, objectclass, sectionname, orxonox::createExecutor(orxonox::createFunctor< __VA_ARGS__ >(&classname::loadfunction), std::string( #classname ) + "::" + #loadfunction), orxonox::createExecutor(orxonox::createFunctor(&classname::savefunction), std::string( #classname ) + "::" + #savefunction), xmlelement, mode, bApplyLoaderMask, bLoadBefore)
+    XMLPortObjectGeneric(xmlcontainer##loadfunction##savefunction, classname, objectclass, sectionname, orxonox::createExecutor(orxonox::createFunctor<classname, __VA_ARGS__ >(&classname::loadfunction), std::string( #classname ) + "::" + #loadfunction), orxonox::createExecutor(orxonox::createFunctor(&classname::savefunction), std::string( #classname ) + "::" + #savefunction), xmlelement, mode, bApplyLoaderMask, bLoadBefore)
 
 // -------------
@@ -233 +233 @@
 */
 #define XMLPortObjectTemplate(classname, objectclass, sectionname, loadfunction, savefunction, xmlelement, mode, ...) \
-    XMLPortObjectGeneric(xmlcontainer##loadfunction##savefunction, classname, objectclass, sectionname, orxonox::createExecutor(orxonox::createFunctor< __VA_ARGS__ >(&classname::loadfunction), std::string( #classname ) + "::" + #loadfunction), orxonox::createExecutor(orxonox::createFunctor(&classname::savefunction), std::string( #classname ) + "::" + #savefunction), xmlelement, mode, false, true)
+    XMLPortObjectGeneric(xmlcontainer##loadfunction##savefunction, classname, objectclass, sectionname, orxonox::createExecutor(orxonox::createFunctor<classname, __VA_ARGS__ >(&classname::loadfunction), std::string( #classname ) + "::" + #loadfunction), orxonox::createExecutor(orxonox::createFunctor(&classname::savefunction), std::string( #classname ) + "::" + #savefunction), xmlelement, mode, false, true)
 
 // --------------------