Prechádzať zdrojové kódy

adjusting emissive ev into range

Signed-off-by: Jonny Galloway <[email protected]>
Jonny Galloway 2 rokov pred
rodič
commit
3cde00532e
29 zmenil súbory, kde vykonal 133 pridanie a 79 odobranie
  1. 2 1
      Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Objects/HTS_BldgMD_A/HTS_BldgMD_A_KB3D_HTS_HoloInfoA.material
  2. 2 1
      Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Objects/HTS_Planter_A/HTS_Planter_A_KB3D_HTS_HoloInfoA.material
  3. 3 0
      Gems/landscape_mps/Assets/Skies/starmap_2020_leveled_lowcontrast_minus6ev_iblskyboxcm.exr
  4. 4 0
      Gems/level_art_mps/Assets/AgPlatform/AgPlatform.prefab
  5. 4 7
      Gems/level_art_mps/Assets/AgPlatform/AgPlatform_opaque_MAT.material
  6. 6 1
      Gems/level_art_mps/Assets/Barrel01/Barrel001.prefab
  7. 4 1
      Gems/level_art_mps/Assets/Barrel01/Barrel01_opaque_MAT.material
  8. 6 1
      Gems/level_art_mps/Assets/Barrel02/Barrel02.prefab
  9. 4 8
      Gems/level_art_mps/Assets/Barrel02/Barrel02_opaque_MAT.material
  10. 13 11
      Gems/level_art_mps/Assets/Crate/Crate_opaque_MAT.material
  11. 4 8
      Gems/level_art_mps/Assets/DefenceTurret/DefenceTurret_opaque_MAT.material
  12. 6 1
      Gems/level_art_mps/Assets/DefenceTurret/DefenseTurret.prefab
  13. 1 1
      Gems/level_art_mps/Assets/EBarricade/EBarricade_Alpha_MAT.material
  14. 4 0
      Gems/level_art_mps/Assets/EBarricade/EBarricade_Small.prefab
  15. 4 0
      Gems/level_art_mps/Assets/EnergyCollector/EnergyCollector.prefab
  16. 4 3
      Gems/level_art_mps/Assets/EnergyCollector/Energycollector_alpha_MAT.material
  17. 4 2
      Gems/level_art_mps/Assets/EnergyCollector/Energycollector_opaque_MAT.material
  18. 8 2
      Gems/level_art_mps/Assets/LEC45d/LEC45d.prefab
  19. 5 2
      Gems/level_art_mps/Assets/LEC45d/LEC45d_Alpha_MAT.material
  20. 2 1
      Gems/level_art_mps/Assets/LEC45d/LEC45d_Opaque_MAT.material
  21. 8 2
      Gems/level_art_mps/Assets/LECstraight/LECstraight.prefab
  22. 4 2
      Gems/level_art_mps/Assets/LECstraight/LECstraight_Alpha_MAT.material
  23. 4 8
      Gems/level_art_mps/Assets/LECstraight/LECstraight_Opaque_MAT.material
  24. 4 2
      Gems/level_art_mps/Assets/MalfunctioningShieldGenerator/MShieldGen_Opaque_mat.material
  25. 10 4
      Gems/level_art_mps/Assets/Planter/Planter_Wall_Large_Planter_Wall_LightsMAT.material
  26. 1 1
      Project/CubeMapCaptures/starmap_2020_capture_d__4E681114-E01E-4899-B2B3-E08B4916DB47__ibldiffusecm.dds
  27. 1 1
      Project/CubeMapCaptures/starmap_2020_capture_s__505C792B-FBCA-4CE7-B26E-D4B50789DCDB__iblspecularcm1024.dds
  28. 8 5
      Project/Levels/IBL-Capture-Test/IBL-Capture-Test.prefab
  29. 3 3
      Project/Levels/IBL-Capture/IBL-Capture.prefab

+ 2 - 1
Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Objects/HTS_BldgMD_A/HTS_BldgMD_A_KB3D_HTS_HoloInfoA.material

@@ -6,9 +6,10 @@
         "baseColor.textureBlendMode": "Overlay",
         "baseColor.textureBlendMode": "Overlay",
         "baseColor.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_basecolor.png",
         "baseColor.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_basecolor.png",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 5.0,
+        "emissive.intensity": 6.0,
         "emissive.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_emissive.png",
         "emissive.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_emissive.png",
         "general.enableShadows": false,
         "general.enableShadows": false,
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_metallic.png",
         "metallic.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_metallic.png",
         "normal.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_normal.png",
         "normal.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_normal.png",
         "opacity.alphaSource": "Split",
         "opacity.alphaSource": "Split",

+ 2 - 1
Gems/kb3d_mps/Assets/KB3D_HighTechStreets/Objects/HTS_Planter_A/HTS_Planter_A_KB3D_HTS_HoloInfoA.material

