OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0032129: Visualization, TKOpenGl - shadowmap is broken for ZLayer having non-zero origin

Browse Source 
OpenGl_LayerList::renderLayer() - fixed usage of wrong camera while rendering shadowmap,
and apply Z-Layer origin shift to shadowmap matrix while applying shadow.
This commit is contained in:
kgv 2021-02-14 01:01:27 +03:00
parent 92f8ec2f01
commit 008210c3e2
7 changed files with 70 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/OpenGl/OpenGl_BackgroundArray.cxx
View File

@ -449,13 +449,13 @@ void OpenGl_BackgroundArray::Render (const Handle(OpenGl_Workspace)& theWorkspac
Standard_Integer aViewSizeY = aCtx->Viewport()[3];
Graphic3d_Vec2i aTileOffset, aTileSize;
if (theWorkspace->View()->Camera()->Tile().IsValid())
if (aCtx->Camera()->Tile().IsValid())
{
aViewSizeX = theWorkspace->View()->Camera()->Tile().TotalSize.x();
aViewSizeY = theWorkspace->View()->Camera()->Tile().TotalSize.y();
aViewSizeX = aCtx->Camera()->Tile().TotalSize.x();
aViewSizeY = aCtx->Camera()->Tile().TotalSize.y();
aTileOffset = theWorkspace->View()->Camera()->Tile().OffsetLowerLeft();
aTileSize = theWorkspace->View()->Camera()->Tile().TileSize;
aTileOffset = aCtx->Camera()->Tile().OffsetLowerLeft();
aTileSize = aCtx->Camera()->Tile().TileSize;
}
if (myToUpdate
|| myViewWidth != aViewSizeX
@ -473,7 +473,7 @@ void OpenGl_BackgroundArray::Render (const Handle(OpenGl_Workspace)& theWorkspac
if (myType == Graphic3d_TOB_CUBEMAP)
{
Graphic3d_Camera aCamera (theWorkspace->View()->Camera());
Graphic3d_Camera aCamera (aCtx->Camera());
aCamera.SetZRange (0.01, 1.0); // is needed to avoid perspective camera exception
// cancel translation
@ -514,7 +514,7 @@ void OpenGl_BackgroundArray::Render (const Handle(OpenGl_Workspace)& theWorkspac
{
aProjection.InitIdentity();
aWorldView.InitIdentity();
if (theWorkspace->View()->Camera()->Tile().IsValid())
if (aCtx->Camera()->Tile().IsValid())
{
aWorldView.SetDiagonal (OpenGl_Vec4 (2.0f / aTileSize.x(), 2.0f / aTileSize.y(), 1.0f, 1.0f));
if (myType == Graphic3d_TOB_GRADIENT)

2
src/OpenGl/OpenGl_FrameStatsPrs.cxx
View File

@ -405,7 +405,7 @@ void OpenGl_FrameStatsPrs::Render (const Handle(OpenGl_Workspace)& theWorkspace)
aCtx->WorldViewState.Push();
if (!myChartTrsfPers.IsNull())
{
myChartTrsfPers->Apply (theWorkspace->View()->Camera(),
myChartTrsfPers->Apply (aCtx->Camera(),
aCtx->ProjectionState.Current(), aCtx->WorldViewState.ChangeCurrent(),
aCtx->VirtualViewport()[2], aCtx->VirtualViewport()[3]);
}

21
src/OpenGl/OpenGl_LayerList.cxx
View File

@ -20,6 +20,7 @@
#include <OpenGl_FrameBuffer.hxx>
#include <OpenGl_LayerList.hxx>
#include <OpenGl_ShaderManager.hxx>
#include <OpenGl_ShadowMap.hxx>
#include <OpenGl_Structure.hxx>
#include <OpenGl_VertexBuffer.hxx>
#include <OpenGl_View.hxx>
@ -604,7 +605,7 @@ void OpenGl_LayerList::renderLayer (const Handle(OpenGl_Workspace)& theWorkspace
aManager->UpdateLightSourceStateTo (aLayerSettings.Lights(), theWorkspace->View()->SpecIBLMapLevels(), Handle(OpenGl_ShadowMapArray)());
}
const Handle(Graphic3d_Camera)& aWorldCamera = theWorkspace->View()->Camera();
const Handle(Graphic3d_Camera)& aWorldCamera = aCtx->Camera();
if (hasLocalCS)
{
// Apply local camera transformation.
@ -645,6 +646,15 @@ void OpenGl_LayerList::renderLayer (const Handle(OpenGl_Workspace)& theWorkspace
NCollection_Mat4<Standard_Real> aWorldView = aWorldCamera->OrientationMatrix();
Graphic3d_TransformUtils::Translate (aWorldView, aLayerSettings.Origin().X(), aLayerSettings.Origin().Y(), aLayerSettings.Origin().Z());
if (!aManager->LightSourceState().ShadowMaps().IsNull())
{
// shift shadowmap matrix
for (OpenGl_ShadowMapArray::Iterator aShadowIter (*aManager->LightSourceState().ShadowMaps()); aShadowIter.More(); aShadowIter.Next())
{
aShadowIter.Value()->UpdateCamera (*theWorkspace->View(), &aLayerSettings.Origin());
}
}
NCollection_Mat4<Standard_ShortReal> aWorldViewF;
aWorldViewF.ConvertFrom (aWorldView);
aCtx->WorldViewState.SetCurrent (aWorldViewF);
@ -676,6 +686,15 @@ void OpenGl_LayerList::renderLayer (const Handle(OpenGl_Workspace)& theWorkspace
}
if (hasLocalCS)
{
if (!aManager->LightSourceState().ShadowMaps().IsNull())
{
// restore shadowmap matrix
for (OpenGl_ShadowMapArray::Iterator aShadowIter (*aManager->LightSourceState().ShadowMaps()); aShadowIter.More(); aShadowIter.Next())
{
aShadowIter.Value()->UpdateCamera (*theWorkspace->View(), &gp::Origin().XYZ());
}
}
aCtx->ShaderManager()->RevertClippingState();
aCtx->ShaderManager()->UpdateLightSourceState();

2
src/OpenGl/OpenGl_PrimitiveArray.cxx
View File

@ -1037,7 +1037,7 @@ void OpenGl_PrimitiveArray::Render (const Handle(OpenGl_Workspace)& theWorkspace
const Graphic3d_Vec2i aViewSize (aCtx->Viewport()[2], aCtx->Viewport()[3]);
const Standard_Integer aMin = aViewSize.minComp();
const GLfloat anEdgeWidth = (GLfloat )anAspectFace->Aspect()->EdgeWidth() * aCtx->LineWidthScale() / (GLfloat )aMin;
const GLfloat anOrthoScale = theWorkspace->View()->Camera()->IsOrthographic() ? (GLfloat )theWorkspace->View()->Camera()->Scale() : -1.0f;
const GLfloat anOrthoScale = aCtx->Camera()->IsOrthographic() ? (GLfloat )aCtx->Camera()->Scale() : -1.0f;
const Handle(OpenGl_ShaderProgram)& anOutlineProgram = aCtx->ActiveProgram();
anOutlineProgram->SetUniform (aCtx, anOutlineProgram->GetStateLocation (OpenGl_OCCT_SILHOUETTE_THICKNESS), anEdgeWidth);

16
src/OpenGl/OpenGl_ShadowMap.cxx
View File

@ -85,10 +85,11 @@ const Handle(OpenGl_Texture)& OpenGl_ShadowMap::Texture() const
// function : UpdateCamera
// purpose :
// =======================================================================
bool OpenGl_ShadowMap::UpdateCamera (const Graphic3d_CView& theView)
bool OpenGl_ShadowMap::UpdateCamera (const Graphic3d_CView& theView,
const gp_XYZ* theOrigin)
{
const Bnd_Box aMinMaxBox = theView.MinMaxValues (false); // applicative min max boundaries
const Bnd_Box aGraphicBox = theView.MinMaxValues (true); // real graphical boundaries (not accounting infinite flag).
const Bnd_Box aMinMaxBox = theOrigin == NULL ? theView.MinMaxValues (false) : Bnd_Box(); // applicative min max boundaries
const Bnd_Box aGraphicBox = theOrigin == NULL ? theView.MinMaxValues (true) : Bnd_Box(); // real graphical boundaries (not accounting infinite flag)
switch (myShadowLight->Type())
{
@ -98,6 +99,15 @@ bool OpenGl_ShadowMap::UpdateCamera (const Graphic3d_CView& theView)
}
case Graphic3d_TOLS_DIRECTIONAL:
{
if (theOrigin != NULL)
{
Graphic3d_Mat4d aTrans;
aTrans.Translate (Graphic3d_Vec3d (theOrigin->X(), theOrigin->Y(), theOrigin->Z()));
Graphic3d_Mat4d anOrientMat = myShadowCamera->OrientationMatrix() * aTrans;
myLightMatrix = myShadowCamera->ProjectionMatrixF() * Graphic3d_Mat4 (anOrientMat);
return true;
}
Graphic3d_Vec4d aDir (myShadowLight->Direction().X(), myShadowLight->Direction().Y(), myShadowLight->Direction().Z(), 0.0);
if (myShadowLight->IsHeadlight())
{

6
src/OpenGl/OpenGl_ShadowMap.hxx
View File

@ -19,6 +19,7 @@
#include <NCollection_Shared.hxx>
#include <OpenGl_NamedResource.hxx>
class gp_XYZ;
class Graphic3d_Camera;
class Graphic3d_CLight;
class Graphic3d_CView;
@ -74,7 +75,10 @@ public:
void SetShadowMapBias (Standard_ShortReal theBias) { myShadowMapBias = theBias; }
//! Compute camera.
Standard_EXPORT bool UpdateCamera (const Graphic3d_CView& theView);
//! @param theView [in] active view
//! @param theOrigin [in] when not-NULL - displace shadow map camera to specified Z-Layer origin
Standard_EXPORT bool UpdateCamera (const Graphic3d_CView& theView,
const gp_XYZ* theOrigin = NULL);
private:

23
tests/v3d/shadows/double_precision Normal file
View File

@ -0,0 +1,23 @@
puts "========"
puts "0032129: Visualization, TKOpenGl - shadowmap is broken for ZLayer having non-zero origin"
puts "========"
pload MODELING VISUALIZATION
box b 0 0 1 100 200 300
box bb -500 -500 0 1000 1000 0 -preview
vinit View1
vrenderparams -shadingModel PHONG
vdisplay -dispMode 1 b bb
vaspects bb -material STONE
vfit
vlight -change 0 -castShadows 1 -head 0 -dir 1 1 -1
vdump $::imagedir/${::casename}_1.png
vzlayer DEFAULT -origin 200 0 0
vdump $::imagedir/${::casename}_2.png
vlocation b -setLocation 1000000000 0 0
vlocation bb -setLocation 1000000000 0 0
vfit
vdump $::imagedir/${::casename}_3.png
vzlayer DEFAULT -origin 1000000000 0 0
vdump $::imagedir/${::casename}_4.png