From b79337d7f84979026bed4a8ee2cd693984d6e7d6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 18 Oct 2004 18:36:40 +0000 Subject: [PATCH] From Bob Kuehne, addition of Vec3f(Vec2f,float) and Vec3d(Vec2d,double) constructors. --- include/osg/Vec3d | 7 +++++++ include/osg/Vec3f | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/include/osg/Vec3d b/include/osg/Vec3d index 51b597b3d..f806e906c 100644 --- a/include/osg/Vec3d +++ b/include/osg/Vec3d @@ -14,6 +14,7 @@ #ifndef OSG_VEC3D #define OSG_VEC3D 1 +#include #include namespace osg { @@ -39,6 +40,12 @@ class Vec3d inline operator Vec3f() const { return Vec3f(static_cast(_v[0]),static_cast(_v[1]),static_cast(_v[2]));} Vec3d(value_type x,value_type y,value_type z) { _v[0]=x; _v[1]=y; _v[2]=z; } + Vec3d(const Vec2d& v2,value_type zz) + { + _v[0] = v2[0]; + _v[1] = v2[1]; + _v[2] = zz; + } inline bool operator == (const Vec3d& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; } diff --git a/include/osg/Vec3f b/include/osg/Vec3f index 4e1048b6e..44b7949d1 100644 --- a/include/osg/Vec3f +++ b/include/osg/Vec3f @@ -16,6 +16,7 @@ #include +#include #include namespace osg { @@ -35,6 +36,12 @@ class Vec3f Vec3f() { _v[0]=0.0; _v[1]=0.0; _v[2]=0.0;} Vec3f(value_type x,value_type y,value_type z) { _v[0]=x; _v[1]=y; _v[2]=z; } + Vec3f(const Vec2f& v2,value_type zz) + { + _v[0] = v2[0]; + _v[1] = v2[1]; + _v[2] = zz; + } inline bool operator == (const Vec3f& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; }