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

Merge branch 'development' into redcode/driller_removal

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-12-02 18:12:48 -08:00
parent 5f41e404a5 cfb426b86c
commit bb685ee40b
307 changed files with 5238 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py
+1 -1
View File
@@ -393,7 +393,7 @@ class AtomComponentProperties:
'name': 'PostFX Shape Weight Modifier',
'requires': [AtomComponentProperties.postfx_layer()],
'shapes': ['Axis Aligned Box Shape', 'Box Shape', 'Capsule Shape', 'Compound Shape', 'Cylinder Shape',
'Disk Shape', 'Polygon Prism Shape', 'Quad Shape', 'Sphere Shape', 'Vegetation Reference Shape'],
'Disk Shape', 'Polygon Prism Shape', 'Quad Shape', 'Sphere Shape', 'Shape Reference'],
}
return properties[property]
AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py
+1 -1
View File
@@ -72,7 +72,7 @@ def Terrain_SupportsPhysics():
# 2) Create 2 test entities, one parent at 512.0, 512.0, 50.0 and one child at the default position and add the required components
entity1_components_to_add = ["Axis Aligned Box Shape", "Terrain Layer Spawner", "Terrain Height Gradient List", "Terrain Physics Heightfield Collider", "PhysX Heightfield Collider"]
entity2_components_to_add = ["Vegetation Reference Shape", "Gradient Transform Modifier", "FastNoise Gradient"]
entity2_components_to_add = ["Shape Reference", "Gradient Transform Modifier", "FastNoise Gradient"]
ball_components_to_add = ["Sphere Shape", "PhysX Collider", "PhysX Rigid Body"]
terrain_spawner_entity = hydra.Entity("TestEntity1")
terrain_spawner_entity.create_entity(azmath.Vector3(512.0, 512.0, 50.0), entity1_components_to_add)
AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
+4
View File
@@ -15,6 +15,7 @@ import logging
# Import LyTestTools
import ly_test_tools.o3de.asset_processor as asset_processor_commands
import ly_test_tools.o3de.asset_processor_utils
logger = logging.getLogger(__name__)
@@ -36,5 +37,8 @@ def asset_processor(request: pytest.fixture, workspace: pytest.fixture) -> asset
ap.stop()
request.addfinalizer(teardown)
for n in ly_test_tools.o3de.asset_processor_utils.processList:
assert not ly_test_tools.o3de.asset_processor_utils.check_ap_running(n), f"{n} process did not shutdown correctly."
return ap
AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
+2 -2
View File
@@ -78,7 +78,7 @@ def LayerSpawner_InheritBehaviorFlag():
# Create Vegetation area and assign a valid asset
veg_1 = hydra.Entity("veg_1")
veg_1.create_entity(
position, ["Vegetation Layer Spawner", "Vegetation Reference Shape", "Vegetation Asset List"]
position, ["Vegetation Layer Spawner", "Shape Reference", "Vegetation Asset List"]
)
set_dynamic_slice_asset(veg_1, 2, os.path.join("Slices", "PinkFlower.dynamicslice"))
veg_1.get_set_test(1, "Configuration|Shape Entity Id", blender_entity.id)
@@ -86,7 +86,7 @@ def LayerSpawner_InheritBehaviorFlag():
# Create second vegetation area and assign a valid asset
veg_2 = hydra.Entity("veg_2")
veg_2.create_entity(
position, ["Vegetation Layer Spawner", "Vegetation Reference Shape", "Vegetation Asset List"]
position, ["Vegetation Layer Spawner", "Shape Reference", "Vegetation Asset List"]
)
set_dynamic_slice_asset(veg_2, 2, os.path.join("Slices", "PurpleFlower.dynamicslice"))
veg_2.get_set_test(1, "Configuration|Shape Entity Id", blender_entity.id)
AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
+2 -2
View File
@@ -9,7 +9,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
def LayerSpawner_InstancesPlantInAllSupportedShapes():
"""
Summary:
The level is loaded and vegetation area is created. Then the Vegetation Reference Shape
The level is loaded and vegetation area is created. Then the Shape Reference
component of vegetation area is pinned with entities of different shape components to check
if the vegetation plants in different shaped areas.
@@ -67,7 +67,7 @@ def LayerSpawner_InstancesPlantInAllSupportedShapes():
10.0, 10.0, 10.0,
asset_path)
vegetation.remove_component("Box Shape")
vegetation.add_component("Vegetation Reference Shape")
vegetation.add_component("Shape Reference")
# Create surface for planting on
dynveg.create_surface_entity("Surface Entity", entity_position, 60.0, 60.0, 1.0)
AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
+2 -2
View File
@@ -96,7 +96,7 @@ def AreaNodes_DependentComponentsAdded():
'SpawnerAreaNode': [
'Vegetation Layer Spawner',
'Vegetation Asset List',
'Vegetation Reference Shape'
'Shape Reference'
],
'MeshBlockerAreaNode': [
'Vegetation Layer Blocker (Mesh)',
@@ -104,7 +104,7 @@ def AreaNodes_DependentComponentsAdded():
],
'BlockerAreaNode': [
'Vegetation Layer Blocker',
'Vegetation Reference Shape'
'Shape Reference'
]
}
AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
+1 -1
View File
@@ -82,7 +82,7 @@ def Edit_DisabledNodeDuplication():
nodes = {
'SpawnerAreaNode': 'Vegetation Asset List',
'MeshBlockerAreaNode': 'Mesh',
'BlockerAreaNode': 'Vegetation Reference Shape',
'BlockerAreaNode': 'Shape Reference',
'FastNoiseGradientNode': 'Gradient Transform Modifier',
'ImageGradientNode': 'Gradient Transform Modifier',
'PerlinNoiseGradientNode': 'Gradient Transform Modifier',
AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
+2 -2
View File
@@ -104,7 +104,7 @@ def GradientNodes_DependentComponentsAdded():
# we will be checking for
commonComponents = [
'Gradient Transform Modifier',
'Vegetation Reference Shape'
'Shape Reference'
]
componentNames = []
for name in gradients:
@@ -114,7 +114,7 @@ def GradientNodes_DependentComponentsAdded():
# Create nodes for the gradients that have additional required dependencies and check if
# the Entity created by adding the node has the appropriate Component and required
# Gradient Transform Modifier and Vegetation Reference Shape components added automatically to it
# Gradient Transform Modifier and Shape Reference components added automatically to it
newGraph = graph.GraphManagerRequestBus(bus.Broadcast, 'GetGraph', newGraphId)
x = 10.0
y = 10.0
AutomatedTesting/Levels/macbeth_shaderballs/macbeth_shaderballs.prefab
+3401
View File
File diff suppressed because it is too large Load Diff
AutomatedTesting/Levels/macbeth_shaderballs/tags.txt
+12
View File
@@ -0,0 +1,12 @@
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
0,0,0,0,0,0
Code/Editor/GameEngine.cpp
-8
View File
@@ -35,7 +35,6 @@
// CryCommon
#include <CryCommon/INavigationSystem.h>
#include <CryCommon/LyShine/ILyShine.h>
#include <CryCommon/MainThreadRenderRequestBus.h>
// Editor
@@ -595,13 +594,6 @@ void CGameEngine::SwitchToInEditor()
// Enable accelerators.
GetIEditor()->EnableAcceleratos(true);
// reset UI system
if (gEnv->pLyShine)
{
gEnv->pLyShine->Reset();
}
// [Anton] - order changed, see comments for CGameEngine::SetSimulationMode
//! Send event to switch out of game.
GetIEditor()->GetObjectManager()->SendEvent(EVENT_OUTOFGAME);
Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake
-1
View File
@@ -13,7 +13,6 @@ set(FILES
EditorCommonAPI.h
ActionOutput.h
ActionOutput.cpp
UiEditorDLLBus.h
DockTitleBarWidget.cpp
DockTitleBarWidget.h
SaveUtilities/AsyncSaveRunner.h
Code/Framework/AzFramework/Tests/InputTests.cpp
+127 -48
View File
@@ -29,6 +29,13 @@ namespace InputUnitTests
////////////////////////////////////////////////////////////////////////////////////////////////
class InputTest : public ScopedAllocatorSetupFixture
{
public:
InputTest() : ScopedAllocatorSetupFixture()
{
// Many input tests are only valid if the GamePad device is supported on this platform.
m_gamepadSupported = InputDeviceGamepad::GetMaxSupportedGamepads() > 0;
}
protected:
////////////////////////////////////////////////////////////////////////////////////////////
void SetUp() override
@@ -46,6 +53,7 @@ namespace InputUnitTests
////////////////////////////////////////////////////////////////////////////////////////////
AZStd::unique_ptr<InputSystemComponent> m_inputSystemComponent;
bool m_gamepadSupported;
};
////////////////////////////////////////////////////////////////////////////////////////////////
@@ -78,12 +86,17 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputContext_ActivateDeactivate_Successfull)
#else
TEST_F(InputTest, InputContext_ActivateDeactivate_Successfull)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputContext_ActivateDeactivate_Successfull";
#else
SUCCEED() << "Skipping test InputContext_ActivateDeactivate_Successfull";
#endif
return;
}
// Create an input context (they are inactive by default).
InputContext inputContext("TestInputContext");
@@ -148,12 +161,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputContext_AddRemoveInputMapping_Successfull)
#else
TEST_F(InputTest, InputContext_AddRemoveInputMapping_Successfull)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputContext_AddRemoveInputMapping_Successfull";
#else
SUCCEED() << "Skipping test InputContext_AddRemoveInputMapping_Successfull";
#endif
return;
}
// Create an input context and activate it.
InputContext inputContext("TestInputContext");
inputContext.Activate();
@@ -256,12 +275,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputContext_ConsumeProcessedInput_Consumed)
#else
TEST_F(InputTest, InputContext_ConsumeProcessedInput_Consumed)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputContext_ConsumeProcessedInput_Consumed";
#else
SUCCEED() << "Skipping test InputContext_ConsumeProcessedInput_Consumed";
#endif
return;
}
InputContext::InitData initData;
// Create a high priority input context that consumes input processed by any of its mappings.
@@ -340,12 +365,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputContext_FilteredInput_Mapped)
#else
TEST_F(InputTest, InputContext_FilteredInput_Mapped)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputContext_FilteredInput_Mapped";
#else
SUCCEED() << "Skipping test InputContext_FilteredInput_Mapped";
#endif
return;
}
// Create an input context that initially only listens for keyboard input.
InputContext::InitData initData;
initData.autoActivate = true;
@@ -413,12 +444,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputMappingOr_AddRemoveSourceInput_Successful)
#else
TEST_F(InputTest, InputMappingOr_AddRemoveSourceInput_Successful)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputMappingOr_AddRemoveSourceInput_Successful";
#else
SUCCEED() << "Skipping test InputMappingOr_AddRemoveSourceInput_Successful";
#endif
return;
}
// Create an input context and activate it.
InputContext inputContext("TestInputContext");
inputContext.Activate();
@@ -491,12 +528,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputMappingOr_SingleSourceInput_Mapped)
#else
TEST_F(InputTest, InputMappingOr_SingleSourceInput_Mapped)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputMappingOr_SingleSourceInput_Mapped";
#else
SUCCEED() << "Skipping test InputMappingOr_SingleSourceInput_Mapped";
#endif
return;
}
// Create an input context and activate it.
InputContext inputContext("TestInputContext");
inputContext.Activate();
@@ -558,12 +601,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputMappingOr_MultipleSourceInputs_Mapped)
#else
TEST_F(InputTest, InputMappingOr_MultipleSourceInputs_Mapped)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputMappingOr_MultipleSourceInputs_Mapped";
#else
SUCCEED() << "Skipping test InputMappingOr_MultipleSourceInputs_Mapped";
#endif
return;
}
// Create an input context and activate it.
InputContext inputContext("TestInputContext");
inputContext.Activate();
@@ -650,12 +699,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputMappingAnd_AddRemoveSourceInput_Successful)
#else
TEST_F(InputTest, InputMappingAnd_AddRemoveSourceInput_Successful)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputMappingAnd_AddRemoveSourceInput_Successful";
#else
SUCCEED() << "Skipping test InputMappingAnd_AddRemoveSourceInput_Successful";
#endif
return;
}
// Create an input context and activate it.
InputContext inputContext("TestInputContext");
inputContext.Activate();
@@ -728,12 +783,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputMappingAnd_SingleSourceInput_Mapped)
#else
TEST_F(InputTest, InputMappingAnd_SingleSourceInput_Mapped)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputMappingAnd_SingleSourceInput_Mapped";
#else
SUCCEED() << "Skipping test InputMappingAnd_SingleSourceInput_Mapped";
#endif
return;
}
// Create an input context and activate it.
InputContext inputContext("TestInputContext");
inputContext.Activate();
@@ -795,12 +856,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputMappingAnd_MultipleSourceInputs_Mapped)
#else
TEST_F(InputTest, InputMappingAnd_MultipleSourceInputs_Mapped)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputMappingAnd_MultipleSourceInputs_Mapped";
#else
SUCCEED() << "Skipping test InputMappingAnd_MultipleSourceInputs_Mapped";
#endif
return;
}
// Create an input context and activate it.
InputContext inputContext("TestInputContext");
inputContext.Activate();
@@ -909,12 +976,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputMappingAnd_MultipleSourceInputsWithDifferentValues_ValuesAveraged)
#else
TEST_F(InputTest, InputMappingAnd_MultipleSourceInputsWithDifferentValues_ValuesAveraged)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputMappingAnd_MultipleSourceInputsWithDifferentValues_ValuesAveraged";
#else
SUCCEED() << "Skipping test InputMappingAnd_MultipleSourceInputsWithDifferentValues_ValuesAveraged";
#endif
return;
}
// Create an input context and activate it.
InputContext inputContext("TestInputContext");
inputContext.Activate();
@@ -969,12 +1042,18 @@ namespace InputUnitTests
}
////////////////////////////////////////////////////////////////////////////////////////////////
#if AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
TEST_F(InputTest, DISABLED_InputMappingAnd_MultipleSourceInputsFromTheSameInputDeviceTypeWithDifferentIndicies_NotMapped)
#else
TEST_F(InputTest, InputMappingAnd_MultipleSourceInputsFromTheSameInputDeviceTypeWithDifferentIndicies_NotMapped)
#endif // AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
{
if (!m_gamepadSupported)
{
#if defined(GTEST_SKIP)
GTEST_SKIP() << "Skipping test InputMappingAnd_MultipleSourceInputsFromTheSameInputDeviceTypeWithDifferentIndicies_NotMapped";
#else
SUCCEED() << "Skipping test InputMappingAnd_MultipleSourceInputsFromTheSameInputDeviceTypeWithDifferentIndicies_NotMapped";
#endif
return;
}
// Create an input context and activate it.
InputContext inputContext("TestInputContext");
inputContext.Activate();
Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp
+21 -22
View File
@@ -53,7 +53,6 @@ static void OptimizedSetParent(QWidget* widget, QWidget* parent)
namespace AzQtComponents
{
static const FancyDockingDropZoneConstants g_FancyDockingConstants;
// Constant for the threshold in pixels for snapping to edges while dragging for docking
static const int g_snapThresholdInPixels = 15;
@@ -155,7 +154,7 @@ namespace AzQtComponents
// Timer for updating our hovered drop zone opacity
QObject::connect(m_dropZoneHoverFadeInTimer, &QTimer::timeout, this, &FancyDocking::onDropZoneHoverFadeInUpdate);
m_dropZoneHoverFadeInTimer->setInterval(g_FancyDockingConstants.dropZoneHoverFadeUpdateIntervalMS);
m_dropZoneHoverFadeInTimer->setInterval(FancyDockingDropZoneConstants::dropZoneHoverFadeUpdateIntervalMS);
QIcon dragIcon = QIcon(QStringLiteral(":/Cursors/Grabbing.svg"));
m_dragCursor = QCursor(dragIcon.pixmap(16), 5, 2);
}
@@ -333,13 +332,13 @@ namespace AzQtComponents
*/
void FancyDocking::onDropZoneHoverFadeInUpdate()
{
const qreal dropZoneHoverOpacity = g_FancyDockingConstants.dropZoneHoverFadeIncrement + m_dropZoneState.dropZoneHoverOpacity();
const qreal dropZoneHoverOpacity = FancyDockingDropZoneConstants::dropZoneHoverFadeIncrement + m_dropZoneState.dropZoneHoverOpacity();
// Once we've reached the full drop zone opacity, cut it off in case we
// went over and stop the timer
if (dropZoneHoverOpacity >= g_FancyDockingConstants.dropZoneOpacity)
if (dropZoneHoverOpacity >= FancyDockingDropZoneConstants::dropZoneOpacity)
{
m_dropZoneState.setDropZoneHoverOpacity(g_FancyDockingConstants.dropZoneOpacity);
m_dropZoneState.setDropZoneHoverOpacity(FancyDockingDropZoneConstants::dropZoneOpacity);
m_dropZoneHoverFadeInTimer->stop();
}
else
@@ -792,12 +791,12 @@ namespace AzQtComponents
QPoint mainWindowTopLeft = multiscreenMapFromGlobal(mainWindow->mapToGlobal(mainWindowRect.topLeft()));
QPoint mainWindowTopRight = multiscreenMapFromGlobal(mainWindow->mapToGlobal(mainWindowRect.topRight()));
QPoint mainWindowBottomLeft = multiscreenMapFromGlobal(mainWindow->mapToGlobal(mainWindowRect.bottomLeft()));
QSize absoluteLeftRightSize(g_FancyDockingConstants.absoluteDropZoneSizeInPixels, mainWindowRect.height());
QSize absoluteLeftRightSize(FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels, mainWindowRect.height());
QRect absoluteLeftDropZone(mainWindowTopLeft, absoluteLeftRightSize);
QRect absoluteRightDropZone(mainWindowTopRight - QPoint(g_FancyDockingConstants.absoluteDropZoneSizeInPixels, 0), absoluteLeftRightSize);
QSize absoluteTopBottomSize(mainWindowRect.width(), g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
QRect absoluteRightDropZone(mainWindowTopRight - QPoint(FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels, 0), absoluteLeftRightSize);
QSize absoluteTopBottomSize(mainWindowRect.width(), FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
QRect absoluteTopDropZone(mainWindowTopLeft, absoluteTopBottomSize);
QRect absoluteBottomDropZone(mainWindowBottomLeft - QPoint(0, g_FancyDockingConstants.absoluteDropZoneSizeInPixels), absoluteTopBottomSize);
QRect absoluteBottomDropZone(mainWindowBottomLeft - QPoint(0, FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels), absoluteTopBottomSize);
// If the drop target is a main window, then we will only show the absolute
// drop zone if the cursor is in that zone already
@@ -986,16 +985,16 @@ namespace AzQtComponents
switch (m_dropZoneState.absoluteDropZoneArea())
{
case Qt::LeftDockWidgetArea:
dockRect.setX(dockRect.x() + g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
dockRect.setX(dockRect.x() + FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
break;
case Qt::RightDockWidgetArea:
dockRect.setWidth(dockRect.width() - g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
dockRect.setWidth(dockRect.width() - FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
break;
case Qt::TopDockWidgetArea:
dockRect.setY(dockRect.y() + g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
dockRect.setY(dockRect.y() + FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
break;
case Qt::BottomDockWidgetArea:
dockRect.setHeight(dockRect.height() - g_FancyDockingConstants.absoluteDropZoneSizeInPixels);
dockRect.setHeight(dockRect.height() - FancyDockingDropZoneConstants::absoluteDropZoneSizeInPixels);
break;
}
@@ -1034,15 +1033,15 @@ namespace AzQtComponents
// Set the drop zone width/height to the default, but if the dock widget
// width and/or height is below the threshold, then switch to scaling them
// down accordingly
int dropZoneWidth = g_FancyDockingConstants.dropZoneSizeInPixels;
if (dockWidth < g_FancyDockingConstants.minDockSizeBeforeDropZoneScalingInPixels)
int dropZoneWidth = FancyDockingDropZoneConstants::dropZoneSizeInPixels;
if (dockWidth < FancyDockingDropZoneConstants::minDockSizeBeforeDropZoneScalingInPixels)
{
dropZoneWidth = aznumeric_cast<int>(dockWidth * g_FancyDockingConstants.dropZoneScaleFactor);
dropZoneWidth = aznumeric_cast<int>(dockWidth * FancyDockingDropZoneConstants::dropZoneScaleFactor);
}
int dropZoneHeight = g_FancyDockingConstants.dropZoneSizeInPixels;
if (dockHeight < g_FancyDockingConstants.minDockSizeBeforeDropZoneScalingInPixels)
int dropZoneHeight = FancyDockingDropZoneConstants::dropZoneSizeInPixels;
if (dockHeight < FancyDockingDropZoneConstants::minDockSizeBeforeDropZoneScalingInPixels)
{
dropZoneHeight = aznumeric_cast<int>(dockHeight * g_FancyDockingConstants.dropZoneScaleFactor);
dropZoneHeight = aznumeric_cast<int>(dockHeight * FancyDockingDropZoneConstants::dropZoneScaleFactor);
}
// Calculate the inner corners to be used when constructing the drop zone polygons
@@ -1078,7 +1077,7 @@ namespace AzQtComponents
int innerDropZoneWidth = m_dropZoneState.innerDropZoneRect().width();
int innerDropZoneHeight = m_dropZoneState.innerDropZoneRect().height();
int centerDropZoneDiameter = (innerDropZoneWidth < innerDropZoneHeight) ? innerDropZoneWidth : innerDropZoneHeight;
centerDropZoneDiameter = aznumeric_cast<int>(centerDropZoneDiameter * g_FancyDockingConstants.centerTabDropZoneScale);
centerDropZoneDiameter = aznumeric_cast<int>(centerDropZoneDiameter * FancyDockingDropZoneConstants::centerTabDropZoneScale);
// Setup our center tab drop zone
const QSize centerDropZoneSize(centerDropZoneDiameter, centerDropZoneDiameter);
@@ -1986,7 +1985,7 @@ namespace AzQtComponents
// hasn't faded in all the way yet, then ignore the drop zone area
// which will make the widget floating
bool modifiedKeyPressed = FancyDockingDropZoneWidget::CheckModifierKey();
if (modifiedKeyPressed || m_dropZoneState.dropZoneHoverOpacity() != g_FancyDockingConstants.dropZoneOpacity)
if (modifiedKeyPressed || m_dropZoneState.dropZoneHoverOpacity() != FancyDockingDropZoneConstants::dropZoneOpacity)
{
area = Qt::NoDockWidgetArea;
}
@@ -3026,7 +3025,7 @@ namespace AzQtComponents
{
bool modifiedKeyPressed = FancyDockingDropZoneWidget::CheckModifierKey();
m_ghostWidget->setWindowOpacity(modifiedKeyPressed ? 1.0f : g_FancyDockingConstants.draggingDockWidgetOpacity);
m_ghostWidget->setWindowOpacity(modifiedKeyPressed ? 1.0f : FancyDockingDropZoneConstants::draggingDockWidgetOpacity);
m_ghostWidget->setPixmap(m_state.dockWidgetScreenGrab.screenGrab, m_state.placeholder(), m_state.placeholderScreen());
}
}
Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp
+7 -27
View File
@@ -19,26 +19,6 @@
namespace AzQtComponents
{
static const FancyDockingDropZoneConstants g_Constants;
FancyDockingDropZoneConstants::FancyDockingDropZoneConstants()
{
draggingDockWidgetOpacity = 0.6;
dropZoneOpacity = 0.4;
dropZoneSizeInPixels = 40;
minDockSizeBeforeDropZoneScalingInPixels = dropZoneSizeInPixels * 3;
dropZoneScaleFactor = 0.25;
centerTabDropZoneScale = 0.5;
centerTabIconScale = 0.5;
dropZoneColor = QColor(155, 155, 155);
dropZoneBorderColor = Qt::black;
dropZoneBorderInPixels = 1;
absoluteDropZoneSizeInPixels = 25;
dockingTargetDelayMS = 110;
dropZoneHoverFadeUpdateIntervalMS = 20;
dropZoneHoverFadeIncrement = dropZoneOpacity / (dockingTargetDelayMS / dropZoneHoverFadeUpdateIntervalMS);
centerDropZoneIconPath = QString(":/stylesheet/img/UI20/docking/tabs_icon.svg");
}
FancyDockingDropZoneWidget::FancyDockingDropZoneWidget(QMainWindow* mainWindow, QWidget* coordinatesRelativeTo, QScreen* screen, FancyDockingDropZoneState* dropZoneState)
// NOTE: this will not work with multiple monitors if this widget has a parent. The floating drop zone
@@ -154,7 +134,7 @@ namespace AzQtComponents
// Draw all of the normal drop zones if they exist (if a dock widget is hovered over)
painter.setPen(Qt::NoPen);
painter.setOpacity(g_Constants.dropZoneOpacity);
painter.setOpacity(FancyDockingDropZoneConstants::dropZoneOpacity);
auto dropZones = m_dropZoneState->dropZones();
for (auto it = dropZones.cbegin(); it != dropZones.cend(); ++it)
{
@@ -189,7 +169,7 @@ namespace AzQtComponents
// Otherwise, set the normal color
else
{
painter.setBrush(g_Constants.dropZoneColor);
painter.setBrush(FancyDockingDropZoneConstants::dropZoneColor);
}
// negate the window position to offset everything by that much
@@ -214,8 +194,8 @@ namespace AzQtComponents
// Scale the tabs icon based on the drop zone size and our specified offset
// Doing this through QIcon to make sure that SVG is rendered already in desired resolution
const QSize& dropZoneSize = dropZoneRect.size();
const QSize requestedIconSize = dropZoneSize * g_Constants.centerTabIconScale;
const QIcon dropZoneIcon = QIcon(g_Constants.centerDropZoneIconPath);
const QSize requestedIconSize = dropZoneSize * FancyDockingDropZoneConstants::centerTabIconScale;
const QIcon dropZoneIcon = QIcon(FancyDockingDropZoneConstants::centerDropZoneIconPath);
const QPixmap dropZonePixmap = dropZoneIcon.pixmap(requestedIconSize);
const QSize receivedIconSize = dropZoneIcon.actualSize(requestedIconSize);
@@ -264,7 +244,7 @@ namespace AzQtComponents
}
else
{
painter.setBrush(g_Constants.dropZoneColor);
painter.setBrush(FancyDockingDropZoneConstants::dropZoneColor);
}
painter.drawRect(absoluteDropZoneRect);
@@ -313,8 +293,8 @@ namespace AzQtComponents
const QPoint innerBottomRight = innerDropZoneRect.bottomRight();
// Draw the lines using the appropriate pen
QPen dropZoneBorderPen(g_Constants.dropZoneBorderColor);
dropZoneBorderPen.setWidth(g_Constants.dropZoneBorderInPixels);
QPen dropZoneBorderPen(FancyDockingDropZoneConstants::dropZoneBorderColor);
dropZoneBorderPen.setWidth(FancyDockingDropZoneConstants::dropZoneBorderInPixels);
painter.setPen(dropZoneBorderPen);
painter.setOpacity(1);
painter.drawLine(topLeft, innerTopLeft);
Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.h
+16 -21
View File
@@ -28,63 +28,58 @@ class QPainter;
namespace AzQtComponents
{
struct AZ_QT_COMPONENTS_API FancyDockingDropZoneConstants
namespace FancyDockingDropZoneConstants
{
// Constant for the opacity of the screen grab for the dock widget being dragged
qreal draggingDockWidgetOpacity;
static constexpr qreal draggingDockWidgetOpacity = 0.6;
// Constant for the opacity of the normal drop zones
qreal dropZoneOpacity;
static constexpr qreal dropZoneOpacity = 0.4;
// Constant for the default drop zone size (in pixels)
int dropZoneSizeInPixels;
static constexpr int dropZoneSizeInPixels = 40;
// Constant for the dock width/height size (in pixels) before we need to start
// scaling down the drop zone sizes, or else they will overlap with the center
// tab icon or each other
int minDockSizeBeforeDropZoneScalingInPixels;
static constexpr int minDockSizeBeforeDropZoneScalingInPixels = dropZoneSizeInPixels * 3;
// Constant for the factor by which we must scale down the drop zone sizes once
// the dock width/height size is too small
qreal dropZoneScaleFactor;
static constexpr qreal dropZoneScaleFactor = 0.25;
// Constant for the percentage to scale down the inner drop zone rectangle for the center tab drop zone
qreal centerTabDropZoneScale;
static constexpr qreal centerTabDropZoneScale = 0.5;
// Constant for the percentage to scale down the center tab drop zone for the center tab icon
qreal centerTabIconScale;
static constexpr qreal centerTabIconScale = 0.5;
// Constant for the drop zone hotspot default color
QColor dropZoneColor;
static const QColor dropZoneColor = QColor(155, 155, 155);
// Constant for the drop zone border color
QColor dropZoneBorderColor;
static const QColor dropZoneBorderColor = Qt::black;
// Constant for the border width in pixels separating the drop zones
int dropZoneBorderInPixels;
static constexpr int dropZoneBorderInPixels = 1;
// Constant for the border width in pixels separating the drop zones
int absoluteDropZoneSizeInPixels;
static constexpr int absoluteDropZoneSizeInPixels = 25;
// Constant for the delay (in milliseconds) before a drop zone becomes active
// once it is hovered over
int dockingTargetDelayMS;
static constexpr int dockingTargetDelayMS = 110;
// Constant for the rate at which we will update (fade in) the drop zone opacity
// when hovered over (in milliseconds)
int dropZoneHoverFadeUpdateIntervalMS;
static constexpr int dropZoneHoverFadeUpdateIntervalMS = 20;
// Constant for the incremental opacity increase for the hovered drop zone
// that will fade in to the full drop zone opacity in the desired time
qreal dropZoneHoverFadeIncrement;
static constexpr qreal dropZoneHoverFadeIncrement = dropZoneOpacity / (dockingTargetDelayMS / dropZoneHoverFadeUpdateIntervalMS);
// Constant for the path to the center drop zone tabs icon
QString centerDropZoneIconPath;
FancyDockingDropZoneConstants();
FancyDockingDropZoneConstants(const FancyDockingDropZoneConstants&) = delete;
FancyDockingDropZoneConstants& operator=(const FancyDockingDropZoneConstants&) = delete;
static const QString centerDropZoneIconPath = QStringLiteral(":/stylesheet/img/UI20/docking/tabs_icon.svg");
};
class FancyDockingDropZoneState
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/ColorController.cpp
+4 -3
View File
@@ -323,7 +323,7 @@ namespace AzQtComponents
saturation *= 2.0 - lightness;
}
double value = (lightness + saturation) / 2.0;
saturation = (2.0 * saturation) / (lightness + saturation);
saturation = qFuzzyIsNull(lightness + saturation) ? 0 : (2.0 * saturation) / (lightness + saturation);
m_hsv.saturation = AZ::GetClamp(saturation, 0.0, 1.0);
m_hsv.value = AZ::GetClamp(value, 0.0, 12.5);
@@ -341,11 +341,12 @@ namespace AzQtComponents
double saturation = m_hsv.saturation * m_hsv.value;
if (lightness <= 1.0)
{
saturation /= lightness;
saturation = (qFuzzyIsNull(lightness)) ? 0.0 : saturation / lightness;
}
else
{
saturation /= 2.0 - lightness;
double two_minus_lightness = 2.0 - lightness;
saturation = (qFuzzyIsNull(two_minus_lightness)) ? 0.0 : saturation / two_minus_lightness;
}
lightness /= 2.0;
Code/Framework/AzQtComponents/AzQtComponents/Tests/ColorControllerTests.cpp
-4
View File
@@ -164,11 +164,7 @@ namespace
}
}
#if AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST
TEST(AzQtComponents, DISABLED_ColorConversionsTestAllZeros)
#else
TEST(AzQtComponents, ColorConversionsTestAllZeros)
#endif // AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST
{
TestConversions({ 0.0, 0.0, 0.0 }, { 0.0, 0.0, 0.0 }, { 0.0, 0.0, 0.0 });
}
Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h
+1 -2
View File
@@ -18,12 +18,11 @@
#define AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_ARCHIVE_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST true
#define AZ_TRAIT_DISABLE_FAILED_FRAMEPROFILER_TEST true
#define AZ_TRAIT_DISABLE_FAILED_FRAMEWORK_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_GRADIENT_SIGNAL_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_MULTIPLAYER_GRIDMATE_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_NATIVE_WINDOWS_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_PROCESS_LAUNCHER_TESTS true
#define AZ_TRAIT_DISABLE_FAILED_EMOTION_FX_TESTS true
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+11 -14
View File
@@ -521,21 +521,18 @@ namespace AzToolsFramework
nestedInstanceLink.has_value(),
"A valid link was not found for one of the instances provided as input for the CreatePrefab operation.");
PrefabDomReference nestedInstanceLinkDom = nestedInstanceLink->get().GetLinkDom();
AZ_Assert(
nestedInstanceLinkDom.has_value(),
"A valid DOM was not found for the link corresponding to one of the instances provided as input for the "
"CreatePrefab operation.");
PrefabDomValueReference nestedInstanceLinkPatches =
PrefabDomUtils::FindPrefabDomValue(nestedInstanceLinkDom->get(), PrefabDomUtils::PatchesName);
AZ_Assert(
nestedInstanceLinkPatches.has_value(),
"A valid DOM for patches was not found for the link corresponding to one of the instances provided as input for the "
"CreatePrefab operation.");
PrefabDom patchesCopyForUndoSupport;
patchesCopyForUndoSupport.CopyFrom(nestedInstanceLinkPatches->get(), patchesCopyForUndoSupport.GetAllocator());
PrefabDomReference nestedInstanceLinkDom = nestedInstanceLink->get().GetLinkDom();
if (nestedInstanceLinkDom.has_value())
{
PrefabDomValueReference nestedInstanceLinkPatches =
PrefabDomUtils::FindPrefabDomValue(nestedInstanceLinkDom->get(), PrefabDomUtils::PatchesName);
if (nestedInstanceLinkPatches.has_value())
{
patchesCopyForUndoSupport.CopyFrom(nestedInstanceLinkPatches->get(), patchesCopyForUndoSupport.GetAllocator());
}
}
PrefabUndoHelpers::RemoveLink(
sourceInstance->GetTemplateId(), targetTemplateId, sourceInstance->GetInstanceAlias(), sourceInstance->GetLinkId(),
AZStd::move(patchesCopyForUndoSupport), undoBatch);
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabDeleteTests.cpp
+150
View File
@@ -0,0 +1,150 @@
/*
* 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/Settings/SettingsRegistryMergeUtils.h>
#include <AzToolsFramework/Entity/EditorEntityHelpers.h>
#include <AzToolsFramework/ToolsComponents/TransformComponent.h>
#include <Prefab/PrefabTestComponent.h>
#include <Prefab/PrefabTestDomUtils.h>
#include <Prefab/PrefabTestFixture.h>
namespace UnitTest
{
using PrefabDeleteTest = PrefabTestFixture;
TEST_F(PrefabDeleteTest, DeleteEntitiesInInstance_DeleteSingleEntitySucceeds)
{
PrefabEntityResult createEntityResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
// Verify that a valid entity is created.
AZ::EntityId testEntityId = createEntityResult.GetValue();
ASSERT_TRUE(testEntityId.IsValid());
AZ::Entity* testEntity = AzToolsFramework::GetEntityById(testEntityId);
ASSERT_TRUE(testEntity != nullptr);
m_prefabPublicInterface->DeleteEntitiesInInstance(AzToolsFramework::EntityIdList{ testEntityId });
// Verify that entity can't be found after deletion.
testEntity = AzToolsFramework::GetEntityById(testEntityId);
EXPECT_TRUE(testEntity == nullptr);
}
TEST_F(PrefabDeleteTest, DeleteEntitiesInInstance_DeleteSinglePrefabSucceeds)
{
PrefabEntityResult createEntityResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
// Verify that a valid entity is created.
AZ::EntityId createdEntityId = createEntityResult.GetValue();
ASSERT_TRUE(createdEntityId.IsValid());
AZ::Entity* createdEntity = AzToolsFramework::GetEntityById(createdEntityId);
ASSERT_TRUE(createdEntity != nullptr);
// Rather than hardcode a path, use a path from settings registry since that will work on all platforms.
AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
AZ::IO::FixedMaxPath path;
registry->Get(path.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
CreatePrefabResult createPrefabResult =
m_prefabPublicInterface->CreatePrefabInMemory(AzToolsFramework::EntityIdList{ createdEntityId }, path);
AZ::EntityId createdPrefabContainerId = createPrefabResult.GetValue();
ASSERT_TRUE(createdPrefabContainerId.IsValid());
AZ::Entity* prefabContainerEntity = AzToolsFramework::GetEntityById(createdPrefabContainerId);
ASSERT_TRUE(prefabContainerEntity != nullptr);
// Verify that the prefab container entity and the entity within are deleted.
m_prefabPublicInterface->DeleteEntitiesInInstance(AzToolsFramework::EntityIdList{ createdPrefabContainerId });
prefabContainerEntity = AzToolsFramework::GetEntityById(createdPrefabContainerId);
EXPECT_TRUE(prefabContainerEntity == nullptr);
createdEntity = AzToolsFramework::GetEntityById(createdEntityId);
EXPECT_TRUE(createdEntity == nullptr);
}
TEST_F(PrefabDeleteTest, DeleteEntitiesAndAllDescendantsInInstance_DeletingEntityDeletesChildEntityToo)
{
PrefabEntityResult parentEntityCreationResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
// Verify that valid parent entity is created.
AZ::EntityId parentEntityId = parentEntityCreationResult.GetValue();
ASSERT_TRUE(parentEntityId.IsValid());
AZ::Entity* parentEntity = AzToolsFramework::GetEntityById(parentEntityId);
ASSERT_TRUE(parentEntity != nullptr);
// Verify that valid child entity is created.
PrefabEntityResult childEntityCreationResult = m_prefabPublicInterface->CreateEntity(parentEntityId, AZ::Vector3());
AZ::EntityId childEntityId = childEntityCreationResult.GetValue();
ASSERT_TRUE(childEntityId.IsValid());
AZ::Entity* childEntity = AzToolsFramework::GetEntityById(childEntityId);
ASSERT_TRUE(childEntity != nullptr);
// PrefabTestFixture won't add required editor components by default. Hence we add them here.
AddRequiredEditorComponents(childEntity);
AddRequiredEditorComponents(parentEntity);
// Parent the child entity under the parent entity.
AZ::TransformBus::Event(childEntityId, &AZ::TransformBus::Events::SetParent, parentEntityId);
// Delete parent entity and its children.
m_prefabPublicInterface->DeleteEntitiesAndAllDescendantsInInstance(AzToolsFramework::EntityIdList{ parentEntityId });
// Verify that both the parent and child entities are deleted.
parentEntity = AzToolsFramework::GetEntityById(parentEntityId);
EXPECT_TRUE(parentEntity == nullptr);
childEntity = AzToolsFramework::GetEntityById(childEntityId);
EXPECT_TRUE(childEntity == nullptr);
}
TEST_F(PrefabDeleteTest, DeleteEntitiesAndAllDescendantsInInstance_DeletingEntityDeletesChildPrefabToo)
{
PrefabEntityResult entityToBePutUnderPrefabResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
// Verify that a valid entity is created that will be put in a prefab later.
AZ::EntityId entityToBePutUnderPrefabId = entityToBePutUnderPrefabResult.GetValue();
ASSERT_TRUE(entityToBePutUnderPrefabId.IsValid());
AZ::Entity* entityToBePutUnderPrefab = AzToolsFramework::GetEntityById(entityToBePutUnderPrefabId);
ASSERT_TRUE(entityToBePutUnderPrefab != nullptr);
// Verify that a valid parent entity is created.
PrefabEntityResult parentEntityCreationResult = m_prefabPublicInterface->CreateEntity(AZ::EntityId(), AZ::Vector3());
AZ::EntityId parentEntityId = parentEntityCreationResult.GetValue();
ASSERT_TRUE(parentEntityId.IsValid());
AZ::Entity* parentEntity = AzToolsFramework::GetEntityById(parentEntityId);
ASSERT_TRUE(parentEntity != nullptr);
// Rather than hardcode a path, use a path from settings registry since that will work on all platforms.
AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
AZ::IO::FixedMaxPath path;
registry->Get(path.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder);
CreatePrefabResult createPrefabResult =
m_prefabPublicInterface->CreatePrefabInMemory(AzToolsFramework::EntityIdList{ entityToBePutUnderPrefabId }, path);
// Verify that a valid prefab container entity is created.
AZ::EntityId createdPrefabContainerId = createPrefabResult.GetValue();
ASSERT_TRUE(createdPrefabContainerId.IsValid());
AZ::Entity* prefabContainerEntity = AzToolsFramework::GetEntityById(createdPrefabContainerId);
ASSERT_TRUE(prefabContainerEntity != nullptr);
// PrefabTestFixture won't add required editor components by default. Hence we add them here.
AddRequiredEditorComponents(parentEntity);
AddRequiredEditorComponents(prefabContainerEntity);
// Parent the prefab under the parent entity.
AZ::TransformBus::Event(createdPrefabContainerId, &AZ::TransformBus::Events::SetParent, parentEntityId);
// Delete the parent entity.
m_prefabPublicInterface->DeleteEntitiesAndAllDescendantsInInstance(AzToolsFramework::EntityIdList{ parentEntityId });
// Validate that the parent and the prefab under it and the entity inside the prefab are all deleted.
parentEntity = AzToolsFramework::GetEntityById(parentEntityId);
ASSERT_TRUE(parentEntity == nullptr);
entityToBePutUnderPrefab = AzToolsFramework::GetEntityById(entityToBePutUnderPrefabId);
ASSERT_TRUE(entityToBePutUnderPrefab == nullptr);
prefabContainerEntity = AzToolsFramework::GetEntityById(createdPrefabContainerId);
EXPECT_TRUE(prefabContainerEntity == nullptr);
}
} // namespace UnitTest
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
+14
View File
@@ -57,6 +57,11 @@ namespace UnitTest
return AZStd::make_unique<PrefabTestToolsApplication>("PrefabTestApplication");
}
void PrefabTestFixture::PropagateAllTemplateChanges()
{
m_prefabSystemComponent->OnSystemTick();
}
AZ::Entity* PrefabTestFixture::CreateEntity(const char* entityName, const bool shouldActivate)
{
// Circumvent the EntityContext system and generate a new entity with a transformcomponent
@@ -125,4 +130,13 @@ namespace UnitTest
EXPECT_EQ(entityInInstance->GetState(), AZ::Entity::State::Active);
}
}
void PrefabTestFixture::AddRequiredEditorComponents(AZ::Entity* entity)
{
ASSERT_TRUE(entity != nullptr);
entity->Deactivate();
AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
&AzToolsFramework::EditorEntityContextRequests::AddRequiredComponents, *entity);
entity->Activate();
}
}
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
+4
View File
@@ -52,6 +52,8 @@ namespace UnitTest
AZStd::unique_ptr<ToolsTestApplication> CreateTestApplication() override;
void PropagateAllTemplateChanges();
AZ::Entity* CreateEntity(const char* entityName, const bool shouldActivate = true);
void CompareInstances(const Instance& instanceA, const Instance& instanceB, bool shouldCompareLinkIds = true,
@@ -62,6 +64,8 @@ namespace UnitTest
//! Validates that all entities within a prefab instance are in 'Active' state.
void ValidateInstanceEntitiesActive(Instance& instance);
void AddRequiredEditorComponents(AZ::Entity* entity);
PrefabSystemComponent* m_prefabSystemComponent = nullptr;
PrefabLoaderInterface* m_prefabLoaderInterface = nullptr;
PrefabPublicInterface* m_prefabPublicInterface = nullptr;
Code/Framework/AzToolsFramework/Tests/UI/EntityOutlinerTests.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ namespace UnitTest
void ProcessDeferredUpdates()
{
// Force a prefab propagation for updates that are deferred to the next tick.
m_prefabSystemComponent->OnSystemTick();
PropagateAllTemplateChanges();
// Ensure the model process its entity update queue
m_model->ProcessEntityUpdates();
Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
+1
View File
@@ -69,6 +69,7 @@ set(FILES
Prefab/PrefabFocus/PrefabFocusTests.cpp
Prefab/MockPrefabFileIOActionValidator.cpp
Prefab/MockPrefabFileIOActionValidator.h
Prefab/PrefabDeleteTests.cpp
Prefab/PrefabDuplicateTests.cpp
Prefab/PrefabEntityAliasTests.cpp
Prefab/PrefabInstanceToTemplatePropagatorTests.cpp
Code/Legacy/CryCommon/crycommon_files.cmake
-77
View File
@@ -100,85 +100,8 @@ set(FILES
platform_impl.cpp
Win32specific.h
Win64specific.h
LyShine/IDraw2d.h
LyShine/ILyShine.h
LyShine/ISprite.h
LyShine/IRenderGraph.h
LyShine/UiAssetTypes.h
LyShine/UiComponentTypes.h
LyShine/UiBase.h
LyShine/UiEntityContext.h
LyShine/UiLayoutCellBase.h
LyShine/UiSerializeHelpers.h
LyShine/Animation/IUiAnimation.h
LyShine/Bus/UiAnimateEntityBus.h
LyShine/Bus/UiAnimationBus.h
LyShine/Bus/UiButtonBus.h
LyShine/Bus/UiCanvasBus.h
LyShine/Bus/UiCanvasManagerBus.h
LyShine/Bus/UiCanvasUpdateNotificationBus.h
LyShine/Bus/UiCheckboxBus.h
LyShine/Bus/UiCursorBus.h
LyShine/Bus/UiDraggableBus.h
LyShine/Bus/UiDropdownBus.h
LyShine/Bus/UiDropdownOptionBus.h
LyShine/Bus/UiDropTargetBus.h
LyShine/Bus/UiDynamicLayoutBus.h
LyShine/Bus/UiDynamicScrollBoxBus.h
LyShine/Bus/UiEditorBus.h
LyShine/Bus/UiEditorCanvasBus.h
LyShine/Bus/UiEditorChangeNotificationBus.h
LyShine/Bus/UiElementBus.h
LyShine/Bus/UiEntityContextBus.h
LyShine/Bus/UiFaderBus.h
LyShine/Bus/UiFlipbookAnimationBus.h
LyShine/Bus/UiGameEntityContextBus.h
LyShine/Bus/UiImageBus.h
LyShine/Bus/UiImageSequenceBus.h
LyShine/Bus/UiIndexableImageBus.h
LyShine/Bus/UiInitializationBus.h
LyShine/Bus/UiInteractableActionsBus.h
LyShine/Bus/UiInteractableBus.h
LyShine/Bus/UiInteractableStatesBus.h
LyShine/Bus/UiInteractionMaskBus.h
LyShine/Bus/UiLayoutBus.h
LyShine/Bus/UiLayoutCellBus.h
LyShine/Bus/UiLayoutCellDefaultBus.h
LyShine/Bus/UiLayoutColumnBus.h
LyShine/Bus/UiLayoutControllerBus.h
LyShine/Bus/UiLayoutFitterBus.h
LyShine/Bus/UiLayoutGridBus.h
LyShine/Bus/UiLayoutManagerBus.h
LyShine/Bus/UiLayoutRowBus.h
LyShine/Bus/UiMarkupButtonBus.h
LyShine/Bus/UiMaskBus.h
LyShine/Bus/UiNavigationBus.h
LyShine/Bus/UiParticleEmitterBus.h
LyShine/Bus/UiRadioButtonBus.h
LyShine/Bus/UiRadioButtonCommunicationBus.h
LyShine/Bus/UiRadioButtonGroupBus.h
LyShine/Bus/UiRadioButtonGroupCommunicationBus.h
LyShine/Bus/UiRenderBus.h
LyShine/Bus/UiRenderControlBus.h
LyShine/Bus/UiScrollableBus.h
LyShine/Bus/UiScrollBarBus.h
LyShine/Bus/UiScrollBoxBus.h
LyShine/Bus/UiScrollerBus.h
LyShine/Bus/UiSliderBus.h
LyShine/Bus/UiSpawnerBus.h
LyShine/Bus/UiSystemBus.h
LyShine/Bus/UiTextBus.h
LyShine/Bus/UiTextInputBus.h
LyShine/Bus/UiTooltipBus.h
LyShine/Bus/UiTooltipDataPopulatorBus.h
LyShine/Bus/UiTooltipDisplayBus.h
LyShine/Bus/UiTransform2dBus.h
LyShine/Bus/UiTransformBus.h
LyShine/Bus/UiVisualBus.h
LyShine/Bus/Sprite/UiSpriteBus.h
LyShine/Bus/World/UiCanvasOnMeshBus.h
LyShine/Bus/World/UiCanvasRefBus.h
LyShine/Bus/Tools/UiSystemToolsBus.h
Maestro/Bus/EditorSequenceAgentComponentBus.h
Maestro/Bus/EditorSequenceBus.h
Maestro/Bus/EditorSequenceComponentBus.h
Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
-7
View File
@@ -26,7 +26,6 @@
#include <AzFramework/Spawnable/RootSpawnableInterface.h>
#include "MainThreadRenderRequestBus.h"
#include <LyShine/ILyShine.h>
#include <AzCore/Component/TickBus.h>
#include <AzCore/IO/Path/Path.h>
#include <AzCore/StringFunc/StringFunc.h>
@@ -880,12 +879,6 @@ void CLevelSystem::UnloadLevel()
// Normally the GC step is triggered at the end of this method (by the ESYSTEM_EVENT_LEVEL_POST_UNLOAD event).
EBUS_EVENT(AZ::ScriptSystemRequestBus, GarbageCollect);
// Perform level unload procedures for the LyShine UI system
if (gEnv && gEnv->pLyShine)
{
gEnv->pLyShine->OnLevelUnload();
}
m_bLevelLoaded = false;
[[maybe_unused]] const AZ::TimeMs unloadTimeMs = AZ::GetRealElapsedTimeMs() - beginTimeMs;
Code/Legacy/CrySystem/LevelSystem/SpawnableLevelSystem.cpp
-7
View File
@@ -18,7 +18,6 @@
#include <AzFramework/Input/Buses/Requests/InputChannelRequestBus.h>
#include "MainThreadRenderRequestBus.h"
#include <LyShine/ILyShine.h>
#include <AzCore/Component/TickBus.h>
#include <AzCore/IO/Path/Path.h>
#include <AzCore/Settings/SettingsRegistryVisitorUtils.h>
@@ -556,12 +555,6 @@ namespace LegacyLevelSystem
// Normally the GC step is triggered at the end of this method (by the ESYSTEM_EVENT_LEVEL_POST_UNLOAD event).
EBUS_EVENT(AZ::ScriptSystemRequestBus, GarbageCollect);
// Perform level unload procedures for the LyShine UI system
if (gEnv && gEnv->pLyShine)
{
gEnv->pLyShine->OnLevelUnload();
}
m_bLevelLoaded = false;
[[maybe_unused]] const AZ::TimeMs unloadTimeMs = AZ::GetRealElapsedTimeMs() - beginTimeMs;
Code/Legacy/CrySystem/System.cpp
-8
View File
@@ -117,7 +117,6 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
#include <ILog.h>
#include <IAudioSystem.h>
#include <IProcess.h>
#include <LyShine/ILyShine.h>
#include <LoadScreenBus.h>
@@ -374,14 +373,7 @@ void CSystem::ShutDown()
m_pSystemEventDispatcher->OnSystemEvent(ESYSTEM_EVENT_FULL_SHUTDOWN, 0, 0);
}
if (gEnv && gEnv->pLyShine)
{
gEnv->pLyShine->Release();
gEnv->pLyShine = nullptr;
}
SAFE_RELEASE(m_env.pMovieSystem);
SAFE_RELEASE(m_env.pLyShine);
SAFE_RELEASE(m_env.pCryFont);
if (m_env.pConsole)
{
Code/Legacy/CrySystem/SystemInit.cpp
-7
View File
@@ -52,7 +52,6 @@
#include <AzFramework/Archive/ArchiveFileIO.h>
#include <LoadScreenBus.h>
#include <LyShine/Bus/UiSystemBus.h>
#include <AzFramework/Logging/MissingAssetLogger.h>
#include <AzFramework/Platform/PlatformDefaults.h>
#include <AzCore/Interface/Interface.h>
@@ -77,7 +76,6 @@
#include <IAudioSystem.h>
#include <ICmdLine.h>
#include <IProcess.h>
#include <LyShine/ILyShine.h>
#include <AzFramework/Archive/Archive.h>
#include "XConsole.h"
@@ -1105,11 +1103,6 @@ AZ_POP_DISABLE_WARNING
InlineInitializationProcessing("CSystem::Init Level System");
if (m_env.pLyShine)
{
m_env.pLyShine->PostInit();
}
InlineInitializationProcessing("CSystem::Init InitLmbrAWS");
// Az to Cry console binding
Gems/AWSClientAuth/Code/CMakeLists.txt
+5 -5
View File
@@ -15,9 +15,9 @@ ly_add_target(
awsclientauth_files.cmake
INCLUDE_DIRECTORIES
PUBLIC
Include/Public
Include
PRIVATE
Include/Private
Source
BUILD_DEPENDENCIES
PRIVATE
AZ::AzCore
@@ -35,7 +35,7 @@ ly_add_target(
awsclientauth_shared_files.cmake
INCLUDE_DIRECTORIES
PRIVATE
Include/Private
Source
BUILD_DEPENDENCIES
PRIVATE
AZ::AzCore
@@ -97,8 +97,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
awsclientauth_test_files.cmake
INCLUDE_DIRECTORIES
PRIVATE
"Include/Private"
"Include/Public"
Source
Include
Tests
BUILD_DEPENDENCIES
PRIVATE
Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationProviderBus.h → Gems/AWSClientAuth/Code/Include/Authentication/AuthenticationProviderBus.h
View File
Gems/AWSClientAuth/Code/Include/Public/Authentication/AuthenticationTokens.h → Gems/AWSClientAuth/Code/Include/Authentication/AuthenticationTokens.h
View File
Gems/AWSClientAuth/Code/Include/Public/Authorization/AWSCognitoAuthorizationBus.h → Gems/AWSClientAuth/Code/Include/Authorization/AWSCognitoAuthorizationBus.h
View File
Gems/AWSClientAuth/Code/Include/Public/Authorization/ClientAuthAWSCredentials.h → Gems/AWSClientAuth/Code/Include/Authorization/ClientAuthAWSCredentials.h
View File
Gems/AWSClientAuth/Code/Include/Public/UserManagement/AWSCognitoUserManagementBus.h → Gems/AWSClientAuth/Code/Include/UserManagement/AWSCognitoUserManagementBus.h
View File
Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthBus.h → Gems/AWSClientAuth/Code/Source/AWSClientAuthBus.h
View File
Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthModule.h → Gems/AWSClientAuth/Code/Source/AWSClientAuthModule.h
View File
Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthResourceMappingConstants.h → Gems/AWSClientAuth/Code/Source/AWSClientAuthResourceMappingConstants.h
View File
Gems/AWSClientAuth/Code/Include/Private/AWSClientAuthSystemComponent.h → Gems/AWSClientAuth/Code/Source/AWSClientAuthSystemComponent.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authentication/AWSCognitoAuthenticationProvider.h → Gems/AWSClientAuth/Code/Source/Authentication/AWSCognitoAuthenticationProvider.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h → Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationNotificationBusBehaviorHandler.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderInterface.h → Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderInterface.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderManager.h → Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderManager.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h → Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderScriptCanvasBus.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authentication/AuthenticationProviderTypes.h → Gems/AWSClientAuth/Code/Source/Authentication/AuthenticationProviderTypes.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authentication/GoogleAuthenticationProvider.h → Gems/AWSClientAuth/Code/Source/Authentication/GoogleAuthenticationProvider.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authentication/LWAAuthenticationProvider.h → Gems/AWSClientAuth/Code/Source/Authentication/LWAAuthenticationProvider.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authentication/OAuthConstants.h → Gems/AWSClientAuth/Code/Source/Authentication/OAuthConstants.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h → Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h → Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h → Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.h
View File
Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h → Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
View File
Gems/AWSClientAuth/Code/Include/Private/UserManagement/AWSCognitoUserManagementController.h → Gems/AWSClientAuth/Code/Source/UserManagement/AWSCognitoUserManagementController.h
View File
Gems/AWSClientAuth/Code/Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h → Gems/AWSClientAuth/Code/Source/UserManagement/UserManagementNotificationBusBehaviorHandler.h
View File
Gems/AWSClientAuth/Code/awsclientauth_files.cmake
+33 -36
View File
@@ -7,46 +7,43 @@
#
set(FILES
Include/Public/Authentication/AuthenticationProviderBus.h
Include/Public/Authentication/AuthenticationTokens.h
Include/Public/Authorization/AWSCognitoAuthorizationBus.h
Include/Public/Authorization/ClientAuthAWSCredentials.h
Include/Public/UserManagement/AWSCognitoUserManagementBus.h
Include/Authentication/AuthenticationProviderBus.h
Include/Authentication/AuthenticationTokens.h
Include/Authorization/AWSCognitoAuthorizationBus.h
Include/Authorization/ClientAuthAWSCredentials.h
Include/UserManagement/AWSCognitoUserManagementBus.h
Include/Private/AWSClientAuthSystemComponent.h
Include/Private/AWSClientAuthBus.h
Include/Private/AWSClientAuthResourceMappingConstants.h
Include/Private/Authentication/AuthenticationProviderTypes.h
Include/Private/Authentication/AuthenticationProviderScriptCanvasBus.h
Include/Private/Authentication/AuthenticationProviderManager.h
Include/Private/Authentication/AuthenticationNotificationBusBehaviorHandler.h
Include/Private/Authorization/AWSCognitoAuthorizationController.h
Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
Include/Private/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h
Include/Private/UserManagement/AWSCognitoUserManagementController.h
Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h
Include/Private/Authentication/AuthenticationProviderInterface.h
Include/Private/Authentication/OAuthConstants.h
Include/Private/Authentication/AWSCognitoAuthenticationProvider.h
Include/Private/Authentication/LWAAuthenticationProvider.h
Include/Private/Authentication/GoogleAuthenticationProvider.h
Source/AWSClientAuthSystemComponent.cpp
Source/Authentication/AuthenticationTokens.cpp
Source/Authentication/AuthenticationProviderInterface.cpp
Source/Authentication/AuthenticationProviderManager.cpp
Source/Authentication/AWSCognitoAuthenticationProvider.cpp
Source/Authentication/LWAAuthenticationProvider.cpp
Source/Authentication/GoogleAuthenticationProvider.cpp
Source/AWSClientAuthSystemComponent.h
Source/AWSClientAuthBus.h
Source/AWSClientAuthResourceMappingConstants.h
Source/Authentication/AuthenticationNotificationBusBehaviorHandler.h
Source/Authentication/AuthenticationProviderInterface.cpp
Source/Authentication/AuthenticationProviderInterface.h
Source/Authentication/AuthenticationProviderManager.cpp
Source/Authentication/AuthenticationProviderManager.h
Source/Authentication/AuthenticationProviderScriptCanvasBus.h
Source/Authentication/AuthenticationProviderTypes.h
Source/Authentication/AuthenticationTokens.cpp
Source/Authentication/AWSCognitoAuthenticationProvider.cpp
Source/Authentication/AWSCognitoAuthenticationProvider.h
Source/Authentication/LWAAuthenticationProvider.cpp
Source/Authentication/LWAAuthenticationProvider.h
Source/Authentication/GoogleAuthenticationProvider.cpp
Source/Authentication/GoogleAuthenticationProvider.h
Source/Authentication/OAuthConstants.h
Source/Authorization/ClientAuthAWSCredentials.cpp
Source/Authorization/AWSCognitoAuthorizationController.cpp
Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp
Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp
Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h
Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp
Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h
Source/Authorization/AWSCognitoAuthorizationController.cpp
Source/Authorization/AWSCognitoAuthorizationController.h
Source/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h
Source/Authorization/ClientAuthAWSCredentials.cpp
Source/UserManagement/AWSCognitoUserManagementController.cpp
Source/UserManagement/AWSCognitoUserManagementController.h
Source/UserManagement/UserManagementNotificationBusBehaviorHandler.h
)
Gems/AWSClientAuth/Code/awsclientauth_shared_files.cmake
+1 -1
View File
@@ -7,6 +7,6 @@
#
set(FILES
Include/Private/AWSClientAuthModule.h
Source/AWSClientAuthModule.cpp
Source/AWSClientAuthModule.h
)
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant.material
+3 -3
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "",
"propertyLayoutVersion": 3,
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"metallic": {
"useTexture": false
@@ -18,4 +18,4 @@
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/00_illuminant_tex.material
+5 -5
View File
@@ -1,11 +1,11 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "Materials/Presets/MacBeth/00_illuminant_sRGB.tif"
"textureMap": "00_illuminant_sRGB.tif"
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin.material
+7 -7
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.17143511772155763,
0.17143511772155762,
0.08227664977312088,
0.056122682988643649,
0.056122682988643646,
1.0
],
"textureMap": "Materials/Presets/MacBeth/01_dark_skin_sRGB.tif",
"textureMap": "01_dark_skin_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/01_dark_skin_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\01_dark_skin.material",
"propertyLayoutVersion": 3,
"parentMaterial": "01_dark_skin.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,8 +11,8 @@
0.21953155100345612,
1.0
],
"textureMap": "Materials/Presets/MacBeth/02_light_skin_sRGB.tif",
"textureMap": "02_light_skin_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/02_light_skin_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\02_light_skin.material",
"propertyLayoutVersion": 3,
"parentMaterial": "02_light_skin.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky.material
+7 -7
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.10946822166442871,
0.19806210696697236,
0.33716335892677309,
0.19806210696697235,
0.33716335892677307,
1.0
],
"textureMap": "Materials/Presets/MacBeth/03_blue_sky_sRGB.tif",
"textureMap": "03_blue_sky_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/03_blue_sky_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\03_blue_sky.material",
"propertyLayoutVersion": 3,
"parentMaterial": "03_blue_sky.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage.material
+6 -6
View File
@@ -1,16 +1,16 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.10223544389009476,
0.14996567368507386,
0.052857253700494769,
0.14996567368507385,
0.052857253700494766,
1.0
]
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/04_foliage_tex.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\04_foliage.material",
"propertyLayoutVersion": 3,
"parentMaterial": "04_foliage.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,7 +11,7 @@
1.0,
1.0
],
"textureMap": "Materials/Presets/MacBeth/04_foliage_sRGB.tif"
"textureMap": "04_foliage_sRGB.tif"
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower.material
+5 -5
View File
@@ -1,16 +1,16 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.2232242375612259,
0.21953155100345612,
0.43414968252182009,
0.43414968252182007,
1.0
]
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/05_blue_flower_tex.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\05_blue_flower.material",
"propertyLayoutVersion": 3,
"parentMaterial": "05_blue_flower.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,7 +11,7 @@
1.0,
1.0
],
"textureMap": "Materials/Presets/MacBeth/05_blue_flower_sRGB.tif"
"textureMap": "05_blue_flower_sRGB.tif"
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green.material
+6 -6
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.12477302551269531,
0.5209887623786926,
0.40723279118537905,
0.40723279118537903,
1.0
],
"textureMap": "Materials/Presets/MacBeth/06_bluish_green_sRGB.tif",
"textureMap": "06_bluish_green_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/06_bluish_green_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\06_bluish_green.material",
"propertyLayoutVersion": 3,
"parentMaterial": "06_bluish_green.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange.material
+6 -6
View File
@@ -1,16 +1,16 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.7156938910484314,
0.19806210696697236,
0.026245517656207086,
0.19806210696697235,
0.026245517656207085,
1.0
]
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/07_orange_tex.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\07_orange.material",
"propertyLayoutVersion": 3,
"parentMaterial": "07_orange.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,7 +11,7 @@
1.0,
1.0
],
"textureMap": "Materials/Presets/MacBeth/07_orange_sRGB.tif"
"textureMap": "07_orange_sRGB.tif"
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue.material
+6 -6
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.06480506807565689,
0.10702677816152573,
0.39157700538635256,
0.39157700538635254,
1.0
],
"textureMap": "Materials/Presets/MacBeth/08_purplish_blue_sRGB.tif",
"textureMap": "08_purplish_blue_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/08_purplish_blue_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\08_purplish_blue.material",
"propertyLayoutVersion": 3,
"parentMaterial": "08_purplish_blue.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,8 +11,8 @@
0.12213321030139923,
1.0
],
"textureMap": "Materials/Presets/MacBeth/09_moderate_red_sRGB.tif",
"textureMap": "09_moderate_red_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/09_moderate_red_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\09_moderate_red.material",
"propertyLayoutVersion": 3,
"parentMaterial": "09_moderate_red.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple.material
+6 -6
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.10461585223674774,
0.043732356280088428,
0.043732356280088425,
0.1412680298089981,
1.0
],
"textureMap": "Materials/Presets/MacBeth/10_purple_sRGB.tif",
"textureMap": "10_purple_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/10_purple_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\10_purple.material",
"propertyLayoutVersion": 3,
"parentMaterial": "10_purple.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,8 +11,8 @@
0.0481727309525013,
1.0
],
"textureMap": "Materials/Presets/MacBeth/11_yellow_green_sRGB.tif",
"textureMap": "11_yellow_green_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/11_yellow_green_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\11_yellow_green.material",
"propertyLayoutVersion": 3,
"parentMaterial": "11_yellow_green.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow.material
+6 -6
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.7835355401039124,
0.35640496015548708,
0.35640496015548706,
0.02217135950922966,
1.0
],
"textureMap": "Materials/Presets/MacBeth/12_orange_yellow_sRGB.tif",
"textureMap": "12_orange_yellow_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/12_orange_yellow_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\12_orange_yellow.material",
"propertyLayoutVersion": 3,
"parentMaterial": "12_orange_yellow.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue.material
+7 -7
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.024155031889677049,
0.024155031889677048,
0.0481727309525013,
0.29176774621009829,
0.29176774621009827,
1.0
],
"textureMap": "Materials/Presets/MacBeth/13_blue_sRGB.tif",
"textureMap": "13_blue_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/13_blue_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\13_blue.material",
"propertyLayoutVersion": 3,
"parentMaterial": "13_blue.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,8 +11,8 @@
0.06480506807565689,
1.0
],
"textureMap": "Materials/Presets/MacBeth/14_green_sRGB.tif",
"textureMap": "14_green_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/14_green_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\14_green.material",
"propertyLayoutVersion": 3,
"parentMaterial": "14_green.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red.material
+7 -7
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.43414968252182009,
0.029556725174188615,
0.43414968252182007,
0.029556725174188614,
0.03955138474702835,
1.0
],
"textureMap": "Materials/Presets/MacBeth/15_red_sRGB.tif",
"textureMap": "15_red_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\15_red.material",
"propertyLayoutVersion": 3,
"parentMaterial": "15_red.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,8 +11,8 @@
0.00802624598145485,
1.0
],
"textureMap": "Materials/Presets/MacBeth/16_yellow_sRGB.tif",
"textureMap": "16_yellow_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/16_yellow_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\16_yellow.material",
"propertyLayoutVersion": 3,
"parentMaterial": "16_yellow.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,8 +11,8 @@
0.30498206615448,
1.0
],
"textureMap": "Materials/Presets/MacBeth/17_magenta_sRGB.tif",
"textureMap": "17_magenta_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/17_magenta_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\17_magenta.material",
"propertyLayoutVersion": 3,
"parentMaterial": "17_magenta.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan.material
+6 -6
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.0,
0.24620431661605836,
0.24620431661605835,
0.3813229501247406,
1.0
],
"textureMap": "Materials/Presets/MacBeth/18_cyan_sRGB.tif",
"textureMap": "18_cyan_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/18_cyan_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\18_cyan.material",
"propertyLayoutVersion": 3,
"parentMaterial": "18_cyan.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,8 +11,8 @@
0.8713664412498474,
1.0
],
"textureMap": "Materials/Presets/MacBeth/19_white_9-5_0-05D_sRGB.tif",
"textureMap": "19_white_9-5_0-05D_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/19_white_9-5_0-05D_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\19_white_9-5_0-05D.material",
"propertyLayoutVersion": 3,
"parentMaterial": "19_white_9-5_0-05D.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D.material
+5 -5
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -11,8 +11,8 @@
0.5840848684310913,
1.0
],
"textureMap": "Materials/Presets/MacBeth/20_neutral_8-0_0-23D_sRGB.tif",
"textureMap": "20_neutral_8-0_0-23D_sRGB.tif",
"useTexture": false
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/20_neutral_8-0_0-23D_tex.material
+4 -4
View File
@@ -1,8 +1,8 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\20_neutral_8-0_0-23D.material",
"propertyLayoutVersion": 3,
"parentMaterial": "20_neutral_8-0_0-23D.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
@@ -14,4 +14,4 @@
"useTexture": true
}
}
}
}
Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/21_neutral_6-5_0-44D.material
+7 -7
View File
@@ -1,18 +1,18 @@
{
"description": "",
"materialType": "Materials\\Types\\StandardPBR.materialtype",
"parentMaterial": "Materials\\Presets\\MacBeth\\00_illuminant.material",
"propertyLayoutVersion": 3,
"parentMaterial": "00_illuminant.material",
"materialType": "../../Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.3515373468399048,
0.35640496015548708,
0.35640496015548708,
0.35640496015548706,
0.35640496015548706,
1.0
],
"textureMap": "Materials/Presets/MacBeth/21_neutral_6-5_0-44D_sRGB.tif",
"textureMap": "21_neutral_6-5_0-44D_sRGB.tif",
"useTexture": false
}
}
}
}

Some files were not shown because too many files have changed in this diff Show More