Light and selection fixes

Author: mhochsteger

webgpu/labels.py

@@ -10,6 +10,7 @@
 class Labels(Renderer):
     vertex_entry_point: str = "vertexText"
     fragment_entry_point: str = "fragmentFont"
+    select_entry_point: str = ""
     n_vertices: int = 6
 
     """Render a list of strings on screen

webgpu/scene.py

@@ -206,7 +206,6 @@ def select(self, x: int, y: int):
 
             ev = SelectEvent(x, y, read_buffer(buffer))
             if ev.obj_id > 0:
-                p = ev.calculate_position(self.options.camera)
                 for parent in objects:
                     for obj in parent.all_renderer():
                         if obj._id == ev.obj_id:

webgpu/shaders/camera.wgsl

@@ -20,9 +20,10 @@ fn cameraMapNormal(n: vec3f) -> vec4f {
     return u_camera.normal_mat * vec4(n, 1.0);
 }
 
-
-@fragment fn fragment_select_default(
+#ifdef SELECT_PIPELINE
+@fragment fn fragment_select_no_clipping(
     @builtin(position) p: vec4f,
 ) -> @location(0) vec4<u32> {
     return vec4<u32>(@RENDER_OBJECT_ID@, bitcast<u32>(p.z), 0, 0);
 }
+#endif SELECT_PIPELINE

webgpu/shaders/clipping.wgsl

@@ -33,3 +33,12 @@ fn checkClipping(p: vec3<f32>) {
     }
 }
 
+#ifdef SELECT_PIPELINE
+@fragment fn fragment_select_default(
+    @builtin(position) p: vec4f,
+    @location(0) p3: vec3f,
+) -> @location(0) vec4<u32> {
+    checkClipping(p3);
+    return vec4<u32>(@RENDER_OBJECT_ID@, bitcast<u32>(p.z), 0, 0);
+}
+#endif SELECT_PIPELINE

webgpu/shaders/light.wgsl

@@ -20,7 +20,10 @@ fn lightCalcBrightness(p: vec3f, normal: vec3f) -> vec2f {
 
     let dim = 1.0;
     var spec = pow( max( dot(r,view) , 0.0 ), u_light.shininess );
-    let sDotN = max( dot( normalize(u_light.direction), n ), 0.0 );
+    var sDotN =  dot( normalize(u_light.direction), n );
+    if (sDotN < 0.0) {
+      sDotN = -0.5*sDotN;
+    }
     let diffuse = u_light.diffuse * sDotN;
     if(diffuse==0.0 || u_light.shininess ==0.0) {
       spec = 0.0;