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

Moving classes from components/nifbullet into NifBullet namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
pull/21/head
Lukasz Gromanowski 14 years ago
parent 514b55766f
commit 2ddd5dba11

@ -358,7 +358,7 @@ void OMW::Engine::go()
loadBSA();
// 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);
// Create the world

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

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

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

Loading…
Cancel
Save