@@ -6,10 +6,11 @@
         "baseColor.textureBlendMode": "Overlay",
         "baseColor.textureBlendMode": "Overlay",
         "baseColor.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_basecolor.png",
         "baseColor.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_basecolor.png",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 5.0,
+        "emissive.intensity": 6.0,
         "emissive.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_emissive.png",
         "emissive.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_emissive.png",
         "general.doubleSided": true,
         "general.doubleSided": true,
         "general.enableShadows": false,
         "general.enableShadows": false,
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_metallic.png",
         "metallic.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_metallic.png",
         "normal.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_normal.png",
         "normal.textureMap": "../../KB3DTextures/KB3D_HTS_HoloInfoA_normal.png",
         "opacity.alphaSource": "Split",
         "opacity.alphaSource": "Split",

+ 3 - 0
Gems/landscape_mps/Assets/Skies/starmap_2020_leveled_lowcontrast_minus6ev_iblskyboxcm.exr

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

+ 4 - 0
Gems/level_art_mps/Assets/AgPlatform/AgPlatform.prefab

@@ -54,6 +54,10 @@
             "Id": "Entity_[24176906811869]",
             "Id": "Entity_[24176906811869]",
             "Name": "agplatform",
             "Name": "agplatform",
             "Components": {
             "Components": {
+                "Component_[10821870466690530978]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 10821870466690530978
+                },
                 "Component_[12545584148022460756]": {
                 "Component_[12545584148022460756]": {
                     "$type": "EditorVisibilityComponent",
                     "$type": "EditorVisibilityComponent",
                     "Id": 12545584148022460756
                     "Id": 12545584148022460756

+ 4 - 7
Gems/level_art_mps/Assets/AgPlatform/AgPlatform_opaque_MAT.material

@@ -2,21 +2,18 @@
     "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
-        "baseColor.color": [
-            0.5,
-            0.5,
-            0.5,
-            1.0
-        ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "textures/AgPlatform_basecolor.png",
         "baseColor.textureMap": "textures/AgPlatform_basecolor.png",
         "emissive.enable": true,
         "emissive.enable": true,
+        "emissive.intensity": 5.0,
         "emissive.textureMap": "textures/AgPlatform_Emissive.png",
         "emissive.textureMap": "textures/AgPlatform_Emissive.png",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/AgPlatform_Metallic.png",
         "metallic.textureMap": "textures/AgPlatform_Metallic.png",
         "normal.textureMap": "textures/AgPlatform_Normal.png",
         "normal.textureMap": "textures/AgPlatform_Normal.png",
         "occlusion.diffuseTextureMap": "textures/AgPlatform_AO.png",
         "occlusion.diffuseTextureMap": "textures/AgPlatform_AO.png",
         "opacity.factor": 1.0,
         "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "textures/AgPlatform_Roughness.png"
+        "roughness.textureMap": "textures/AgPlatform_Roughness.png",
+        "specularF0.enableMultiScatterCompensation": true
     }
     }
 }
 }

+ 6 - 1
Gems/level_art_mps/Assets/Barrel01/Barrel001.prefab

@@ -114,7 +114,8 @@
                                         "MaterialAsset": {
                                         "MaterialAsset": {
                                             "assetId": {
                                             "assetId": {
                                                 "guid": "{E38E8351-886F-57F9-8D32-228FF458D23E}"
                                                 "guid": "{E38E8351-886F-57F9-8D32-228FF458D23E}"
-                                            }
+                                            },
+                                            "assetHint": "barrel01/barrel01_opaque_mat.azmaterial"
                                         }
                                         }
                                     }
                                     }
                                 }
                                 }
@@ -178,6 +179,10 @@
                         "LocallyEnabled": false
                         "LocallyEnabled": false
                     }
                     }
                 },
                 },
+                "Component_[7837798807590721068]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7837798807590721068
+                },
                 "Component_[7890103433140478346]": {
                 "Component_[7890103433140478346]": {
                     "$type": "EditorPendingCompositionComponent",
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 7890103433140478346
                     "Id": 7890103433140478346

+ 4 - 1
Gems/level_art_mps/Assets/Barrel01/Barrel01_opaque_MAT.material

@@ -6,7 +6,9 @@
         "baseColor.textureMap": "textures/Barrel01_basecolor.png",
         "baseColor.textureMap": "textures/Barrel01_basecolor.png",
         "baseColor.textureMapUv": "Unwrapped",
         "baseColor.textureMapUv": "Unwrapped",
         "emissive.enable": true,
         "emissive.enable": true,
+        "emissive.intensity": 5.0,
         "emissive.textureMap": "textures/Barrel01_Emissive.png",
         "emissive.textureMap": "textures/Barrel01_Emissive.png",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/Barrel01_Metallic.png",
         "metallic.textureMap": "textures/Barrel01_Metallic.png",
         "metallic.textureMapUv": "Unwrapped",
         "metallic.textureMapUv": "Unwrapped",
         "normal.textureMap": "textures/Barrel01_Normal.png",
         "normal.textureMap": "textures/Barrel01_Normal.png",
@@ -16,6 +18,7 @@
         "opacity.factor": 1.0,
         "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
         "roughness.textureMap": "textures/Barrel01_Roughness.png",
         "roughness.textureMap": "textures/Barrel01_Roughness.png",
-        "roughness.textureMapUv": "Unwrapped"
+        "roughness.textureMapUv": "Unwrapped",
+        "specularF0.enableMultiScatterCompensation": true
     }
     }
 }
 }

