Merge branch 'develop' for v2.42

pi3d/event/FindDevices.py

@@ -2,7 +2,7 @@
 from .Constants import *
 
 def test_bit(nlst, b):
-  index = b / 32
+  index = b // 32
   bit = b % 32
   if len(nlst) <= index:
     return False

pi3d/shaders/std_bump.inc

@@ -7,6 +7,9 @@
 
   bump.y *= -1.0;
   // unib[3][2] ([11] in python) is used to adjust the strength of normal map textures
-  float bfact = unib[3][2] * (1.0 - smoothstep(100.0, 600.0, dist)); // ------ attenuate smoothly between 100 and 600 units
+  float bfact = unib[3][2];
+  if (is_3d > 0.0) {
+      bfact *= (1.0 - smoothstep(100.0, 600.0, dist)); // ------ attenuate smoothly between 100 and 600 units
+  }
   float intensity = clamp(dot(lightVector, normalize(vec3(0.0, 0.0, 1.0) + bump * bfact)) * lightFactor, 0.0, 1.0); // ------ adjustment of colour according to combined normal
   texc.rgb = (texc.rgb * unif[9]) * intensity + (texc.rgb * unif[10]); // ------ directional lightcol * intensity + ambient lightcol

pi3d/shaders/std_head_fs.inc

@@ -12,5 +12,6 @@ uniform vec3 unif[20];
 
 varying float dist;
 varying float fog_start;
+varying float is_3d;
 
 //fragcolor

pi3d/shaders/std_head_vs.inc

@@ -17,3 +17,4 @@ uniform vec3 unif[20];
 
 varying float dist;
 varying float fog_start;
+varying float is_3d;

pi3d/shaders/std_main_vs.inc

@@ -28,3 +28,5 @@
                           uvec.y, vvec.y, -normout.y, 0.0,
                           uvec.z, vvec.z, -normout.z, 0.0,
                           0.0,    0.0,    0.0,        1.0) * vec4(lightVector, 0.0));
+
+  is_3d = abs(modelviewmatrix[0][3][3] - modelviewmatrix[1][3][3]);