CMake/vtkModuleTesting.cmake

@@ -719,6 +719,8 @@ Options:
 
 Additional flags may be passed to tests using the ``${_vtk_build_test}_ARGS``
 variable or the ``<NAME>_ARGS`` variable.
+To use a different baseline name than ``<NAME>`` you can set
+``<NAME>_BASELINE_NAME`` variable. This is the name of the image file without extension.
 #]==]
 function (vtk_add_test_python)
   if (NOT _vtk_testing_python_exe)
@@ -761,17 +763,22 @@ function (vtk_add_test_python)
     set(_V "")
     set(image_compare_method ${default_image_compare})
     if (NOT local_NO_VALID)
+      if (DEFINED "${test_name}_BASELINE_NAME")
+        set(baseline_name "${${test_name}_BASELINE_NAME}")
+      else()
+        set(baseline_name "${test_name}")
+      endif()
       if (local_NO_RT)
         if (local_DIRECT_DATA)
           set(_B -B "${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline/")
         else ()
-          set(_B -B "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/,REGEX:${test_name}(-.*)?(_[0-9]+)?.png}")
+          set(_B -B "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/,REGEX:${baseline_name}(-.*)?(_[0-9]+)?.png}")
         endif()
       else ()
         if (local_DIRECT_DATA)
-          set(_V -V "${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline/${test_name}.png")
+          set(_V -V "${CMAKE_CURRENT_SOURCE_DIR}/Data/Baseline/${baseline_name}.png")
         else ()
-          set(_V -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/${test_name}.png,:}")
+          set(_V -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/${baseline_name}.png,:}")
         endif()
         if (NOT local_JUST_VALID)
           set(rtImageTest -m "vtkmodules.test.rtImageTest")

CMake/vtkVersion.cmake

@@ -6,7 +6,7 @@ set(VTK_MINOR_VERSION 4)
 # the date component is updated while it is in progress, the bump of the minor
 # version ends up conflicting with the patch version update.
 
-set(VTK_BUILD_VERSION 20241217)
+set(VTK_BUILD_VERSION 20241220)
 
 if (NOT VTK_MINOR_VERSION LESS 100)
   message(FATAL_ERROR

Common/Core/vtkScalarsToColors.cxx

 // SPDX-FileCopyrightText: Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
 // SPDX-License-Identifier: BSD-3-Clause
+
+// VTK_DEPRECATED_IN_9_5_0()
+#define VTK_DEPRECATION_LEVEL 0
+
 #include "vtkScalarsToColors.h"
 
 #include "vtkAbstractArray.h"
@@ -45,7 +49,7 @@ vtkScalarsToColors::vtkScalarsToColors()
   this->IndexedLookup = 0;
 
 #if !defined(VTK_LEGACY_REMOVE)
-  // obsolete, kept for backwards compatibility
+  // VTK_DEPRECATED_IN_9_5_0()
   this->UseMagnitude = 0;
 #endif
 }

Common/Core/vtkScalarsToColors.h

@@ -35,6 +35,7 @@
 #define vtkScalarsToColors_h
 
 #include "vtkCommonCoreModule.h" // For export macro
+#include "vtkDeprecation.h"      // For VTK_DEPRECATED_IN_9_5_0
 #include "vtkObject.h"
 #include "vtkVariant.h"       // Set/get annotation methods require variants.
 #include "vtkWrappingHints.h" // For VTK_MARSHALAUTO
@@ -446,7 +447,7 @@ protected:
   int VectorSize;
 
 #if !defined(VTK_LEGACY_REMOVE)
-  // Obsolete, kept so subclasses will still compile
+  VTK_DEPRECATED_IN_9_5_0("UseMagnitude is ignored and will be removed")
   int UseMagnitude;
 #endif
 

Common/DataModel/vtkBoundingBox.cxx

@@ -765,6 +765,22 @@ bool vtkBoundingBox::IntersectsLine(const double p1[3], const double p2[3]) cons
   return false;
 }
 