+ 6 - 1
Gems/level_art_mps/Assets/Barrel02/Barrel02.prefab

@@ -109,7 +109,8 @@
                                         "MaterialAsset": {
                                         "MaterialAsset": {
                                             "assetId": {
                                             "assetId": {
                                                 "guid": "{9DC207B1-7C2A-5111-9575-777D9E844800}"
                                                 "guid": "{9DC207B1-7C2A-5111-9575-777D9E844800}"
-                                            }
+                                            },
+                                            "assetHint": "barrel02/barrel02_opaque_mat.azmaterial"
                                         }
                                         }
                                     }
                                     }
                                 }
                                 }
@@ -121,6 +122,10 @@
                     "$type": "EditorDisabledCompositionComponent",
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 17848953960732628146
                     "Id": 17848953960732628146
                 },
                 },
+                "Component_[3974063600564769674]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 3974063600564769674
+                },
                 "Component_[4203999225150376362]": {
                 "Component_[4203999225150376362]": {
                     "$type": "EditorPendingCompositionComponent",
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 4203999225150376362
                     "Id": 4203999225150376362

+ 4 - 8
Gems/level_art_mps/Assets/Barrel02/Barrel02_opaque_MAT.material

@@ -2,22 +2,18 @@
     "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
-        "baseColor.color": [
-            0.5,
-            0.5,
-            0.5,
-            1.0
-        ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "textures/Barrel02_BaseColor.png",
         "baseColor.textureMap": "textures/Barrel02_BaseColor.png",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 2.700000047683716,
+        "emissive.intensity": 5.0,
         "emissive.textureMap": "textures/Barrel02_Emissive.png",
         "emissive.textureMap": "textures/Barrel02_Emissive.png",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/Barrel02_Metallic.png",
         "metallic.textureMap": "textures/Barrel02_Metallic.png",
         "normal.textureMap": "textures/Barrel02_Normal.png",
         "normal.textureMap": "textures/Barrel02_Normal.png",
         "occlusion.diffuseTextureMap": "textures/Barrel02_AO.png",
         "occlusion.diffuseTextureMap": "textures/Barrel02_AO.png",
         "opacity.factor": 1.0,
         "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "textures/Barrel02_Roughness.png"
+        "roughness.textureMap": "textures/Barrel02_Roughness.png",
+        "specularF0.enableMultiScatterCompensation": true
     }
     }
 }
 }

+ 13 - 11
Gems/level_art_mps/Assets/Crate/Crate_opaque_MAT.material

@@ -1,22 +1,24 @@
 {
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 4,
+    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
+    "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureBlendMode": "Lerp",
-        "baseColor.textureMap": "Crate/textures/Crate_BaseColor.png",
+        "baseColor.textureMap": "textures/Crate_BaseColor.png",
         "baseColor.textureMapUv": "Unwrapped",
         "baseColor.textureMapUv": "Unwrapped",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 3.0,
-        "emissive.textureMap": "Crate/textures/Crate_Emissive.png",
+        "emissive.intensity": 5.5,
+        "emissive.textureMap": "textures/Crate_Emissive.png",
         "emissive.textureMapUv": "Unwrapped",
         "emissive.textureMapUv": "Unwrapped",
-        "metallic.textureMap": "Crate/textures/Crate_Metallic.png",
+        "irradiance.irradianceColorSource": "BaseColor",
+        "metallic.textureMap": "textures/Crate_Metallic.png",
         "metallic.textureMapUv": "Unwrapped",
         "metallic.textureMapUv": "Unwrapped",
-        "normal.textureMap": "Crate/textures/Crate_Normal.png",
+        "normal.textureMap": "textures/Crate_Normal.png",
         "normal.textureMapUv": "Unwrapped",
         "normal.textureMapUv": "Unwrapped",
-        "occlusion.diffuseTextureMap": "Crate/textures/Crate_Ambient Occlusion.png",
+        "occlusion.diffuseTextureMap": "textures/Crate_Ambient Occlusion.png",
         "occlusion.diffuseTextureMapUv": "Unwrapped",
         "occlusion.diffuseTextureMapUv": "Unwrapped",
         "opacity.factor": 1.0,
         "opacity.factor": 1.0,
-        "roughness.textureMap": "Crate/textures/Crate_Roughness.png",
-        "roughness.textureMapUv": "Unwrapped"
+        "roughness.textureMap": "textures/Crate_Roughness.png",
+        "roughness.textureMapUv": "Unwrapped",
+        "specularF0.enableMultiScatterCompensation": true
     }
     }
