Skip to content

Commit c7d375d

Browse files
author
Emanuel Kozerski
committed
Merge branch 'dev/e-man/stage-prim-picker' into 'main'
REMIX-4245 - Implementing a generic Stage Prim Picker in a searchable dropdown window form. See merge request lightspeedrtx/lightspeed-kit!1043
2 parents 7b124eb + ade72b1 commit c7d375d

File tree

72 files changed

+5571
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+5571
-172
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2626
- REMIX-4576: Added icon support for prims tab
2727
- Small improvements for Remix Logic: added delete button, hid unused ui, stage manager refresh filtering
2828
- REMIX-4719: Added Stage Manager Remix Logic Graph Interaction Action Plugin, And Logic Graph Filter
29+
- REMIX-4245: Added a generic Stage Prim Picker widget and implemented it in the Remix Logic Properties Panel.
2930

3031
### Changed
3132
- Update hdremix and omni_core_materials to ext-822f7b6-main
@@ -38,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3839
- Update hdremix and omni_core_materials to ext-2c10e95-main
3940
- REMIX-4721: Reimplemented Sidebar using ui.ToolBar for improved docking behavior
4041
- REMIX-4715: Make "Edit Graph" dialog a bit easier to use
42+
- Centralized prim type icon mappings in omni.flux.utils.common for reuse across extensions
4143

4244
### Fixed
4345
- Improved Pyright configuration by generating a list of search paths
@@ -46,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4648
- REMIX-4749: Fix symlink validation and repair when no deps dir exists
4749
- Set build jobs to run against GPU agents
4850
- Fixed code formatting and lint errors across multiple extensions
51+
- REMIX-4593: Fixed logic graph and particle properties panel not preserving expansion state across refreshes
4952

5053
### Removed
5154
- Removed Waypoint support based on deprecated kit sample waypoint extension

