teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1302 from hasufell/master

Browse source 
Fix build with osg >= 3.5.6
This commit is contained in:
scrawl 2017-05-28 23:07:48 +02:00 committed by GitHub
commit d39da2b755
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/TriangleFunctor>
#include <osg/Transform> #include <osg/Transform>
#include <osg/Drawable> #include <osg/Drawable>
#include <osg/Version>
#include <BulletCollision/CollisionShapes/btTriangleMesh.h> #include <BulletCollision/CollisionShapes/btTriangleMesh.h>
@ -42,7 +43,11 @@ struct GetTriangleFunctor
return btVector3(vec.x(), vec.y(), vec.z()); 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 ) void inline operator()( const osg::Vec3 v1, const osg::Vec3 v2, const osg::Vec3 v3, bool _temp )
#endif
{ {
if (mTriMesh) if (mTriMesh)
mTriMesh->addTriangle( toBullet(mMatrix.preMult(v1)), toBullet(mMatrix.preMult(v2)), toBullet(mMatrix.preMult(v3))); mTriMesh->addTriangle( toBullet(mMatrix.preMult(v1)), toBullet(mMatrix.preMult(v2)), toBullet(mMatrix.preMult(v3)));