mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-24 04:41:34 +00:00
Code Issues Releases Wiki Activity

add back some explicit includes

Browse source
This commit is contained in:
Bret Curtis 2021-09-29 16:29:10 +02:00
parent 8358418555
commit 803195a05f
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/groundcover.cpp
View file

@ -151,7 +151,7 @@ namespace MWRender
mStateset->setRenderBinDetails(0, "RenderBin", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS); mStateset->setRenderBinDetails(0, "RenderBin", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
mStateset->setAttribute(new osg::VertexAttribDivisor(6, 1)); mStateset->setAttribute(new osg::VertexAttribDivisor(6, 1));
mStateset->setAttribute(new osg::VertexAttribDivisor(7, 1)); mStateset->setAttribute(new osg::VertexAttribDivisor(7, 1));
mProgramTemplate = mSceneManager->getShaderManager().getProgramTemplate() ? static_cast<osg::Program*>(mSceneManager->getShaderManager().getProgramTemplate()->clone(osg::CopyOp::SHALLOW_COPY)) : new osg::Program; mProgramTemplate = mSceneManager->getShaderManager().getProgramTemplate() ? static_cast<osg::Program*>(mSceneManager->getShaderManager().getProgramTemplate()->clone(osg::CopyOp::SHALLOW_COPY)) : new osg::Program;
mProgramTemplate->addBindAttribLocation("aOffset", 6); mProgramTemplate->addBindAttribLocation("aOffset", 6);
mProgramTemplate->addBindAttribLocation("aRotation", 7); mProgramTemplate->addBindAttribLocation("aRotation", 7);

2
components/shader/shadervisitor.hpp
View file

@ -112,7 +112,7 @@ namespace Shader
void createProgram(const ShaderRequirements& reqs); void createProgram(const ShaderRequirements& reqs);
void ensureFFP(osg::Node& node); void ensureFFP(osg::Node& node);
bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs); bool adjustGeometry(osg::Geometry& sourceGeometry, const ShaderRequirements& reqs);
osg::ref_ptr<const osg::Program> mProgramTemplate; osg::ref_ptr<const osg::Program> mProgramTemplate;
}; };

2
components/terrain/quadtreeworld.cpp
View file

@ -3,6 +3,7 @@
#include <osgUtil/CullVisitor> #include <osgUtil/CullVisitor>
#include <osg/ShapeDrawable> #include <osg/ShapeDrawable>
#include <osg/PolygonMode> #include <osg/PolygonMode>
#include <osg/Geode>
#include <limits> #include <limits>
#include <sstream> #include <sstream>
@ -12,6 +13,7 @@
#include <components/sceneutil/positionattitudetransform.hpp> #include <components/sceneutil/positionattitudetransform.hpp>
#include <components/loadinglistener/reporter.hpp> #include <components/loadinglistener/reporter.hpp>
#include <components/resource/resourcesystem.hpp> #include <components/resource/resourcesystem.hpp>
#include <components/settings/settings.hpp>
#include "quadtreenode.hpp" #include "quadtreenode.hpp"
#include "storage.hpp" #include "storage.hpp"