feat(vtkProperty): add vtkProperty edgeOpacity

fixes: #3461

Author: daker

Sources/Rendering/Core/Property/index.d.ts

@@ -17,6 +17,7 @@ export interface IPropertyInitialValues {
   RMTexture?: vtkTexture;
   ORMTexture?: vtkTexture;
   edgeColor?: RGBColor;
+  edgeOpacity?: number;
   ambient?: number;
   diffuse?: number;
   metallic?: number;
@@ -103,6 +104,11 @@ export interface vtkProperty extends vtkObject {
    */
   getEdgeColorByReference(): RGBColor;
 
+  /**
+   *
+   */
+  getEdgeOpacity(): number;
+
   /**
    *
    */
@@ -360,6 +366,13 @@ export interface vtkProperty extends vtkObject {
    */
   setEdgeColorFrom(edgeColor: RGBColor): boolean;
 
+  /**
+   * Set the opacity of primitive edges. If not set explicitly, edge opacity
+   * follows the regular property opacity.
+   * @param {Number} edgeOpacity The opacity of primitive edges.
+   */
+  setEdgeOpacity(edgeOpacity: number): boolean;
+
   /**
    * Turn on/off the visibility of edges. On some renderers it is
    * possible to render the edges of geometric primitives separately

Sources/Rendering/Core/Property/index.js

@@ -116,6 +116,7 @@ const DEFAULT_VALUES = {
   specular: 0,
   specularPower: 1,
   opacity: 1,
+  edgeOpacity: 1,
   interpolation: Interpolation.GOURAUD,
   representation: Representation.SURFACE,
   edgeVisibility: false,
@@ -153,6 +154,7 @@ export function extend(publicAPI, model, initialValues = {}) {
     'specular',
     'specularPower',
     'opacity',
+    'edgeOpacity',
     'edgeVisibility',
     'lineWidth',
     'pointSize',

Sources/Rendering/OpenGL/PolyDataMapper/index.js

@@ -1529,7 +1529,12 @@ function vtkOpenGLPolyDataMapper(publicAPI, model) {
 
     let ppty = actor.getProperty();
 
-    let opacity = ppty.getOpacity();
+    const edgeLikeRepresentation =
+      model.drawingEdges ||
+      ppty.getRepresentation() === Representation.WIREFRAME;
+    let opacity = edgeLikeRepresentation
+      ? ppty.getEdgeOpacity()
+      : ppty.getOpacity();
 
     let aColor = model.drawingEdges
       ? ppty.getEdgeColorByReference()

Sources/Rendering/WebGPU/CellArrayMapper/index.js

@@ -543,7 +543,14 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
     const edgeColor = ppty.getEdgeColorByReference?.();
     if (edgeColor) model.UBO.setArray('EdgeColor', [...edgeColor, 1.0]);
     model.UBO.setValue('LineWidth', ppty.getLineWidth());
-    model.UBO.setValue('Opacity', ppty.getOpacity());
+    const edgeLikeRepresentation =
+      model.primitiveType === PrimitiveTypes.TriangleEdges ||
+      model.primitiveType === PrimitiveTypes.TriangleStripEdges ||
+      ppty.getRepresentation() === Representation.WIREFRAME;
+    model.UBO.setValue(
+      'Opacity',
+      edgeLikeRepresentation ? ppty.getEdgeOpacity() : ppty.getOpacity()
+    );
     model.UBO.setValue('PropID', model.WebGPUActor.getPropID());
     const cp = publicAPI.getCoincidentParameters();
     model.UBO.setValue('CoincidentFactor', cp.factor);
@@ -825,13 +832,14 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
     let code = fDesc.getCode();
 
     // Code that runs if the fragment shader includes normals
-    if (
-      code.includes('var normal:') &&
+    const hasNormal = code.includes('var normal:');
+    const needLighting =
+      hasNormal &&
       model.useRendererMatrix &&
       !isEdges(hash) &&
       !model.is2D &&
-      !hash.includes('sel')
-    ) {
+      !hash.includes('sel');
+    if (needLighting) {
       const lightingCode = [
         // Vectors needed for light calculations
         '  let fragPos = vec3<f32>(input.vertexVC.xyz);',
@@ -1236,9 +1244,16 @@ function vtkWebGPUCellArrayMapper(publicAPI, model) {
     // --- Normals ---
     const usage = publicAPI.getUsage(representation, primType);
     model._usesCellNormals = false;
+    // Add normals for triangles/strips, AND for lines in wireframe mode (converted from triangles)
+    const isWireframeFromTriangles =
+      representation === Representation.WIREFRAME &&
+      (primType === PrimitiveTypes.Triangles ||
+        primType === PrimitiveTypes.TriangleStrips);
     if (
       !model.is2D && // no lighting on Property2D
-      (usage === BufferUsage.Triangles || usage === BufferUsage.Strips)
+      (usage === BufferUsage.Triangles ||
+        usage === BufferUsage.Strips ||
+        isWireframeFromTriangles)
     ) {
       const normals = pd.getPointData().getNormals();
       // https://vtk.org/doc/nightly/html/classvtkPolyDataTangents.html