Sfoglia il codice sorgente

planter fix, tools update, adding road from Ben

Signed-off-by: Jonny Galloway <[email protected]>
Jonny Galloway 2 anni fa
parent
commit
997f0a0a9b

+ 3 - 0
Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Objects/RoadTile/road_tile.fbx

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c31df420839891d4c0422c8352d92c64e67c054df766524bb630004eef4896c9
+size 22544

+ 186 - 0
Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Objects/RoadTile/road_tile.prefab

@@ -0,0 +1,186 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "road_tile",
+        "Components": {
+            "Component_[10384509143050107620]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 10384509143050107620
+            },
+            "Component_[15490645323403393293]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 15490645323403393293
+            },
+            "Component_[15852704042093290027]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 15852704042093290027
+            },
+            "Component_[17964519421730169384]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 17964519421730169384
+            },
+            "Component_[4436910717373248819]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 4436910717373248819,
+                "Parent Entity": ""
+            },
+            "Component_[5075496849795277834]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 5075496849795277834,
+                "Child Entity Order": [
+                    "Entity_[1402045417546]"
+                ]
+            },
+            "Component_[7918632594945038358]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 7918632594945038358
+            },
+            "Component_[8391031730576373532]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 8391031730576373532
+            },
+            "Component_[872237283455412157]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 872237283455412157
+            },
+            "Component_[9685259775679690562]": {
+                "$type": "EditorLockComponent",
+                "Id": 9685259775679690562
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[1402045417546]": {
+            "Id": "Entity_[1402045417546]",
+            "Name": "road_tile",
+            "Components": {
+                "Component_[14288178889635849910]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 14288178889635849910
+                },
+                "Component_[14906622794970581770]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 14906622794970581770,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 18013514340443044748
+                        }
+                    ]
+                },
+                "Component_[16091617400884366146]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 16091617400884366146
+                },
+                "Component_[17004492759190186803]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 17004492759190186803
+                },
+                "Component_[18013514340443044748]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 18013514340443044748,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[2667379192910300994]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2667379192910300994
+                },
+                "Component_[4416790619460834903]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4416790619460834903
+                },
+                "Component_[4721517717718667381]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 4721517717718667381
+                },
+                "Component_[7768425832210735219]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 7768425832210735219,
+                    "Child Entity Order": [
+                        "Entity_[1406340384842]"
+                    ]
+                }
+            }
+        },
+        "Entity_[1406340384842]": {
+            "Id": "Entity_[1406340384842]",
+            "Name": "road_tile",
+            "Components": {
+                "Component_[10457936678855656071]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 10457936678855656071
+                },
+                "Component_[12082612815033725877]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 12082612815033725877
+                },
+                "Component_[12469637538557887403]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 12469637538557887403
+                },
+                "Component_[1485013695030426006]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 1485013695030426006
+                },
+                "Component_[15654229986716636501]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 15654229986716636501,
+                    "Parent Entity": "Entity_[1402045417546]"
+                },
+                "Component_[3271807408782070682]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 3271807408782070682
+                },
+                "Component_[3299310405600849622]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 3299310405600849622,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 1134223526
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{1F5CAB85-16F2-5457-8CB0-8D1773D51F94}"
+                                            },
+                                            "assetHint": "kb3d_hightechstreets/objects/roadtile/road_tile_lambert2.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[4291232599273372448]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 4291232599273372448
+                },
+                "Component_[5870740074424943417]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 5870740074424943417
+                },
+                "Component_[6215915806351908816]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 6215915806351908816,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{DB17075D-CFDF-50C8-9710-072D62600A01}",
+                                    "subId": 282396578
+                                },
+                                "assetHint": "kb3d_hightechstreets/objects/roadtile/default_road_tile_4594106d_3cd9_560f_9e0e_c0e209788bd0_.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[7297477326990769251]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 7297477326990769251
+                }
+            }
+        }
+    }
+}

+ 29 - 0
Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Objects/RoadTile/road_tile_lambert2.material

