Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compile and python errors from the export script #477

Merged
merged 2 commits into from
May 7, 2024
Merged

Fix compile and python errors from the export script #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
052fc36
Fix compile and python errors from the export script
spham-amzn May 7, 2024
d1994f7
Mix argument for exp.bundle_assets
spham-amzn May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ExportScripts/export_mps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def export_multiplayer_sample(ctx: exp.O3DEScriptExportContext,
if should_build_server_launcher:
launcher_type |= exp.LauncherType.SERVER
if should_build_headless_server_launcher:
launcher_type |= exp.LauncherType.HEADLESS
launcher_type |= exp.LauncherType.HEADLESS_SERVER
if should_build_unified_launcher:
launcher_type |= exp.LauncherType.UNIFIED

Expand Down Expand Up @@ -126,7 +126,7 @@ def export_multiplayer_sample(ctx: exp.O3DEScriptExportContext,
required=True)
logger.info(f"Using '{asset_bundler_path}' to bundle the assets.")
expected_bundles_path = exp.bundle_assets(ctx=ctx,
selected_platform=selected_platform,
selected_platforms=[selected_platform],
seedlist_paths=validated_seedslist_paths,
seedfile_paths=[],
tools_build_path=tools_build_path,
Expand Down
4 changes: 3 additions & 1 deletion Gem/Code/Source/UserSettings/MultiplayerSampleUserSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,9 @@ namespace MultiplayerSample
{
auto ssrOptions = reflectionFeatureProcessor->GetSSROptions();
ssrOptions.m_enable = (reflectionType != SpecularReflections::None);
ssrOptions.m_rayTracing = (reflectionType == SpecularReflections::ScreenSpaceAndRaytracing);
ssrOptions.m_reflectionMethod = (reflectionType == SpecularReflections::ScreenSpaceAndRaytracing) ?
AZ::Render::SSROptions::ReflectionMethod::RayTracing :
AZ::Render::SSROptions::ReflectionMethod::ScreenSpace;
reflectionFeatureProcessor->SetSSROptions(ssrOptions);
}
}
Expand Down