source/apps/exts.deps.generated.kit

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
"lightspeed.trex.project_wizard.setup_page.widget" = {}
8484
"lightspeed.trex.project_wizard.start_page.widget" = {}
8585
"lightspeed.trex.project_wizard.window" = {}
86+
"lightspeed.trex.properties_pane.logic.widget" = {}
8687
"lightspeed.trex.properties_pane.material.widget" = {}
8788
"lightspeed.trex.properties_pane.mesh.widget" = {}
88-
"lightspeed.trex.properties_pane.logic.widget" = {}
8989
"lightspeed.trex.properties_pane.particle.widget" = {}
9090
"lightspeed.trex.properties_pane.widget" = {}
9191
"lightspeed.trex.recent_projects.core" = {}
@@ -173,6 +173,7 @@
173173
"omni.flux.stage_manager.plugin.widget.usd" = {}
174174
"omni.flux.stage_manager.widget" = {}
175175
"omni.flux.stage_manager.window" = {}
176+
"omni.flux.stage_prim_picker.widget" = {}
176177
"omni.flux.tabbed.widget" = {}
177178
"omni.flux.telemetry.core" = {}
178179
"omni.flux.tests.dependencies" = {}
@@ -234,4 +235,4 @@ enabled = [
234235

235236
########################################################################################################################
236237
# END GENERATED PART
237-
########################################################################################################################
238+
########################################################################################################################

source/extensions/lightspeed.trex.app.resources/config/extension.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
version = "1.26.0"
2+
version = "1.26.1"
33
authors = ["[email protected]"]
44
repository = "https://gitlab-master.nvidia.com/lightspeedrtx/lightspeed-kit"
55
changelog = "docs/CHANGELOG.md"
Lines changed: 5 additions & 0 deletions
Loading
Lines changed: 9 additions & 0 deletions
Loading

source/extensions/lightspeed.trex.app.resources/docs/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
33

4+
## [1.26.1]
5+
### Changed
6+
- Added styling for StagePrimPicker UI components
7+
48
## [1.26.0]
59
### Added
610
- Added LogicGraphWidgetPlugin Widget to the Stage Manager via schema configuration

source/extensions/lightspeed.trex.app.style/config/extension.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
authors =["Damien Bataille <[email protected]>"]
33
title = "NVIDIA RTX Remix Style"
44
description = "Global Style for NVIDIA RTX Remix App"
5-
version = "1.18.0"
5+
version = "1.19.0"
66
readme = "docs/README.md"
77
repository = "https://gitlab-master.nvidia.com/lightspeedrtx/lightspeed-kit/-/tree/main/source/extensions/lightspeed.trex.app.style"
88
category = "internal"

source/extensions/lightspeed.trex.app.style/docs/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
33

4+
## [1.19.0]
5+
### Added
6+
- Added styling for StagePrimPicker dropdown and field components
7+
48
## [1.18.0]
59
### Added
610
- Added Logic Graph Icon to style so they can be used in the Stage Manager

source/extensions/lightspeed.trex.app.style/lightspeed/trex/app/style/trex_style.py

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,75 @@ def override_dialog_get_style(style_value): # noqa PLW0621
10441044
"TreeView.Item.IsHovered": {"background_color": _BLUE_HOVERED},
10451045
"TreeView.Item.Minus": {"image_url": _get_icons("disclosure-expanded"), "color": _WHITE_60},
10461046
"TreeView.Item.Plus": {"image_url": _get_icons("disclosure-collapsed_h"), "color": _WHITE_60},
1047+
"Image::FadeoutBG": {"image_url": _get_icons("fade-gradient")},
1048+
# Stage Prim Picker Widget
1049+
"Image::AngledArrowDown": {"image_url": _get_icons("disclosure-expanded"), "color": _WHITE_60},
1050+
"Rectangle::StagePrimPickerClearBackground": {
1051+
"background_color": _GREY_50,
1052+
"border_radius": 8,
1053+
"margin": 0,
1054+
"padding": 0,
1055+
},
1056+
"Rectangle::StagePrimPickerClearBackground:hovered": {
1057+
"background_color": _GREY_60,
1058+
},
1059+
"Rectangle::StagePrimPickerArrowBackground": {
1060+
"background_color": _GREY_50,
1061+
"border_radius": 8,
1062+
"margin": 0,
1063+
"padding": 0,
1064+
},
1065+
"Image::StagePrimPickerClear": {"image_url": _get_icons("close"), "color": _WHITE_60},
1066+
"Image::StagePrimPickerClear:hovered": {"image_url": _get_icons("close"), "color": _WHITE_100},
1067+
"Field::StagePrimPickerField": {
1068+
"background_color": _GREY_50,
1069+
"color": _WHITE_80,
1070+
"border_width": 1,
1071+
"border_radius": 5,
1072+
"border_color": _WHITE_20,
1073+
"padding": 4,
1074+
"font_size": 14,
1075+
},
1076+
"Field::StagePrimPickerField:hovered": {
1077+
"background_color": _BLUE_HOVERED,
1078+
},
1079+
"Button::StagePrimPickerFieldShowMore": {"background_color": _GREY_50, "border_radius": 3, "padding": 4},
1080+
"Button::StagePrimPickerFieldShowMore:hovered": {"background_color": _GREY_60},
1081+
"Button::StagePrimPickerFieldShowMore:disabled": {"background_color": _GREY_40},
1082+
"Button.Label::StagePrimPickerFieldShowMore:disabled": {"color": _WHITE_30},
1083+
"Button::StagePrimPickerItem": {
1084+
"background_color": 0x0,
1085+
"padding": 0,
1086+
"margin": 0,
1087+
"border_width": 0,
1088+
"border_radius": 0,
1089+
},
1090+
"Button::StagePrimPickerItem:hovered": {"background_color": _BLUE_HOVERED},
1091+
"Button.Label::StagePrimPickerItem": {"alignment": ui.Alignment.LEFT_CENTER, "margin_width": 4},
1092+
"Field::StagePrimPickerSearch": {
1093+
"background_color": _GREY_50,
1094+
"border_width": 1,
1095+
"border_radius": 3,
1096+
"border_color": _WHITE_20,
1097+
"padding": 4,
1098+
},
1099+
"Field::StagePrimPickerSearch:hovered": {
1100+
"background_color": _GREY_60,
1101+
"border_color": _WHITE_40,
1102+
},
1103+
"Label::StagePrimPickerSearchPlaceholder": {
1104+
"color": _WHITE_30,
1105+
"margin_width": 6,
1106+
},
1107+
"Label::StagePrimPickerHeaderText": {"color": _WHITE_80},
1108+
"Label::StagePrimPickerHeaderTextBold": {"color": _WHITE_80, "font": ui.url.nvidia_md, "font_size": 16},
1109+
"Window::StagePrimPickerDropdown": {
1110+
"background_color": _GREY_50,
1111+
"border_color": _GREY_60,
1112+
"border_width": 1,
1113+
"border_radius": 4,
1114+
},
1115+
"Rectangle::StagePrimPickerDropdownBackground": {"background_color": _GREY_50},
10471116
"TreeView.ScrollingFrame::WelcomePad": {"background_color": 0x0},
10481117
"ViewportStats::FloatField": {
10491118
"background_color": 0,

source/extensions/lightspeed.trex.properties_pane.logic.widget/config/extension.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
version = "1.2.0"
2+
version = "1.2.1"
33
authors = ["Nicolas Kendall-Bar <[email protected]>"]
44
title = "Remix Logic Properties Widget"
55
description = "Properties panel for RemixLogic prim types"
@@ -17,11 +17,13 @@ icon = "data/images/icon.png"
1717
"lightspeed.events_manager" = {}
1818
"lightspeed.trex.utils.common" = {}
1919
"lightspeed.trex.logic.core" = {}
20+
"lightspeed.trex.logic.ogn" = {}
2021
"omni.flux.property_widget_builder.model.usd" = {}
2122
"omni.flux.property_widget_builder.widget" = {}
2223
"omni.flux.utils.common" = {}
2324
"omni.kit.commands" = {}
2425
"omni.graph" = {}
26+
"omni.graph.core" = {}
2527
"omni.graph.tools" = {}
2628
"omni.ui" = {}
2729
"omni.usd" = {}
@@ -31,6 +33,6 @@ name = "lightspeed.trex.properties_pane.logic.widget"
3133

3234
[[test]]
3335
dependencies = [
34-
"omni.flux.tests.dependencies",
36+
"lightspeed.trex.tests.dependencies",
3537
"omni.kit.test",
3638
]

0 commit comments

Comments
 (0)