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

Timestamp:

09/29/08 20:30:17 (5 years ago)

Author:

robert

Message:

Updated shaders

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -761 +761 @@
                         {
                             float value = powf(v,5);
-                            osg::notify(osg::NOTICE)<<"sampleDensity = "<<value<<std::endl;
+                            osg::notify(osg::INFO)<<"sampleDensity = "<<value<<std::endl;
                             uniform->set(value);
                         }
@@ -1062 +1062 @@
     }
 
-    osg::Uniform* sampleDensity = new osg::Uniform("sampleDensity", 0.01f);
+    osg::Uniform* sampleDensity = new osg::Uniform("sampleDensity", 0.005f);
     stateset->addUniform(sampleDensity);
 
@@ -1795 +1795 @@
 
         keyswitchManipulator->addMatrixManipulator( '1', "Trackball", new osgGA::TrackballManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '2', "Flight", new osgGA::FlightManipulator() );
+        
+        osgGA::FlightManipulator* flightManipulator = new osgGA::FlightManipulator();
+        flightManipulator->setYawControlMode(osgGA::FlightManipulator::NO_AUTOMATIC_YAW);
+        keyswitchManipulator->addMatrixManipulator( '2', "Flight", flightManipulator );
 
         viewer.setCameraManipulator( keyswitchManipulator.get() );
@@ -2083 +2086 @@
     zSize = (*sizeItr)->r();
     ++sizeItr;
+
     for(;sizeItr != images.end(); ++sizeItr)
     {
@@ -2095 +2099 @@
 
 
-#if 0
-    osg::RefMatrix* matrix = dynamic_cast<osg::RefMatrix*>(image_3d->getUserData());
+#if 1
+    osg::RefMatrix* matrix = dynamic_cast<osg::RefMatrix*>(images.front()->getUserData());
     if (matrix)
     {
         osg::notify(osg::NOTICE)<<"Image has Matrix = "<<*matrix<<std::endl;
-        xSize = image_3d->s() * (*matrix)(0,0);
-        ySize = image_3d->t() * (*matrix)(1,1);
-        zSize = image_3d->r() * (*matrix)(2,2);
-    }
-#else
+        xSize = xSize * (*matrix)(0,0);
+        ySize = ySize * (*matrix)(1,1);
+        zSize = zSize * (*matrix)(2,2);
+    }
 #endif
-
 
     osg::Vec4 minValue, maxValue;
@@ -2114 +2116 @@
         ++itr)
     {
+#if 0    
+        osg::RefMatrix* matrix = dynamic_cast<osg::RefMatrix*>((*itr)->getUserData());
+        if (matrix)
+        {
+            std::cout<<"matrix = "<<*matrix<<std::endl;
+        }
+#endif
         if (osgVolume::computeMinMax(itr->get(), minValue, maxValue)) computeMinMax = true;
     }