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

Style fix

Browse source
This commit is contained in:
scrawl 2015-06-18 01:26:10 +02:00
parent fabc5126f3
commit 43384596d4
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/resource/scenemanager.cpp
View file

@ -104,8 +104,7 @@ namespace Resource
// TODO: add support for non-NIF formats // TODO: add support for non-NIF formats
NifOsg::Loader loader; osg::ref_ptr<osg::Node> loaded = NifOsg::Loader::load(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized)), mTextureManager);
osg::ref_ptr<osg::Node> loaded = loader.load(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized)), mTextureManager);
osgDB::Registry::instance()->getOrCreateSharedStateManager()->share(loaded.get()); osgDB::Registry::instance()->getOrCreateSharedStateManager()->share(loaded.get());
// TODO: run SharedStateManager::prune on unload // TODO: run SharedStateManager::prune on unload
@ -144,9 +143,8 @@ namespace Resource
{ {
Files::IStreamPtr file = mVFS->get(normalized); Files::IStreamPtr file = mVFS->get(normalized);
NifOsg::Loader loader;
osg::ref_ptr<NifOsg::KeyframeHolder> loaded (new NifOsg::KeyframeHolder); osg::ref_ptr<NifOsg::KeyframeHolder> loaded (new NifOsg::KeyframeHolder);
loader.loadKf(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized)), *loaded.get()); NifOsg::Loader::loadKf(Nif::NIFFilePtr(new Nif::NIFFile(file, normalized)), *loaded.get());
mKeyframeIndex[normalized] = loaded; mKeyframeIndex[normalized] = loaded;
return loaded; return loaded;