From 14980872a7f0aa9519fd803482b7608c2b79b669 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 4 Sep 2005 11:17:00 +0000
Subject: [PATCH] Standardised the Vec* class interfaces, and added
 num_components enum to aid generic programming.

---
 include/osg/Vec2b                       |  42 +++++--
 include/osg/Vec2d                       |   6 +
 include/osg/Vec2f                       |   7 ++
 include/osg/Vec2s                       | 137 ++++++++++++---------
 include/osg/Vec3b                       |  51 +++++---
 include/osg/Vec3d                       |   6 +
 include/osg/Vec3f                       |   8 +-
 include/osg/Vec3s                       | 151 +++++++++++++++---------
 include/osg/Vec4b                       |  60 ++++++----
 include/osg/Vec4d                       |   9 +-
 include/osg/Vec4f                       |   7 +-
 include/osg/Vec4s                       | 151 +++++++++++++++---------
 include/osg/Vec4ub                      |  22 ++--
 src/osgPlugins/ive/DataOutputStream.cpp |  18 +--
 14 files changed, 431 insertions(+), 244 deletions(-)

diff --git a/include/osg/Vec2b b/include/osg/Vec2b
index 930ceb5fd..dae8f8029 100644
--- a/include/osg/Vec2b
+++ b/include/osg/Vec2b
@@ -28,6 +28,15 @@ class Vec2b
 
 	// Methods are defined here so that they are implicitly inlined
 
+        /** Type of Vec class.*/
+        typedef char value_type;
+
+        /** Number of vector components. */
+        enum { num_components = 2 };
+        
+        /** Vec member varaible. */
+        value_type _v[2];
+
         Vec2b() { _v[0]=0; _v[1]=0; }
         
         Vec2b(char r, char g)
@@ -35,8 +44,6 @@ class Vec2b
             _v[0]=r; _v[1]=g;
         }
 
-        char _v[2];
-
         inline bool operator == (const Vec2b& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
 
         inline bool operator != (const Vec2b& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1]; }
@@ -48,22 +55,33 @@ class Vec2b
             else return (_v[1]<v._v[1]);
         }
 
-        inline char* ptr() { return _v; }
-        inline const char* ptr() const { return _v; }
+        inline value_type* ptr() { return _v; }
+        inline const value_type* ptr() const { return _v; }
 
-        inline void set(char r, char g)
+        inline void set( value_type x, value_type y)
         {
-            _v[0]=r; _v[1]=g;
+            _v[0]=x; _v[1]=y;
         }
 
-        inline char& operator [] (unsigned int i) { return _v[i]; }
-        inline char operator [] (unsigned int i) const { return _v[i]; }
+        inline void set( const Vec2b& rhs)
+        {
+            _v[0]=rhs._v[0]; _v[1]=rhs._v[1];
+        }
 
-        inline char& r() { return _v[0]; }
-        inline char& g() { return _v[1]; }        
+        inline value_type& operator [] (int i) { return _v[i]; }
+        inline value_type operator [] (int i) const { return _v[i]; }
 
-        inline char r() const { return _v[0]; }
-        inline char g() const { return _v[1]; }        
+        inline value_type& x() { return _v[0]; }
+        inline value_type& y() { return _v[1]; }
+
+        inline value_type x() const { return _v[0]; }
+        inline value_type y() const { return _v[1]; }
+
+        inline value_type& r() { return _v[0]; }
+        inline value_type& g() { return _v[1]; }
+
+        inline value_type r() const { return _v[0]; }
+        inline value_type g() const { return _v[1]; }
 
         /** Multiply by scalar. */
         inline Vec2b operator * (float rhs) const
