Changeset 5090 for OpenSceneGraph/trunk/examples/osgprecipitation/osgprecipitation.cpp

Timestamp:

04/14/06 13:04:11 (7 years ago)

Author:

robert

Message:

Added fog parameters settings.

Files:

• OpenSceneGraph/trunk/examples/osgprecipitation/osgprecipitation.cpp (modified) (17 diffs)

OpenSceneGraph/trunk/examples/osgprecipitation/osgprecipitation.cpp

@@ -40 +40 @@
         nearTransition(25.0),
         farTransition(100.0),
-        fogDensity(0.1),
-        fogEnd(1000.0)
+        fogDensity(0.001),
+        fogExponent(1.0),
+        fogEnd(1000.0),
+        fogColour(0.5, 0.5, 0.5, 1.0)
     {}
 
@@ -49 +51 @@
         particleSize = 0.01 + 0.02*intensity;
         numberOfParticles = intensity * 100000000;
-        particleColour = osg::Vec4(0.6, 0.6, 0.6, 1.0);
-        fogDensity = intensity;
+        particleColour = osg::Vec4(0.6, 0.6, 0.6, 1.0) -  osg::Vec4(0.1, 0.1, 0.1, 1.0)* intensity;
+        fogExponent = 1.0f;
+        fogDensity = 0.01f*intensity;
         fogEnd = 250/(0.01 + intensity);
+        farTransition = 150.0f - 100.0f*intensity;
     }
 
@@ -59 +63 @@
         particleSize = 0.02 + 0.03*intensity;
         numberOfParticles = intensity * 100000000;
-        particleColour = osg::Vec4(0.8, 0.8, 0.8, 1.0);
-        fogDensity = intensity;
-        fogEnd = 150/(0.01 + intensity);
+        particleColour = osg::Vec4(0.85f, 0.85f, 0.85f, 1.0f) -  osg::Vec4(0.1f, 0.1f, 0.1f, 1.0f)* intensity;
+        fogExponent = 1.0f;
+        fogDensity = 0.02f*intensity;
+        fogEnd = 150.0f/(0.01f + intensity);
+        farTransition = 150.0f - 100.0f*intensity;
     }
 
@@ -74 +80 @@
     float               nearTransition;
     float               farTransition;
+    float               fogExponent;
     float               fogDensity;
     float               fogEnd;
+    osg::Vec4           fogColour;
 };
 
@@ -89 +97 @@
     virtual bool cull(osg::NodeVisitor* nodeVisitor, osg::Drawable* drawable, osg::State* state) const
     {
-        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nodeVisitor);
-        if (cv)
-        {
-            float distance = nodeVisitor->getDistanceFromEyePoint(drawable->getBound().center(),true);
-
-//            if (distance<-4.0) return true;
-            
-#if 0
-            
-            const osg::BoundingBox& bb = drawable->getBound();
-            const osg::Polytope& frustum = cv->getCurrentCullingSet().getFrustum();
-            int numPointsInside = 0;
-            for(unsigned int i=0; i<8; ++i)
-            {
-                if (frustum.contains(bb.corner(i))) ++numPointsInside;
-            }
-        
-            std::cout<<" "<<drawable->getName()<<" distance "<<distance<<"num Points inside = "<<numPointsInside<<std::endl;
-
-            if (cv->isCulled(drawable->getBound()))
-            {
-                std::cout<<" isCulled "<<drawable->getName()<<std::endl;
-                return true;
-            }
-#endif
-
-        }
-    
         return false;
     }
@@ -144 +124 @@
         void setPosition(const osg::Vec3& position) { _position = position; }
         const osg::Vec3& getPosition() const { return _position; }
