mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 15:39:42 +00:00
Code Issues Releases Wiki Activity

Do not create terrain geodes when built with OSG 3.4

Browse source
This commit is contained in:
scrawl 2015-11-16 15:11:20 +01:00
parent 71d9e7dc52
commit 52901ec10c
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/terrain/terraingrid.cpp
View file

@ -13,6 +13,7 @@
#include <osg/Geometry> #include <osg/Geometry>
#include <osg/Geode> #include <osg/Geode>
#include <osg/KdTree> #include <osg/KdTree>
#include <osg/Version>
#include <osgFX/Effect> #include <osgFX/Effect>
@ -126,10 +127,6 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
osg::BoundingBox bounds(min, max); osg::BoundingBox bounds(min, max);
geometry->setComputeBoundingBoxCallback(new StaticBoundingBoxCallback(bounds)); geometry->setComputeBoundingBoxCallback(new StaticBoundingBoxCallback(bounds));
osg::ref_ptr<osg::Geode> geode (new osg::Geode);
geode->addDrawable(geometry);
std::vector<LayerInfo> layerList; std::vector<LayerInfo> layerList;
std::vector<osg::ref_ptr<osg::Image> > blendmaps; std::vector<osg::ref_ptr<osg::Image> > blendmaps;
mStorage->getBlendmaps(chunkSize, chunkCenter, false, blendmaps, layerList); mStorage->getBlendmaps(chunkSize, chunkCenter, false, blendmaps, layerList);
@ -169,11 +166,20 @@ osg::ref_ptr<osg::Node> TerrainGrid::buildTerrain (osg::Group* parent, float chu
effect->addCullCallback(new SceneUtil::LightListCallback); effect->addCullCallback(new SceneUtil::LightListCallback);
transform->addChild(effect); transform->addChild(effect);
effect->addChild(geode);
#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
osg::Node* toAttach = geometry.get();
#else
osg::ref_ptr<osg::Geode> geode (new osg::Geode);
geode->addDrawable(geometry);
osg::Node* toAttach = geode.get();
#endif
effect->addChild(toAttach);
if (mIncrementalCompileOperation) if (mIncrementalCompileOperation)
{ {
mIncrementalCompileOperation->add(geode); mIncrementalCompileOperation->add(toAttach);
mIncrementalCompileOperation->add(textureCompileDummy); mIncrementalCompileOperation->add(textureCompileDummy);
} }