Renamed Byte2,3,4 and Short2,3,4 and UByte4 to use the Vec*b, Vec*s and Vec4ub form

include/osg/Vec2b

@@ -0,0 +1,136 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSG_VEC2B
+#define OSG_VEC2B 1
+
+namespace osg {
+
+/** General purpose float triple.
+  * Uses include representation of color coordinates.
+  * No support yet added for float * Vec2b - is it necessary?
+  * Need to define a non-member non-friend operator*  etc.
+  * Vec2b * float is okay
+*/
+class Vec2b
+{
+    public:
+
+	// Methods are defined here so that they are implicitly inlined
+
+        Vec2b() { _v[0]=0; _v[1]=0; }
+        
+        Vec2b(char r, char g)
+        {
+            _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]; }
+
+        inline bool operator <  (const Vec2b& 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 char* ptr() { return _v; }
+        inline const char* ptr() const { return _v; }
+
+        inline void set(char r, char g)
+        {
+            _v[0]=r; _v[1]=g;
+        }
+
+        inline char& operator [] (unsigned int i) { return _v[i]; }
+        inline char operator [] (unsigned int i) const { return _v[i]; }
+
+        inline char& r() { return _v[0]; }
+        inline char& g() { return _v[1]; }        
+
+        inline char r() const { return _v[0]; }
+        inline char g() const { return _v[1]; }        
+
+        /** Multiply by scalar. */
+        inline Vec2b operator * (float rhs) const
+        {
+            Vec2b col(*this);
+            col *= rhs;
+            return col;
+        }
+
+        /** Unary multiply by scalar. */
+        inline Vec2b& operator *= (float rhs)
+        {
+            _v[0]=(char)((float)_v[0]*rhs);
+            _v[1]=(char)((float)_v[1]*rhs);            
+            return *this;
+        }
+
+        /** Divide by scalar. */
+        inline Vec2b operator / (float rhs) const
+        {
+            Vec2b col(*this);
+            col /= rhs;
+            return col;
+        }
+
+        /** Unary divide by scalar. */
+        inline Vec2b& operator /= (float rhs)
+        {
+            float div = 1.0f/rhs;
+            *this *= div;
+            return *this;
+        }
+
+        /** Binary vector add. */
+        inline Vec2b operator + (const Vec2b& rhs) const
+        {
+            return Vec2b(_v[0]+rhs._v[0], _v[1]+rhs._v[1]);
+        }
+
+        /** Unary vector add. Slightly more efficient because no temporary
+          * intermediate object.
+		*/
+        inline Vec2b& operator += (const Vec2b& rhs)
+        {
+            _v[0] += rhs._v[0];
+            _v[1] += rhs._v[1];            
+            return *this;
+        }
+
+        /** Binary vector subtract. */
+        inline Vec2b operator - (const Vec2b& rhs) const
+        {
+            return Vec2b(_v[0]-rhs._v[0], _v[1]-rhs._v[1]);
+        }
+
+        /** Unary vector subtract. */
+        inline Vec2b& operator -= (const Vec2b& rhs)
+        {
+            _v[0]-=rhs._v[0];
+            _v[1]-=rhs._v[1];            
+            return *this;
+        }
+
+};	// end of class Vec2b
+
+
+
+}	// end of namespace osg
+
+#endif