Changeset 4496 for OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

Timestamp:

09/03/05 22:56:25 (8 years ago)

Author:

robert

Message:

Changed red()/green()/blue()/alpha() to r()/g()/b()/a() for greater consistency
across Vec* classes and with OpenGL Shander Lanaguage.

Files:

• OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -929 +929 @@
     mutable unsigned int    _pos;
     
-    inline void luminance(float& l) const { l = _colours[_pos++].red(); } 
-    inline void alpha(float& a) const { a = _colours[_pos++].alpha(); } 
-    inline void luminance_alpha(float& l,float& a) const { l = _colours[_pos].red(); a = _colours[_pos++].alpha(); } 
-    inline void rgb(float& r,float& g,float& b) const { r = _colours[_pos].red(); g = _colours[_pos].green(); b = _colours[_pos].blue(); }
-    inline void rgba(float& r,float& g,float& b,float& a) const {  r = _colours[_pos].red(); g = _colours[_pos].green(); b = _colours[_pos].blue(); a = _colours[_pos++].alpha(); }
+    inline void luminance(float& l) const { l = _colours[_pos++].r(); } 
+    inline void alpha(float& a) const { a = _colours[_pos++].a(); } 
+    inline void luminance_alpha(float& l,float& a) const { l = _colours[_pos].r(); a = _colours[_pos++].a(); } 
+    inline void rgb(float& r,float& g,float& b) const { r = _colours[_pos].r(); g = _colours[_pos].g(); b = _colours[_pos].b(); }
+    inline void rgba(float& r,float& g,float& b,float& a) const {  r = _colours[_pos].r(); g = _colours[_pos].g(); b = _colours[_pos].b(); a = _colours[_pos++].a(); }
 };
 
@@ -1064 +1064 @@
 };
 
-struct ModulatAlphaByLuminanceOperator
-{
-    ModulatAlphaByLuminanceOperator() {}
+struct ModulateAlphaByLuminanceOperator
+{
+    ModulateAlphaByLuminanceOperator() {}
 
     inline void luminance(float&) const {} 
@@ -1075 +1075 @@
 };
 
-struct ModulatAlphaByColourOperator
-{
-    ModulatAlphaByColourOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); }
+struct ModulateAlphaByColourOperator
+{
+    ModulateAlphaByColourOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); }
     
     osg::Vec4 _colour;
@@ -1086 +1086 @@
     inline void luminance_alpha(float& l,float& a) const { a*= l*_lum; } 
     inline void rgb(float&,float&,float&) const {}
-    inline void rgba(float& r,float& g,float& b,float& a) const { a = (r*_colour.red()+g*_colour.green()+b*_colour.blue()+a*_colour.alpha()); }
+    inline void rgba(float& r,float& g,float& b,float& a) const { a = (r*_colour.r()+g*_colour.g()+b*_colour.b()+a*_colour.a()); }
 };
 
@@ -1106 +1106 @@
         case (MODULATE_ALPHA_BY_LUMINANCE):
             std::cout<<"doing conversion MODULATE_ALPHA_BY_LUMINANCE"<<std::endl;
-            modifyImage(image,ModulatAlphaByLuminanceOperator()); 
+            modifyImage(image,ModulateAlphaByLuminanceOperator()); 
             break;
         case (MODULATE_ALPHA_BY_COLOUR):
             std::cout<<"doing conversion MODULATE_ALPHA_BY_COLOUR"<<std::endl;
-            modifyImage(image,ModulatAlphaByColourOperator(colour)); 
+            modifyImage(image,ModulateAlphaByColourOperator(colour)); 
             break;
         case (REPLACE_ALPHA_WITH_LUMINACE):