[Orxonox-commit 4149] r8820 - in code/branches/output: data/levels/templates src/libraries/core src/orxonox/worldentities
landauf at orxonox.net
landauf at orxonox.net
Wed Aug 3 23:28:06 CEST 2011
Author: landauf
Date: 2011-08-03 23:28:06 +0200 (Wed, 03 Aug 2011)
New Revision: 8820
Modified:
code/branches/output/data/levels/templates/FPS.oxt
code/branches/output/data/levels/templates/spaceshipAssff.oxt
code/branches/output/data/levels/templates/spaceshipAssff2.oxt
code/branches/output/data/levels/templates/spaceshipGhost.oxt
code/branches/output/data/levels/templates/spaceshipH2.oxt
code/branches/output/data/levels/templates/spaceshipHXY.oxt
code/branches/output/data/levels/templates/spaceshipHXYSL.oxt
code/branches/output/data/levels/templates/spaceshipImmTest.oxt
code/branches/output/data/levels/templates/spaceshipPirate.oxt
code/branches/output/data/levels/templates/spaceshipSwallow.oxt
code/branches/output/data/levels/templates/spaceshipTransporter.oxt
code/branches/output/data/levels/templates/spaceshipTransporterSL.oxt
code/branches/output/src/libraries/core/GraphicsManager.cc
code/branches/output/src/libraries/core/Loader.cc
code/branches/output/src/libraries/core/Loader.h
code/branches/output/src/orxonox/worldentities/WorldEntity.cc
Log:
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)
Modified: code/branches/output/data/levels/templates/FPS.oxt
===================================================================
--- code/branches/output/data/levels/templates/FPS.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/FPS.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -29,7 +29,7 @@
</camerapositions>
<?lua
- include("includes/weaponSettingsFPS.oxi")
+ include("../includes/weaponSettingsFPS.oxi")
?>
</FpsPlayer>
@@ -50,4 +50,4 @@
</camerapositions>
</FpsPlayer>
</Template>
--->
\ No newline at end of file
+-->
Modified: code/branches/output/data/levels/templates/spaceshipAssff.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipAssff.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipAssff.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -55,7 +55,7 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
<?lua
- include("includes/weaponSettingsAssff.oxi")
+ include("../includes/weaponSettingsAssff.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/data/levels/templates/spaceshipAssff2.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipAssff2.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipAssff2.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -55,7 +55,7 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
<?lua
- include("includes/weaponSettingsAssff2.oxi")
+ include("../includes/weaponSettingsAssff2.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/data/levels/templates/spaceshipGhost.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipGhost.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipGhost.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -35,7 +35,7 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
<?lua
- include("includes/weaponSettingsGhost.oxi")
+ include("../includes/weaponSettingsGhost.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/data/levels/templates/spaceshipH2.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipH2.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipH2.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -21,7 +21,7 @@
>
<?lua
- include("includes/weaponSettingsH2.oxi")
+ include("../includes/weaponSettingsH2.oxi")
?>
<engines>
<MultiStateEngine position="0,0,0" template=spaceshipHtwoengine />
Modified: code/branches/output/data/levels/templates/spaceshipHXY.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipHXY.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipHXY.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -36,7 +36,7 @@
</collisionShapes>
<?lua
- include("includes/weaponSettingsHXY.oxi")
+ include("../includes/weaponSettingsHXY.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/data/levels/templates/spaceshipHXYSL.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipHXYSL.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipHXYSL.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -35,7 +35,7 @@
</collisionShapes>
<?lua
- include("includes/weaponSettingsHXY.oxi")
+ include("../includes/weaponSettingsHXY.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/data/levels/templates/spaceshipImmTest.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipImmTest.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipImmTest.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -36,7 +36,7 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
<?lua
- include("includes/weaponSettingsImmTest.oxi")
+ include("../includes/weaponSettingsImmTest.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/data/levels/templates/spaceshipPirate.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipPirate.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipPirate.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -39,7 +39,7 @@
</collisionShapes>
<?lua
- include("includes/weaponSettingsPirate.oxi")
+ include("../includes/weaponSettingsPirate.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/data/levels/templates/spaceshipSwallow.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipSwallow.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipSwallow.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -34,7 +34,7 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
<?lua
- include("includes/weaponSettingsSwallow.oxi")
+ include("../includes/weaponSettingsSwallow.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/data/levels/templates/spaceshipTransporter.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipTransporter.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipTransporter.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -35,7 +35,7 @@
</collisionShapes>
<?lua
- include("includes/weaponSettingsTransporter.oxi")
+ include("../includes/weaponSettingsTransporter.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/data/levels/templates/spaceshipTransporterSL.oxt
===================================================================
--- code/branches/output/data/levels/templates/spaceshipTransporterSL.oxt 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/data/levels/templates/spaceshipTransporterSL.oxt 2011-08-03 21:28:06 UTC (rev 8820)
@@ -35,7 +35,7 @@
</collisionShapes>
<?lua
- include("includes/weaponSettingsTransporter.oxi")
+ include("../includes/weaponSettingsTransporter.oxi")
?>
</SpaceShip>
</Template>
Modified: code/branches/output/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/output/src/libraries/core/GraphicsManager.cc 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/src/libraries/core/GraphicsManager.cc 2011-08-03 21:28:06 UTC (rev 8820)
@@ -113,7 +113,7 @@
// Load resources
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)
if (PathConfig::buildDirectoryRun())
@@ -121,7 +121,7 @@
extResources_.reset(new XMLFile("resources.oxr"));
extResources_->setLuaSupport(false);
- Loader::open(extResources_.get());
+ Loader::open(extResources_.get(), ClassTreeMask(), false);
if (bLoadRenderer)
{
@@ -312,7 +312,7 @@
// Load debug overlay to show info about fps and tick time
orxout(internal_info) << "Loading Debug Overlay..." << endl;
debugOverlay_.reset(new XMLFile("debug.oxo"));
- Loader::open(debugOverlay_.get());
+ Loader::open(debugOverlay_.get(), ClassTreeMask(), false);
}
/**
Modified: code/branches/output/src/libraries/core/Loader.cc
===================================================================
--- code/branches/output/src/libraries/core/Loader.cc 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/src/libraries/core/Loader.cc 2011-08-03 21:28:06 UTC (rev 8820)
@@ -48,10 +48,10 @@
std::vector<std::pair<const XMLFile*, ClassTreeMask> > Loader::files_s;
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);
}
void Loader::close()
Modified: code/branches/output/src/libraries/core/Loader.h
===================================================================
--- code/branches/output/src/libraries/core/Loader.h 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/src/libraries/core/Loader.h 2011-08-03 21:28:06 UTC (rev 8820)
@@ -50,7 +50,7 @@
class _CoreExport Loader
{
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);
Modified: code/branches/output/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/output/src/orxonox/worldentities/WorldEntity.cc 2011-08-03 19:54:19 UTC (rev 8819)
+++ code/branches/output/src/orxonox/worldentities/WorldEntity.cc 2011-08-03 21:28:06 UTC (rev 8820)
@@ -94,7 +94,7 @@
this->collisionShape_ = new WorldEntityCollisionShape(this);
this->collisionType_ = None;
this->collisionTypeSynchronised_ = None;
- this->mass_ = 0;
+ this->mass_ = 1.0f;
this->childrenMass_ = 0;
// Using bullet default values
this->restitution_ = 0;
@@ -967,7 +967,7 @@
// Just set everything to zero
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
orxout(internal_warning) << "Setting the internal physical mass to 1.0 because mass_ is 0.0" << endl;
More information about the Orxonox-commit
mailing list