Esteban Papp
1f9b284de2
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h # Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h # Code/Editor/Plugins/EditorCommon/stdafx.cpp # Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h # Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h # Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h # Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h # Code/Tools/AssetProcessor/native/precompiled.h # Code/Tools/Standalone/StandaloneTools_precompiled.h # Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h # Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h # Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h # Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h # Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h # Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h # Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake # Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h # Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h # Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp # Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake # Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h # Gems/Blast/Code/Source/StdAfx.cpp # Gems/Camera/Code/Source/Camera_precompiled.h # Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h # Gems/FastNoise/Code/Source/FastNoise_precompiled.h # Gems/Gestures/Code/Source/Gestures_precompiled.h # Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h # Gems/GraphCanvas/Code/precompiled.h # Gems/ImGui/Code/Source/ImGui_precompiled.h # Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h # Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h # Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp # Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h # Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h # Gems/LyShine/Code/Source/LyShine_precompiled.h # Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h # Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h # Gems/Maestro/Code/Source/Maestro_precompiled.h # Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h # Gems/Metastream/Code/Source/Metastream_precompiled.h # Gems/Microphone/Code/Source/Microphone_precompiled.h # Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h # Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h # Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h # Gems/PhysX/Code/Source/PhysX_precompiled.h # Gems/PhysX/Code/physx_unsupported_files.cmake # Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h # Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h # Gems/ScriptCanvas/Code/Editor/precompiled.h # Gems/ScriptCanvas/Code/Source/precompiled.h # Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h # Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h # Gems/ScriptEvents/Code/Source/precompiled.h # Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp # Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h # Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h # Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h # Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h # Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h # Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h # Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h # Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h # Gems/Twitch/Code/Source/Twitch_precompiled.h # Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h # Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h # Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
265 lines
12 KiB
C++
265 lines
12 KiB
C++
/*
|
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
*
|
|
*/
|
|
|
|
#include <AzCore/Component/TransformBus.h>
|
|
#include <AzCore/UnitTest/TestTypes.h>
|
|
#include <AzTest/AzTest.h>
|
|
#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
|
|
#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
|
|
#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
|
|
#include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
|
|
|
|
#include <Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h>
|
|
|
|
using namespace AzToolsFramework;
|
|
|
|
namespace UnitTest
|
|
{
|
|
class ComponentEntityObjectVisibilityFixture
|
|
: public ToolsApplicationFixture
|
|
, private EditorEntityVisibilityNotificationBus::Router
|
|
, private EditorEntityInfoNotificationBus::Handler
|
|
{
|
|
public:
|
|
void SetUpEditorFixtureImpl() override
|
|
{
|
|
EditorEntityVisibilityNotificationBus::Router::BusRouterConnect();
|
|
EditorEntityInfoNotificationBus::Handler::BusConnect();
|
|
}
|
|
|
|
void TearDownEditorFixtureImpl() override
|
|
{
|
|
EditorEntityInfoNotificationBus::Handler::BusDisconnect();
|
|
EditorEntityVisibilityNotificationBus::Router::BusRouterDisconnect();
|
|
}
|
|
|
|
TestEditorActions m_editorActions;
|
|
AZ::EntityId m_layerId;
|
|
|
|
private:
|
|
// EditorEntityVisibilityNotificationBus ...
|
|
void OnEntityVisibilityChanged(bool /*visibility*/) override
|
|
{
|
|
}
|
|
|
|
// EditorEntityInfoNotificationBus ...
|
|
void OnEntityInfoUpdatedVisibility(AZ::EntityId /*entityId*/, bool /*visible*/) override
|
|
{
|
|
}
|
|
};
|
|
|
|
TEST_F(ComponentEntityObjectVisibilityFixture, ViewportComponentEntityObjectRespectsLayerVisibility)
|
|
{
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Given
|
|
AZ::Entity* entityA = nullptr;
|
|
const AZ::EntityId a = CreateDefaultEditorEntity("A", &entityA);
|
|
AZ::Entity* entityB = nullptr;
|
|
const AZ::EntityId b = CreateDefaultEditorEntity("B", &entityB);
|
|
AZ::Entity* entityC = nullptr;
|
|
const AZ::EntityId c = CreateDefaultEditorEntity("C", &entityC);
|
|
|
|
m_layerId = CreateEditorLayerEntity("Layer");
|
|
|
|
entityA->Deactivate();
|
|
entityB->Deactivate();
|
|
entityC->Deactivate();
|
|
|
|
CComponentEntityObject componentEntityObjectA;
|
|
componentEntityObjectA.AssignEntity(entityA);
|
|
|
|
CComponentEntityObject componentEntityObjectB;
|
|
componentEntityObjectB.AssignEntity(entityB);
|
|
|
|
CComponentEntityObject componentEntityObjectC;
|
|
componentEntityObjectC.AssignEntity(entityC);
|
|
|
|
entityC->Activate();
|
|
entityB->Activate();
|
|
entityA->Activate();
|
|
|
|
AZ::TransformBus::Event(a, &AZ::TransformBus::Events::SetParent, m_layerId);
|
|
AZ::TransformBus::Event(b, &AZ::TransformBus::Events::SetParent, m_layerId);
|
|
AZ::TransformBus::Event(c, &AZ::TransformBus::Events::SetParent, m_layerId);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// When
|
|
SetEntityVisibility(a, false);
|
|
SetEntityVisibility(b, false);
|
|
SetEntityVisibility(c, false);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Then
|
|
EXPECT_TRUE(componentEntityObjectA.IsHidden());
|
|
EXPECT_TRUE(componentEntityObjectB.IsHidden());
|
|
EXPECT_TRUE(componentEntityObjectC.IsHidden());
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// When
|
|
SetEntityVisibility(a, true);
|
|
SetEntityVisibility(b, true);
|
|
SetEntityVisibility(c, true);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Then
|
|
EXPECT_FALSE(componentEntityObjectA.IsHidden());
|
|
EXPECT_FALSE(componentEntityObjectB.IsHidden());
|
|
EXPECT_FALSE(componentEntityObjectC.IsHidden());
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// When
|
|
SetEntityVisibility(m_layerId, false);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Then
|
|
EXPECT_TRUE(componentEntityObjectA.IsHidden());
|
|
EXPECT_TRUE(componentEntityObjectB.IsHidden());
|
|
EXPECT_TRUE(componentEntityObjectC.IsHidden());
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
}
|
|
|
|
TEST_F(ComponentEntityObjectVisibilityFixture, ComponentEntityObjectDoesNotOverrideVisibility)
|
|
{
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Given
|
|
AZ::Entity* entityA = nullptr;
|
|
const AZ::EntityId a = CreateDefaultEditorEntity("A", &entityA);
|
|
AZ::Entity* entityB = nullptr;
|
|
const AZ::EntityId b = CreateDefaultEditorEntity("B", &entityB);
|
|
AZ::Entity* entityC = nullptr;
|
|
const AZ::EntityId c = CreateDefaultEditorEntity("C", &entityC);
|
|
|
|
m_layerId = CreateEditorLayerEntity("Layer");
|
|
|
|
entityA->Deactivate();
|
|
entityB->Deactivate();
|
|
entityC->Deactivate();
|
|
|
|
CComponentEntityObject componentEntityObjectA;
|
|
componentEntityObjectA.AssignEntity(entityA);
|
|
|
|
CComponentEntityObject componentEntityObjectB;
|
|
componentEntityObjectB.AssignEntity(entityB);
|
|
|
|
CComponentEntityObject componentEntityObjectC;
|
|
componentEntityObjectC.AssignEntity(entityC);
|
|
|
|
entityC->Activate();
|
|
entityB->Activate();
|
|
entityA->Activate();
|
|
|
|
AZ::TransformBus::Event(a, &AZ::TransformBus::Events::SetParent, m_layerId);
|
|
AZ::TransformBus::Event(b, &AZ::TransformBus::Events::SetParent, m_layerId);
|
|
AZ::TransformBus::Event(c, &AZ::TransformBus::Events::SetParent, m_layerId);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// When
|
|
SetEntityVisibility(m_layerId, false);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Then
|
|
EXPECT_TRUE(componentEntityObjectA.IsHidden());
|
|
EXPECT_TRUE(componentEntityObjectB.IsHidden());
|
|
EXPECT_TRUE(componentEntityObjectC.IsHidden());
|
|
|
|
EXPECT_TRUE(IsEntitySetToBeVisible(a));
|
|
EXPECT_FALSE(IsEntityVisible(a));
|
|
|
|
EXPECT_TRUE(IsEntitySetToBeVisible(a));
|
|
EXPECT_FALSE(IsEntityVisible(b));
|
|
|
|
EXPECT_TRUE(IsEntitySetToBeVisible(a));
|
|
EXPECT_FALSE(IsEntityVisible(c));
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
}
|
|
|
|
TEST_F(ComponentEntityObjectVisibilityFixture, ViewportComponentEntityObjectRespectsLayerLock)
|
|
{
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Given
|
|
AZ::Entity* entityA = nullptr;
|
|
const AZ::EntityId a = CreateDefaultEditorEntity("A", &entityA);
|
|
AZ::Entity* entityB = nullptr;
|
|
const AZ::EntityId b = CreateDefaultEditorEntity("B", &entityB);
|
|
AZ::Entity* entityC = nullptr;
|
|
const AZ::EntityId c = CreateDefaultEditorEntity("C", &entityC);
|
|
|
|
m_layerId = CreateEditorLayerEntity("Layer");
|
|
|
|
entityA->Deactivate();
|
|
entityB->Deactivate();
|
|
entityC->Deactivate();
|
|
|
|
CComponentEntityObject componentEntityObjectA;
|
|
componentEntityObjectA.AssignEntity(entityA);
|
|
|
|
CComponentEntityObject componentEntityObjectB;
|
|
componentEntityObjectB.AssignEntity(entityB);
|
|
|
|
CComponentEntityObject componentEntityObjectC;
|
|
componentEntityObjectC.AssignEntity(entityC);
|
|
|
|
entityC->Activate();
|
|
entityB->Activate();
|
|
entityA->Activate();
|
|
|
|
AZ::TransformBus::Event(a, &AZ::TransformBus::Events::SetParent, m_layerId);
|
|
AZ::TransformBus::Event(b, &AZ::TransformBus::Events::SetParent, m_layerId);
|
|
AZ::TransformBus::Event(c, &AZ::TransformBus::Events::SetParent, m_layerId);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// When
|
|
SetEntityLockState(a, true);
|
|
SetEntityLockState(b, true);
|
|
SetEntityLockState(c, true);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Then
|
|
EXPECT_TRUE(componentEntityObjectA.IsFrozen());
|
|
EXPECT_TRUE(componentEntityObjectB.IsFrozen());
|
|
EXPECT_TRUE(componentEntityObjectC.IsFrozen());
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// When
|
|
SetEntityLockState(a, false);
|
|
SetEntityLockState(b, false);
|
|
SetEntityLockState(c, false);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Then
|
|
EXPECT_FALSE(componentEntityObjectA.IsFrozen());
|
|
EXPECT_FALSE(componentEntityObjectB.IsFrozen());
|
|
EXPECT_FALSE(componentEntityObjectC.IsFrozen());
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// When
|
|
SetEntityLockState(m_layerId, true);
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
// Then
|
|
EXPECT_TRUE(componentEntityObjectA.IsFrozen());
|
|
EXPECT_TRUE(componentEntityObjectB.IsFrozen());
|
|
EXPECT_TRUE(componentEntityObjectC.IsFrozen());
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
}
|
|
} // namespace UnitTest
|