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

Timestamp:

04/19/06 15:04:21 (7 years ago)

Author:

robert

Message:

Convertered shaders across to using modelview matrix instead of uniforms.

Files:

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

OpenSceneGraph/trunk/examples/osgprecipitation/osgprecipitation.cpp

@@ -46 +46 @@
         fogEnd(1000.0),
         fogColour(0.5, 0.5, 0.5, 1.0),
-        clearColour(0.5, 0.5, 0.5, 1.0)
+        clearColour(0.5, 0.5, 0.5, 1.0),
+        useFarLineSegments(false)
     {
         rain(0.5);
@@ -65 +66 @@
         fogColour.set(0.5, 0.5, 0.5, 1.0);
         clearColour.set(0.5, 0.5, 0.5, 1.0);
+        useFarLineSegments = false;
     }
 
@@ -81 +83 @@
         fogColour.set(0.6, 0.6, 0.6, 1.0);
         clearColour.set(0.6, 0.6, 0.6, 1.0);
+        useFarLineSegments = false;
     }
 
@@ -98 +101 @@
     osg::Vec4           fogColour;
     osg::Vec4           clearColour;
+    bool                useFarLineSegments;
 };
 
@@ -139 +143 @@
         void setPosition(const osg::Vec3& position) { _position = position; }
         const osg::Vec3& getPosition() const { return _position; }
+        
+        void setScale(const osg::Vec3& scale) { _scale = scale; }
+        const osg::Vec3& getScale() const { return _scale; }
         
         void setStartTime(float time) { _startTime = time; }
@@ -164 +171 @@
             glNormal3fv(_position.ptr());
             extensions->glMultiTexCoord1f(GL_TEXTURE0+1, _startTime);
-
+            
+            glPushMatrix();
+            
+            osg::Matrix modelview = state.getModelViewMatrix();
+            modelview.preMult(osg::Matrix::translate(_position));
+            modelview.preMult(osg::Matrix::scale(_scale));
+            
+            bool isPoint = (_internalGeometry->getName()=="point");
+            
+            glLoadMatrix(modelview.ptr());
+            
+            if (!isPoint)
+            {
+                state.setActiveTextureUnit(0);
+                glMatrixMode( GL_TEXTURE );
+
+                glPushMatrix();
+
+                glLoadMatrix(_previousModelView.ptr());
+
+                _previousModelView = modelview;
+            }
+#if 0            
+            else
+            {
+                state.setActiveTextureUnit(0);
+                glMatrixMode( GL_TEXTURE );
+
+                glPushMatrix();
+
+                glLoadIdentity();
+
+                _previousModelView = modelview;
+            }      
+#endif                        
             _internalGeometry->draw(state);
             
@@ -206 +247 @@
                 s_NumberPointsVertices+= _internalGeometry->getVertexArray()->getNumElements();
             }
+        
+            if (!isPoint)
+            {
+                glPopMatrix();
+                glMatrixMode( GL_MODELVIEW );
+            }
+            
+            glPopMatrix();
         }
 
@@ -216 +265 @@
 
         osg::Vec3                   _position;
+        osg::Vec3                   _scale;
         float                       _startTime;
         osg::ref_ptr<osg::Geometry> _internalGeometry;
+        mutable osg::Matrix                 _previousModelView;
 
 };
@@ -452 +503 @@
 #ifdef USE_LOCAL_SHADERS
         char vertexShaderSource[] = 
-            "uniform vec3 dv_i;\n"
-            "uniform vec3 dv_j;\n"
-            "uniform vec3 dv_k;\n"
-            "\n"
             "uniform float inversePeriod;\n"
             "uniform vec4 particleColour;\n"
@@ -462 +509 @@
             "uniform float osg_FrameTime;\n"
             "uniform float osg_DeltaFrameTime;\n"
-            "uniform mat4 previousModelViewMatrix;\n"
             "\n"
             "varying vec4 colour;\n"
@@ -469 +515 @@
             "void main(void)\n"
             "{\n"
