teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Mantis: #18 - Move components from global namespace into their own namespace.

Browse source 
Moving classes from components/nifbullet into NifBullet namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
This commit is contained in:
Lukasz Gromanowski 2011-06-19 18:45:23 +02:00
parent 514b55766f
commit 2ddd5dba11
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.cpp
View file

@ -358,7 +358,7 @@ void OMW::Engine::go()
loadBSA(); loadBSA();
// Create physics. shapeLoader is deleted by the physic engine // Create physics. shapeLoader is deleted by the physic engine
ManualBulletShapeLoader* shapeLoader = new ManualBulletShapeLoader(); NifBullet::ManualBulletShapeLoader* shapeLoader = new NifBullet::ManualBulletShapeLoader();
mPhysicEngine = new OEngine::Physic::PhysicEngine(shapeLoader); mPhysicEngine = new OEngine::Physic::PhysicEngine(shapeLoader);
// Create the world // Create the world

2
components/nifbullet/bullet_nif_loader.cpp
View file

@ -49,7 +49,7 @@ using namespace Ogre;
using namespace Nif; using namespace Nif;
using namespace Mangle::VFS; using namespace Mangle::VFS;
using namespace NifBullet;
//==================================================================================================== //====================================================================================================
Ogre::Matrix3 ManualBulletShapeLoader::getMatrix(Nif::Transformation* tr) Ogre::Matrix3 ManualBulletShapeLoader::getMatrix(Nif::Transformation* tr)

4
components/nifbullet/bullet_nif_loader.hpp
View file

@ -58,6 +58,8 @@ namespace Mangle
} }
} }
namespace NifBullet
{
/** /**
*Load bulletShape from NIF files. *Load bulletShape from NIF files.
@ -126,4 +128,6 @@ private:
btCompoundShape* currentShape;//the shape curently under construction btCompoundShape* currentShape;//the shape curently under construction
}; };
}
#endif #endif

4
components/nifbullet/test/test.cpp
View file

@ -90,11 +90,11 @@ int main()
//Ressources stuff //Ressources stuff
addBSA("Morrowind.bsa"); Bsa::addBSA("Morrowind.bsa");
//Ogre::ResourceGroupManager::getSingleton().createResourceGroup("general"); //Ogre::ResourceGroupManager::getSingleton().createResourceGroup("general");
Ogre::ResourcePtr ptr = BulletShapeManager::getSingleton().getByName(mesh,"General"); Ogre::ResourcePtr ptr = BulletShapeManager::getSingleton().getByName(mesh,"General");
ManualBulletShapeLoader* ShapeLoader = new ManualBulletShapeLoader(); NifBullet::ManualBulletShapeLoader* ShapeLoader = new NifBullet::ManualBulletShapeLoader();
ShapeLoader->load(mesh,"General"); ShapeLoader->load(mesh,"General");
//BulletShapeManager::getSingleton().unload(mesh); //BulletShapeManager::getSingleton().unload(mesh);