Changeset 13041 for OpenSceneGraph/trunk/src/osgShadow/ViewDependentShadowMap.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgShadow/ViewDependentShadowMap.cpp (modified) (71 diffs)

OpenSceneGraph/trunk/src/osgShadow/ViewDependentShadowMap.cpp

@@ -177 +177 @@
     {
         OSG_INFO<<"Pushing custom Polytope"<<std::endl;
-        
+
         osg::CullingSet& cs = cv->getProjectionCullingStack().back();
 
@@ -200 +200 @@
 
     OSG_INFO<<"VDSM second : _renderStage = "<<_renderStage<<std::endl;
-    
+
     if (cv->getComputeNearFarMode() != osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
     {
@@ -256 +256 @@
     {
         setCullingMode(osg::CullSettings::VIEW_FRUSTUM_CULLING);
-        
+
         pushViewport(viewport);
         pushProjectionMatrix(new osg::RefMatrix(projectionMatrix));
         pushModelViewMatrix(new osg::RefMatrix(viewMatrix),osg::Transform::ABSOLUTE_RF);
     }
-    
+
     void apply(osg::Node& node)
     {
         if (isCulled(node)) return;
-        
+
         // push the culling mode.
         pushCurrentMask();
@@ -305 +305 @@
         return;
     }
-    
+
     void apply(osg::Transform& transform)
     {
@@ -324 +324 @@
             popModelViewMatrix();
         }
-        
+
         // pop the culling mode.
         popCurrentMask();
-        
+
     }
 
@@ -339 +339 @@
     {
         if (!bb.valid()) return;
-        
+
         const osg::Matrix& matrix = *getModelViewMatrix() * *getProjectionMatrix();
 
@@ -370 +370 @@
     osg::BoundingBox _bb;
 };
-    
+
 ///////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -432 +432 @@
 
     const ShadowSettings* settings = vdd->getViewDependentShadowMap()->getShadowedScene()->getShadowSettings();
-    
+
     bool debug = settings->getDebugDraw();
 
@@ -443 +443 @@
     osg::Vec2s textureSize = debug ? osg::Vec2s(512,512) : settings->getTextureSize();
     _texture->setTextureSize(textureSize.x(), textureSize.y());
-    
+
     if (debug)
     {
@@ -454 +454 @@
         _texture->setShadowTextureMode(osg::Texture2D::LUMINANCE);
     }
-    
+
     _texture->setFilter(osg::Texture2D::MIN_FILTER,osg::Texture2D::LINEAR);
     _texture->setFilter(osg::Texture2D::MAG_FILTER,osg::Texture2D::LINEAR);
@@ -463 +463 @@
     _texture->setBorderColor(osg::Vec4(1.0f,1.0f,1.0f,1.0f));
     //_texture->setBorderColor(osg::Vec4(0.0f,0.0f,0.0f,0.0f));
-    
+
     // set up the camera
     _camera = new osg::Camera;
@@ -477 +477 @@
     // switch off small feature culling as this can cull out geometry that will still be large enough once perspective correction takes effect.
     _camera->setCullingMode(_camera->getCullingMode() & ~osg::CullSettings::SMALL_FEATURE_CULLING);
-    
+
     // set viewport
     _camera->setViewport(0,0,textureSize.x(),textureSize.y());
@@ -498 +498 @@
         // clear the depth and colour bufferson each clear.
         _camera->setClearMask(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-        
+
         // set the camera to render before the main camera.
         _camera->setRenderOrder(osg::Camera::PRE_RENDER);
-        
+
         // tell the camera to use OpenGL frame buffer object where supported.
         _camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
@@ -508 +508 @@
         _camera->attach(osg::Camera::DEPTH_BUFFER, _texture.get());
         //_camera->attach(osg::Camera::COLOR_BUFFER, _texture.get());
-    }   
+    }
 }
 
@@ -542 +542 @@
         OSG_INFO<<"Projection matrix after clamping "<<projectionMatrix<<std::endl;
     }
-    
+
     corners[0].set(-1.0,-1.0,-1.0);
     corners[1].set(1.0,-1.0,-1.0);
@@ -696 +696 @@
 
     createShaders();
-    
+
     _dirty = false;
 }
@@ -752 +752 @@
 
     osg::RefMatrix& viewProjectionMatrix = *cv.getProjectionMatrix();
-    
+
     // check whether this main views projection is perspective or orthographic
     bool orthographicViewFrustum = viewProjectionMatrix(0,3)==0.0 &&
@@ -795 +795 @@
         cv.computeNearPlane();
     }
-    
+
     Frustum frustum(&cv, minZNear, maxZFar);
 
@@ -809 +809 @@
 
     ShadowSettings* settings = getShadowedScene()->getShadowSettings();
-    
+
     unsigned int pos_x = 0;
     unsigned int textureUnit = settings->getBaseShadowTextureUnit();