-}
+}

+ 4 - 8
Gems/level_art_mps/Assets/DefenceTurret/DefenceTurret_opaque_MAT.material

@@ -2,23 +2,19 @@
     "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
-        "baseColor.color": [
-            0.5,
-            0.5,
-            0.5,
-            1.0
-        ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "textures/DefenceTurret_BaseColor.png",
         "baseColor.textureMap": "textures/DefenceTurret_BaseColor.png",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 3.0,
+        "emissive.intensity": 5.0,
         "emissive.textureMap": "textures/DefenceTurret_Emissive.png",
         "emissive.textureMap": "textures/DefenceTurret_Emissive.png",
         "emissive.textureMapUv": "Unwrapped",
         "emissive.textureMapUv": "Unwrapped",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/DefenceTurret_Metallic.png",
         "metallic.textureMap": "textures/DefenceTurret_Metallic.png",
         "normal.textureMap": "textures/DefenceTurret_Normal.png",
         "normal.textureMap": "textures/DefenceTurret_Normal.png",
         "occlusion.diffuseTextureMap": "textures/DefenceTurret_AO.png",
         "occlusion.diffuseTextureMap": "textures/DefenceTurret_AO.png",
         "opacity.factor": 1.0,
         "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "textures/DefenceTurret_Roughness.png"
+        "roughness.textureMap": "textures/DefenceTurret_Roughness.png",
+        "specularF0.enableMultiScatterCompensation": true
     }
     }
 }
 }

+ 6 - 1
Gems/level_art_mps/Assets/DefenceTurret/DefenseTurret.prefab

@@ -120,6 +120,10 @@
                     "$type": "EditorLockComponent",
                     "$type": "EditorLockComponent",
                     "Id": 3178359612842764654
                     "Id": 3178359612842764654
                 },
                 },
+                "Component_[4315581377446364950]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 4315581377446364950
+                },
                 "Component_[6685531474249640067]": {
                 "Component_[6685531474249640067]": {
                     "$type": "AZ::Render::EditorMeshComponent",
                     "$type": "AZ::Render::EditorMeshComponent",
                     "Id": 6685531474249640067,
                     "Id": 6685531474249640067,
@@ -149,7 +153,8 @@
                                         "MaterialAsset": {
                                         "MaterialAsset": {
                                             "assetId": {
                                             "assetId": {
                                                 "guid": "{6750615E-D0A9-5759-B55A-A68B64343574}"
                                                 "guid": "{6750615E-D0A9-5759-B55A-A68B64343574}"
-                                            }
+                                            },
+                                            "assetHint": "defenceturret/defenceturret_opaque_mat.azmaterial"
                                         }
                                         }
                                     }
                                     }
                                 }
                                 }

+ 1 - 1
Gems/level_art_mps/Assets/EBarricade/EBarricade_Alpha_MAT.material

@@ -12,10 +12,10 @@
         ],
         ],
         "emissive.intensity": 0.0,
         "emissive.intensity": 0.0,
         "emissive.textureMap": "textures/EBarricade_emissive.png",
         "emissive.textureMap": "textures/EBarricade_emissive.png",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/EBarricade_Metalic.png",
         "metallic.textureMap": "textures/EBarricade_Metalic.png",
         "normal.textureMap": "textures/EBarricade_Normal.png",
         "normal.textureMap": "textures/EBarricade_Normal.png",
         "occlusion.diffuseTextureMap": "textures/EBarricade_AO.png",
         "occlusion.diffuseTextureMap": "textures/EBarricade_AO.png",
-        "opacity.alphaAffectsSpecular": 0.009999999776482582,
         "opacity.alphaSource": "Split",
         "opacity.alphaSource": "Split",
         "opacity.factor": 0.4000000059604645,
         "opacity.factor": 0.4000000059604645,
         "opacity.mode": "TintedTransparent",
         "opacity.mode": "TintedTransparent",

+ 4 - 0
Gems/level_art_mps/Assets/EBarricade/EBarricade_Small.prefab

@@ -161,6 +161,10 @@
                         }
                         }
                     ]
                     ]
                 },
                 },
+                "Component_[16686378144442695065]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 16686378144442695065
+                },
                 "Component_[321387165225063293]": {
                 "Component_[321387165225063293]": {
                     "$type": "EditorPendingCompositionComponent",
                     "$type": "EditorPendingCompositionComponent",
                     "Id": 321387165225063293
                     "Id": 321387165225063293

+ 4 - 0
Gems/level_art_mps/Assets/EnergyCollector/EnergyCollector.prefab

@@ -191,6 +191,10 @@
                         }
                         }
                     ]
                     ]
                 },
                 },
