[Opensg-commits] OpenSG/Source/Experimental/ShadowViewport OSGDitherShadowMap.cpp, 1.44, 1.45 OSGPCFShadowMap.cpp, 1.59, 1.60 OSGPCSSShadowMap.cpp, 1.38, 1.39 OSGPerspectiveShadowMap.cpp, 1.47, 1.48 OSGShadowViewport.cpp, 1.43, 1.44 OSGStdShadowMap.cpp, 1.45, 1.46 OSGVarianceShadowMap.cpp, 1.29, 1.30

[Carsten N. <car...@us...>]

Update of /cvsroot/opensg/OpenSG/Source/Experimental/ShadowViewport
In directory vz-cvs-4.sog:/tmp/cvs-serv28454/Source/Experimental/ShadowViewport

Modified Files:
	OSGDitherShadowMap.cpp OSGPCFShadowMap.cpp 
	OSGPCSSShadowMap.cpp OSGPerspectiveShadowMap.cpp 
	OSGShadowViewport.cpp OSGStdShadowMap.cpp 
	OSGVarianceShadowMap.cpp 
Log Message:
fixed: use GL_LIGHTING_BIT in glPushAttrib to save/restore global ambient

       Bug reported by Michael Raab, thanks!


Index: OSGShadowViewport.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/Experimental/ShadowViewport/OSGShadowViewport.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** OSGShadowViewport.cpp	12 Dec 2011 23:49:52 -0000	1.43
--- OSGShadowViewport.cpp	1 Feb 2012 20:28:03 -0000	1.44
***************
*** 369,382 ****
          _lights.clear();
          for(UInt32 i = 0;i < getMFLightNodes()->getSize();++i) 
! 		{
! 			LightPtr lPtr = LightPtr::dcast(getLightNodes(i)->getCore());
! 			if (lPtr != NullFC) {
! 				_lights.push_back(std::make_pair(getLightNodes(i), lPtr));
! 			}
! 			else {
! 				FFATAL(("ShadowViewport::changed - LightPtr is NullFC / %s\n",
! 						getLightNodes(i)->getCore()->getTypeName()));
! 			}
! 		}
      }
  
--- 369,382 ----
          _lights.clear();
          for(UInt32 i = 0;i < getMFLightNodes()->getSize();++i) 
!         {
!             LightPtr lPtr = LightPtr::dcast(getLightNodes(i)->getCore());
!             if (lPtr != NullFC) {
!                 _lights.push_back(std::make_pair(getLightNodes(i), lPtr));
!             }
!             else {
!                 FFATAL(("ShadowViewport::changed - LightPtr is NullFC / %s\n",
!                         getLightNodes(i)->getCore()->getTypeName()));
!             }
!         }
      }
  
***************
*** 923,927 ****
                          bb[5] = Pnt3f(sceneMax[0], sceneMin[1], sceneMax[2]);
                          bb[6] = Pnt3f(sceneMax[0], sceneMax[1], sceneMax[2]);
!                         bb[7] = Pnt3f(sceneMin[0], sceneMax[1], sceneMax[2]);	
  
                          PLangle = deg2rad(0);
--- 923,927 ----
                          bb[5] = Pnt3f(sceneMax[0], sceneMin[1], sceneMax[2]);
                          bb[6] = Pnt3f(sceneMax[0], sceneMax[1], sceneMax[2]);
!                         bb[7] = Pnt3f(sceneMin[0], sceneMax[1], sceneMax[2]);   
  
                          PLangle = deg2rad(0);
***************
*** 955,959 ****
                              }
                          }
! 	
                          if(rad2deg(PLangle) < 120) //Use one Side only
                          {
--- 955,959 ----
                              }
                          }
