0024402: TKOpenGl - Implement clipping planes in Phong GLSL program

Limit number of lights (breaks compatibility with old hardware).

diff --git a/src/OpenGl/OpenGl_ShaderManager.cxx b/src/OpenGl/OpenGl_ShaderManager.cxx
index d155c0006aeec808276fc8b155626851237321ba..566025592928b656f969b6be5d40df56b27dd1cb 100755 (executable)
--- a/src/OpenGl/OpenGl_ShaderManager.cxx
+++ b/src/OpenGl/OpenGl_ShaderManager.cxx
@@ -509,7 +509,7 @@ void OpenGl_ShaderManager::PushClippingState (const Handle(OpenGl_ShaderProgram)
     return;
   }
 
-  GLuint aPlanesNb = 0;
+  GLint aPlanesNb = 0;
   for (Graphic3d_SequenceOfHClipPlane::Iterator anIter (myContext->Clipping().Planes());
        anIter.More(); anIter.Next())
   {
@@ -526,8 +526,9 @@ void OpenGl_ShaderManager::PushClippingState (const Handle(OpenGl_ShaderProgram)
     return;
   }
 
-  OpenGl_Vec4* anEquations = new OpenGl_Vec4[aPlanesNb];
-  GLint*       aSpaces     = new GLint      [aPlanesNb];
+  const Standard_Size MAX_CLIP_PLANES = 8;
+  OpenGl_Vec4* anEquations = new OpenGl_Vec4[MAX_CLIP_PLANES];
+  GLint*       aSpaces     = new GLint      [MAX_CLIP_PLANES];
   GLuint aPlaneId = 0;
   for (Graphic3d_SequenceOfHClipPlane::Iterator anIter (myContext->Clipping().Planes());
        anIter.More(); anIter.Next())
@@ -546,8 +547,12 @@ void OpenGl_ShaderManager::PushClippingState (const Handle(OpenGl_ShaderProgram)
     aSpaces[aPlaneId] = myContext->Clipping().GetEquationSpace (aPlane);
     ++aPlaneId;
   }
-  theProgram->SetUniform (myContext, aLocEquations, aPlanesNb, anEquations[0].GetData());
-  theProgram->SetUniform (myContext, aLocSpaces,    aPlanesNb, aSpaces);
+
+  theProgram->SetUniform (myContext,
+                          theProgram->GetStateLocation (OpenGl_OCC_CLIP_PLANE_COUNT),
+                          aPlanesNb);
+  theProgram->SetUniform (myContext, aLocEquations, MAX_CLIP_PLANES, anEquations);
+  theProgram->SetUniform (myContext, aLocSpaces,    MAX_CLIP_PLANES, aSpaces);
 
   delete[] anEquations;
   delete[] aSpaces;

diff --git a/src/OpenGl/OpenGl_ShaderProgram.cxx b/src/OpenGl/OpenGl_ShaderProgram.cxx
index 0bee9c3392e8d76c242ba9cdb4533ffe86e800d1..61bb58db652970cfb0958047c2b9f79cb881e4ce 100755 (executable)
--- a/src/OpenGl/OpenGl_ShaderProgram.cxx
+++ b/src/OpenGl/OpenGl_ShaderProgram.cxx
@@ -47,6 +47,7 @@ Standard_CString OpenGl_ShaderProgram::PredefinedKeywords[] =
 
   "occClipPlaneEquations", // OpenGl_OCC_CLIP_PLANE_EQUATIONS
   "occClipPlaneSpaces",    // OpenGl_OCC_CLIP_PLANE_SPACES
+  "occClipPlaneCount",     // OpenGl_OCC_CLIP_PLANE_COUNT
 
   "occLightSourcesCount",  // OpenGl_OCC_LIGHT_SOURCE_COUNT
   "occLightSourcesTypes",  // OpenGl_OCC_LIGHT_SOURCE_TYPES

diff --git a/src/OpenGl/OpenGl_ShaderProgram.hxx b/src/OpenGl/OpenGl_ShaderProgram.hxx
index 611d2ed50a6a0ba9787cf57ed88cc1f97ec12eb2..52c20c06102d385573f4af4d9a9ffcee6bcea5f0 100755 (executable)
--- a/src/OpenGl/OpenGl_ShaderProgram.hxx
+++ b/src/OpenGl/OpenGl_ShaderProgram.hxx
@@ -50,6 +50,7 @@ enum OpenGl_StateVariable
   // OpenGL clip planes state
   OpenGl_OCC_CLIP_PLANE_EQUATIONS,
   OpenGl_OCC_CLIP_PLANE_SPACES,
+  OpenGl_OCC_CLIP_PLANE_COUNT,
 
   // OpenGL light state
   OpenGl_OCC_LIGHT_SOURCE_COUNT,

diff --git a/src/Shaders/Declarations.glsl b/src/Shaders/Declarations.glsl
index 382f106b278eb18a7a4b27e33cd508492159c286..a20dacfcfce28fc71d5d36d4b2cf7e8e2efc1fbd 100644 (file)
--- a/src/Shaders/Declarations.glsl
+++ b/src/Shaders/Declarations.glsl
@@ -77,3 +77,4 @@ const int OccEquationCoords_World = 1; //!< world-space clipping plane
 //! Parameters of clipping planes
 uniform vec4 occClipPlaneEquations[THE_MAX_CLIP_PLANES];
 uniform int  occClipPlaneSpaces   [THE_MAX_CLIP_PLANES];
+uniform int  occClipPlaneCount;   //!< Total number of clip planes

diff --git a/src/Shaders/PhongShading.fs b/src/Shaders/PhongShading.fs
index 0cb63e2270480263bc5989a6820c24cbb59cff19..08df0f043f0b19c675bb6caaeaa1e6ef068c0d97 100755 (executable)
--- a/src/Shaders/PhongShading.fs
+++ b/src/Shaders/PhongShading.fs
@@ -13,9 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-varying vec3 View;     //!< Direction to the viewer
-varying vec3 Normal;   //!< Vertex normal in view space
-varying vec4 Position; //!< Vertex position in view space.
+varying vec3 View;          //!< Direction to the viewer
+varying vec3 Normal;        //!< Vertex normal in view space
+varying vec4 Position;      //!< Vertex position in view space.
+varying vec4 PositionWorld; //!< Vertex position in world space
 
 vec3 Ambient;  //!< Ambient  contribution of light sources
 vec3 Diffuse;  //!< Diffuse  contribution of light sources
@@ -172,6 +173,27 @@ vec4 computeLighting (in vec3 theNormal,
 //! Entry point to the Fragment Shader
 void main()
 {
+  // process clipping planes
+  for (int anIndex = 0; anIndex < occClipPlaneCount; ++anIndex)
+  {
+    vec4 aClipEquation = occClipPlaneEquations[anIndex];
+    int  aClipSpace    = occClipPlaneSpaces[anIndex];
+    if (aClipSpace == OccEquationCoords_World)
+    {
+      if (dot (aClipEquation.xyz, PositionWorld.xyz) + aClipEquation.w < 0.0)
+      {
+        discard;
+      }
+    }
+    else if (aClipSpace == OccEquationCoords_View)
+    {
+      if (dot (aClipEquation.xyz, Position.xyz) + aClipEquation.w < 0.0)
+      {
+        discard;
+      }
+    }
+  }
+
   gl_FragColor = computeLighting (normalize (Normal),
                                   normalize (View),
                                   Position);

diff --git a/src/Shaders/PhongShading.vs b/src/Shaders/PhongShading.vs
index ada2d299d239b893c7b41ae7633e43cc9b40c5a6..4a86a1ae9a7e199c9d79e0a5c78a819a2bdaa56f 100755 (executable)
--- a/src/Shaders/PhongShading.vs
+++ b/src/Shaders/PhongShading.vs
@@ -13,9 +13,10 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-varying vec3 View;     //!< Direction to the viewer
-varying vec3 Normal;   //!< Vertex normal   in view space
-varying vec4 Position; //!< Vertex position in view space
+varying vec3 View;          //!< Direction to the viewer
+varying vec3 Normal;        //!< Vertex normal in view space
+varying vec4 Position;      //!< Vertex position in view space
+varying vec4 PositionWorld; //!< Vertex position in world space
 
 //! Computes the normal in view space
 vec3 TransformNormal (in vec3 theNormal)
@@ -29,8 +30,9 @@ vec3 TransformNormal (in vec3 theNormal)
 //! Entry point to the Vertex Shader
 void main()
 {
-  Position = occWorldViewMatrix * occModelWorldMatrix * occVertex; // position in the view space
-  Normal   = TransformNormal (occNormal);                          // normal   in the view space
+  PositionWorld = occModelWorldMatrix * occVertex;
+  Position      = occWorldViewMatrix * PositionWorld;
+  Normal        = TransformNormal (occNormal);
 
   // Note: The specified view vector is absolutely correct only for the orthogonal projection.
   // For perspective projection it will be approximate, but it is in good agreement with the OpenGL calculations.