diff --git a/include/osg/Vec2d b/include/osg/Vec2d
index a89893522..c540779a2 100644
--- a/include/osg/Vec2d
+++ b/include/osg/Vec2d
@@ -29,7 +29,13 @@ class Vec2d
 {
     public:
 
+        /** Type of Vec class.*/
         typedef double value_type;
+
+        /** Number of vector components. */
+        enum { num_components = 2 };
+        
+        /** Vec member varaible. */
         value_type _v[2];
 
         Vec2d() {_v[0]=0.0; _v[1]=0.0;}
diff --git a/include/osg/Vec2f b/include/osg/Vec2f
index 6edcc294b..5797aba54 100644
--- a/include/osg/Vec2f
+++ b/include/osg/Vec2f
@@ -29,8 +29,15 @@ class Vec2f
 {
     public:
 
+        /** Type of Vec class.*/
         typedef float value_type;
+
+        /** Number of vector components. */
+        enum { num_components = 2 };
+        
+        /** Vec member varaible. */
         value_type _v[2];
+        
 
         Vec2f() {_v[0]=0.0; _v[1]=0.0;}
         Vec2f(value_type x,value_type y) { _v[0]=x; _v[1]=y; }
diff --git a/include/osg/Vec2s b/include/osg/Vec2s
index abbbb8ba3..d6252cf8d 100644
--- a/include/osg/Vec2s
+++ b/include/osg/Vec2s
@@ -18,65 +18,92 @@ namespace osg {
 
 class Vec2s
 {
-public:
+    public:
 
-	typedef short value_type;
+        /** Type of Vec class.*/
+        typedef short value_type;
 
-    union
-    {
-        struct {value_type x,y;};
+        /** Number of vector components. */
+        enum { num_components = 2 };
+        
+        /** Vec member varaible. */
         value_type _v[2];
-    };
-    Vec2s() {}
-    Vec2s(value_type xx, value_type yy)
-    { x = xx; y = yy; }
-    
-    inline value_type* ptr() { return _v; }
-    inline const value_type* ptr() const { return _v; }
 
-    inline bool operator == (const Vec2s& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
-    inline bool operator != (const Vec2s& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1]; }
-    inline bool operator <  (const Vec2s& v) const
-    {
-        if (_v[0]<v._v[0])      return true;
-        else if (_v[0]>v._v[0]) return false;
-        else return (_v[1]<v._v[1]);
-    }
-    
-    inline Vec2s operator * (value_type rhs) const
-    {
-        return Vec2s(_v[0]*rhs, _v[1]*rhs);
-    }
-    
-    inline Vec2s operator / (value_type rhs) const
-    {
-        return Vec2s(_v[0]/rhs, _v[1]/rhs);
-    }
-    
-    inline Vec2s operator + (value_type rhs) const
-    {
-        return Vec2s(_v[0]+rhs, _v[1]+rhs);
-    }
-    
-    inline Vec2s operator - (value_type rhs) const
-    {
-        return Vec2s(_v[0]-rhs, _v[1]-rhs);
-    }
-    
-    inline Vec2s operator + (const Vec2s& rhs) const
-    {
-        return Vec2s(_v[0]+rhs._v[0], _v[1]+rhs._v[1]);
-    }
-    
-    inline Vec2s operator - (const Vec2s& rhs) const
-    {
-        return Vec2s(_v[0]-rhs._v[0], _v[1]-rhs._v[1]);
-    }
-    
-    inline Vec2s operator * (const Vec2s& rhs) const
-    {
-        return Vec2s(_v[0]*rhs._v[0], _v[1]*rhs._v[1]);
-    }
+        Vec2s() { _v[0]=0; _v[1]=0; }
+
+        Vec2s(value_type x, value_type y) { _v[0] = x; _v[1] = y; }
+
+        inline bool operator == (const Vec2s& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
+        inline bool operator != (const Vec2s& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1]; }
+        inline bool operator <  (const Vec2s& v) const
+        {
+            if (_v[0]<v._v[0])      return true;
+            else if (_v[0]>v._v[0]) return false;
+            else return (_v[1]<v._v[1]);
+        }
+
+        inline value_type* ptr() { return _v; }
+        inline const value_type* ptr() const { return _v; }
+
+        inline void set( value_type x, value_type y)
+        {
+            _v[0]=x; _v[1]=y;
+        }
+
+        inline void set( const Vec2s& rhs)
+        {
+            _v[0]=rhs._v[0]; _v[1]=rhs._v[1];
+        }
+
+        inline value_type& operator [] (int i) { return _v[i]; }
+        inline value_type operator [] (int i) const { return _v[i]; }
+
+        inline value_type& x() { return _v[0]; }
+        inline value_type& y() { return _v[1]; }
+
+        inline value_type x() const { return _v[0]; }
+        inline value_type y() const { return _v[1]; }
+
+        inline value_type& r() { return _v[0]; }
+        inline value_type& g() { return _v[1]; }
+
+        inline value_type r() const { return _v[0]; }
+        inline value_type g() const { return _v[1]; }
+
+        inline Vec2s operator * (value_type rhs) const
+        {
+            return Vec2s(_v[0]*rhs, _v[1]*rhs);
+        }
+
+        inline Vec2s operator / (value_type rhs) const
+        {
+            return Vec2s(_v[0]/rhs, _v[1]/rhs);
+        }
+
+        inline Vec2s operator + (value_type rhs) const
+        {
+            return Vec2s(_v[0]+rhs, _v[1]+rhs);
+        }
+
+        inline Vec2s operator - (value_type rhs) const
+        {
+            return Vec2s(_v[0]-rhs, _v[1]-rhs);
+        }
+
+        inline Vec2s operator + (const Vec2s& rhs) const
+        {
+            return Vec2s(_v[0]+rhs._v[0], _v[1]+rhs._v[1]);
+        }
+
+        inline Vec2s operator - (const Vec2s& rhs) const
+        {
+            return Vec2s(_v[0]-rhs._v[0], _v[1]-rhs._v[1]);
+        }
+
+        inline Vec2s operator * (const Vec2s& rhs) const
+        {
+            return Vec2s(_v[0]*rhs._v[0], _v[1]*rhs._v[1]);
+        }
 
 };
 
diff --git a/include/osg/Vec3b b/include/osg/Vec3b
index d0cabc42e..412f1c8fd 100644
--- a/include/osg/Vec3b
+++ b/include/osg/Vec3b
@@ -26,16 +26,18 @@ class Vec3b
 {
     public:
 
-	// Methods are defined here so that they are implicitly inlined
+        /** Type of Vec class.*/
+        typedef char value_type;
+
+        /** Number of vector components. */
+        enum { num_components = 3 };
+        
+        /** Vec member varaible. */
+        value_type _v[3];
 
         Vec3b() { _v[0]=0; _v[1]=0; _v[2]=0; }
         
-        Vec3b(char r, char g, char b)
-        {
-            _v[0]=r; _v[1]=g; _v[2]=b;
-        }
-
-        char _v[3];
+        Vec3b(value_type r, value_type g, value_type b) { _v[0]=r; _v[1]=g; _v[2]=b;  }
 
         inline bool operator == (const Vec3b& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; }
 
@@ -50,24 +52,37 @@ class Vec3b
             else return (_v[2]<v._v[2]);
         }
 
-        inline char* ptr() { return _v; }
-        inline const char* ptr() const { return _v; }
+        inline value_type* ptr() { return _v; }
+        inline const value_type* ptr() const { return _v; }
 
-        inline void set(char r, char g, char b)
+        inline void set(value_type r, value_type g, value_type b)
         {
             _v[0]=r; _v[1]=g; _v[2]=b;
         }
 
-        inline char& operator [] (unsigned int i) { return _v[i]; }
-        inline char operator [] (unsigned int i) const { return _v[i]; }
+        inline void set( const Vec3b& rhs)
+        {
+            _v[0]=rhs._v[0]; _v[1]=rhs._v[1]; _v[2]=rhs._v[2];
+        }
 
-        inline char& r() { return _v[0]; }
-        inline char& g() { return _v[1]; }
-        inline char& b() { return _v[2]; }
+        inline value_type& operator [] (unsigned int i) { return _v[i]; }
+        inline value_type operator [] (unsigned int i) const { return _v[i]; }
 
-        inline char r() const { return _v[0]; }
-        inline char g() const { return _v[1]; }
-        inline char b() const { return _v[2]; }
+        inline value_type& x() { return _v[0]; }
+        inline value_type& y() { return _v[1]; }
+        inline value_type& z() { return _v[2]; }
+
+        inline value_type x() const { return _v[0]; }
+        inline value_type y() const { return _v[1]; }
+        inline value_type z() const { return _v[2]; }
+
+        inline value_type& r() { return _v[0]; }
+        inline value_type& g() { return _v[1]; }
+        inline value_type& b() { return _v[2]; }
+
+        inline value_type r() const { return _v[0]; }
+        inline value_type g() const { return _v[1]; }
+        inline value_type b() const { return _v[2]; }
 
         /** Multiply by scalar. */
         inline Vec3b operator * (float rhs) const
diff --git a/include/osg/Vec3d b/include/osg/Vec3d
index db07f2a3b..f2e3e02cc 100644
--- a/include/osg/Vec3d
+++ b/include/osg/Vec3d
@@ -30,7 +30,13 @@ class Vec3d
 {
     public:
 
+        /** Type of Vec class.*/
         typedef double value_type;
+
+        /** Number of vector components. */
+        enum { num_components = 3 };
+        
+        /** Vec member varaible. */
         value_type _v[3];
 
         Vec3d() { _v[0]=0.0; _v[1]=0.0; _v[2]=0.0;}
diff --git a/include/osg/Vec3f b/include/osg/Vec3f
index 3dd03ac5a..3812db948 100644
--- a/include/osg/Vec3f
+++ b/include/osg/Vec3f
@@ -29,10 +29,16 @@ class Vec3f
 {
     public:
 
+        /** Type of Vec class.*/
         typedef float value_type;
+
+        /** Number of vector components. */
+        enum { num_components = 3 };
+        
+        /** Vec member varaible. */
         value_type _v[3];
 
-        Vec3f() { _v[0]=0.0; _v[1]=0.0; _v[2]=0.0;}
+        Vec3f() { _v[0]=0.0f; _v[1]=0.0f; _v[2]=0.0f;}
         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)
         {
diff --git a/include/osg/Vec3s b/include/osg/Vec3s
index 6a870df1d..99043b665 100644
--- a/include/osg/Vec3s
+++ b/include/osg/Vec3s
@@ -18,68 +18,101 @@ namespace osg {
 
 class Vec3s
 {
-public:
+    public:
 
-    typedef short value_type;
+        /** Type of Vec class.*/
+        typedef short value_type;
 
-    union
-    {
-        struct {value_type x,y,z;};
-        value_type _v[3];
-    };
-
-    Vec3s (){}
-    Vec3s (value_type xx, value_type yy, value_type zz)
-    { x = xx; y = yy; z = zz;}
-
-    inline value_type* ptr() { return _v; }
-    inline const value_type* ptr() const { return _v; }
+        /** Number of vector components. */
+        enum { num_components = 3 };
         
-    inline bool operator == (const Vec3s& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; }
-    inline bool operator != (const Vec3s& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2]; }
-    inline bool operator <  (const Vec3s& v) const
-    {
-        if (_v[0]<v._v[0])      return true;
-        else if (_v[0]>v._v[0]) return false;
-        else if (_v[1]<v._v[1]) return true;
-        else if (_v[1]>v._v[1]) return false;
-        else return (_v[2]<v._v[2]);
-    }
-    
-    inline Vec3s operator * (value_type rhs) const
-    {
-        return Vec3s(_v[0]*rhs, _v[1]*rhs, _v[2]*rhs);
-    }
-    
-    inline Vec3s operator / (value_type rhs) const
-    {
-        return Vec3s(_v[0]/rhs, _v[1]/rhs, _v[2]/rhs);
-    }
-    
-    inline Vec3s operator + (value_type rhs) const
-    {
-        return Vec3s(_v[0]+rhs, _v[1]+rhs, _v[2]+rhs);
-    }
-    
-    inline Vec3s operator - (value_type rhs) const
-    {
-        return Vec3s(_v[0]-rhs, _v[1]-rhs, _v[2]-rhs);
-    }
-    
-    inline Vec3s operator + (const Vec3s& rhs) const
-    {
-        return Vec3s(_v[0]+rhs._v[0], _v[1]+rhs._v[1], _v[2]+rhs._v[2]);
-    }
-    
-    inline Vec3s operator - (const Vec3s& rhs) const
-    {
-        return Vec3s(_v[0]-rhs._v[0], _v[1]-rhs._v[1], _v[2]-rhs._v[2]);
-    }
-    
-    inline Vec3s operator * (const Vec3s& rhs) const
-    {
-        return Vec3s(_v[0]*rhs._v[0], _v[1]*rhs._v[1], _v[2]*rhs._v[2]);
-    }
+        /** Vec member varaible. */
+        value_type _v[3];
+
+        typedef short value_type;
+
+        Vec3s() { _v[0]=0; _v[1]=0; _v[2]=0; }
+        
+        Vec3s(value_type r, value_type g, value_type b) { _v[0]=r; _v[1]=g; _v[2]=b;  }
+
+        inline bool operator == (const Vec3s& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; }
+        inline bool operator != (const Vec3s& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2]; }
+        inline bool operator <  (const Vec3s& v) const
+        {
+            if (_v[0]<v._v[0])      return true;
+            else if (_v[0]>v._v[0]) return false;
+            else if (_v[1]<v._v[1]) return true;
+            else if (_v[1]>v._v[1]) return false;
+            else return (_v[2]<v._v[2]);
+        }
+
+        inline value_type* ptr() { return _v; }
+        inline const value_type* ptr() const { return _v; }
+
+        inline void set(value_type r, value_type g, value_type b)
+        {
+            _v[0]=r; _v[1]=g; _v[2]=b;
+        }
+
+        inline void set( const Vec3s& rhs)
+        {
+            _v[0]=rhs._v[0]; _v[1]=rhs._v[1]; _v[2]=rhs._v[2];
+        }
+
+        inline value_type& operator [] (unsigned int i) { return _v[i]; }
+        inline value_type operator [] (unsigned int i) const { return _v[i]; }
+
+        inline value_type& x() { return _v[0]; }
+        inline value_type& y() { return _v[1]; }
+        inline value_type& z() { return _v[2]; }
+
+        inline value_type x() const { return _v[0]; }
+        inline value_type y() const { return _v[1]; }
+        inline value_type z() const { return _v[2]; }
+
+        inline value_type& r() { return _v[0]; }
+        inline value_type& g() { return _v[1]; }
+        inline value_type& b() { return _v[2]; }
+
+        inline value_type r() const { return _v[0]; }
+        inline value_type g() const { return _v[1]; }
+        inline value_type b() const { return _v[2]; }
+
+        /** Multiply by scalar. */
+        inline Vec3s operator * (value_type rhs) const
+        {
+            return Vec3s(_v[0]*rhs, _v[1]*rhs, _v[2]*rhs);
+        }
+
+        inline Vec3s operator / (value_type rhs) const
+        {
+            return Vec3s(_v[0]/rhs, _v[1]/rhs, _v[2]/rhs);
+        }
+
+        inline Vec3s operator + (value_type rhs) const
+        {
+            return Vec3s(_v[0]+rhs, _v[1]+rhs, _v[2]+rhs);
+        }
+
+        inline Vec3s operator - (value_type rhs) const
+        {
+            return Vec3s(_v[0]-rhs, _v[1]-rhs, _v[2]-rhs);
+        }
+
+        inline Vec3s operator + (const Vec3s& rhs) const
+        {
+            return Vec3s(_v[0]+rhs._v[0], _v[1]+rhs._v[1], _v[2]+rhs._v[2]);
+        }
+
+        inline Vec3s operator - (const Vec3s& rhs) const
+        {
+            return Vec3s(_v[0]-rhs._v[0], _v[1]-rhs._v[1], _v[2]-rhs._v[2]);
+        }
+
+        inline Vec3s operator * (const Vec3s& rhs) const
+        {
+            return Vec3s(_v[0]*rhs._v[0], _v[1]*rhs._v[1], _v[2]*rhs._v[2]);
+        }
 };
 
 };
diff --git a/include/osg/Vec4b b/include/osg/Vec4b
index d3099c3c3..50f1e802e 100644
--- a/include/osg/Vec4b
+++ b/include/osg/Vec4b
@@ -26,16 +26,24 @@ class Vec4b
 {
     public:
 
-    // Methods are defined here so that they are implicitly inlined
+        /** Type of Vec class.*/
+        typedef char value_type;
+
+        /** Number of vector components. */
+        enum { num_components = 4 };
+        
+        /** Vec member varaible. */
+        value_type _v[4];
 
         Vec4b() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; }
-        
-        Vec4b(char r, char g, char b, char a)
-        {
-            _v[0]=r; _v[1]=g; _v[2]=b; _v[3]=a;
-        }
 
-        char _v[4];
+        Vec4b(value_type x, value_type y, value_type z, value_type w)
+        {
+            _v[0]=x;
+            _v[1]=y;
+            _v[2]=z;
+            _v[3]=w;
+        }
 
         inline bool operator == (const Vec4b& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2] && _v[3]==v._v[3]; }
 
@@ -52,26 +60,36 @@ class Vec4b
             else return (_v[3]<v._v[3]);
         }
 
-        inline char* ptr() { return _v; }
-        inline const char* ptr() const { return _v; }
+        inline value_type* ptr() { return _v; }
+        inline const value_type* ptr() const { return _v; }
 
-        inline void set(char r, char g, char b, char a)
+        inline void set( value_type x, value_type y, value_type z, value_type w)
         {
-            _v[0]=r; _v[1]=g; _v[2]=b; _v[3]=a;
+            _v[0]=x; _v[1]=y; _v[2]=z; _v[3]=w;
         }
 
-        inline char& operator [] (unsigned int i) { return _v[i]; }
-        inline char operator [] (unsigned int i) const { return _v[i]; }
+        inline value_type& operator [] (unsigned int i) { return _v[i]; }
+        inline value_type  operator [] (unsigned int i) const { return _v[i]; }
 
-        inline char& r() { return _v[0]; }
-        inline char& g() { return _v[1]; }
-        inline char& b() { return _v[2]; }
-        inline char& a() { return _v[3]; }
+        inline value_type& x() { return _v[0]; }
+        inline value_type& y() { return _v[1]; }
+        inline value_type& z() { return _v[2]; }
+        inline value_type& w() { return _v[3]; }
 
-        inline char r() const { return _v[0]; }
-        inline char g() const { return _v[1]; }
-        inline char b() const { return _v[2]; }
-        inline char a() const { return _v[3]; }
+        inline value_type x() const { return _v[0]; }
+        inline value_type y() const { return _v[1]; }
+        inline value_type z() const { return _v[2]; }
+        inline value_type w() const { return _v[3]; }
+
+        inline value_type& r() { return _v[0]; }
+        inline value_type& g() { return _v[1]; }
+        inline value_type& b() { return _v[2]; }
+        inline value_type& a() { return _v[3]; }
+
+        inline value_type r() const { return _v[0]; }
+        inline value_type g() const { return _v[1]; }
+        inline value_type b() const { return _v[2]; }
+        inline value_type a() const { return _v[3]; }
 
         /** Multiply by scalar. */
         inline Vec4b operator * (float rhs) const
diff --git a/include/osg/Vec4d b/include/osg/Vec4d
index 75c2c656d..f391b22c7 100644
--- a/include/osg/Vec4d
+++ b/include/osg/Vec4d
@@ -29,14 +29,17 @@ class Vec4d
 {
     public:
 
+        /** Type of Vec class.*/
         typedef double value_type;
 
+        /** Number of vector components. */
+        enum { num_components = 4 };
+        
+        /** Vec member varaible. */
         value_type _v[4];
 
-        // Methods are defined here so that they are implicitly inlined
+        Vec4d() { _v[0]=0.0; _v[1]=0.0; _v[2]=0.0; _v[3]=0.0; }
 
-        Vec4d() { _v[0]=0.0; _v[1]=0.0; _v[2]=0.0; _v[3]=0.0;}
-        
         Vec4d(value_type x, value_type y, value_type z, value_type w)
         {
             _v[0]=x;
diff --git a/include/osg/Vec4f b/include/osg/Vec4f
index 71753a606..8745f6e45 100644
--- a/include/osg/Vec4f
+++ b/include/osg/Vec4f
@@ -28,13 +28,18 @@ class Vec4f
 {
     public:
 
+        /** Type of Vec class.*/
         typedef float value_type;
 
+        /** Number of vector components. */
+        enum { num_components = 4 };
+        
+        /** Vec member varaible. */
         value_type _v[4];
 
         // Methods are defined here so that they are implicitly inlined
 
-        Vec4f() { _v[0]=0.0; _v[1]=0.0; _v[2]=0.0; _v[3]=0.0;}
+        Vec4f() { _v[0]=0.0f; _v[1]=0.0f; _v[2]=0.0f; _v[3]=0.0f;}
         
         Vec4f(value_type x, value_type y, value_type z, value_type w)
         {
diff --git a/include/osg/Vec4s b/include/osg/Vec4s
index c1fc0982d..2daed1227 100644
--- a/include/osg/Vec4s
+++ b/include/osg/Vec4s
@@ -18,70 +18,105 @@ namespace osg {
 
 class Vec4s
 {
-public:
+    public:
 
-    typedef short value_type;
+        /** Type of Vec class.*/
+        typedef short value_type;
 
-    union
-    {
-        struct {value_type x,y,z,w;};
+        /** Number of vector components. */
+        enum { num_components = 4 };
+        
+        /** Vec member varaible. */
         value_type _v[4];
-    };
 
-    Vec4s (){}
-    Vec4s (value_type xx, value_type yy, value_type zz, value_type ww)
-    {x = xx; y = yy; z = zz; w = ww;}
+        Vec4s() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; }
+
+        Vec4s(value_type x, value_type y, value_type z, value_type w)
+        {
+            _v[0]=x;
+            _v[1]=y;
+            _v[2]=z;
+            _v[3]=w;
+        }
+
+        inline bool operator == (const Vec4s& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2] && _v[3]==v._v[3]; }
+        inline bool operator != (const Vec4s& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2] || _v[3]!=v._v[3]; }
+        inline bool operator <  (const Vec4s& v) const
+        {
+            if (_v[0]<v._v[0])      return true;
+            else if (_v[0]>v._v[0]) return false;
+            else if (_v[1]<v._v[1]) return true;
+            else if (_v[1]>v._v[1]) return false;
+            else if (_v[2]<v._v[2]) return true;
+            else if (_v[2]>v._v[2]) return false;
+            else return (_v[3]<v._v[3]);
+        }
 
 	inline value_type* ptr() { return _v; }
-    inline const value_type* ptr() const { return _v; }
-        
-    inline bool operator == (const Vec4s& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2] && _v[3]==v._v[3]; }
-    inline bool operator != (const Vec4s& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2] || _v[3]!=v._v[3]; }
-    inline bool operator <  (const Vec4s& v) const
-    {
-        if (_v[0]<v._v[0])      return true;
-        else if (_v[0]>v._v[0]) return false;
-        else if (_v[1]<v._v[1]) return true;
-        else if (_v[1]>v._v[1]) return false;
-        else if (_v[2]<v._v[2]) return true;
-        else if (_v[2]>v._v[2]) return false;
-        else return (_v[3]<v._v[3]);
-    }
-    
-    inline Vec4s operator * (value_type rhs) const
-    {
-        return Vec4s(_v[0]*rhs, _v[1]*rhs, _v[2]*rhs, _v[3]*rhs);
-    }
-    
-    inline Vec4s operator / (value_type rhs) const
-    {
-        return Vec4s(_v[0]/rhs, _v[1]/rhs, _v[2]/rhs, _v[3]/rhs);
-    }
-    
-    inline Vec4s operator + (value_type rhs) const
-    {
-        return Vec4s(_v[0]+rhs, _v[1]+rhs, _v[2]+rhs, _v[3]+rhs);
-    }
-    
-    inline Vec4s operator - (value_type rhs) const
-    {
-        return Vec4s(_v[0]-rhs, _v[1]-rhs, _v[2]-rhs, _v[3]-rhs);
-    }
-    
-    inline Vec4s operator + (const Vec4s& rhs) const
-    {
-        return Vec4s(_v[0]+rhs._v[0], _v[1]+rhs._v[1], _v[2]+rhs._v[2], _v[3]+rhs._v[3]);
-    }
-    
-    inline Vec4s operator - (const Vec4s& rhs) const
-    {
-        return Vec4s(_v[0]-rhs._v[0], _v[1]-rhs._v[1], _v[2]-rhs._v[2], _v[3]-rhs._v[3]);
-    }
-    
-    inline Vec4s operator * (const Vec4s& rhs) const
-    {
-        return Vec4s(_v[0]*rhs._v[0], _v[1]*rhs._v[1], _v[2]*rhs._v[2], _v[3]*rhs._v[3]);
-    }
+        inline const value_type* ptr() const { return _v; }
+
+        inline void set( value_type x, value_type y, value_type z, value_type w)
+        {
+            _v[0]=x; _v[1]=y; _v[2]=z; _v[3]=w;
+        }
+
+        inline value_type& operator [] (unsigned int i) { return _v[i]; }
+        inline value_type  operator [] (unsigned int i) const { return _v[i]; }
+
+        inline value_type& x() { return _v[0]; }
+        inline value_type& y() { return _v[1]; }
+        inline value_type& z() { return _v[2]; }
+        inline value_type& w() { return _v[3]; }
+
+        inline value_type x() const { return _v[0]; }
+        inline value_type y() const { return _v[1]; }
+        inline value_type z() const { return _v[2]; }
+        inline value_type w() const { return _v[3]; }
+
+        inline value_type& r() { return _v[0]; }
+        inline value_type& g() { return _v[1]; }
+        inline value_type& b() { return _v[2]; }
+        inline value_type& a() { return _v[3]; }
+
+        inline value_type r() const { return _v[0]; }
+        inline value_type g() const { return _v[1]; }
+        inline value_type b() const { return _v[2]; }
+        inline value_type a() const { return _v[3]; }
+
+        inline Vec4s operator * (value_type rhs) const
+        {
+            return Vec4s(_v[0]*rhs, _v[1]*rhs, _v[2]*rhs, _v[3]*rhs);
+        }
+
+        inline Vec4s operator / (value_type rhs) const
+        {
+            return Vec4s(_v[0]/rhs, _v[1]/rhs, _v[2]/rhs, _v[3]/rhs);
+        }
+
+        inline Vec4s operator + (value_type rhs) const
+        {
+            return Vec4s(_v[0]+rhs, _v[1]+rhs, _v[2]+rhs, _v[3]+rhs);
+        }
+
+        inline Vec4s operator - (value_type rhs) const
+        {
+            return Vec4s(_v[0]-rhs, _v[1]-rhs, _v[2]-rhs, _v[3]-rhs);
+        }
+
+        inline Vec4s operator + (const Vec4s& rhs) const
+        {
+            return Vec4s(_v[0]+rhs._v[0], _v[1]+rhs._v[1], _v[2]+rhs._v[2], _v[3]+rhs._v[3]);
+        }
+
+        inline Vec4s operator - (const Vec4s& rhs) const
+        {
+            return Vec4s(_v[0]-rhs._v[0], _v[1]-rhs._v[1], _v[2]-rhs._v[2], _v[3]-rhs._v[3]);
+        }
+
+        inline Vec4s operator * (const Vec4s& rhs) const
+        {
+            return Vec4s(_v[0]*rhs._v[0], _v[1]*rhs._v[1], _v[2]*rhs._v[2], _v[3]*rhs._v[3]);
+        }
 };
 
 };
