birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/RC/ResourceCompilerScene/Cgf/CgfUtils.cpp
-2
View File
@@ -81,8 +81,6 @@ namespace AZ
result += SceneAPI::Events::Process(containerContext);
result += SceneAPI::Events::Process<ContainerExportContext>(containerContext, Phase::Filling);
const SceneAPI::Containers::SceneGraph& graph = context.m_scene.GetGraph();
ProcessMeshType(containerContext, content, targetNodes, PHYS_GEOM_TYPE_NONE);
result += SceneAPI::Events::Process<ContainerExportContext>(containerContext, Phase::Finalizing);
Code/Tools/RC/ResourceCompilerScene/Common/UVStreamExporter.cpp
+2 -4
View File
@@ -58,9 +58,7 @@ namespace AZ
return SceneEvents::ProcessingResult::Ignored;
}
const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
const SceneDataTypes::IGroup& group = context.m_group;
const SceneContainers::SceneGraph& graph = context.m_scene.GetGraph();
SceneEvents::ProcessingResultCombiner result;
@@ -146,4 +144,4 @@ namespace AZ
return SceneEvents::ProcessingResult::Success;
}
} // namespace RC
} // namespace AZ
} // namespace AZ
Code/Tools/RC/ResourceCompilerScene/SceneCompiler.cpp
+4 -16
View File
@@ -146,7 +146,7 @@ namespace AZ
AZ::CommandLine* commandLine = application.GetAzCommandLine();
AZStd::string overrideProjectPath = m_context.m_config->GetAsString("gameroot", "", "").c_str();
AZStd::string overrideProjectPath = m_context.m_config->GetAsString("project-path", "", "").c_str();
if (!overrideProjectPath.empty())
{
auto overrideArgs = AZStd::string::format(
@@ -158,18 +158,6 @@ namespace AZ
commandLine->Parse(commandLineArgs);
}
AZStd::string overrideProjectName = m_context.m_config->GetAsString("gamesubdirectory", "", "").c_str();
if (!overrideProjectName.empty())
{
auto gameNameOverride = AZStd::string::format("--regset=%s/project_name=%s", AZ::SettingsRegistryMergeUtils::ProjectSettingsRootKey,
overrideProjectName.c_str());
AZ::CommandLine::ParamContainer commandLineArgs;
commandLine->Dump(commandLineArgs);
commandLineArgs.emplace_back(gameNameOverride.c_str(), gameNameOverride.size());
commandLine->Parse(commandLineArgs);
}
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(registry, *commandLine, false);
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(registry);
@@ -298,7 +286,7 @@ namespace AZ
//the project name can be overridden, check it
AZStd::string overrideProjectName;
overrideProjectName = m_context.m_config->GetAsString("gamesubdirectory", "", "");
overrideProjectName = m_context.m_config->GetAsString("project-name", "", "");
if (!overrideProjectName.empty())
{
connectionSettings.m_projectName = overrideProjectName;
@@ -319,12 +307,12 @@ namespace AZ
bool SceneCompiler::LoadAndExportScene(const AssetBuilderSDK::ProcessJobRequest& request, AssetBuilderSDK::ProcessJobResponse& response)
{
const string platformName = m_context.m_config->GetAsString("p", "<unknown>", "<invalid>");
const string platformName = m_context.m_config->GetAsString("platform", "<unknown>", "<invalid>");
AZ_TraceContext("Platform", platformName.c_str());
if (platformName == "<unknown>")
{
AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "No target platform provided - this compiler requires the /p=platformIdentifier option\n");
AZ_TracePrintf(SceneAPI::Utilities::ErrorWindow, "No target platform provided - this compiler requires the --platform=platformIdentifier option\n");
return false;
}
Code/Tools/RC/ResourceCompilerScene/Tests/TestsMain.cpp
+3 -3
View File
@@ -35,7 +35,7 @@ protected:
{
sceneCoreModule = AZ::DynamicModuleHandle::Create("SceneCore");
AZ_Assert(sceneCoreModule, "ResourceCompilerScene unit tests failed to create SceneCore module.");
bool loaded = sceneCoreModule->Load(false);
[[maybe_unused]] bool loaded = sceneCoreModule->Load(false);
AZ_Assert(loaded, "ResourceCompilerScene unit tests failed to load SceneCore module.");
auto init = sceneCoreModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
AZ_Assert(init, "ResourceCompilerScene unit tests failed to find the initialization function the SceneCore module.");
@@ -44,7 +44,7 @@ protected:
{
sceneDataModule = AZ::DynamicModuleHandle::Create("SceneData");
AZ_Assert(sceneDataModule, "ResourceCompilerScene unit tests failed to create SceneData module.");
bool loaded = sceneDataModule->Load(false);
[[maybe_unused]] bool loaded = sceneDataModule->Load(false);
AZ_Assert(loaded, "ResourceCompilerScene unit tests failed to load SceneData module.");
auto init = sceneDataModule->GetFunction<AZ::InitializeDynamicModuleFunction>(AZ::InitializeDynamicModuleFunctionName);
AZ_Assert(init, "ResourceCompilerScene unit tests failed to find the initialization function the SceneData module.");
@@ -54,7 +54,7 @@ protected:
{
fbxSceneBuilderModule = AZ::DynamicModuleHandle::Create("FbxSceneBuilder");
AZ_Assert(fbxSceneBuilderModule, "ResourceCompilerScene unit tests failed to create FbxSceneBuilder module.");
bool loaded = fbxSceneBuilderModule->Load(false);
[[maybe_unused]] bool loaded = fbxSceneBuilderModule->Load(false);
AZ_Assert(loaded, "ResourceCompilerScene unit tests failed to load FbxSceneBuilder module.");
}
}