+                "Component_[7828978321003616797]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 7828978321003616797
+                },
                 "Component_[8817580024962977177]": {
                 "Component_[8817580024962977177]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 8817580024962977177,
                     "Id": 8817580024962977177,

+ 4 - 3
Gems/level_art_mps/Assets/EnergyCollector/Energycollector_alpha_MAT.material

@@ -7,16 +7,17 @@
         "baseColor.textureMapUv": "Unwrapped",
         "baseColor.textureMapUv": "Unwrapped",
         "clearCoat.enable": true,
         "clearCoat.enable": true,
         "emissive.enable": true,
         "emissive.enable": true,
+        "emissive.intensity": 5.0,
         "emissive.textureMap": "textures/Energycollector_Emissive.png",
         "emissive.textureMap": "textures/Energycollector_Emissive.png",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/Energycollector_Metallic.png",
         "metallic.textureMap": "textures/Energycollector_Metallic.png",
         "metallic.textureMapUv": "Unwrapped",
         "metallic.textureMapUv": "Unwrapped",
         "normal.textureMap": "textures/Energycollector_Normal.png",
         "normal.textureMap": "textures/Energycollector_Normal.png",
         "normal.textureMapUv": "Unwrapped",
         "normal.textureMapUv": "Unwrapped",
         "occlusion.diffuseTextureMap": "textures/Energycollector_AO.png",
         "occlusion.diffuseTextureMap": "textures/Energycollector_AO.png",
-        "opacity.alphaAffectsSpecular": 1.0,
         "opacity.alphaSource": "Split",
         "opacity.alphaSource": "Split",
-        "opacity.factor": 1.0,
-        "opacity.mode": "Blended",
+        "opacity.factor": 0.20000000298023224,
+        "opacity.mode": "TintedTransparent",
         "opacity.textureMap": "textures/Energycollector_opacity.png",
         "opacity.textureMap": "textures/Energycollector_opacity.png",
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
         "roughness.textureMap": "textures/Energycollector_Roughness.png",
         "roughness.textureMap": "textures/Energycollector_Roughness.png",

+ 4 - 2
Gems/level_art_mps/Assets/EnergyCollector/Energycollector_opaque_MAT.material

@@ -6,8 +6,9 @@
         "baseColor.textureMap": "textures/Energycollector_basecolor.png",
         "baseColor.textureMap": "textures/Energycollector_basecolor.png",
         "baseColor.textureMapUv": "Unwrapped",
         "baseColor.textureMapUv": "Unwrapped",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 3.0,
+        "emissive.intensity": 5.0,
         "emissive.textureMap": "textures/Energycollector_Emissive.png",
         "emissive.textureMap": "textures/Energycollector_Emissive.png",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/Energycollector_Metallic.png",
         "metallic.textureMap": "textures/Energycollector_Metallic.png",
         "metallic.textureMapUv": "Unwrapped",
         "metallic.textureMapUv": "Unwrapped",
         "normal.textureMap": "textures/Energycollector_Normal.png",
         "normal.textureMap": "textures/Energycollector_Normal.png",
@@ -18,6 +19,7 @@
         "opacity.textureMap": "textures/Energycollector_opacity.png",
         "opacity.textureMap": "textures/Energycollector_opacity.png",
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
         "roughness.textureMap": "textures/Energycollector_Roughness.png",
         "roughness.textureMap": "textures/Energycollector_Roughness.png",
-        "roughness.textureMapUv": "Unwrapped"
+        "roughness.textureMapUv": "Unwrapped",
+        "specularF0.enableMultiScatterCompensation": true
     }
     }
 }
 }

+ 8 - 2
Gems/level_art_mps/Assets/LEC45d/LEC45d.prefab

@@ -104,6 +104,10 @@
                         "LocallyEnabled": false
                         "LocallyEnabled": false
                     }
                     }
                 },
                 },
+                "Component_[12407881375474222086]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 12407881375474222086
+                },
                 "Component_[13167236848490048581]": {
                 "Component_[13167236848490048581]": {
                     "$type": "EditorMaterialComponent",
                     "$type": "EditorMaterialComponent",
                     "Id": 13167236848490048581,
                     "Id": 13167236848490048581,
@@ -118,7 +122,8 @@
                                         "MaterialAsset": {
                                         "MaterialAsset": {
                                             "assetId": {
                                             "assetId": {
                                                 "guid": "{1CC1E9B1-1020-5778-9FE0-83FBAD8FF087}"
                                                 "guid": "{1CC1E9B1-1020-5778-9FE0-83FBAD8FF087}"
-                                            }
+                                            },
+                                            "assetHint": "lec45d/lec45d_opaque_mat.azmaterial"
                                         }
                                         }
                                     }
                                     }
                                 },
                                 },