-            "    vec3 pos = gl_Normal.xyz + (gl_Vertex.x*dv_i) + (dv_j * gl_Vertex.y);\n"
-            "    \n"
             "    float offset = gl_Vertex.z;\n"
+            "    float startTime = gl_MultiTexCoord1.x;\n"
             "    texCoord = gl_MultiTexCoord0.xy;\n"
-            "    float startTime = gl_MultiTexCoord1.x;\n"
-            "\n"
-            "    vec3 v_previous = pos + dv_k * fract( (osg_FrameTime - startTime)*inversePeriod - offset);\n"
-            "    vec3 v_current = v_previous + dv_k * (osg_DeltaFrameTime*inversePeriod);\n"
-            "    \n"
+            "\n"
+            "    vec4 v_previous = gl_Vertex;\n"
+            "    v_previous.z = fract( (osg_FrameTime - startTime)*inversePeriod - offset);\n"
+            "    \n"
+            "    vec4 v_current =  v_previous;\n"
+            "    v_current.z += (osg_DeltaFrameTime*inversePeriod);\n"
+            "    \n"
+            "\n"
             "    colour = particleColour;\n"
             "    \n"
-            "    vec4 v1 = gl_ModelViewMatrix * vec4(v_current,1.0);\n"
-            "    vec4 v2 = previousModelViewMatrix * vec4(v_previous,1.0);\n"
+            "    vec4 v1 = gl_ModelViewMatrix * v_current;\n"
+            "    vec4 v2 = gl_TextureMatrix[0] * v_previous;\n"
             "    \n"
             "    vec3 dv = v2.xyz - v1.xyz;\n"
@@ -531 +579 @@
 #ifdef USE_LOCAL_SHADERS
         char vertexShaderSource[] = 
-            "uniform vec3 dv_i;\n"
-            "uniform vec3 dv_j;\n"
-            "uniform vec3 dv_k;\n"
-            "\n"
             "uniform float inversePeriod;\n"
             "uniform vec4 particleColour;\n"
@@ -548 +592 @@
             "void main(void)\n"
             "{\n"
-            "    vec3 pos = gl_Normal.xyz + (gl_Vertex.x*dv_i) + (dv_j * gl_Vertex.y);\n"
-            "    \n"
-            "\n"
             "    float offset = gl_Vertex.z;\n"
+            "    float startTime = gl_MultiTexCoord1.x;\n"
             "    texCoord = gl_MultiTexCoord0.xy;\n"
-            "    float startTime = gl_MultiTexCoord1.x;\n"
-            "\n"
-            "    vec3 v_previous = pos + dv_k * fract( (osg_FrameTime - startTime)*inversePeriod - offset);\n"
-            "    vec3 v_current = v_previous + dv_k * (osg_DeltaFrameTime*inversePeriod);\n"
+            "\n"
+            "    vec4 v_previous = gl_Vertex;\n"
+            "    v_previous.z = fract( (osg_FrameTime - startTime)*inversePeriod - offset);\n"
+            "    \n"
+            "    vec4 v_current =  v_previous;\n"
+            "    v_current.z += (osg_DeltaFrameTime*inversePeriod);\n"
             "    \n"
             "    colour = particleColour;\n"
             "    \n"
-            "    vec4 v1 = gl_ModelViewMatrix * vec4(v_current,1.0);\n"
-            "    vec4 v2 = previousModelViewMatrix * vec4(v_previous,1.0);\n"
+            "    vec4 v1 = gl_ModelViewMatrix * v_current;\n"
+            "    vec4 v2 = gl_TextureMatrix[0] * v_previous;\n"
             "    \n"
             "    vec3 dv = v2.xyz - v1.xyz;\n"
@@ -569 +613 @@
             "    \n"
             "    float area = length(dv.xy);\n"
-            "    colour.a = 0.1+(particleSize)/area;\n"
+            "    colour.a = (particleSize)/area;\n"
             "    \n"
             "    v1.xyz += dv*texCoord.y;\n"
             "    \n"
             "    gl_Position = gl_ProjectionMatrix * v1;\n"