@@ -0,0 +1,29 @@
+{
+    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
+    "materialTypeVersion": 5,
+    "propertyValues": {
+        "baseColor.color": [
+            0.4000000059604645,
+            0.4000000059604645,
+            0.4000000059604645,
+            1.0
+        ],
+        "baseColor.textureBlendMode": "Lerp",
+        "baseColor.textureMap": "../../KB3DTextures/KB3D_HTS_MetalWhite_basecolor.png",
+        "emissive.color": [
+            0.0,
+            0.0,
+            0.0,
+            1.0
+        ],
+        "metallic.textureMap": "../../KB3DTextures/KB3D_HTS_MetalWhite_metallic.png",
+        "metallic.useTexture": false,
+        "normal.textureMap": "../../KB3DTextures/KB3D_HTS_MetalWhite_normal.png",
+        "normal.useTexture": false,
+        "opacity.factor": 1.0,
+        "roughness.textureMap": "../../KB3DTextures/KB3D_HTS_MetalWhite_specular.png",
+        "roughness.useTexture": false,
+        "specularF0.textureMap": "../../KB3DTextures/KB3D_HTS_MetalWhite_specular.png",
+        "specularF0.useTexture": false
+    }
+}

+ 22 - 3
Gems/kb3d_mps/Tools/Env_Dev.bat.template

@@ -1,4 +1,23 @@
-:: This file allows you to set/override values for Project_Env.bat
-:: copy this file, rename from User_Env.bat.template, to User_Env.bat
+REM
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM
+REM
 
-set O3DE_DEV=C:\path\to\root\o3de-engine
+echo.
+echo _____________________________________________________________________
+echo.
+echo ~    O3DE DCCsi Env Dev ...
+echo _____________________________________________________________________
+echo.
+echo ~    local env settings
+echo.
+
+:: These are local overrides for developers launching the dev environment
+:: Using the .bat files (for windows)
+
+:: set the location of the engine root
+set O3DE_DEV=C:\depot\o3de-dev
+echo     O3DE_DEV = %O3DE_DEV%

+ 2 - 2
Gems/kb3d_mps/Tools/Launch_Maya.bat

@@ -46,10 +46,10 @@ IF EXIST "%~dp0Project_Env.bat" CALL %~dp0Project_Env.bat
 
 :: Maya 2022: 3.7.7 (tags/v3.7.7:d7c567b08f, Mar 10 2020, 10:41:24) [MSC v.1900 64 bit (AMD64)]
 IF "%DCCSI_PY_VERSION_MAJOR%"=="" (set DCCSI_PY_VERSION_MAJOR=3)
-IF "%DCCSI_PY_VERSION_MINOR%"=="" (set DCCSI_PY_VERSION_MINOR=7)
+IF "%DCCSI_PY_VERSION_MINOR%"=="" (set DCCSI_PY_VERSION_MINOR=9)
 IF "%DCCSI_PY_VERSION_RELEASE%"=="" (set DCCSI_PY_VERSION_RELEASE=7)
 :: Override the default maya version
-IF "%MAYA_VERSION%"=="" (set MAYA_VERSION=2022)
+IF "%MAYA_VERSION%"=="" (set MAYA_VERSION=2023)
 
 CALL %O3DE_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\Dev\Windows\Env_DCC_Maya.bat
 

+ 10 - 1
Gems/kb3d_mps/Tools/Project_Env.bat

@@ -28,7 +28,9 @@ echo.
 echo ~    Setting up O3DE DSI %O3DE_PROJECT_NAME% Environment ...
 echo _____________________________________________________________________
 echo.
-echo     O3DE_PROJECT_NAME = %O3DE_PROJECT_NAME%
+
+:: if the user has set up a custom env call it
+IF EXIST "%~dp0Env_Dev.bat" CALL %~dp0Env_Dev.bat
 
 :: O3DE_PROJECT is ideally treated as a full path in the env launchers
 :: do to changes in o3de, external engine/project/gem folder structures, etc.
@@ -44,6 +46,13 @@ echo     PATH_O3DE_PROJECT = %PATH_O3DE_PROJECT%
 set "PATH_O3DE_CACHE=%PATH_O3DE_PROJECT%\Cache"
 echo     PATH_O3DE_CACHE = %PATH_O3DE_CACHE%
 
+IF "%O3DE_DEV%"=="" (
+    echo       ~ O3DE_DEV is not set aka engine_root
+    echo       ~ set O3DE_DEV in Dev.bat
+    echo       ~ example: set "O3DE_DEV=C:\O3DE\0.0.0.0"
+    set O3DE_DEV=C:\not\set\o3de
+    )
+
 CALL %O3DE_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\Dev\Windows\Env_O3DE_Core.bat
 CALL %O3DE_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\Dev\Windows\Env_O3DE_Python.bat
 

