Changeset 853 for code/branches/core/src/orxonox

Timestamp:

Mar 5, 2008, 6:38:09 PM (17 years ago)

Author:

landauf

Message:

sync with notebook, there are some changes in the MultiTypes, XMLPort and the WorldEntity, but there's still a bug in some of the Converter-specializations

Location:

code/branches/core/src/orxonox

Files:

• core/BaseObject.cc (modified) (1 diff)
• core/XMLPort.h (modified) (3 diffs)
• objects/WorldEntity.cc (modified) (1 diff)
• objects/WorldEntity.h (modified) (2 diffs)

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

@@ -79 +79 @@
     Element& BaseObject::XMLPort(Element& xmlelement, bool loading)
     {
+        std::cout << "1_1: " << this->getName() << std::endl;
         XMLPortParam(BaseObject, "name", setName, getName, xmlelement, loading);
-
+std::cout << "1_2: " << this->getName() << std::endl;
         return xmlelement;
     }

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

@@ -48 +48 @@
     xmlcontainer##loadfunction##savefunction->port(this, xmlelement, loading)
 
+#define XMLPortParamLoadOnly(classname, paramname, loadfunction, xmlelement, loading) \
+    orxonox::XMLPortClassParamContainer<classname>* xmlcontainer##loadfunction##savefunction = (orxonox::XMLPortClassParamContainer<classname>*)(this->getIdentifier()->getXMLPortParamContainer(paramname)); \
+    if (!xmlcontainer##loadfunction##savefunction) \
+    { \
+        xmlcontainer##loadfunction##savefunction = new orxonox::XMLPortClassParamContainer<classname>(this->getIdentifier()->getName(), std::string(paramname), createFunctor(&classname::loadfunction), 0); \
+        this->getIdentifier()->addXMLPortParamContainer(paramname, xmlcontainer##loadfunction##savefunction); \
+    } \
+    xmlcontainer##loadfunction##savefunction->port(this, xmlelement, loading)
 
 namespace orxonox
@@ -100 +108 @@
                 if (loading)
                 {
+std::cout << "3_1: load param " << this->paramname_ << std::endl;
                     std::string attribute = xmlelement.GetAttribute(this->paramname_);
+std::cout << "3_2: attribute " << attribute << std::endl;
                     if (attribute.size() > 0)
                     {
                         SubString tokens(attribute, ",", SubString::WhiteSpaces, false, '\\', '"', '(', ')', '\0');
+std::cout << "3_3: tokens: " << tokens.size() << " params: " << this->loadfunction_->getParamCount() << std::endl;
                         if ((unsigned int)tokens.size() >= (unsigned int)this->loadfunction_->getParamCount())
                         {
-                            MultiTypeMath param1, param2, param3, param4, param5;
-                            if (tokens.size() >= 1) param1 = tokens[0];
-                            if (tokens.size() >= 2) param1 = tokens[1];
-                            if (tokens.size() >= 3) param1 = tokens[2];
-                            if (tokens.size() >= 4) param1 = tokens[3];
-                            if (tokens.size() >= 5) param1 = tokens[4];
+                            if (this->loadfunction_->getParamCount() == 1)
+                            {
+std::cout << "3_4 start: load with whole attribute as input" << std::endl;
+                                (*this->loadfunction_)(object, MultiTypeMath(attribute));
+std::cout << "3_5 end" << std::endl;
+                            }
+                            else
+                            {
+std::cout << "3_4: load with tokens as input" << std::endl;
+                                MultiTypeMath param1, param2, param3, param4, param5;
+                                if (tokens.size() >= 1) param1 = tokens[0];
+                                if (tokens.size() >= 2) param1 = tokens[1];
+                                if (tokens.size() >= 3) param1 = tokens[2];
+                                if (tokens.size() >= 4) param1 = tokens[3];
+                                if (tokens.size() >= 5) param1 = tokens[4];
 
-                            (*this->loadfunction_)(object, param1, param2, param3, param4, param5);
+                                (*this->loadfunction_)(object, param1, param2, param3, param4, param5);
+                            }
                         }
                         else
@@ -123 +144 @@
                 else
                 {
-//                    xmlelement.SetAttribute(this->paramname_, "...");
+                    if (this->savefunction_)
+                    {
+//                        xmlelement.SetAttribute(this->paramname_, "...");
+                    }
                 }
 

code/branches/core/src/orxonox/objects/WorldEntity.cc

@@ -172 +172 @@
         XMLPortParam(WorldEntity, "position", setPosition, getPosition, xmlelement, loading);
 //        XMLPortParam(WorldEntity, "direction", setDirection, getDirection, xmlelement, loading);
-//        XMLPortParam(WorldEntity, "yaw", yaw, getYaw, xmlelement, loading);
-//        XMLPortParam(WorldEntity, "pitch", pitch, getPitch, xmlelement, loading);
-//        XMLPortParam(WorldEntity, "roll", roll, getRoll, xmlelement, loading);
-        XMLPortParam(WorldEntity, "scale", setScale, getScale, xmlelement, loading);
+        XMLPortParamLoadOnly(WorldEntity, "yaw", setYaw, xmlelement, loading);
+        XMLPortParamLoadOnly(WorldEntity, "pitch", setPitch, xmlelement, loading);
+        XMLPortParamLoadOnly(WorldEntity, "roll", setRoll, xmlelement, loading);
+        XMLPortParam(WorldEntity, "scale", setTotalScale, getScale, xmlelement, loading);
         XMLPortParam(WorldEntity, "rotationAxis", setRotationAxis, getRotationAxis, xmlelement, loading);
         XMLPortParam(WorldEntity, "rotationRate", setRotationRate, getRotationRate, xmlelement, loading);

code/branches/core/src/orxonox/objects/WorldEntity.h

@@ -57 +57 @@
                 { this->node_->roll(angle, relativeTo); }
 
+            inline void setYaw(const Degree &angle)
+                { this->node_->yaw(angle, Ogre::Node::TS_LOCAL); }
+            inline void setPitch(const Degree &angle)
+                { this->node_->pitch(angle, Ogre::Node::TS_LOCAL); }
+            inline void setRoll(const Degree &angle)
+                { this->node_->roll(angle, Ogre::Node::TS_LOCAL); }
+
             inline const Ogre::Quaternion& getOrientation()
               { return this->node_->getOrientation(); }
@@ -75 +82 @@
               { this->node_->setScale(x, y, z); }
             inline void setScale(Real scale)
+              { this->node_->setScale(scale, scale, scale); }
+            inline void setTotalScale(Real scale)
               { this->node_->setScale(scale, scale, scale); }
             inline const Vector3& getScale(void) const