FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Particles: guard against duplicate init

Browse Source
This commit is contained in:
James Turner
2021-04-23 12:46:20 +01:00
parent 2871a2df85
commit ede4484b8d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/particles.cxx
+5
View File
@@ -71,6 +71,7 @@ public:
void registerNewWorldParticleSystem(osg::Node* node, ParticleSystemRef ps, osg::Group* frame); void registerNewWorldParticleSystem(osg::Node* node, ParticleSystemRef ps, osg::Group* frame);
std::mutex _lock; std::mutex _lock;
bool _inited = false;
bool _frozen = false; bool _frozen = false;
double _simulationDt = 0.0; double _simulationDt = 0.0;
osg::ref_ptr<osg::Group> _commonRoot; osg::ref_ptr<osg::Group> _commonRoot;
@@ -184,6 +185,10 @@ void ParticlesGlobalManager::ParticlesGlobalManagerPrivate::registerNewWorldPart
void ParticlesGlobalManager::initFromMainThread() void ParticlesGlobalManager::initFromMainThread()
{ {
std::lock_guard<std::mutex> g(d->_lock); std::lock_guard<std::mutex> g(d->_lock);
if (d->_inited)
return;
d->_inited = true;
d->internalGetCommonRoot(); d->internalGetCommonRoot();
d->_commonRoot->addUpdateCallback(d.get()); d->_commonRoot->addUpdateCallback(d.get());
d->_commonRoot->setCullingActive(false); d->_commonRoot->setCullingActive(false);