X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmath%2FSGVec4.hxx;h=6e42d957d8710f9a3a56c85cfa9d0b3ddf41f0bd;hb=66c9187c95fb6861d9737f135fdf68d1bfa265f3;hp=6030c48ba03e2ea331b43442cebfd2df509fdf1b;hpb=819d3f5ded821235bd1c9bf0350b683ac7b5df89;p=simgear.git diff --git a/simgear/math/SGVec4.hxx b/simgear/math/SGVec4.hxx index 6030c48b..6e42d957 100644 --- a/simgear/math/SGVec4.hxx +++ b/simgear/math/SGVec4.hxx @@ -18,11 +18,6 @@ #ifndef SGVec4_H #define SGVec4_H -#ifndef NO_OPENSCENEGRAPH_INTERFACE -#include -#include -#endif - /// 4D Vector Class template class SGVec4 { @@ -428,26 +423,4 @@ SGVec4d toVec4d(const SGVec4f& v) { return SGVec4d(v(0), v(1), v(2), v(3)); } -#ifndef NO_OPENSCENEGRAPH_INTERFACE -inline -SGVec4d -toSG(const osg::Vec4d& v) -{ return SGVec4d(v[0], v[1], v[2], v[3]); } - -inline -SGVec4f -toSG(const osg::Vec4f& v) -{ return SGVec4f(v[0], v[1], v[2], v[3]); } - -inline -osg::Vec4d -toOsg(const SGVec4d& v) -{ return osg::Vec4d(v[0], v[1], v[2], v[3]); } - -inline -osg::Vec4f -toOsg(const SGVec4f& v) -{ return osg::Vec4f(v[0], v[1], v[2], v[3]); } -#endif - #endif