Merge branch 'LogicFixes' into 'main'

[REMIX-4811, REMIX-4789, REMIX-4779, REMIX-4827, REMIX-4823] fixing several Remix Logic bugs

See merge request lightspeedrtx/dxvk-remix-nv!1837

Author: MarkEHenderson

documentation/components/EqualTo.md

@@ -15,6 +15,7 @@ Returns true if A is equal to B, false otherwise\.<br/><br/>For floating point v
 |----------|--------------|------|---------|---------------|----------|
 | a | A | NumberOrVector | Input | 0 | No | 
 | b | B | NumberOrVector | Input | 0 | No | 
+| tolerance | Tolerance | Float | Input | 0\.00001 | No | 
 
 ### A
 
@@ -26,6 +27,11 @@ The first value to compare\.
 The second value to compare\.
 
 
+### Tolerance
+
+The tolerance for rounding errors\. Math operations with floating point values are not exact, so equality comparisons should allow for slightly different values\. If the difference between A and B is less than Tolerance, the result will be true\.
+
+
 ## Output Properties
 
 | Property | Display Name | Type | IO Type | Default Value | Optional |
@@ -41,12 +47,12 @@ True if A == B, false otherwise
 
 This component supports flexible types. The following type combinations are valid:
 
-| # | a | b | result |
-|---|---|---|---|
-| 1 | Float | Float | Bool |
-| 2 | Float2 | Float2 | Bool |
-| 3 | Float3 | Float3 | Bool |
-| 4 | Float4 | Float4 | Bool |
+| # | a | b | result | tolerance |
+|---|---|---|---|---|
+| 1 | Float | Float | Bool | Float |
+| 2 | Float2 | Float2 | Bool | Float |
+| 3 | Float3 | Float3 | Bool | Float |
+| 4 | Float4 | Float4 | Bool | Float |
 
 ## Usage Notes
 

documentation/components/MeshHashChecker.md

@@ -1,6 +1,6 @@
 # Mesh Hash Checker
 
-Detects if a specific mesh is currently being drawn in the scene\.<br/><br/>Checks if a specific mesh hash was processed in the current frame\.
+Detects if a specific mesh is currently being drawn in the scene\.<br/><br/>This checks all meshes that the game sends to Remix in the current frame, which will probably include meshes that are off camera or occluded\.
 
 ## Component Information
 

documentation/components/MeshProximity.md

@@ -1,6 +1,6 @@
 # Mesh Proximity
 
-Measures how far a point is from a mesh's bounding box\. This can be used to determine if the camera is close to a mesh, or inside of a room\.<br/><br/>Calculates the signed distance from a world position to a mesh's bounding box\. Positive values indicate the point is outside the bounding box, negative values indicate it's inside\.<br/><br/>Note that the output is in object space\.
+Measures how far a point is from a mesh's bounding box\. This can be used to determine if the camera is close to a mesh, or inside of a room\.<br/><br/>Calculates the signed distance from a world position to a mesh's bounding box\. Positive values indicate the point is outside the bounding box, negative values indicate it's inside\.<br/><br/>Note that the output is in object space, so if the mesh is scaled, the distance may not correspond to world units\.
 
 ## Component Information
 
@@ -21,27 +21,27 @@ Measures how far a point is from a mesh's bounding box\. This can be used to det
 
 ### Target
 
-The mesh prim to get bounding box from\. Must be a mesh prim\.
+The mesh prim to get bounding box from\. Must be a UsdGeomMesh prim \(the actual geometry\)\.
 
 
 ### World Position
 
