From: asl <asl@opencascade.com>
Date: Wed, 13 Jun 2018 04:51:20 +0000 (+0300)
Subject: eventual correction of the outline shader
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=e48da12d51502ae35a5db2e6b9d50c0c184a8075;p=occt-copy.git

eventual correction of the outline shader
---

diff --git a/src/OpenGl/OpenGl_PrimitiveArray.cxx b/src/OpenGl/OpenGl_PrimitiveArray.cxx
index f6937deeaf..8804b51bcc 100644
--- a/src/OpenGl/OpenGl_PrimitiveArray.cxx
+++ b/src/OpenGl/OpenGl_PrimitiveArray.cxx
@@ -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);
diff --git a/src/OpenGl/OpenGl_ShaderManager.cxx b/src/OpenGl/OpenGl_ShaderManager.cxx
index d5c29a6a52..5be378ae36 100644
--- a/src/OpenGl/OpenGl_ShaderManager.cxx
+++ b/src/OpenGl/OpenGl_ShaderManager.cxx
@@ -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)"