Changeset 13205

Timestamp:

05/22/13 17:48:42 (3 hours ago)

Author:

robert

Message:

Quitened down debug messages

Location:

OpenSceneGraph/trunk

Files:

• examples/osgvolume/osgvolume.cpp (modified) (2 diffs)
• include/osg/ImageUtils (modified) (1 diff)
• include/osgPresentation/SlideShowConstructor (modified) (1 diff)
• src/osg/ImageUtils.cpp (modified) (2 diffs)
• src/osgPlugins/p3d/ReaderWriterP3D.cpp (modified) (1 diff)
• src/osgPresentation/SlideShowConstructor.cpp (modified) (1 diff)

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -590 +590 @@
 
     // set up colour space operation.
-    osg::ColorSpaceOperation colourSpaceOperation = osg::NO_COLOUR_SPACE_OPERATION;
+    osg::ColorSpaceOperation colourSpaceOperation = osg::NO_COLOR_SPACE_OPERATION;
     osg::Vec4 colourModulate(0.25f,0.25f,0.25f,0.25f);
     while(arguments.read("--modulate-alpha-by-luminance")) { colourSpaceOperation = osg::MODULATE_ALPHA_BY_LUMINANCE; }
-    while(arguments.read("--modulate-alpha-by-colour", colourModulate.x(),colourModulate.y(),colourModulate.z(),colourModulate.w() )) { colourSpaceOperation = osg::MODULATE_ALPHA_BY_COLOUR; }
+    while(arguments.read("--modulate-alpha-by-colour", colourModulate.x(),colourModulate.y(),colourModulate.z(),colourModulate.w() )) { colourSpaceOperation = osg::MODULATE_ALPHA_BY_COLOR; }
     while(arguments.read("--replace-alpha-with-luminance")) { colourSpaceOperation = osg::REPLACE_ALPHA_WITH_LUMINANCE; }
     while(arguments.read("--replace-rgb-with-luminance")) { colourSpaceOperation = osg::REPLACE_RGB_WITH_LUMINANCE; }
@@ -937 +937 @@
 
 
-    if (colourSpaceOperation!=osg::NO_COLOUR_SPACE_OPERATION)
+    if (colourSpaceOperation!=osg::NO_COLOR_SPACE_OPERATION)
     {
         for(Images::iterator itr = images.begin();

OpenSceneGraph/trunk/include/osg/ImageUtils

@@ -164 +164 @@
 enum ColorSpaceOperation
 {
-    NO_COLOUR_SPACE_OPERATION,
+    NO_COLOR_SPACE_OPERATION,
     MODULATE_ALPHA_BY_LUMINANCE,
-    MODULATE_ALPHA_BY_COLOUR,
+    MODULATE_ALPHA_BY_COLOR,
     REPLACE_ALPHA_WITH_LUMINANCE,
     REPLACE_RGB_WITH_LUMINANCE

OpenSceneGraph/trunk/include/osgPresentation/SlideShowConstructor

@@ -294 +294 @@
             sampleDensityValue(0.005),
             sampleDensityWhenMovingValue(0.0),
-            colorSpaceOperation(osg::NO_COLOUR_SPACE_OPERATION),
+            colorSpaceOperation(osg::NO_COLOR_SPACE_OPERATION),
             colorModulate(1.0f,1.0f,1.0f,1.0f)
         {

OpenSceneGraph/trunk/src/osg/ImageUtils.cpp

@@ -616 +616 @@
 
 
-struct ModulateAlphaByColourOperator
-{
-    ModulateAlphaByColourOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); }
+
+struct ModulateAlphaByColorOperator
+{
+    ModulateAlphaByColorOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); }
 
     osg::Vec4 _colour;
@@ -651 +652 @@
             return image;
         }
-        case (MODULATE_ALPHA_BY_COLOUR):
+        case (MODULATE_ALPHA_BY_COLOR):
         {
             OSG_NOTICE<<"doing conversion MODULATE_ALPHA_BY_COLOUR"<<std::endl;
-            osg::modifyImage(image, ModulateAlphaByColourOperator(colour));
+            osg::modifyImage(image, ModulateAlphaByColorOperator(colour));
             return image;
         }

OpenSceneGraph/trunk/src/osgPlugins/p3d/ReaderWriterP3D.cpp

@@ -1106 +1106 @@
     if (getProperty(cur, "colorSpaceOperation", operation) || getProperty(cur, "colourSpaceOperation", operation))
     {
-        osg::ColorSpaceOperation colorOp = osg::NO_COLOUR_SPACE_OPERATION;
-        if (operation=="NO_COLOUR_SPACE_OPERATION") volumeData.colorSpaceOperation = osg::NO_COLOUR_SPACE_OPERATION;
+        if (operation=="NO_COLOR_SPACE_OPERATION") volumeData.colorSpaceOperation = osg::NO_COLOR_SPACE_OPERATION;
         else if (operation=="MODULATE_ALPHA_BY_LUMINANCE") volumeData.colorSpaceOperation = osg::MODULATE_ALPHA_BY_LUMINANCE;
-        else if (operation=="MODULATE_ALPHA_BY_COLOUR") volumeData.colorSpaceOperation = osg::MODULATE_ALPHA_BY_COLOUR;
+        else if (operation=="MODULATE_ALPHA_BY_COLOR") volumeData.colorSpaceOperation = osg::MODULATE_ALPHA_BY_COLOR;
         else if (operation=="REPLACE_ALPHA_WITH_LUMINANCE") volumeData.colorSpaceOperation = osg::REPLACE_ALPHA_WITH_LUMINANCE;
         else if (operation=="REPLACE_RGB_WITH_LUMINANCE") volumeData.colorSpaceOperation = osg::REPLACE_RGB_WITH_LUMINANCE;

OpenSceneGraph/trunk/src/osgPresentation/SlideShowConstructor.cpp

@@ -2083 +2083 @@
 
 
-    if (volumeData.colorSpaceOperation!=osg::NO_COLOUR_SPACE_OPERATION)
+    if (volumeData.colorSpaceOperation!=osg::NO_COLOR_SPACE_OPERATION)
     {
         OSG_NOTICE<<"Doing colour space conversion"<<std::endl;