mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-26 15:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ObjectPagingMergeIssue' into 'master'

Browse Source 
Share state

See merge request OpenMW/openmw!879
This commit is contained in:
psi29a 2021-05-19 05:08:12 +00:00
commit c4fde03542
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwrender/objectpaging.cpp
View File

@ -651,6 +651,7 @@ namespace MWRender
} }
optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback); optimizer.setIsOperationPermissibleForObjectCallback(new CanOptimizeCallback);
unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS|SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES|SceneUtil::Optimizer::MERGE_GEOMETRY; unsigned int options = SceneUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS|SceneUtil::Optimizer::REMOVE_REDUNDANT_NODES|SceneUtil::Optimizer::MERGE_GEOMETRY;
mSceneManager->shareState(mergeGroup);
optimizer.optimize(mergeGroup, options); optimizer.optimize(mergeGroup, options);
group->addChild(mergeGroup); group->addChild(mergeGroup);

6
components/resource/scenemanager.cpp
View File

@ -514,6 +514,12 @@ namespace Resource
return options; return options;
} }
void SceneManager::shareState(osg::ref_ptr<osg::Node> node) {
mSharedStateMutex.lock();
mSharedStateManager->share(node.get());
mSharedStateMutex.unlock();
}
osg::ref_ptr<const osg::Node> SceneManager::getTemplate(const std::string &name, bool compile) osg::ref_ptr<const osg::Node> SceneManager::getTemplate(const std::string &name, bool compile)
{ {
std::string normalized = name; std::string normalized = name;

2
components/resource/scenemanager.hpp
View File

@ -135,7 +135,7 @@ namespace Resource
osg::ref_ptr<osg::Node> createInstance(const std::string& name); osg::ref_ptr<osg::Node> createInstance(const std::string& name);
osg::ref_ptr<osg::Node> createInstance(const osg::Node* base); osg::ref_ptr<osg::Node> createInstance(const osg::Node* base);
void shareState(osg::ref_ptr<osg::Node> node);
/// Get an instance of the given scene template /// Get an instance of the given scene template
/// @see getTemplate /// @see getTemplate
/// @note Thread safe. /// @note Thread safe.