-
-        
+        
+        void setStartTime(float time) { _startTime = time; }
+        float getStartTime() const { return _startTime; }
+
+
         virtual void compileGLObjects(osg::State& state) const
         {
@@ -162 +145 @@
             if (!_internalGeometry) return;
             
+            const Extensions* extensions = getExtensions(state.getContextID(),true);
+
             glNormal3fv(_position.ptr());
+            extensions->glMultiTexCoord1f(GL_TEXTURE1, _startTime);
 
             _internalGeometry->draw(state);
@@ -215 +201 @@
 
         osg::Vec3                   _position;
+        float                       _startTime;
         osg::ref_ptr<osg::Geometry> _internalGeometry;
 
@@ -508 +495 @@
     osg::Vec3 dv_j( 0.0f, bb.yMax()-bb.yMin(), 0.0f );
     osg::Vec3 dv_k( velocity * period );
+
+    float startTime = random(0, period);
     
     // high res LOD.
@@ -519 +508 @@
         geometry->setName("highres");
         geometry->setPosition(position);
+        geometry->setStartTime(startTime);
         geometry->setInitialBound(bb);
         geometry->setInternalGeometry(quad_geometry.get());
@@ -537 +527 @@
         geometry->setName("lowres");
         geometry->setPosition(position);
+        geometry->setStartTime(startTime);
         geometry->setInitialBound(bb);
         geometry->setInternalGeometry(point_geometry.get());
@@ -606 +597 @@
 
     osg::Uniform* inversePeriodUniform = new osg::Uniform("inversePeriod",1.0f/period);
-    osg::Uniform* startTime = new osg::Uniform("startTime",0.0f);
+    //osg::Uniform* startTime = new osg::Uniform("startTime",0.0f);
 
     //stateset->addUniform(position_Uniform); // vec3
@@ -613 +604 @@
     stateset->addUniform(dv_k_Uniform); // vec3
     stateset->addUniform(inversePeriodUniform); // float
-    stateset->addUniform(startTime); // float
+    //stateset->addUniform(startTime); // float
 
     stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
@@ -657 +648 @@
         
         osg::Fog* fog = new osg::Fog;
-        fog->setMode(osg::Fog::LINEAR);
+        
+        if (parameters.fogExponent<1.0)
+        {
+            fog->setMode(osg::Fog::LINEAR);
+        }
+        else if (parameters.fogExponent<2.0)
+        {
+            fog->setMode(osg::Fog::EXP);
+        }
+        else
+        {
+            fog->setMode(osg::Fog::EXP2);
+        }
+        
         fog->setDensity(parameters.fogDensity);
         fog->setStart(0.0f);
         fog->setEnd(parameters.fogEnd);
-        fog->setColor(osg::Vec4(0.5f,0.5f,0.5f,1.0f));
+        fog->setColor(parameters.fogColour);
         stateset->setAttributeAndModes(fog, osg::StateAttribute::ON);
         
@@ -693 +697 @@
     arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
     arguments.getApplicationUsage()->addCommandLineOption("-h or --help","Display this information");
-    arguments.getApplicationUsage()->addCommandLineOption("--shader","Use GLSL shaders.");
-    arguments.getApplicationUsage()->addCommandLineOption("--fixed","Use fixed function pipeline.");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
+    arguments.getApplicationUsage()->addCommandLineOption("","");
     
 
@@ -713 +725 @@
 
     while (arguments.read("--particleSize", parameters.particleSize)) {}
+    while (arguments.read("--particleColor", parameters.particleColour.r(), parameters.particleColour.g(), parameters.particleColour.b(), parameters.particleColour.a())) {}
+    while (arguments.read("--particleColour", parameters.particleColour.r(), parameters.particleColour.g(), parameters.particleColour.b(), parameters.particleColour.a())) {}
 
     osg::Vec3 particleVelocity;
@@ -734 +748 @@
 
     while (arguments.read("--fogDensity", parameters.fogDensity )) {}
+    while (arguments.read("--fogExponent", parameters.fogExponent )) {}
     while (arguments.read("--fogEnd", parameters.fogEnd )) {}
+    while (arguments.read("--fogColor", parameters.fogColour.r(), parameters.fogColour.g(), parameters.fogColour.b(), parameters.fogColour.a())) {}
+    while (arguments.read("--fogColour", parameters.fogColour.r(), parameters.fogColour.g(), parameters.fogColour.b(), parameters.fogColour.a())) {}
  
     // if user request help write it out to cout.