+ 30 - 0
Gems/level_art_mps/Assets/DeciduousPlanter/DeciduousPlanter_DeciduousPlanter_mat.material

@@ -0,0 +1,30 @@
+{
+    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
+    "materialTypeVersion": 5,
+    "propertyValues": {
+        "baseColor.color": [
+            0.5,
+            0.5,
+            0.5,
+            1.0
+        ],
+        "baseColor.textureBlendMode": "Lerp",
+        "baseColor.textureMap": "textures/Deciduous_Planter_Base_color.png",
+        "emissive.color": [
+            0.0,
+            0.0,
+            0.0,
+            1.0
+        ],
+        "emissive.intensity": 0.0,
+        "metallic.textureMap": "textures/Deciduous_Planter_Metallic.png",
+        "normal.textureMap": "textures/Deciduous_Planter_Normal.png",
+        "occlusion.diffuseTextureMap": "textures/Deciduous_Planter_Ao.png",
+        "opacity.alphaSource": "Split",
+        "opacity.factor": 1.0,
+        "opacity.mode": "Cutout",
+        "opacity.textureMap": "textures/Deciduous_Planter_Opacity.png",
+        "roughness.factor": 0.33000001311302185,
+        "roughness.textureMap": "textures/Deciduous_Planter_Roughness.png"
+    }
+}

+ 3 - 0
Gems/level_art_mps/Assets/DeciduousPlanter/Maya2023_DeciduousPlanter.mb

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d97d0e2b1596a36e5f0627cadf26cd3fc4c993ec4765229a7021c68b17b0ea3
+size 853908

+ 1 - 0
Gems/level_art_mps/Tools/.gitignore

@@ -0,0 +1 @@
+Env_Dev.bat

+ 23 - 0
Gems/level_art_mps/Tools/Env_Dev.bat.template

@@ -0,0 +1,23 @@
+REM
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM
+REM
+
+echo.
+echo _____________________________________________________________________
+echo.
+echo ~    O3DE DCCsi Env Dev ...
+echo _____________________________________________________________________
+echo.
+echo ~    local env settings
+echo.
+
+:: These are local overrides for developers launching the dev environment
+:: Using the .bat files (for windows)
+
+:: set the location of the engine root
+set O3DE_DEV=C:\depot\o3de-dev
+echo     O3DE_DEV = %O3DE_DEV%

+ 37 - 0
Gems/level_art_mps/Tools/Launch_Cmd.bat

@@ -0,0 +1,37 @@
+:: Need to set up
+
+@echo off
+:: Set up and start a O3DE CMD prompt
+:: Sets up the current (DCC) Project_Env,
+:: Puts you in the CMD within the dev environment
+
+:: Set up window
+TITLE O3DE DCC Scripting Interface Cmd
+:: Use obvious color to prevent confusion (Grey with Yellow Text)
+COLOR 8E
+
+%~d0
+cd %~dp0
+PUSHD %~dp0
+
+:: Keep changes local
+SETLOCAL enableDelayedExpansion
+
+CALL %~dp0\Project_Env.bat
+
+echo.
+echo _____________________________________________________________________
+echo.
+echo ~    O3DE %O3DE_PROJECT_NAME% Asset Gem CMD ...
+echo _____________________________________________________________________
+echo.
+
+:: Create command prompt with environment
+CALL %windir%\system32\cmd.exe
+
+ENDLOCAL
+
+:: Return to starting directory
+POPD
+
+:END_OF_FILE

+ 137 - 0
Gems/level_art_mps/Tools/Launch_Maya.bat