@@ -861 +861 @@
         {
             // osg::ElapsedTime timer;
-            
+
             osg::ref_ptr<osg::Viewport> viewport = new osg::Viewport(0,0,2048,2048);
             ComputeLightSpaceBounds clsb(viewport.get(), projectionMatrix, viewMatrix);
@@ -896 +896 @@
                 // OSG_NOTICE<<"  xMid="<<xMid<<", yMid="<<yMid<<", xRange="<<xRange<<", yRange="<<yRange<<std::endl;
 
-                projectionMatrix = 
+                projectionMatrix =
                     projectionMatrix *
                     osg::Matrixd::translate(osg::Vec3d(-xMid,-yMid,0.0)) *
                     osg::Matrixd::scale(osg::Vec3d(2.0/xRange, 2.0/yRange,1.0));
-                
+
             }
 
@@ -906 +906 @@
 
         double splitPoint = 0.0;
-        
+
         if (numShadowMapsPerLight>1)
         {
@@ -913 +913 @@
             osg::Vec3d viewdir_v = center_v-eye_v; viewdir_v.normalize();
             osg::Vec3d lightdir(0.0,0.0,-1.0);
-            
+
             double dotProduct_v = lightdir * viewdir_v;
             double angle = acosf(dotProduct_v);
 
             osg::Vec3d eye_ls = eye_v * projectionMatrix;
-            
+
             OSG_INFO<<"Angle between view vector and eye "<<osg::RadiansToDegrees(angle)<<std::endl;
             OSG_INFO<<"eye_ls="<<eye_ls<<std::endl;
@@ -979 +979 @@
             {
                 // compute the start and end range in non-dimensional coords
-#if 0                
+#if 0
                 double r_start = (sm_i==0) ? -1.0 : (double(sm_i)/double(numShadowMapsPerLight)*2.0-1.0);
                 double r_end = (sm_i+1==numShadowMapsPerLight) ? 1.0 : (double(sm_i+1)/double(numShadowMapsPerLight)*2.0-1.0);
@@ -1024 +1024 @@
                 local_polytope.setupMask();
 
-                
+
                 // OSG_NOTICE<<"Need to adjust RTT camera projection and view matrix here, r_start="<<r_start<<", r_end="<<r_end<<std::endl;
                 // OSG_NOTICE<<"  textureUnit = "<<textureUnit<<std::endl;
@@ -1037 +1037 @@
                     osg::Matrixd::translate(osg::Vec3d(0.0,-mid_r,0.0)) *
                     osg::Matrixd::scale(osg::Vec3d(1.0,2.0/range_r,1.0)));
-                
+
             }
 
@@ -1071 +1071 @@
             // pass on shadow data to ShadowDataList
             sd->_textureUnit = textureUnit;
-            
+
             if (textureUnit >= 8)
             {
@@ -1080 +1080 @@
                 sdl.push_back(sd);
             }
-            
+
             // increment counters.
             ++textureUnit;
@@ -1089 +1089 @@
     if (numValidShadows>0)
     {
-        decoratorStateGraph->setStateSet(selectStateSetForRenderingShadow(*vdd));        
-    }
-   
+        decoratorStateGraph->setStateSet(selectStateSetForRenderingShadow(*vdd));
+    }
+
     // OSG_NOTICE<<"End of shadow setup Projection matrix "<<*cv.getProjectionMatrix()<<std::endl;
 }
@@ -1100 +1100 @@
 
     LightDataList& pll = vdd->getLightDataList();
-    
+
     LightDataList previous_ldl;
     previous_ldl.swap(pll);
@@ -1110 +1110 @@
 
     osg::Matrixd modelViewMatrix = *(cv->getModelViewMatrix());
-    
+
     osgUtil::PositionalStateContainer::AttrMatrixList& aml =
         rs->getPositionalStateContainer()->getAttrMatrixList();
@@ -1116 +1116 @@
 
     const ShadowSettings* settings = getShadowedScene()->getShadowSettings();
-        
+
     for(osgUtil::PositionalStateContainer::AttrMatrixList::reverse_iterator itr = aml.rbegin();
         itr != aml.rend();
@@ -1126 +1126 @@
             // is LightNum matched to that defined in settings
             if (settings && settings->getLightNum()>=0 && light->getLightNum()!=settings->getLightNum()) continue;
-            
+
             LightDataList::iterator pll_itr = pll.begin();
             for(; pll_itr != pll.end(); ++pll_itr)
@@ -1143 +1143 @@
             {
                 OSG_INFO<<"Light num "<<light->getLightNum()<<" already used, ignore light"<<std::endl;
-            }            
-        }
-    }
-    
+            }
+        }
+    }
+
     return !pll.empty();
 }