-The world space position to test against the mesh bounding box\.
+The world space position to test against the mesh bounding box\. This is often the \`Position\` output from the \`Camera\` component, if checking how close the camera is to the mesh\.
 
 
 ### Inactive Distance
 
-The distance inside the bounding box that corresponds to a normalized value of 0\.0\.  Positive numbers represent values outside the AABB\. 
+When the \`World Position\` is this far from the mesh's bounding box, \`Activation Strength\` will be 0\. Positive numbers represent mean \`World Position\` is outside the box, negative numbers mean it is inside the box\.
 
 
 ### Full Activation Distance
 
-The distance inside the bounding box that corresponds to a normalized value of 1\.0\.  Positive numbers represent values outside the AABB\. 
+When the \`World Position\` is this far from the mesh's bounding box, \`Activation Strength\` will be 1\. Positive numbers represent mean \`World Position\` is outside the box, negative numbers mean it is inside the box\.
 
 
 ### Easing Type
 
-The type of easing to apply to the normalized output\.
+The type of easing to apply to the \`Activation Strength\` output\.  
 
 Underlying Type: `Enum`
 
@@ -67,12 +67,12 @@ Underlying Type: `Enum`
 
 ### Signed Distance
 
-Distance in object space to the nearest bounding box plane\. Positive when outside, negative when inside\.  Outputs FLT\_MAX when no valid bounding box is found\.
+Distance in object space to the nearest point on the surface of the bounding box\. Positive when outside the bounding box, negative when inside\. Outputs a very large number when no valid bounding box is found\. Because this is in object space, if the object is scaled, the distance may not correspond to world units\.
 
 
 ### Activation Strength
 
-Normalized 0\-1 value: 0 when on bounding box surface, 1 when at max distance inside \(with easing applied\)\.
+Normalized 0\-1 value: 0 when \`Signed Distance\` = \`Inactive Distance\`, 1 when it equals \`Full Activation Distance\`\. This is often passed directly to the \`Blend Strength\` of \`Rtx Option Layer Action\` to enable a conf layer when the camera is close to the mesh\.
 
 
 ## Usage Notes

documentation/components/index.md

@@ -62,7 +62,7 @@ This documentation provides detailed information about all available components
 | [Fog Hash Checker](FogHashChecker.md) | Detects if a specific fog state is currently active in the scene\.<br/><br/>Checks if a given fog hash matche\.\.\. | 1 |
 | [Keyboard Input](KeyboardInput.md) | Detects when keyboard keys are pressed, held, or released\.<br/><br/>Checks the state of a keyboard key or ke\.\.\. | 1 |
 | [Light Hash Checker](LightHashChecker.md) | Detects if a specific light is currently active in the scene\.<br/><br/>Checks if a specific light hash is pr\.\.\. | 1 |
-| [Mesh Hash Checker](MeshHashChecker.md) | Detects if a specific mesh is currently being drawn in the scene\.<br/><br/>Checks if a specific mesh hash wa\.\.\. | 1 |
+| [Mesh Hash Checker](MeshHashChecker.md) | Detects if a specific mesh is currently being drawn in the scene\.<br/><br/>This checks all meshes that the g\.\.\. | 1 |
 | [Mesh Proximity](MeshProximity.md) | Measures how far a point is from a mesh's bounding box\. This can be used to determine if the camera \.\.\. | 1 |
 | [Ray Mesh Intersection](RayMeshIntersection.md) | Tests if a ray intersects with a mesh\.<br/><br/>Performs a ray\-mesh intersection test\. Currently supports bo\.\.\. | 1 |
 | [Read Bone Transform](ReadBoneTransform.md) | Reads the transform \(position, rotation, scale\) of a bone from a skinned mesh\.<br/><br/>Extracts the transfo\.\.\. | 1 |

src/dxvk/rtx_render/graph/components/equal_to.h

@@ -28,9 +28,20 @@
 namespace dxvk {
 namespace components {
 
+namespace {
+  constexpr bool isVectorPropertyType(RtComponentPropertyType type) {
+    return type == RtComponentPropertyType::Float2 ||
+           type == RtComponentPropertyType::Float3 ||
+           type == RtComponentPropertyType::Float4;
+  }
+}
+
 #define LIST_INPUTS(X) \
   X(RtComponentPropertyType::NumberOrVector, 0, a, "A","The first value to compare.") \
-  X(RtComponentPropertyType::NumberOrVector, 0, b, "B","The second value to compare.")
+  X(RtComponentPropertyType::NumberOrVector, 0, b, "B","The second value to compare.") \
+  X(RtComponentPropertyType::Float, 0.00001f, tolerance, "Tolerance", "The tolerance for rounding errors."\
+    " Math operations with floating point values are not exact, so equality comparisons should allow for slightly different values." \
+    " If the difference between A and B is less than Tolerance, the result will be true.")
 
 #define LIST_STATES(X)
 
@@ -42,6 +53,7 @@ namespace components {
 template <RtComponentPropertyType aPropertyType, RtComponentPropertyType bPropertyType>
 class EqualTo : public RtRegisteredComponentBatch<EqualTo<aPropertyType, bPropertyType>> {
 private:
+  static constexpr RtComponentPropertyType tolerancePropertyType = RtComponentPropertyType::Float;
   static constexpr RtComponentPropertyType resultPropertyType = RtComponentPropertyType::Bool;
   REMIX_COMPONENT_BODY(
     /* the Component class name */ EqualTo,
@@ -58,7 +70,14 @@ class EqualTo : public RtRegisteredComponentBatch<EqualTo<aPropertyType, bProper
       // This is needed to allow things like Vector3 == int32_t, etc.
       #pragma warning(push)
       #pragma warning(disable: 4244)
-      m_result[i] = m_a[i] == m_b[i];
+      auto diff = m_a[i] - m_b[i];
+      if constexpr (isVectorPropertyType(aPropertyType)) {
+        // For vectors, use length squared to avoid sqrt
+        auto tolSqr = m_tolerance[i] * m_tolerance[i];
+        m_result[i] = lengthSqr(diff) < tolSqr;
+      } else {
+        m_result[i] = std::abs(diff) < m_tolerance[i];
+      }
       #pragma warning(pop)
     }
   }

src/dxvk/rtx_render/graph/components/mesh_hash_checker.h

@@ -42,7 +42,7 @@ REMIX_COMPONENT( \
   /* the UI name */        "Mesh Hash Checker", \
   /* the UI categories */  "Sense", \
   /* the doc string */     "Detects if a specific mesh is currently being drawn in the scene.\n\n" \
-    "Checks if a specific mesh hash was processed in the current frame.", \
+    "This checks all meshes that the game sends to Remix in the current frame, which will probably include meshes that are off camera or occluded.", \
   /* the version number */ 1, \
   LIST_INPUTS, LIST_STATES, LIST_OUTPUTS);
 

src/dxvk/rtx_render/graph/components/mesh_proximity.h

@@ -36,29 +36,44 @@ namespace dxvk {
 namespace components {
 
 #define LIST_INPUTS(X) \
-  X(RtComponentPropertyType::Prim, kInvalidPrimTarget, target, "Target", "The mesh prim to get bounding box from. Must be a mesh prim.", \
+  X(RtComponentPropertyType::Prim, kInvalidPrimTarget, target, "Target", \
+    "The mesh prim to get bounding box from. Must be a UsdGeomMesh prim (the actual geometry).", \
     property.allowedPrimTypes = {PrimType::UsdGeomMesh}) \
-  X(RtComponentPropertyType::Float3, Vector3(0.0f, 0.0f, 0.0f), worldPosition, "World Position", "The world space position to test against the mesh bounding box.") \
-  X(RtComponentPropertyType::Float, 1.0f, inactiveDistance, "Inactive Distance", "The distance inside the bounding box that corresponds to a normalized value of 0.0.  Positive numbers represent values outside the AABB. ", property.optional = true) \
-  X(RtComponentPropertyType::Float, 0.0f, fullActivationDistance, "Full Activation Distance", "The distance inside the bounding box that corresponds to a normalized value of 1.0.  Positive numbers represent values outside the AABB. ", property.optional = true) \
+  X(RtComponentPropertyType::Float3, Vector3(0.0f, 0.0f, 0.0f), worldPosition, "World Position", \
+    "The world space position to test against the mesh bounding box." \
+    " This is often the `Position` output from the `Camera` component, if checking how close the camera is to the mesh.") \
+  X(RtComponentPropertyType::Float, 1.0f, inactiveDistance, "Inactive Distance", \
+    "When the `World Position` is this far from the mesh's bounding box, `Activation Strength` will be 0." \
+    " Positive numbers represent mean `World Position` is outside the box, negative numbers mean it is inside the box.", \
+    property.optional = true) \
+  X(RtComponentPropertyType::Float, 0.0f, fullActivationDistance, "Full Activation Distance", \
+    "When the `World Position` is this far from the mesh's bounding box, `Activation Strength` will be 1." \
+    " Positive numbers represent mean `World Position` is outside the box, negative numbers mean it is inside the box.", \
+    property.optional = true) \
   X(RtComponentPropertyType::Enum, static_cast<uint32_t>(InterpolationType::Linear), easingType, "Easing Type", \
-    "The type of easing to apply to the normalized output.", \
+    "The type of easing to apply to the `Activation Strength` output.  ", \
     property.optional = true, \
     property.enumValues = kInterpolationTypeEnumValues)
 
 #define LIST_STATES(X)
 
 #define LIST_OUTPUTS(X) \
-  X(RtComponentPropertyType::Float, 0.0f, signedDistance, "Signed Distance", "Distance in object space to the nearest bounding box plane. Positive when outside, negative when inside.  Outputs FLT_MAX when no valid bounding box is found.") \
-  X(RtComponentPropertyType::Float, 0.0f, activationStrength, "Activation Strength", "Normalized 0-1 value: 0 when on bounding box surface, 1 when at max distance inside (with easing applied).")
+  X(RtComponentPropertyType::Float, 0.0f, signedDistance, "Signed Distance", \
+    "Distance in object space to the nearest point on the surface of the bounding box." \
+    " Positive when outside the bounding box, negative when inside." \
+    " Outputs a very large number when no valid bounding box is found." \
+    " Because this is in object space, if the object is scaled, the distance may not correspond to world units.") \
+  X(RtComponentPropertyType::Float, 0.0f, activationStrength, "Activation Strength", \
+    "Normalized 0-1 value: 0 when `Signed Distance` = `Inactive Distance`, 1 when it equals `Full Activation Distance`." \
+    " This is often passed directly to the `Blend Strength` of `Rtx Option Layer Action` to enable a conf layer when the camera is close to the mesh.") \
 
 REMIX_COMPONENT( \
   /* the Component name */ MeshProximity, \
   /* the UI name */        "Mesh Proximity", \
   /* the UI categories */  "Sense", \
   /* the doc string */     "Measures how far a point is from a mesh's bounding box. This can be used to determine if the camera is close to a mesh, or inside of a room.\n\n" \
     "Calculates the signed distance from a world position to a mesh's bounding box. Positive values indicate the point is outside the bounding box, negative values indicate it's inside.\n\n" \
-    "Note that the output is in object space.", \
+    "Note that the output is in object space, so if the mesh is scaled, the distance may not correspond to world units.", \
   /* the version number */ 1, \
   LIST_INPUTS, LIST_STATES, LIST_OUTPUTS);
 

src/dxvk/rtx_render/graph/rtx_graph_batch.cpp

@@ -98,10 +98,6 @@ namespace {
 void RtGraphBatch::Initialize(const RtGraphTopology& topology) {
   // NOTE: need to do this separate from the constructor, because the address of `this` changes when it's moved.
   ScopedCpuProfileZone();
-  if (topology.componentSpecs.empty()) {
-    Logger::err("RtGraphTopology has no component specs");
-    return;
-  }
 
   // Store pointer to topology for GUI access (safe because topology lives in stable asset storage)
   m_topology = &topology;

src/dxvk/rtx_render/graph/rtx_graph_batch.h

@@ -67,8 +67,11 @@ class RtGraphBatch {
   }
 
   // Safety and validation methods
-  bool isValid() const {
-    return !m_componentBatches.empty() && !m_properties.empty();
+
+  // Returns true if the graph has no valid components.
+  // Empty graphs can exist without causing errors, but they won't do anything.
+  bool isEmpty() const {
+    return m_componentBatches.empty();
   }
 
   bool hasInstance(size_t index) const {

src/dxvk/rtx_render/graph/rtx_graph_gui.cpp

@@ -145,7 +145,12 @@ void RtxGraphGUI::showGraphSelector(const SceneManager& sceneManager) {
 
 void RtxGraphGUI::showComponentList() {
   if (m_components.empty()) {
-    ImGui::Text("No components in selected graph instance");
+    if (m_selectedGraphIsEmpty) {
+      ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.3f, 1.0f), "Empty graph - no valid components found");
+      ImGui::TextWrapped("This graph has no components. This can happen when all components "
+                         "failed to load, are unsupported, or were filtered out.");
+    }
+    ImGui::Text("No graph selected.");
     return;
   }
   if (ImGui::CollapsingHeader("Components:", ImGuiTreeNodeFlags_DefaultOpen)) {
@@ -155,8 +160,8 @@ void RtxGraphGUI::showComponentList() {
     for (size_t i = 0; i < m_components.size(); ++i) {
       const auto& component = m_components[i];
 
-      // Component header with collapsible tree node
-      std::string headerText = component.typeName;
+      // Component header with collapsible tree node.  Included the index so each section has a unique name.
+      std::string headerText = component.typeName + " (" + std::to_string(i) + ")";
 
       if (ImGui::CollapsingHeader(headerText.c_str())) {
         // Show component description as tooltip on header hover
@@ -230,6 +235,7 @@ void RtxGraphGUI::showComponentList() {
 void RtxGraphGUI::updateGraphData(const SceneManager& sceneManager) {
   // Clear existing data
   m_components.clear();
+  m_selectedGraphIsEmpty = false;
 
   if (m_selectedInstanceId == kInvalidInstanceId) {
     return;
@@ -254,6 +260,13 @@ void RtxGraphGUI::updateGraphData(const SceneManager& sceneManager) {
   }
 
   const RtGraphBatch& batch = batchIt->second;
+  
+  // Handle empty graphs gracefully - they have no components to display
+  if (batch.isEmpty()) {
+    m_selectedGraphIsEmpty = true;
+    return;
+  }
+  
   const auto& componentBatches = batch.getComponentBatches();
   const auto& topology = batch.getTopology();
   const auto& properties = batch.getProperties();
@@ -346,7 +359,6 @@ std::string RtxGraphGUI::extractGraphInstanceName(const GraphManager& graphManag
     return "Instance " + std::to_string(graphInstance.getId()) + " (Hash: " + hashStream.str() + ")";
   }
 
-  const RtGraphBatch& batch = batchIt->second;
   const auto& initialGraphState = graphInstance.getInitialGraphState();
 
   // Use the stored prim path from the topology
@@ -437,6 +449,8 @@ std::string RtxGraphGUI::formatPropertyValue(const RtComponentPropertyValue& val
       return ss.str();
     } else if constexpr (std::is_same_v<T, std::string>) {
       return "\"" + v + "\"";
+    } else if constexpr (std::is_same_v<T, PrimTarget>) {
+      return "instance: " + std::to_string(v.instanceId) + ", index: " + std::to_string(v.replacementIndex);
     } else {
       return "Unknown";
     }