@@ -0,0 +1,137 @@
+@echo off
+
+REM 
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM
+REM
+
+:: Launches Maya 2022+, with this Asset Gem as the Maya project,
+:: and bootstrapped with O3DE DccScriptingInterface Gem
+:: Note: O3DE DCCsi currently only supports windows and Maya 2022+ with Python3+
+
+:: Set up window
+TITLE O3DE DCCsi Launch WingIDE 7x
+:: Use obvious color to prevent confusion (Grey with Yellow Text)
+COLOR 8E
+
+echo.
+echo _____________________________________________________________________
+echo.
+echo ~    O3DE, Asset Gem, DCCsi Maya Launch Env ...
+echo _____________________________________________________________________
+echo.
+echo ~    default envas for O3DE and Maya
+echo.
+
+%~d0
+cd %~dp0
+PUSHD %~dp0
+
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+:: change the relative path up to dev
+set ABS_PATH=%~dp0
+
+:: if the user has set up a custom env call it
+:: this should allow the user to locally
+:: set env hooks like O3DE_DEV or O3DE_PROJECT
+:: Put you project env vars and overrides in this file
+IF EXIST "%~dp0Env_Dev.bat" CALL %~dp0Env_Dev.bat
+
+:: if a local customEnv.bat exists, run it
+IF EXIST "%~dp0Project_Env.bat" CALL %~dp0Project_Env.bat
+
+:: Maya 2022: 3.7.7 (tags/v3.7.7:d7c567b08f, Mar 10 2020, 10:41:24) [MSC v.1900 64 bit (AMD64)]
+IF "%DCCSI_PY_VERSION_MAJOR%"=="" (set DCCSI_PY_VERSION_MAJOR=3)
+IF "%DCCSI_PY_VERSION_MINOR%"=="" (set DCCSI_PY_VERSION_MINOR=9)
+IF "%DCCSI_PY_VERSION_RELEASE%"=="" (set DCCSI_PY_VERSION_RELEASE=7)
+:: Override the default maya version
+IF "%MAYA_VERSION%"=="" (set MAYA_VERSION=2023)
+
+CALL %O3DE_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\Dev\Windows\Env_DCC_Maya.bat
+
+:: ide and debugger plug
+set "DCCSI_PY_DEFAULT=%MAYA_BIN_PATH%\mayapy.exe"
+echo     DCCSI_PY_DEFAULT = %DCCSI_PY_DEFAULT%
+
+:: Some IDEs like Wing, may in some cases need acess directly to the exe to operate correctly
+set "DCCSI_PY_IDE=%MAYA_BIN_PATH%\mayapy.exe"
+echo     DCCSI_PY_IDE = %DCCSI_PY_IDE%
+
+:: add to the PATH here (this is global)
+SET PATH=%MAYA_BIN_PATH%;%DCCSI_PY_IDE%;%DCCSI_PY_DEFAULT%;%PATH%
+
+:: the next line sets up too much, I beleive is causing a maya boot failure
+::CALL %~dp0..\Env_O3DE_Python.bat
+
+:: shared location for 64bit python 3.7 DEV location
+:: this defines a DCCsi sandbox for lib site-packages by version
+:: <O3DE>\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib
+set "PATH_DCCSI_PYTHON=%PATH_DCCSIG%\3rdParty\Python"
+echo     PATH_DCCSI_PYTHON = %PATH_DCCSI_PYTHON%
+
+:: add access to a Lib location that matches the py version (example: 3.7.x)
+:: switch this for other python versions like maya (2.7.x)
+IF "%PATH_DCCSI_PYTHON_LIB%"=="" (set "PATH_DCCSI_PYTHON_LIB=%PATH_DCCSI_PYTHON%\Lib\%DCCSI_PY_VERSION_MAJOR%.x\%DCCSI_PY_VERSION_MAJOR%.%DCCSI_PY_VERSION_MINOR%.x\site-packages")
+echo     PATH_DCCSI_PYTHON_LIB = %PATH_DCCSI_PYTHON_LIB%
+
+:: add to the PATH
+SET PATH=%MAYA_BIN_PATH%;%PATH%
+
+:: add all python related paths to PYTHONPATH for package imports
+set PYTHONPATH=%DCCSI_MAYA_SCRIPT_PATH%;%PATH_DCCSIG%;%PATH_DCCSI_PYTHON_LIB%;%PYTHONPATH%
+
+:: some of the env is procedural and build off of other settings
+:: so calling it again here, makes sure the overrides in the Env_Dev.bat persist as final.
+IF EXIST "%~dp0Env_Dev.bat" CALL %~dp0Env_Dev.bat
+
+echo.
+echo _____________________________________________________________________
+echo.
+echo Launching Maya %MAYA_VERSION% for O3DE DCCsi...
+echo _____________________________________________________________________
+echo.
+
+echo     MAYA_VERSION = %MAYA_VERSION%
+echo     DCCSI_PY_VERSION_MAJOR = %DCCSI_PY_VERSION_MAJOR%
+echo     DCCSI_PY_VERSION_MINOR = %DCCSI_PY_VERSION_MINOR%
+echo     DCCSI_PY_VERSION_RELEASE = %DCCSI_PY_VERSION_RELEASE%
+echo     MAYA_LOCATION = %MAYA_LOCATION%
+echo     MAYA_BIN_PATH = %MAYA_BIN_PATH%
+
+echo.
+echo     PATH = %PATH%
+echo.
+echo     PYTHONPATH = %PYTHONPATH%
+echo.
+
+:: Change to root dir
+CD /D %PATH_O3DE_PROJECT%
+
+echo Ready to start Maya
+pause
+
+:: Default to the right version of Maya if we can detect it... and launch
+IF EXIST "%MAYA_BIN_PATH%\maya.exe" (
+    start "" "%MAYA_BIN_PATH%\maya.exe" %*
+) ELSE (
+    Where maya.exe 2> NUL
+    IF ERRORLEVEL 1 (
+        echo Maya.exe could not be found
+            pause
+    ) ELSE (
+        start "" Maya.exe %*
+    )
+)
+
+::ENDLOCAL
+
+:: Restore previous directory
+POPD
+
+:END_OF_FILE
+
+exit /b 0

