[Orxonox-commit 2222] r6938 - in code/branches/presentation3: data/levels/templates src/libraries/core

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-05-20 16:35:48 +0200 (Thu, 20 May 2010)
New Revision: 6938

Modified:
   code/branches/presentation3/data/levels/templates/lodinformation.oxt
   code/branches/presentation3/src/libraries/core/Template.cc
   code/branches/presentation3/src/libraries/core/Template.h
Log:
Resolved issue with lod-template. Now, template inherit the "defaults"-parameter of templates they link. Empty level should work now.


Modified: code/branches/presentation3/data/levels/templates/lodinformation.oxt
===================================================================
--- code/branches/presentation3/data/levels/templates/lodinformation.oxt	2010-05-20 14:34:49 UTC (rev 6937)
+++ code/branches/presentation3/data/levels/templates/lodinformation.oxt	2010-05-20 14:35:48 UTC (rev 6938)
@@ -1,4 +1,4 @@
-<Template name=lodtemplate_default defaults=0>
+<Template name=lodtemplate_default defaults=false>
   <Level>
 	<lodinformation>
 	  <MeshLodInformation mesh=Carrier.mesh lodQuality=1.8 />

Modified: code/branches/presentation3/src/libraries/core/Template.cc
===================================================================
--- code/branches/presentation3/src/libraries/core/Template.cc	2010-05-20 14:34:49 UTC (rev 6937)
+++ code/branches/presentation3/src/libraries/core/Template.cc	2010-05-20 14:35:48 UTC (rev 6938)
@@ -98,13 +98,15 @@
         *this->xmlelement_ = xmlelement;
     }
 
-    const TiXmlElement& Template::getXMLElement() const
+    const TiXmlElement& Template::getXMLElement()
     {
         if (this->bIsLink_)
         {
             Template* temp = Template::getTemplate(this->link_);
             if (temp)
             {
+                this->bLoadDefaults_ = temp->bLoadDefaults_;
+                
                 if (!temp->bIsReturningXMLElement_)
                 {
                     this->bIsReturningXMLElement_ = true;

Modified: code/branches/presentation3/src/libraries/core/Template.h
===================================================================
--- code/branches/presentation3/src/libraries/core/Template.h	2010-05-20 14:34:49 UTC (rev 6937)
+++ code/branches/presentation3/src/libraries/core/Template.h	2010-05-20 14:35:48 UTC (rev 6938)
@@ -57,7 +57,7 @@
                 { return this->bLoadDefaults_; }
 
             void setXMLElement(const TiXmlElement& xmlelement);
-            const TiXmlElement& getXMLElement() const;
+            const TiXmlElement& getXMLElement();
 
             void setBaseclass(const std::string& baseclass);
             inline const std::string& getBaseclass() const