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

Minor cleanup

Browse source
This commit is contained in:
scrawl 2015-06-11 18:01:00 +02:00
parent cdc47fa874
commit 712cef36b0
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -594,7 +594,7 @@ namespace MWPhysics
// --------------------------------------------------------------- // ---------------------------------------------------------------
PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode) PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode)
: mShapeManager(new NifBullet::BulletShapeManager(resourceSystem->getVFS(), resourceSystem->getSceneManager())) : mShapeManager(new NifBullet::BulletShapeManager(resourceSystem->getVFS()))
, mDebugDrawEnabled(false) , mDebugDrawEnabled(false)
, mTimeAccum(0.0f) , mTimeAccum(0.0f)
, mWaterHeight(0) , mWaterHeight(0)

5
components/nifbullet/bulletshapemanager.cpp
View file

@ -4,14 +4,11 @@
#include <components/nifbullet/bulletnifloader.hpp> #include <components/nifbullet/bulletnifloader.hpp>
#include <components/resource/scenemanager.hpp>
namespace NifBullet namespace NifBullet
{ {
BulletShapeManager::BulletShapeManager(const VFS::Manager* vfs, Resource::SceneManager* sceneManager) BulletShapeManager::BulletShapeManager(const VFS::Manager* vfs)
: mVFS(vfs) : mVFS(vfs)
, mSceneManager(sceneManager)
{ {
} }

4
components/nifbullet/bulletshapemanager.hpp
View file

@ -25,15 +25,13 @@ namespace NifBullet
class BulletShapeManager class BulletShapeManager
{ {
public: public:
BulletShapeManager(const VFS::Manager* vfs, Resource::SceneManager* sceneManager); BulletShapeManager(const VFS::Manager* vfs);
~BulletShapeManager(); ~BulletShapeManager();
osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name); osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name);
private: private:
const VFS::Manager* mVFS; const VFS::Manager* mVFS;
// need to load keyframes to know what nodes are going to be animated
Resource::SceneManager* mSceneManager;
typedef std::map<std::string, osg::ref_ptr<BulletShape> > Index; typedef std::map<std::string, osg::ref_ptr<BulletShape> > Index;
Index mIndex; Index mIndex;