Skip to content

Commit da66310

Browse files
committed
REMIX-3904: Improved mod packaging flow by adding a window to fix unresolved assets
1 parent 68a82c8 commit da66310

File tree

36 files changed

+1314
-195
lines changed

36 files changed

+1314
-195
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5151
- REMIX-3896: Improve the Unload Stage (Close Project) button behavior
5252
- REMIX-3832: Update material property widget to work with virtual attributes
5353
- Upgraded the AI Tools PyTorch Version
54+
- REMIX-3904: Improved mod packaging flow by adding a window to fix unresolved assets
5455

5556
### Fixed
5657
- REMIX-2350: Updating capture window behavior to avoid it hanging on other tabs

source/apps/exts.deps.generated.kit

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"lightspeed.trex.mod_packaging_layers.widget" = {}
9494
"lightspeed.trex.mod_packaging_output.widget" = {}
9595
"lightspeed.trex.packaging.core" = {}
96+
"lightspeed.trex.packaging.window" = {}
9697
"lightspeed.trex.project_wizard.core" = {}
9798
"lightspeed.trex.project_wizard.existing_mods_page.widget" = {}
9899
"lightspeed.trex.project_wizard.file_picker.widget" = {}

source/apps/lightspeed.app.trex.app.settings.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ folders.'++' = ["${app}/../exts", "${app}/../extscache", "${app}/../apps"]
3333
grid.trackCamera = true
3434

3535
[app.window]
36-
width = 1700
37-
height = 800
36+
width = 1800
37+
height = 900
3838
x = -1
3939
y = -1
4040

source/extensions/lightspeed.trex.mod_packaging_layers.widget/config/extension.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
version = "1.1.3"
2+
version = "1.1.4"
33
authors =["Pierre-Olivier Trottier <[email protected]>"]
44
title = "Mod Packaging Layers Widget"
55
description = "Mod Packaging Details Layers implementation"

source/extensions/lightspeed.trex.mod_packaging_layers.widget/docs/CHANGELOG.md

+4
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.1.4]
5+
## Fixed
6+
- Fixed default state for muted layers
7+
48
## [1.1.3]
59
## Changed
610
- Update to Kit 106.5

source/extensions/lightspeed.trex.mod_packaging_layers.widget/lightspeed/trex/mod_packaging_layers/widget/setup_ui.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,10 @@ def _update_model_item_package_status(self, *_):
131131
item.data["exclude_package"] = not should_package
132132
if "package" in item.data and should_package:
133133
continue
134-
item.data["package"] = should_package or is_capture_baker
134+
# Set the default package status. Disable muted layers by default
135+
item.data["package"] = (
136+
(should_package or is_capture_baker) and item.data.get("visible") and item.data.get("parent_visible")
137+
)
135138

136139
self._layers_validity_changed()
137140

source/extensions/lightspeed.trex.packaging.core/bin/cli.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,20 @@ async def run(parsed_args):
4646
try:
4747
core = PackagingCore()
4848

49+
def print_completed(errors, failed_assets, cancelled):
50+
message = "Project Packaging Finished:\n"
51+
if errors or failed_assets:
52+
if errors:
53+
message += f"Errors occurred: {errors}\n"
54+
if failed_assets:
55+
message += f"Failed to collect assets: {failed_assets}\n"
56+
else:
57+
message += "Packaging was cancelled." if cancelled else "The project was successfully packaged."
58+
4959
_progress_sub = core.subscribe_packaging_progress( # noqa F841
5060
lambda c, t, s: print(f"Progress: {s} ({c} / {t})")
5161
)
52-
_completed_sub = core.subscribe_packaging_completed( # noqa F841
53-
lambda e, c: print(
54-
f"Project Packaging Finished: {f'Errors occurred: {e}' if e else 'Cancelled' if c else 'Success'}"
55-
)
56-
)
62+
_completed_sub = core.subscribe_packaging_completed(print_completed) # noqa F841
5763

5864
success = await core.package(read_json_file(parsed_args.schema))
5965
if success:

source/extensions/lightspeed.trex.packaging.core/config/extension.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
version = "1.0.20"
2+
version = "1.1.0"
33
authors =["Pierre-Olivier Trottier <[email protected]>"]
44
title = "Mod Packaging Core"
55
description = "Mod Packaging Core implementation"

source/extensions/lightspeed.trex.packaging.core/docs/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
44

5+
## [1.1.0]
6+
## Added
7+
- Added the ability to get unresolved assets ignore errors
8+
59
## [1.0.20]
610
## Changed
711
- Update to Kit 106.5

source/extensions/lightspeed.trex.packaging.core/lightspeed/trex/packaging/core/items.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import re
1919
from pathlib import Path
20-
from typing import List, Optional
20+
from typing import List, Optional, Tuple
2121

2222
from lightspeed.trex.replacement.core.shared import Setup as _ReplacementCore
2323
from omni.flux.utils.common.omni_url import OmniUrl as _OmniUrl
@@ -55,6 +55,9 @@ class ModPackagingSchema(BaseModel):
5555
mod_name: str = Field(..., description="The display name used for the mod in the RTX Remix Runtime.")
5656
mod_version: str = Field(..., description="The mod version. Used when building dependency lists.")
5757
mod_details: Optional[str] = Field(None, description="Optional text used to describe the mod in more details.")
58+
ignored_errors: Optional[List[Tuple[str, str, str]]] = Field(
59+
None, description="A list of errors to ignore when packaging the mod."
60+
)
5861

5962
@validator("mod_layer_paths", allow_reuse=True)
6063
def at_least_one(cls, v): # noqa

0 commit comments

Comments
 (0)