-            "}";
+            "}\n";
 
         char fragmentShaderSource[] = 
@@ -607 +651 @@
 #ifdef USE_LOCAL_SHADERS
         char vertexShaderSource[] = 
-            "uniform vec3 dv_i;\n"
-            "uniform vec3 dv_j;\n"
-            "uniform vec3 dv_k;\n"
-            "\n"
             "uniform float inversePeriod;\n"
             "uniform vec4 particleColour;\n"
@@ -618 +658 @@
             "\n"
             "varying vec4 colour;\n"
-            "varying vec2 texCoord;\n"
             "\n"
             "void main(void)\n"
             "{\n"
-            "    vec3 pos = gl_Normal.xyz + (gl_Vertex.x*dv_i) + (dv_j * gl_Vertex.y);\n"
-            "    texCoord = gl_MultiTexCoord0.xy;\n"
-            "\n"
+            "    float offset = gl_Vertex.z;\n"
             "    float startTime = gl_MultiTexCoord1.x;\n"
             "\n"
-            "    vec3 v_current = pos + dv_k * fract( (osg_FrameTime - startTime)*inversePeriod - gl_Vertex.z);\n"
+            "    vec4 v_current = gl_Vertex;\n"
+            "    v_current.z = fract( (osg_FrameTime - startTime)*inversePeriod - offset);\n"
             "   \n"
             "    colour = particleColour;\n"
             "\n"
-            "    gl_Position = gl_ModelViewProjectionMatrix * vec4(v_current,1.0);\n"
+            "    gl_Position = gl_ModelViewProjectionMatrix * v_current;\n"
             "\n"
             "    float pointSize = abs(1280.0*particleSize / gl_Position.w);\n"
+            "\n"
             "    //gl_PointSize = max(ceil(pointSize),2);\n"
             "    gl_PointSize = ceil(pointSize);\n"
@@ -642 +681 @@
         char fragmentShaderSource[] = 
             "uniform sampler2D baseTexture;\n"
-            "varying vec2 texCoord;\n"
             "varying vec4 colour;\n"
             "\n"
             "void main (void)\n"
             "{\n"
-            "    gl_FragColor = colour * texture2D( baseTexture, texCoord);\n"
+            "    gl_FragColor = colour * texture2D( baseTexture, gl_TexCoord[0]);\n"
             "}\n";
 
@@ -655 +693 @@
         // get shaders from source
         program->addShader(osg::Shader::readShaderFile(osg::Shader::VERTEX, osgDB::findDataFile("point_rain.vert")));
-        program->addShader(osg::Shader::readShaderFile(osg::Shader::FRAGMENT, osgDB::findDataFile("rain.frag")));
+        program->addShader(osg::Shader::readShaderFile(osg::Shader::FRAGMENT, osgDB::findDataFile("point_rain.frag")));
 #endif
 
