OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

eventual correction of the outline shader

Browse Source
This commit is contained in:
asl
2018-06-13 07:51:20 +03:00
parent c425264ff8
commit e48da12d51
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenGl/OpenGl_PrimitiveArray.cxx
View File

@@ -828,7 +828,7 @@ void OpenGl_PrimitiveArray::Render (const Handle(OpenGl_Workspace)& theWorkspace
theWorkspace->View()->Window()->Size(aViewWidth, aViewHeight);
Standard_Integer aMin = aViewWidth < aViewHeight ? aViewWidth : aViewHeight;
Standard_ShortReal anEdgeWidth = 2*(Standard_ShortReal)anAspectFace->Aspect()->EdgeWidth() / (Standard_ShortReal)aMin;
Standard_ShortReal anEdgeWidth = (Standard_ShortReal)anAspectFace->Aspect()->EdgeWidth() / (Standard_ShortReal)aMin;
aCtx->SetSilhouetteThickness(anEdgeWidth);
aCtx->SetIsSilhouettePass(Standard_True);

4
src/OpenGl/OpenGl_ShaderManager.cxx
View File

@@ -1616,10 +1616,10 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramUnlit (Handle(OpenGl_Sha
EOL" vec3 pdelta = vec3(0.0, 0.0, 0.0);"
EOL" vec4 proj_normal = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatrix * vec4(occNormal, 0.0);"
EOL""
EOL" float aShift = occSilhouetteThickness / 2.0;"
EOL" float aShift = occSilhouetteThickness;"// / 2.0;"
EOL" if (occOrthoScale > 0.0)"
EOL" {"
EOL" if (abs(proj_normal[2]) < 0.1)"
EOL" if (abs(proj_normal[2]) < 0.25)"
EOL" {"
EOL" float k = 1.0;"
EOL" if (occIsSilhouettePass < 0.1)"