diff --git a/include/osg/Vec4ub b/include/osg/Vec4ub
index d5c5cba45..d59dd5166 100644
--- a/include/osg/Vec4ub
+++ b/include/osg/Vec4ub
@@ -28,16 +28,24 @@ class Vec4ub
 {
     public:
 
-	// Methods are defined here so that they are implicitly inlined
+        /** Type of Vec class.*/
+        typedef unsigned char value_type;
 
-        Vec4ub() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0;}
+        /** Number of vector components. */
+        enum { num_components = 4 };
         
-        Vec4ub(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-        {
-            _v[0]=r; _v[1]=g; _v[2]=b; _v[3]=a;
-        }
+        /** Vec member varaible. */
+        value_type _v[4];
 
-        unsigned char _v[4];
+        Vec4ub() { _v[0]=0; _v[1]=0; _v[2]=0; _v[3]=0; }
+
+        Vec4ub(value_type x, value_type y, value_type z, value_type w)
+        {
+            _v[0]=x;
+            _v[1]=y;
+            _v[2]=z;
+            _v[3]=w;
+        }
 
         inline bool operator == (const Vec4ub& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2] && _v[3]==v._v[3]; }
 
diff --git a/src/osgPlugins/ive/DataOutputStream.cpp b/src/osgPlugins/ive/DataOutputStream.cpp
index 1d3ce4062..43ca0661a 100644
--- a/src/osgPlugins/ive/DataOutputStream.cpp
+++ b/src/osgPlugins/ive/DataOutputStream.cpp
@@ -490,8 +490,8 @@ void DataOutputStream::writeVec2sArray(const osg::Vec2sArray* a)
     int size = a->getNumElements(); 
     writeInt(size);
     for(int i =0; i<size ;i++){
-        writeShort((*a)[i].x);
-        writeShort((*a)[i].y);
+        writeShort((*a)[i].x());
+        writeShort((*a)[i].y());
     }
 
     if (_verboseOutput) std::cout<<"read/writeVec2sArray() ["<<size<<"]"<<std::endl;
@@ -502,9 +502,9 @@ void DataOutputStream::writeVec3sArray(const osg::Vec3sArray* a)
     int size = a->getNumElements(); 
     writeInt(size);
     for(int i =0; i<size ;i++){
-        writeShort((*a)[i].x);
-        writeShort((*a)[i].y);
-        writeShort((*a)[i].z);
+        writeShort((*a)[i].x());
+        writeShort((*a)[i].y());
+        writeShort((*a)[i].z());
     }
 
     if (_verboseOutput) std::cout<<"read/writeVec3sArray() ["<<size<<"]"<<std::endl;
@@ -515,10 +515,10 @@ void DataOutputStream::writeVec4sArray(const osg::Vec4sArray* a)
     int size = a->getNumElements(); 
     writeInt(size);
     for(int i =0; i<size ;i++){
-        writeShort((*a)[i].x);
-        writeShort((*a)[i].y);
-        writeShort((*a)[i].z);
-        writeShort((*a)[i].w);
+        writeShort((*a)[i].x());
+        writeShort((*a)[i].y());
+        writeShort((*a)[i].z());
+        writeShort((*a)[i].w());
     }
 
     if (_verboseOutput) std::cout<<"read/writeVec4sArray() ["<<size<<"]"<<std::endl;