+ 73 - 0
Gems/level_art_mps/Tools/Project_Env.bat

@@ -0,0 +1,73 @@
+@echo off
+REM 
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM
+REM
+
+:: Sets up environment for O3DE DCC tools and code access
+
+:: Store current dir
+%~d0
+cd %~dp0
+PUSHD %~dp0
+
+:: change the relative path up to dev
+set ABS_PATH=%~dp0
+
+:: project name as a str tag
+IF "%O3DE_PROJECT_NAME%"=="" (
+    for %%I in ("%~dp0.") do for %%J in ("%%~dpI.") do set O3DE_PROJECT_NAME=%%~nxJ
+    )
+
+echo.
+echo _____________________________________________________________________
+echo.
+echo ~    Setting up O3DE DSI %O3DE_PROJECT_NAME% Environment ...
+echo _____________________________________________________________________
+echo.
+
+:: if the user has set up a custom env call it
+IF EXIST "%~dp0Env_Dev.bat" CALL %~dp0Env_Dev.bat
+
+:: O3DE_PROJECT is ideally treated as a full path in the env launchers
+:: do to changes in o3de, external engine/project/gem folder structures, etc.
+IF "%O3DE_PROJECT%"=="" (
+    for %%i in ("%~dp0..") do set "O3DE_PROJECT=%%~fi"
+    )
+echo     O3DE_PROJECT = %O3DE_PROJECT%
+
+:: this is here for archaic reasons, WILL DEPRECATE
+IF "%PATH_O3DE_PROJECT%"=="" (set PATH_O3DE_PROJECT=%O3DE_PROJECT%)
+echo     PATH_O3DE_PROJECT = %PATH_O3DE_PROJECT%
+
+set "PATH_O3DE_CACHE=%PATH_O3DE_PROJECT%\Cache"
+echo     PATH_O3DE_CACHE = %PATH_O3DE_CACHE%
+
+IF "%O3DE_DEV%"=="" (
+    echo       ~ O3DE_DEV is not set aka engine_root
+    echo       ~ set O3DE_DEV in Dev.bat
+    echo       ~ example: set "O3DE_DEV=C:\O3DE\0.0.0.0"
+    set O3DE_DEV=C:\not\set\o3de
+    )
+
+CALL %O3DE_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\Dev\Windows\Env_O3DE_Core.bat
+CALL %O3DE_DEV%\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\Tools\Dev\Windows\Env_O3DE_Python.bat
+
+:: add to the PATH here (this is global)
+SET PATH=%PATH_O3DE_BIN%;%PATH_DCCSIG%;%PATH%
+
+:: Restore original directory
+popd
+
+:: Change to root dir
+CD /D %ABS_PATH%
+
+GOTO END_OF_FILE
+
+:: Return to starting directory
+POPD
+
+:END_OF_FILE

+ 90 - 0
Gems/level_art_mps/workspace.mel

