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

Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950

Browse Source 
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
This commit is contained in:
Guthrie Adams
2021-04-19 14:46:11 -05:00
committed by GitHub
parent dc7cc77be6 8fead27c45
commit 3b4e424d38
13 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/LightingPresets/greenwich_park_02.lightingconfig.json
-2
View File
@@ -1,7 +1,6 @@
{
"configurations": [
{
"autoSelect": false,
"displayName": "Greenwich Park 02",
"skyboxImageAsset": {
"assetId": {
@@ -64,7 +63,6 @@
"shadowCatcherOpacity": 0.20000000298023225
},
{
"autoSelect": false,
"displayName": "Greenwich Park 02 (Alt)",
"skyboxImageAsset": {
"assetId": {
Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/LightingPreset.h
-1
View File
@@ -78,7 +78,6 @@ namespace AZ
AZ_CLASS_ALLOCATOR(LightingPreset, AZ::SystemAllocator, 0);
static void Reflect(AZ::ReflectContext* context);
bool m_autoSelect = false;
AZStd::string m_displayName;
AZ::Data::Asset<AZ::RPI::StreamingImageAsset> m_iblDiffuseImageAsset;
AZ::Data::Asset<AZ::RPI::StreamingImageAsset> m_iblSpecularImageAsset;
Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h
-1
View File
@@ -32,7 +32,6 @@ namespace AZ
AZ_CLASS_ALLOCATOR(ModelPreset, AZ::SystemAllocator, 0);
static void Reflect(AZ::ReflectContext* context);
bool m_autoSelect = false;
AZStd::string m_displayName;
AZ::Data::Asset<AZ::RPI::ModelAsset> m_modelAsset;
AZ::Data::Asset<AZ::RPI::StreamingImageAsset> m_previewImageAsset;
Gems/Atom/Feature/Common/Code/Source/Utils/EditorLightingPreset.cpp
-1
View File
@@ -112,7 +112,6 @@ namespace AZ
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->Attribute(AZ::Edit::Attributes::AutoExpand, true)
->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_displayName, "Display Name", "Identifier used for display and selection")
->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_autoSelect, "Auto Select", "When true, the configuration is automatically selected when loaded")
->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_iblDiffuseImageAsset, "IBL Diffuse Image Asset", "IBL diffuse image asset reference")
->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_iblSpecularImageAsset, "IBL Specular Image Asset", "IBL specular image asset reference")
->DataElement(AZ::Edit::UIHandlers::Default, &LightingPreset::m_skyboxImageAsset, "Skybox Image Asset", "Skybox image asset reference")
Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp
-1
View File
@@ -32,7 +32,6 @@ namespace AZ
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->Attribute(AZ::Edit::Attributes::AutoExpand, true)
->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_displayName, "Display Name", "Identifier used for display and selection")
->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_autoSelect, "Auto Select", "When true, the configuration is automatically selected when loaded")
->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_modelAsset, "Model Asset", "Model asset reference")
->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_previewImageAsset, "Preview Image Asset", "Preview image asset reference")
;
Gems/Atom/Feature/Common/Code/Source/Utils/LightingPreset.cpp
+1 -3
View File
@@ -105,8 +105,7 @@ namespace AZ
serializeContext->RegisterGenericType<AZStd::vector<LightConfig>>();
serializeContext->Class<LightingPreset>()
->Version(4)
->Field("autoSelect", &LightingPreset::m_autoSelect)
->Version(5)
->Field("displayName", &LightingPreset::m_displayName)
->Field("iblDiffuseImageAsset", &LightingPreset::m_iblDiffuseImageAsset)
->Field("iblSpecularImageAsset", &LightingPreset::m_iblSpecularImageAsset)
@@ -128,7 +127,6 @@ namespace AZ
->Attribute(AZ::Script::Attributes::Module, "render")
->Constructor()
->Constructor<const LightingPreset&>()
->Property("autoSelect", BehaviorValueProperty(&LightingPreset::m_autoSelect))
->Property("displayName", BehaviorValueProperty(&LightingPreset::m_displayName))
->Property("alternateSkyboxImageAsset", BehaviorValueProperty(&LightingPreset::m_alternateSkyboxImageAsset))
->Property("skyboxImageAsset", BehaviorValueProperty(&LightingPreset::m_skyboxImageAsset))
Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp
+1 -3
View File
@@ -25,8 +25,7 @@ namespace AZ
if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
{
serializeContext->Class<ModelPreset>()
->Version(2)
->Field("autoSelect", &ModelPreset::m_autoSelect)
->Version(3)
->Field("displayName", &ModelPreset::m_displayName)
->Field("modelAsset", &ModelPreset::m_modelAsset)
->Field("previewImageAsset", &ModelPreset::m_previewImageAsset)
@@ -41,7 +40,6 @@ namespace AZ
->Attribute(AZ::Script::Attributes::Module, "render")
->Constructor()
->Constructor<const ModelPreset&>()
->Property("autoSelect", BehaviorValueProperty(&ModelPreset::m_autoSelect))
->Property("displayName", BehaviorValueProperty(&ModelPreset::m_displayName))
->Property("modelAsset", BehaviorValueProperty(&ModelPreset::m_modelAsset))
->Property("previewImageAsset", BehaviorValueProperty(&ModelPreset::m_previewImageAsset))
Gems/Atom/TestData/TestData/LightingPresets/urban_street_02.lightingpreset.azasset
-1
View File
@@ -3,7 +3,6 @@
"Version": 1,
"ClassName": "AZ::Render::LightingPreset",
"ClassData": {
"autoSelect": false,
"displayName": "Urban Street 02",
"skyboxImageAsset": {
"assetId": {
Gems/Atom/Tools/MaterialEditor/Assets/MaterialEditor/LightingPresets/_TEMPLATE_.lightingconfig.json.template
-2
View File
@@ -2,7 +2,6 @@
"configurations": [
{
"displayName": "Substance: <template>",
"autoSelect": false,
"iblSpecularImageFilePath": "materialeditor/lightingpresets/_Substance_/<latlong_image>_iblskyboxcm_iblspecular.exr.streamingimage",
"iblDiffuseImageFilePath": "materialeditor/lightingpresets/_Substance_/<latlong_image>_iblskyboxcm_ibldiffuse.exr.streamingimage",
"skyboxFilePath": "materialeditor/lightingpresets/_Substance_/<latlong_image>_iblskyboxcm.exr.streamingimage",
@@ -45,7 +44,6 @@
},
{
"displayName": "Substance: <template> (Alt)",
"autoSelect": false,
"iblSpecularImageFilePath": "materialeditor/lightingpresets/_Substance_/<latlong_image>_iblskyboxcm_iblspecular.exr.streamingimage",
"iblDiffuseImageFilePath": "materialeditor/lightingpresets/_Substance_/<latlong_image>_iblskyboxcm_ibldiffuse.exr.streamingimage",
"skyboxFilePath": "materialeditor/lightingpresets/_Substance_/<latlong_image>_iblskyboxcm_ibldiffuse.exr.streamingimage",
Gems/Atom/Tools/MaterialEditor/Assets/MaterialEditor/LightingPresets/neutral_urban.lightingpreset.azasset
-1
View File
@@ -3,7 +3,6 @@
"Version": 1,
"ClassName": "AZ::Render::LightingPreset",
"ClassData": {
"autoSelect": true,
"displayName": "Neutral Urban",
"iblDiffuseImageAsset": {
"assetId": {
Gems/Atom/Tools/MaterialEditor/Assets/MaterialEditor/ViewportModels/Shaderball.modelpreset.azasset
-1
View File
@@ -3,7 +3,6 @@
"Version": 1,
"ClassName": "AZ::Render::ModelPreset",
"ClassData": {
"autoSelect": true,
"displayName": "Shader Ball",
"modelAsset": {
"assetId": {
Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
+10 -3
View File
@@ -278,7 +278,7 @@ namespace MaterialEditor
MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnLightingPresetAdded, presetPtr);
if (preset.m_autoSelect || m_lightingPresetVector.size() == 1)
if (m_lightingPresetVector.size() == 1)
{
SelectLightingPreset(presetPtr);
}
@@ -373,7 +373,7 @@ namespace MaterialEditor
MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnModelPresetAdded, presetPtr);
if (preset.m_autoSelect || m_modelPresetVector.size() == 1)
if (m_modelPresetVector.size() == 1)
{
SelectModelPreset(presetPtr);
}
@@ -510,6 +510,13 @@ namespace MaterialEditor
void MaterialViewportComponent::OnCatalogLoaded([[maybe_unused]] const char* catalogFile)
{
AZ::TickBus::QueueFunction([this]() { ReloadContent(); });
AZ::TickBus::QueueFunction([this]() {
ReloadContent();
// Automatically select preferred default presets if they exist
// We will later data drive this with editor settings
SelectLightingPresetByName("Neutral Urban");
SelectModelPresetByName("Shader Ball");
});
}
}
Gems/AtomLyIntegration/CommonFeatures/Assets/EnvHDRi/photo_studio_01.lightingconfig.json
-2
View File
@@ -1,7 +1,6 @@
{
"configurations": [
{
"autoSelect": false,
"displayName": "Photo Studio 01",
"skyboxImageAsset": {
"assetId": {
@@ -64,7 +63,6 @@
"shadowCatcherOpacity": 0.25
},
{
"autoSelect": false,
"displayName": "Photo Studio 01 (Alt)",
"skyboxImageAsset": {
"assetId": {