Repository navigation
Make render-test scenes editable in UntoldEditor - #1379
Merged
Merged
Conversation
Reshape Tests/UntoldEngineRenderTests/Resources/ to be GameData-shaped
(untoldengine create layout) so UntoldEditor recognizes it as a project
and UnitTestRender.untoldscene/Models can be browsed and edited there
instead of hand-editing JSON.
- Move Scenes, Models, Animations, Materials under a new Resources/GameData/
directory; fix the Guassians -> Gaussians typo along the way. Materials
moves too even though it's not in ProjectLayout.gameDataCategories,
since LoadingSystem resolves it relative to assetBasePath and the editor
itself expects it alongside GameData's other categories.
- Add a minimal Resources/project.yml placeholder: UntoldEditor's
openProject() gates on <name>.xcodeproj or project.yml existing before
it even looks for GameData.
- Update DemoUtils.demoResourcesURL() and two hardcoded CLI/engine test
fixture paths to the new GameData-relative locations (they read straight
off disk, not through a bundled resource lookup).
- Leave BaseRenderSetup's assetBasePath pointed at the bundle root:
SwiftPM's .process("Resources") flattens the whole tree regardless of
GameData nesting, and the existing flat-bundle fallback in
getResourceURL already handles that.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Tests/UntoldEngineRenderTests/Resources/to beuntoldengine create-shaped:Scenes,Models,StreamModels,Animations,Gaussians,Materialsnow live under a newResources/GameData/directory, matching.rootLeveldetection inProjectLayout. Fixes the pre-existingGuassianstypo along the way.Resources/project.ymlplaceholder, since UntoldEditor'sopenProject()first gates on<name>.xcodeprojorproject.ymlexisting before it even checks forGameData.DemoUtils.demoResourcesURL()and two hardcoded fixture paths (BakeLODsCommandTests.swift,UntoldAssetPatcherTests.swift) to the newGameData-relative locations, since those read straight off disk rather than through a bundled resource lookup.BaseRenderSetup'sassetBasePathpointed at the bundle root: SwiftPM's.process("Resources")flattens the whole tree regardless of the on-diskGameDatanesting, and the existing flat-bundle fallback ingetResourceURLalready handles that case.Closes #1377
Test plan
swift buildsucceedsswift test --filter RendererTest— 33 tests, 0 failures (1 opt-in skip)swift test --filter SkyPassSmokeTest,UntoldAssetPatcherTests/testRealCookedFixtureRoundTrips, CLIBakeLODsCommandTests— all passTests/UntoldEngineRenderTests/Resourcesin UntoldEditor and confirmed it's recognized as a project (browsed/editedUnitTestRender.untoldsceneandModels/*)