@@ -130,7 +135,8 @@
                                         "MaterialAsset": {
                                         "MaterialAsset": {
                                             "assetId": {
                                             "assetId": {
                                                 "guid": "{9741517B-FB23-56C4-95F0-2739E0D6CEC5}"
                                                 "guid": "{9741517B-FB23-56C4-95F0-2739E0D6CEC5}"
-                                            }
+                                            },
+                                            "assetHint": "lec45d/lec45d_alpha_mat.azmaterial"
                                         }
                                         }
                                     }
                                     }
                                 }
                                 }

+ 5 - 2
Gems/level_art_mps/Assets/LEC45d/LEC45d_Alpha_MAT.material

@@ -5,8 +5,10 @@
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "textures/LEC45d_BaseColor.jpg",
         "baseColor.textureMap": "textures/LEC45d_BaseColor.jpg",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 3.0,
+        "emissive.intensity": 5.0,
         "emissive.textureMap": "textures/LEC45d_Emissive.jpg",
         "emissive.textureMap": "textures/LEC45d_Emissive.jpg",
+        "general.doubleSided": true,
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/LEC45d_Metallic.jpg",
         "metallic.textureMap": "textures/LEC45d_Metallic.jpg",
         "normal.textureMap": "textures/LEC45d_Normal.jpg",
         "normal.textureMap": "textures/LEC45d_Normal.jpg",
         "occlusion.diffuseTextureMap": "textures/LEC45d_AO.jpg",
         "occlusion.diffuseTextureMap": "textures/LEC45d_AO.jpg",
@@ -15,6 +17,7 @@
         "opacity.mode": "TintedTransparent",
         "opacity.mode": "TintedTransparent",
         "opacity.textureMap": "textures/LEC45d_opacity.jpg",
         "opacity.textureMap": "textures/LEC45d_opacity.jpg",
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "textures/LEC45d_Roughness.jpg"
+        "roughness.textureMap": "textures/LEC45d_Roughness.jpg",
+        "specularF0.enableMultiScatterCompensation": true
     }
     }
 }
 }

+ 2 - 1
Gems/level_art_mps/Assets/LEC45d/LEC45d_Opaque_MAT.material

@@ -5,8 +5,9 @@
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "textures/LEC45d_BaseColor.jpg",
         "baseColor.textureMap": "textures/LEC45d_BaseColor.jpg",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 3.0,
+        "emissive.intensity": 5.0,
         "emissive.textureMap": "textures/LEC45d_Emissive.jpg",
         "emissive.textureMap": "textures/LEC45d_Emissive.jpg",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/LEC45d_Metallic.jpg",
         "metallic.textureMap": "textures/LEC45d_Metallic.jpg",
         "normal.textureMap": "textures/LEC45d_Normal.jpg",
         "normal.textureMap": "textures/LEC45d_Normal.jpg",
         "occlusion.diffuseTextureMap": "textures/LEC45d_AO.jpg",
         "occlusion.diffuseTextureMap": "textures/LEC45d_AO.jpg",

+ 8 - 2
Gems/level_art_mps/Assets/LECstraight/LECstraight.prefab

@@ -77,6 +77,10 @@
                         }
                         }
                     }
                     }
                 },
                 },
+                "Component_[15578307605589958068]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 15578307605589958068
+                },
                 "Component_[16688166531796963723]": {
                 "Component_[16688166531796963723]": {
                     "$type": "EditorEntitySortComponent",
                     "$type": "EditorEntitySortComponent",
                     "Id": 16688166531796963723
                     "Id": 16688166531796963723
@@ -108,7 +112,8 @@
                                         "MaterialAsset": {
                                         "MaterialAsset": {
                                             "assetId": {
                                             "assetId": {
                                                 "guid": "{F791FF86-080E-52DC-939F-9BA6986CD167}"
                                                 "guid": "{F791FF86-080E-52DC-939F-9BA6986CD167}"
-                                            }
+                                            },
+                                            "assetHint": "lecstraight/lecstraight_opaque_mat.azmaterial"
                                         }
                                         }
                                     }
                                     }
                                 },
                                 },
@@ -120,7 +125,8 @@
                                         "MaterialAsset": {
                                         "MaterialAsset": {
                                             "assetId": {
                                             "assetId": {
                                                 "guid": "{47E669A5-CDA1-5D6F-A77D-1692D984E402}"
                                                 "guid": "{47E669A5-CDA1-5D6F-A77D-1692D984E402}"
-                                            }
+                                            },
+                                            "assetHint": "lecstraight/lecstraight_alpha_mat.azmaterial"
                                         }
                                         }
                                     }
                                     }
                                 }
                                 }

+ 4 - 2
Gems/level_art_mps/Assets/LECstraight/LECstraight_Alpha_MAT.material

@@ -4,17 +4,19 @@
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "textures/LECstraight_BaseColor.jpg",
         "baseColor.textureMap": "textures/LECstraight_BaseColor.jpg",
