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

merge from development

Browse Source 
Signed-off-by: greerdv <greerdv@amazon.com>
This commit is contained in:
greerdv
2022-02-10 17:23:25 +00:00
parent 36285aa834 6791b652cc
commit 2ad3cb770b
429 changed files with 11108 additions and 5963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
+6 -1
View File
@@ -20,9 +20,14 @@ TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "tests")
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
class TestAutomation(EditorTestSuite):
enable_prefab_system = False
enable_prefab_system = True
# this test is intermittently timing out without ever having executed. sandboxing while we investigate cause.
@pytest.mark.test_case_id("C36525660")
class AtomEditorComponents_DisplayMapperAdded(EditorSharedTest):
from Atom.tests import hydra_AtomEditorComponents_DisplayMapperAdded as test_module
# The "Sponza" level is failing with a hard lock 4-12% of the time, needs root causing and fixing.
@pytest.mark.test_case_id("C36529679")
class AtomLevelLoadTest_Editor_Sandbox(EditorSharedTest):
from Atom.tests import hydra_Atom_LevelLoadTest_Sandbox as test_module
AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py
+3 -1
View File
@@ -33,7 +33,9 @@ GLOBAL_ILLUMINATION_QUALITY = {
}
# Level list used in Editor Level Load Test
LEVEL_LIST = ["hermanubis", "hermanubis_high", "macbeth_shaderballs", "PbrMaterialChart", "ShadowTest", "Sponza"]
# WARNING: "Sponza" level is sandboxed due to an intermittent failure.
LEVEL_LIST = ["hermanubis", "hermanubis_high", "macbeth_shaderballs", "PbrMaterialChart", "ShadowTest"]
class AtomComponentProperties:
"""
AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_Atom_LevelLoadTest_Sandbox.py
+71
View File
@@ -0,0 +1,71 @@
"""
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
"""
def Atom_LevelLoadTest():
"""
Summary:
Loads all graphics levels within the AutomatedTesting project in editor. For each level this script will verify that
the level loads, and can enter/exit gameplay without crashing the editor.
Test setup:
- Store all available levels in a list.
- Set up a for loop to run all checks for each level.
Expected Behavior:
Test verifies that each level loads, enters/exits game mode, and reports success for all test actions.
Test Steps for each level:
1) Create tuple with level load success and failure messages
2) Open the level using the python test tools command
3) Verify level is loaded using a separate command, and report success/failure
4) Enter gameplay and report result using a tuple
5) Exit Gameplay and report result using a tuple
6) Look for errors or asserts.
:return: None
"""
SANDBOX_LEVEL_LIST = ["Sponza"]
import azlmbr.legacy.general as general
from editor_python_test_tools.utils import Report, Tracer, TestHelper
with Tracer() as error_tracer:
for level in SANDBOX_LEVEL_LIST:
# 1. Create tuple with level load success and failure messages
level_check_tuple = (f"loaded {level}", f"failed to load {level}")
# 2. Open the level using the python test tools command
TestHelper.init_idle()
TestHelper.open_level("Graphics", level)
# 3. Verify level is loaded using a separate command, and report success/failure
Report.result(level_check_tuple, level == general.get_current_level_name())
# 4. Enter gameplay and report result using a tuple
enter_game_mode_tuple = (f"{level} entered gameplay successfully ", f"{level} failed to enter gameplay")
TestHelper.enter_game_mode(enter_game_mode_tuple)
general.idle_wait_frames(1)
# 5. Exit gameplay and report result using a tuple
exit_game_mode_tuple = (f"{level} exited gameplay successfully ", f"{level} failed to exit gameplay")
TestHelper.exit_game_mode(exit_game_mode_tuple)
# 6. Look for errors or asserts.
TestHelper.wait_for_condition(lambda: error_tracer.has_errors or error_tracer.has_asserts, 1.0)
for error_info in error_tracer.errors:
Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}")
for assert_info in error_tracer.asserts:
Report.info(f"Assert: {assert_info.filename} {assert_info.function} | {assert_info.message}")
if __name__ == "__main__":
from editor_python_test_tools.utils import Report
Report.start_test(Atom_LevelLoadTest)
AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py
+8 -8
View File
@@ -17,34 +17,34 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesti
from base import TestAutomationBase
@pytest.mark.SUITE_periodic
@pytest.mark.SUITE_main
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
class TestAutomation(TestAutomationBase):
def test_ActorSplitsAfterCollision(self, request, workspace, editor, launcher_platform):
from .tests import Blast_ActorSplitsAfterCollision as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ActorSplitsAfterRadialDamage(self, request, workspace, editor, launcher_platform):
from .tests import Blast_ActorSplitsAfterRadialDamage as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ActorSplitsAfterCapsuleDamage(self, request, workspace, editor, launcher_platform):
from .tests import Blast_ActorSplitsAfterCapsuleDamage as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ActorSplitsAfterImpactSpreadDamage(self, request, workspace, editor, launcher_platform):
from .tests import Blast_ActorSplitsAfterImpactSpreadDamage as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ActorSplitsAfterShearDamage(self, request, workspace, editor, launcher_platform):
from .tests import Blast_ActorSplitsAfterShearDamage as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ActorSplitsAfterTriangleDamage(self, request, workspace, editor, launcher_platform):
from .tests import Blast_ActorSplitsAfterTriangleDamage as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ActorSplitsAfterStressDamage(self, request, workspace, editor, launcher_platform):
from .tests import Blast_ActorSplitsAfterStressDamage as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentAssetCommands_test_case.py
+1 -1
View File
@@ -14,7 +14,7 @@ import azlmbr.math as math
import azlmbr.asset as asset
# Open a level (any level should work)
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'WaterSample')
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'Base')
def GetSetCompareTest(component, path, assetId):
# Test Get/Set (get old value, set new value, check that new value was set correctly)
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test.py
+1
View File
@@ -24,6 +24,7 @@ from hydra_utils import launch_test_case
@pytest.mark.parametrize('level', ['Simple'])
class TestComponentCommands(object):
# It needs a new test level in prefab format to make it testable again.
def test_MeshComponentBasics(self, request, editor, level, launcher_platform):
unexpected_lines=[]
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentCommands_test_case.py
+3 -1
View File
@@ -5,6 +5,8 @@ For complete copyright and license terms please see the LICENSE at the root of t
SPDX-License-Identifier: Apache-2.0 OR MIT
"""
# It needs a new test level in prefab format to make it testable again.
# Tests a portion of the Component CRUD Python API while the Editor is running
import azlmbr.bus as bus
@@ -18,7 +20,7 @@ def CompareComponentEntityIdPairs(component1, component2):
return component1.Equal(component2)
# Open a level (any level should work)
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'WaterSample')
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'Base')
# Get Component Types for Mesh and Comment
typeIdsList = editor.EditorComponentAPIBus(bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["Mesh", "Comment", "Mesh Collider"], entity.EntityType().Game)
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentPropertyCommands_test_case.py
+1 -1
View File
@@ -13,7 +13,7 @@ import azlmbr.entity as entity
import azlmbr.math as math
# Open a level (any level should work)
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'WaterSample')
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'Base')
def GetSetCompareTest(component, path, value):
oldObj = editor.EditorComponentAPIBus(bus.Broadcast, 'GetComponentProperty', component, path)
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCRUDCommands_test_case.py
+1 -1
View File
@@ -12,7 +12,7 @@ import azlmbr.editor as editor
from azlmbr.entity import EntityId
# Open a level (any level should work)
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'WaterSample')
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'Base')
parentEntityId = editor.ToolsApplicationRequestBus(bus.Broadcast, 'CreateNewEntity', EntityId())
childEntityId = editor.ToolsApplicationRequestBus(bus.Broadcast, 'CreateNewEntity', EntityId())
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EntityCommands_test_case.py
+1 -1
View File
@@ -32,7 +32,7 @@ def onEditorEntityDeleted(parameters):
# Open a level (any level should work)
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'WaterSample')
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'Base')
# Listen for notifications when entities are created/deleted
handler = bus.NotificationHandler('EditorEntityContextNotificationBus')
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test.py
+1 -1
View File
@@ -16,13 +16,13 @@ import os
sys.path.append(os.path.dirname(__file__))
from hydra_utils import launch_test_case
@pytest.mark.SUITE_sandbox
@pytest.mark.parametrize('launcher_platform', ['windows_editor'])
@pytest.mark.parametrize('project', ['AutomatedTesting'])
@pytest.mark.parametrize('level', ['Simple'])
class TestObjectManagerAutomation(object):
# It needs a new test level in prefab format to make it testable again.
def test_ViewPane(self, request, editor, level, launcher_platform):
unexpected_lines=[]
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
+3 -5
View File
@@ -20,12 +20,10 @@ def fetch_vector3_parts(vec3):
general.idle_enable(True)
# Try to open the WaterSample level. If not, fail the test.
# We need to rely on an existing level since the API does not provide
# a way to create entities, but only lets us manipulate them.
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'WaterSample')
# It needs a new test level in prefab format to make it testable again.
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'Base')
if (editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'GetCurrentLevelName') == 'WaterSample'):
if (editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'GetCurrentLevelName') == 'Base'):
objs_list = general.get_all_objects()
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test_case.py
+1 -2
View File
@@ -21,8 +21,7 @@ import azlmbr.bus as bus
import azlmbr.entity as entity
import azlmbr.editor as editor
import azlmbr.legacy.general as general
import editor_python_test_tools.pyside_component_utils as pysde_component_utils
import editor_python_test_tools.pyside_component_utils as pyside_component_utils
def PySide_Example_test_case():
# Open level, any level should work
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewPaneCommands_test_case.py
+1 -1
View File
@@ -13,7 +13,7 @@ import azlmbr.math
import azlmbr.legacy.general as general
# Open a level (any level should work)
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'WaterSample')
editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'OpenLevelNoPrompt', 'Base')
general.idle_wait(0.5)
AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ViewportTitleDlgCommands_test_case.py
+1 -1
View File
@@ -11,7 +11,7 @@ import azlmbr.math
import azlmbr.legacy.general as general
# Open a level (any level should work)
general.open_level_no_prompt('WaterSample')
general.open_level_no_prompt('Base')
general.idle_wait(0.5)
test_success = True
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py
+1 -1
View File
@@ -20,7 +20,7 @@ from editor_python_test_tools.utils import TestHelper as helper
def open_base_level():
helper.init_idle()
helper.open_level("Prefab", "Base")
helper.open_level("", "Base")
def find_entity_by_name(entity_name):
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
+1 -1
View File
@@ -61,7 +61,7 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
from os import path
editor.args.extend([
"--regset=/Amazon/Preferences/EnablePrefabSystem=true",
f"--regset-file={os.path.join(workspace.paths.engine_root(), 'Registry', 'prefab.test.setreg')}"])
f"--regset-file={os.path.join(editor.workspace.paths.engine_root(), 'Registry', 'prefab.test.setreg')}"])
else:
editor.args.extend(["--regset=/Amazon/Preferences/EnablePrefabSystem=false"])
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py
+1 -2
View File
@@ -7,8 +7,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
import PySide2
import editor_python_test_tools.pyside_utils
import editor_python_test_tools.pyside_utils as pyside_utils
def get_component_combobox_values(component_name, property_name, log_fn=None):
"""
AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
+6 -2
View File
@@ -67,7 +67,7 @@ class TestHelper:
return result == 0
@staticmethod
def open_level(directory : str, level : str):
def open_level(directory : str, level : str, no_prompt: bool = True):
# type: (str, str) -> None
"""
:param level: the name of the level folder in AutomatedTesting\\Physics\\
@@ -75,7 +75,11 @@ class TestHelper:
:return: None
"""
Report.info("Open level {}/{}".format(directory, level))
success = general.open_level_no_prompt(os.path.join(directory, level))
if no_prompt:
success = general.open_level_no_prompt(os.path.join(directory, level))
else:
success = general.open_level(os.path.join(directory, level))
if not success:
open_level_name = general.get_current_level_name()
if open_level_name == level:
AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main.py
+3 -3
View File
@@ -52,11 +52,11 @@ class TestAutomation(TestAutomationBase):
@revert_physics_config
def test_CharacterController_SwitchLevels(self, request, workspace, editor, launcher_platform):
from .tests.character_controller import CharacterController_SwitchLevels as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Ragdoll_AddPhysxRagdollComponentWorks(self, request, workspace, editor, launcher_platform):
from .tests.ragdoll import Ragdoll_AddPhysxRagdollComponentWorks as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_ScriptCanvas_MultipleRaycastNode(self, request, workspace, editor, launcher_platform):
@@ -81,7 +81,7 @@ class TestAutomation(TestAutomationBase):
@revert_physics_config
def test_Collider_PxMeshConvexMeshCollides(self, request, workspace, editor, launcher_platform):
from .tests.collider import Collider_PxMeshConvexMeshCollides as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_ShapeCollider_CylinderShapeCollides(self, request, workspace, editor, launcher_platform):
AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main_Optimized.py
+47 -42
View File
@@ -53,6 +53,7 @@ class EditorSingleTest_WithFileOverrides(EditorSingleTest):
for f in original_file_list:
fm._restore_file(f, file_list[f])
@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.")
@pytest.mark.SUITE_main
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@@ -72,6 +73,51 @@ class TestAutomationWithPrefabSystemEnabled(EditorTestSuite):
class C4982802_PhysXColliderShape_CanBeSelected(EditorSharedTest):
from .tests.collider import Collider_CapsuleShapeEditing as test_module
class C14654881_CharacterController_SwitchLevels(EditorSharedTest):
from .tests.character_controller import CharacterController_SwitchLevels as test_module
class C14861500_DefaultSetting_ColliderShape(EditorSharedTest):
from .tests.collider import Collider_CheckDefaultShapeSettingIsPxMesh as test_module
class C4044695_PhysXCollider_AddMultipleSurfaceFbx(EditorSharedTest):
from .tests.collider import Collider_MultipleSurfaceSlots as test_module
class C14861501_PhysXCollider_RenderMeshAutoAssigned(EditorSharedTest):
from .tests.collider import Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent as test_module
@pytest.mark.xfail(reason="This will fail due to this issue ATOM-15487.")
class C14861502_PhysXCollider_AssetAutoAssigned(EditorSharedTest):
from .tests.collider import Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent as test_module
class C4982803_Enable_PxMesh_Option(EditorSharedTest):
from .tests.collider import Collider_PxMeshConvexMeshCollides as test_module
class C15096740_Material_LibraryUpdatedCorrectly(EditorSharedTest):
from .tests.material import Material_LibraryClearingAssignsDefault as test_module
class C17411467_AddPhysxRagdollComponent(EditorSharedTest):
from .tests.ragdoll import Ragdoll_AddPhysxRagdollComponentWorks as test_module
class C19578021_ShapeCollider_CanBeAdded(EditorSharedTest):
from .tests.shape_collider import ShapeCollider_CanBeAddedWitNoWarnings as test_module
class C19578018_ShapeColliderWithNoShapeComponent(EditorSharedTest):
from .tests.shape_collider import ShapeCollider_InactiveWhenNoShapeComponent as test_module
class C19723164_ShapeCollider_WontCrashEditor(EditorSharedTest):
from .tests.shape_collider import ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor as test_module
class C12905528_ForceRegion_WithNonTriggerCollider(EditorSharedTest):
from .tests.force_region import ForceRegion_WithNonTriggerColliderWarning as test_module
# Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"]
class C14861504_RenderMeshAsset_WithNoPxAsset(EditorSharedTest):
from .tests.collider import Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx as test_module
class C4976236_AddPhysxColliderComponent(EditorSharedTest):
from .tests.collider import Collider_AddColliderComponent as test_module
@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.")
@pytest.mark.SUITE_main
@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
@@ -115,19 +161,13 @@ class TestAutomation(EditorTestSuite):
class C14654881_CharacterController_SwitchLevels(EditorSharedTest):
from .tests.character_controller import CharacterController_SwitchLevels as test_module
class C17411467_AddPhysxRagdollComponent(EditorSharedTest):
from .tests.ragdoll import Ragdoll_AddPhysxRagdollComponentWorks as test_module
class C12712453_ScriptCanvas_MultipleRaycastNode(EditorSharedTest):
from .tests.script_canvas import ScriptCanvas_MultipleRaycastNode as test_module
class C18243586_Joints_HingeLeadFollowerCollide(EditorSharedTest):
from .tests.joints import Joints_HingeLeadFollowerCollide as test_module
class C4982803_Enable_PxMesh_Option(EditorSharedTest):
from .tests.collider import Collider_PxMeshConvexMeshCollides as test_module
class C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(EditorSharedTest):
from .tests.shape_collider import ShapeCollider_CylinderShapeCollides as test_module
@@ -297,19 +337,6 @@ class TestAutomation(EditorTestSuite):
class C18243591_Joints_BallLeadFollowerCollide(EditorSharedTest):
from .tests.joints import Joints_BallLeadFollowerCollide as test_module
class C19578018_ShapeColliderWithNoShapeComponent(EditorSharedTest):
from .tests.shape_collider import ShapeCollider_InactiveWhenNoShapeComponent as test_module
class C14861500_DefaultSetting_ColliderShape(EditorSharedTest):
from .tests.collider import Collider_CheckDefaultShapeSettingIsPxMesh as test_module
class C19723164_ShapeCollider_WontCrashEditor(EditorSharedTest):
from .tests.shape_collider import ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor as test_module
class C12905528_ForceRegion_WithNonTriggerCollider(EditorSharedTest):
from .tests.force_region import ForceRegion_WithNonTriggerColliderWarning as test_module
# Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"]
class C5932040_ForceRegion_CubeExertsWorldForce(EditorSharedTest):
from .tests.force_region import ForceRegion_WorldSpaceForceOnRigidBodies as test_module
@@ -321,26 +348,7 @@ class TestAutomation(EditorTestSuite):
class C5959809_ForceRegion_RotationalOffset(EditorSharedTest):
from .tests.force_region import ForceRegion_RotationalOffset as test_module
class C15096740_Material_LibraryUpdatedCorrectly(EditorSharedTest):
from .tests.material import Material_LibraryClearingAssignsDefault as test_module
class C4976236_AddPhysxColliderComponent(EditorSharedTest):
from .tests.collider import Collider_AddColliderComponent as test_module
@pytest.mark.xfail(reason="This will fail due to this issue ATOM-15487.")
class C14861502_PhysXCollider_AssetAutoAssigned(EditorSharedTest):
from .tests.collider import Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent as test_module
class C14861501_PhysXCollider_RenderMeshAutoAssigned(EditorSharedTest):
from .tests.collider import Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent as test_module
class C4044695_PhysXCollider_AddMultipleSurfaceFbx(EditorSharedTest):
from .tests.collider import Collider_MultipleSurfaceSlots as test_module
class C14861504_RenderMeshAsset_WithNoPxAsset(EditorSharedTest):
from .tests.collider import Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx as test_module
class C100000_RigidBody_EnablingGravityWorksPoC(EditorSharedTest):
from .tests.rigid_body import RigidBody_EnablingGravityWorksPoC as test_module
@@ -350,8 +358,5 @@ class TestAutomation(EditorTestSuite):
class C6090547_ForceRegion_ParentChildForceRegions(EditorSharedTest):
from .tests.force_region import ForceRegion_ParentChildForcesCombineForces as test_module
class C19578021_ShapeCollider_CanBeAdded(EditorSharedTest):
from .tests.shape_collider import ShapeCollider_CanBeAddedWitNoWarnings as test_module
class C15425929_Undo_Redo(EditorSharedTest):
from .tests import Physics_UndoRedoWorksOnEntityWithPhysComponents as test_module
AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Periodic.py
+11 -11
View File
@@ -388,17 +388,17 @@ class TestAutomation(TestAutomationBase):
@revert_physics_config
def test_ShapeCollider_InactiveWhenNoShapeComponent(self, request, workspace, editor, launcher_platform):
from .tests.shape_collider import ShapeCollider_InactiveWhenNoShapeComponent as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_Collider_CheckDefaultShapeSettingIsPxMesh(self, request, workspace, editor, launcher_platform):
from .tests.collider import Collider_CheckDefaultShapeSettingIsPxMesh as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor(self, request, workspace, editor, launcher_platform):
from .tests.shape_collider import ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_Collider_SphereShapeEditing(self, request, workspace, editor, launcher_platform):
@@ -418,7 +418,7 @@ class TestAutomation(TestAutomationBase):
def test_ForceRegion_WithNonTriggerColliderWarning(self, request, workspace, editor, launcher_platform):
from .tests.force_region import ForceRegion_WithNonTriggerColliderWarning as test_module
# Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"]
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ForceRegion_WorldSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform):
from .tests.force_region import ForceRegion_WorldSpaceForceOnRigidBodies as test_module
@@ -438,29 +438,29 @@ class TestAutomation(TestAutomationBase):
def test_Material_LibraryClearingAssignsDefault(self, request, workspace, editor, launcher_platform):
from .tests.material import Material_LibraryClearingAssignsDefault as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Collider_AddColliderComponent(self, request, workspace, editor, launcher_platform):
from .tests.collider import Collider_AddColliderComponent as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(
reason="This will fail due to this issue ATOM-15487.")
def test_Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent(self, request, workspace, editor, launcher_platform):
from .tests.collider import Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent(self, request, workspace, editor, launcher_platform):
from .tests.collider import Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Collider_MultipleSurfaceSlots(self, request, workspace, editor, launcher_platform):
from .tests.collider import Collider_MultipleSurfaceSlots as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx(self, request, workspace, editor, launcher_platform):
from .tests.collider import Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform):
from .tests.rigid_body import RigidBody_EnablingGravityWorksPoC as test_module
@@ -486,7 +486,7 @@ class TestAutomation(TestAutomationBase):
@revert_physics_config
def test_ShapeCollider_CanBeAddedWitNoWarnings(self, request, workspace, editor, launcher_platform):
from .tests.shape_collider import ShapeCollider_CanBeAddedWitNoWarnings as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@revert_physics_config
def test_Physics_UndoRedoWorksOnEntityWithPhysComponents(self, request, workspace, editor, launcher_platform):
AutomatedTesting/Gem/PythonTests/Physics/tests/character_controller/CharacterController_SwitchLevels.py
+3 -1
View File
@@ -53,10 +53,12 @@ def CharacterController_SwitchLevels():
import os
import sys
from editor_python_test_tools.utils import Report
from editor_python_test_tools.utils import TestHelper as helper
import azlmbr.legacy.general as general
import azlmbr.bus
import editor_python_test_tools.hydra_editor_utils as hydra
# Constants
WAIT_FOR_ERRORS = 3.0
@@ -77,7 +79,7 @@ def CharacterController_SwitchLevels():
helper.exit_game_mode(Tests.level1_exit_game_mode)
# 2.1) Load level 2 (empty level)
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2.2) Enter game mode
helper.enter_game_mode(Tests.level2_enter_game_mode)
AutomatedTesting/Gem/PythonTests/Physics/tests/collider/Collider_AddColliderComponent.py
+3 -2
View File
@@ -49,9 +49,10 @@ def Collider_AddColliderComponent():
from editor_python_test_tools.utils import Tracer
from editor_python_test_tools.asset_utils import Asset
helper.init_idle()
import editor_python_test_tools.hydra_editor_utils as hydra
# 1) Load the level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create test entity
test_entity = EditorEntity.create_editor_entity("TestEntity")
AutomatedTesting/Gem/PythonTests/Physics/tests/collider/Collider_CheckDefaultShapeSettingIsPxMesh.py
+3 -2
View File
@@ -45,14 +45,15 @@ def Collider_CheckDefaultShapeSettingIsPxMesh():
from editor_python_test_tools.utils import Report
from editor_python_test_tools.utils import TestHelper as helper
import editor_python_test_tools.hydra_editor_utils as hydra
# Open 3D Engine Imports
import azlmbr.legacy.general as general
PHYSICS_ASSET_INDEX = 7 # Hardcoded enum index value for Shape property
helper.init_idle()
# 1) Load empty level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create an entity to hold the PhysX Shape Collider component
collider_entity = Entity.create_editor_entity("Collider")
AutomatedTesting/Gem/PythonTests/Physics/tests/collider/Collider_MultipleSurfaceSlots.py
+3 -2
View File
@@ -54,6 +54,8 @@ def Collider_MultipleSurfaceSlots():
from editor_python_test_tools.utils import TestHelper as helper
from editor_python_test_tools.asset_utils import Asset
import editor_python_test_tools.hydra_editor_utils as hydra
# Constants
PHYSICS_ASSET_INDEX = 7 # Hardcoded enum index value for Shape property
SURFACE_TAG_COUNT = 4 # Number of surface tags included in used asset
@@ -62,9 +64,8 @@ def Collider_MultipleSurfaceSlots():
STATIC_MESH = os.path.join("assets", "Physics", "Collider_MultipleSurfaceSlots", "test.azmodel")
PHYSX_MESH = os.path.join("assets", "Physics","Collider_MultipleSurfaceSlots", "test.pxmesh")
helper.init_idle()
# 1) Load the empty level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create an entity
test_entity = Entity.create_editor_entity("test_entity")
AutomatedTesting/Gem/PythonTests/Physics/tests/collider/Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent.py
+3 -2
View File
@@ -54,15 +54,16 @@ def Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent():
from editor_python_test_tools.utils import TestHelper as helper
from editor_python_test_tools.asset_utils import Asset
import editor_python_test_tools.hydra_editor_utils as hydra
# Asset paths
STATIC_MESH = os.path.join("assets", "Physics", "Collider_PxMeshAutoAssigned", "spherebot", "r0-b_body.azmodel")
PHYSX_MESH = os.path.join(
"assets", "Physics", "Collider_PxMeshAutoAssigned", "spherebot", "r0-b_body.pxmesh"
)
helper.init_idle()
# 1) Load the empty level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create an entity
test_entity = Entity.create_editor_entity("test_entity")
AutomatedTesting/Gem/PythonTests/Physics/tests/collider/Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent.py
+3 -2
View File
@@ -53,6 +53,8 @@ def Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent():
from editor_python_test_tools.utils import TestHelper as helper
from editor_python_test_tools.asset_utils import Asset
import editor_python_test_tools.hydra_editor_utils as hydra
# Open 3D Engine Imports
import azlmbr.legacy.general as general
@@ -60,9 +62,8 @@ def Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent():
MESH_PROPERTY_PATH = "Controller|Configuration|Mesh Asset"
TESTED_PROPERTY_PATH = "Shape Configuration|Asset|PhysX Mesh"
helper.init_idle()
# 1) Load the empty level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create an entity
test_entity = Entity.create_editor_entity("test_entity")
AutomatedTesting/Gem/PythonTests/Physics/tests/collider/Collider_PxMeshConvexMeshCollides.py
+3 -2
View File
@@ -62,7 +62,9 @@ def Collider_PxMeshConvexMeshCollides():
from editor_python_test_tools.utils import Report
from editor_python_test_tools.utils import TestHelper as helper
from editor_python_test_tools.asset_utils import Asset
import azlmbr.math as math
import editor_python_test_tools.hydra_editor_utils as hydra
# Open 3D Engine Imports
import azlmbr
@@ -73,9 +75,8 @@ def Collider_PxMeshConvexMeshCollides():
MESH_ASSET_PATH = os.path.join("assets", "Physics", "Collider_PxMeshConvexMeshCollides", "spherebot", "r0-b_body.pxmesh")
TIMEOUT = 2.0
helper.init_idle()
# 1) Load the level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create test entity
collider = EditorEntity.create_editor_entity_at([512.0, 512.0, 33.0], "Collider")
AutomatedTesting/Gem/PythonTests/Physics/tests/collider/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx.py
+3 -2
View File
@@ -59,15 +59,16 @@ def Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx():
from editor_python_test_tools.utils import Tracer
from editor_python_test_tools.asset_utils import Asset
import editor_python_test_tools.hydra_editor_utils as hydra
# Open 3D Engine Imports
import azlmbr.asset as azasset
# Asset paths
STATIC_MESH = os.path.join("assets", "Physics", "Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx", "test_asset.azmodel")
helper.init_idle()
# 1) Load the empty level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create an entity
test_entity = Entity.create_editor_entity("test_entity")
AutomatedTesting/Gem/PythonTests/Physics/tests/force_region/ForceRegion_WithNonTriggerColliderWarning.py
+3 -3
View File
@@ -44,15 +44,15 @@ def ForceRegion_WithNonTriggerColliderWarning():
:return: None
"""
import azlmbr.legacy.general as general
import editor_python_test_tools.hydra_editor_utils as hydra
from editor_python_test_tools.editor_entity_utils import EditorEntity
from editor_python_test_tools.utils import Report
from editor_python_test_tools.utils import TestHelper as helper
from editor_python_test_tools.utils import Tracer
helper.init_idle()
# 1) Load the empty level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create test entity
test_entity = EditorEntity.create_editor_entity("TestEntity")
AutomatedTesting/Gem/PythonTests/Physics/tests/material/Material_LibraryClearingAssignsDefault.py
+3 -2
View File
@@ -57,6 +57,8 @@ def Material_LibraryClearingAssignsDefault():
from editor_python_test_tools.utils import TestHelper as helper
from editor_python_test_tools.asset_utils import Asset
import editor_python_test_tools.hydra_editor_utils as hydra
# Open 3D Engine Imports
import azlmbr.asset as azasset
@@ -66,9 +68,8 @@ def Material_LibraryClearingAssignsDefault():
default_material_path = os.path.join("assets", "physics", "surfacetypemateriallibrary.physmaterial")
new_material_path = os.path.join("physicssurfaces", "default_phys_materials.physmaterial")
helper.init_idle()
# 1) Load the level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create new Entity with PhysX Character Controller
test_entity = EditorEntity.create_editor_entity("TestEntity")
AutomatedTesting/Gem/PythonTests/Physics/tests/ragdoll/Ragdoll_AddPhysxRagdollComponentWorks.py
+3 -2
View File
@@ -49,9 +49,10 @@ def Ragdoll_AddPhysxRagdollComponentWorks():
from editor_python_test_tools.utils import TestHelper as helper
from editor_python_test_tools.utils import Tracer
helper.init_idle()
import editor_python_test_tools.hydra_editor_utils as hydra
# 1) Load the level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create test entity
test_entity = EditorEntity.create_editor_entity("TestEntity")
AutomatedTesting/Gem/PythonTests/Physics/tests/shape_collider/ShapeCollider_CanBeAddedWitNoWarnings.py
+3 -2
View File
@@ -50,12 +50,13 @@ def ShapeCollider_CanBeAddedWitNoWarnings():
from editor_python_test_tools.utils import TestHelper as helper
from editor_python_test_tools.utils import Tracer
import editor_python_test_tools.hydra_editor_utils as hydra
# Open 3D Engine Imports
import azlmbr.legacy.general as general
helper.init_idle()
# 1) Load the empty level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create an entity
collider_entity = Entity.create_editor_entity("Collider")
AutomatedTesting/Gem/PythonTests/Physics/tests/shape_collider/ShapeCollider_InactiveWhenNoShapeComponent.py
+3 -2
View File
@@ -54,6 +54,8 @@ def ShapeCollider_InactiveWhenNoShapeComponent():
from editor_python_test_tools.editor_entity_utils import EditorEntity
from editor_python_test_tools.utils import TestHelper as helper
import editor_python_test_tools.hydra_editor_utils as hydra
# Open 3D Engine Imports
import azlmbr.bus as bus
import azlmbr.editor as editor
@@ -65,9 +67,8 @@ def ShapeCollider_InactiveWhenNoShapeComponent():
"""
return editor.EditorComponentAPIBus(bus.Broadcast, "IsComponentEnabled", component_id)
helper.init_idle()
# 1) Load the level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Add an entity with a PhysX Shape Collider component.
collider = EditorEntity.create_editor_entity("Collider")
AutomatedTesting/Gem/PythonTests/Physics/tests/shape_collider/ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor.py
+3 -2
View File
@@ -45,6 +45,8 @@ def ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor():
from editor_python_test_tools.utils import TestHelper as helper
from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity
import editor_python_test_tools.hydra_editor_utils as hydra
# Open 3D Engine Imports
import azlmbr.legacy.general as general
@@ -61,9 +63,8 @@ def ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor():
# Wait 60 frames more
general.idle_wait_frames(60)
helper.init_idle()
# 1) Load the empty level
helper.open_level("Physics", "Base")
hydra.open_base_level()
# 2) Create 512 entities with PhysX Shape Collider and Sphere Shape components
entity_failure = False
AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py
+3 -3
View File
@@ -24,12 +24,12 @@ from base import TestAutomationBase
class TestAutomation(TestAutomationBase):
def test_WhiteBox_AddComponentToEntity(self, request, workspace, editor, launcher_platform):
from .tests import WhiteBox_AddComponentToEntity as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_WhiteBox_SetDefaultShape(self, request, workspace, editor, launcher_platform):
from .tests import WhiteBox_SetDefaultShape as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_WhiteBox_SetInvisible(self, request, workspace, editor, launcher_platform):
from .tests import WhiteBox_SetInvisible as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_AddComponentToEntity.py
+1 -1
View File
@@ -32,7 +32,7 @@ def C28798177_WhiteBox_AddComponentToEntity():
# open level
helper.init_idle()
general.open_level("EmptyLevel")
helper.open_level("WhiteBox", "EmptyLevel", no_prompt=False)
# create white box entity and attach component
white_box_entity = init.create_white_box_entity()
AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetDefaultShape.py
+1 -1
View File
@@ -54,7 +54,7 @@ def C29279329_WhiteBox_SetDefaultShape():
# open level
helper.init_idle()
general.open_level("EmptyLevel")
helper.open_level("WhiteBox", "EmptyLevel", no_prompt=False)
# create white box entity and attach component
white_box_entity = init.create_white_box_entity()
AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetInvisible.py
+1 -1
View File
@@ -39,7 +39,7 @@ def C28798205_WhiteBox_SetInvisible():
# open level
helper.init_idle()
general.open_level("EmptyLevel")
helper.open_level("WhiteBox", "EmptyLevel", no_prompt=False)
white_box_entity_name = 'WhiteBox-Visibility'
white_box_visibility_path = 'White Box Material|Visible'
AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py
+4 -2
View File
@@ -79,7 +79,7 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
workspace.asset_processor_platform)
)
# Useful sizes
self.max_bundle_size_in_mib = 5
self.max_bundle_size_in_mib = 35
self.number_of_bytes_in_mib = 1024 * 1024
self.workspace = workspace
self.platforms = platforms
@@ -271,11 +271,13 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
for rel_path in self.get_asset_relative_paths(self.asset_info_file_result):
assets_from_file.append(os.path.normpath(rel_path))
expected_size = self.max_bundle_size_in_mib * self.number_of_bytes_in_mib
# extract all files from the bundles
for bundle in dependent_bundle_name:
file_info = os.stat(bundle)
# Verify that the size of all bundles is less than the max size specified
assert file_info.st_size <= (self.max_bundle_size_in_mib * self.number_of_bytes_in_mib)
assert file_info.st_size <= expected_size, \
f"file_info.st_size {file_info.st_size} for bundle {bundle} was expected to be smaller than {expected_size}"
with zipfile.ZipFile(bundle) as bundle_zip:
bundle_zip.extractall(extract_dir)
AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
+11 -7
View File
@@ -49,9 +49,11 @@ class TestAutomationBase:
time_info_str += f"{testcase_name}: (Full:{t} sec, Editor:{editor_t} sec)\n"
logger.info(time_info_str)
if cls.asset_processor is not None:
cls.asset_processor.teardown()
# Kill all ly processes
cls.asset_processor.teardown()
cls._kill_ly_processes()
cls._kill_ly_processes(include_asset_processor=True)
def _run_test(self, request, workspace, editor, testcase_module, extra_cmdline_args=[], batch_mode=True,
autotest_mode=True, use_null_renderer=True, enable_prefab_system=True):
@@ -62,14 +64,16 @@ class TestAutomationBase:
#########
# Setup #
if self.asset_processor is None:
self._kill_ly_processes(include_asset_processor=True)
self.__class__.asset_processor = AssetProcessor(workspace)
self.asset_processor.backup_ap_settings()
self._kill_ly_processes(include_asset_processor=False)
self.asset_processor.start()
self.asset_processor.wait_for_idle()
else:
self._kill_ly_processes(include_asset_processor=False)
if not self.asset_processor.process_exists():
self.asset_processor.start()
self.asset_processor.wait_for_idle()
def teardown():
if os.path.exists(workspace.paths.editor_log()):
AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py
+32 -34
View File
@@ -27,15 +27,15 @@ TEST_DIRECTORY = os.path.dirname(__file__)
class TestAutomation(TestAutomationBase):
def test_Pane_HappyPath_OpenCloseSuccessfully(self, request, workspace, editor, launcher_platform):
from . import Pane_HappyPath_OpenCloseSuccessfully as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Pane_HappyPath_DocksProperly(self, request, workspace, editor, launcher_platform):
from . import Pane_HappyPath_DocksProperly as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Pane_HappyPath_ResizesProperly(self, request, workspace, editor, launcher_platform):
from . import Pane_HappyPath_ResizesProperly as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@pytest.mark.parametrize("level", ["tmp_level"])
@@ -45,7 +45,7 @@ class TestAutomation(TestAutomationBase):
request.addfinalizer(teardown)
file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
from . import ScriptCanvas_TwoComponents_InteractSuccessfully as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@pytest.mark.parametrize("level", ["tmp_level"])
@@ -55,15 +55,16 @@ class TestAutomation(TestAutomationBase):
request.addfinalizer(teardown)
file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
from . import ScriptCanvas_ChangingAssets_ComponentStable as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Graph_HappyPath_ZoomInZoomOut(self, request, workspace, editor, launcher_platform):
from . import Graph_HappyPath_ZoomInZoomOut as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
def test_NodePalette_HappyPath_CanSelectNode(self, request, workspace, editor, launcher_platform):
from . import NodePalette_HappyPath_CanSelectNode as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@pytest.mark.parametrize("level", ["tmp_level"])
@@ -73,11 +74,11 @@ class TestAutomation(TestAutomationBase):
request.addfinalizer(teardown)
file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
from . import ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_NodePalette_HappyPath_ClearSelection(self, request, workspace, editor, launcher_platform, project):
from . import NodePalette_HappyPath_ClearSelection as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@pytest.mark.parametrize("level", ["tmp_level"])
@@ -87,7 +88,7 @@ class TestAutomation(TestAutomationBase):
request.addfinalizer(teardown)
file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
from . import ScriptCanvas_TwoEntities_UseSimultaneously as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ScriptEvent_HappyPath_CreatedWithoutError(self, request, workspace, editor, launcher_platform, project):
def teardown():
@@ -99,20 +100,21 @@ class TestAutomation(TestAutomationBase):
[os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True
)
from . import ScriptEvent_HappyPath_CreatedWithoutError as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ScriptCanvasTools_Toggle_OpenCloseSuccess(self, request, workspace, editor, launcher_platform):
from . import ScriptCanvasTools_Toggle_OpenCloseSuccess as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_NodeInspector_HappyPath_VariableRenames(self, request, workspace, editor, launcher_platform, project):
from . import NodeInspector_HappyPath_VariableRenames as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Debugger_HappyPath_TargetMultipleGraphs(self, request, workspace, editor, launcher_platform, project):
from . import Debugger_HappyPath_TargetMultipleGraphs as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
@pytest.mark.parametrize("level", ["tmp_level"])
def test_Debugger_HappyPath_TargetMultipleEntities(self, request, workspace, editor, launcher_platform, project, level):
def teardown():
@@ -120,16 +122,16 @@ class TestAutomation(TestAutomationBase):
request.addfinalizer(teardown)
file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
from . import Debugger_HappyPath_TargetMultipleEntities as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
def test_EditMenu_Default_UndoRedo(self, request, workspace, editor, launcher_platform, project):
from . import EditMenu_Default_UndoRedo as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Pane_Undocked_ClosesSuccessfully(self, request, workspace, editor, launcher_platform):
from . import Pane_Undocked_ClosesSuccessfully as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.parametrize("level", ["tmp_level"])
def test_Entity_HappyPath_AddScriptCanvasComponent(self, request, workspace, editor, launcher_platform, project, level):
@@ -138,11 +140,11 @@ class TestAutomation(TestAutomationBase):
request.addfinalizer(teardown)
file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
from . import Entity_HappyPath_AddScriptCanvasComponent as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_Pane_Default_RetainOnSCRestart(self, request, workspace, editor, launcher_platform):
from . import Pane_Default_RetainOnSCRestart as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@pytest.mark.parametrize("level", ["tmp_level"])
@@ -152,7 +154,7 @@ class TestAutomation(TestAutomationBase):
request.addfinalizer(teardown)
file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
from . import ScriptEvents_HappyPath_SendReceiveAcrossMultiple as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@pytest.mark.parametrize("level", ["tmp_level"])
@@ -162,7 +164,7 @@ class TestAutomation(TestAutomationBase):
request.addfinalizer(teardown)
file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
from . import ScriptEvents_Default_SendReceiveSuccessfully as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@pytest.mark.parametrize("level", ["tmp_level"])
@@ -172,24 +174,26 @@ class TestAutomation(TestAutomationBase):
request.addfinalizer(teardown)
file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True)
from . import ScriptEvents_ReturnSetType_Successfully as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
def test_NodeCategory_ExpandOnClick(self, request, workspace, editor, launcher_platform):
from . import NodeCategory_ExpandOnClick as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_NodePalette_SearchText_Deletion(self, request, workspace, editor, launcher_platform):
from . import NodePalette_SearchText_Deletion as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
def test_VariableManager_UnpinVariableType_Works(self, request, workspace, editor, launcher_platform):
from . import VariableManager_UnpinVariableType_Works as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
@pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
def test_Node_HappyPath_DuplicateNode(self, request, workspace, editor, launcher_platform):
from . import Node_HappyPath_DuplicateNode as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
def test_ScriptEvent_AddRemoveParameter_ActionsSuccessful(self, request, workspace, editor, launcher_platform):
def teardown():
@@ -201,7 +205,7 @@ class TestAutomation(TestAutomationBase):
[os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True
)
from . import ScriptEvent_AddRemoveParameter_ActionsSuccessful as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
# NOTE: We had to use hydra_test_utils.py, as TestAutomationBase run_test method
# fails because of pyside_utils import
@@ -227,7 +231,6 @@ class TestScriptCanvasTests(object):
expected_lines,
auto_test_mode=False,
timeout=60,
enable_prefab_system=False,
)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@@ -246,7 +249,6 @@ class TestScriptCanvasTests(object):
expected_lines,
auto_test_mode=False,
timeout=60,
enable_prefab_system=False,
)
def test_GraphClose_Default_SavePrompt(self, request, editor, launcher_platform):
@@ -263,9 +265,9 @@ class TestScriptCanvasTests(object):
expected_lines,
auto_test_mode=False,
timeout=60,
enable_prefab_system=False,
)
@pytest.mark.xfail(reason="Test fails on nightly build builds, it needs to be fixed.")
def test_VariableManager_Default_CreateDeleteVars(self, request, editor, launcher_platform):
var_types = ["Boolean", "Color", "EntityID", "Number", "String", "Transform", "Vector2", "Vector3", "Vector4"]
expected_lines = [f"Success: {var_type} variable is created" for var_type in var_types]
@@ -278,7 +280,6 @@ class TestScriptCanvasTests(object):
expected_lines,
auto_test_mode=False,
timeout=60,
enable_prefab_system=False,
)
@pytest.mark.parametrize(
@@ -314,7 +315,6 @@ class TestScriptCanvasTests(object):
cfg_args=[config.get('cfg_args')],
auto_test_mode=False,
timeout=60,
enable_prefab_system=False,
)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@@ -343,7 +343,6 @@ class TestScriptCanvasTests(object):
expected_lines,
auto_test_mode=False,
timeout=60,
enable_prefab_system=False,
)
@pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.")
@@ -371,6 +370,5 @@ class TestScriptCanvasTests(object):
expected_lines,
auto_test_mode=False,
timeout=60,
enable_prefab_system=False,
)
AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py
+1 -1
View File
@@ -23,4 +23,4 @@ class TestAutomation(TestAutomationBase):
def test_Opening_Closing_Pane(self, request, workspace, editor, launcher_platform):
from . import Opening_Closing_Pane as test_module
self._run_test(request, workspace, editor, test_module, enable_prefab_system=False)
self._run_test(request, workspace, editor, test_module)
AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
+10
View File
@@ -45,4 +45,14 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
AutomatedTesting.Assets
)
ly_add_pytest(
NAME AutomatedTesting::SmokeTest_Sandbox
TEST_SUITE sandbox
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}
PYTEST_MARKS "SUITE_sandbox"
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
)
endif()
AutomatedTesting/Gem/PythonTests/smoke/test_CLITool_AssetBuilder_Works.py
+1 -1
View File
@@ -14,7 +14,7 @@ import pytest
import subprocess
@pytest.mark.SUITE_smoke
@pytest.mark.SUITE_sandbox
class TestCLIToolAssetBuilderWorks(object):
def test_CLITool_AssetBuilder_Works(self, build_directory):
file_path = os.path.join(build_directory, "AssetBuilder")
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material
+20 -30
View File
@@ -1,35 +1,25 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"emissive": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"irradiance": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"opacity": {
"factor": 1.0
}
"propertyValues": {
"baseColor.color": [
0.0,
0.0,
0.0,
1.0
],
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"irradiance.color": [
0.0,
0.0,
0.0,
1.0
],
"opacity.factor": 1.0
}
}
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material
+20 -30
View File
@@ -1,35 +1,25 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
0.0,
1.0,
0.0,
1.0
]
},
"emissive": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"irradiance": {
"color": [
0.0,
1.0,
0.0,
1.0
]
},
"opacity": {
"factor": 1.0
}
"propertyValues": {
"baseColor.color": [
0.0,
1.0,
0.0,
1.0
],
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"irradiance.color": [
0.0,
1.0,
0.0,
1.0
],
"opacity.factor": 1.0
}
}
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material
+24 -44
View File
@@ -1,49 +1,29 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"textureMap": "Textures/arch_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.885053813457489,
0.801281750202179,
1.0
]
},
"metallic": {
"textureMap": "Textures/arch_1k_metallic.png"
},
"normal": {
"textureMap": "Textures/arch_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "Textures/arch_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.050999999046325687,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/arch_1k_roughness.png"
}
"propertyValues": {
"baseColor.color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"baseColor.textureMap": "Textures/arch_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
1.0,
0.885053813457489,
0.801281750202179,
1.0
],
"metallic.textureMap": "Textures/arch_1k_metallic.png",
"normal.textureMap": "Textures/arch_1k_normal.jpg",
"occlusion.diffuseTextureMap": "Textures/arch_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.050999999046325684,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "Textures/arch_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material
+27 -49
View File
@@ -1,54 +1,32 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"textureMap": "Textures/bricks_1k_basecolor.png"
},
"clearCoat": {
"factor": 0.5,
"normalMap": "Textures/bricks_1k_normal.jpg",
"roughness": 0.5
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.9703211784362793,
0.9703211784362793,
1.0
]
},
"metallic": {
"textureMap": "Textures/bricks_1k_metallic.png"
},
"normal": {
"textureMap": "Textures/bricks_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "Textures/bricks_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"algorithm": "ContactRefinement",
"factor": 0.03500000014901161,
"quality": "Medium",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/bricks_1k_roughness.png"
}
"propertyValues": {
"baseColor.color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"baseColor.textureMap": "Textures/bricks_1k_basecolor.png",
"clearCoat.factor": 0.5,
"clearCoat.normalMap": "Textures/bricks_1k_normal.jpg",
"clearCoat.roughness": 0.5,
"general.applySpecularAA": true,
"irradiance.color": [
1.0,
0.9703211784362793,
0.9703211784362793,
1.0
],
"metallic.textureMap": "Textures/bricks_1k_metallic.png",
"normal.textureMap": "Textures/bricks_1k_normal.jpg",
"occlusion.diffuseTextureMap": "Textures/bricks_1k_ao.png",
"opacity.factor": 1.0,
"parallax.algorithm": "ContactRefinement",
"parallax.factor": 0.03500000014901161,
"parallax.quality": "Medium",
"parallax.useTexture": false,
"roughness.textureMap": "Textures/bricks_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material
+26 -46
View File
@@ -1,51 +1,31 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"textureMap": "Textures/floor_1k_basecolor.png"
},
"clearCoat": {
"enable": true,
"influenceMap": "Textures/floor_1k_ao.png",
"normalMap": "Textures/floor_1k_normal.png",
"roughness": 0.25
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.9404135346412659,
0.8688944578170776,
1.0
]
},
"normal": {
"textureMap": "Textures/floor_1k_normal.png"
},
"occlusion": {
"diffuseTextureMap": "Textures/floor_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.012000000104308129,
"pdo": true,
"useTexture": false
},
"roughness": {
"textureMap": "Textures/floor_1k_roughness.png"
}
"propertyValues": {
"baseColor.color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"baseColor.textureMap": "Textures/floor_1k_basecolor.png",
"clearCoat.enable": true,
"clearCoat.influenceMap": "Textures/floor_1k_ao.png",
"clearCoat.normalMap": "Textures/floor_1k_normal.png",
"clearCoat.roughness": 0.25,
"general.applySpecularAA": true,
"irradiance.color": [
1.0,
0.9404135346412659,
0.8688944578170776,
1.0
],
"normal.textureMap": "Textures/floor_1k_normal.png",
"occlusion.diffuseTextureMap": "Textures/floor_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.012000000104308128,
"parallax.pdo": true,
"parallax.useTexture": false,
"roughness.textureMap": "Textures/floor_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material
+21 -39
View File
@@ -1,44 +1,26 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "Textures/roof_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"metallic": {
"useTexture": false
},
"normal": {
"factor": 0.5,
"flipY": true,
"textureMap": "Textures/roof_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "Textures/roof_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"algorithm": "ContactRefinement",
"factor": 0.019999999552965165,
"quality": "Medium",
"useTexture": false
},
"roughness": {
"textureMap": "Textures/roof_1k_roughness.png"
}
"propertyValues": {
"baseColor.color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"baseColor.textureBlendMode": "Lerp",
"baseColor.textureMap": "Textures/roof_1k_basecolor.png",
"general.applySpecularAA": true,
"metallic.useTexture": false,
"normal.factor": 0.5,
"normal.flipY": true,
"normal.textureMap": "Textures/roof_1k_normal.jpg",
"occlusion.diffuseTextureMap": "Textures/roof_1k_ao.png",
"opacity.factor": 1.0,
"parallax.algorithm": "ContactRefinement",
"parallax.factor": 0.019999999552965164,
"parallax.quality": "Medium",
"parallax.useTexture": false,
"roughness.textureMap": "Textures/roof_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material
+20 -30
View File
@@ -1,35 +1,25 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
0.0,
0.0,
1.0,
1.0
]
},
"emissive": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"irradiance": {
"color": [
0.0,
0.0,
1.0,
1.0
]
},
"opacity": {
"factor": 1.0
}
"propertyValues": {
"baseColor.color": [
0.0,
0.0,
1.0,
1.0
],
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"irradiance.color": [
0.0,
0.0,
1.0,
1.0
],
"opacity.factor": 1.0
}
}
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material
+20 -30
View File
@@ -1,35 +1,25 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"baseColor": {
"color": [
0.800000011920929,
0.0,
0.0,
1.0
]
},
"emissive": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"irradiance": {
"color": [
1.0,
0.0,
0.0,
1.0
]
},
"opacity": {
"factor": 1.0
}
"propertyValues": {
"baseColor.color": [
0.800000011920929,
0.0,
0.0,
1.0
],
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"irradiance.color": [
1.0,
0.0,
0.0,
1.0
],
"opacity.factor": 1.0
}
}
AutomatedTesting/Gem/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material
+8 -14
View File
@@ -1,19 +1,13 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"emissive": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"opacity": {
"factor": 1.0
}
"propertyValues": {
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"opacity.factor": 1.0
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/lightBlocker_lambert1.material
+9 -15
View File
@@ -1,19 +1,13 @@
{
"description": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"parentMaterial": "",
"materialTypeVersion": 3,
"properties": {
"emissive": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"opacity": {
"factor": 1.0
}
"propertyValues": {
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"opacity.factor": 1.0
}
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_arch.material
+17 -35
View File
@@ -1,40 +1,22 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/arch_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.2663614749908447,
0.2383916974067688,
0.18117037415504456,
1.0
]
},
"normal": {
"textureMap": "../Textures/arch_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/arch_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.050999999046325684,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/arch_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/arch_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
0.2663614749908447,
0.2383916974067688,
0.18117037415504456,
1.0
],
"normal.textureMap": "../Textures/arch_1k_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/arch_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.050999999046325684,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/arch_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_background.material
+20 -40
View File
@@ -1,45 +1,25 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/background_1k_basecolor.png"
},
"clearCoat": {
"factor": 0.5,
"normalMap": "../Textures/background_1k_normal.jpg",
"roughness": 0.4000000059604645
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.19806210696697235,
0.1746547669172287,
0.16513313353061676,
1.0
]
},
"normal": {
"textureMap": "../Textures/background_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/background_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.03099999949336052,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/background_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/background_1k_basecolor.png",
"clearCoat.factor": 0.5,
"clearCoat.normalMap": "../Textures/background_1k_normal.jpg",
"clearCoat.roughness": 0.4000000059604645,
"general.applySpecularAA": true,
"irradiance.color": [
0.19806210696697235,
0.1746547669172287,
0.16513313353061676,
1.0
],
"normal.textureMap": "../Textures/background_1k_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/background_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.03099999949336052,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/background_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_bricks.material
+20 -40
View File
@@ -1,45 +1,25 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/bricks_1k_basecolor.png"
},
"clearCoat": {
"factor": 0.5,
"normalMap": "../Textures/bricks_1k_normal.jpg",
"roughness": 0.5
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.27467766404151917,
0.27467766404151917,
0.270496666431427,
1.0
]
},
"normal": {
"textureMap": "../Textures/bricks_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/bricks_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"algorithm": "ContactRefinement",
"factor": 0.03500000014901161,
"quality": "Medium",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/bricks_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/bricks_1k_basecolor.png",
"clearCoat.factor": 0.5,
"clearCoat.normalMap": "../Textures/bricks_1k_normal.jpg",
"clearCoat.roughness": 0.5,
"general.applySpecularAA": true,
"irradiance.color": [
0.27467766404151917,
0.27467766404151917,
0.270496666431427,
1.0
],
"normal.textureMap": "../Textures/bricks_1k_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/bricks_1k_ao.png",
"opacity.factor": 1.0,
"parallax.algorithm": "ContactRefinement",
"parallax.factor": 0.03500000014901161,
"parallax.quality": "Medium",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/bricks_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_ceiling.material
+17 -31
View File
@@ -1,36 +1,22 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/ceiling_1k_basecolor.png"
},
"emissive": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"irradiance": {
"color": [
0.29176774621009827,
0.27888914942741394,
0.2501564025878906,
1.0
]
},
"normal": {
"textureMap": "../Textures/ceiling_1k_normal.png"
},
"opacity": {
"factor": 1.0
},
"roughness": {
"textureMap": "../Textures/ceiling_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/ceiling_1k_basecolor.png",
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"irradiance.color": [
0.29176774621009827,
0.27888914942741394,
0.2501564025878906,
1.0
],
"normal.textureMap": "../Textures/ceiling_1k_normal.png",
"opacity.factor": 1.0,
"roughness.textureMap": "../Textures/ceiling_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_chain.material
+16 -30
View File
@@ -1,35 +1,21 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureBlendMode": "Lerp",
"textureMap": "../Textures/chain_basecolor.png"
},
"emissive": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"general": {
"doubleSided": true
},
"metallic": {
"factor": 0.8899999856948853
},
"normal": {
"textureMap": "../Textures/chain_normal.jpg"
},
"opacity": {
"alphaSource": "Split",
"factor": 1.0,
"mode": "Cutout",
"textureMap": "../Textures/chain_alpha.png"
}
"propertyValues": {
"baseColor.textureBlendMode": "Lerp",
"baseColor.textureMap": "../Textures/chain_basecolor.png",
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"general.doubleSided": true,
"metallic.factor": 0.8899999856948853,
"normal.textureMap": "../Textures/chain_normal.jpg",
"opacity.alphaSource": "Split",
"opacity.factor": 1.0,
"opacity.mode": "Cutout",
"opacity.textureMap": "../Textures/chain_alpha.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_columna.material
+20 -40
View File
@@ -1,45 +1,25 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/columnA_1k_basecolor.png"
},
"clearCoat": {
"factor": 0.5,
"normalMap": "../Textures/columnA_1k_normal.jpg",
"roughness": 0.30000001192092896
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.8964369893074036,
0.8264744281768799,
1.0
]
},
"normal": {
"textureMap": "../Textures/columnA_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/columnA_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.017000000923871994,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/columnA_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/columnA_1k_basecolor.png",
"clearCoat.factor": 0.5,
"clearCoat.normalMap": "../Textures/columnA_1k_normal.jpg",
"clearCoat.roughness": 0.30000001192092896,
"general.applySpecularAA": true,
"irradiance.color": [
1.0,
0.8964369893074036,
0.8264744281768799,
1.0
],
"normal.textureMap": "../Textures/columnA_1k_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/columnA_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.017000000923871994,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/columnA_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_columnb.material
+20 -40
View File
@@ -1,45 +1,25 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/columnB_1k_basecolor.png"
},
"clearCoat": {
"factor": 0.5,
"normalMap": "../Textures/columnB_1k_normal.jpg",
"roughness": 0.30000001192092896
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.41788357496261597,
0.40723279118537903,
0.4286869466304779,
1.0
]
},
"normal": {
"textureMap": "../Textures/columnB_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/columnB_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.020999999716877937,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/columnB_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/columnB_1k_basecolor.png",
"clearCoat.factor": 0.5,
"clearCoat.normalMap": "../Textures/columnB_1k_normal.jpg",
"clearCoat.roughness": 0.30000001192092896,
"general.applySpecularAA": true,
"irradiance.color": [
0.41788357496261597,
0.40723279118537903,
0.4286869466304779,
1.0
],
"normal.textureMap": "../Textures/columnB_1k_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/columnB_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.020999999716877937,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/columnB_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_columnc.material
+20 -40
View File
@@ -1,45 +1,25 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/columnC_1k_basecolor.png"
},
"clearCoat": {
"factor": 0.5,
"normalMap": "../Textures/columnC_1k_normal.jpg",
"roughness": 0.30000001192092896
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.32314029335975647,
0.29176774621009827,
0.24228274822235107,
1.0
]
},
"normal": {
"textureMap": "../Textures/columnC_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/columnC_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.014000000432133675,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/columnC_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/columnC_1k_basecolor.png",
"clearCoat.factor": 0.5,
"clearCoat.normalMap": "../Textures/columnC_1k_normal.jpg",
"clearCoat.roughness": 0.30000001192092896,
"general.applySpecularAA": true,
"irradiance.color": [
0.32314029335975647,
0.29176774621009827,
0.24228274822235107,
1.0
],
"normal.textureMap": "../Textures/columnC_1k_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/columnC_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.014000000432133675,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/columnC_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_curtainblue.material
+27 -47
View File
@@ -1,52 +1,32 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
1.0,
1.0,
1.0,
1.0
],
"textureMap": "../Textures/curtainBlue_1k_basecolor.png"
},
"emissive": {
"color": [
1.0,
1.0,
1.0,
1.0
]
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.0,
0.14901961386203766,
1.0,
1.0
]
},
"metallic": {
"textureMap": "../Textures/curtain_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "../Textures/curtain_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/curtain_ao.png"
},
"roughness": {
"textureMap": "../Textures/curtain_roughness.png"
},
"specularF0": {
"enableMultiScatterCompensation": true
}
"propertyValues": {
"baseColor.color": [
1.0,
1.0,
1.0,
1.0
],
"baseColor.textureMap": "../Textures/curtainBlue_1k_basecolor.png",
"emissive.color": [
1.0,
1.0,
1.0,
1.0
],
"general.applySpecularAA": true,
"irradiance.color": [
0.0,
0.14901961386203766,
1.0,
1.0
],
"metallic.textureMap": "../Textures/curtain_metallic.png",
"normal.factor": 0.5,
"normal.textureMap": "../Textures/curtain_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/curtain_ao.png",
"roughness.textureMap": "../Textures/curtain_roughness.png",
"specularF0.enableMultiScatterCompensation": true
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_curtaingreen.material
+15 -33
View File
@@ -1,38 +1,20 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/curtainGreen_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.0,
0.15294118225574493,
0.0,
1.0
]
},
"metallic": {
"textureMap": "../Textures/curtain_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "../Textures/curtain_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/curtain_ao.png"
},
"opacity": {
"factor": 1.0
},
"roughness": {
"textureMap": "../Textures/curtain_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/curtainGreen_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
0.0,
0.15294118225574493,
0.0,
1.0
],
"metallic.textureMap": "../Textures/curtain_metallic.png",
"normal.factor": 0.5,
"normal.textureMap": "../Textures/curtain_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/curtain_ao.png",
"opacity.factor": 1.0,
"roughness.textureMap": "../Textures/curtain_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_curtainred.material
+18 -38
View File
@@ -1,43 +1,23 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/curtainRed_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.41960784792900085,
0.003921568859368563,
0.003921568859368563,
1.0
]
},
"metallic": {
"textureMap": "../Textures/curtain_metallic.png"
},
"normal": {
"textureMap": "../Textures/curtain_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/curtain_ao.png"
},
"opacity": {
"factor": 1.0
},
"roughness": {
"textureMap": "../Textures/curtain_roughness.png"
},
"uv": {
"center": [
16.0,
0.0
]
}
"propertyValues": {
"baseColor.textureMap": "../Textures/curtainRed_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
0.41960784792900085,
0.003921568859368563,
0.003921568859368563,
1.0
],
"metallic.textureMap": "../Textures/curtain_metallic.png",
"normal.textureMap": "../Textures/curtain_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/curtain_ao.png",
"opacity.factor": 1.0,
"roughness.textureMap": "../Textures/curtain_roughness.png",
"uv.center": [
16.0,
0.0
]
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_details.material
+14 -34
View File
@@ -1,39 +1,19 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/details_1k_basecolor.png"
},
"clearCoat": {
"factor": 0.5,
"normalMap": "../Textures/details_1k_normal.png",
"roughness": 0.25
},
"general": {
"applySpecularAA": true
},
"metallic": {
"textureMap": "../Textures/details_1k_metallic.png"
},
"normal": {
"textureMap": "../Textures/details_1k_normal.png"
},
"occlusion": {
"diffuseTextureMap": "../Textures/details_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.02500000037252903,
"pdo": true,
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/details_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/details_1k_basecolor.png",
"clearCoat.factor": 0.5,
"clearCoat.normalMap": "../Textures/details_1k_normal.png",
"clearCoat.roughness": 0.25,
"general.applySpecularAA": true,
"metallic.textureMap": "../Textures/details_1k_metallic.png",
"normal.textureMap": "../Textures/details_1k_normal.png",
"occlusion.diffuseTextureMap": "../Textures/details_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.02500000037252903,
"parallax.pdo": true,
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/details_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_fabricblue.material
+16 -34
View File
@@ -1,39 +1,21 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/fabricBlue_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.0,
0.15049973130226135,
1.0,
1.0
],
"factor": 0.30000001192092896
},
"metallic": {
"textureMap": "../Textures/fabric_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "../Textures/fabric_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/fabric_ao.png"
},
"opacity": {
"factor": 1.0
},
"roughness": {
"textureMap": "../Textures/fabric_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/fabricBlue_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
0.0,
0.15049973130226135,
1.0,
1.0
],
"irradiance.factor": 0.30000001192092896,
"metallic.textureMap": "../Textures/fabric_metallic.png",
"normal.factor": 0.5,
"normal.textureMap": "../Textures/fabric_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/fabric_ao.png",
"opacity.factor": 1.0,
"roughness.textureMap": "../Textures/fabric_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_fabricgreen.material
+16 -34
View File
@@ -1,39 +1,21 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/fabricGreen_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.0,
0.15292592346668243,
0.0012207217514514923,
1.0
],
"factor": 0.30000001192092896
},
"metallic": {
"textureMap": "../Textures/fabric_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "../Textures/fabric_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/fabric_ao.png"
},
"opacity": {
"factor": 1.0
},
"roughness": {
"textureMap": "../Textures/fabric_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/fabricGreen_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
0.0,
0.15292592346668243,
0.0012207217514514923,
1.0
],
"irradiance.factor": 0.30000001192092896,
"metallic.textureMap": "../Textures/fabric_metallic.png",
"normal.factor": 0.5,
"normal.textureMap": "../Textures/fabric_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/fabric_ao.png",
"opacity.factor": 1.0,
"roughness.textureMap": "../Textures/fabric_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_fabricred.material
+16 -34
View File
@@ -1,39 +1,21 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/fabricRed_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.42040130496025085,
0.004654001910239458,
0.0037232013419270515,
1.0
],
"factor": 0.30000001192092896
},
"metallic": {
"textureMap": "../Textures/fabric_metallic.png"
},
"normal": {
"factor": 0.5,
"textureMap": "../Textures/fabric_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/fabric_ao.png"
},
"opacity": {
"factor": 1.0
},
"roughness": {
"textureMap": "../Textures/fabric_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/fabricRed_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
0.42040130496025085,
0.004654001910239458,
0.0037232013419270515,
1.0
],
"irradiance.factor": 0.30000001192092896,
"metallic.textureMap": "../Textures/fabric_metallic.png",
"normal.factor": 0.5,
"normal.textureMap": "../Textures/fabric_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/fabric_ao.png",
"opacity.factor": 1.0,
"roughness.textureMap": "../Textures/fabric_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_flagpole.material
+19 -41
View File
@@ -1,46 +1,24 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/flagpole_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.6520485281944275,
0.7122911214828491,
1.0
]
},
"metallic": {
"textureMap": "../Textures/flagpole_1k_metallic.png"
},
"normal": {
"textureMap": "../Textures/flagpole_1k_normal.png"
},
"occlusion": {
"diffuseTextureMap": "../Textures/flagpole_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.014000000432133675,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/flagpole_1k_roughness.png"
},
"specularF0": {
"enableMultiScatterCompensation": true
}
"propertyValues": {
"baseColor.textureMap": "../Textures/flagpole_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
1.0,
0.6520485281944275,
0.7122911214828491,
1.0
],
"metallic.textureMap": "../Textures/flagpole_1k_metallic.png",
"normal.textureMap": "../Textures/flagpole_1k_normal.png",
"occlusion.diffuseTextureMap": "../Textures/flagpole_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.014000000432133675,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/flagpole_1k_roughness.png",
"specularF0.enableMultiScatterCompensation": true
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_floor.material
+19 -39
View File
@@ -1,44 +1,24 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/floor_1k_basecolor.png"
},
"clearCoat": {
"influenceMap": "../Textures/floor_1k_ao.png",
"normalMap": "../Textures/floor_1k_normal.png",
"roughness": 0.25
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.9404135346412659,
0.8688944578170776,
1.0
]
},
"normal": {
"textureMap": "../Textures/floor_1k_normal.png"
},
"occlusion": {
"diffuseTextureMap": "../Textures/floor_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.012000000104308128,
"pdo": true,
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/floor_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/floor_1k_basecolor.png",
"clearCoat.influenceMap": "../Textures/floor_1k_ao.png",
"clearCoat.normalMap": "../Textures/floor_1k_normal.png",
"clearCoat.roughness": 0.25,
"general.applySpecularAA": true,
"irradiance.color": [
1.0,
0.9404135346412659,
0.8688944578170776,
1.0
],
"normal.textureMap": "../Textures/floor_1k_normal.png",
"occlusion.diffuseTextureMap": "../Textures/floor_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.012000000104308128,
"parallax.pdo": true,
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/floor_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_leaf.material
+20 -38
View File
@@ -1,43 +1,25 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/thorn_basecolor.png"
},
"clearCoat": {
"factor": 0.05000000074505806,
"normalMap": "../Textures/thorn_normal.jpg",
"roughness": 0.10000000149011612
},
"general": {
"applySpecularAA": true,
"doubleSided": true
},
"irradiance": {
"color": [
0.46506446599960327,
1.0,
0.3944609761238098,
1.0
]
},
"normal": {
"textureMap": "../Textures/thorn_normal.jpg"
},
"opacity": {
"alphaSource": "Split",
"factor": 0.20000000298023224,
"mode": "Cutout",
"textureMap": "../Textures/thorn_alpha.png"
},
"parallax": {
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/thorn_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/thorn_basecolor.png",
"clearCoat.factor": 0.05000000074505806,
"clearCoat.normalMap": "../Textures/thorn_normal.jpg",
"clearCoat.roughness": 0.10000000149011612,
"general.applySpecularAA": true,
"general.doubleSided": true,
"irradiance.color": [
0.46506446599960327,
1.0,
0.3944609761238098,
1.0
],
"normal.textureMap": "../Textures/thorn_normal.jpg",
"opacity.alphaSource": "Split",
"opacity.factor": 0.20000000298023224,
"opacity.mode": "Cutout",
"opacity.textureMap": "../Textures/thorn_alpha.png",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/thorn_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_lion.material
+17 -31
View File
@@ -1,36 +1,22 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/lion_1k_basecolor.png"
},
"emissive": {
"color": [
0.0,
0.0,
0.0,
1.0
]
},
"irradiance": {
"color": [
0.5583428740501404,
0.496940553188324,
0.4125429093837738,
1.0
]
},
"normal": {
"textureMap": "../Textures/lion_1k_normal.jpg"
},
"opacity": {
"factor": 1.0
},
"roughness": {
"textureMap": "../Textures/lion_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/lion_1k_basecolor.png",
"emissive.color": [
0.0,
0.0,
0.0,
1.0
],
"irradiance.color": [
0.5583428740501404,
0.496940553188324,
0.4125429093837738,
1.0
],
"normal.textureMap": "../Textures/lion_1k_normal.jpg",
"opacity.factor": 1.0,
"roughness.textureMap": "../Textures/lion_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_roof.material
+22 -42
View File
@@ -1,47 +1,27 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureBlendMode": "Lerp",
"textureMap": "../Textures/roof_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.29613184928894043,
0.3324483036994934,
0.45078203082084656,
1.0
]
},
"metallic": {
"textureMap": "../Textures/roof_1k_metallic.png",
"useTexture": false
},
"normal": {
"factor": 0.5,
"flipY": true,
"textureMap": "../Textures/roof_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/roof_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"algorithm": "ContactRefinement",
"factor": 0.019999999552965164,
"quality": "Medium",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/roof_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureBlendMode": "Lerp",
"baseColor.textureMap": "../Textures/roof_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
0.29613184928894043,
0.3324483036994934,
0.45078203082084656,
1.0
],
"metallic.textureMap": "../Textures/roof_1k_metallic.png",
"metallic.useTexture": false,
"normal.factor": 0.5,
"normal.flipY": true,
"normal.textureMap": "../Textures/roof_1k_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/roof_1k_ao.png",
"opacity.factor": 1.0,
"parallax.algorithm": "ContactRefinement",
"parallax.factor": 0.019999999552965164,
"parallax.quality": "Medium",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/roof_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_vase.material
+19 -41
View File
@@ -1,46 +1,24 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/vase_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
1.0,
0.8713664412498474,
0.6021667718887329,
1.0
]
},
"metallic": {
"textureMap": "../Textures/vase_1k_metallic.png"
},
"normal": {
"textureMap": "../Textures/vase_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/vase_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.027000000700354576,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/vase_1k_roughness.png"
},
"specularF0": {
"enableMultiScatterCompensation": true
}
"propertyValues": {
"baseColor.textureMap": "../Textures/vase_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
1.0,
0.8713664412498474,
0.6021667718887329,
1.0
],
"metallic.textureMap": "../Textures/vase_1k_metallic.png",
"normal.textureMap": "../Textures/vase_1k_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/vase_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.027000000700354576,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/vase_1k_roughness.png",
"specularF0.enableMultiScatterCompensation": true
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_vasehanging.material
+18 -38
View File
@@ -1,43 +1,23 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/vaseHanging_1k_basecolor.png"
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.765606164932251,
1.0,
0.7052567601203918,
1.0
]
},
"metallic": {
"textureMap": "../Textures/vaseHanging_1k_metallic.png"
},
"normal": {
"textureMap": "../Textures/vaseHanging_1k_normal.png"
},
"occlusion": {
"diffuseTextureMap": "../Textures/vaseHanging_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.04600000008940697,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/vaseHanging_1k_roughness.png"
}
"propertyValues": {
"baseColor.textureMap": "../Textures/vaseHanging_1k_basecolor.png",
"general.applySpecularAA": true,
"irradiance.color": [
0.765606164932251,
1.0,
0.7052567601203918,
1.0
],
"metallic.textureMap": "../Textures/vaseHanging_1k_metallic.png",
"normal.textureMap": "../Textures/vaseHanging_1k_normal.png",
"occlusion.diffuseTextureMap": "../Textures/vaseHanging_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.04600000008940697,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/vaseHanging_1k_roughness.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_vaseplant.material
+21 -31
View File
@@ -1,36 +1,26 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"textureBlendMode": "Lerp",
"textureMap": "../Textures/vasePlant_1k_basecolor.png"
},
"general": {
"applySpecularAA": true,
"doubleSided": true
},
"irradiance": {
"color": [
0.09086747467517853,
0.4111391007900238,
0.0474097803235054,
1.0
]
},
"opacity": {
"alphaSource": "Split",
"factor": 0.23999999463558197,
"mode": "Cutout",
"textureMap": "../Textures/vasePlant_1k_alpha.png"
}
"propertyValues": {
"baseColor.color": [
0.800000011920929,
0.800000011920929,
0.800000011920929,
1.0
],
"baseColor.textureBlendMode": "Lerp",
"baseColor.textureMap": "../Textures/vasePlant_1k_basecolor.png",
"general.applySpecularAA": true,
"general.doubleSided": true,
"irradiance.color": [
0.09086747467517853,
0.4111391007900238,
0.0474097803235054,
1.0
],
"opacity.alphaSource": "Split",
"opacity.factor": 0.23999999463558197,
"opacity.mode": "Cutout",
"opacity.textureMap": "../Textures/vasePlant_1k_alpha.png"
}
}
AutomatedTesting/Gem/Sponza/Assets/objects/sponza_mat_vaseround.material
+22 -44
View File
@@ -1,49 +1,27 @@
{
"description": "",
"parentMaterial": "",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 4,
"properties": {
"baseColor": {
"textureMap": "../Textures/vaseRound_1k_basecolor.png"
},
"clearCoat": {
"factor": 0.5,
"influenceMap": "../Textures/vaseRound_1k_ao.png",
"normalMap": "../Textures/vaseRound_1k_normal.jpg",
"roughness": 0.25
},
"general": {
"applySpecularAA": true
},
"irradiance": {
"color": [
0.46933698654174805,
0.3824063539505005,
0.47861447930336,
1.0
]
},
"normal": {
"textureMap": "../Textures/vaseRound_1k_normal.jpg"
},
"occlusion": {
"diffuseTextureMap": "../Textures/vaseRound_1k_ao.png"
},
"opacity": {
"factor": 1.0
},
"parallax": {
"factor": 0.019999999552965164,
"pdo": true,
"quality": "High",
"useTexture": false
},
"roughness": {
"textureMap": "../Textures/vaseRound_1k_roughness.png"
},
"specularF0": {
"enableMultiScatterCompensation": true
}
"propertyValues": {
"baseColor.textureMap": "../Textures/vaseRound_1k_basecolor.png",
"clearCoat.factor": 0.5,
"clearCoat.influenceMap": "../Textures/vaseRound_1k_ao.png",
"clearCoat.normalMap": "../Textures/vaseRound_1k_normal.jpg",
"clearCoat.roughness": 0.25,
"general.applySpecularAA": true,
"irradiance.color": [
0.46933698654174805,
0.3824063539505005,
0.47861447930336,
1.0
],
"normal.textureMap": "../Textures/vaseRound_1k_normal.jpg",
"occlusion.diffuseTextureMap": "../Textures/vaseRound_1k_ao.png",
"opacity.factor": 1.0,
"parallax.factor": 0.019999999552965164,
"parallax.pdo": true,
"parallax.quality": "High",
"parallax.useTexture": false,
"roughness.textureMap": "../Textures/vaseRound_1k_roughness.png",
"specularF0.enableMultiScatterCompensation": true
}
}
AutomatedTesting/Levels/Blast/Blast_ActorSplitsAfterCollision/Blast_ActorSplitsAfterCollision.prefab
+255
View File
@@ -0,0 +1,255 @@
{
"ContainerEntity": {
"Id": "ContainerEntity",
"Name": "Blast_ActorSplitsAfterCollision",
"Components": {
"Component_[10182366347512475253]": {
"$type": "EditorPrefabComponent",
"Id": 10182366347512475253
},
"Component_[12917798267488243668]": {
"$type": "EditorPendingCompositionComponent",
"Id": 12917798267488243668
},
"Component_[3261249813163778338]": {
"$type": "EditorOnlyEntityComponent",
"Id": 3261249813163778338
},
"Component_[3837204912784440039]": {
"$type": "EditorDisabledCompositionComponent",
"Id": 3837204912784440039
},
"Component_[4272963378099646759]": {
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
"Id": 4272963378099646759,
"Parent Entity": ""
},
"Component_[4848458548047175816]": {
"$type": "EditorVisibilityComponent",
"Id": 4848458548047175816
},
"Component_[5787060997243919943]": {
"$type": "EditorInspectorComponent",
"Id": 5787060997243919943
},
"Component_[7804170251266531779]": {
"$type": "EditorLockComponent",
"Id": 7804170251266531779
},
"Component_[7874177159288365422]": {
"$type": "EditorEntitySortComponent",
"Id": 7874177159288365422
},
"Component_[8018146290632383969]": {
"$type": "EditorEntityIconComponent",
"Id": 8018146290632383969
},
"Component_[8452360690590857075]": {
"$type": "SelectionComponent",
"Id": 8452360690590857075
}
}
},
"Entities": {
"Entity_[678057008134]": {
"Id": "Entity_[678057008134]",
"Name": "Sphere_Moving",
"Components": {
"Component_[158491845118288574]": {
"$type": "EditorColliderComponent",
"Id": 158491845118288574,
"ColliderConfiguration": {
"CollisionGroupId": {
"GroupId": "{45EBDE87-10BA-405B-9118-1FE9C750E5A3}"
},
"MaterialSelection": {
"MaterialIds": [
{}
]
}
},
"ShapeConfiguration": {
"ShapeType": 0
}
},
"Component_[15882836540317052831]": {
"$type": "EditorOnlyEntityComponent",
"Id": 15882836540317052831
},
"Component_[15988538924200810686]": {
"$type": "EditorDisabledCompositionComponent",
"Id": 15988538924200810686
},
"Component_[17332118306686659923]": {
"$type": "SelectionComponent",
"Id": 17332118306686659923
},
"Component_[18013098363541384892]": {
"$type": "EditorPendingCompositionComponent",
"Id": 18013098363541384892
},
"Component_[3299242856338866058]": {
"$type": "EditorVisibilityComponent",
"Id": 3299242856338866058
},
"Component_[3368757662560547573]": {
"$type": "EditorInspectorComponent",
"Id": 3368757662560547573,
"ComponentOrderEntryArray": [
{
"ComponentId": 9646670826592538370
},
{
"ComponentId": 158491845118288574,
"SortIndex": 1
},
{
"ComponentId": 7177752238184232813,
"SortIndex": 2
},
{
"ComponentId": 3538399061071907667,
"SortIndex": 3
}
]
},
"Component_[3538399061071907667]": {
"$type": "EditorSphereShapeComponent",
"Id": 3538399061071907667,
"GameView": true
},
"Component_[3584595476595239676]": {
"$type": "EditorLockComponent",
"Id": 3584595476595239676
},
"Component_[4539775501292735153]": {
"$type": "EditorEntityIconComponent",
"Id": 4539775501292735153
},
"Component_[5885911623396957736]": {
"$type": "EditorEntitySortComponent",
"Id": 5885911623396957736
},
"Component_[7177752238184232813]": {
"$type": "EditorRigidBodyComponent",
"Id": 7177752238184232813,
"Configuration": {
"entityId": "",
"Compute Mass": false,
"Mass": 100.0,
"Inertia tensor": {
"roll": 0.0,
"pitch": 0.0,
"yaw": 0.0,
"scale": 0.10000000149011612
}
}
},
"Component_[9646670826592538370]": {
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
"Id": 9646670826592538370,
"Parent Entity": "ContainerEntity",
"Transform Data": {
"Translate": [
511.9999694824219,
532.0,
43.0
]
}
}
}
},
"Entity_[682351975430]": {
"Id": "Entity_[682351975430]",
"Name": "Destructable_Box",
"Components": {
"Component_[14428979635353087750]": {
"$type": "EditorEntitySortComponent",
"Id": 14428979635353087750
},
"Component_[14459069801260260996]": {
"$type": "EditorPendingCompositionComponent",
"Id": 14459069801260260996
},
"Component_[16353277599917996564]": {
"$type": "SelectionComponent",
"Id": 16353277599917996564
},
"Component_[16528484535459302978]": {
"$type": "EditorDisabledCompositionComponent",
"Id": 16528484535459302978
},
"Component_[17689177494335411023]": {
"$type": "EditorVisibilityComponent",
"Id": 17689177494335411023
},
"Component_[18116908665747450198]": {
"$type": "EditorOnlyEntityComponent",
"Id": 18116908665747450198
},
"Component_[3544855145233062627]": {
"$type": "EditorInspectorComponent",
"Id": 3544855145233062627,
"ComponentOrderEntryArray": [
{
"ComponentId": 3826825320808092990
},
{
"ComponentId": 5627868831214978789,
"SortIndex": 1
},
{
"ComponentId": 7875098433529363009,
"SortIndex": 2
}
]
},
"Component_[3569626399556956817]": {
"$type": "EditorLockComponent",
"Id": 3569626399556956817
},
"Component_[3826825320808092990]": {
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
"Id": 3826825320808092990,
"Parent Entity": "ContainerEntity",
"Transform Data": {
"Translate": [
511.9991455078125,
532.031982421875,
39.52538299560547
],
"Scale": [
1.0000001192092896,
0.9999998807907104,
1.0
]
}
},
"Component_[5627868831214978789]": {
"$type": "EditorBlastFamilyComponent",
"Id": 5627868831214978789,
"BlastAsset": {
"assetId": {
"guid": "{BAB71D97-F136-5C11-8AB6-6E9F768CA83B}"
},
"assetHint": "assets/destruction/box_2_chunks.blast"
},
"BlastMaterial": {
"BlastMaterialId": "{2F200947-553F-487F-B4EA-57F0EF5AE024}"
},
"PhysicsMaterial": {
"MaterialId": "{34AD1046-240B-448C-A694-AE80F595C431}"
}
},
"Component_[7159608037522336146]": {
"$type": "EditorEntityIconComponent",
"Id": 7159608037522336146
},
"Component_[7875098433529363009]": {
"$type": "EditorBlastMeshDataComponent",
"Id": 7875098433529363009
}
}
}
}
}
AutomatedTesting/Levels/Blast/Blast_ActorSplitsAfterDamage/Blast_ActorSplitsAfterDamage.prefab
+148
View File
@@ -0,0 +1,148 @@
{
"ContainerEntity": {
"Id": "ContainerEntity",
"Name": "Blast_ActorSplitsAfterDamage",
"Components": {
"Component_[10182366347512475253]": {
"$type": "EditorPrefabComponent",
"Id": 10182366347512475253
},
"Component_[12917798267488243668]": {
"$type": "EditorPendingCompositionComponent",
"Id": 12917798267488243668
},
"Component_[3261249813163778338]": {
"$type": "EditorOnlyEntityComponent",
"Id": 3261249813163778338
},
"Component_[3837204912784440039]": {
"$type": "EditorDisabledCompositionComponent",
"Id": 3837204912784440039
},
"Component_[4272963378099646759]": {
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
"Id": 4272963378099646759,
"Parent Entity": ""
},
"Component_[4848458548047175816]": {
"$type": "EditorVisibilityComponent",
"Id": 4848458548047175816
},
"Component_[5787060997243919943]": {
"$type": "EditorInspectorComponent",
"Id": 5787060997243919943
},
"Component_[7804170251266531779]": {
"$type": "EditorLockComponent",
"Id": 7804170251266531779
},
"Component_[7874177159288365422]": {
"$type": "EditorEntitySortComponent",
"Id": 7874177159288365422
},
"Component_[8018146290632383969]": {
"$type": "EditorEntityIconComponent",
"Id": 8018146290632383969
},
"Component_[8452360690590857075]": {
"$type": "SelectionComponent",
"Id": 8452360690590857075
}
}
},
"Entities": {
"Entity_[682351975430]": {
"Id": "Entity_[682351975430]",
"Name": "Destructable_Box",
"Components": {
"Component_[14428979635353087750]": {
"$type": "EditorEntitySortComponent",
"Id": 14428979635353087750
},
"Component_[14459069801260260996]": {
"$type": "EditorPendingCompositionComponent",
"Id": 14459069801260260996
},
"Component_[16353277599917996564]": {
"$type": "SelectionComponent",
"Id": 16353277599917996564
},
"Component_[16528484535459302978]": {
"$type": "EditorDisabledCompositionComponent",
"Id": 16528484535459302978
},
"Component_[17689177494335411023]": {
"$type": "EditorVisibilityComponent",
"Id": 17689177494335411023
},
"Component_[18116908665747450198]": {
"$type": "EditorOnlyEntityComponent",
"Id": 18116908665747450198
},
"Component_[3544855145233062627]": {
"$type": "EditorInspectorComponent",
"Id": 3544855145233062627,
"ComponentOrderEntryArray": [
{
"ComponentId": 3826825320808092990
},
{
"ComponentId": 5627868831214978789,
"SortIndex": 1
},
{
"ComponentId": 7875098433529363009,
"SortIndex": 2
}
]
},
"Component_[3569626399556956817]": {
"$type": "EditorLockComponent",
"Id": 3569626399556956817
},
"Component_[3826825320808092990]": {
"$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
"Id": 3826825320808092990,
"Parent Entity": "ContainerEntity",
"Transform Data": {
"Translate": [
511.9991455078125,
532.031982421875,
39.52538299560547
],
"Scale": [
1.0000001192092896,
0.9999998807907104,
1.0
]
}
},
"Component_[5627868831214978789]": {
"$type": "EditorBlastFamilyComponent",
"Id": 5627868831214978789,
"BlastAsset": {
"assetId": {
"guid": "{BAB71D97-F136-5C11-8AB6-6E9F768CA83B}"
},
"assetHint": "assets/destruction/box_2_chunks.blast"
},
"BlastMaterial": {
"BlastMaterialId": "{2F200947-553F-487F-B4EA-57F0EF5AE024}"
},
"PhysicsMaterial": {
"MaterialId": "{34AD1046-240B-448C-A694-AE80F595C431}"
}
},
"Component_[7159608037522336146]": {
"$type": "EditorEntityIconComponent",
"Id": 7159608037522336146
},
"Component_[7875098433529363009]": {
"$type": "EditorBlastMeshDataComponent",
"Id": 7875098433529363009,
"Show Mesh Assets": true
}
}
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic.material
+22 -28
View File
@@ -1,32 +1,26 @@
{
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"baseColor": {
"color": [ 1.0, 1.0, 1.0 ],
"factor": 0.75,
"useTexture": false,
"textureMap": ""
},
"metallic": {
"factor": 0.0,
"useTexture": false,
"textureMap": ""
},
"roughness": {
"factor": 0.0,
"useTexture": false,
"textureMap": ""
},
"specularF0": {
"factor": 0.5,
"useTexture": false,
"textureMap": ""
},
"normal": {
"factor": 1.0,
"useTexture": false,
"textureMap": ""
}
"propertyValues": {
"baseColor.color": [
1.0,
1.0,
1.0
],
"baseColor.factor": 0.75,
"baseColor.textureMap": "",
"baseColor.useTexture": false,
"metallic.factor": 0.0,
"metallic.textureMap": "",
"metallic.useTexture": false,
"normal.factor": 1.0,
"normal.textureMap": "",
"normal.useTexture": false,
"roughness.factor": 0.0,
"roughness.textureMap": "",
"roughness.useTexture": false,
"specularF0.factor": 0.5,
"specularF0.textureMap": "",
"specularF0.useTexture": false
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r00.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.0
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.0
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r01.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.1
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.10000000149011612
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r02.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.2
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.20000000298023224
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r03.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.3
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.30000001192092896
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r04.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.4
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.4000000059604645
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r05.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.5
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.5
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r06.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.6
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.6000000238418579
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r07.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.7
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.699999988079071
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r08.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.8
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.800000011920929
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r09.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 0.9
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 0.8999999761581421
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m00_r10.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 0.0
},
"roughness": {
"factor": 1.0
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 0.0,
"roughness.factor": 1.0
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r00.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.0
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 1.0,
"roughness.factor": 0.0
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r01.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.1
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 1.0,
"roughness.factor": 0.10000000149011612
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r02.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.2
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 1.0,
"roughness.factor": 0.20000000298023224
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r03.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.3
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 1.0,
"roughness.factor": 0.30000001192092896
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r04.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.4
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 1.0,
"roughness.factor": 0.4000000059604645
}
}
}
AutomatedTesting/Levels/Graphics/PbrMaterialChart/materials/basic_m10_r05.material
+5 -9
View File
@@ -1,13 +1,9 @@
{
"parentMaterial": "./basic.material",
"materialType": "Materials/Types/StandardPBR.materialtype",
"materialTypeVersion": 1,
"properties": {
"metallic": {
"factor": 1.0
},
"roughness": {
"factor": 0.5
}
"parentMaterial": "./basic.material",
"propertyValues": {
"metallic.factor": 1.0,
"roughness.factor": 0.5
}
}
}

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