mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-16 16:10:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix build with osg >= 3.5.6

Browse Source
This commit is contained in:
Julian Ospald 2017-05-28 17:30:01 +02:00 committed by scrawl
parent 1c5c82dd9f
commit 7704dcfcce
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/resource/bulletshapemanager.cpp
View File

@ -4,6 +4,7 @@
#include <osg/TriangleFunctor>
#include <osg/Transform>
#include <osg/Drawable>
#include <osg/Version>
#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
@ -42,7 +43,11 @@ struct GetTriangleFunctor
return btVector3(vec.x(), vec.y(), vec.z());
}
#if OSG_MIN_VERSION_REQUIRED(3,5,6)
void inline operator()( const osg::Vec3 v1, const osg::Vec3 v2, const osg::Vec3 v3 )
#else
void inline operator()( const osg::Vec3 v1, const osg::Vec3 v2, const osg::Vec3 v3, bool _temp )
#endif
{
if (mTriMesh)
mTriMesh->addTriangle( toBullet(mMatrix.preMult(v1)), toBullet(mMatrix.preMult(v2)), toBullet(mMatrix.preMult(v3)));