mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-09-28 07:32:00 -04:00
Merge pull request #386 from OpenMW/master
Add OpenMW commits up to 13 Feb 2018, part 2
This commit is contained in:
commit
65c3472772
@ -6,6 +6,8 @@
|
|||||||
#include <osg/Texture2D>
|
#include <osg/Texture2D>
|
||||||
#include <osg/RenderInfo>
|
#include <osg/RenderInfo>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
namespace Terrain
|
namespace Terrain
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -62,6 +64,7 @@ void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const
|
|||||||
mCompileSet.erase(mCompileSet.begin());
|
mCompileSet.erase(mCompileSet.begin());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
mTimer.setStartTick();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CompositeMapRenderer::compile(CompositeMap &compositeMap, osg::RenderInfo &renderInfo, double* timeLeft) const
|
void CompositeMapRenderer::compile(CompositeMap &compositeMap, osg::RenderInfo &renderInfo, double* timeLeft) const
|
||||||
|
Loading…
x
Reference in New Issue
Block a user