@@ -1159 +1159 @@
 
     ShadowSettings* settings = getShadowedScene()->getShadowSettings();
-    
+
     if (!settings->getDebugDraw())
     {
@@ -1178 +1178 @@
         _shadowCastingStateSet->setMode( GL_CULL_FACE, osg::StateAttribute::OFF );
     }
-    
+
 #if 1
     float factor = 1.1;
@@ -1190 +1190 @@
     _shadowCastingStateSet->setMode(GL_POLYGON_OFFSET_FILL, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
-    
+
     _uniforms.clear();
     osg::ref_ptr<osg::Uniform> baseTextureSampler = new osg::Uniform("baseTexture",(int)_baseTextureUnit);
@@ -1236 +1236 @@
                 _program->addShader(new osg::Shader(osg::Shader::FRAGMENT, fragmentShaderSource_withBaseTexture));
             }
-            
+
             break;
         }
@@ -1387 +1387 @@
 
     const ShadowSettings* settings = getShadowedScene()->getShadowSettings();
-    
+
     double dotProduct_v = positionedLight.lightDir * frustum.frustumCenterLine;
     double gamma_v = acos(dotProduct_v);
@@ -1411 +1411 @@
 #endif
 
-    
+
     if (positionedLight.directionalLight)
     {
@@ -1484 +1484 @@
 
             OSG_INFO<<"   cornerInLightCoords= "<<cornerInLightCoords<<std::endl;
-            
+
             zMax = osg::maximum( zMax, cornerInLightCoords.z());
         }
@@ -1572 +1572 @@
         _edges.push_back( Edge(frustum.corners[3],frustum.corners[7]) );
     }
-    
+
     void transform(const osg::Matrixd& m)
     {
@@ -1583 +1583 @@
         }
     }
-    
-    void clip(const osg::Plane& plane)    
+
+    void clip(const osg::Plane& plane)
     {
         Vertices intersections;
-        
+
         // OSG_NOTICE<<"clip("<<plane<<") edges.size()="<<_edges.size()<<std::endl;
         for(Edges::iterator itr = _edges.begin();
@@ -1624 +1624 @@
                     v1 = intersection;
                 }
-                
+
                 ++itr;
             }
@@ -1640 +1640 @@
             return;
         }
-        
+
         if (intersections.size() == 3)
         {
@@ -1658 +1658 @@
         osg::Vec3d side = (side_x.length2()>=side_y.length2()) ? side_x : side_y;
         side.normalize();
-        
+
         osg::Vec3d up = side ^ normal;
         up.normalize();
@@ -1671 +1671 @@
 
         center /= double(intersections.size());
-                
+
         typedef std::map<double, osg::Vec3d> VertexMap;
         VertexMap vertexMap;
@@ -1694 +1694 @@
             previous_v = itr->second;
         }
-        
+
         // OSG_NOTICE<<"  after clip("<<plane<<") edges.size()="<<_edges.size()<<std::endl;
     }
-    
+
     void clip(const osg::Polytope& polytope)
     {
@@ -1722 +1722 @@
         return m;
     }
-    
+
     double max(unsigned int index) const
     {
@@ -1835 +1835 @@
         n = nr;
     }
-    
+
     void operator() (const osgUtil::RenderLeaf* renderLeaf)
     {
         ++numRenderLeaf;
-        
+
         if (renderLeaf->_modelview.get()!=previous_modelview)
         {
@@ -1906 +1906 @@
             if (z_ratio>max_z_ratio) max_z_ratio = z_ratio;
         }
-        
+
         // clip to the light space
         if (ls.x()<clip_min_x) ls.x()=clip_min_x;
@@ -1934 +1934 @@
     osg::Vec3d          eye_ls;
     double              n;
-    
+
     osg::Matrixd        light_mvp;
     osg::RefMatrix*     previous_modelview;
@@ -1945 +1945 @@
     double clip_min_x_ratio, clip_max_x_ratio;
     double clip_min_z_ratio, clip_max_z_ratio;
-    
+
     double min_x_ratio, max_x_ratio;
     double min_z_ratio, max_z_ratio;
@@ -1977 +1977 @@
     //OSG_NOTICE<<"light_v="<<light_v<<std::endl;
     //OSG_NOTICE<<"light_p="<<light_p<<std::endl;
-    
+
     ConvexHull convexHull;
     convexHull.setToFrustum(frustum);
-    
+
 #if 0
     OSG_NOTICE<<"ws ConvexHull xMin="<<convexHull.min(0)<<", xMax="<<convexHull.max(0)<<std::endl;
     OSG_NOTICE<<"ws ConvexHull yMin="<<convexHull.min(1)<<", yMax="<<convexHull.max(1)<<std::endl;
     OSG_NOTICE<<"ws ConvexHull zMin="<<convexHull.min(2)<<", zMax="<<convexHull.max(2)<<std::endl;
-    
+
     convexHull.output(osg::notify(osg::NOTICE));
 #endif
-    
+
     convexHull.transform(light_vp);
 
@@ -2042 +2042 @@
         convexHull.clip(osg::Plane(1.0,0.0,0.0,widest_x));
         convexHull.clip(osg::Plane(-1.0,0.0,0.0,widest_x));
-#endif        
+#endif
 #if 1
         convexHull.clip(osg::Plane(0.0,1.0,0.0,-rli.min_y));
@@ -2057 +2057 @@
 #endif
 
-#if 0        
+#if 0
         OSG_NOTICE<<"widest_x = "<<widest_x<<std::endl;
         OSG_NOTICE<<"widest_y = "<<widest_y<<std::endl;
@@ -2097 +2097 @@
     OSG_NOTICE<<"zMin = "<<zMin<<", \tzMax = "<<zMax<<std::endl;
 #endif
-    
+
 #if 1
     // we always want the lightspace to include the computed near plane.
@@ -2108 +2108 @@
                                     -0.5*(yMax+yMin),
                                     -0.5*(zMax+zMin)));
