Merged stabilization/2106 -> development (resolved merge conflicts).

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-08 13:56:47 -05:00
parent 0730960a4f d075d5f7b5
commit 3b1873b045
489 changed files with 1685 additions and 13777 deletions
@@ -263,7 +263,23 @@ namespace AZ

            // Update the cached light type.
            m_lightType = m_controller.m_configuration.m_lightType;
+            
+            // Check to see if the current photometric type is supported by the light type. If not, convert to lumens before deactivating.
+            auto supportedPhotometricUnits = m_controller.m_configuration.GetValidPhotometricUnits();
+            auto foundIt = AZStd::find_if(
+                supportedPhotometricUnits.begin(),
+                supportedPhotometricUnits.end(),
+                [&](const Edit::EnumConstant<PhotometricUnit>& entry) -> bool
+                {
+                    return AZStd::RemoveEnum<PhotometricUnit>::type(m_controller.m_configuration.m_intensityMode) == entry.m_value;
+                }
+            );

+            if (foundIt == supportedPhotometricUnits.end())
+            {
+                m_controller.ConvertToIntensityMode(PhotometricUnit::Lumen);
+            }
+            
            // componets may be removed or added here, so deactivate now and reactivate the entity when everything is done shifting around.
            GetEntity()->Deactivate();

@@ -320,7 +336,7 @@ namespace AZ
                // Some light types don't require a shape, this is ok. 
                break;
            }
-                
+            
            GetEntity()->Activate();

            // Set more reasonable default values for certain shapes.
@@ -333,7 +349,7 @@ namespace AZ
                LmbrCentral::DiskShapeComponentRequestBus::Event(GetEntityId(), &LmbrCentral::DiskShapeComponentRequests::SetRadius, 0.05f);
                break;
            }
-            
+
            return true;
        }

@@ -134,6 +134,11 @@ namespace AZ
                    // For lights that get their transform from the shape bus, force an OnShapeChanged to update the transform.
                    OnShapeChanged(ShapeChangeReasons::TransformChanged);
                }
+                else
+                {
+                    // OnShapeChanged() already calls this for delegates with a shape bus
+                    HandleShapeChanged();
+                }
            }
        }

@@ -130,6 +130,12 @@ namespace AZ
                arguments.append(QString("--rhi=%1").arg(apiName.GetCStr()));
            }

+            AZ::IO::FixedMaxPathString projectPath(AZ::Utils::GetProjectPath());
+            if (!projectPath.empty())
+            {
+                arguments.append(QString("--project-path=%1").arg(projectPath.c_str()));
+            }
+
            AtomToolsFramework::LaunchTool("MaterialEditor", ".exe", arguments);
        }

@@ -114,7 +114,7 @@ namespace AZ
                    Render::FrameCaptureRequestBus::BroadcastResult(
                        startedCapture,
                        &Render::FrameCaptureRequestBus::Events::CapturePassAttachmentWithCallback,
-                        m_context->GetData()->m_passHierarchy, AZStd::string("Output"), readbackCallback);
+                        m_context->GetData()->m_passHierarchy, AZStd::string("Output"), readbackCallback, RPI::PassAttachmentReadbackOption::Output);
                    // Reset the capture flag if the capture request was successful. Otherwise try capture it again next tick.
                    if (startedCapture)
                    {