@@ -0,0 +1,90 @@
+//Maya 2023 Project Definition
+workspace -fr "templates" "assets";
+
+//Maya 2020 Project Definition
+workspace -fr "fluidCache" "";
+workspace -fr "images" "Assets";
+workspace -fr "JT_ATF" "";
+workspace -fr "offlineEdit" "Tools/Maya/.maya_data/scenes/edits";
+workspace -fr "STEP_ATF Export" "";
+workspace -fr "furShadowMap" "";
+workspace -fr "SVG" "";
+workspace -fr "scripts" "Tools/Maya/Scripts";
+workspace -fr "DAE_FBX" "";
+workspace -fr "shaders" "Tools/Maya/Shaders";
+workspace -fr "NX_ATF" "";
+workspace -fr "furFiles" "";
+workspace -fr "CATIAV5_ATF Export" "";
+workspace -fr "OBJ" "Assets";
+workspace -fr "PARASOLID_ATF Export" "";
+workspace -fr "FBX export" "Assets";
+workspace -fr "furEqualMap" "";
+workspace -fr "textures" "Assets";
+workspace -fr "BIF" "";
+workspace -fr "lights" "Tools/Maya/.maya_data/renderData/shaders";
+workspace -fr "DAE_FBX export" "";
+workspace -fr "aliasWire" "Tools/Maya/.maya_data/data";
+workspace -fr "CATIAV5_ATF" "";
+workspace -fr "SAT_ATF Export" "";
+workspace -fr "movie" "Tools/Maya/.maya_data/movies";
+workspace -fr "ASS Export" "";
+workspace -fr "autoSave" "Tools/Maya/.maya_data/autoSave";
+workspace -fr "move" "Tools/Maya/.maya_data";
+workspace -fr "mayaAscii" "Assets";
+workspace -fr "NX_ATF Export" "";
+workspace -fr "sound" "Tools/Maya/.maya_data/sound";
+workspace -fr "mayaBinary" "Assets";
+workspace -fr "timeEditor" "";
+workspace -fr "RIBexport" "Tools/Maya/.maya_data/data";
+workspace -fr "DWG_ATF" "";
+workspace -fr "mentalray" "Tools/Maya/.maya_data/renderData/mentalray";
+workspace -fr "Arnold-USD" "";
+workspace -fr "JT_ATF Export" "";
+workspace -fr "iprImages" "Tools/Maya/.maya_data/renderData/iprImages";
+workspace -fr "FBX" "Assets";
+workspace -fr "renderData" "Tools/Maya/.maya_data/renderData";
+workspace -fr "CATIAV4_ATF" "";
+workspace -fr "fileCache" "";
+workspace -fr "eps" "";
+workspace -fr "IGESexport" "Tools/Maya/.maya_data/data";
+workspace -fr "3dPaintTextures" "Tools/Maya/.maya_data/3dPaintTextures";
+workspace -fr "translatorData" "";
+workspace -fr "mel" "Tools/Maya/Scripts/Mel";
+workspace -fr "DXF_ATF Export" "";
+workspace -fr "IGES" "Tools/Maya/.maya_data/data";
+workspace -fr "particles" "Tools/Maya/.maya_data/particles";
+workspace -fr "DXFexport" "Tools/Maya/.maya_data/data";
+workspace -fr "DXF_ATF" "";
+workspace -fr "scene" "Assets";
+workspace -fr "renderScenes" "Tools/Maya/.maya_data/renderScenes";
+workspace -fr "SAT_ATF" "";
+workspace -fr "PROE_ATF" "";
+workspace -fr "WIRE_ATF Export" "";
+workspace -fr "sourceImages" "Assets";
+workspace -fr "RIB" "Tools/Maya/.maya_data/data";
+workspace -fr "furImages" "";
+workspace -fr "clips" "Tools/Maya/.maya_data/clips";
+workspace -fr "Adobe(R) Illustrator(R)" "Tools/Maya/.maya_data/data";
+workspace -fr "animExport" "Tools/Maya/.maya_data/data";
+workspace -fr "mentalRay" "Tools/Maya/.maya_data/mentalRay";
+workspace -fr "STEP_ATF" "";
+workspace -fr "DWG_ATF Export" "";
+workspace -fr "depth" "Tools/Maya/.maya_data/renderData/depth";
+workspace -fr "sceneAssembly" "";
+workspace -fr "IGES_ATF Export" "";
+workspace -fr "teClipExports" "";
+workspace -fr "IGES_ATF" "";
+workspace -fr "PARASOLID_ATF" "";
+workspace -fr "ASS" "";
+workspace -fr "Substance" "Tools/Maya/.maya_data/data";
+workspace -fr "audio" "Tools/Maya/.maya_data/sound";
+workspace -fr "EPS" "Tools/Maya/.maya_data/data";
+workspace -fr "Alembic" "Assets";
+workspace -fr "diskCache" "Tools/Maya/.maya_data/cache";
+workspace -fr "illustrator" "";
+workspace -fr "WIRE_ATF" "";
+workspace -fr "templates" "Tools/Maya/.maya_data/SceneTemplates";
+workspace -fr "animImport" "Tools/Maya/.maya_data/data";
+workspace -fr "OBJexport" "Assets";
+workspace -fr "furAttrMap" "";
+workspace -fr "DXF" "Tools/Maya/.maya_data/data";

