0031196: Visualization, TKOpenGl - enable Ray-Tracing using OpenGL ES 3.2

[occt.git] / src / Shaders / Shaders_RaytraceBase_fs.pxx

diff --git a/src/Shaders/Shaders_RaytraceBase_fs.pxx b/src/Shaders/Shaders_RaytraceBase_fs.pxx
index 942d9f6..c7f6a4a 100644 (file)
--- a/src/Shaders/Shaders_RaytraceBase_fs.pxx
+++ b/src/Shaders/Shaders_RaytraceBase_fs.pxx
@@ -15,10 +15,10 @@ static const char Shaders_RaytraceBase_fs[] =
   "//! Normalized pixel coordinates.\n"
   "in vec2 vPixel;\n"
   "\n"
-  "//! Sub-pixel offset in X direction for FSAA.\n"
-  "uniform float uOffsetX = 0.f;\n"
+  "//! Sub-pixel offset in for FSAA.\n"
+  "uniform vec2 uFsaaOffset;\n"
   "//! Sub-pixel offset in Y direction for FSAA.\n"
-  "uniform float uOffsetY = 0.f;\n"
+  "uniform float uOffsetY;\n"
   "\n"
   "//! Origin of viewing ray in left-top corner.\n"
   "uniform vec3 uOriginLT;\n"
@@ -127,15 +127,15 @@ static const char Shaders_RaytraceBase_fs[] =
   "#endif\n"
   "\n"
   "//! Top color of gradient background.\n"
-  "uniform vec4 uBackColorTop = vec4 (0.0);\n"
+  "uniform vec4 uBackColorTop;\n"
   "//! Bottom color of gradient background.\n"
-  "uniform vec4 uBackColorBot = vec4 (0.0);\n"
+  "uniform vec4 uBackColorBot;\n"
   "\n"
   "//! Aperture radius of camera used for depth-of-field\n"
-  "uniform float uApertureRadius = 0.f;\n"
+  "uniform float uApertureRadius;\n"
   "\n"
   "//! Focal distance of camera used for depth-of field\n"
-  "uniform float uFocalPlaneDist = 10.f;\n"
+  "uniform float uFocalPlaneDist;\n"
   "\n"
   "//! Camera position used for projective mode\n"
   "uniform vec3 uEyeOrig;\n"
@@ -159,7 +159,6 @@ static const char Shaders_RaytraceBase_fs[] =
   "struct SRay\n"
   "{\n"
   "  vec3 Origin;\n"
-  "\n"
   "  vec3 Direct;\n"
   "};\n"
   "\n"
@@ -167,9 +166,7 @@ static const char Shaders_RaytraceBase_fs[] =
   "struct SIntersect\n"
   "{\n"
   "  float Time;\n"
-  "\n"
   "  vec2 UV;\n"
-  "\n"
   "  vec3 Normal;\n"
   "};\n"
   "\n"
@@ -177,7 +174,6 @@ static const char Shaders_RaytraceBase_fs[] =
   "struct STriangle\n"
   "{\n"
   "  ivec4 TriIndex;\n"
-  "\n"
   "  vec3 Points[3];\n"
   "};\n"
   "\n"