mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 16:15:31 +00:00
Code Issues Releases Wiki Activity

Define template ref classes in components

Browse source
This commit is contained in:
Andrei Kortunov 2021-01-13 13:33:46 +04:00
parent 3e35df49df
commit f175beb304
4 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwrender/objectpaging.cpp
View file

@ -249,15 +249,6 @@ namespace MWRender
}
};
class TemplateRef : public osg::Object
{
public:
TemplateRef() {}
TemplateRef(const TemplateRef& copy, const osg::CopyOp&) : mObjects(copy.mObjects) {}
META_Object(MWRender, TemplateRef)
std::vector<osg::ref_ptr<const Object>> mObjects;
};
class RefnumSet : public osg::Object
{
public:
@ -530,7 +521,7 @@ namespace MWRender
osg::ref_ptr<osg::Group> group = new osg::Group;
osg::ref_ptr<osg::Group> mergeGroup = new osg::Group;
osg::ref_ptr<TemplateRef> templateRefs = new TemplateRef;
osg::ref_ptr<Resource::TemplateMultiRef> templateRefs = new Resource::TemplateMultiRef;
osgUtil::StateToCompile stateToCompile(0, nullptr);
CopyOp copyop;
for (const auto& pair : nodes)
@ -596,7 +587,7 @@ namespace MWRender
if (numinstances > 0)
{
// add a ref to the original template, to hint to the cache that it's still being used and should be kept in cache
templateRefs->mObjects.emplace_back(cnode);
templateRefs->addRef(cnode);
if (pair.second.mNeedCompile)
{

18
components/resource/scenemanager.cpp
View file

@ -110,6 +110,10 @@ namespace
namespace Resource
{
void TemplateMultiRef::addRef(const osg::Node* node)
{
mObjects.emplace_back(node);
}
class SharedStateManager : public osgDB::SharedStateManager
{
@ -554,20 +558,6 @@ namespace Resource
return node;
}
class TemplateRef : public osg::Object
{
public:
TemplateRef(const Object* object)
: mObject(object) {}
TemplateRef() {}
TemplateRef(const TemplateRef& copy, const osg::CopyOp&) : mObject(copy.mObject) {}
META_Object(Resource, TemplateRef)
private:
osg::ref_ptr<const Object> mObject;
};
osg::ref_ptr<osg::Node> SceneManager::createInstance(const std::string& name)
{
osg::ref_ptr<const osg::Node> scene = getTemplate(name);

25
components/resource/scenemanager.hpp
View file

@ -37,6 +37,31 @@ namespace Shader
namespace Resource
{
class TemplateRef : public osg::Object
{
public:
TemplateRef(const Object* object) : mObject(object) {}
TemplateRef() {}
TemplateRef(const TemplateRef& copy, const osg::CopyOp&) : mObject(copy.mObject) {}
META_Object(Resource, TemplateRef)
private:
osg::ref_ptr<const Object> mObject;
};
class TemplateMultiRef : public osg::Object
{
public:
TemplateMultiRef() {}
TemplateMultiRef(const TemplateMultiRef& copy, const osg::CopyOp&) : mObjects(copy.mObjects) {}
void addRef(const osg::Node* node);
META_Object(Resource, TemplateMultiRef)
private:
std::vector<osg::ref_ptr<const Object>> mObjects;
};
class MultiObjectCache;

1
components/sceneutil/serialize.cpp
View file

@ -121,6 +121,7 @@ void registerSerializers()
const char* ignore[] = {
"MWRender::PtrHolder",
"Resource::TemplateRef",
"Resource::TemplateMultiRef",
"SceneUtil::CompositeStateSetUpdater",
"SceneUtil::LightListCallback",
"SceneUtil::LightManagerUpdateCallback",