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

Timestamp:

04/17/06 21:10:06 (7 years ago)

Author:

robert

Message:

Standardised the bin number of the particle effects

Files:

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

OpenSceneGraph/trunk/examples/osgprecipitation/osgprecipitation.cpp

@@ -25 +25 @@
 #include <osg/PointSprite>
 #include <osg/io_utils>
+
+#define USE_LOCAL_SHADERS 1
 
 float random(float min,float max) { return min + (max-min)*(float)rand()/(float)RAND_MAX; }
@@ -437 +439 @@
 void setUpGeometries(unsigned int numParticles)
 {
+    unsigned int renderBin = 11;
+
     {
         quad_geometry = new osg::Geometry;
@@ -444 +448 @@
         osg::Program* program = new osg::Program;
         quad_stateset->setAttribute(program);
-        quad_stateset->setRenderBinDetails(13,"DepthSortedBin");
-
-#if 1
+        quad_stateset->setRenderBinDetails(renderBin,"DepthSortedBin");
+
+#ifdef USE_LOCAL_SHADERS
         char vertexShaderSource[] = 
             "uniform vec3 dv_i;\n"
@@ -523 +527 @@
         osg::Program* program = new osg::Program;
         line_stateset->setAttribute(program);
-        line_stateset->setRenderBinDetails(12,"DepthSortedBin");
-
-#if 1
+        line_stateset->setRenderBinDetails(renderBin,"DepthSortedBin");
+
+#ifdef USE_LOCAL_SHADERS
         char vertexShaderSource[] = 
             "uniform vec3 dv_i;\n"
@@ -601 +605 @@
         point_stateset->setAttribute(program);
 
-#if 1
+#ifdef USE_LOCAL_SHADERS
         char vertexShaderSource[] = 
             "uniform vec3 dv_i;\n"
@@ -629 +633 @@
             "    gl_Position = gl_ModelViewProjectionMatrix * vec4(v_current,1.0);\n"
             "\n"
-            "    //float pointSize = min(abs(1280*particleSize / gl_Position.w), 20.0);\n"
-            "    float pointSize = abs(1280*particleSize / gl_Position.w);\n"
+            "    float pointSize = abs(1280.0*particleSize / gl_Position.w);\n"
             "    //gl_PointSize = max(ceil(pointSize),2);\n"
             "    gl_PointSize = ceil(pointSize);\n"
@@ -660 +663 @@
 
         point_stateset->setMode(GL_VERTEX_PROGRAM_POINT_SIZE, osg::StateAttribute::ON);
-        point_stateset->setRenderBinDetails(11,"DepthSortedBin");
+        point_stateset->setRenderBinDetails(renderBin,"DepthSortedBin");
     }