+ 43 - 15
Project/Levels/MPS-Asset-Test/MPS-Asset-Test.prefab

@@ -39,7 +39,9 @@
                     "Instance_[2051676711651]/ContainerEntity",
                     "Instance_[2399569062627]/ContainerEntity",
                     "Instance_[2764641282787]/ContainerEntity",
-                    "Instance_[3146893372131]/ContainerEntity"
+                    "Instance_[3146893372131]/ContainerEntity",
+                    "Instance_[24237596969497]/ContainerEntity",
+                    "Instance_[1393455482954]/ContainerEntity"
                 ]
             },
             "Component_[15230859088967841193]": {
@@ -560,6 +562,7 @@
                                 0.13725490868091583
                             ],
                             "Intensity": 2.0,
+                            "AngularDiameter": 1.0,
                             "CameraEntityId": "",
                             "ShadowFilterMethod": 1,
                             "CascadeBlendingEnabled": true
@@ -1536,43 +1539,53 @@
                 }
             ]
         },
-        "Instance_[1806404418815]": {
-            "Source": "DefenceTurret/DefenceTurret.prefab",
+        "Instance_[1393455482954]": {
+            "Source": "KB3D_HighTechStreets/Objects/RoadTile/road_tile.prefab",
             "Patches": [
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[7968127118296968054]/Parent Entity",
+                    "path": "/ContainerEntity/Components/Component_[4436910717373248819]/Parent Entity",
                     "value": "../Entity_[1146574390643]"
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[7968127118296968054]/Transform Data/Translate/0",
-                    "value": -3.6079564094543457
+                    "path": "/ContainerEntity/Components/Component_[4436910717373248819]/Transform Data/Translate/0",
+                    "value": -3.598296642303467
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[7968127118296968054]/Transform Data/Translate/1",
-                    "value": -9.964027404785156
+                    "path": "/ContainerEntity/Components/Component_[4436910717373248819]/Transform Data/Translate/1",
+                    "value": -18.98159408569336
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[2377036055897]/Components/Component_[6568286573377831044]/ColliderConfiguration/MaterialSlots/Slots/0/Name",
-                    "value": "lambert1"
+                    "path": "/ContainerEntity/Components/Component_[4436910717373248819]/Transform Data/Translate/2",
+                    "value": -0.03361344337463379
                 }
             ]
         },
-        "Instance_[24237596969497]": {
-            "Source": "Prefabs/Canyon-Barren-Terrain.prefab",
+        "Instance_[1806404418815]": {
+            "Source": "DefenceTurret/DefenceTurret.prefab",
             "Patches": [
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[16893389135966699929]/Parent Entity",
+                    "path": "/ContainerEntity/Components/Component_[7968127118296968054]/Parent Entity",
                     "value": "../Entity_[1146574390643]"
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[16893389135966699929]/Transform Data/Translate/2",
-                    "value": 28.52194023132324
+                    "path": "/ContainerEntity/Components/Component_[7968127118296968054]/Transform Data/Translate/0",
+                    "value": -3.6079564094543457
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[7968127118296968054]/Transform Data/Translate/1",
+                    "value": -9.964027404785156
+                },
+                {
+                    "op": "replace",
+                    "path": "/Entities/Entity_[2377036055897]/Components/Component_[6568286573377831044]/ColliderConfiguration/MaterialSlots/Slots/0/Name",
+                    "value": "lambert1"
                 }
             ]
         },
@@ -1596,6 +1609,21 @@
                 }
             ]
         },
+        "Instance_[24237596969497]": {
+            "Source": "Prefabs/Canyon-Barren-Terrain.prefab",
+            "Patches": [
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[16893389135966699929]/Parent Entity",
+                    "value": "../Entity_[1146574390643]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[16893389135966699929]/Transform Data/Translate/2",
+                    "value": 28.52194023132324
+                }
+            ]
+        },
         "Instance_[2764641282787]": {
             "Source": "LEC45d/LEC45d.prefab",
             "Patches": [