+        "clearCoat.enable": true,
         "emissive.enable": true,
         "emissive.enable": true,
         "emissive.intensity": 3.0,
         "emissive.intensity": 3.0,
         "emissive.textureMap": "textures/LECstraight_Emissive.jpg",
         "emissive.textureMap": "textures/LECstraight_Emissive.jpg",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/LECstraight_Metallic.jpg",
         "metallic.textureMap": "textures/LECstraight_Metallic.jpg",
         "normal.textureMap": "textures/LECstraight_Normal.jpg",
         "normal.textureMap": "textures/LECstraight_Normal.jpg",
         "occlusion.diffuseTextureMap": "textures/LECstraight_AO.png",
         "occlusion.diffuseTextureMap": "textures/LECstraight_AO.png",
         "opacity.alphaSource": "Split",
         "opacity.alphaSource": "Split",
-        "opacity.factor": 1.0,
+        "opacity.factor": 0.4000000059604645,
         "opacity.mode": "TintedTransparent",
         "opacity.mode": "TintedTransparent",
         "opacity.textureMap": "textures/LECstraight_opacity.jpg",
         "opacity.textureMap": "textures/LECstraight_opacity.jpg",
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "textures/LECstraight_BaseColor.jpg"
+        "roughness.textureMap": "textures/LECstraight_Roughness.jpg"
     }
     }
 }
 }

+ 4 - 8
Gems/level_art_mps/Assets/LECstraight/LECstraight_Opaque_MAT.material

@@ -2,22 +2,18 @@
     "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
-        "baseColor.color": [
-            0.5,
-            0.5,
-            0.5,
-            1.0
-        ],
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "textures/LECstraight_BaseColor.jpg",
         "baseColor.textureMap": "textures/LECstraight_BaseColor.jpg",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 3.0,
+        "emissive.intensity": 5.0,
         "emissive.textureMap": "textures/LECstraight_Emissive.jpg",
         "emissive.textureMap": "textures/LECstraight_Emissive.jpg",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/LECstraight_Metallic.jpg",
         "metallic.textureMap": "textures/LECstraight_Metallic.jpg",
         "normal.textureMap": "textures/LECstraight_Normal.jpg",
         "normal.textureMap": "textures/LECstraight_Normal.jpg",
         "occlusion.diffuseTextureMap": "textures/LECstraight_AO.png",
         "occlusion.diffuseTextureMap": "textures/LECstraight_AO.png",
         "opacity.factor": 1.0,
         "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "textures/LECstraight_BaseColor.jpg"
+        "roughness.textureMap": "textures/LECstraight_Roughness.jpg",
+        "specularF0.enableMultiScatterCompensation": true
     }
     }
 }
 }

+ 4 - 2
Gems/level_art_mps/Assets/MalfunctioningShieldGenerator/MShieldGen_Opaque_mat.material

@@ -5,13 +5,15 @@
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureBlendMode": "Lerp",
         "baseColor.textureMap": "textures/Mal_shield_gen_Base_color.png",
         "baseColor.textureMap": "textures/Mal_shield_gen_Base_color.png",
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 3.0,
+        "emissive.intensity": 6.5,
         "emissive.textureMap": "textures/Mal_shield_gen_Emissive.png",
         "emissive.textureMap": "textures/Mal_shield_gen_Emissive.png",
+        "irradiance.irradianceColorSource": "BaseColor",
         "metallic.textureMap": "textures/Mal_shield_gen_Metallic.png",
         "metallic.textureMap": "textures/Mal_shield_gen_Metallic.png",
         "normal.textureMap": "textures/Mal_shield_gen_Normal.png",
         "normal.textureMap": "textures/Mal_shield_gen_Normal.png",
         "occlusion.diffuseTextureMap": "textures/Mal_shield_gen_Ao.png",
         "occlusion.diffuseTextureMap": "textures/Mal_shield_gen_Ao.png",
         "opacity.factor": 1.0,
         "opacity.factor": 1.0,
         "roughness.factor": 0.33000001311302185,
         "roughness.factor": 0.33000001311302185,
-        "roughness.textureMap": "textures/Mal_shield_gen_Roughness.png"
+        "roughness.textureMap": "textures/Mal_shield_gen_Roughness.png",
+        "specularF0.enableMultiScatterCompensation": true
     }
     }
 }
 }

+ 10 - 4
Gems/level_art_mps/Assets/Planter/Planter_Wall_Large_Planter_Wall_LightsMAT.material