+// ---------------------------------------------------------------------------
+void vtkBoundingBox::ClampPoint(double point[3])
+{
+  for (int i = 0; i < 3; i++)
+  {
+    if (point[i] < this->MinPnt[i])
+    {
+      point[i] = this->MinPnt[i];
+    }
+    else if (point[i] > this->MaxPnt[i])
+    {
+      point[i] = this->MaxPnt[i];
+    }
+  }
+}
+
 // ---------------------------------------------------------------------------
 int vtkBoundingBox::ComputeInnerDimension() const
 {

Common/DataModel/vtkBoundingBox.h

@@ -31,8 +31,18 @@ public:
    * VTK_DOUBLE_MAX and the max point set to VTK_DOUBLE_MIN.
    */
   vtkBoundingBox();
+  /**
+   * Construct a bounding box with given bounds.
+   */
   vtkBoundingBox(const double bounds[6]);
+  /**
+   * Construct a bounding box with given bounds.
+   */
   vtkBoundingBox(double xMin, double xMax, double yMin, double yMax, double zMin, double zMax);
+  /**
+   * Construct a bounding box around center, inflated by delta (so final length is 2*delta)
+   */
+  vtkBoundingBox(double center[3], double delta);
   ///@}
 
   /**
@@ -365,6 +375,12 @@ public:
    */
   void Reset();
 
+  /**
+   * Clamp point so it is contained inside box.
+   * Each coordinate is clamped with box bounds.
+   */
+  void ClampPoint(double point[3]);
+
 protected:
   double MinPnt[3], MaxPnt[3];
 };
@@ -496,6 +512,13 @@ inline vtkBoundingBox::vtkBoundingBox(const vtkBoundingBox& bbox)
   this->MaxPnt[2] = bbox.MaxPnt[2];
 }
 
