diff --git a/Gems/AtomContent/Sponza/.gitignore b/Gems/AtomContent/Sponza/.gitignore index c58f3de65f..8bbb0be455 100644 --- a/Gems/AtomContent/Sponza/.gitignore +++ b/Gems/AtomContent/Sponza/.gitignore @@ -1,3 +1,4 @@ /.maya_data/* /.mayaSwatches/* -*.swatch \ No newline at end of file +*.swatch +[Uu]ser_env.bat \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/.src/objects/sponza.ma b/Gems/AtomContent/Sponza/.src/objects/sponza.ma new file mode 100644 index 0000000000..fabe9dd9ee --- /dev/null +++ b/Gems/AtomContent/Sponza/.src/objects/sponza.ma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c95e08274ea0051ee35f415918eaf1530f05475d6265f2ad7ec7c1ff79d29f2b +size 40549297 diff --git a/Gems/AtomContent/Sponza/.src/objects/sponza_cleanup.mb b/Gems/AtomContent/Sponza/.src/objects/sponza_cleanup.mb new file mode 100644 index 0000000000..bdd51c6f8c --- /dev/null +++ b/Gems/AtomContent/Sponza/.src/objects/sponza_cleanup.mb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b77710f70b80578339c826f51eef4d964e1136f27e67ff26a348542feec16dfa +size 22804176 diff --git a/Gems/AtomContent/Sponza/ArtSource/stub b/Gems/AtomContent/Sponza/.src/stub similarity index 100% rename from Gems/AtomContent/Sponza/ArtSource/stub rename to Gems/AtomContent/Sponza/.src/stub diff --git a/Gems/AtomContent/Sponza/ArtSource/objects/sponza.ma b/Gems/AtomContent/Sponza/ArtSource/objects/sponza.ma deleted file mode 100644 index 5bea07b7d6..0000000000 --- a/Gems/AtomContent/Sponza/ArtSource/objects/sponza.ma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7250488d0ba6115089c5f83d6c352826b41d711550ca828853a139129ffcff9f -size 40549260 diff --git a/Gems/AtomContent/Sponza/ArtSource/objects/sponza_cleanup.mb b/Gems/AtomContent/Sponza/ArtSource/objects/sponza_cleanup.mb deleted file mode 100644 index 882496f2b0..0000000000 --- a/Gems/AtomContent/Sponza/ArtSource/objects/sponza_cleanup.mb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d3c18d76f00688d15c54736ef3d8c953df08baf46a796fa71627de18bdb3c0f -size 22804332 diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza.fbx b/Gems/AtomContent/Sponza/Assets/objects/sponza.fbx index 9061666968..38752bf32a 100644 --- a/Gems/AtomContent/Sponza/Assets/objects/sponza.fbx +++ b/Gems/AtomContent/Sponza/Assets/objects/sponza.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35a880abc018520d4b30d21a64f7a14fca74d936593320d5afd03ddf25771bf3 -size 9176416 +oid sha256:e24948f9f477a3a167e50a80b04148d0a598d8c40bed86d51870daa8842ce5dd +size 9175808 diff --git a/Gems/AtomContent/Sponza/CMakeLists.txt b/Gems/AtomContent/Sponza/CMakeLists.txt new file mode 100644 index 0000000000..d65c7234cb --- /dev/null +++ b/Gems/AtomContent/Sponza/CMakeLists.txt @@ -0,0 +1,11 @@ +# +# 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. +# +ly_create_alias(NAME Sponza.Builders NAMESPACE Gem) \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Launch_WingIDE-7-1.bat b/Gems/AtomContent/Sponza/Launch_WingIDE-7-1.bat deleted file mode 100644 index f73fb640d5..0000000000 --- a/Gems/AtomContent/Sponza/Launch_WingIDE-7-1.bat +++ /dev/null @@ -1,82 +0,0 @@ -@echo off -REM -REM All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -REM its licensors. -REM -REM For complete copyright and license terms please see the LICENSE at the root of this -REM distribution (the "License"). All use of this software is governed by the License, -REM or, if provided, by the license below or the license accompanying this file. Do not -REM remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM - -:: Launches Wing IDE and the DccScriptingInterface Project Files - -echo. -echo _____________________________________________________________________ -echo. -echo ~ Setting up LY DCCsi WingIDE Dev Env... -echo _____________________________________________________________________ -echo. - -:: Store current dir -%~d0 -cd %~dp0 -PUSHD %~dp0 - -:: Keep changes local -SETLOCAL enableDelayedExpansion - -SET ABS_PATH=%~dp0 -echo Current Dir, %ABS_PATH% - -:: WingIDE version Major -SET WING_VERSION_MAJOR=7 -echo WING_VERSION_MAJOR = %WING_VERSION_MAJOR% - -:: WingIDE version Major -SET WING_VERSION_MINOR=1 -echo WING_VERSION_MINOR = %WING_VERSION_MINOR% - -:: note the changed path from IDE to Pro -set WINGHOME=%PROGRAMFILES(X86)%\Wing Pro %WING_VERSION_MAJOR%.%WING_VERSION_MINOR% -echo WINGHOME = %WINGHOME% - -CALL %~dp0\Project_Env.bat - -echo. -echo _____________________________________________________________________ -echo. -echo ~ WingIDE Version %WING_VERSION_MAJOR%.%WING_VERSION_MINOR% -echo _____________________________________________________________________ -echo. - -SET WING_PROJ=%DCCSIG_PATH%\Solutions\.wing\DCCsi_%WING_VERSION_MAJOR%x.wpr -echo WING_PROJ = %WING_PROJ% - -echo. -echo _____________________________________________________________________ -echo. -echo ~ Launching %LY_PROJECT% project in WingIDE %WING_VERSION_MAJOR%.%WING_VERSION_MINOR% ... -echo _____________________________________________________________________ -echo. - - -IF EXIST "%WINGHOME%\bin\wing.exe" ( - start "" "%WINGHOME%\bin\wing.exe" "%WING_PROJ%" -) ELSE ( - Where wing.exe 2> NUL - IF ERRORLEVEL 1 ( - echo wing.exe could not be found - pause - ) ELSE ( - start "" wing.exe "%WING_PROJ%" - ) -) - -ENDLOCAL - -:: Return to starting directory -POPD - -:END_OF_FILE diff --git a/Gems/AtomContent/Sponza/Project_Env.bat b/Gems/AtomContent/Sponza/Project_Env.bat index b06acfaa9a..7df40049f3 100644 --- a/Gems/AtomContent/Sponza/Project_Env.bat +++ b/Gems/AtomContent/Sponza/Project_Env.bat @@ -15,6 +15,7 @@ REM cd %~dp0 PUSHD %~dp0 +:: This is a legacy envar which is being migrated to LY_PROJECT_NAME for %%a in (.) do set LY_PROJECT=%%~na echo. @@ -26,6 +27,9 @@ echo. echo LY_PROJECT = %LY_PROJECT% +set LY_PROJECT_NAME=%LY_PROJECT% +echo LY_PROJECT_NAME = %LY_PROJECT_NAME% + :: Put you project env vars and overrides here :: chanhe the relative path up to dev diff --git a/Gems/AtomContent/Sponza/Registry/AssetProcessorPlatformConfig.setreg b/Gems/AtomContent/Sponza/Registry/AssetProcessorPlatformConfig.setreg new file mode 100644 index 0000000000..778d05dee9 --- /dev/null +++ b/Gems/AtomContent/Sponza/Registry/AssetProcessorPlatformConfig.setreg @@ -0,0 +1,14 @@ +{ + "Amazon": { + "AssetProcessor": { + "Settings": { + // ------------------------------------------------------------------------------ + // Sample Gems, Block source folders + // ------------------------------------------------------------------------------ + "Exclude Work In Progress Folders": { + "pattern": ".*\\\\/.[Ss]rc\\\\/.*" + } + } + } + } +} diff --git a/Gems/AtomContent/Sponza/Launch_Cmd.bat b/Gems/AtomContent/Sponza/Tools/Launch_Cmd.bat similarity index 54% rename from Gems/AtomContent/Sponza/Launch_Cmd.bat rename to Gems/AtomContent/Sponza/Tools/Launch_Cmd.bat index f69d4ef49c..f5d436b215 100644 --- a/Gems/AtomContent/Sponza/Launch_Cmd.bat +++ b/Gems/AtomContent/Sponza/Tools/Launch_Cmd.bat @@ -1,16 +1,6 @@ +:: Need to set up + @echo off - -REM -REM All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -REM its licensors. -REM -REM For complete copyright and license terms please see the LICENSE at the root of this -REM distribution (the "License"). All use of this software is governed by the License, -REM or, if provided, by the license below or the license accompanying this file. Do not -REM remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM - :: Set up and run LY Python CMD prompt :: Sets up the DccScriptingInterface_Env, :: Puts you in the CMD within the dev environment @@ -27,7 +17,7 @@ PUSHD %~dp0 :: Keep changes local SETLOCAL enableDelayedExpansion -CALL %~dp0\Project_Env.bat +CALL %~dp0\..\Project_Env.bat echo. echo _____________________________________________________________________ @@ -44,4 +34,4 @@ ENDLOCAL :: Return to starting directory POPD -:END_OF_FILE +:END_OF_FILE \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Launch_Maya_2020.bat b/Gems/AtomContent/Sponza/Tools/Maya/Launch_Maya_2020.bat similarity index 64% rename from Gems/AtomContent/Sponza/Launch_Maya_2020.bat rename to Gems/AtomContent/Sponza/Tools/Maya/Launch_Maya_2020.bat index 224d8c15d0..8fb283d6d8 100644 --- a/Gems/AtomContent/Sponza/Launch_Maya_2020.bat +++ b/Gems/AtomContent/Sponza/Tools/Maya/Launch_Maya_2020.bat @@ -1,15 +1,7 @@ -@echo off +:: Launches maya wityh a bunch of local hooks for Lumberyard +:: ToDo: move all of this to a .json data driven boostrapping system -REM -REM All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -REM its licensors. -REM -REM For complete copyright and license terms please see the LICENSE at the root of this -REM distribution (the "License"). All use of this software is governed by the License, -REM or, if provided, by the license below or the license accompanying this file. Do not -REM remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM +@echo off %~d0 cd %~dp0 @@ -34,7 +26,7 @@ set MAYA_VERSION=2020 echo MAYA_VERSION = %MAYA_VERSION% :: if a local customEnv.bat exists, run it -IF EXIST "%~dp0Project_Env.bat" CALL %~dp0Project_Env.bat +IF EXIST "%~dp0..\..\Project_Env.bat" CALL %~dp0..\..\Project_Env.bat echo ________________________________ echo Launching Maya %MAYA_VERSION% for Lumberyard... @@ -53,7 +45,7 @@ IF EXIST "%MAYA_LOCATION%\bin\Maya.exe" ( Where maya.exe 2> NUL IF ERRORLEVEL 1 ( echo Maya.exe could not be found - pause + pause ) ELSE ( start "" Maya.exe %* ) @@ -64,4 +56,4 @@ POPD :END_OF_FILE -exit /b 0 +exit /b 0 \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/LyProjectRootStub b/Gems/AtomContent/Sponza/Tools/Maya/Scripts/stub similarity index 100% rename from Gems/AtomContent/Sponza/LyProjectRootStub rename to Gems/AtomContent/Sponza/Tools/Maya/Scripts/stub diff --git a/Gems/AtomContent/Sponza/User_env.bat.template b/Gems/AtomContent/Sponza/User_env.bat.template new file mode 100644 index 0000000000..99bc7a951d --- /dev/null +++ b/Gems/AtomContent/Sponza/User_env.bat.template @@ -0,0 +1 @@ +set LY_DEV=C:\Depot\o3de-engine \ No newline at end of file