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/Config/rc/RCJob_Build_LY_Bin64vc141.xml
-138
View File
@@ -1,138 +0,0 @@
<RCJobs>
<!--
DefaultProperties can be override from command line
pak_root - defines output folder for *.pak-s (required for NAnt build system)
-->
<DefaultProperties
game="RPGSample"
engine="Engine"
loc="LY_Localization"
src="."
trg="TempRC\"
pak_root=".\Build"
vertex_index="u16"
streaming="auto"
/>
<Properties
xml_types="*.animevents;*.animsettings;*.adb;*.bspace;*.cdf;*.chrparams;*.comb;*.dlg;*.ent;*.fsq;*.fxl;*.ik;*.json;*.lmg;*.mtl;*.setup;*.xml;*.node;*.veg"
non_xml_types="*.ag;*.gfx;*.png;*.usm;*.ogg;*.txt;*.anm;*.cal;*.i_caf;*.skel;*.skin;*.grd;*.grp;*.cfg;*.csv;*.lua;*.dat;*.ini;*.xls;*.as;*.lut;*.mp2;*.mp3;*.xma"
src_game="${game}"
src_engine="${src}\${engine}"
src_loc="${src}\${loc}"
trg_game="${trg}\${game}"
trg_engine="${trg}\${engine}"
trg_loc="${trg}\${loc}"
pak_game="${pak_root}\${game}"
pak_engine="${pak_root}\${engine}"
vtx_idx="${vertex_index}"
plat="${p}"
do_streaming="0"
/>
<if do_streaming="0">
<Properties dont_streaming="1" />
</if>
<if do_streaming="1">
<Properties dont_streaming="0" />
</if>
<ConvertJob>
<Job input="*.i_caf" animConfigFolder="Animations" sourceroot="${src_game}" targetroot="${trg_game}" cafAlignTracks="1" dbaStreamPrepare="1" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.cgf" VertexPositionFormat="exporter" SplitLODs="1" vertexindexformat="${vtx_idx}" />
<Job sourceroot="${src_engine}" targetroot="${trg_engine}" input="*.cgf" VertexPositionFormat="exporter" SplitLODs="1" vertexindexformat="${vtx_idx}" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.cga" VertexPositionFormat="exporter" SplitLODs="1" vertexindexformat="${vtx_idx}" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.tif" imagecompressor="${imagecompressor}" streaming="${do_streaming}" />
<Job sourceroot="${src_engine}" targetroot="${trg_engine}" input="*.tif" imagecompressor="${imagecompressor}" streaming="${do_streaming}" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.dds" copyonly="${dont_streaming}" />
<Job sourceroot="${src_engine}" targetroot="${trg_engine}" input="*.dds" copyonly="${dont_streaming}" />
</ConvertJob>
<PakJob>
<Job sourceroot="${trg_game}" input="Difficulty\*.*" zip="${pak_game}\GameData.pak" />
<Job sourceroot="${trg_game}" input="Libs\*.*" zip="${pak_game}\GameData.pak" />
<Job sourceroot="${trg_game}" input="Materials\*.*" zip="${pak_game}\GameData.pak" />
<Job sourceroot="${trg_game}" input="Prefabs\*.*" zip="${pak_game}\GameData.pak" />
<Job sourceroot="${trg_game}" input="Levels\*.*xml" zip="${pak_game}\GameData.pak" exclude="*filelist.*" />
<Job sourceroot="${trg_game}" input="Levels\*.*dds" zip="${pak_game}\GameData.pak" exclude="*filelist.*" />
<Job sourceroot="${trg_game}" input="Animations\*.*" zip="${pak_game}\Animations.pak" />
<Job sourceroot="${trg_game}" input="Objects\*.anm" zip="${pak_game}\Animations.pak" />
<Job sourceroot="${trg_game}" input="Objects\*.*" zip="${pak_game}\Objects.pak" exclude="Objects\level_specific\*.*;Objects\multiplayer\*.*;Objects\weapons\*.*;Objects\characters\*.*;Objects\props\*.*;*.anm" />
<Job sourceroot="${trg_game}" input="Objects\multiplayer\*.*" zip="${pak_game}\ObjectsMP.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Objects\weapons\*.*" zip="${pak_game}\Weapons.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Objects\characters\*.*" zip="${pak_game}\Characters.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Objects\props\*.*" zip="${pak_game}\Characters.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Objects\level_specific\*.*" zip="${pak_game}\LevelSpecific.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Textures\*.*" zip="${pak_game}\Textures.pak" />
<Job sourceroot="${trg_game}" input="Sounds\*.*" zip="${pak_game}\Sounds.pak" zip_compression="0" />
<Job sourceroot="${trg_game}" input="Videos\*.*" zip="${pak_game}\Videos.pak" zip_compression="0" />
<Job sourceroot="${trg_game}" input="Entities\*.*" zip="${pak_game}\Scripts.pak" />
<Job sourceroot="${trg_game}" input="Scripts\*.*" zip="${pak_game}\Scripts.pak" />
<Job sourceroot="${trg_engine}" input="Shaders\*.ext;Shaders\*.cfi;Shaders\*.cfx" zip="${pak_engine}\Shaders.pak" />
<Job sourceroot="${trg_engine}" input="Config\*.*;Fonts\*.*;EngineAssets\*.*;Libs\*.*" exclude="*.tif" zip="${pak_engine}\Engine.pak"/>
<Job sourceroot="${trg_game}\Levels" input="*.*" targetroot="${pak_game}\Levels" copyonly="1" exclude="*.tif;*\ShaderCache\*"/>
</PakJob>
<CopyJob>
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.chr" copyonly="1"/>
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.skin" copyonly="1" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="${xml_types}" overwriteextension="xml" xmlfilterfile="${_rc_exe_folder}xmlfilter.txt" copyonly="1"/>
<Job sourceroot="${src_engine}" targetroot="${trg_engine}" input="${xml_types}" overwriteextension="xml" xmlfilterfile="${_rc_exe_folder}xmlfilter.txt" copyonly="1"/>
<Job sourceroot="${src_game}\Levels" input="*.*" targetroot="${trg_game}\Levels" copyonly="1" exclude="*.tif;*\ShaderCache\*"/>
<Job sourceroot="${src_game}\Animations" input="*.ag" targetroot="${trg_game}\Animations" copyonly="1"/>
<Job sourceroot="${src_game}\Textures" input="*.gfx;*.png;*.usm" targetroot="${trg_game}\Textures" copyonly="1"/>
<Job sourceroot="${src_game}\Difficulty" input="*.cfg;*.xls" targetroot="${trg_game}\Difficulty" copyonly="1" />
<Job sourceroot="${src_game}\Libs" input="*.cfg;*.dat;*.gfx;*.lua;*.lut;*.txt;*.usm" targetroot="${trg_game}\Libs" copyonly="1" />
<Job sourceroot="${src_game}\Sounds" input="*.bnk;*.wem" targetroot="${trg_game}\Sounds" copyonly="1" />
<Job sourceroot="${src_game}\Videos" input="*.txt;*.usm" targetroot="${trg_game}\Videos" copyonly="1" />
<Job sourceroot="${src_game}\Objects" input="*.anm;*.cal;*.gfx;*.grd;*.grp" targetroot="${trg_game}\Objects" copyonly="1" />
<Job sourceroot="${src_game}\Entities" input="*" targetroot="${trg_game}\Entities" copyonly="1" />
<Job sourceroot="${src_game}\Scripts" input="*" targetroot="${trg_game}\Scripts" copyonly="1" />
<Job sourceroot="${src_engine}\Shaders" input="*.ext;*.cfx;*.cfi;*.txt" targetroot="${trg_engine}\Shaders" copyonly="1" />
<Job sourceroot="${src_engine}\Config" input="*.cfg;*.dat;*.ini;*.txt" targetroot="${trg_engine}\Config" copyonly="1" />
<Job sourceroot="${src_engine}\EngineAssets" input="*.cfg;*.dat;*.ini;*.txt" targetroot="${trg_engine}\EngineAssets" copyonly="1" />
<Job sourceroot="${src_engine}\Fonts" input="*.ttf;*.txt" targetroot="${trg_engine}\Fonts" copyonly="1" />
<Job sourceroot="${src}" input="*.cfg" targetroot="${pak_root}" copyonly="1" />
<Job sourceroot="${src}\Bin64vc141" targetroot="${pak_root}\Bin64vc141" input="*.exe" copyonly="1"/>
<Job sourceroot="${src}\Bin64vc141" targetroot="${pak_root}\Bin64vc141" input="*.dll" copyonly="1"/>
</CopyJob>
<CleanJob>
<Job input="" targetroot="${trg}" clean_targetroot="1" />
</CleanJob>
<ValidateJob>
<Run Job="ConvertJob"/>
<Job input="" targetroot="${trg}" clean_targetroot="1" refs_scan="1" />
</ValidateJob>
<Run Job="ConvertJob"/>
<Run Job="CopyJob"/>
<Run Job="PakJob"/>
<Run Job="CleanJob"/>
</RCJobs>
Code/Tools/RC/Config/rc/RCJob_Build_LY_Bin64vc142.xml
-138
View File
@@ -1,138 +0,0 @@
<RCJobs>
<!--
DefaultProperties can be override from command line
pak_root - defines output folder for *.pak-s (required for NAnt build system)
-->
<DefaultProperties
game="RPGSample"
engine="Engine"
loc="LY_Localization"
src="."
trg="TempRC\"
pak_root=".\Build"
vertex_index="u16"
streaming="auto"
/>
<Properties
xml_types="*.animevents;*.animsettings;*.adb;*.bspace;*.cdf;*.chrparams;*.comb;*.dlg;*.ent;*.fsq;*.fxl;*.ik;*.json;*.lmg;*.mtl;*.setup;*.xml;*.node;*.veg"
non_xml_types="*.ag;*.gfx;*.png;*.usm;*.ogg;*.txt;*.anm;*.cal;*.i_caf;*.skel;*.skin;*.grd;*.grp;*.cfg;*.csv;*.lua;*.dat;*.ini;*.xls;*.as;*.lut;*.mp2;*.mp3;*.xma"
src_game="${game}"
src_engine="${src}\${engine}"
src_loc="${src}\${loc}"
trg_game="${trg}\${game}"
trg_engine="${trg}\${engine}"
trg_loc="${trg}\${loc}"
pak_game="${pak_root}\${game}"
pak_engine="${pak_root}\${engine}"
vtx_idx="${vertex_index}"
plat="${p}"
do_streaming="0"
/>
<if do_streaming="0">
<Properties dont_streaming="1" />
</if>
<if do_streaming="1">
<Properties dont_streaming="0" />
</if>
<ConvertJob>
<Job input="*.i_caf" animConfigFolder="Animations" sourceroot="${src_game}" targetroot="${trg_game}" cafAlignTracks="1" dbaStreamPrepare="1" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.cgf" VertexPositionFormat="exporter" SplitLODs="1" vertexindexformat="${vtx_idx}" />
<Job sourceroot="${src_engine}" targetroot="${trg_engine}" input="*.cgf" VertexPositionFormat="exporter" SplitLODs="1" vertexindexformat="${vtx_idx}" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.cga" VertexPositionFormat="exporter" SplitLODs="1" vertexindexformat="${vtx_idx}" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.tif" imagecompressor="${imagecompressor}" streaming="${do_streaming}" />
<Job sourceroot="${src_engine}" targetroot="${trg_engine}" input="*.tif" imagecompressor="${imagecompressor}" streaming="${do_streaming}" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.dds" copyonly="${dont_streaming}" />
<Job sourceroot="${src_engine}" targetroot="${trg_engine}" input="*.dds" copyonly="${dont_streaming}" />
</ConvertJob>
<PakJob>
<Job sourceroot="${trg_game}" input="Difficulty\*.*" zip="${pak_game}\GameData.pak" />
<Job sourceroot="${trg_game}" input="Libs\*.*" zip="${pak_game}\GameData.pak" />
<Job sourceroot="${trg_game}" input="Materials\*.*" zip="${pak_game}\GameData.pak" />
<Job sourceroot="${trg_game}" input="Prefabs\*.*" zip="${pak_game}\GameData.pak" />
<Job sourceroot="${trg_game}" input="Levels\*.*xml" zip="${pak_game}\GameData.pak" exclude="*filelist.*" />
<Job sourceroot="${trg_game}" input="Levels\*.*dds" zip="${pak_game}\GameData.pak" exclude="*filelist.*" />
<Job sourceroot="${trg_game}" input="Animations\*.*" zip="${pak_game}\Animations.pak" />
<Job sourceroot="${trg_game}" input="Objects\*.anm" zip="${pak_game}\Animations.pak" />
<Job sourceroot="${trg_game}" input="Objects\*.*" zip="${pak_game}\Objects.pak" exclude="Objects\level_specific\*.*;Objects\multiplayer\*.*;Objects\weapons\*.*;Objects\characters\*.*;Objects\props\*.*;*.anm" />
<Job sourceroot="${trg_game}" input="Objects\multiplayer\*.*" zip="${pak_game}\ObjectsMP.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Objects\weapons\*.*" zip="${pak_game}\Weapons.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Objects\characters\*.*" zip="${pak_game}\Characters.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Objects\props\*.*" zip="${pak_game}\Characters.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Objects\level_specific\*.*" zip="${pak_game}\LevelSpecific.pak" exclude="*.anm" />
<Job sourceroot="${trg_game}" input="Textures\*.*" zip="${pak_game}\Textures.pak" />
<Job sourceroot="${trg_game}" input="Sounds\*.*" zip="${pak_game}\Sounds.pak" zip_compression="0" />
<Job sourceroot="${trg_game}" input="Videos\*.*" zip="${pak_game}\Videos.pak" zip_compression="0" />
<Job sourceroot="${trg_game}" input="Entities\*.*" zip="${pak_game}\Scripts.pak" />
<Job sourceroot="${trg_game}" input="Scripts\*.*" zip="${pak_game}\Scripts.pak" />
<Job sourceroot="${trg_engine}" input="Shaders\*.ext;Shaders\*.cfi;Shaders\*.cfx" zip="${pak_engine}\Shaders.pak" />
<Job sourceroot="${trg_engine}" input="Config\*.*;Fonts\*.*;EngineAssets\*.*;Libs\*.*" exclude="*.tif" zip="${pak_engine}\Engine.pak"/>
<Job sourceroot="${trg_game}\Levels" input="*.*" targetroot="${pak_game}\Levels" copyonly="1" exclude="*.tif;*\ShaderCache\*"/>
</PakJob>
<CopyJob>
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.chr" copyonly="1"/>
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="*.skin" copyonly="1" />
<Job sourceroot="${src_game}" targetroot="${trg_game}" input="${xml_types}" overwriteextension="xml" xmlfilterfile="${_rc_exe_folder}xmlfilter.txt" copyonly="1"/>
<Job sourceroot="${src_engine}" targetroot="${trg_engine}" input="${xml_types}" overwriteextension="xml" xmlfilterfile="${_rc_exe_folder}xmlfilter.txt" copyonly="1"/>
<Job sourceroot="${src_game}\Levels" input="*.*" targetroot="${trg_game}\Levels" copyonly="1" exclude="*.tif;*\ShaderCache\*"/>
<Job sourceroot="${src_game}\Animations" input="*.ag" targetroot="${trg_game}\Animations" copyonly="1"/>
<Job sourceroot="${src_game}\Textures" input="*.gfx;*.png;*.usm" targetroot="${trg_game}\Textures" copyonly="1"/>
<Job sourceroot="${src_game}\Difficulty" input="*.cfg;*.xls" targetroot="${trg_game}\Difficulty" copyonly="1" />
<Job sourceroot="${src_game}\Libs" input="*.cfg;*.dat;*.gfx;*.lua;*.lut;*.txt;*.usm" targetroot="${trg_game}\Libs" copyonly="1" />
<Job sourceroot="${src_game}\Sounds" input="*.bnk;*.wem" targetroot="${trg_game}\Sounds" copyonly="1" />
<Job sourceroot="${src_game}\Videos" input="*.txt;*.usm" targetroot="${trg_game}\Videos" copyonly="1" />
<Job sourceroot="${src_game}\Objects" input="*.anm;*.cal;*.gfx;*.grd;*.grp" targetroot="${trg_game}\Objects" copyonly="1" />
<Job sourceroot="${src_game}\Entities" input="*" targetroot="${trg_game}\Entities" copyonly="1" />
<Job sourceroot="${src_game}\Scripts" input="*" targetroot="${trg_game}\Scripts" copyonly="1" />
<Job sourceroot="${src_engine}\Shaders" input="*.ext;*.cfx;*.cfi;*.txt" targetroot="${trg_engine}\Shaders" copyonly="1" />
<Job sourceroot="${src_engine}\Config" input="*.cfg;*.dat;*.ini;*.txt" targetroot="${trg_engine}\Config" copyonly="1" />
<Job sourceroot="${src_engine}\EngineAssets" input="*.cfg;*.dat;*.ini;*.txt" targetroot="${trg_engine}\EngineAssets" copyonly="1" />
<Job sourceroot="${src_engine}\Fonts" input="*.ttf;*.txt" targetroot="${trg_engine}\Fonts" copyonly="1" />
<Job sourceroot="${src}" input="*.cfg" targetroot="${pak_root}" copyonly="1" />
<Job sourceroot="${src}\Bin64vc142" targetroot="${pak_root}\Bin64vc142" input="*.exe" copyonly="1"/>
<Job sourceroot="${src}\Bin64vc142" targetroot="${pak_root}\Bin64vc142" input="*.dll" copyonly="1"/>
</CopyJob>
<CleanJob>
<Job input="" targetroot="${trg}" clean_targetroot="1" />
</CleanJob>
<ValidateJob>
<Run Job="ConvertJob"/>
<Job input="" targetroot="${trg}" clean_targetroot="1" refs_scan="1" />
</ValidateJob>
<Run Job="ConvertJob"/>
<Run Job="CopyJob"/>
<Run Job="PakJob"/>
<Run Job="CleanJob"/>
</RCJobs>
Code/Tools/RC/Config/rc/RCJob_Generic_MakeAuxiliaryContent.xml
+7 -10
View File
@@ -3,10 +3,10 @@
DefaultProperties can be overriden from command line.
-->
<DefaultProperties
p="pc"
game="automatedtesting"
src="cache\${game}\${p}"
trg="${game}_${p}_paks"
platform="pc"
project-path="AutomatedTesting"
src="${project-path}\Cache\${platform}"
trg="${project-path}\user\paks\${platform}"
/>
<Properties
@@ -14,14 +14,14 @@
levels_pak_types="levels\*.*"
levels_pak_excludes="*\leveldata\*;*.pak"
gems_pak_types="gems\*.json;${game}\gems.json;${game}\gem\*.*"
gems_pak_types="gems\*.json;gem\*.*"
gems_pak_excludes=""
shader_pak_types="shaders\*.ext;shaders\*.cfi;shaders\*.cfx"
shader_pak_excludes=""
src_game="${src}\${game}"
trg_paks="${trg}\${game}"
src_game="${src}"
trg_paks="${trg}"
/>
<!--
@@ -31,12 +31,9 @@
<IfNot SkipLevelPaks="1">
<Job sourceroot="${src_game}\levels" targetroot="${trg_paks}\levels" input="*.pak" copyonly="1"/>
</IfNot>
<Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="game.xml" copyonly="1"/>
<Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="editor.xml" copyonly="1"/>
<Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="*.awslogicalmappings.json" copyonly="1"/>
<Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="launcher.deployment.json" copyonly="1"/>
<Job sourceroot="${src}" targetroot="${trg}" input="engine.json" copyonly="1"/>
<Job sourceroot="${src}" targetroot="${trg}" input="engineroot.txt" copyonly="1"/>
<Job sourceroot="${src}" targetroot="${trg}" input="bootstrap.cfg" copyonly="1" recursive="0"/>
<Job sourceroot="${src}" targetroot="${trg}" input="system_windows_pc.cfg" copyonly="1" recursive="0"/>
</CopyJob>
Code/Tools/RC/Config/rc/RCJob_Generic_MakePaks.xml
+9 -13
View File
@@ -4,10 +4,10 @@
Sounds pak properties moved here in order to override them.
-->
<DefaultProperties
p="pc"
game="automatedtesting"
src="Cache\${game}\${p}"
trg="${game}_${p}_paks"
platform="pc"
project-path="AutomatedTesting"
src="${project-path}\Cache\${platform}"
trg="${project-path}\user\paks\${platform}"
sounds_pak_types="sounds\*.*"
sounds_pak_excludes=""
@@ -39,19 +39,18 @@
shader_pak_excludes=""
engine_pak_types="fonts\*.*;engineassets\*.*;config\*.*"
engine_pak_excludes="config\editor.xml;config\game.xml"
gems_pak_types="gems\*.json;${game}\gems.json;${game}\gem\*.*"
gems_pak_types="gems\*.json;gem\*.*"
gems_pak_excludes=""
video_pak_types="*.mp4;*.mkv;*.webm;*.mov;*.bk2"
video_pak_excludes=""
misc_pak_types="*.*"
misc_pak_excludes="*cmakelists.*;editor\*.*;${levels_pak_types};${levels_pak_excludes};${game_data_pak_types};${game_data_pak_excludes};${animation_pak_types};${animation_pak_excludes};${objects_pak_types};${objects_pak_excludes};${character_pak_types};${character_pak_excludes};${textures_pak_types};${textures_pak_excludes};${sounds_pak_types};${sounds_pak_excludes};${scripts_pak_types};${scripts_pak_excludes};${shader_pak_types};${shader_pak_excludes};${engine_pak_types};${engine_pak_excludes};${gems_pak_types};${gems_pak_excludes};${video_pak_types}"
misc_pak_excludes="*cmakelists.*;editor\*.*;${levels_pak_types};${levels_pak_excludes};${game_data_pak_types};${game_data_pak_excludes};${animation_pak_types};${animation_pak_excludes};${objects_pak_types};${objects_pak_excludes};${character_pak_types};${character_pak_excludes};${textures_pak_types};${textures_pak_excludes};${sounds_pak_types};${sounds_pak_excludes};${scripts_pak_types};${scripts_pak_excludes};${shader_pak_types};${shader_pak_excludes};${engine_pak_types};${gems_pak_types};${gems_pak_excludes};${video_pak_types}"
src_game="${src}\${game}"
trg_paks="${trg}\${game}"
src_game="${src}"
trg_paks="${trg}"
/>
<!--
@@ -59,12 +58,9 @@
-->
<CopyJob>
<Job sourceroot="${src_game}\levels" targetroot="${trg_paks}\levels" input="*.pak" copyonly="1"/>
<Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="game.xml" copyonly="1"/>
<Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="editor.xml" copyonly="1"/>
<Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="*.awslogicalmappings.json" copyonly="1"/>
<Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="launcher.deployment.json" copyonly="1"/>
<Job sourceroot="${src}" targetroot="${trg}" input="engine.json" copyonly="1"/>
<Job sourceroot="${src}" targetroot="${trg}" input="engineroot.txt" copyonly="1"/>
<Job sourceroot="${src}" targetroot="${trg}" input="*.cfg" copyonly="1" recursive="0"/>
<Job sourceroot="${src}" targetroot="${trg}" input="*.xml" copyonly="1" recursive="0"/>
</CopyJob>
@@ -85,7 +81,7 @@
<Job sourceroot="${src_game}" input="${video_pak_types}" zip="${trg_paks}\videos.pak" exclude="${video_pak_excludes}" zip_compression="0" />
<Job sourceroot="${src_game}" input="${shader_pak_types}" zip="${trg_paks}\shaders.pak" exclude="${shader_pak_excludes}" />
<Job sourceroot="${src_game}" input="${engine_pak_types}" zip="${trg_paks}\engine.pak" exclude="${engine_pak_excludes}" />
<Job sourceroot="${src_game}" input="${engine_pak_types}" zip="${trg_paks}\engine.pak" />
<Job sourceroot="${src_game}" input="${misc_pak_types}" zip="${trg_paks}\misc.pak" exclude="${misc_pak_excludes}" />
<Job sourceroot="${src}" input="${gems_pak_types}" zip="${trg_paks}\gems\gems.pak" exclude="${gems_pak_excludes}" />
Code/Tools/RC/ResourceCompiler/CmdLine.cpp
-95
View File
@@ -1,95 +0,0 @@
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*
* For complete copyright and license terms please see the LICENSE at the root of this
* distribution (the "License"). All use of this software is governed by the License,
* or, if provided, by the license below or the license accompanying this file. Do not
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
*/
// Original file Copyright Crytek GMBH or its affiliates, used under license.
#include "ResourceCompiler_precompiled.h"
#include "CmdLine.h"
#include "Config.h"
//////////////////////////////////////////////////////////////////////////
static void AddParameterToConfig(Config* config, const char* parameter)
{
// Split on key/value pair
const string p = parameter;
const size_t splitterPos = p.find('=');
if (splitterPos != string::npos)
{
const string key = p.substr(0, splitterPos);
const string value = p.substr(splitterPos + 1);
if (!key.empty())
{
config->SetKeyValue(eCP_PriorityCmdline, key.c_str(), value.c_str());
}
}
else
{
config->SetKeyValue(eCP_PriorityCmdline, p.c_str(), "");
}
}
//////////////////////////////////////////////////////////////////////////
//Return true if the parameter is a file spec
/////////////////////////////////////////////////////////////////////////
static bool isValidFileSpecCheck(const string& path)
{
if (path[0] == '-')
{
return false;
}
//Since Macs can have '/' in the file paths check for '='
//to confirm that it is a file spec and not a config argument.
if (path[0] == '/')
{
const size_t equalPos = path.find('=');
if (equalPos != string::npos)
{
return false;
}
else
{
//You can have a config argument that does not have a '='. Use
//extension path to determine if it is a file spec.
return PathHelpers::FindExtension(path) != "";
}
}
return true;
}
//////////////////////////////////////////////////////////////////////////
void CmdLine::Parse(const std::vector<string>& args, Config* config, string& fileSpec)
{
assert(config);
fileSpec.clear();
for (int i = 1; i < (int)args.size(); ++i)
{
const char* const parameter = args[i].c_str();
bool isValidFileSpec = isValidFileSpecCheck(string(parameter));
if (isValidFileSpec)
{
if (fileSpec.empty())
{
fileSpec = parameter;
}
}
else
{
AddParameterToConfig(config, parameter + 1);
}
}
}
Code/Tools/RC/ResourceCompiler/CmdLine.h
-26
View File
@@ -1,26 +0,0 @@
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*
* For complete copyright and license terms please see the LICENSE at the root of this
* distribution (the "License"). All use of this software is governed by the License,
* or, if provided, by the license below or the license accompanying this file. Do not
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
*/
// Original file Copyright Crytek GMBH or its affiliates, used under license.
#ifndef CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CMDLINE_H
#define CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CMDLINE_H
#pragma once
class Config;
// Command line parser
namespace CmdLine
{
void Parse(const std::vector<string>& args, Config* config, string& fileSpec);
};
#endif // CRYINCLUDE_TOOLS_RC_RESOURCECOMPILER_CMDLINE_H
Code/Tools/RC/ResourceCompiler/ResourceCompiler.cpp
+6 -12
View File
@@ -1294,7 +1294,7 @@ void ResourceCompiler::LogMultiLine(const char* szText)
void ResourceCompiler::ShowHelp(const bool bDetailed)
{
RCLog("");
RCLog("Usage: RC filespec /p=<platform> [/Key1=Value1] [/Key2=Value2] etc...");
RCLog("Usage: RC filespec --platform=<platform> [--Key1=Value1] [--Key2=Value2] etc...");
if (bDetailed)
{
@@ -2372,8 +2372,6 @@ typedef std::set<const char*, stl::less_strcmp<const char*> > References;
void ResourceCompiler::ScanForAssetReferences(std::vector<string>& outReferences, const string& refsRoot)
{
const IConfig* const config = &m_multiConfig.getConfig();
const char* const scanRoot = ".";
RCLog("Scanning for asset references in \"%s\"", scanRoot);
@@ -2526,8 +2524,6 @@ static bool MatchesWildcardsSet(const string& str, const std::vector<string>& ma
//////////////////////////////////////////////////////////////////////////
void ResourceCompiler::SaveAssetReferences(const std::vector<string>& references, const string& filename, const string& includeMasksStr, const string& excludeMasksStr)
{
const IConfig* const config = &m_multiConfig.getConfig();
std::vector<string> includeMasks;
StringHelpers::Split(includeMasksStr, ";", false, includeMasks);
@@ -2868,8 +2864,6 @@ int ResourceCompiler::ProcessJobFile()
//////////////////////////////////////////////////////////////////////////
void ResourceCompiler::ExtractJobDefaultProperties(std::vector<string>& properties, const XmlNodeRef& jobNode)
{
IConfig* const config = &m_multiConfig.getConfig();
if (jobNode->isTag("DefaultProperties"))
{
// Attributes are config modifiers.
@@ -3109,12 +3103,12 @@ int ResourceCompiler::EvaluateJobXmlNode(CPropertyVars& properties, XmlNodeRef&
// Check current platform property against start-up platform setting
// Reason: This setting cannot be modified after start-up
const char* pCurrentPlatform = NULL;
if (config->GetKeyValue("p", pCurrentPlatform) && pCurrentPlatform)
if (config->GetKeyValue("platform", pCurrentPlatform) && pCurrentPlatform)
{
int currentPlatformIndex = FindPlatform(pCurrentPlatform);
if (GetMultiplatformConfig().getActivePlatform() != currentPlatformIndex)
{
RCLogWarning("The platform property '/p=%s' is ignored because it can only be specified on the command-line", pCurrentPlatform);
RCLogWarning("The platform property '--platform=%s' is ignored because it can only be specified on the command-line", pCurrentPlatform);
}
}
@@ -3257,6 +3251,8 @@ void ResourceCompiler::RegisterDefaultKeys()
{
RegisterKey("_debug", ""); // hidden key for debug-related activities. parsing is module-dependent and subject to change without prior notice.
RegisterKey("project-path", "Path to project. Used to find files related to the project.");
RegisterKey("project-name", R"(Name of the project. It's value is derived from the project.json file "project_name" field.)");
RegisterKey("wait",
"wait for an user action on start and/or finish of RC:\n"
"0-don't wait (default),\n"
@@ -3267,7 +3263,7 @@ void ResourceCompiler::RegisterDefaultKeys()
RegisterKey("wx", "pause and display message box in case of warning or error");
RegisterKey("recursive", "traverse input directory with sub folders");
RegisterKey("refresh", "force recompilation of resources with up to date timestamp");
RegisterKey("p", "to specify platform (for supported names see [_platform] sections in ini)");
RegisterKey("platform", "to specify platform (for supported names see [_platform] sections in ini)");
RegisterKey("pi", "provides the platform id from the Asset Processor");
RegisterKey("statistics", "log statistics to rc_stats_* files");
RegisterKey("dependencies",
@@ -3281,7 +3277,6 @@ void ResourceCompiler::RegisterDefaultKeys()
RegisterKey("logfiles", "to suppress generating log file rc_log.log");
RegisterKey("logprefix", "prepends this prefix to every log file name used (by default the prefix is the exe's folder).");
RegisterKey("logtime", "logs time passed: 0=off, 1=on (default)");
RegisterKey("gameroot", "The root of the current game project. Used to find files related to the current game.");
RegisterKey("watchfolder", "The watched root folder that this file is located in. Used to produce the relative asset name.");
RegisterKey("nosourcecontrol", "Boolean - if true, disables initialization of source control. Disabling Source Control in the editor automatically disables it here, too.");
RegisterKey("sourceroot", "list of source folders separated by semicolon");
@@ -3334,7 +3329,6 @@ void ResourceCompiler::RegisterDefaultKeys()
RegisterKey("job", "Process a job xml file");
RegisterKey("jobtarget", "Run only a job with specific name instead of whole job-file. Used only with /job option");
RegisterKey("unittest", "Run the unit tests for resource compiler and nothing else");
RegisterKey("gamesubdirectory", "The relative path to game folder from root from @devroot@. Defines @devassets@ when concatenated with @devroot@. Used to find files related to the this game.");
RegisterKey("unattended", "Prevents RC from opening any dialogs or message boxes");
RegisterKey("createjobs", "Instructs RC to read the specified input file (a CreateJobsRequest) and output a CreateJobsResponse");
RegisterKey("port", "Specifies the port that should be used to connect to the asset processor. If not set, the default from the bootstrap cfg will be used instead");
Code/Tools/RC/ResourceCompiler/ZipEncryptor.cpp
-3
View File
@@ -204,9 +204,6 @@ bool ZipEncryptor::ParseKey(uint32 outputKey[4], const char* inputString)
return false;
}
const char* p = inputString;
const char* end = p + len;
size_t i = 0;
while (i != numBytes)
{
Code/Tools/RC/ResourceCompiler/main.cpp
+38 -16
View File
@@ -31,7 +31,6 @@
#include <ResourceCompiler.h>
#include <IResourceCompilerHelper.h>
#include <CmdLine.h>
#include <CryLibrary.h>
#include <ZipEncryptor.h>
@@ -295,7 +294,7 @@ static bool RegisterConvertors(ResourceCompiler* pRc)
strDir.append(AZ_CORRECT_FILESYSTEM_SEPARATOR_STRING);
AZ::IO::LocalFileIO localFile;
bool foundOK = localFile.FindFiles(strDir.c_str(), CryLibraryDefName("ResourceCompiler*"), [&](const char* pluginFilename) -> bool
localFile.FindFiles(strDir.c_str(), CryLibraryDefName("ResourceCompiler*"), [&](const char* pluginFilename) -> bool
{
#if defined(AZ_PLATFORM_WINDOWS)
HMODULE hPlugin = CryLoadLibrary(pluginFilename);
@@ -413,7 +412,21 @@ int rcmain(int argc, char** argv, [[maybe_unused]] char** envp)
bool enableSourceControl = settings.value("RC_EnableSourceControl", true).toBool();
mainConfig.SetKeyValue(eCP_PriorityCmdline, "nosourcecontrol", enableSourceControl ? "0" : "1");
CmdLine::Parse(args, &mainConfig, fileSpec);
AZ::CommandLine commandLine;
commandLine.Parse(argc, argv);
for (auto&& [option, value] : commandLine)
{
if (!option.empty())
{
mainConfig.SetKeyValue(EConfigPriority::eCP_PriorityCmdline, option.c_str(), value.c_str());
}
else
{
fileSpec = commandLine.GetMiscValue(0).c_str();
}
}
// initialize rc (also initializes logs)
rc.Init(mainConfig);
@@ -518,16 +531,20 @@ int rcmain(int argc, char** argv, [[maybe_unused]] char** envp)
// Obtain target platform
int platform;
{
string platformStr = mainConfig.GetAsString("p", "", "");
string platformStr = mainConfig.GetAsString("platform", "", "");
if (platformStr.empty())
{
platformStr = mainConfig.GetAsString("p", "", "");
}
if (platformStr.empty())
{
if (!mainConfig.GetAsBool("version", false, true))
{
RCLog("Platform (/p) not specified, defaulting to 'pc'.");
RCLog("Platform (-p) not specified, defaulting to 'pc'.");
RCLog("");
}
platformStr = "pc";
mainConfig.SetKeyValue(eCP_PriorityCmdline, "p", platformStr.c_str());
mainConfig.SetKeyValue(eCP_PriorityCmdline, "platform", platformStr.c_str());
}
platform = rc.FindPlatform(platformStr.c_str());
@@ -548,7 +565,7 @@ int rcmain(int argc, char** argv, [[maybe_unused]] char** envp)
}
}
const IConfig& config = rc.GetMultiplatformConfig().getConfig();
IConfig& config = rc.GetMultiplatformConfig().getConfig();
{
RCLog("Initializing pak management");
@@ -567,23 +584,28 @@ int rcmain(int argc, char** argv, [[maybe_unused]] char** envp)
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_O3deUserRegistry(settingsRegistry, AZ_TRAIT_OS_PLATFORM_CODENAME, {});
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(settingsRegistry, commandLine, false);
string projectPath = config.GetAsString("gameroot", "", "");
const auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString::format(
"%s/project_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey);
string projectPath = config.GetAsString("project-path", "", "");
if (!projectPath.empty())
{
const auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString::format(
"%s/project_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey);
settingsRegistry.Set(projectPathKey, projectPath.c_str());
}
string gameName = config.GetAsString("gamesubdirectory", "", "");
if (!gameName.empty())
// Update the Runtime FilePaths and project settings
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(settingsRegistry);
// Set the project-path and project-name entries from the Settings registry into the RC config structure
if (AZ::IO::FixedMaxPathString projPath; settingsRegistry.Get(projPath, AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectPath))
{
const auto projectNameKey = AZ::SettingsRegistryInterface::FixedValueString::format(
"%s/project_name", AZ::SettingsRegistryMergeUtils::ProjectSettingsRootKey);
settingsRegistry.Set(projectNameKey, gameName.c_str());
config.SetKeyValue(eCP_PriorityCmdline, "project-path", projPath.c_str());
}
AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(settingsRegistry);
const auto projectNameKey = AZ::SettingsRegistryInterface::FixedValueString::format(
"%s/project_name", AZ::SettingsRegistryMergeUtils::ProjectSettingsRootKey);
if (AZ::IO::FixedMaxPathString projName; settingsRegistry.Get(projName, projectNameKey))
{
config.SetKeyValue(eCP_PriorityCmdline, "project-name", projName.c_str());
}
// and because we're a tool, add the tool folders:
if (AZ::SettingsRegistryInterface::FixedValueString appRoot; settingsRegistry.Get(appRoot, AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder))
{
Code/Tools/RC/ResourceCompiler/resourcecompiler_static_files.cmake
-2
View File
@@ -28,7 +28,6 @@ set(FILES
PakHelpers.h
PakManager.h
CfgFile.cpp
CmdLine.cpp
Config.cpp
DependencyList.cpp
ExcelExport.cpp
@@ -40,7 +39,6 @@ set(FILES
ResourceCompiler_precompiled.h
TextFileReader.cpp
CfgFile.h
CmdLine.h
Config.h
ConvertContext.h
DebugLog.h
Code/Tools/RC/ResourceCompilerABC/AlembicCompiler.cpp
+3 -5
View File
@@ -948,8 +948,6 @@ bool AlembicCompiler::CompileStaticMeshData(GeomCache::Node& node, Alembic::AbcG
// Check basic mesh parameters
Alembic::AbcGeom::IPolyMeshSchema& meshSchema = mesh.getSchema();
Alembic::AbcGeom::MeshTopologyVariance topologyVariance = meshSchema.getTopologyVariance();
Alembic::Abc::TimeSampling& meshTimeSampling = *meshSchema.getTimeSampling();
size_t numMeshSamples = meshSchema.getNumSamples();
std::shared_ptr<GeomCache::Mesh> pMesh(new GeomCache::Mesh);
pMesh->m_constantStreams = GeomCacheFile::EStreams(0);
@@ -1999,8 +1997,8 @@ bool AlembicCompiler::CompileFullMesh(GeomCache::Mesh& mesh, const size_t curren
// Compute mesh hash
uint64 meshHash = 0;
size_t numVertexHashes = abcVertexHashes.size();
for (size_t i = 0; i < abcVertexHashes.size(); ++i)
const size_t numVertexHashes = abcVertexHashes.size();
for (size_t i = 0; i < numVertexHashes; ++i)
{
uint64 vertexHash = abcVertexHashes[i];
AlembicCompilerHashCombine<uint64>(meshHash, vertexHash);
@@ -2346,7 +2344,7 @@ bool AlembicCompiler::CompileVertices(std::vector<AlembicCompilerVertex>& vertic
else
{
assert(meshData.m_positions.size() == vertices.size());
if (!meshData.m_positions.size() == vertices.size())
if (meshData.m_positions.size() != vertices.size())
{
return false;
}
Code/Tools/RC/ResourceCompilerABC/GeomCacheWriter.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ void GeomCacheDiskWriteThread::Write(std::vector<char>& buffer, long offset, int
// Write and clear current read buffer
const size_t bufferSize = buffer.size();
m_bytesWritten += bufferSize;
size_t bytesWritten = fwrite(buffer.data(), 1, bufferSize, m_fileHandle);
/*size_t bytesWritten =*/ fwrite(buffer.data(), 1, bufferSize, m_fileHandle);
//RCLog("Written %Iu/%Iu bytes with error: %d", bytesWritten, bufferSize, ferror(m_fileHandle));
}
Code/Tools/RC/ResourceCompilerLegacy/LegacyCompiler.cpp
-1
View File
@@ -50,7 +50,6 @@ namespace AZ
application.Start(descriptor);
AssetBuilderSDK::InitializeSerializationContext();
bool result = false;
AssetBuilderSDK::ProcessJobResponse response;
// Read ProcessJobRequest.xml from the output folder
Code/Tools/RC/ResourceCompilerPC/CGF/DataWriter.cpp
+11 -2
View File
@@ -275,12 +275,21 @@ void DataWriter::ExpandBuffer(const uint32 addBytes)
const uint32 newBufferSize = m_currentBufferSize + BUFFERINCREASESIZE;
if (m_outputBuffer)
{
m_outputBuffer = realloc(m_outputBuffer, newBufferSize);
void* tmpBuffer = realloc(m_outputBuffer, newBufferSize);
AZ_Assert(
tmpBuffer != nullptr,
"realloc failed, this is possible when allocating a large data array whose size is comparable to RAM size, and also when "
"the memory is highly segmented");
if (tmpBuffer)
{
m_outputBuffer = tmpBuffer;
m_currentBufferSize = newBufferSize;
}
}
else
{
m_outputBuffer = malloc(newBufferSize);
m_currentBufferSize = newBufferSize;
}
m_currentBufferSize = newBufferSize;
}
}
Code/Tools/RC/ResourceCompilerPC/StatCGFCompiler.cpp
+5 -5
View File
@@ -422,22 +422,22 @@ bool CStatCGFCompiler::DebugDumpCGF(const char* sourceFileName, const char* outp
}
{
const CPhysicalizeInfoCGF* pPhys = pCGF->GetPhysicalizeInfo();
//const CPhysicalizeInfoCGF* pPhys = pCGF->GetPhysicalizeInfo();
fprintf(f, "\t" "PhysicalizeInfo: (not printed yet)\n");
}
{
CExportInfoCGF* pExport = pCGF->GetExportInfo();
//CExportInfoCGF* pExport = pCGF->GetExportInfo();
fprintf(f, "\t" "ExportInfo: (not printed yet)\n");
}
{
CSkinningInfo* pSkin = pCGF->GetSkinningInfo();
//CSkinningInfo* pSkin = pCGF->GetSkinningInfo();
fprintf(f, "\t" "SkinningInfo: (not printed yet)\n");
}
{
SFoliageInfoCGF* pSkin = pCGF->GetFoliageInfo();
//SFoliageInfoCGF* pSkin = pCGF->GetFoliageInfo();
fprintf(f, "\t" "FoliageInfo: (not printed yet)\n");
}
@@ -797,7 +797,7 @@ bool CStatCGFCompiler::Process()
sourceWatchFolder = m_CC.m_config->GetAsString("sourceroot", "", "").c_str();
if (sourceWatchFolder.empty())
{
sourceWatchFolder = m_CC.m_config->GetAsString("gameroot", "", "").c_str();
sourceWatchFolder = m_CC.m_config->GetAsString("project-path", "", "").c_str();
}
}
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.");
}
}