+inline vtkBoundingBox::vtkBoundingBox(double center[3], double delta)
+{
+  this->Reset();
+  this->AddPoint(center);
+  this->Inflate(delta);
+}
+
 inline vtkBoundingBox& vtkBoundingBox::operator=(const vtkBoundingBox& bbox)
 {
   this->MinPnt[0] = bbox.MinPnt[0];

Common/DataModel/vtkConvexPointSet.h

@@ -20,6 +20,7 @@
 
 #include "vtkCell3D.h"
 #include "vtkCommonDataModelModule.h" // For export macro
+#include "vtkDeprecation.h"           // For VTK_DEPRECATED_IN_9_5_0
 
 VTK_ABI_NAMESPACE_BEGIN
 class vtkUnstructuredGrid;
@@ -39,6 +40,7 @@ public:
    * See vtkCell3D API for description of this method.
    */
 #ifndef VTK_LEGACY_REMOVE
+  VTK_DEPRECATED_IN_9_5_0("HasFixedTopology() is always 0 and will be removed")
   virtual vtkTypeBool HasFixedTopology() { return 0; }
 #endif
 

Common/DataModel/vtkCylinder.h

@@ -59,7 +59,7 @@ public:
   /**
    * Set/Get the cylinder radius.
    */
-  vtkSetMacro(Radius, double);
+  vtkSetClampMacro(Radius, double, 0, VTK_DOUBLE_MAX);
   vtkGetMacro(Radius, double);
   ///@}
 

Common/DataModel/vtkFrustum.cxx

@@ -16,7 +16,7 @@ vtkStandardNewMacro(vtkFrustum);
 //------------------------------------------------------------------------------
 vtkFrustum::vtkFrustum()
 {
-  this->NearPlane->SetNormal(0, 1, 0);
+  this->NearPlane->SetNormal(0, -1, 0);
   this->NearPlane->SetOrigin(0, this->NearPlaneDistance, 0);
 
   this->CalculateHorizontalPlanesNormal();
@@ -28,7 +28,7 @@ vtkFrustum::vtkFrustum()
   this->BooleanOp->AddFunction(this->RightPlane);
   this->BooleanOp->AddFunction(this->LeftPlane);
 
-  this->BooleanOp->SetOperationTypeToUnion();
+  this->BooleanOp->SetOperationTypeToIntersection();
 }
 
 //------------------------------------------------------------------------------
@@ -43,7 +43,7 @@ double vtkFrustum::EvaluateFunction(double x[3])
 //------------------------------------------------------------------------------
 void vtkFrustum::EvaluateGradient(double x[3], double g[3])
 {
-  return this->BooleanOp->EvaluateGradient(x, g);
+  this->BooleanOp->EvaluateGradient(x, g);
 }
 
 //------------------------------------------------------------------------------
@@ -104,8 +104,8 @@ void vtkFrustum::CalculateHorizontalPlanesNormal()
   double cosAngle = std::cos(angleRadians);
   double sinAngle = std::sin(angleRadians);
 
-  vtkVector3d leftPlaneNormal(cosAngle, sinAngle, 0);
-  vtkVector3d rightPlaneNormal(-cosAngle, sinAngle, 0);
+  vtkVector3d leftPlaneNormal(cosAngle, -sinAngle, 0);
+  vtkVector3d rightPlaneNormal(-cosAngle, -sinAngle, 0);
 
   this->RightPlane->SetNormal(rightPlaneNormal.GetData());
   this->LeftPlane->SetNormal(leftPlaneNormal.GetData());
@@ -118,8 +118,8 @@ void vtkFrustum::CalculateVerticalPlanesNormal()
   double cosAngle = std::cos(angleRadians);
   double sinAngle = std::sin(angleRadians);
 
-  vtkVector3d topPlaneNormal(0, sinAngle, -cosAngle);
-  vtkVector3d bottomPlaneNormal(0, sinAngle, cosAngle);
+  vtkVector3d topPlaneNormal(0, -sinAngle, -cosAngle);
+  vtkVector3d bottomPlaneNormal(0, -sinAngle, cosAngle);
 
   this->TopPlane->SetNormal(topPlaneNormal.GetData());
   this->BottomPlane->SetNormal(bottomPlaneNormal.GetData());

Common/DataModel/vtkFrustum.h

@@ -89,9 +89,15 @@ private:
   vtkFrustum(const vtkFrustum&) = delete;
   void operator=(const vtkFrustum&) = delete;
 
-  /// Compute and set the horizontal or vertical planes' normals according to the defined angle
+  ///@{
+  /**
+   * Compute and set the horizontal or vertical planes' normals according to the defined angle
+   * Normals are pointing "outside" the frustum
+   * @see vtkImplicitFunction and EvaluateFunction
+   */
   void CalculateHorizontalPlanesNormal();
   void CalculateVerticalPlanesNormal();
+  ///@}
 
   double NearPlaneDistance = 0.5;
   double VerticalAngle = 30;

Documentation/release/dev/add-XArrayToNetCDFCFReader.md

+## Add to the NetCDFCFReader the ability to use data from an XArray
+
+An XArray can create a vtkNetCDFCFReader that uses its data, using
+zero copy when possible to create a VTK dataset using ``` reader =
+xarray_data.vtk.reader() ``` Any `vtkNetCDFCFReader` options can be
+set (`FileName` is ignored), and the reader can be used as usual in a VTK
+pipeline.

Documentation/release/dev/add-raytraced-lightwidget.md

+## Add vtkLightWidget to path-traced environments
+
+The `vtkRenderingRayTracing` module now supports rendering and interaction with the `vtkLightWidget`
+to be able to interactively place and modify lights in the view.
+
+![](https://vtk.org/files/ExternalData/SHA512/53b5e6ab5f30f59915be20da76fb415181d7fba709964f0d78de60bcc24abb860d2f339dfeaad26da8dfbe4f674617a65132ec442955c9ba9768d9c630693a8b)
+
+![](./lightwidget_pathtracing.png)

Documentation/release/dev/rectgrid-celldata.md

+## Rectilinear Grid Volume Rendering with Cell Data
+
+Fixed an issue in the volume mapper for rectilinear grids with cell scalars where the bounds of the
+dataset were incorrectly mapped to the texture space.
+
+|Before|After|
+|:--:|:--:|
+|![](./rectgrid_celldata_pre.png)|![](./rectgrid_celldata_fixed.png)|

Documentation/release/dev/widget-representations-improvements.md

+## Implicit Widget Representations Improvements
+
+VTK has better support for several vtkWidgetRepresentation subclasses.
+
+### Bug fixes
+Interactions are smoother thanks to a better Picker choice.
+Also, interactively modifying radius (for Annulus, Cone and Cylinder) used to
+be based on screen motion. Switching to mouse world position makes it
+more intuitive: circle effectively follow the mouse cursor.
+
+### New BoundedWidget design
+vtkBoundedWidgetRepresentation is a new vtkWidgetRepresentation subclass,
+to inherits from to benefit of a "crop at outline" feature.
+This is useful for most vtkImplicitFunction representations.
+
+### API breaking changes
+The classes that were ported to the vtkBoundedWidgetRepresentation design
+loose some protected member, as the new parent class has same member as `private`.
+Please use the Getters instead.
+
+Concerned classes:  vtkImplicitConeRepresentation, vtkImplicitCylinderRepresentation,
+vtkImplicitAnnulusRepresentation and vtkImplicitPlaneRepresentation

IO/Geometry/vtkGLTFDocumentLoader.cxx

@@ -1230,6 +1230,85 @@ bool vtkGLTFDocumentLoader::BuildPolyDataFromPrimitive(Primitive& primitive)
   return true;
 }
 
+//------------------------------------------------------------------------------
+bool vtkGLTFDocumentLoader::BuildPolyDataFromSkin(Skin& skin)
+{
+  if (skin.Skeleton >= 0 && skin.Skeleton < static_cast<int>(this->InternalModel->Nodes.size()))
+  {
+    skin.Armature = vtkSmartPointer<vtkPolyData>::New();
+
+    vtkNew<vtkPoints> points;
+    points->SetNumberOfPoints(skin.Joints.size());
+
+    vtkNew<vtkCellArray> vertices;
+
+    std::vector<int> nodeMapping(this->InternalModel->Nodes.size(), -1);
+
+    for (size_t i = 0; i < skin.Joints.size(); i++)
+    {
+      if (skin.Joints[i] >= static_cast<int>(nodeMapping.size()))
+      {
+        // invalid index
+        return false;
+      }
+
+      double p[3] = {};
+
+      auto trs = this->InternalModel->Nodes[skin.Joints[i]].GlobalTransform;
+      if (trs)
+      {
+        p[0] = trs->GetElement(0, 3);
+        p[1] = trs->GetElement(1, 3);
+        p[2] = trs->GetElement(2, 3);
+      }
+
+      points->SetPoint(i, p);
+
+      vtkIdType vId = i;
+      vertices->InsertNextCell(1, &vId);
+
+      nodeMapping[skin.Joints[i]] = static_cast<int>(i);
+    }
+
+    vtkNew<vtkCellArray> lines;
+
+    std::function<bool(int)> VisitJoint = [&](int nodeIndex)
+    {
+      const Node& node = this->InternalModel->Nodes[nodeIndex];
+
+      int mappedNode = nodeMapping[nodeIndex];
+
+      if (mappedNode == -1)
+      {
+        return false;
+      }
+
+      for (int childIndex : node.Children)
+      {
+        int mappedChild = nodeMapping[childIndex];
+
+        if (mappedChild == -1)
+        {
+          return false;
+        }
+
+        lines->InsertNextCell({ mappedNode, mappedChild });
+        VisitJoint(childIndex);
+      }
+
+      return true;
+    };
+
+    skin.Armature->SetPoints(points);
+    skin.Armature->SetVerts(vertices);
+    skin.Armature->SetLines(lines);
+
+    return VisitJoint(skin.Skeleton);
+  }
+
+  return false;
+}
+
 //------------------------------------------------------------------------------
 void vtkGLTFDocumentLoader::Node::UpdateTransform()
 {
@@ -1519,6 +1598,11 @@ bool vtkGLTFDocumentLoader::BuildModelVTKGeometry()
       this->BuildGlobalTransforms(node, nullptr);
     }
   }
