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

Timestamp:

05/23/13 20:29:47 (12 hours ago)

Author:

robert

Message:

Added repolation of the _deadparts stack which would otherwise been invalidatd by the depth sort of particles.

Files:

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

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();