[REMIX-4725] rename the component folder to line up with the toolkit extension names

MarkEHenderson · MarkEHenderson · commit a5f64d87d4b2 · 2025-11-06T12:44:47.000-08:00
diff --git a/src/dxvk/rtx_render/graph/rtx_graph_ogn_writer.cpp b/src/dxvk/rtx_render/graph/rtx_graph_ogn_writer.cpp
@@ -300,7 +300,7 @@ bool writePythonStub(const RtComponentSpec* spec, const char* outputFolderPath)
   outputFile << "from typing import TYPE_CHECKING" << std::endl;
   outputFile << std::endl;
   outputFile << "if TYPE_CHECKING:" << std::endl;
-  outputFile << "    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase" << std::endl;
+  outputFile << "    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase" << std::endl;
   outputFile << std::endl;
   outputFile << std::endl;
   outputFile << "class "<< escapeJsonString(spec->getClassName()) << ":" << std::endl;
diff --git a/src/dxvk/rtx_render/graph/rtx_graph_types.h b/src/dxvk/rtx_render/graph/rtx_graph_types.h
@@ -184,7 +184,7 @@ using RtComponentType = XXH64_hash_t;
 static const RtComponentType kInvalidComponentType = kEmptyHash;
 
 struct RtComponentPropertySpec {
-  static inline const std::string kUsdNamePrefix = "lightspeed.trex.components.";
+  static inline const std::string kUsdNamePrefix = "lightspeed.trex.logic.";
   
   RtComponentPropertyType type;
   RtComponentPropertyValue defaultValue;
diff --git a/src/ogn/lightspeed.trex.logic/AnimatedFloat.ogn b/src/ogn/lightspeed.trex.logic/AnimatedFloat.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.AnimatedFloat": {
+  "lightspeed.trex.logic.AnimatedFloat": {
     "description": ["A single animated float value."],
     "version": 1,
     "uiName": "Animated Float",
diff --git a/src/ogn/lightspeed.trex.logic/AnimatedFloat.py b/src/ogn/lightspeed.trex.logic/AnimatedFloat.py
@@ -1,14 +1,14 @@
-# GENERATED FILE - DO NOT EDIT
-# This file is a stub for OmniGraph editor compatibility, and is not used by the Remix Runtime.
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
-
-
-class AnimatedFloat:
-    @staticmethod
-    def compute(_db: OgnTemplateNodePyDatabase):
-        return True
+# GENERATED FILE - DO NOT EDIT
+# This file is a stub for OmniGraph editor compatibility, and is not used by the Remix Runtime.
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+
+
+class AnimatedFloat:
+    @staticmethod
+    def compute(_db: OgnTemplateNodePyDatabase):
+        return True
diff --git a/src/ogn/lightspeed.trex.logic/BoxProximity.ogn b/src/ogn/lightspeed.trex.logic/BoxProximity.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.BoxProximity": {
+  "lightspeed.trex.logic.BoxProximity": {
     "description": ["Calculates the signed distance from a world position to a mesh's bounding box. Positive values indicate the point is outside the bounding box.  Note that the output is in object space."],
     "version": 1,
     "uiName": "Box Proximity",
diff --git a/src/ogn/lightspeed.trex.logic/BoxProximity.py b/src/ogn/lightspeed.trex.logic/BoxProximity.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
 
 
 class BoxProximity:
diff --git a/src/ogn/lightspeed.trex.logic/Camera.ogn b/src/ogn/lightspeed.trex.logic/Camera.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.Camera": {
+  "lightspeed.trex.logic.Camera": {
     "description": ["Outputs current camera properties including position, orientation vectors, and projection parameters. Uses free camera when both 'rtx.camera.useFreeCameraForComponents' and free camera are enabled."],
     "version": 1,
     "uiName": "Camera",
diff --git a/src/ogn/lightspeed.trex.logic/Camera.py b/src/ogn/lightspeed.trex.logic/Camera.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
 
 
 class Camera:
diff --git a/src/ogn/lightspeed.trex.logic/InterpolateFloat.ogn b/src/ogn/lightspeed.trex.logic/InterpolateFloat.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.InterpolateFloat": {
+  "lightspeed.trex.logic.InterpolateFloat": {
     "description": ["Interpolates a value from an input range to an output range with optional easing. \nCombines normalization (reverse LERP), easing, and mapping (LERP) into a single component. \n\nNote input values outside of input range are valid, and that easing can lead to the output value being outside of the output range even when input is inside the input range.\nInverted input ranges (Input Max < Input Min) are supported - the min/max will be swapped and the normalized value inverted."],
     "version": 1,
     "uiName": "Interpolate Float",
diff --git a/src/ogn/lightspeed.trex.logic/InterpolateFloat.py b/src/ogn/lightspeed.trex.logic/InterpolateFloat.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
 
 
 class InterpolateFloat:
diff --git a/src/ogn/lightspeed.trex.logic/KeyboardInput.ogn b/src/ogn/lightspeed.trex.logic/KeyboardInput.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.KeyboardInput": {
+  "lightspeed.trex.logic.KeyboardInput": {
     "description": ["Checks the state of a keyboard key or key combination using the same format as RTX options."],
     "version": 1,
     "uiName": "Keyboard Input",
diff --git a/src/ogn/lightspeed.trex.logic/KeyboardInput.py b/src/ogn/lightspeed.trex.logic/KeyboardInput.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
 
 
 class KeyboardInput:
diff --git a/src/ogn/lightspeed.trex.logic/LoopFloat.ogn b/src/ogn/lightspeed.trex.logic/LoopFloat.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.LoopFloat": {
+  "lightspeed.trex.logic.LoopFloat": {
     "description": ["Applies looping behavior to a float value.  Value is unchanged if it is inside the range.\nComponent outputs Min Range if Min Range == Max Range and looping type is not None.\nInverted ranges (max < min) are supported, but the results are undefined and may change without warning."],
     "version": 1,
     "uiName": "Loop Float",
diff --git a/src/ogn/lightspeed.trex.logic/LoopFloat.py b/src/ogn/lightspeed.trex.logic/LoopFloat.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
 
 
 class LoopFloat:
diff --git a/src/ogn/lightspeed.trex.logic/MeshHashChecker.ogn b/src/ogn/lightspeed.trex.logic/MeshHashChecker.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.MeshHashChecker": {
+  "lightspeed.trex.logic.MeshHashChecker": {
     "description": ["Checks if a specific mesh hash was processed in the current frame."],
     "version": 1,
     "uiName": "Mesh Hash Checker",
diff --git a/src/ogn/lightspeed.trex.logic/MeshHashChecker.py b/src/ogn/lightspeed.trex.logic/MeshHashChecker.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
 
 
 class MeshHashChecker:
diff --git a/src/ogn/lightspeed.trex.logic/RtxOptionLayerAction.ogn b/src/ogn/lightspeed.trex.logic/RtxOptionLayerAction.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.RtxOptionLayerAction": {
+  "lightspeed.trex.logic.RtxOptionLayerAction": {
     "description": ["Controls an RtxOptionLayer by name, allowing dynamic enable/disable, strength adjustment, and threshold control. This can be used to activate configuration layers at runtime based on game state or other conditions. The layer is created if it doesn't exist, and managed with reference counting. Each layer requires a unique priority value - if multiple components specify the same priority, an error will occur."],
     "version": 1,
     "uiName": "Rtx Option Layer Action",
diff --git a/src/ogn/lightspeed.trex.logic/RtxOptionLayerAction.py b/src/ogn/lightspeed.trex.logic/RtxOptionLayerAction.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
 
 
 class RtxOptionLayerAction:
diff --git a/src/ogn/lightspeed.trex.logic/SphereLightOverride.ogn b/src/ogn/lightspeed.trex.logic/SphereLightOverride.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.SphereLightOverride": {
+  "lightspeed.trex.logic.SphereLightOverride": {
     "description": ["Override the sphere light properties."],
     "version": 1,
     "uiName": "Sphere Light",
diff --git a/src/ogn/lightspeed.trex.logic/SphereLightOverride.py b/src/ogn/lightspeed.trex.logic/SphereLightOverride.py
@@ -1,14 +1,14 @@
-# GENERATED FILE - DO NOT EDIT
-# This file is a stub for OmniGraph editor compatibility, and is not used by the Remix Runtime.
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
-
-
-class SphereLightOverride:
-    @staticmethod
-    def compute(_db: OgnTemplateNodePyDatabase):
-        return True
+# GENERATED FILE - DO NOT EDIT
+# This file is a stub for OmniGraph editor compatibility, and is not used by the Remix Runtime.
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+
+
+class SphereLightOverride:
+    @staticmethod
+    def compute(_db: OgnTemplateNodePyDatabase):
+        return True
diff --git a/src/ogn/lightspeed.trex.logic/TextureHashChecker.ogn b/src/ogn/lightspeed.trex.logic/TextureHashChecker.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.TextureHashChecker": {
+  "lightspeed.trex.logic.TextureHashChecker": {
     "description": ["Checks if a specific texture hash was used for material replacement in the current frame.  This includes textures in all categories, including ignored textures."],
     "version": 1,
     "uiName": "Texture Hash Checker",
diff --git a/src/ogn/lightspeed.trex.logic/TextureHashChecker.py b/src/ogn/lightspeed.trex.logic/TextureHashChecker.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
 
 
 class TextureHashChecker:
diff --git a/src/ogn/lightspeed.trex.logic/Time.ogn b/src/ogn/lightspeed.trex.logic/Time.ogn
@@ -1,5 +1,5 @@
 {
-  "lightspeed.trex.components.Time": {
+  "lightspeed.trex.logic.Time": {
     "description": ["Outputs the time in seconds since the component was created. Can be paused and speed-adjusted."],
     "version": 1,
     "uiName": "Time",
diff --git a/src/ogn/lightspeed.trex.logic/Time.py b/src/ogn/lightspeed.trex.logic/Time.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from lightspeed.trex.components.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
+    from lightspeed.trex.logic.ogn.ogn.OgnTemplateNodePyDatabase import OgnTemplateNodePyDatabase
 
 
 class Time:
diff --git a/tests/rtx/unit/test_graph_documentation.cpp b/tests/rtx/unit/test_graph_documentation.cpp
@@ -42,7 +42,7 @@
 namespace {
 
   // Shared constants for directory paths
-  const std::string kGoldenOgnDir = BUILD_SOURCE_ROOT "src/ogn/lightspeed.trex.components/";
+  const std::string kGoldenOgnDir = BUILD_SOURCE_ROOT "src/ogn/lightspeed.trex.logic/";
   const std::string kGoldenMdDir = BUILD_SOURCE_ROOT "documentation/components/";
   
   const std::string kModifiedOgnDir = "rtx-remix/schemas/";
@@ -122,7 +122,7 @@ namespace test_graph_documentation_app {
       std::string fileName = filePath1Path.filename().string();
       
       // Calculate relative path from the source root to preserve folder structure
-      // For OGN files: from src/ogn/lightspeed.trex.components/ to rtx-remix/golden/src/ogn/lightspeed.trex.components/
+      // For OGN files: from src/ogn/lightspeed.trex.logic/ to rtx-remix/golden/src/ogn/lightspeed.trex.logic/
       // For MD files: from documentation/components/ to rtx-remix/golden/documentation/components/
       std::filesystem::path goldenSourceDir = std::filesystem::path(filePath1).parent_path();
       std::filesystem::path sourceRoot = BUILD_SOURCE_ROOT; // The repository root
diff --git a/tests/rtx/unit/test_graph_usd_parser.cpp b/tests/rtx/unit/test_graph_usd_parser.cpp
@@ -80,7 +80,7 @@ class GraphUsdParserTest {
     
     // Add node:type attribute
     pxr::UsdAttribute typeAttr = nodePrim.CreateAttribute(pxr::TfToken("node:type"), pxr::SdfValueTypeNames->Token);
-    typeAttr.Set(pxr::TfToken("lightspeed.trex.components.TestComponent"));
+    typeAttr.Set(pxr::TfToken("lightspeed.trex.logic.TestComponent"));
     
     // Add node:typeVersion attribute
     pxr::UsdAttribute versionAttr = nodePrim.CreateAttribute(pxr::TfToken("node:typeVersion"), pxr::SdfValueTypeNames->Int);
@@ -109,7 +109,7 @@ class GraphUsdParserTest {
     
     // Add required attributes
     pxr::UsdAttribute typeAttr = nodePrim.CreateAttribute(pxr::TfToken("node:type"), pxr::SdfValueTypeNames->Token);
-    typeAttr.Set(pxr::TfToken("lightspeed.trex.components.TestComponent"));
+    typeAttr.Set(pxr::TfToken("lightspeed.trex.logic.TestComponent"));
     
     pxr::UsdAttribute versionAttr = nodePrim.CreateAttribute(pxr::TfToken("node:typeVersion"), pxr::SdfValueTypeNames->Int);
     versionAttr.Set(1);
@@ -250,7 +250,7 @@ void testCreateTestGraph() {
   
   pxr::TfToken typeValue;
   typeAttr.Get(&typeValue);
-  if (typeValue.GetString() != "lightspeed.trex.components.TestComponent") {
+  if (typeValue.GetString() != "lightspeed.trex.logic.TestComponent") {
     throw DxvkError("testCreateTestGraph: typeValue is not 'remix.test.component'");
   }
   
@@ -317,7 +317,7 @@ void testVersionCheck() {
   pxr::SdfPath noVersionNodePath = graphPrim.GetPath().AppendChild(pxr::TfToken("noVersionNode"));
   pxr::UsdPrim noVersionNodePrim = test.m_stage->DefinePrim(noVersionNodePath);
   pxr::UsdAttribute typeAttr = noVersionNodePrim.CreateAttribute(pxr::TfToken("node:type"), pxr::SdfValueTypeNames->Token);
-  typeAttr.Set(pxr::TfToken("lightspeed.trex.components.TestComponent"));
+  typeAttr.Set(pxr::TfToken("lightspeed.trex.logic.TestComponent"));
   
   Logger::info("Expecting 'err:   Node /World/testGraph/noVersionNode is missing a `node:typeVersion` attribute.'");
   result = GraphUsdParserTestApp::versionCheck(noVersionNodePrim, *componentSpec);
@@ -464,7 +464,7 @@ void testSimpleGraph() {
   if (spec->componentType != testSpec->componentType) {
     throw DxvkError("testSimpleGraph: spec componentType mismatch");
   }
-  if (spec->name != "lightspeed.trex.components.TestComponent") {
+  if (spec->name != "lightspeed.trex.logic.TestComponent") {
     throw DxvkError("testSimpleGraph: spec name mismatch");
   }
   
@@ -1310,7 +1310,7 @@ void testOldPropertyNames() {
     
     // Add required attributes in root layer
     pxr::UsdAttribute typeAttr = nodePrim.CreateAttribute(pxr::TfToken("node:type"), pxr::SdfValueTypeNames->Token);
-    typeAttr.Set(pxr::TfToken("lightspeed.trex.components.TestComponent"));
+    typeAttr.Set(pxr::TfToken("lightspeed.trex.logic.TestComponent"));
     pxr::UsdAttribute versionAttr = nodePrim.CreateAttribute(pxr::TfToken("node:typeVersion"), pxr::SdfValueTypeNames->Int);
     versionAttr.Set(1);
     

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "lightspeed.trex.components.AnimatedFloat": {`
	`2`	`+ "lightspeed.trex.logic.AnimatedFloat": {`
`3`	`3`	`"description": ["A single animated float value."],`
`4`	`4`	`"version": 1,`
`5`	`5`	`"uiName": "Animated Float",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "lightspeed.trex.components.BoxProximity": {`
	`2`	`+ "lightspeed.trex.logic.BoxProximity": {`
`3`	`3`	`"description": ["Calculates the signed distance from a world position to a mesh's bounding box. Positive values indicate the point is outside the bounding box. Note that the output is in object space."],`
`4`	`4`	`"version": 1,`
`5`	`5`	`"uiName": "Box Proximity",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "lightspeed.trex.components.Camera": {`
	`2`	`+ "lightspeed.trex.logic.Camera": {`
`3`	`3`	`"description": ["Outputs current camera properties including position, orientation vectors, and projection parameters. Uses free camera when both 'rtx.camera.useFreeCameraForComponents' and free camera are enabled."],`
`4`	`4`	`"version": 1,`
`5`	`5`	`"uiName": "Camera",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "lightspeed.trex.components.InterpolateFloat": {`
	`2`	`+ "lightspeed.trex.logic.InterpolateFloat": {`
`3`	`3`	`"description": ["Interpolates a value from an input range to an output range with optional easing. \nCombines normalization (reverse LERP), easing, and mapping (LERP) into a single component. \n\nNote input values outside of input range are valid, and that easing can lead to the output value being outside of the output range even when input is inside the input range.\nInverted input ranges (Input Max < Input Min) are supported - the min/max will be swapped and the normalized value inverted."],`
`4`	`4`	`"version": 1,`
`5`	`5`	`"uiName": "Interpolate Float",`