+  // Build armatures
+  for (Skin& skin : this->InternalModel->Skins)
+  {
+    this->BuildPolyDataFromSkin(skin);
+  }
 
   return true;
 }

IO/Geometry/vtkGLTFDocumentLoader.h

@@ -376,6 +376,7 @@ public:
     int InverseBindMatricesAccessorId;
     int Skeleton;
     std::string Name;
+    vtkSmartPointer<vtkPolyData> Armature;
   };
 
   /**
@@ -654,6 +655,11 @@ private:
    */
   bool BuildPolyDataFromPrimitive(Primitive& primitive);
 
+  /**
+   * Creates and populates the Skin's geometry vtkPolyData member with all the armature hierarchy
+   */
+  bool BuildPolyDataFromSkin(Skin& skin);
+
   /**
    * Load keyframes from buffers.
    */

IO/Import/Testing/Cxx/CMakeLists.txt

@@ -118,6 +118,10 @@ vtk_add_test_cxx(vtkIOImportCxxTests tests
   TestGLTFImporterUnlit,TestGLTFImporter.cxx DATA{../Data/glTF/UnlitTest/UnlitTest.glb} -1 2 0 0
 )
 
+vtk_add_test_cxx(vtkIOImportCxxTests tests
+  TestGLTFImporterArmature,TestGLTFImporter.cxx DATA{../Data/glTF/Armature.gltf} -1 1 0 0
+)
+
 vtk_add_test_cxx(vtkIOImportCxxTests tests
   TestGLTFImporterURITexture,TestGLTFImporter.cxx DATA{../Data/glTF/Lantern/Lantern.gltf} -1 3 0 0
    DATA{../Data/glTF/Lantern/Lantern.bin}