!     
                          if(rad2deg(PLangle) < 120) //Use one Side only
                          {

Index: OSGVarianceShadowMap.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/Experimental/ShadowViewport/OSGVarianceShadowMap.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** OSGVarianceShadowMap.cpp	12 Dec 2011 23:49:52 -0000	1.29
--- OSGVarianceShadowMap.cpp	1 Feb 2012 20:28:03 -0000	1.30
***************
*** 1371,1375 ****
      else
      {
!         glPushAttrib(GL_ENABLE_BIT);
  
          if(!_initTexturesDone)
--- 1371,1375 ----
      else
      {
!         glPushAttrib(GL_ENABLE_BIT | GL_LIGHTING_BIT);
  
          if(!_initTexturesDone)

Index: OSGStdShadowMap.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/Experimental/ShadowViewport/OSGStdShadowMap.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** OSGStdShadowMap.cpp	12 Dec 2011 23:49:52 -0000	1.45
--- OSGStdShadowMap.cpp	1 Feb 2012 20:28:03 -0000	1.46
***************
*** 3778,3782 ****
      else
      {
!         glPushAttrib(GL_ENABLE_BIT);
  
          if(!_initTexturesDone)
--- 3778,3782 ----
      else
      {
!         glPushAttrib(GL_ENABLE_BIT | GL_LIGHTING_BIT);
  
          if(!_initTexturesDone)

Index: OSGPCSSShadowMap.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/Experimental/ShadowViewport/OSGPCSSShadowMap.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** OSGPCSSShadowMap.cpp	12 Dec 2011 23:49:52 -0000	1.38
--- OSGPCSSShadowMap.cpp	1 Feb 2012 20:28:03 -0000	1.39
***************
*** 1269,1273 ****
      else
      {
!         glPushAttrib(GL_ENABLE_BIT);
  
          if(!_initTexturesDone)
--- 1269,1273 ----
      else
      {
!         glPushAttrib(GL_ENABLE_BIT | GL_LIGHTING_BIT);
  
          if(!_initTexturesDone)

Index: OSGPerspectiveShadowMap.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/Experimental/ShadowViewport/OSGPerspectiveShadowMap.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** OSGPerspectiveShadowMap.cpp	12 Dec 2011 23:49:52 -0000	1.47
--- OSGPerspectiveShadowMap.cpp	1 Feb 2012 20:28:03 -0000	1.48
***************
*** 4242,4246 ****
      {
  
!         glPushAttrib(GL_ENABLE_BIT);
  
          if(!_initTexturesDone)
--- 4242,4246 ----
      {
  
!         glPushAttrib(GL_ENABLE_BIT | GL_LIGHTING_BIT);
  
          if(!_initTexturesDone)

Index: OSGPCFShadowMap.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/Experimental/ShadowViewport/OSGPCFShadowMap.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** OSGPCFShadowMap.cpp	12 Dec 2011 23:49:52 -0000	1.59
--- OSGPCFShadowMap.cpp	1 Feb 2012 20:28:03 -0000	1.60
***************
*** 4915,4919 ****
      else
      {
!         glPushAttrib(GL_ENABLE_BIT);
  
          if(!_initTexturesDone)
--- 4915,4919 ----
      else
      {
!         glPushAttrib(GL_ENABLE_BIT | GL_LIGHTING_BIT);
  
          if(!_initTexturesDone)

Index: OSGDitherShadowMap.cpp
===================================================================
RCS file: /cvsroot/opensg/OpenSG/Source/Experimental/ShadowViewport/OSGDitherShadowMap.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** OSGDitherShadowMap.cpp	12 Dec 2011 23:49:52 -0000	1.44
--- OSGDitherShadowMap.cpp	1 Feb 2012 20:28:03 -0000	1.45
***************
*** 2857,2861 ****
      else
      {
!         glPushAttrib(GL_ENABLE_BIT);
  
          if(!_initTexturesDone)
--- 2857,2861 ----
      else
      {
!         glPushAttrib(GL_ENABLE_BIT | GL_LIGHTING_BIT);
  
          if(!_initTexturesDone)