Changeset 8820 for code/branches/output

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

Files:

• data/levels/templates/FPS.oxt (modified) (1 diff)
• data/levels/templates/spaceshipAssff.oxt (modified) (1 diff)
• data/levels/templates/spaceshipAssff2.oxt (modified) (1 diff)
• data/levels/templates/spaceshipGhost.oxt (modified) (1 diff)
• data/levels/templates/spaceshipH2.oxt (modified) (1 diff)
• data/levels/templates/spaceshipHXY.oxt (modified) (1 diff)
• data/levels/templates/spaceshipHXYSL.oxt (modified) (1 diff)
• data/levels/templates/spaceshipImmTest.oxt (modified) (1 diff)
• data/levels/templates/spaceshipPirate.oxt (modified) (1 diff)
• data/levels/templates/spaceshipSwallow.oxt (modified) (1 diff)
• data/levels/templates/spaceshipTransporter.oxt (modified) (1 diff)
• data/levels/templates/spaceshipTransporterSL.oxt (modified) (1 diff)
• src/libraries/core/GraphicsManager.cc (modified) (3 diffs)
• src/libraries/core/Loader.cc (modified) (1 diff)
• src/libraries/core/Loader.h (modified) (1 diff)
• src/orxonox/worldentities/WorldEntity.cc (modified) (2 diffs)

code/branches/output/data/levels/templates/FPS.oxt

@@ -30 +30 @@
     
     <?lua
-        include("includes/weaponSettingsFPS.oxi")
+        include("../includes/weaponSettingsFPS.oxi")
     ?>
 

code/branches/output/data/levels/templates/spaceshipAssff.oxt

@@ -56 +56 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponSettingsAssff.oxi")
+  include("../includes/weaponSettingsAssff.oxi")
 ?>
   </SpaceShip>

code/branches/output/data/levels/templates/spaceshipAssff2.oxt

@@ -56 +56 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponSettingsAssff2.oxi")
+  include("../includes/weaponSettingsAssff2.oxi")
 ?>
   </SpaceShip>

code/branches/output/data/levels/templates/spaceshipGhost.oxt

@@ -36 +36 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponSettingsGhost.oxi")
+  include("../includes/weaponSettingsGhost.oxi")
 ?>
   </SpaceShip>

code/branches/output/data/levels/templates/spaceshipH2.oxt

@@ -22 +22 @@
 
 <?lua
-  include("includes/weaponSettingsH2.oxi")
+  include("../includes/weaponSettingsH2.oxi")
 ?>
     <engines>

code/branches/output/data/levels/templates/spaceshipHXY.oxt

@@ -37 +37 @@
 
 <?lua
-  include("includes/weaponSettingsHXY.oxi")
+  include("../includes/weaponSettingsHXY.oxi")
 ?>
   </SpaceShip>

code/branches/output/data/levels/templates/spaceshipHXYSL.oxt

@@ -36 +36 @@
 
 <?lua
-  include("includes/weaponSettingsHXY.oxi")
+  include("../includes/weaponSettingsHXY.oxi")
 ?>
   </SpaceShip>

code/branches/output/data/levels/templates/spaceshipImmTest.oxt

@@ -37 +37 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponSettingsImmTest.oxi")
+  include("../includes/weaponSettingsImmTest.oxi")
 ?>
   </SpaceShip>

code/branches/output/data/levels/templates/spaceshipPirate.oxt

@@ -40 +40 @@
 
 <?lua
-  include("includes/weaponSettingsPirate.oxi")
+  include("../includes/weaponSettingsPirate.oxi")
 ?>
   </SpaceShip>

code/branches/output/data/levels/templates/spaceshipSwallow.oxt

@@ -35 +35 @@
     </collisionShapes>
 <?lua
-  include("includes/weaponSettingsSwallow.oxi")
+  include("../includes/weaponSettingsSwallow.oxi")
 ?>
   </SpaceShip>

code/branches/output/data/levels/templates/spaceshipTransporter.oxt

@@ -36 +36 @@
 
 <?lua
-  include("includes/weaponSettingsTransporter.oxi")
+  include("../includes/weaponSettingsTransporter.oxi")
 ?>
   </SpaceShip>

code/branches/output/data/levels/templates/spaceshipTransporterSL.oxt

@@ -36 +36 @@
 
 <?lua
-  include("includes/weaponSettingsTransporter.oxi")
+  include("../includes/weaponSettingsTransporter.oxi")
 ?>
   </SpaceShip>

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