Merge branch 'dependabot/update-rtx-remix-target-deps' into 'main'

[dependabot] bump rtx-remix dependencies

See merge request lightspeedrtx/lightspeed-kit!1053

Author: nxkb

CHANGELOG.md

@@ -6,7 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-- Cleanup Github runners before packaging Toolkit
 
 ### Added
 - Created 1.2.4 build
@@ -51,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - REMIX-4715, REMIX-4826: Improved Edit Graph dialog with tree-based selection UI and disabled compound graphs
 - REMIX-4818: FilePicker now supports automatic conversion to relative paths for USD edit target compliance
 - REMIX-4816: Improved logic graph properties panel UI with icon buttons and clearer dialog messages
+- Update hdremix and omni_core_materials to ext-83e59c6-main
 
 ### Fixed
 - Improved Pyright configuration by generating a list of search paths
@@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved a few UX issues with the Logic Properties pane
 - REMIX-4766: Added input validation to ensure a valid graph prim name is provided for new graphs
 - REMIX-4804: Fixed Remix Logic Graph Creation Logic Inconstancy Across Editor, Property Panel, and Right Click Menus
+- Cleanup Github runners before packaging Toolkit
 
 ### Removed
 - Removed Waypoint support based on deprecated kit sample waypoint extension

deps/target-deps.packman.xml

@@ -9,7 +9,7 @@
     <package name="remix-models-i2m-artifacts" version="1.1.0" />
   </dependency>
   <dependency name="rtx-remix-hdremix" linkPath="../_build/target-deps/hdremix">
-    <package name="rtx-remix-hdremix" version="ext-a9cbe4d-main" />
+    <package name="rtx-remix-hdremix" version="ext-83e59c6-main" />
   </dependency>
   <dependency name="rtx-remix-lookdev-lighting" linkPath="../_build/target-deps/content/rtx-remix-lookdev-lighting">
     <package name="rtx-remix-lookdev-lighting" version="2023.1.0" />
@@ -18,7 +18,7 @@
     <package name="rtx-remix-lookdev-modeling" version="2023.0.0" />
   </dependency>
   <dependency name="rtx-remix-omni_core_materials" linkPath="../_build/target-deps/omni_core_materials">
-    <package name="rtx-remix-omni_core_materials" version="ext-a9cbe4d-main" />
+    <package name="rtx-remix-omni_core_materials" version="ext-83e59c6-main" />
   </dependency>
   <dependency name="rtx-remix-remix_runtime" linkPath="../_build/${platform}/${config}/deps/remix_runtime">
     <package name="rtx-remix-remix_runtime" version="remix-1.2.4" />

source/extensions/lightspeed.trex.logic.ogn/config/extension.toml

@@ -1,7 +1,7 @@
 # Main extension description values
 [package]
 # The current extension version number - uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
-version = "0.0.2"
+version = "0.0.3"
 # The title of the extension that will appear in the extension window
 title = "Remix OmniGraph Python Nodes"
 # Longer description of the extension

source/extensions/lightspeed.trex.logic.ogn/docs/CHANGELOG.md

@@ -6,10 +6,14 @@ This document records all notable changes to the **lightspeed.trex.logic.ogn** e
 
 The format is based on [Keep a Changelog](https://keepachangelog.com). The project adheres to [Semantic Versioning](https://semver.org).
 
-## [0.0.1]
-### Initial Version
-- Created based on omni.graph.template.python-1.40.0
+## [0.0.3]
+### Changed
+- Update node schema to match omni_core_materials ext-83e59c6-main
 
 ## [0.0.2]
 ### Changed
 - Updated node schema to match current runtime.
+
+## [0.0.1]
+### Initial Version
+- Created based on omni.graph.template.python-1.40.0

source/extensions/lightspeed.trex.logic.ogn/python/nodes/ConditionallyStore.ogn

@@ -15,14 +15,14 @@
       },
       "input": {
         "description": ["The value to store when store is true."],
-        "type": ["bool", "float", "float[2]", "float[3]", "float[4]", "target", "token", "uint"],
+        "type": "any",
         "uiName": "Input"
       }
     },
     "outputs": {
       "output": {
         "description": ["The currently stored value."],
-        "type": ["bool", "float", "float[2]", "float[3]", "float[4]", "target", "token", "uint"],
+        "type": "any",
         "uiName": "Output"
       }
     }

source/extensions/lightspeed.trex.logic.ogn/python/nodes/ConditionallyStore.py

@@ -24,41 +24,28 @@ def on_connection_type_resolve(node) -> None:
         # Combination 3: input=float[2], output=float[2], store=bool, storedValue=float[2]
         # Combination 4: input=float[3], output=float[3], store=bool, storedValue=float[3]
         # Combination 5: input=float[4], output=float[4], store=bool, storedValue=float[4]
-        # Combination 6: input=uint, output=uint, store=bool, storedValue=uint
-        # Combination 7: input=token, output=token, store=bool, storedValue=token
-        # Combination 8: input=target, output=target, store=bool, storedValue=target
+        # Combination 6: input=token, output=token, store=bool, storedValue=token
+        # Combination 7: input=target, output=target, store=bool, storedValue=target
 
         # Get attributes
         input_input = node.get_attribute("inputs:input")
