Changeset 8820 for code/branches/output/src

Timestamp:

Aug 3, 2011, 11:28:06 PM (13 years ago)

Author:

landauf

Message:

fixed some stuff that became visible after the recent changes in the output system:

• fixed ogre exception because of included files in xml template files (it was searching for templates/includes/*.oxi instead of includes/*.oxi)
• initializing worldentities with mass 1 instead of 0 to avoid a warning
• Loader::open now also supports a bVerbose flag to hide output for internal xml files (like resource files)

Location:

code/branches/output/src

Files:

• libraries/core/GraphicsManager.cc (modified) (3 diffs)
• libraries/core/Loader.cc (modified) (1 diff)
• libraries/core/Loader.h (modified) (1 diff)
• orxonox/worldentities/WorldEntity.cc (modified) (2 diffs)

code/branches/output/src/libraries/core/GraphicsManager.cc

@@ -114 +114 @@
         resources_.reset(new XMLFile("DefaultResources.oxr"));
         resources_->setLuaSupport(false);
-        Loader::open(resources_.get());
+        Loader::open(resources_.get(), ClassTreeMask(), false);
 
         // Only for runs in the build directory (not installed)
@@ -122 +122 @@
         extResources_.reset(new XMLFile("resources.oxr"));
         extResources_->setLuaSupport(false);
-        Loader::open(extResources_.get());
+        Loader::open(extResources_.get(), ClassTreeMask(), false);
 
         if (bLoadRenderer)
@@ -313 +313 @@
         orxout(internal_info) << "Loading Debug Overlay..." << endl;
         debugOverlay_.reset(new XMLFile("debug.oxo"));
-        Loader::open(debugOverlay_.get());
+        Loader::open(debugOverlay_.get(), ClassTreeMask(), false);
     }
 

code/branches/output/src/libraries/core/Loader.cc

@@ -49 +49 @@
     ClassTreeMask Loader::currentMask_s;
 
-    bool Loader::open(const XMLFile* file, const ClassTreeMask& mask)
+    bool Loader::open(const XMLFile* file, const ClassTreeMask& mask, bool bVerbose)
     {
         Loader::add(file, mask);
-        return Loader::load(file, mask);
+        return Loader::load(file, mask, bVerbose);
     }
 

code/branches/output/src/libraries/core/Loader.h

@@ -51 +51 @@
     {
         public:
-            static bool open(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask());
+            static bool open(const XMLFile* file, const ClassTreeMask& mask = ClassTreeMask(), bool bVerbose = true);
             static void close();
             static void close(const XMLFile* file);

code/branches/output/src/orxonox/worldentities/WorldEntity.cc

@@ -95 +95 @@
         this->collisionType_             = None;
         this->collisionTypeSynchronised_ = None;
-        this->mass_           = 0;
+        this->mass_           = 1.0f;
         this->childrenMass_   = 0;
         // Using bullet default values
@@ -968 +968 @@
                 this->physicalBody_->setMassProps(0.0f, btVector3(0, 0, 0));
             }
-            else if ((this->mass_ + this->childrenMass_) == 0.0f)
+            else if (totalMass == 0.0f)
             {
                 // Use default values to avoid very large or very small values