-        
+
         m.postMultScale(osg::Vec3d(2.0/(xMax-xMin),
                                    2.0/(yMax-yMin),
@@ -2125 +2125 @@
 
 #endif
-    
+
     osg::Vec3d eye_v = frustum.eye * light_v;
     //osg::Vec3d centerNearPlane_v = frustum.centerNearPlane * light_v;
@@ -2142 +2142 @@
     //OSG_NOTICE<<"eye_v="<<eye_v<<std::endl;
     //OSG_NOTICE<<"viewdir_v="<<viewdir_v<<std::endl;
-    
+
     osg::Vec3d eye_ls = frustum.eye * light_vp;
 #if 0
@@ -2151 +2151 @@
     }
 #endif
-    
+
     //osg::Vec3d centerNearPlane_ls = frustum.centerNearPlane * light_vp;
     //osg::Vec3d centerFarPlane_ls = frustum.centerFarPlane * light_vp;
@@ -2159 +2159 @@
     osg::Vec3d side = lightdir ^ viewdir_ls; side.normalize();
     osg::Vec3d up = side ^ lightdir;
-    
+
     double d = 2.0;
 
@@ -2179 +2179 @@
 
     //n = z_n;
-    
+
     double f = n+d;
 
@@ -2212 +2212 @@
     OSG_NOTICE<<"convexHull max_z_ratio = "<<max_z_ratio<<std::endl;
 #endif
-    
+
     #if 1
     if (renderStage)
@@ -2228 +2228 @@
             return false;
         }
-        
+
 #if 0
         OSG_NOTICE<<"Time for RenderLeafTraverser "<<timer.elapsedTime_m()<<"ms, number of render leaves "<<rli.numRenderLeaf<<std::endl;
@@ -2258 +2258 @@
 
     //best_z_ratio *= 10.0;
-    
+
     osg::Matrixd lightPerspective( 1.0/best_x_ratio,  0.0, 0.0,  0.0,
                                    0.0,  a,   0.0,  1.0,
@@ -2303 +2303 @@
     OSG_INFO<<"cullShadowReceivingScene()"<<std::endl;
 
-#if 0    
+#if 0
     // record the traversal mask on entry so we can reapply it later.
     unsigned int traversalMask = cv->getTraversalMask();
@@ -2322 +2322 @@
 {
     OSG_INFO<<"cullShadowCastingScene()"<<std::endl;
-    
+
     // record the traversal mask on entry so we can reapply it later.
     unsigned int traversalMask = cv->getTraversalMask();
@@ -2340 +2340 @@
 
     osg::ref_ptr<osg::StateSet> stateset = vdd.getStateSet();
-    
+
     vdd.getStateSet()->clear();
-    
+
     vdd.getStateSet()->setTextureAttributeAndModes(0, _fallbackBaseTexture.get(), osg::StateAttribute::ON);
 
@@ -2403 +2403 @@
         stateset->setTextureMode(sd._textureUnit,GL_TEXTURE_GEN_T,osg::StateAttribute::ON);
         stateset->setTextureMode(sd._textureUnit,GL_TEXTURE_GEN_R,osg::StateAttribute::ON);
-        stateset->setTextureMode(sd._textureUnit,GL_TEXTURE_GEN_Q,osg::StateAttribute::ON);       
+        stateset->setTextureMode(sd._textureUnit,GL_TEXTURE_GEN_Q,osg::StateAttribute::ON);
     }
 
@@ -2411 +2411 @@
 void ViewDependentShadowMap::resizeGLObjectBuffers(unsigned int maxSize)
 {
-    // the way that ViewDependentData is mapped shouldn't 
+    // the way that ViewDependentData is mapped shouldn't
 }