-        input_storedValue = node.get_attribute("inputs:storedValue")
         output_output = node.get_attribute("outputs:output")
 
         # Get current types of connected attributes
         type_input = input_input.get_resolved_type()
-        type_storedValue = input_storedValue.get_resolved_type()
 
         # Check all valid type combinations and resolve output types
-        if (type_input == og.Type(og.BaseDataType.BOOL) and 
-            type_storedValue == og.Type(og.BaseDataType.BOOL)):
+        if (type_input == og.Type(og.BaseDataType.BOOL)):
             output_output.set_resolved_type(og.Type(og.BaseDataType.BOOL))
-        elif (type_input == og.Type(og.BaseDataType.FLOAT) and 
-            type_storedValue == og.Type(og.BaseDataType.FLOAT)):
+        elif (type_input == og.Type(og.BaseDataType.FLOAT)):
             output_output.set_resolved_type(og.Type(og.BaseDataType.FLOAT))
-        elif (type_input == og.Type(og.BaseDataType.FLOAT, 2) and 
-            type_storedValue == og.Type(og.BaseDataType.FLOAT, 2)):
+        elif (type_input == og.Type(og.BaseDataType.FLOAT, 2)):
             output_output.set_resolved_type(og.Type(og.BaseDataType.FLOAT, 2))
-        elif (type_input == og.Type(og.BaseDataType.FLOAT, 3) and 
-            type_storedValue == og.Type(og.BaseDataType.FLOAT, 3)):
+        elif (type_input == og.Type(og.BaseDataType.FLOAT, 3)):
             output_output.set_resolved_type(og.Type(og.BaseDataType.FLOAT, 3))
-        elif (type_input == og.Type(og.BaseDataType.FLOAT, 4) and 
-            type_storedValue == og.Type(og.BaseDataType.FLOAT, 4)):
+        elif (type_input == og.Type(og.BaseDataType.FLOAT, 4)):
             output_output.set_resolved_type(og.Type(og.BaseDataType.FLOAT, 4))
-        elif (type_input == og.Type(og.BaseDataType.UINT) and 
-            type_storedValue == og.Type(og.BaseDataType.UINT)):
-            output_output.set_resolved_type(og.Type(og.BaseDataType.UINT))
-        elif (type_input == og.Type(og.BaseDataType.TOKEN) and 
-            type_storedValue == og.Type(og.BaseDataType.TOKEN)):
+        elif (type_input == og.Type(og.BaseDataType.TOKEN)):
             output_output.set_resolved_type(og.Type(og.BaseDataType.TOKEN))
-        elif (type_input == og.Type(og.BaseDataType.RELATIONSHIP) and 
-            type_storedValue == og.Type(og.BaseDataType.RELATIONSHIP)):
+        elif (type_input == og.Type(og.BaseDataType.RELATIONSHIP)):
             output_output.set_resolved_type(og.Type(og.BaseDataType.RELATIONSHIP))

source/extensions/lightspeed.trex.logic.ogn/python/nodes/ConstFloat.ogn

@@ -2,7 +2,7 @@
   "lightspeed.trex.logic.ConstFloat": {
     "description": ["Provides a constant decimal number that you can set.\n\nUse this to provide fixed values like 0.5, 3.14, or 100.0 to other components."],
     "version": 1,
-    "uiName": "Constant Float",
+    "uiName": "Constant Number",
     "language": "python",
     "categoryDefinitions": "config/CategoryDefinition.json",
     "categories": "Constants",

source/extensions/lightspeed.trex.logic.ogn/python/nodes/CountToggles.ogn

@@ -22,10 +22,10 @@
     },
     "outputs": {
       "count": {
-        "description": ["The current count value as a float."],
+        "description": ["The current count value."],
         "type": "float",
         "default": 0.000000,
-        "uiName": "Count as Float"
+        "uiName": "Count"
       }
     }
   }

source/extensions/lightspeed.trex.logic.ogn/python/nodes/Counter.ogn

@@ -1,6 +1,6 @@
 {
   "lightspeed.trex.logic.Counter": {
-    "description": ["Counts up by a value every frame when a condition is true.\n\nIncrements a counter by a specified value every frame that the input bool is true. Useful for tracking how many frames a condition has been active."],
+    "description": ["Counts up by a value every frame when a condition is true.\n\nIncrements a counter by a specified value every frame that the input bool is true. Use `Starting Value` to set the initial counter value. Useful for tracking how many frames a condition has been active."],
     "version": 1,
     "uiName": "Counter",
     "language": "python",
@@ -19,6 +19,12 @@
         "default": 1.000000,
         "optional": true,
         "uiName": "Increment Value"
+      },
+      "defaultValue": {
+        "description": ["The initial value of the counter when the component is created."],
+        "type": "float",
+        "default": 0.000000,
+        "uiName": "Starting Value"
       }
     },
     "outputs": {

source/extensions/lightspeed.trex.logic.ogn/python/nodes/Counter.py

@@ -19,4 +19,4 @@ def compute(_db: CounterDatabase):
     def on_connection_type_resolve(node) -> None:
         """Resolve flexible types based on connected attribute types."""
         # Valid type combinations for this component:
-        # Combination 1: count=float, increment=bool, incrementValue=float, value=float
+        # Combination 1: count=float, defaultValue=float, increment=bool, incrementValue=float, value=float