@@ -671 +709 @@
 
 
-osg::Node* createRainEffect(const osg::BoundingBox& bb, const osg::Vec3& velocity, float nearTransition, float farTransition)
+osg::Node* createRainEffect(const osg::BoundingBox& bb, const PrecipatationParameters& parameters)
 {
     osg::LOD* lod = new osg::LOD;
@@ -680 +718 @@
 
     // time taken to get from start to the end of cycle
-    float period = fabs((bb.zMax()-bb.zMin()) / velocity.z());
+    float period = fabs((bb.zMax()-bb.zMin()) / parameters.particleVelocity.z());
     osg::Vec3 dv_i( bb.xMax()-bb.xMin(), 0.0f, 0.0f );
     osg::Vec3 dv_j( 0.0f, bb.yMax()-bb.yMin(), 0.0f );
-    osg::Vec3 dv_k( velocity * period );
+    osg::Vec3 dv_k( parameters.particleVelocity * period );
+
+    osg::Vec3 scale( bb.xMax()-bb.xMin(), bb.yMax()-bb.yMin(), parameters.particleVelocity.z() * period);
 
     float startTime = random(0, period);
@@ -697 +737 @@
         geometry->setName("highres");
         geometry->setPosition(position);
+        geometry->setScale(scale);
         geometry->setStartTime(startTime);
         geometry->setInitialBound(bb);
@@ -702 +743 @@
         geometry->setStateSet(quad_stateset.get());
         
-        lod->addChild( highres_geode, 0.0f, nearTransition );
-    }
-    
-    // low res LOD
+        lod->addChild( highres_geode, 0.0f, parameters.nearTransition );
+    }
+
+
+    if (parameters.useFarLineSegments)
     {
         osg::Geode* lowres_geode = new osg::Geode;
@@ -716 +758 @@
         geometry->setName("lowres");
         geometry->setPosition(position);
+        geometry->setScale(scale);
+        geometry->setStartTime(startTime);
+        geometry->setInitialBound(bb);
+        geometry->setInternalGeometry(line_geometry.get());
+        geometry->setStateSet(line_stateset.get());
+        
+        lod->addChild( lowres_geode, parameters.nearTransition, parameters.farTransition );
+    }
+    else
+    {
+        osg::Geode* lowres_geode = new osg::Geode;
+
+
+        PrecipitationGeometry* geometry = new PrecipitationGeometry;
+
+        lowres_geode->addDrawable(geometry);
+
+        geometry->setName("lowres");
+        geometry->setPosition(position);
+        geometry->setScale(scale);
         geometry->setStartTime(startTime);
         geometry->setInitialBound(bb);
@@ -721 +783 @@
         geometry->setStateSet(point_stateset.get());
         
-        lod->addChild( lowres_geode, nearTransition, farTransition );
+        lod->addChild( lowres_geode, parameters.nearTransition, parameters.farTransition );
     }
 
@@ -759 +821 @@
                                      bb.zMax());
 
-            group->addChild(createRainEffect(bbLocal, parameters.particleVelocity, parameters.nearTransition, parameters.farTransition));
+            group->addChild(createRainEffect(bbLocal, parameters));
         }        
     }
@@ -779 +841 @@
     osg::Vec3 dv_k( parameters.particleVelocity * period );
 
-    // set up uniforms
-    // osg::Uniform* position_Uniform = new osg::Uniform("position",position);
-    osg::Uniform* dv_i_Uniform = new osg::Uniform("dv_i",dv_i);
-    osg::Uniform* dv_j_Uniform = new osg::Uniform("dv_j",dv_j);
-    osg::Uniform* dv_k_Uniform = new osg::Uniform("dv_k",dv_k);
 
     osg::Uniform* inversePeriodUniform = new osg::Uniform("inversePeriod",1.0f/period);
     //osg::Uniform* startTime = new osg::Uniform("startTime",0.0f);
 
-    //stateset->addUniform(position_Uniform); // vec3
-    stateset->addUniform(dv_i_Uniform); // vec3 could be float 
-    stateset->addUniform(dv_j_Uniform); // vec3 could be float
-    stateset->addUniform(dv_k_Uniform); // vec3
     stateset->addUniform(inversePeriodUniform); // float
     //stateset->addUniform(startTime); // float
@@ -807 +860 @@
     stateset->addUniform(new osg::Uniform("particleSize", parameters.particleSize));
   
-    osg::Uniform* previousModelViewUniform = new osg::Uniform("previousModelViewMatrix",osg::Matrix());
-    stateset->addUniform(previousModelViewUniform);
-    
-    group->setCullCallback(new CullCallback(previousModelViewUniform));
+    // osg::Uniform* previousModelViewUniform = new osg::Uniform("previousModelViewMatrix",osg::Matrix());
+    // stateset->addUniform(previousModelViewUniform);
+    
+    // group->setCullCallback(new CullCallback(previousModelViewUniform));
 
 
@@ -940 +993 @@
     while (arguments.read("--fogColour", parameters.fogColour.r(), parameters.fogColour.g(), parameters.fogColour.b(), parameters.fogColour.a())) {}
  
+    while (arguments.read("--useFarLineSegments")) { parameters.useFarLineSegments = true; }
 
     viewer.setClearColor(parameters.clearColour);