@@ -4,18 +4,24 @@
     "propertyValues": {
     "propertyValues": {
         "baseColor.color": [
         "baseColor.color": [
             0.800000011920929,
             0.800000011920929,
-            0.5938963890075684,
+            0.5921568870544434,
             0.0,
             0.0,
             1.0
             1.0
         ],
         ],
         "emissive.color": [
         "emissive.color": [
-            1.0,
-            0.575967013835907,
+            0.800000011920929,
+            0.5921568870544434,
             0.0,
             0.0,
             1.0
             1.0
         ],
         ],
         "emissive.enable": true,
         "emissive.enable": true,
-        "emissive.intensity": 5.440000057220459,
+        "emissive.intensity": 5.0,
+        "irradiance.manualColor": [
+            0.800000011920929,
+            0.5921568870544434,
+            0.0,
+            1.0
+        ],
         "opacity.factor": 1.0
         "opacity.factor": 1.0
     }
     }
 }
 }

+ 1 - 1
Project/CubeMapCaptures/starmap_2020_capture_d__4E681114-E01E-4899-B2B3-E08B4916DB47__ibldiffusecm.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e6f70f7b1d52b6c9fd0fb45657efc7d90e4718f109b8207618795288d100a57
+oid sha256:b9ad0ef117ab29125d157303003b487956abcceaf429a6fdad16af7c886c4794
 size 50331796
 size 50331796

+ 1 - 1
Project/CubeMapCaptures/starmap_2020_capture_s__505C792B-FBCA-4CE7-B26E-D4B50789DCDB__iblspecularcm1024.dds

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e6f70f7b1d52b6c9fd0fb45657efc7d90e4718f109b8207618795288d100a57
+oid sha256:b9ad0ef117ab29125d157303003b487956abcceaf429a6fdad16af7c886c4794
 size 50331796
 size 50331796

+ 8 - 5
Project/Levels/IBL-Capture-Test/IBL-Capture-Test.prefab

@@ -541,11 +541,12 @@
                         "Configuration": {
                         "Configuration": {
                             "CubemapAsset": {
                             "CubemapAsset": {
                                 "assetId": {
                                 "assetId": {
-                                    "guid": "{7198341F-EDB2-585D-8569-590591710270}",
+                                    "guid": "{AFD66868-7A71-5175-9BDC-43C50EC3FB8D}",
                                     "subId": 1000
                                     "subId": 1000
                                 },
                                 },
-                                "assetHint": "skies/starmap_2020_leveled_lowcontrast_minus3ev_iblskyboxcm.exr.streamingimage"
-                            }
+                                "assetHint": "skies/starmap_2020_leveled_lowcontrast_minus6ev_iblskyboxcm.exr.streamingimage"
+                            },
+                            "Exposure": 6.0
                         }
                         }
                     }
                     }
                 },
                 },
@@ -571,7 +572,8 @@
                                     "subId": 2000
                                     "subId": 2000
                                 },
                                 },
                                 "assetHint": "cubemapcaptures/starmap_2020_capture_s__505c792b-fbca-4ce7-b26e-d4b50789dcdb__iblspecularcm1024.dds.streamingimage"
                                 "assetHint": "cubemapcaptures/starmap_2020_capture_s__505c792b-fbca-4ce7-b26e-d4b50789dcdb__iblspecularcm1024.dds.streamingimage"
-                            }
+                            },
+                            "exposure": 6.0
                         }
                         }
                     },
                     },
                     "diffuseImageAsset": {
                     "diffuseImageAsset": {
@@ -587,7 +589,8 @@
                             "subId": 2000
                             "subId": 2000
                         },
                         },
                         "assetHint": "cubemapcaptures/starmap_2020_capture_s__505c792b-fbca-4ce7-b26e-d4b50789dcdb__iblspecularcm1024.dds.streamingimage"
                         "assetHint": "cubemapcaptures/starmap_2020_capture_s__505c792b-fbca-4ce7-b26e-d4b50789dcdb__iblspecularcm1024.dds.streamingimage"
-                    }
+                    },
+                    "exposure": 6.0
                 },
                 },
                 "Component_[14994774102579326069]": {
                 "Component_[14994774102579326069]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "$type": "EditorDisabledCompositionComponent",

+ 3 - 3
Project/Levels/IBL-Capture/IBL-Capture.prefab

@@ -541,12 +541,12 @@
                         "Configuration": {
                         "Configuration": {
                             "CubemapAsset": {
                             "CubemapAsset": {
                                 "assetId": {
                                 "assetId": {
-                                    "guid": "{7198341F-EDB2-585D-8569-590591710270}",
+                                    "guid": "{AFD66868-7A71-5175-9BDC-43C50EC3FB8D}",
                                     "subId": 1000
                                     "subId": 1000
                                 },
                                 },
-                                "assetHint": "skies/starmap_2020_leveled_lowcontrast_minus3ev_iblskyboxcm.exr.streamingimage"
+                                "assetHint": "skies/starmap_2020_leveled_lowcontrast_minus6ev_iblskyboxcm.exr.streamingimage"
                             },
                             },
-                            "Exposure": 3.0
+                            "Exposure": 6.0
                         }
                         }
                     }
                     }
                 },
                 },