fix(PBR): enable PBR with setInterpolationToPBR

Author: daker

Examples/Rendering/PBR/index.js

@@ -10,11 +10,12 @@ import vtkOBJReader from '@kitware/vtk.js/IO/Misc/OBJReader';
 import vtkMapper from '@kitware/vtk.js/Rendering/Core/Mapper';
 import vtkTexture from '@kitware/vtk.js/Rendering/Core/Texture';
 import vtkPolyDataNormals from '@kitware/vtk.js/Filters/Core/PolyDataNormals';
-
+import vtkProperty from '@kitware/vtk.js/Rendering/Core/Property';
 import vtkFPSMonitor from '@kitware/vtk.js/Interaction/UI/FPSMonitor';
-
 import GUI from 'lil-gui';
 
+const { Shading } = vtkProperty;
+
 // ----------------------------------------------------------------------------
 // Standard rendering code setup
 // ----------------------------------------------------------------------------
@@ -108,6 +109,7 @@ reader.setUrl(`${__BASE_PATH__}/data/pbr/helmet.obj`).then(async () => {
 
   // Setting default values
   actor.setPosition(0.0, 0.0, 0.0);
+  actor.getProperty().setInterpolation(Shading.PBR);
   actor.getProperty().setRoughness(1.0);
   actor.getProperty().setEmission(0.6);
   actor.getProperty().setMetallic(1.0);

Sources/Common/Core/AnimationCue/test/testAnimationCue.js

@@ -1,6 +1,5 @@
 import test from 'tape';
-import vtkAnimationCue from '../index';
-import { CueState } from '../Constants';
+import vtkAnimationCue from 'vtk.js/Sources/Common/Core/AnimationCue';
 
 test('vtkAnimationCue: Basic instantiation', (t) => {
   const cue = vtkAnimationCue.newInstance();

Sources/Common/Core/AnimationMixer/test/testAnimationMixer.js

@@ -26,10 +26,10 @@ test('vtkAnimationMixer: Non-skeletal animation bindings', (t) => {
 
   const registered = mixer.setAnimationBinding(
     'custom',
-    [animation],
     (updates, context) => {
       applied.push({ updates, context });
-    }
+    },
+    [animation]
   );
 
   t.ok(registered);
@@ -67,10 +67,10 @@ test('vtkAnimationMixer: Uses the first animation only', (t) => {
 
   const registered = mixer.setAnimationBinding(
     'selected',
-    [animation1, animation2],
     (updates, context) => {
       applied.push({ updates, context });
-    }
+    },
+    [animation1, animation2]
   );
 
   t.ok(registered);

Sources/Common/Core/AnimationScene/test/testAnimationScene.js

@@ -1,6 +1,6 @@
 import test from 'tape';
-import vtkAnimationCue from '../../AnimationCue/index';
-import vtkAnimationScene from '../index';
+import vtkAnimationCue from 'vtk.js/Sources/Common/Core/AnimationCue';
+import vtkAnimationScene from 'vtk.js/Sources/Common/Core/AnimationScene';
 
 test('vtkAnimationScene: Basic instantiation', (t) => {
   const scene = vtkAnimationScene.newInstance();

Sources/Common/DataModel/AnimationClip/index.js

@@ -34,11 +34,11 @@ function vtkAnimationClip(publicAPI, model) {
 
       // Recalculate duration
       model.duration = 0;
-      for (const track of model.tracks) {
+      model.tracks.forEach((track) => {
         if (track.getDuration() > model.duration) {
           model.duration = track.getDuration();
         }
-      }
+      });
 
       publicAPI.modified();
     }
@@ -74,7 +74,8 @@ function vtkAnimationClip(publicAPI, model) {
    * @return {vtkAnimationTrack | null}
    */
   publicAPI.getTrackByName = (name) => {
-    for (const track of model.tracks) {
+    for (let i = 0; i < model.tracks.length; i++) {
+      const track = model.tracks[i];
       if (track.getName() === name) {
         return track;
       }

Sources/Common/DataModel/AnimationClip/test/testAnimationClip.js

@@ -1,10 +1,7 @@
 import test from 'tape';
 import vtkAnimationTrack from 'vtk.js/Sources/Common/DataModel/AnimationTrack';
 import vtkAnimationClip from 'vtk.js/Sources/Common/DataModel/AnimationClip';
-import {
-  TrackType,
-  InterpolationMode,
-} from 'vtk.js/Sources/Common/DataModel/AnimationTrack/Constants';
+import { TrackType } from 'vtk.js/Sources/Common/DataModel/AnimationTrack/Constants';
 
 test('vtkAnimationClip: Basic instantiation', (t) => {
   const clip = vtkAnimationClip.newInstance();

Sources/Common/DataModel/Armature/index.js

@@ -562,14 +562,14 @@ function vtkArmature(publicAPI, model) {
 
       for (let ti = 0; ti < tracks.length; ti++) {
         const track = tracks[ti];
-        if (track.getBoneIndex() !== i) continue;
+        if (track.getBoneIndex() === i) {
+          const trackType = track.getTrackType();
+          const value = track.evaluate(time);
 
-        const trackType = track.getTrackType();
-        const value = track.evaluate(time);
-
-        if (trackType === 0) t = value;
-        else if (trackType === 1) r = value;
-        else if (trackType === 2) s = value;
+          if (trackType === 0) t = value;
+          else if (trackType === 1) r = value;
+          else if (trackType === 2) s = value;
+        }
       }
 
       const offset = i * 16;

Sources/Filters/Sources/ArmatureSource/index.js

@@ -47,7 +47,6 @@ function vtkArmatureSource(publicAPI, model) {
     const lines = vtkCellArray.newInstance();
 
     // Generate joint points and bone links
-    let lineCount = 0;
     for (let i = 0; i < boneCount; i++) {
       const bone = skeleton.getBone(i);
       const parentIdx = bone.parentIndex;
@@ -62,7 +61,6 @@ function vtkArmatureSource(publicAPI, model) {
       // If has parent, draw line from parent to this bone
       if (parentIdx !== -1) {
         lines.insertNextCell([parentIdx, i]);
-        lineCount++;
       }
     }