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

Timestamp:

02/23/11 13:48:17 (2 years ago)

Author:

robert

Message:

Added support for positive values of --xMultiple <float> --yMultiplier <float> and --zMultiplier <float>

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -1081 +1081 @@
         while (arguments.read("--clip",sliceEnd)) { OSG_NOTICE<<"Warning: --clip option no longer supported."<<std::endl; invalidOption = true; }
 
-        float xMultiplier=1.0f;
-        while (arguments.read("--xMultiplier",xMultiplier)) { OSG_NOTICE<<"Warning: --xMultiplier option no longer supported."<<std::endl; invalidOption = true; }
-
-        float yMultiplier=1.0f;
-        while (arguments.read("--yMultiplier",yMultiplier)) { OSG_NOTICE<<"Warning: --yMultiplier option no longer supported."<<std::endl; invalidOption = true; }
-
-        float zMultiplier=1.0f;
-        while (arguments.read("--zMultiplier",zMultiplier)) { OSG_NOTICE<<"Warning: --zMultiplier option no longer supported."<<std::endl; invalidOption = true; }
 
         if (invalidOption) return 1;
     }
+
+    float xMultiplier=1.0f;
+    while (arguments.read("--xMultiplier",xMultiplier)) {}
+
+    float yMultiplier=1.0f;
+    while (arguments.read("--yMultiplier",yMultiplier)) {}
+
+    float zMultiplier=1.0f;
+    while (arguments.read("--zMultiplier",zMultiplier)) {}
 
 
@@ -1391 +1392 @@
     }
 
+
+    if (xMultiplier!=1.0 || yMultiplier!=1.0 || zMultiplier!=1.0)
+    {
+        matrix->postMultScale(osg::Vec3d(fabs(xMultiplier), fabs(yMultiplier), fabs(zMultiplier)));
+    }
+
     osg::Vec4 minValue(FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX);
     osg::Vec4 maxValue(-FLT_MAX, -FLT_MAX, -FLT_MAX, -FLT_MAX);