X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmath%2FSGVec3.hxx;h=dbc8af543bf9a5d39a933be30d55e32b9dfc9c43;hb=914d3e6a2b323cf9f186cbef2aef7865ea07b309;hp=c85b418e23cbab173b66f4164606b4ae13561ecf;hpb=423eba373389684061fc0a8c7b78292f10011ed7;p=simgear.git diff --git a/simgear/math/SGVec3.hxx b/simgear/math/SGVec3.hxx index c85b418e..dbc8af54 100644 --- a/simgear/math/SGVec3.hxx +++ b/simgear/math/SGVec3.hxx @@ -18,10 +18,7 @@ #ifndef SGVec3_H #define SGVec3_H -#ifndef NO_OPENSCENEGRAPH_INTERFACE -#include -#include -#endif +#include /// 3D Vector Class template @@ -505,26 +502,4 @@ SGVec3d toVec3d(const SGVec3f& v) { return SGVec3d(v(0), v(1), v(2)); } -#ifndef NO_OPENSCENEGRAPH_INTERFACE -inline -SGVec3d -toSG(const osg::Vec3d& v) -{ return SGVec3d(v[0], v[1], v[2]); } - -inline -SGVec3f -toSG(const osg::Vec3f& v) -{ return SGVec3f(v[0], v[1], v[2]); } - -inline -osg::Vec3d -toOsg(const SGVec3d& v) -{ return osg::Vec3d(v[0], v[1], v[2]); } - -inline -osg::Vec3f -toOsg(const SGVec3f& v) -{ return osg::Vec3f(v[0], v[1], v[2]); } -#endif - #endif