diff --git a/.gitignore b/.gitignore
index 5f6172cd76..9012ec7576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
.vscode/
__pycache__
AssetProcessorTemp/**
-[Bb]uild/**
+[Bb]uild/
[Oo]ut/**
CMakeUserPresets.json
[Cc]ache/
diff --git a/Assets/Editor/Scripts/export_all_project_levels.py b/Assets/Editor/Scripts/export_all_project_levels.py
deleted file mode 100755
index ba900b37a8..0000000000
--- a/Assets/Editor/Scripts/export_all_project_levels.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# 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
-#
-#
-"""
-This script loads every level in a game project and exports them. You will be prompted with the standard
-Check-Out/Overwrite/Cancel dialog for each level.
-This is useful when there is a version update to a file that requires re-exporting.
-"""
-import sys, os
-import azlmbr.legacy.general as general
-import azlmbr.legacy.checkout_dialog as checkout_dialog
-
-
-class CheckOutDialogEnableAll:
- """
- Helper class to wrap enabling the "Apply to all" checkbox in the CheckOutDialog.
- Guarantees that the old setting will be restored.
- To use, do:
-
- with CheckOutDialogEnableAll():
- # your code here
- """
-
- def __init__(self):
- self.old_setting = False
-
- def __enter__(self):
- self.old_setting = checkout_dialog.enable_for_all(True)
- print(self.old_setting)
-
- def __exit__(self, type, value, traceback):
- checkout_dialog.enable_for_all(self.old_setting)
-
-
-level_list = []
-
-
-def is_in_special_folder(file_full_path):
- if file_full_path.find("_savebackup") >= 0:
- return True
- if file_full_path.find("_autobackup") >= 0:
- return True
- if file_full_path.find("_hold") >= 0:
- return True
- if file_full_path.find("_tmpresize") >= 0:
- return True
-
- return False
-
-
-game_folder = general.get_game_folder()
-
-
-# Recursively search every directory in the game project for files ending with .cry and .ly
-for root, dirs, files in os.walk(game_folder):
- for file in files:
- if file.endswith(".cry") or file.endswith(".ly"):
- # The engine expects the full path of the .cry file
- file_full_path = os.path.abspath(os.path.join(root, file))
- # Exclude files in special directories
- if not is_in_special_folder(file_full_path):
- level_list.append(file_full_path)
-
-# make the checkout dialog enable the 'Apply to all' checkbox
-with CheckOutDialogEnableAll():
-
- # For each valid .cry file found, open it in the editor and export it
- for level in level_list:
- if not isinstance(level, str):
- # general.open_level_no_prompt expects the file path in utf8 format
- level = level.encode("utf-8")
-
- general.open_level_no_prompt(level)
- general.export_to_engine()
diff --git a/Assets/Editor/Scripts/generatelod.py b/Assets/Editor/Scripts/generatelod.py
deleted file mode 100755
index 618827c5b4..0000000000
--- a/Assets/Editor/Scripts/generatelod.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# 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
-#
-#
-'''
-Generates a 50% lod for the selected model
-
-@argument name="Lod Percentage", type="string", default="50.0f"
-'''
-
-import sys
-import time
-
-percentage = float(sys.argv[1])
-
-selectedcgf = lodtools.getselected()
-selectedmaterial = lodtools.getselectedmaterial()
-
-loadedmodel = lodtools.loadcgf(selectedcgf)
-loadedmaterial = lodtools.loadmaterial(selectedmaterial)
-
-if loadedmodel == True and loadedmaterial == True:
- lodtools.generatelodchain()
- finished = 0.0
- while finished >= 0.0:
- finished = lodtools.generatetick()
- print 'Lod Chain Generation progress: ' + str(finished)
- time.sleep(1)
- if finished == 1.0:
- break
-
- lodtools.createlod(1,percentage)
- lodtools.generatematerials(1,512,512)
- lodtools.savetextures(1)
- lodtools.savesettings()
- lodtools.reloadmodel()
-
diff --git a/Assets/Editor/Scripts/lua_symbols.py b/Assets/Editor/Scripts/lua_symbols.py
deleted file mode 100644
index b21edb41d0..0000000000
--- a/Assets/Editor/Scripts/lua_symbols.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# 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
-#
-#
-
-
-# This script shows basic usage of LuaSymbolsReporterBus,
-# Which can be used to report all symbols available for
-# game scripting with Lua.
-
-import sys
-import os
-
-import azlmbr.bus as azbus
-import azlmbr.script as azscript
-import azlmbr.legacy.general as azgeneral
-
-
-def _dump_class_symbol(class_symbol: azlmbr.script.LuaClassSymbol):
- print(f"** {class_symbol}")
- print("Properties:")
- for property_symbol in class_symbol.properties:
- print(f" - {property_symbol}")
- print("Methods:")
- for method_symbol in class_symbol.methods:
- print(f" - {method_symbol}")
-
-
-def _dump_lua_classes():
- class_symbols = azscript.LuaSymbolsReporterBus(azbus.Broadcast,
- "GetListOfClasses")
- print("======== Classes ==========")
- sorted_classes_by_named = sorted(class_symbols, key=lambda class_symbol: class_symbol.name)
- for class_symbol in sorted_classes_by_named:
- _dump_class_symbol(class_symbol)
- print("\n\n")
-
-
-def _dump_lua_globals():
- global_properties = azscript.LuaSymbolsReporterBus(azbus.Broadcast,
- "GetListOfGlobalProperties")
- print("======== Global Properties ==========")
- sorted_properties_by_name = sorted(global_properties, key=lambda symbol: symbol.name)
- for property_symbol in sorted_properties_by_name:
- print(f"- {property_symbol}")
- print("\n\n")
- global_functions = azscript.LuaSymbolsReporterBus(azbus.Broadcast,
- "GetListOfGlobalFunctions")
- print("======== Global Functions ==========")
- sorted_functions_by_name = sorted(global_functions, key=lambda symbol: symbol.name)
- for function_symbol in sorted_functions_by_name:
- print(f"- {function_symbol}")
- print("\n\n")
-
-
-def _dump_lua_ebus(ebus_symbol: azlmbr.script.LuaEBusSymbol):
- print(f">> {ebus_symbol}")
- sorted_senders = sorted(ebus_symbol.senders, key=lambda symbol: symbol.name)
- for sender in sorted_senders:
- print(f" - {sender}")
- print("\n")
-
-
-def _dump_lua_ebuses():
- ebuses = azscript.LuaSymbolsReporterBus(azbus.Broadcast,
- "GetListOfEBuses")
- print("======== Ebus List ==========")
- sorted_ebuses_by_name = sorted(ebuses, key=lambda symbol: symbol.name)
- for ebus_symbol in sorted_ebuses_by_name:
- _dump_lua_ebus(ebus_symbol)
- print("\n\n")
-
-
-class WhatToDo:
- DumpClasses = "c"
- DumpGlobals = "g"
- DumpEBuses = "e"
-
-if __name__ == "__main__":
- redirecting_stdout = False
- orig_stdout = sys.stdout
- if len(sys.argv) > 1:
- output_file_name = sys.argv[1]
- if not os.path.isabs(output_file_name):
- game_root_path = os.path.normpath(azgeneral.get_game_folder())
- output_file_name = os.path.join(game_root_path, output_file_name)
- try:
- file_obj = open(output_file_name, 'wt')
- sys.stdout = file_obj
- redirecting_stdout = True
- except Exception as e:
- print(f"Failed to open {output_file_name}: {e}")
- sys.exit(-1)
-
- what_to_do = [action.lower() for action in sys.argv[2:]]
-
- # If the user did not specify what to do, then let's dump
- # all the symbols.
- if len(what_to_do) < 1:
- what_to_do = [WhatToDo.DumpClasses, WhatToDo.DumpGlobals, WhatToDo.DumpEBuses]
-
- for action in what_to_do:
- if action == WhatToDo.DumpClasses:
- _dump_lua_classes()
- elif action == WhatToDo.DumpGlobals:
- _dump_lua_globals()
- elif action == WhatToDo.DumpEBuses:
- _dump_lua_ebuses()
-
- if redirecting_stdout:
- sys.stdout.close()
- sys.stdout = orig_stdout
- print(f" Lua Symbols Are available in: {output_file_name}")
diff --git a/Assets/Editor/Scripts/rename_cgf.py b/Assets/Editor/Scripts/rename_cgf.py
deleted file mode 100755
index 1196c4c6a2..0000000000
--- a/Assets/Editor/Scripts/rename_cgf.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# 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
-#
-#
-objects = general.get_all_objects("", "") # Get the name list of all objects in the level.
-# If there is any object with the geometry file of "objects\\default\\primitive_box.cgf",
-# change it to "objects\\default\\primitive_cube.cgf".
-for obj in objects:
- geometry_file = general.get_entity_geometry_file(obj)
- if geometry_file == "objects\\default\\primitive_box.cgf":
- general.set_entity_geometry_file(obj, "objects\\default\\primitive_cube.cgf")
diff --git a/Assets/Editor/Scripts/select_story_anim_objects.py b/Assets/Editor/Scripts/select_story_anim_objects.py
deleted file mode 100755
index 93021baac4..0000000000
--- a/Assets/Editor/Scripts/select_story_anim_objects.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# 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
-#
-#
-objects = general.get_all_objects("AnimObject", "") # Get the name list of all anim objects in the level.
-general.clear_selection()
-# If there is any object with the geometry file whose name contains "\\story\\", select it
-for obj in objects:
- geometry_file = general.get_entity_geometry_file(obj)
- if geometry_file.find("\\story\\") != -1:
- general.select_object(obj)
diff --git a/Assets/Editor/Scripts/tools_shelf_actions.py b/Assets/Editor/Scripts/tools_shelf_actions.py
deleted file mode 100755
index 8b99d76e1f..0000000000
--- a/Assets/Editor/Scripts/tools_shelf_actions.py
+++ /dev/null
@@ -1,508 +0,0 @@
-#
-# 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
-#
-#
-import __future__
-import time, re, os, sys, itertools, ast
-import azlmbr.legacy.general as general
-
-global ctrlFile
-ctrlFile = 'setState.txt'
-global logfile
-logfile = 'Editor.log'
-
-global HIDDEN_MASK_PREFIX
-HIDDEN_MASK_PREFIX= 'hidden_mask_for_'
-global HIDDEN_MASK_PREFIX_LENGTH
-HIDDEN_MASK_PREFIX_LENGTH = len(HIDDEN_MASK_PREFIX)
-
-def getLogList(logfile):
- logList = [x for x in open(logfile, 'r')]
- return logList
-
-def getCheckList(ctrlFile):
- try:
- with open(ctrlFile):
- stateList = open(ctrlFile, 'r')
-
- except:
- open(ctrlFile, 'w').close()
- stateList = open(ctrlFile, 'r')
-
- checkList = [x for x in stateList]
- return checkList
-
-#Store/Restore CVars default values -----------------------------------------------------------------#
-if 'CVARS' not in globals():
- CVARS = {}
-
-def saveDefaultValue(cVars, value):
- if cVars not in CVARS:
- CVARS[cVars] = value
-
-def restoreDefaultValue(cVars):
- if cVars not in CVARS:
- return
-
- defaultValue = CVARS[cVars]
- del CVARS[cVars]
- if cVars.startswith(HIDDEN_MASK_PREFIX):
- type = cVars[HIDDEN_MASK_PREFIX_LENGTH:]
- general.set_hidemask(type, defaultValue)
- else:
- general.set_cvar(cVars, defaultValue)
-
-#toggle CVars--------------------------------------------------------------------#
-
-def updateCvars(cVars, value):
- saveDefaultValue(cVars, value)
- general.set_cvar(cVars, value)
-
-def toggleCvarsRestartCheck(log, state, mode, cVars, onValue, offValue, ctrlFile):
- if log in state:
- toggleCvarsV(mode, cVars, onValue, offValue, ctrlFile)
- else:
- stateList = open(ctrlFile, 'w')
- stateList.write(log)
- stateList = open(ctrlFile, 'r')
- toggleCvarsV(mode, cVars, onValue, offValue, ctrlFile)
-
-def toggleCvarsV(mode, cVars, onValue, offValue, ctrlFile):
- stateList = open(ctrlFile, 'r')
- setState = [x for x in enumerate(stateList)]
- blankCheck = [x for x in setState]
- getList = [x for x in stateList]
-
- if blankCheck == []:
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str("%s,{'%s': %s}" % (mode, cVars, offValue))+'\n'))
- general.set_cvar(cVars, offValue)
- else:
- stateList = open(ctrlFile, 'r')
- checkFor = str([x for x in stateList])
-
- if mode not in str(checkFor):
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
- getList.insert(1, str("%s,{'%s': %s}\n" % (mode, cVars , offValue)))
- print (str("{'%s': %s}\n" % (cVars , offValue)))
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(getList))
- general.set_cvar(cVars, offValue)
-
- else:
- stateList = open(ctrlFile, 'r')
- for d in enumerate(stateList):
- values = d[1].split(',')
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
-
- if mode in values[0]:
- getDict = ast.literal_eval(values[1])
- getState = getDict.get(cVars)
-
- if getState == offValue:
- getDict[cVars] = onValue
- joinStr = [mode,",",str(getDict), '\n']
- newLine = ''.join(joinStr)
- print (getDict)
- getList[d[0]] = newLine
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- general.set_cvar(cVars, onValue)
- else:
- getDict[cVars] = offValue
- joinStr = [mode,",",str(getDict), '\n']
- newLine = ''.join(joinStr)
- print (getDict)
- getList[d[0]] = newLine
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- general.set_cvar(cVars, offValue)
-
-def toggleCvarsValue(mode, cVars, onValue, offValue):
- currentValue = general.get_cvar(cVars)
-
- if type(onValue) is str:
- saveDefaultValue(cVars, currentValue)
- elif type(onValue) is int:
- saveDefaultValue(cVars, int(currentValue))
- elif type(onValue) is float:
- saveDefaultValue(cVars, float(currentValue))
- else:
- general.log('Failed to store default value for {0}'.format(cVars))
-
- if currentValue == str(onValue):
- general.set_cvar(cVars, offValue)
- else:
- general.set_cvar(cVars, onValue)
-
-#toggleConsol--------------------------------------------------------------------#
-
-def toggleConsolRestartCheck(log,state, mode, onValue, offValue, ctrlFile):
- if log in state:
- toggleConsolV(mode, onValue, offValue, ctrlFile)
- else:
- stateList = open(ctrlFile, 'w')
- stateList.write(log)
- stateList = open(ctrlFile, 'r')
- toggleConsolV(mode, onValue, offValue, ctrlFile)
-
-def toggleConsolV(mode, onValue, offValue):
- stateList = open(ctrlFile, 'r')
- setState = [x for x in enumerate(stateList)]
- blankCheck = [x for x in setState]
- getList = [x for x in stateList]
- onOffList = [onValue, offValue]
-
- if blankCheck == []:
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str("%s,'%s'" % (mode, offValue))+'\n'))
- general.run_console(offValue)
- else:
- stateList = open(ctrlFile, 'r')
- checkFor = str([x for x in stateList])
-
- if mode not in str(checkFor):
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
- getList.insert(1, str("%s,'%s'\n" % (mode, offValue)))
- print (str("{'%s': %s}\n" % (cVars , offValue)))
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(getList))
- general.run_console(onValue)
-
- else:
- stateList = open(ctrlFile, 'r')
- for d in enumerate(stateList):
-
- values = d[1].split(',')
-
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
-
- if mode in values[0]:
- getDict = values[1]
- off = ["'",str(offValue),"'", '\n']
- joinoff = ''.join(off)
-
- if values[1] == joinoff:
- getDict = onValue
- joinStr = [mode,",","'",getDict,"'", '\n']
- newLine = ''.join(joinStr)
- print (getDict)
- getList[d[0]] = str(newLine)
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- general.run_console(onValue)
- else:
- getDict = offValue
- joinStr = [mode,",","'",getDict,"'", '\n']
- newLine = ''.join(joinStr)
- print (getDict)
- getList[d[0]] = str(newLine)
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- general.run_console(offValue)
-
-def toggleConsolValue(log, state, mode, onValue, offValue):
- logList = getLogList(logfile)
- checkList = getCheckList(ctrlFile)
- toggleConsolRestartCheck(logList[1],checkList, mode, onValue, offValue, ctrlFile)
-
-#cycleCvars----------------------------------------------------------------------#
-
-def cycleCvarsRestartCheck(log, state, mode, cVars, cycleList, ctrlFile):
- if log in state:
- cycleCvarsV(mode, cVars, cycleList, ctrlFile)
- else:
- stateList = open(ctrlFile, 'w')
- stateList.write(log)
- stateList = open(ctrlFile, 'r')
- cycleCvarsV(mode, cVars, cycleList, ctrlFile)
-
-def cycleCvarsV(mode, cVars, cycleList, ctrlFile):
- stateList = open(ctrlFile, 'r')
- setState = [x for x in enumerate(stateList)]
- blankCheck = [x for x in setState]
- getList = [x for x in stateList]
-
- if blankCheck == []:
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str("%s,{'%s': %s}" % (mode, cVars, cycleList[1]))+'\n'))
- general.set_cvar(cVars, cycleList[1])
- else:
- stateList = open(ctrlFile, 'r')
- checkFor = str([x for x in stateList])
-
- if mode not in str(checkFor):
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
- getList.insert(1, str("%s,{'%s': %s}\n" % (mode, cVars , cycleList[1])))
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(getList))
- general.set_cvar(cVars, cycleList[1])
-
- else:
- stateList = open(ctrlFile, 'r')
-
- for d in enumerate(stateList):
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
- values = d[1].split(',')
-
- if mode in values[0]:
- getDict = ast.literal_eval(values[1])
- getState = getDict.get(cVars)
-
- cycleL = [x for x in enumerate(cycleList)]
-
- for x in cycleL:
- if getState == x[1]:
- number = [n[1] for n in cycleL]
- getMax = max(number)
- nextNum = x[0]+1
-
- if nextNum > getMax:
- getDict[cVars] = cycleList[0]
- joinStr = [mode,",",str(getDict), '\n']
- newLine = ''.join(joinStr)
- getList[d[0]] = newLine
- print (getDict)
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- general.set_cvar(cVars, cycleList[0])
- else:
- getDict[cVars] = cycleList[x[0]+1]
- joinStr = [mode,",",str(getDict), '\n']
- newLine = ''.join(joinStr)
- getList[d[0]] = newLine
- print (getDict)
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- general.set_cvar(cVars, cycleList[x[0]+1])
-
-def cycleCvarsValue(log, state, mode, cVars, cycleList):
- logList = getLogList(logfile)
- checkList = getCheckList(ctrlFile)
- cycleCvarsRestartCheck(logList[1],checkList, mode, cVars, cycleList, ctrlFile)
-
-def cycleCvarsFloatValue(cVars, cycleList):
- currentValueAsString = general.get_cvar(cVars)
- try:
- currentValue = float(currentValueAsString)
- except:
- currentValue = -1.0
-
- saveDefaultValue(cVars, currentValue)
-
- # make sure we sort the list in ascending fashion
- cycleList = sorted(cycleList)
-
- # find out what the next closest index is
- newIndex = 0
- for x in cycleList:
- if (currentValue < x):
- break
- newIndex = newIndex + 1
-
- # loop around, if we need to
- if newIndex >= len(cycleList):
- newIndex = 0
-
- general.set_cvar(cVars, cycleList[newIndex])
-
-
-def cycleCvarsIntValue(cVars, cycleList):
- currentValueAsString = general.get_cvar(cVars)
- try:
- currentValue = int(currentValueAsString)
- except:
- currentValue = 0
-
- saveDefaultValue(cVars, currentValue)
-
- # find out what index we're on already
- # default to -1 so that when we increment to the next, we'll be at 0
- newIndex = -1
- for x in cycleList:
- if (currentValue == x):
- break
- newIndex = newIndex + 1
-
- # move to the next item
- newIndex = newIndex + 1
-
- # validate
- if newIndex >= len(cycleList):
- newIndex = 0
-
- general.set_cvar(cVars, cycleList[newIndex])
-
-#cycleConsol----------------------------------------------------------------------#
-
-def cycleConsolRestartCheck(log, state, mode, cycleList, ctrlFile):
- if log in state:
- cycleConsolV(mode, cycleList, ctrlFile)
- else:
- stateList = open(ctrlFile, 'w')
- stateList.write(log)
- stateList = open(ctrlFile, 'r')
- cycleConsolV(mode, cycleList, ctrlFile)
-
-def cycleConsolV(mode, cycleList, ctrlFile):
- stateList = open(ctrlFile, 'r')
- setState = [x for x in enumerate(stateList)]
- blankCheck = [x for x in setState]
- getList = [x for x in stateList]
-
- if blankCheck == []:
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str("%s,'%s'" % (mode, cycleList[0]))+'\n'))
- general.run_console(cycleList[0])
- else:
- stateList = open(ctrlFile, 'r')
- checkFor = str([x for x in stateList])
-
- if mode not in str(checkFor):
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
- getList.insert(1, str("%s,'%s'\n" % (mode, cycleList[0])))
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(getList))
- general.run_console(cycleList[0])
-
- else:
- stateList = open(ctrlFile, 'r')
- for d in enumerate(stateList):
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
- values = d[1].split(',')
-
- if mode in values[0]:
- newValue = ''.join(values[1].split('\n'))
- cycleL = [e for e in enumerate(cycleList)]
- getDict = ''.join(values[1].split('\n'))
-
- for x in cycleL:
-
- if newValue in "'%s'" % x[1]:
- number = [n[0] for n in cycleL]
- getMax = max(number)
- nextNum = x[0]+1
-
- if nextNum > getMax:
- getDict = '%s' % cycleList[0]
- joinStr = [mode,",","'",getDict,"'", '\n']
- newLine = ''.join(joinStr)
- getList[d[0]] = newLine
- print (getDict)
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- general.run_console(getDict)
- else:
- getDict = '%s' % cycleList[x[0]+1]
- joinStr = [mode,",","'",getDict,"'", '\n']
- newLine = ''.join(joinStr)
- getList[d[0]] = newLine
- print (getDict)
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- general.run_console(getDict)
-
-def cycleConsolValue(mode, cycleList):
- logList = getLogList(logfile)
- checkList = getCheckList(ctrlFile)
- cycleConsolRestartCheck(logList[1],checkList, mode, cycleList, ctrlFile)
-
-def toggleHideMaskValues(type):
- cVars = "%s%s" % (HIDDEN_MASK_PREFIX, type)
- currentValue = general.get_hidemask(type)
- saveDefaultValue(cVars, int(currentValue))
- if (currentValue):
- general.set_hidemask(type, 0)
- else:
- general.set_hidemask(type, 1)
-
-#toggleHide------------------------------------------------------------------------#
-
-def toggleHideRestartCheck(log, state, mode, type, onValue, offValue, ctrlFile):
- if log in state:
- toggleHideByT(mode, type, onValue, offValue, ctrlFile)
- else:
- stateList = open(ctrlFile, 'w')
- stateList.write(log)
- stateList = open(ctrlFile, 'r')
- toggleHideByT(mode, type, onValue, offValue, ctrlFile)
-
-def toggleHideByType(mode, type, onValue, offValue):
- logList = getLogList(logfile)
- checkList = getCheckList(ctrlFile)
- toggleHideRestartCheck(logList[1],checkList, mode, type, onValue, offValue, ctrlFile)
-
-def toggleHideByT(mode, type, onValue, offValue, ctrlFile):
- stateList = open(ctrlFile, 'r')
- setState = [x for x in enumerate(stateList)]
- blankCheck = [x for x in setState]
- getList = [x for x in stateList]
-
- if blankCheck == []:
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str("%s,{'%s': %s}" % (mode, type, offValue))+'\n'))
-
- hideByType(type)
- else:
- stateList = open(ctrlFile, 'r')
- checkFor = str([x for x in stateList])
-
- if mode not in str(checkFor):
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
- getList.insert(1, str("%s,{'%s': %s}\n" % (mode, type , offValue)))
- print (str("{'%s': %s}\n" % (type , offValue)))
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(getList))
- hideByType(type)
-
- else:
- stateList = open(ctrlFile, 'r')
- for d in enumerate(stateList):
- values = d[1].split(',')
- stateList = open(ctrlFile, 'r')
- getList = [x for x in stateList]
-
- if mode in values[0]:
- getDict = ast.literal_eval(values[1])
- getState = getDict.get(type)
-
- if getState == offValue:
- getDict[type] = onValue
- joinStr = [mode,",",str(getDict), '\n']
- newLine = ''.join(joinStr)
- print (getDict)
- getList[d[0]] = newLine
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- unHideByType(type)
- else:
- getDict[type] = offValue
- joinStr = [mode,",",str(getDict), '\n']
- newLine = ''.join(joinStr)
- print (getDict)
- getList[d[0]] = newLine
- stateList = open(ctrlFile, 'w')
- stateList.write(''.join(str(''.join(getList))))
- hideByType(type)
-
-def hideByType(type):
- typeList = general.get_all_objects(str(type), "")
- for x in typeList:
- general.hide_object(x)
-
-def unHideByType(type):
- typeList = general.get_all_objects(str(type), "")
- for x in typeList:
- general.unhide_object(x)
diff --git a/AutomatedTesting/Editor/Scripts/auto_lod.py b/AutomatedTesting/Editor/Scripts/auto_lod.py
new file mode 100644
index 0000000000..058303242a
--- /dev/null
+++ b/AutomatedTesting/Editor/Scripts/auto_lod.py
@@ -0,0 +1,124 @@
+#
+# 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
+#
+#
+import os, traceback, binascii, sys, json, pathlib, logging
+import azlmbr.math
+import azlmbr.bus
+from scene_helpers import *
+
+#
+# SceneAPI Processor
+#
+
+def update_manifest(scene):
+ import uuid
+ import azlmbr.scene as sceneApi
+ import azlmbr.scene.graph
+ from scene_api import scene_data as sceneData
+
+ graph = sceneData.SceneGraph(scene.graph)
+ # Get a list of all the mesh nodes, as well as all the nodes
+ mesh_name_list, all_node_paths = get_mesh_node_names(graph)
+ mesh_name_list.sort(key=lambda node: str.casefold(node.get_path()))
+ scene_manifest = sceneData.SceneManifest()
+
+ clean_filename = scene.sourceFilename.replace('.', '_')
+
+ # Compute the filename of the scene file
+ source_basepath = scene.watchFolder
+ source_relative_path = os.path.dirname(os.path.relpath(clean_filename, source_basepath))
+ source_filename_only = os.path.basename(clean_filename)
+
+ created_entities = []
+ previous_entity_id = azlmbr.entity.InvalidEntityId
+ first_mesh = True
+
+ # Make a list of mesh node paths
+ mesh_path_list = list(map(lambda node: node.get_path(), mesh_name_list))
+
+ # Assume the first mesh is the main mesh
+ main_mesh = mesh_name_list[0]
+ mesh_path = main_mesh.get_path()
+
+ # Create a unique mesh group name using the filename + node name
+ mesh_group_name = '{}_{}'.format(source_filename_only, main_mesh.get_name())
+ # Remove forbidden filename characters from the name since this will become a file on disk later
+ mesh_group_name = "".join(char for char in mesh_group_name if char not in "|<>:\"/?*\\")
+ # Add the MeshGroup to the manifest and give it a unique ID
+ mesh_group = scene_manifest.add_mesh_group(mesh_group_name)
+ mesh_group['id'] = '{' + str(uuid.uuid5(uuid.NAMESPACE_DNS, source_filename_only + mesh_path)) + '}'
+ # Set our current node as the only node that is included in this MeshGroup
+ scene_manifest.mesh_group_select_node(mesh_group, mesh_path)
+
+ # Explicitly remove all other nodes to prevent implicit inclusions
+ for node in mesh_path_list:
+ if node != mesh_path:
+ scene_manifest.mesh_group_unselect_node(mesh_group, node)
+
+ # Create a LOD rule
+ lod_rule = scene_manifest.mesh_group_add_lod_rule(mesh_group)
+
+ # Loop all the mesh nodes after the first
+ for x in mesh_path_list[1:]:
+ # Add a new LOD level
+ lod = scene_manifest.lod_rule_add_lod(lod_rule)
+ # Select the current mesh for this LOD level
+ scene_manifest.lod_select_node(lod, x)
+
+ # Unselect every other mesh for this LOD level
+ for y in mesh_path_list:
+ if y != x:
+ scene_manifest.lod_unselect_node(lod, y)
+
+ # Create an editor entity
+ entity_id = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "CreateEditorReadyEntity", mesh_group_name)
+ # Add an EditorMeshComponent to the entity
+ editor_mesh_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName", entity_id, "AZ::Render::EditorMeshComponent")
+ # Set the ModelAsset assetHint to the relative path of the input asset + the name of the MeshGroup we just created + the azmodel extension
+ # The MeshGroup we created will be output as a product in the asset's path named mesh_group_name.azmodel
+ # The assetHint will be converted to an AssetId later during prefab loading
+ json_update = json.dumps({
+ "Controller": { "Configuration": { "ModelAsset": {
+ "assetHint": os.path.join(source_relative_path, mesh_group_name) + ".azmodel" }}}
+ });
+ # Apply the JSON above to the component we created
+ result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id, editor_mesh_component, json_update)
+
+ if not result:
+ raise RuntimeError("UpdateComponentForEntity failed for Mesh component")
+
+ create_prefab(scene_manifest, source_filename_only, [entity_id])
+
+ # Convert the manifest to a JSON string and return it
+ new_manifest = scene_manifest.export()
+
+ return new_manifest
+
+sceneJobHandler = None
+
+def on_update_manifest(args):
+ try:
+ scene = args[0]
+ return update_manifest(scene)
+ except RuntimeError as err:
+ print (f'ERROR - {err}')
+ log_exception_traceback()
+ except:
+ log_exception_traceback()
+
+ global sceneJobHandler
+ sceneJobHandler = None
+
+# try to create SceneAPI handler for processing
+try:
+ import azlmbr.scene as sceneApi
+ if (sceneJobHandler == None):
+ sceneJobHandler = sceneApi.ScriptBuildingNotificationBusHandler()
+ sceneJobHandler.connect()
+ sceneJobHandler.add_callback('OnUpdateManifest', on_update_manifest)
+except:
+ sceneJobHandler = None
diff --git a/AutomatedTesting/Editor/Scripts/scene_helpers.py b/AutomatedTesting/Editor/Scripts/scene_helpers.py
new file mode 100644
index 0000000000..761068e796
--- /dev/null
+++ b/AutomatedTesting/Editor/Scripts/scene_helpers.py
@@ -0,0 +1,95 @@
+"""
+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
+"""
+
+import traceback, logging, json
+from typing import Tuple, List
+
+import azlmbr.bus
+from scene_api import scene_data as sceneData
+from scene_api.scene_data import SceneGraphName
+
+
+def log_exception_traceback():
+ """
+ Outputs an exception stacktrace.
+ """
+ data = traceback.format_exc()
+ logger = logging.getLogger('python')
+ logger.error(data)
+
+
+def sanitize_name_for_disk(name: str):
+ """
+ Removes illegal filename characters from a string.
+
+ :param name: String to clean.
+ :return: Name with illegal characters removed.
+ """
+ return "".join(char for char in name if char not in "|<>:\"/?*\\")
+
+
+def get_mesh_node_names(scene_graph: sceneData.SceneGraph) -> Tuple[List[SceneGraphName], List[str]]:
+ """
+ Returns a tuple of all the mesh nodes as well as all the node paths
+
+ :param scene_graph: Scene graph to search
+ :return: Tuple of [Mesh Nodes, All Node Paths]
+ """
+ import azlmbr.scene as sceneApi
+ import azlmbr.scene.graph
+
+ mesh_data_list = []
+ node = scene_graph.get_root()
+ children = []
+ paths = []
+
+ while node.IsValid():
+ # store children to process after siblings
+ if scene_graph.has_node_child(node):
+ children.append(scene_graph.get_node_child(node))
+
+ node_name = sceneData.SceneGraphName(scene_graph.get_node_name(node))
+ paths.append(node_name.get_path())
+
+ # store any node that has mesh data content
+ node_content = scene_graph.get_node_content(node)
+ if node_content.CastWithTypeName('MeshData'):
+ if scene_graph.is_node_end_point(node) is False:
+ if len(node_name.get_path()):
+ mesh_data_list.append(sceneData.SceneGraphName(scene_graph.get_node_name(node)))
+
+ # advance to next node
+ if scene_graph.has_node_sibling(node):
+ node = scene_graph.get_node_sibling(node)
+ elif children:
+ node = children.pop()
+ else:
+ node = azlmbr.scene.graph.NodeIndex()
+
+ return mesh_data_list, paths
+
+
+def create_prefab(scene_manifest: sceneData.SceneManifest, prefab_name: str, entities: list) -> None:
+ prefab_filename = prefab_name + ".prefab"
+ created_template_id = azlmbr.prefab.PrefabSystemScriptingBus(azlmbr.bus.Broadcast, "CreatePrefab", entities,
+ prefab_filename)
+
+ if created_template_id is None or created_template_id == azlmbr.prefab.InvalidTemplateId:
+ raise RuntimeError("CreatePrefab {} failed".format(prefab_filename))
+
+ # Convert the prefab to a JSON string
+ output = azlmbr.prefab.PrefabLoaderScriptingBus(azlmbr.bus.Broadcast, "SaveTemplateToString", created_template_id)
+
+ if output is not None and output.IsSuccess():
+ json_string = output.GetValue()
+ uuid = azlmbr.math.Uuid_CreateRandom().ToString()
+ json_result = json.loads(json_string)
+ # Add a PrefabGroup to the manifest and store the JSON on it
+ scene_manifest.add_prefab_group(prefab_name, uuid, json_result)
+ else:
+ raise RuntimeError(
+ "SaveTemplateToString failed for template id {}, prefab {}".format(created_template_id, prefab_filename))
diff --git a/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py b/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py
index e832b1f82b..db8df09091 100644
--- a/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py
+++ b/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py
@@ -5,55 +5,17 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT
#
#
-import os, traceback, binascii, sys, json, pathlib
-import azlmbr.math
import azlmbr.bus
+import azlmbr.math
+
+from scene_api.scene_data import PrimitiveShape, DecompositionMode
+from scene_helpers import *
+
#
# SceneAPI Processor
#
-
-def log_exception_traceback():
- exc_type, exc_value, exc_tb = sys.exc_info()
- data = traceback.format_exception(exc_type, exc_value, exc_tb)
- print(str(data))
-
-def get_mesh_node_names(sceneGraph):
- import azlmbr.scene as sceneApi
- import azlmbr.scene.graph
- from scene_api import scene_data as sceneData
-
- meshDataList = []
- node = sceneGraph.get_root()
- children = []
- paths = []
-
- while node.IsValid():
- # store children to process after siblings
- if sceneGraph.has_node_child(node):
- children.append(sceneGraph.get_node_child(node))
-
- nodeName = sceneData.SceneGraphName(sceneGraph.get_node_name(node))
- paths.append(nodeName.get_path())
-
- # store any node that has mesh data content
- nodeContent = sceneGraph.get_node_content(node)
- if nodeContent.CastWithTypeName('MeshData'):
- if sceneGraph.is_node_end_point(node) is False:
- if (len(nodeName.get_path())):
- meshDataList.append(sceneData.SceneGraphName(sceneGraph.get_node_name(node)))
-
- # advance to next node
- if sceneGraph.has_node_sibling(node):
- node = sceneGraph.get_node_sibling(node)
- elif children:
- node = children.pop()
- else:
- node = azlmbr.scene.graph.NodeIndex()
-
- return meshDataList, paths
-
def add_material_component(entity_id):
# Create an override AZ::Render::EditorMaterialComponent
editor_material_component = azlmbr.entity.EntityUtilityBus(
@@ -64,24 +26,53 @@ def add_material_component(entity_id):
# this fills out the material asset to a known product AZMaterial asset relative path
json_update = json.dumps({
- "Controller": { "Configuration": { "materials": [
- {
- "Key": {},
- "Value": { "MaterialAsset":{
- "assetHint": "materials/basic_grey.azmaterial"
- }}
- }]
- }}
- });
- result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id, editor_material_component, json_update)
+ "Controller": {"Configuration": {"materials": [
+ {
+ "Key": {},
+ "Value": {"MaterialAsset": {
+ "assetHint": "materials/basic_grey.azmaterial"
+ }}
+ }]
+ }}
+ })
+ result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id,
+ editor_material_component, json_update)
if not result:
raise RuntimeError("UpdateComponentForEntity for editor_material_component failed")
+
+def add_physx_meshes(scene_manifest: sceneData.SceneManifest, source_file_name: str, mesh_name_list: List, all_node_paths: List[str]):
+ first_mesh = mesh_name_list[0].get_path()
+
+ # Add a Box Primitive PhysX mesh with a comment
+ physx_box = scene_manifest.add_physx_primitive_mesh_group(source_file_name + "_box", PrimitiveShape.BOX, 0.0, None)
+ scene_manifest.physx_mesh_group_add_comment(physx_box, "This is a box primitive")
+ # Select the first mesh, unselect every other node
+ scene_manifest.physx_mesh_group_add_selected_node(physx_box, first_mesh)
+
+ for node in all_node_paths:
+ if node != first_mesh:
+ scene_manifest.physx_mesh_group_add_unselected_node(physx_box, node)
+
+ # Add a Convex Mesh PhysX mesh with a comment
+ convex_mesh = scene_manifest.add_physx_convex_mesh_group(source_file_name + "_convex", 0.08, .0004,
+ True, True, True, True, True, 24, True, "Glass")
+ scene_manifest.physx_mesh_group_add_comment(convex_mesh, "This is a convex mesh")
+ # Select/Unselect nodes using lists
+ all_except_first_mesh = [x for x in all_node_paths if x != first_mesh]
+ scene_manifest.physx_mesh_group_add_selected_unselected_nodes(convex_mesh, [first_mesh], all_except_first_mesh)
+
+ # Configure mesh decomposition for this mesh
+ scene_manifest.physx_mesh_group_decompose_meshes(convex_mesh, 512, 32, .002, 100100, DecompositionMode.TETRAHEDRON,
+ 0.06, 0.055, 0.00015, 3, 3, True, False)
+
+ # Add a Triangle mesh
+ triangle = scene_manifest.add_physx_triangle_mesh_group(source_file_name + "_triangle", False, True, True, True, True, True)
+ scene_manifest.physx_mesh_group_add_selected_unselected_nodes(triangle, [first_mesh], all_except_first_mesh)
+
def update_manifest(scene):
- import json
import uuid, os
- import azlmbr.scene as sceneApi
import azlmbr.scene.graph
from scene_api import scene_data as sceneData
@@ -89,9 +80,9 @@ def update_manifest(scene):
# Get a list of all the mesh nodes, as well as all the nodes
mesh_name_list, all_node_paths = get_mesh_node_names(graph)
scene_manifest = sceneData.SceneManifest()
-
+
clean_filename = scene.sourceFilename.replace('.', '_')
-
+
# Compute the filename of the scene file
source_basepath = scene.watchFolder
source_relative_path = os.path.dirname(os.path.relpath(clean_filename, source_basepath))
@@ -101,6 +92,8 @@ def update_manifest(scene):
previous_entity_id = azlmbr.entity.InvalidEntityId
first_mesh = True
+ add_physx_meshes(scene_manifest, source_filename_only, mesh_name_list, all_node_paths)
+
# Loop every mesh node in the scene
for activeMeshIndex in range(len(mesh_name_list)):
mesh_name = mesh_name_list[activeMeshIndex]
@@ -108,52 +101,82 @@ def update_manifest(scene):
# Create a unique mesh group name using the filename + node name
mesh_group_name = '{}_{}'.format(source_filename_only, mesh_name.get_name())
# Remove forbidden filename characters from the name since this will become a file on disk later
- mesh_group_name = "".join(char for char in mesh_group_name if char not in "|<>:\"/?*\\")
+ mesh_group_name = sanitize_name_for_disk(mesh_group_name)
# Add the MeshGroup to the manifest and give it a unique ID
mesh_group = scene_manifest.add_mesh_group(mesh_group_name)
mesh_group['id'] = '{' + str(uuid.uuid5(uuid.NAMESPACE_DNS, source_filename_only + mesh_path)) + '}'
# Set our current node as the only node that is included in this MeshGroup
scene_manifest.mesh_group_select_node(mesh_group, mesh_path)
+ scene_manifest.mesh_group_add_comment(mesh_group, "Hello World")
# Explicitly remove all other nodes to prevent implicit inclusions
for node in all_node_paths:
if node != mesh_path:
scene_manifest.mesh_group_unselect_node(mesh_group, node)
+ scene_manifest.mesh_group_add_cloth_rule(mesh_group, mesh_path, "Col0", 1, "Col0", 2, "Col0", 2, 3)
+ scene_manifest.mesh_group_add_advanced_mesh_rule(mesh_group, True, False, True, "Col0")
+ scene_manifest.mesh_group_add_skin_rule(mesh_group, 3, 0.002)
+ scene_manifest.mesh_group_add_tangent_rule(mesh_group, 1, 0)
+
# Create an editor entity
entity_id = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "CreateEditorReadyEntity", mesh_group_name)
# Add an EditorMeshComponent to the entity
- editor_mesh_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName", entity_id, "AZ::Render::EditorMeshComponent")
- # Set the ModelAsset assetHint to the relative path of the input asset + the name of the MeshGroup we just created + the azmodel extension
- # The MeshGroup we created will be output as a product in the asset's path named mesh_group_name.azmodel
- # The assetHint will be converted to an AssetId later during prefab loading
+ editor_mesh_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName",
+ entity_id, "AZ::Render::EditorMeshComponent")
+ # Set the ModelAsset assetHint to the relative path of the input asset + the name of the MeshGroup we just
+ # created + the azmodel extension The MeshGroup we created will be output as a product in the asset's path
+ # named mesh_group_name.azmodel The assetHint will be converted to an AssetId later during prefab loading
json_update = json.dumps({
- "Controller": { "Configuration": { "ModelAsset": {
- "assetHint": os.path.join(source_relative_path, mesh_group_name) + ".azmodel" }}}
- });
+ "Controller": {"Configuration": {"ModelAsset": {
+ "assetHint": os.path.join(source_relative_path, mesh_group_name) + ".azmodel"}}}
+ })
# Apply the JSON above to the component we created
- result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id, editor_mesh_component, json_update)
+ result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id,
+ editor_mesh_component, json_update)
if not result:
raise RuntimeError("UpdateComponentForEntity failed for Mesh component")
+ # Add a physics component referencing the triangle mesh we made for the first node
+ if previous_entity_id is None:
+ physx_mesh_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName",
+ entity_id, "{FD429282-A075-4966-857F-D0BBF186CFE6} EditorColliderComponent")
+
+ json_update = json.dumps({
+ "ShapeConfiguration": {
+ "PhysicsAsset": {
+ "Asset": {
+ "assetHint": os.path.join(source_relative_path, source_filename_only + "_triangle.pxmesh")
+ }
+ }
+ }
+ })
+
+ result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id, physx_mesh_component, json_update)
+
+ if not result:
+ raise RuntimeError("UpdateComponentForEntity failed for PhysX mesh component")
+
# an example of adding a material component to override the default material
if previous_entity_id is not None and first_mesh:
first_mesh = False
add_material_component(entity_id)
# Get the transform component
- transform_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName", entity_id, "27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0")
+ transform_component = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "GetOrAddComponentByTypeName",
+ entity_id, "27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0")
# Set this entity to be a child of the last entity we created
# This is just an example of how to do parenting and isn't necessarily useful to parent everything like this
if previous_entity_id is not None:
transform_json = json.dumps({
- "Parent Entity" : previous_entity_id.to_json()
- });
+ "Parent Entity": previous_entity_id.to_json()
+ })
# Apply the JSON update
- result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id, transform_component, transform_json)
+ result = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "UpdateComponentForEntity", entity_id,
+ transform_component, transform_json)
if not result:
raise RuntimeError("UpdateComponentForEntity failed for Transform component")
@@ -165,37 +188,23 @@ def update_manifest(scene):
created_entities.append(entity_id)
# Create a prefab with all our entities
- prefab_filename = source_filename_only + ".prefab"
- created_template_id = azlmbr.prefab.PrefabSystemScriptingBus(azlmbr.bus.Broadcast, "CreatePrefab", created_entities, prefab_filename)
-
- if created_template_id == azlmbr.prefab.InvalidTemplateId:
- raise RuntimeError("CreatePrefab {} failed".format(prefab_filename))
-
- # Convert the prefab to a JSON string
- output = azlmbr.prefab.PrefabLoaderScriptingBus(azlmbr.bus.Broadcast, "SaveTemplateToString", created_template_id)
-
- if output.IsSuccess():
- jsonString = output.GetValue()
- uuid = azlmbr.math.Uuid_CreateRandom().ToString()
- jsonResult = json.loads(jsonString)
- # Add a PrefabGroup to the manifest and store the JSON on it
- scene_manifest.add_prefab_group(source_filename_only, uuid, jsonResult)
- else:
- raise RuntimeError("SaveTemplateToString failed for template id {}, prefab {}".format(created_template_id, prefab_filename))
+ create_prefab(scene_manifest, source_filename_only, created_entities)
# Convert the manifest to a JSON string and return it
new_manifest = scene_manifest.export()
return new_manifest
+
sceneJobHandler = None
+
def on_update_manifest(args):
try:
scene = args[0]
return update_manifest(scene)
except RuntimeError as err:
- print (f'ERROR - {err}')
+ print(f'ERROR - {err}')
log_exception_traceback()
except:
log_exception_traceback()
@@ -203,10 +212,12 @@ def on_update_manifest(args):
global sceneJobHandler
sceneJobHandler = None
+
# try to create SceneAPI handler for processing
try:
import azlmbr.scene as sceneApi
- if (sceneJobHandler == None):
+
+ if sceneJobHandler is None:
sceneJobHandler = sceneApi.ScriptBuildingNotificationBusHandler()
sceneJobHandler.connect()
sceneJobHandler.add_callback('OnUpdateManifest', on_update_manifest)
diff --git a/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml b/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml
index 12c222add6..46d6191835 100644
--- a/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml
+++ b/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml
@@ -13,4 +13,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
index 292bb9c19c..f0bb6e72ca 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py
@@ -12,6 +12,7 @@ import pytest
import ly_test_tools.environment.file_system as file_system
import editor_python_test_tools.hydra_test_utils as hydra
+from ly_test_tools.o3de.editor_test import EditorSharedTest, EditorTestSuite
from Atom.atom_utils.atom_constants import LIGHT_TYPES
logger = logging.getLogger(__name__)
@@ -159,3 +160,17 @@ class TestMaterialEditorBasicTests(object):
enable_prefab_system=False,
)
+
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+@pytest.mark.parametrize("launcher_platform", ['windows_editor'])
+class TestAutomation(EditorTestSuite):
+
+ enable_prefab_system = False
+
+ @pytest.mark.test_case_id("C36529666")
+ class AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded(EditorSharedTest):
+ from Atom.tests import hydra_AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded as test_module
+
+ @pytest.mark.test_case_id("C36525660")
+ class AtomEditorComponentsLevel_DisplayMapperAdded(EditorSharedTest):
+ from Atom.tests import hydra_AtomEditorComponentsLevel_DisplayMapperAdded as test_module
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py
index 400349c5ee..e6d6ac7fb1 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py
@@ -18,12 +18,20 @@ LIGHT_TYPES = {
'simple_spot': 7,
}
+
# Attenuation Radius Mode options for the Light component.
ATTENUATION_RADIUS_MODE = {
'automatic': 1,
'explicit': 0,
}
+# Qualiity Level settings for Diffuse Global Illumination level component
+GLOBAL_ILLUMINATION_QUALITY = {
+ 'Low': 0,
+ 'Medium': 1,
+ 'High': 2,
+}
+
class AtomComponentProperties:
"""
@@ -122,6 +130,21 @@ class AtomComponentProperties:
}
return properties[property]
+ @staticmethod
+ def diffuse_global_illumination(property: str = 'name') -> str:
+ """
+ Diffuse Global Illumination level component properties.
+ Controls global settings for Diffuse Probe Grid components.
+ - 'Quality Level' from atom_constants.py GLOBAL_ILLUMINATION_QUALITY
+ :param property: From the last element of the property tree path. Default 'name' for component name string.
+ :return: Full property path OR component name if no property specified.
+ """
+ properties = {
+ 'name': 'Diffuse Global Illumination',
+ 'Quality Level': 'Controller|Configuration|Quality Level'
+ }
+ return properties[property]
+
@staticmethod
def diffuse_probe_grid(property: str = 'name') -> str:
"""
@@ -154,12 +177,17 @@ class AtomComponentProperties:
@staticmethod
def display_mapper(property: str = 'name') -> str:
"""
- Display Mapper component properties.
+ Display Mapper level component properties.
+ - 'Enable LDR color grading LUT' toggles the use of LDR color grading LUT
+ - 'LDR color Grading LUT' is the Low Definition Range (LDR) color grading for Look-up Textures (LUT) which is
+ an Asset.id value corresponding to a lighting asset file.
:param property: From the last element of the property tree path. Default 'name' for component name string.
:return: Full property path OR component name if no property specified.
"""
properties = {
'name': 'Display Mapper',
+ 'Enable LDR color grading LUT': 'Controller|Configuration|Enable LDR color grading LUT',
+ 'LDR color Grading LUT': 'Controller|Configuration|LDR color Grading LUT',
}
return properties[property]
@@ -410,7 +438,7 @@ class AtomComponentProperties:
'name': 'PostFX Shape Weight Modifier',
'requires': [AtomComponentProperties.postfx_layer()],
'shapes': ['Axis Aligned Box Shape', 'Box Shape', 'Capsule Shape', 'Compound Shape', 'Cylinder Shape',
- 'Disk Shape', 'Polygon Prism Shape', 'Quad Shape', 'Sphere Shape', 'Vegetation Reference Shape'],
+ 'Disk Shape', 'Polygon Prism Shape', 'Quad Shape', 'Sphere Shape', 'Shape Reference'],
}
return properties[property]
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded.py
new file mode 100644
index 0000000000..ddcd5c3c46
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponentsLevel_DiffuseGlobalIlluminationAdded.py
@@ -0,0 +1,109 @@
+"""
+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
+"""
+
+class Tests:
+ creation_undo = (
+ "UNDO Level component addition success",
+ "UNDO Level component addition failed")
+ creation_redo = (
+ "REDO Level component addition success",
+ "REDO Level component addition failed")
+ diffuse_global_illumination_component = (
+ "Level has a Diffuse Global Illumination component",
+ "Level failed to find Diffuse Global Illumination component")
+ diffuse_global_illumination_quality = (
+ "Quality Level set",
+ "Quality Level could not be set")
+ enter_game_mode = (
+ "Entered game mode",
+ "Failed to enter game mode")
+ exit_game_mode = (
+ "Exited game mode",
+ "Couldn't exit game mode")
+
+
+def AtomEditorComponentsLevel_DiffuseGlobalIllumination_AddedToEntity():
+ """
+ Summary:
+ Tests the Diffuse Global Illumination level component can be added to the level entity and is stable.
+
+ Test setup:
+ - Wait for Editor idle loop.
+ - Open the "Base" level.
+
+ Expected Behavior:
+ The component can be added, used in game mode, and has accurate required components.
+ Creation and deletion undo/redo should also work.
+
+ Test Steps:
+ 1) Add Diffuse Global Illumination level component to the level entity.
+ 2) UNDO the level component addition.
+ 3) REDO the level component addition.
+ 4) Set Quality Level property to Low
+ 5) Enter/Exit game mode.
+ 6) Look for errors and asserts.
+
+ :return: None
+ """
+
+ import azlmbr.legacy.general as general
+
+ from editor_python_test_tools.editor_entity_utils import EditorLevelEntity
+ from editor_python_test_tools.utils import Report, Tracer, TestHelper
+ from Atom.atom_utils.atom_constants import AtomComponentProperties, GLOBAL_ILLUMINATION_QUALITY
+
+ with Tracer() as error_tracer:
+ # Test setup begins.
+ # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
+ TestHelper.init_idle()
+ TestHelper.open_level("", "Base")
+
+ # Test steps begin.
+ # 1. Add Diffuse Global Illumination level component to the level entity.
+ diffuse_global_illumination_component = EditorLevelEntity.add_component(
+ AtomComponentProperties.diffuse_global_illumination())
+ Report.critical_result(
+ Tests.diffuse_global_illumination_component,
+ EditorLevelEntity.has_component(AtomComponentProperties.diffuse_global_illumination()))
+
+ # 2. UNDO the level component addition.
+ # -> UNDO component addition.
+ general.undo()
+ general.idle_wait_frames(1)
+ Report.result(Tests.creation_undo,
+ not EditorLevelEntity.has_component(AtomComponentProperties.diffuse_global_illumination()))
+
+ # 3. REDO the level component addition.
+ # -> REDO component addition.
+ general.redo()
+ general.idle_wait_frames(1)
+ Report.result(Tests.creation_redo,
+ EditorLevelEntity.has_component(AtomComponentProperties.diffuse_global_illumination()))
+
+ # 4. Set Quality Level property to Low
+ diffuse_global_illumination_component.set_component_property_value(
+ AtomComponentProperties.diffuse_global_illumination('Quality Level', GLOBAL_ILLUMINATION_QUALITY['Low']))
+ quality = diffuse_global_illumination_component.get_component_property_value(
+ AtomComponentProperties.diffuse_global_illumination('Quality Level'))
+ Report.result(diffuse_global_illumination_quality, quality == GLOBAL_ILLUMINATION_QUALITY['Low'])
+
+ # 5. Enter/Exit game mode.
+ TestHelper.enter_game_mode(Tests.enter_game_mode)
+ general.idle_wait_frames(1)
+ TestHelper.exit_game_mode(Tests.exit_game_mode)
+
+ # 6. Look for errors and 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(AtomEditorComponentsLevel_DiffuseGlobalIllumination_AddedToEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponentsLevel_DisplayMapperAdded.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponentsLevel_DisplayMapperAdded.py
new file mode 100644
index 0000000000..c050dd76d4
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponentsLevel_DisplayMapperAdded.py
@@ -0,0 +1,124 @@
+"""
+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
+"""
+
+
+class Tests:
+ creation_undo = (
+ "UNDO level component addition success",
+ "UNDO level component addition failed")
+ creation_redo = (
+ "REDO Level component addition success",
+ "REDO Level component addition failed")
+ display_mapper_component = (
+ "Level has a Display Mapper component",
+ "Level failed to find Display Mapper component")
+ ldr_color_grading_lut = (
+ "LDR color Grading LUT asset set",
+ "LDR color Grading LUT asset could not be set")
+ enable_ldr_color_grading_lut = (
+ "Enable LDR color grading LUT set",
+ "Enable LDR color grading LUT could not be set")
+ enter_game_mode = (
+ "Entered game mode",
+ "Failed to enter game mode")
+ exit_game_mode = (
+ "Exited game mode",
+ "Couldn't exit game mode")
+
+
+def AtomEditorComponentsLevel_DisplayMapper_AddedToEntity():
+ """
+ Summary:
+ Tests the Display Mapper level component can be added to the level entity and has the expected functionality.
+
+ Test setup:
+ - Wait for Editor idle loop.
+ - Open the "Base" level.
+
+ Expected Behavior:
+ The component can be added, used in game mode, and has accurate required components.
+ Creation and deletion undo/redo should also work.
+
+ Test Steps:
+ 1) Add Display Mapper level component to the level entity.
+ 2) UNDO the level component addition.
+ 3) REDO the level component addition.
+ 4) Set LDR color Grading LUT asset.
+ 5) Set Enable LDR color grading LUT property True
+ 6) Enter/Exit game mode.
+ 7) Look for errors and asserts.
+
+ :return: None
+ """
+ import os
+
+ import azlmbr.legacy.general as general
+
+ from editor_python_test_tools.asset_utils import Asset
+ from editor_python_test_tools.editor_entity_utils import EditorLevelEntity
+ from editor_python_test_tools.utils import Report, Tracer, TestHelper
+ from Atom.atom_utils.atom_constants import AtomComponentProperties
+
+ with Tracer() as error_tracer:
+ # Test setup begins.
+ # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level.
+ TestHelper.init_idle()
+ TestHelper.open_level("", "Base")
+
+ # Test steps begin.
+ # 1. Add Display Mapper level component to the level entity.
+ display_mapper_component = EditorLevelEntity.add_component(AtomComponentProperties.display_mapper())
+ Report.critical_result(
+ Tests.display_mapper_component,
+ EditorLevelEntity.has_component(AtomComponentProperties.display_mapper()))
+
+ # 2. UNDO the level component addition.
+ # -> UNDO component addition.
+ general.undo()
+ general.idle_wait_frames(1)
+ Report.result(Tests.creation_undo, not EditorLevelEntity.has_component(AtomComponentProperties.display_mapper()))
+
+ # 3. REDO the level component addition.
+ # -> REDO component addition.
+ general.redo()
+ general.idle_wait_frames(1)
+ Report.result(Tests.creation_redo, EditorLevelEntity.has_component(AtomComponentProperties.display_mapper()))
+
+ # 4. Set LDR color Grading LUT asset.
+ display_mapper_asset_path = os.path.join("TestData", "test.lightingpreset.azasset")
+ display_mapper_asset = Asset.find_asset_by_path(display_mapper_asset_path, False)
+ display_mapper_component.set_component_property_value(
+ AtomComponentProperties.display_mapper('LDR color Grading LUT'), display_mapper_asset.id)
+ Report.result(
+ Tests.ldr_color_grading_lut,
+ display_mapper_component.get_component_property_value(
+ AtomComponentProperties.display_mapper('LDR color Grading LUT')) == display_mapper_asset.id)
+
+ # 5. Set Enable LDR color grading LUT property True
+ display_mapper_component.set_component_property_value(
+ AtomComponentProperties.display_mapper('Enable LDR color grading LUT'), True)
+ Report.result(
+ Test.enable_ldr_color_grading_lut,
+ display_mapper_component.get_component_property_value(
+ AtomComponentProperties.display_mapper('Enable LDR color grading LUT')) is True)
+
+ # 6. Enter/Exit game mode.
+ TestHelper.enter_game_mode(Tests.enter_game_mode)
+ general.idle_wait_frames(1)
+ TestHelper.exit_game_mode(Tests.exit_game_mode)
+
+ # 7. Look for errors and 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(AtomEditorComponentsLevel_DisplayMapper_AddedToEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DisplayMapperAdded.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DisplayMapperAdded.py
index f8881bfa2a..558d69046e 100644
--- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DisplayMapperAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_DisplayMapperAdded.py
@@ -5,16 +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
"""
+
class Tests:
- camera_creation = (
- "Camera Entity successfully created",
- "Camera Entity failed to be created")
- camera_component_added = (
- "Camera component was added to entity",
- "Camera component failed to be added to entity")
- camera_component_check = (
- "Entity has a Camera component",
- "Entity failed to find Camera component")
creation_undo = (
"UNDO Entity creation success",
"UNDO Entity creation failed")
@@ -39,6 +31,12 @@ class Tests:
is_hidden = (
"Entity is hidden",
"Entity was not hidden")
+ ldr_color_grading_lut = (
+ "LDR color Grading LUT asset set",
+ "LDR color Grading LUT asset could not be set")
+ enable_ldr_color_grading_lut = (
+ "Enable LDR color grading LUT set",
+ "Enable LDR color grading LUT could not be set")
entity_deleted = (
"Entity deleted",
"Entity was not deleted")
@@ -68,19 +66,23 @@ def AtomEditorComponents_DisplayMapper_AddedToEntity():
2) Add Display Mapper component to Display Mapper entity.
3) UNDO the entity creation and component addition.
4) REDO the entity creation and component addition.
- 5) Enter/Exit game mode.
- 6) Test IsHidden.
- 7) Test IsVisible.
- 8) Delete Display Mapper entity.
- 9) UNDO deletion.
- 10) REDO deletion.
- 11) Look for errors and asserts.
+ 5) Set LDR color Grading LUT asset.
+ 6) Set Enable LDR color grading LUT property True
+ 7) Enter/Exit game mode.
+ 8) Test IsHidden.
+ 9) Test IsVisible.
+ 10) Delete Display Mapper entity.
+ 11) UNDO deletion.
+ 12) REDO deletion.
+ 13) Look for errors and asserts.
:return: None
"""
+ import os
import azlmbr.legacy.general as general
+ from editor_python_test_tools.asset_utils import Asset
from editor_python_test_tools.editor_entity_utils import EditorEntity
from editor_python_test_tools.utils import Report, Tracer, TestHelper
from Atom.atom_utils.atom_constants import AtomComponentProperties
@@ -97,7 +99,7 @@ def AtomEditorComponents_DisplayMapper_AddedToEntity():
Report.critical_result(Tests.display_mapper_creation, display_mapper_entity.exists())
# 2. Add Display Mapper component to Display Mapper entity.
- display_mapper_entity.add_component(AtomComponentProperties.display_mapper())
+ display_mapper_component = display_mapper_entity.add_component(AtomComponentProperties.display_mapper())
Report.critical_result(
Tests.display_mapper_component,
display_mapper_entity.has_component(AtomComponentProperties.display_mapper()))
@@ -126,33 +128,51 @@ def AtomEditorComponents_DisplayMapper_AddedToEntity():
general.idle_wait_frames(1)
Report.result(Tests.creation_redo, display_mapper_entity.exists())
- # 5. Enter/Exit game mode.
+ # 5. Set LDR color Grading LUT asset.
+ display_mapper_asset_path = os.path.join("TestData", "test.lightingpreset.azasset")
+ display_mapper_asset = Asset.find_asset_by_path(display_mapper_asset_path, False)
+ display_mapper_component.set_component_property_value(
+ AtomComponentProperties.display_mapper("LDR color Grading LUT"), display_mapper_asset.id)
+ Report.result(
+ Tests.ldr_color_grading_lut,
+ display_mapper_component.get_component_property_value(
+ AtomComponentProperties.display_mapper("LDR color Grading LUT")) == display_mapper_asset.id)
+
+ # 6. Set Enable LDR color grading LUT property True
+ display_mapper_component.set_component_property_value(
+ AtomComponentProperties.display_mapper('Enable LDR color grading LUT'), True)
+ Report.result(
+ Tests.enable_ldr_color_grading_lut,
+ display_mapper_component.get_component_property_value(
+ AtomComponentProperties.display_mapper('Enable LDR color grading LUT')) is True)
+
+ # 7. Enter/Exit game mode.
TestHelper.enter_game_mode(Tests.enter_game_mode)
general.idle_wait_frames(1)
TestHelper.exit_game_mode(Tests.exit_game_mode)
- # 6. Test IsHidden.
+ # 8. Test IsHidden.
display_mapper_entity.set_visibility_state(False)
Report.result(Tests.is_hidden, display_mapper_entity.is_hidden() is True)
- # 7. Test IsVisible.
+ # 9. Test IsVisible.
display_mapper_entity.set_visibility_state(True)
general.idle_wait_frames(1)
Report.result(Tests.is_visible, display_mapper_entity.is_visible() is True)
- # 8. Delete Display Mapper entity.
+ # 10. Delete Display Mapper entity.
display_mapper_entity.delete()
Report.result(Tests.entity_deleted, not display_mapper_entity.exists())
- # 9. UNDO deletion.
+ # 11. UNDO deletion.
general.undo()
Report.result(Tests.deletion_undo, display_mapper_entity.exists())
- # 10. REDO deletion.
+ # 12. REDO deletion.
general.redo()
Report.result(Tests.deletion_redo, not display_mapper_entity.exists())
- # 11. Look for errors and asserts.
+ # 13. Look for errors and 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}")
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
index 9a308ab9c1..28b49bb4cb 100755
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py
@@ -67,30 +67,6 @@ if (editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'GetCurrentLevelName'
if(general.get_num_selected() == 0):
print("clear_selection works")
- general.hide_all_objects()
-
- if(general.is_object_hidden(objs_list[1])):
- print("hide_all_objects works")
-
- general.unhide_object(objs_list[1])
-
- if not(general.is_object_hidden(objs_list[1])):
- print("unhide_object works")
-
- general.hide_object(objs_list[1])
-
- if(general.is_object_hidden(objs_list[1])):
- print("hide_object works")
-
- general.unhide_all_objects()
-
- general.freeze_object(objs_list[1])
-
- if(general.is_object_frozen(objs_list[1])):
- print("freeze_object works")
-
- general.unfreeze_object(objs_list[1])
-
position = general.get_position(objs_list[1])
px1, py1, pz1 = fetch_vector3_parts(position)
general.set_position(objs_list[1], px1 + 10, py1 - 4, pz1 + 3)
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
index 642d7279a4..bd9740f60f 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
@@ -26,8 +26,8 @@ INSTALL
It is recommended to set up these these tools with O3DE's CMake build commands.
Assuming CMake is already setup on your operating system, below are some sample build commands:
cd /path/to/od3e/
- mkdir windows_vs2019
- cd windows_vs2019
+ mkdir windows
+ cd windows
cmake .. -G "Visual Studio 16 2019" -DLY_PROJECTS=AutomatedTesting
To manually install the project in development mode using your own installed Python interpreter:
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py
index 5b0ab0067c..72530325e0 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py
@@ -467,3 +467,110 @@ class EditorEntity:
"""
new_translation = convert_to_azvector3(new_translation)
azlmbr.components.TransformBus(azlmbr.bus.Event, "SetLocalTranslation", self.id, new_translation)
+
+ # Use this only when prefab system is enabled as it will fail otherwise.
+ def focus_on_owning_prefab(self) -> None:
+ """
+ Focuses on the owning prefab instance of the given entity.
+ :param entity: The entity used to fetch the owning prefab to focus on.
+ """
+
+ assert self.id.isValid(), "A valid entity id is required to focus on its owning prefab."
+ focus_prefab_result = azlmbr.prefab.PrefabFocusPublicRequestBus(bus.Broadcast, "FocusOnOwningPrefab", self.id)
+ assert focus_prefab_result.IsSuccess(), f"Prefab operation 'FocusOnOwningPrefab' failed. Error: {focus_prefab_result.GetError()}"
+
+
+class EditorLevelEntity:
+ """
+ EditorLevel class used to add and fetch level components.
+ Level entity is a special entity that you do not create/destroy independently of larger systems of level creation.
+ This collects a number of staticmethods that do not rely on entityId since Level entity is found internally by
+ EditorLevelComponentAPIBus requests.
+ """
+
+ @staticmethod
+ def get_type_ids(component_names: list) -> list:
+ """
+ Used to get type ids of given components list for EntityType Level
+ :param: component_names: List of components to get type ids
+ :return: List of type ids of given components.
+ """
+ type_ids = editor.EditorComponentAPIBus(
+ bus.Broadcast, "FindComponentTypeIdsByEntityType", component_names, azlmbr.entity.EntityType().Level
+ )
+ return type_ids
+
+ @staticmethod
+ def add_component(component_name: str) -> EditorComponent:
+ """
+ Used to add new component to Level.
+ :param component_name: String of component name to add.
+ :return: Component object of newly added component.
+ """
+ component = EditorLevelEntity.add_components([component_name])[0]
+ return component
+
+ @staticmethod
+ def add_components(component_names: list) -> List[EditorComponent]:
+ """
+ Used to add multiple components
+ :param: component_names: List of components to add to level
+ :return: List of newly added components to the level
+ """
+ components = []
+ type_ids = EditorLevelEntity.get_type_ids(component_names)
+ for type_id in type_ids:
+ new_comp = EditorComponent()
+ new_comp.type_id = type_id
+ add_component_outcome = editor.EditorLevelComponentAPIBus(
+ bus.Broadcast, "AddComponentsOfType", [type_id]
+ )
+ assert (
+ add_component_outcome.IsSuccess()
+ ), f"Failure: Could not add component: '{new_comp.get_component_name()}' to level"
+ new_comp.id = add_component_outcome.GetValue()[0]
+ components.append(new_comp)
+ return components
+
+ @staticmethod
+ def get_components_of_type(component_names: list) -> List[EditorComponent]:
+ """
+ Used to get components of type component_name that already exists on the level
+ :param component_names: List of names of components to check
+ :return: List of Level Component objects of given component name
+ """
+ component_list = []
+ type_ids = EditorLevelEntity.get_type_ids(component_names)
+ for type_id in type_ids:
+ component = EditorComponent()
+ component.type_id = type_id
+ get_component_of_type_outcome = editor.EditorLevelComponentAPIBus(
+ bus.Broadcast, "GetComponentOfType", type_id
+ )
+ assert (
+ get_component_of_type_outcome.IsSuccess()
+ ), f"Failure: Level does not have component:'{component.get_component_name()}'"
+ component.id = get_component_of_type_outcome.GetValue()
+ component_list.append(component)
+
+ return component_list
+
+ @staticmethod
+ def has_component(component_name: str) -> bool:
+ """
+ Used to verify if the level has the specified component
+ :param component_name: Name of component to check for
+ :return: True, if level has specified component. Else, False
+ """
+ type_ids = EditorLevelEntity.get_type_ids([component_name])
+ return editor.EditorLevelComponentAPIBus(bus.Broadcast, "HasComponentOfType", type_ids[0])
+
+ @staticmethod
+ def count_components_of_type(component_name: str) -> int:
+ """
+ Used to get a count of the specified level component attached to the level
+ :param component_name: Name of component to check for
+ :return: integer count of occurences of level component attached to level or zero if none are present
+ """
+ type_ids = EditorLevelEntity.get_type_ids([component_name])
+ return editor.EditorLevelComponentAPIBus(bus.Broadcast, "CountComponentsOfType", type_ids[0])
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
index 7231af4a12..f277148bc8 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py
@@ -34,6 +34,38 @@ class TestHelper:
# JIRA: SPEC-2880
# general.idle_wait_frames(1)
+ @staticmethod
+ def create_level(level_name: str) -> bool:
+ """
+ :param level_name: The name of the level to be created
+ :return: True if ECreateLevelResult returns 0, False otherwise with logging to report reason
+ """
+ Report.info(f"Creating level {level_name}")
+
+ # Use these hardcoded values to pass expected values for old terrain system until new create_level API is
+ # available
+ heightmap_resolution = 1024
+ heightmap_meters_per_pixel = 1
+ terrain_texture_resolution = 4096
+ use_terrain = False
+
+ result = general.create_level_no_prompt(level_name, heightmap_resolution, heightmap_meters_per_pixel,
+ terrain_texture_resolution, use_terrain)
+
+ # Result codes are ECreateLevelResult defined in CryEdit.h
+ if result == 1:
+ Report.info(f"{level_name} level already exists")
+ elif result == 2:
+ Report.info("Failed to create directory")
+ elif result == 3:
+ Report.info("Directory length is too long")
+ elif result != 0:
+ Report.info("Unknown error, failed to create level")
+ else:
+ Report.info(f"{level_name} level created successfully")
+
+ return result == 0
+
@staticmethod
def open_level(directory : str, level : str):
# type: (str, str) -> None
diff --git a/AutomatedTesting/Gem/PythonTests/Physics/utils/FileManagement.py b/AutomatedTesting/Gem/PythonTests/Physics/utils/FileManagement.py
index 017bb672a4..03287d0542 100644
--- a/AutomatedTesting/Gem/PythonTests/Physics/utils/FileManagement.py
+++ b/AutomatedTesting/Gem/PythonTests/Physics/utils/FileManagement.py
@@ -98,38 +98,32 @@ class FileManagement:
"""
file_map = FileManagement._load_file_map()
backup_path = FileManagement.backup_folder_path
- backup_file_name = "{}.bak".format(file_name)
- backup_file = os.path.join(backup_path, backup_file_name)
# If backup directory DNE, make one
if not os.path.exists(backup_path):
os.mkdir(backup_path)
- # If "traditional" backup file exists, delete it (myFile.txt.bak)
- if os.path.exists(backup_file):
- fs.delete([backup_file], True, False)
- # Find my next storage name (myFile_1.txt.bak)
- backup_storage_file_name = FileManagement._next_available_name(backup_file_name, file_map)
- if backup_storage_file_name is None:
+
+ # Find my next storage name (myFile_1.txt)
+ backup_file_name = FileManagement._next_available_name(file_name, file_map)
+ if backup_file_name is None:
# If _next_available_name returns None, we have backed up MAX_BACKUPS of files name [file_name]
raise Exception(
"FileManagement class ran out of backups per name. Max: {}".format(FileManagement.MAX_BACKUPS)
)
- backup_storage_file = os.path.join(backup_path, backup_storage_file_name)
+
+ # If this backup file already exists, delete it.
+ backup_storage_file = "{}.bak".format(os.path.normpath(os.path.join(backup_path, backup_file_name)))
if os.path.exists(backup_storage_file):
- # This file should not exists, but if it does it's about to get clobbered!
- fs.unlock_file(backup_storage_file)
- # Create "traditional" backup file (myFile.txt.bak)
- fs.create_backup(os.path.join(file_path, file_name), backup_path)
- # Copy "traditional" backup file into storage backup (myFile_1.txt.bak)
- FileManagement._copy_file(backup_file_name, backup_path, backup_storage_file_name, backup_path)
- fs.lock_file(backup_storage_file)
- # Delete "traditional" back up file
- fs.unlock_file(backup_file)
- fs.delete([backup_file], True, False)
+ fs.delete([backup_storage_file], True, False)
+
+ # Create backup file (myFile_1.txt.bak)
+ original_file = os.path.normpath(os.path.join(file_path, file_name))
+ fs.create_backup(original_file, backup_path, backup_file_name)
+
# Update file map with new file
- file_map[os.path.join(file_path, file_name)] = backup_storage_file_name
+ file_map[original_file] = backup_file_name
FileManagement._save_file_map(file_map)
# Unlock original file to get it ready to be edited by the test
- fs.unlock_file(os.path.join(file_path, file_name))
+ fs.unlock_file(original_file)
@staticmethod
def _restore_file(file_name, file_path):
@@ -143,20 +137,15 @@ class FileManagement:
"""
file_map = FileManagement._load_file_map()
backup_path = FileManagement.backup_folder_path
- src_file = os.path.join(file_path, file_name)
+ src_file = os.path.normpath(os.path.join(file_path, file_name))
if src_file in file_map:
- backup_file = os.path.join(backup_path, file_map[src_file])
- if os.path.exists(backup_file):
- fs.unlock_file(backup_file)
- fs.unlock_file(src_file)
- # Make temporary copy of backed up file to restore from
- temp_file = "{}.bak".format(file_name)
- FileManagement._copy_file(file_map[src_file], backup_path, temp_file, backup_path)
- fs.restore_backup(src_file, backup_path)
- fs.lock_file(src_file)
- # Delete backup file
- fs.delete([os.path.join(backup_path, temp_file)], True, False)
+ backup_file_name = file_map[src_file]
+ backup_file = "{}.bak".format(os.path.join(backup_path, backup_file_name))
+
+ fs.unlock_file(src_file)
+ if fs.restore_backup(src_file, backup_path, backup_file_name):
fs.delete([backup_file], True, False)
+
# Remove from file map
del file_map[src_file]
FileManagement._save_file_map(file_map)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py
index c1d4836342..6e1f94d358 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py
@@ -61,3 +61,11 @@ class TestAutomation(TestAutomationBase):
def test_CreatePrefab_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform):
from Prefab.tests.create_prefab import CreatePrefab_UnderAnotherPrefab as test_module
self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
+
+ def test_DeleteEntity_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform):
+ from Prefab.tests.delete_entity import DeleteEntity_UnderAnotherPrefab as test_module
+ self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
+
+ def test_DeleteEntity_UnderLevelPrefab(self, request, workspace, editor, launcher_platform):
+ from Prefab.tests.delete_entity import DeleteEntity_UnderLevelPrefab as test_module
+ self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_WithSingleEntity.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_WithSingleEntity.py
index 80f4c0e596..eb8a262a69 100644
--- a/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_WithSingleEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/create_prefab/CreatePrefab_WithSingleEntity.py
@@ -24,6 +24,7 @@ def CreatePrefab_WithSingleEntity():
# Creates a prefab from the new entity
Prefab.create_prefab(car_prefab_entities, CAR_PREFAB_FILE_NAME)
+
if __name__ == "__main__":
from editor_python_test_tools.utils import Report
Report.start_test(CreatePrefab_WithSingleEntity)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py
new file mode 100644
index 0000000000..deaaaedf30
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py
@@ -0,0 +1,52 @@
+"""
+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 DeleteEntity_UnderAnotherPrefab():
+ """
+ Test description:
+ - Creates an entity.
+ - Creates a prefab out of the above entity.
+ - Focuses on the created prefab and destroys the entity within.
+ Checks that the entity is correctly destroyed.
+ """
+
+ from editor_python_test_tools.editor_entity_utils import EditorEntity
+ from editor_python_test_tools.prefab_utils import Prefab
+
+ import Prefab.tests.PrefabTestUtils as prefab_test_utils
+
+ prefab_test_utils.open_base_tests_level()
+
+ PREFAB_FILE_NAME = 'some_prefab'
+
+ # Creates a new entity at the root level
+ entity = EditorEntity.create_editor_entity()
+ assert entity.id.IsValid(), "Couldn't create entity."
+
+ # Asserts if prefab creation doesn't succeed
+ child_prefab, child_instance = Prefab.create_prefab([entity], PREFAB_FILE_NAME)
+ child_entity_ids_inside_prefab = child_instance.get_direct_child_entities()
+ assert len(
+ child_entity_ids_inside_prefab) == 1, f"{len(child_entity_ids_inside_prefab)} entities found inside prefab" \
+ f" when there should have been just 1 entity"
+
+ child_entity_inside_prefab = child_entity_ids_inside_prefab[0]
+ child_entity_inside_prefab.focus_on_owning_prefab()
+
+ child_entity_inside_prefab.delete()
+
+ # Wait till prefab propagation finishes before validating entity deletion.
+ azlmbr.legacy.general.idle_wait_frames(1)
+
+ child_entity_ids_inside_prefab = child_instance.get_direct_child_entities()
+ assert len(
+ child_entity_ids_inside_prefab) == 0, f"{len(child_entity_ids_inside_prefab)} entities found inside prefab" \
+ f" when there should have been 0 entities"
+
+if __name__ == "__main__":
+ from editor_python_test_tools.utils import Report
+ Report.start_test(DeleteEntity_UnderAnotherPrefab)
diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py
new file mode 100644
index 0000000000..807427718c
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py
@@ -0,0 +1,37 @@
+"""
+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 DeleteEntity_UnderLevelPrefab():
+ """
+ Test description:
+ - Creates an entity.
+ - Destroys the created entity.
+ Checks that the entity is correctly destroyed.
+ """
+
+ from editor_python_test_tools.editor_entity_utils import EditorEntity
+ import Prefab.tests.PrefabTestUtils as prefab_test_utils
+
+ prefab_test_utils.open_base_tests_level()
+
+ # Creates a new Entity at the root level
+ # Asserts if creation didn't succeed
+ entity = EditorEntity.create_editor_entity_at((100.0, 100.0, 100.0), name = "TestEntity")
+ assert entity.id.IsValid(), "Couldn't create entity"
+
+ level_container_entity = EditorEntity(entity.get_parent_id())
+ entity.delete()
+
+ # Wait till prefab propagation finishes before validating entity deletion.
+ azlmbr.legacy.general.idle_wait_frames(1)
+ level_container_child_entities_count = len(level_container_entity.get_children_ids())
+ assert level_container_child_entities_count == 0, f"The level still has {level_container_child_entities_count}" \
+ f" children when it should have 0."
+
+if __name__ == "__main__":
+ from editor_python_test_tools.utils import Report
+ Report.start_test(DeleteEntity_UnderLevelPrefab)
diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainHeightGradientList_AddRemoveGradientWorks.py b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainHeightGradientList_AddRemoveGradientWorks.py
new file mode 100644
index 0000000000..0be1f1ca10
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainHeightGradientList_AddRemoveGradientWorks.py
@@ -0,0 +1,144 @@
+"""
+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
+"""
+
+class HeightTests:
+ single_gradient_height_correct = (
+ "Successfully retrieved height for gradient1.",
+ "Failed to retrieve height for gradient1."
+ )
+ double_gradient_height_correct = (
+ "Successfully retrieved height when two gradients exist.",
+ "Failed to retrieve height when two gradients exist."
+ )
+ triple_gradient_height_correct = (
+ "Successfully retrieved height when three gradients exist.",
+ "Failed to retrieve height when three gradients exist."
+ )
+ terrain_data_changed_call_count_correct = (
+ "OnTerrainDataChanged called expected number of times.",
+ "OnTerrainDataChanged call count incorrect."
+ )
+
+def TerrainHeightGradientList_AddRemoveGradientWorks():
+ """
+ Summary:
+ Test aspects of the TerrainHeightGradientList through the BehaviorContext and the Property Tree.
+ :return: None
+ """
+
+ import os
+ import math as sys_math
+
+ import azlmbr.legacy.general as general
+ import azlmbr.bus as bus
+ import azlmbr.math as math
+ import azlmbr.terrain as terrain
+ import azlmbr.editor as editor
+ import azlmbr.vegetation as vegetation
+ import azlmbr.entity as EntityId
+
+ import editor_python_test_tools.hydra_editor_utils as hydra
+ from editor_python_test_tools.utils import Report
+ from editor_python_test_tools.utils import TestHelper as helper
+ import editor_python_test_tools.pyside_utils as pyside_utils
+ from editor_python_test_tools.editor_entity_utils import EditorEntity
+
+ terrain_changed_call_count = 0
+ expected_terrain_changed_calls = 0
+
+ aabb_component_name = "Axis Aligned Box Shape"
+ gradientlist_component_name = "Terrain Height Gradient List"
+ layerspawner_component_name = "Terrain Layer Spawner"
+
+ gradient_value_path = "Configuration|Value"
+
+ def create_entity_at(entity_name, components_to_add, x, y, z):
+ entity = hydra.Entity(entity_name)
+ entity.create_entity(math.Vector3(x, y, z), components_to_add)
+
+ return entity
+
+ def on_terrain_changed(args):
+ nonlocal terrain_changed_call_count
+
+ terrain_changed_call_count += 1
+
+ def set_component_path_val(entity, component, path, value):
+ entity.get_set_test(component, path, value)
+
+ def set_gradients_check_height(main_entity, gradient_list, expected_height, test_results):
+ nonlocal expected_terrain_changed_calls
+
+ test_tolerance = 0.01
+ gradient_list_path = "Configuration|Gradient Entities"
+
+ set_component_path_val(main_entity, 1, gradient_list_path, gradient_list)
+
+ expected_terrain_changed_calls += 1
+
+ # Wait until the terrain data has been updated.
+ helper.wait_for_condition(lambda: terrain_changed_call_count == expected_terrain_changed_calls, 2.0)
+
+ # Get the height at the origin.
+ height = terrain.TerrainDataRequestBus(bus.Broadcast, "GetHeightFromFloats", 0.0, 0.0, 0)
+
+ Report.result(test_results, sys_math.isclose(height, expected_height, abs_tol=test_tolerance))
+
+ helper.init_idle()
+
+ # Open a level.
+ helper.open_level("Physics", "Base")
+ helper.wait_for_condition(lambda: general.get_current_level_name() == "Base", 2.0)
+
+ general.idle_wait_frames(1)
+
+ # Add a terrain world component
+ world_component = hydra.add_level_component("Terrain World")
+
+ aabb_height = 1024.0
+ box_dimensions = math.Vector3(1.0, 1.0, aabb_height);
+
+ # Create a main entity with a LayerSpawner, AAbb and HeightGradientList.
+ main_entity = create_entity_at("entity2", [layerspawner_component_name, gradientlist_component_name, aabb_component_name], 0.0, 0.0, aabb_height/2.0)
+
+ # Create three gradient entities.
+ gradient_entity1 = create_entity_at("Constant Gradient1", ["Constant Gradient"], 0.0, 0.0, 0.0);
+ gradient_entity2 = create_entity_at("Constant Gradient2", ["Constant Gradient"], 0.0, 0.0, 0.0);
+ gradient_entity3 = create_entity_at("Constant Gradient3", ["Constant Gradient"], 0.0, 0.0, 0.0);
+
+ # Give everything a chance to finish initializing.
+ general.idle_wait_frames(1)
+
+ # Set the gradients to different values.
+ gradient_values = [0.5, 0.8, 0.3]
+ set_component_path_val(gradient_entity1, 0, gradient_value_path, gradient_values[0])
+ set_component_path_val(gradient_entity2, 0, gradient_value_path, gradient_values[1])
+ set_component_path_val(gradient_entity3, 0, gradient_value_path, gradient_values[2])
+
+ # Give the TerrainSystem time to tick.
+ general.idle_wait_frames(1)
+
+ # Set the dimensions of the Aabb.
+ set_component_path_val(main_entity, 2, "Axis Aligned Box Shape|Box Configuration|Dimensions", box_dimensions)
+
+ # Set up a handler to wait for notifications from the TerrainSystem.
+ handler = azlmbr.terrain.TerrainDataNotificationBusHandler()
+ handler.connect()
+ handler.add_callback("OnTerrainDataChanged", on_terrain_changed)
+
+ # Add a gradient to GradientList, then check the height returned from the TerrainSystem is correct.
+ set_gradients_check_height(main_entity, [gradient_entity1.id], aabb_height * gradient_values[0], HeightTests.single_gradient_height_correct)
+
+ # Add gradient2 and check height at the origin, this should have changed to match the second gradient value.
+ set_gradients_check_height(main_entity, [gradient_entity1.id, gradient_entity2.id], aabb_height * gradient_values[1], HeightTests.double_gradient_height_correct)
+
+ # Add gradient3, the height should still be the second value, as that was the highest.
+ set_gradients_check_height(main_entity, [gradient_entity1.id, gradient_entity2.id, gradient_entity3.id], aabb_height * gradient_values[1], HeightTests.triple_gradient_height_correct)
+
+if __name__ == "__main__":
+
+ from editor_python_test_tools.utils import Report
+ Report.start_test(TerrainHeightGradientList_AddRemoveGradientWorks)
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py
index e68b0932c2..390ec6a6b0 100644
--- a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py
+++ b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py
@@ -72,7 +72,7 @@ def Terrain_SupportsPhysics():
# 2) Create 2 test entities, one parent at 512.0, 512.0, 50.0 and one child at the default position and add the required components
entity1_components_to_add = ["Axis Aligned Box Shape", "Terrain Layer Spawner", "Terrain Height Gradient List", "Terrain Physics Heightfield Collider", "PhysX Heightfield Collider"]
- entity2_components_to_add = ["Vegetation Reference Shape", "Gradient Transform Modifier", "FastNoise Gradient"]
+ entity2_components_to_add = ["Shape Reference", "Gradient Transform Modifier", "FastNoise Gradient"]
ball_components_to_add = ["Sphere Shape", "PhysX Collider", "PhysX Rigid Body"]
terrain_spawner_entity = hydra.Entity("TestEntity1")
terrain_spawner_entity.create_entity(azmath.Vector3(512.0, 512.0, 50.0), entity1_components_to_add)
diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py
index 786651713c..fc9a917f47 100644
--- a/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py
@@ -27,3 +27,6 @@ class TestAutomation(EditorTestSuite):
class test_Terrain_SupportsPhysics(EditorSharedTest):
from .EditorScripts import Terrain_SupportsPhysics as test_module
+
+ class test_TerrainHeightGradientList_AddRemoveGradientWorks(EditorSharedTest):
+ from .EditorScripts import TerrainHeightGradientList_AddRemoveGradientWorks as test_module
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py
index 857d91bb12..7f7f420fd0 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py
@@ -183,23 +183,26 @@ def ap_missing_dependency_fixture(request, workspace, ap_setup_fixture) -> Any:
:return: None
"""
logger.info(f"Searching output for expected dependencies for product {product}")
+ sorted_expected = sorted(expected_dependencies)
# Check dependencies found either in the log or console output
for product_name, missing_deps in self.extract_missing_dependencies_from_output(log_output).items():
if product in product_name:
+ sorted_missing = sorted(missing_deps)
# fmt:off
- assert sorted(missing_deps) == sorted(expected_dependencies), \
+ assert sorted_expected == sorted_missing, \
f"Missing dependencies for '{product_name}' did not match expected. Expected: " \
- f"{expected_dependencies}, Actual: {missing_deps}"
+ f"{sorted_expected}, Actual: {sorted_missing}"
# fmt:on
# Check dependencies found in Database
for product_name, missing_deps in self.extract_missing_dependencies_from_database(product,
platforms).items():
if product.replace("\\", "/") in product_name:
+ sorted_missing = sorted(missing_deps)
# fmt:off
- assert sorted(expected_dependencies) == sorted(missing_deps), \
- f"Product '{product_name}' expected missing dependencies: {expected_dependencies}; " \
- f"actual missing dependencies {missing_deps}"
+ assert sorted_expected == sorted_missing, \
+ f"Product '{product_name}' expected missing dependencies: {sorted_expected}; " \
+ f"actual missing dependencies {sorted_missing}"
# fmt:on
def __getitem__(self, item: str) -> object:
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py
index 244ecfb516..c5b02e4f28 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py
@@ -4,7 +4,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
SPDX-License-Identifier: Apache-2.0 OR MIT
-A fixture for Setting Up Asset Processor Batch workspace for tests in lmbr_test
+A fixture for Setting Up Asset Processor Batch workspace for tests
"""
# Import builtin libraries
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
index eea6cb9224..885b4c2959 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py
@@ -4,7 +4,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
SPDX-License-Identifier: Apache-2.0 OR MIT
-A fixture for using the Asset Processor in lmbr_test, this will stop the asset processor after every test via
+A fixture for using the Asset Processor, this will stop the asset processor after every test via
the teardown. Using the fixture at class level will stop the asset processor after the suite completes.
Using the fixture at test level will stop asset processor after the test completes. Calling this fixture as a test argument will still run the teardown to stop the Asset Processor.
"""
@@ -15,6 +15,7 @@ import logging
# Import LyTestTools
import ly_test_tools.o3de.asset_processor as asset_processor_commands
+import ly_test_tools.o3de.asset_processor_utils
logger = logging.getLogger(__name__)
@@ -36,5 +37,8 @@ def asset_processor(request: pytest.fixture, workspace: pytest.fixture) -> asset
ap.stop()
request.addfinalizer(teardown)
+ for n in ly_test_tools.o3de.asset_processor_utils.processList:
+ assert not ly_test_tools.o3de.asset_processor_utils.check_ap_running(n), f"{n} process did not shutdown correctly."
+
return ap
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
index 5a5809595e..e37a5ed99b 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
@@ -103,6 +103,19 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
AZ::AssetBundlerBatch
)
+ ly_add_pytest(
+ NAME AssetPipelineTests.BundleMode
+ PATH ${CMAKE_CURRENT_LIST_DIR}/bundle_mode_tests.py
+ EXCLUDE_TEST_RUN_TARGET_FROM_IDE
+ TEST_SERIAL
+ TEST_SUITE periodic
+ RUNTIME_DEPENDENCIES
+ AZ::AssetProcessor
+ AZ::AssetBundlerBatch
+ Legacy::Editor
+ AutomatedTesting.Assets
+ )
+
ly_add_pytest(
NAME AssetPipelineTests.AssetBuilder
PATH ${CMAKE_CURRENT_LIST_DIR}/asset_builder_tests.py
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py
index 2d67bca8fe..cc79ed7c27 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py
@@ -8,6 +8,8 @@ General Asset Processor Batch Tests
"""
# Import builtin libraries
+from os import listdir
+
import pytest
import logging
import os
@@ -724,3 +726,11 @@ class TestsAssetProcessorBatch_AllPlatforms(object):
assert error_line_found, "The error could not be found in the newest run of the AP Batch log."
+ @pytest.mark.assetpipeline
+ def test_AssetProcessor_Log_On_Failure(self, asset_processor, ap_setup_fixture, workspace):
+ asset_processor.prepare_test_environment(ap_setup_fixture["tests_dir"], "test_AP_Logs")
+ result, output = asset_processor.batch_process(expect_failure=True, capture_output=True)
+ assert result == False, f'AssetProcessorBatch should have failed because there is a bad asset, output was {output}'
+
+ jobLogs = listdir(workspace.paths.ap_job_logs() + "/test_AP_Logs")
+ assert not len(jobLogs) == 0, 'No job logs where output during failure.'
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/test_AP_Logs/BadAsset.fbx b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/test_AP_Logs/BadAsset.fbx
new file mode 100644
index 0000000000..cf1bbaac8a
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/assets/test_AP_Logs/BadAsset.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c6b33c6137d6bd8c696f180c30a23089c95c1af398a630b4b13e080bec3254d
+size 18220
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py
new file mode 100644
index 0000000000..33a55d6601
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py
@@ -0,0 +1,20 @@
+"""
+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
+"""
+import azlmbr.bus
+import azlmbr.editor
+import azlmbr.legacy.general
+import sys
+
+# Print out the passed in bundle_path, so the outer test can verify this was sent in correctly
+bundle_path = sys.argv[1]
+print('Bundle mode test running with path {}'.format(sys.argv[1]))
+
+# Turn on bundle mode. This will trigger some printouts that the outer test logic will validate.
+azlmbr.legacy.general.set_cvar_integer("sys_report_files_not_found_in_paks", 1)
+azlmbr.legacy.general.run_console(f"loadbundles {bundle_path}")
+
+azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt')
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py
new file mode 100644
index 0000000000..af92bb1773
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py
@@ -0,0 +1,93 @@
+"""
+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
+"""
+
+import os
+import pytest
+import logging
+import sys
+import time
+pytest.importorskip('ly_test_tools')
+
+import ly_test_tools.environment.file_system as fs
+import ly_test_tools.environment.waiter as waiter
+import ly_test_tools.log.log_monitor
+
+from ..ap_fixtures.asset_processor_fixture import asset_processor as asset_processor
+from ..ap_fixtures.bundler_batch_setup_fixture import bundler_batch_setup_fixture as bundler_batch_helper
+from ..ap_fixtures.timeout_option_fixture import timeout_option_fixture as timeout
+
+@pytest.mark.SUITE_periodic
+@pytest.mark.parametrize('launcher_platform', ['windows_editor'])
+@pytest.mark.parametrize('project', ['AutomatedTesting'])
+@pytest.mark.parametrize('level', ['auto_test'])
+class TestBundleMode(object):
+ def test_bundle_mode_with_levels_mounts_bundles_correctly(self, request, editor, level, launcher_platform,
+ asset_processor, workspace, bundler_batch_helper):
+ level_pak = os.path.join("levels", level, "level.pak")
+
+ bundles_folder = os.path.join(workspace.paths.project(), "Bundles")
+ bundle_request_path = os.path.join(bundles_folder, "bundle.pak")
+ bundle_result_path = os.path.join(bundles_folder,
+ bundler_batch_helper.platform_file_name(
+ "bundle.pak", workspace.asset_processor_platform))
+
+ # Create target 'Bundles' folder if it doesn't exist
+ if not os.path.exists(bundles_folder):
+ os.mkdir(bundles_folder)
+ # Delete target bundle file if it already exists
+ if os.path.exists(bundle_result_path):
+ fs.delete([bundle_result_path], True, False)
+
+ # Make asset list file to use in the bundle
+ bundler_batch_helper.call_assetLists(
+ addSeed=level_pak,
+ assetListFile=bundler_batch_helper["asset_info_file_request"],
+ )
+
+ # Make bundle in /Bundles
+ bundler_batch_helper.call_bundles(
+ assetListFile=bundler_batch_helper["asset_info_file_result"],
+ outputBundlePath=bundle_request_path,
+ maxSize="2048",
+ )
+
+ # Ensure the bundle was created
+ assert os.path.exists(bundle_result_path), f"Bundle was not created at location: {bundle_result_path}"
+
+ # The editor flips the slash direction in some of the printouts
+ bundle_result_path_editor_separator = bundle_result_path.replace('\\', '/')
+
+ expected_lines = [
+ # A beginning of test printout can help debug where failures occur, if this line is missing
+ # then the Editor didn't launch, didn't run the Python test, or didn't pass in the right parameter
+ f'Bundle mode test running with path {bundles_folder}',
+ # These printouts happen in response to the loadbundles call, and verify this bundle is actually loaded
+ f"[CONSOLE] Executing console command 'loadbundles {bundles_folder}'",
+ f'(BundlingSystem) - Loading bundles from {bundles_folder} of type .pak',
+ f'(Archive) - Opening archive file {bundle_result_path_editor_separator}',
+ ]
+ unexpected_lines = []
+
+ timeout = 180
+ halt_on_unexpected = False
+ test_directory = os.path.join(os.path.dirname(__file__))
+ test_file = os.path.join(test_directory, 'bundle_mode_in_editor_tests.py')
+ editor.args.extend(['-NullRenderer', '-rhi=Null', "--skipWelcomeScreenDialog",
+ "--autotest_mode", "--runpythontest", test_file, "--runpythonargs", bundles_folder])
+
+ with editor.start(launch_ap=True):
+ editor_log_file = os.path.join(editor.workspace.paths.project_log(), 'Editor.log')
+ log_monitor = ly_test_tools.log.log_monitor.LogMonitor(editor, editor_log_file)
+ waiter.wait_for(
+ lambda: editor.is_alive(),
+ timeout,
+ exc=("Log file '{}' was never opened by another process.".format(editor_log_file)),
+ interval=1)
+ log_monitor.monitor_log_for_lines(expected_lines, unexpected_lines, halt_on_unexpected, timeout)
+
+ # Delete the bundle created and used in this test
+ fs.delete([bundle_result_path], True, False)
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py
index 7159b2e83f..52321fceea 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py
@@ -120,31 +120,29 @@ class TestsMissingDependencies_WindowsAndMac(object):
# Relative path to the txt file with missing dependencies
expected_product = f"testassets\\validuuidsnotdependency.txt"
- self._asset_processor.add_source_folder_assets(f"{self._workspace.project}\\Objects\\LumberTank")
- self._asset_processor.add_source_folder_assets(f"{self._workspace.project}\\Objects\\Characters\\Jack")
# Expected missing dependencies
expected_dependencies = [
# String Asset #
- ('1CB10C43F3245B93A294C602ADEF95F9:[0', '{1CB10C43-F324-5B93-A294-C602ADEF95F9}:0'),
+ # InvalidAssetIdNoReport.txt
+ ('E68A85B0-131D-5A82-B2D5-BC58EE4062AE', '{E68A85B0-131D-5A82-B2D5-BC58EE4062AE}:0'),
+ # InvalidRelativePathsNoReport.txt
+ ('B3EF12DD306C520EB0A8A6B0D031A195', '{B3EF12DD-306C-520E-B0A8-A6B0D031A195}:0'),
+ # SelfReferenceUUID.txt
('33bcee02F3225688ABEE534F6058593F', '{33BCEE02-F322-5688-ABEE-534F6058593F}:0'),
- ('345E5C660D6254FF8D0F7C8EE66A2249', '{345E5C66-0D62-54FF-8D0F-7C8EE66A2249}:3e8'),
- ('345E5C660D6254FF8D0F7C8EE66A2249', '{345E5C66-0D62-54FF-8D0F-7C8EE66A2249}:3ea'),
- ('345E5C660D6254FF8D0F7C8EE66A2249', '{345E5C66-0D62-54FF-8D0F-7C8EE66A2249}:3eb'),
- ('37108522F50459499CD6C8D47A960CF1', '{37108522-F504-5949-9CD6-C8D47A960CF1}:3e8'),
- ('37108522F50459499CD6C8D47A960CF1', '{37108522-F504-5949-9CD6-C8D47A960CF1}:3ea'),
- ('37108522F50459499CD6C8D47A960CF1', '{37108522-F504-5949-9CD6-C8D47A960CF1}:3eb'),
- ('6BDE282B49C957F7B0714B26579BCA9A', '{6BDE282B-49C9-57F7-B071-4B26579BCA9A}:0'),
- ('747D31D71E62553592226173C49CF97E', '{747D31D7-1E62-5535-9222-6173C49CF97E}:1'),
- ('747D31D71E62553592226173C49CF97E', '{747D31D7-1E62-5535-9222-6173C49CF97E}:2'),
- ('A26C73D1837E5AE59E68F916FA7C3699', '{A26C73D1-837E-5AE5-9E68-F916FA7C3699}:3e8'),
- ('A26C73D1837E5AE59E68F916FA7C3699', '{A26C73D1-837E-5AE5-9E68-F916FA7C3699}:3ea'),
- ('A26C73D1837E5AE59E68F916FA7C3699', '{A26C73D1-837E-5AE5-9E68-F916FA7C3699}:3eb'),
- ('B076CDDC-14DF-50F4-A5E9-7518ABB3E851', '{B076CDDC-14DF-50F4-A5E9-7518ABB3E851}:0'),
- ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3e8'),
- ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3ea'),
- ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3eb'),
- ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3ec'),
- ('D92C4661C8985E19BD3597CB2318CFA6:[0', '{D92C4661-C898-5E19-BD35-97CB2318CFA6}:0'),
+ # SelfReferencePath.txt
+ ('DD587FBE-16C8-5B98-AE3C-A9F8750B2692', '{DD587FBE-16C8-5B98-AE3C-A9F8750B2692}:0'),
+ # InvalidUUIDNoReport.txt
+ ('837412DF-D05F-576D-81AA-ACF360463749', '{837412DF-D05F-576D-81AA-ACF360463749}:0'),
+ # MaxIteration31Deep.txt
+ ('3F642A0FDC825696A70A1DA5709744DF', '{3F642A0F-DC82-5696-A70A-1DA5709744DF}:0'),
+ # OnlyMatchesCorrectLengthUUIDs.txt
+ ('2545AD8B-1B9B-5F93-859D-D8DC1DC2B480', '{2545AD8B-1B9B-5F93-859D-D8DC1DC2B480}:0'),
+ # WildcardScanTest1.txt
+ ('1CB10C43F3245B93A294C602ADEF95F9:[0', '{1CB10C43-F324-5B93-A294-C602ADEF95F9}:0'),
+ # RelativeProductPathsNotDependencies.txt
+ ('B772953CA08A5D209491530E87D11504:[0', '{B772953C-A08A-5D20-9491-530E87D11504}:0'),
+ # WildcardScanTest2.txt
+ ('D92C4661C8985E19BD3597CB2318CFA6', '{D92C4661-C898-5E19-BD35-97CB2318CFA6}:0'),
]
self.do_missing_dependency_test(expected_product, expected_dependencies,
"%ValidUUIDsNotDependency.txt")
@@ -187,8 +185,11 @@ class TestsMissingDependencies_WindowsAndMac(object):
# Expected missing dependencies
expected_dependencies = [
# String Asset #
- ('2ef92b8D044E5C278E2BB1AC0374A4E7:1003', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3eb'),
+ # _dev_Red.tif
+ ('2ef92b8D044E5C278E2BB1AC0374A4E7:1000', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3e8'),
+ # _dev_Purple.tif
('A2482826-053D-5634-A27B-084B1326AAE5}:[1002', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'),
+ # _dev_White.tif
('D83B36F1-61A6-5001-B191-4D0CE282E236}-1002', '{D83B36F1-61A6-5001-B191-4D0CE282E236}:3ea'),
]
@@ -237,11 +238,10 @@ class TestsMissingDependencies_WindowsAndMac(object):
expected_dependencies = [
# String Asset #
('TestAssets\\WildcardScanTest1.txt', '{1CB10C43-F324-5B93-A294-C602ADEF95F9}:0'),
- ('libs/particles/milestone2PARTICLES.XML', '{6BDE282B-49C9-57F7-B071-4B26579BCA9A}:0'),
+ ('TESTASSETS/ReportONEmISSINGdEPENDENCY.tXT', '{BE5E2373-245E-59E4-B4C6-7370EEAA2EFD}:0'),
('textures/_dev_Purple.tif', '{A2482826-053D-5634-A27B-084B1326AAE5}:3e8'),
('textures/_dev_Purple.tif', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'),
- ('textures/_dev_Purple.tif', '{A2482826-053D-5634-A27B-084B1326AAE5}:3eb'),
- ('project.json', '{B076CDDC-14DF-50F4-A5E9-7518ABB3E851}:0'),
+ ('TestAssets/InvalidAssetIdNoReport.txt', '{E68A85B0-131D-5A82-B2D5-BC58EE4062AE}:0'),
('TestAssets/RelativeProductPathsNotDependencies.txt', '{B772953C-A08A-5D20-9491-530E87D11504}:0'),
]
@@ -282,29 +282,31 @@ class TestsMissingDependencies_WindowsAndMac(object):
2. Set the expected missing dependencies
3. Execute test
"""
-
- self._asset_processor.add_source_folder_assets(f"Gems\\LyShineExamples\\Assets\\UI\\Fonts\\LyShineExamples")
- self._asset_processor.add_scan_folder(f"Gems\\LyShineExamples\\Assets")
# Relative path to the txt file with missing dependencies as product paths
expected_product = f"testassets\\relativeproductpathsnotdependencies.txt"
expected_dependencies = [
# String Asset #
- ('materials/floor_tile.mtl', '{0EFF5E4A-F544-5D87-8696-6DDFA62D6063}:0'),
- ('materials/am_grass1.mtl', '{1151F14D-38A6-5579-888A-BE3139882E68}:0'),
- ('2ef92b8D044E5C278E2BB1AC0374A4E7:1002', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3ea'),
- ('textures/milestone2/ama_grey_02.tif.streamingimage', '{3EE80AAD-EB9C-56BD-9E9C-65410578998C}:3e8'),
- ('ui/milestone2menu.uicanvas', '{445D9AF3-6CA5-5281-82A9-5C570BCD1DB8}:0'),
- ('libs/particles/milestone2particles.xml', '{6BDE282B-49C9-57F7-B071-4B26579BCA9A}:0'),
- ('textures/_dev_yellow_light.tif.1002.imagemipchain', '{6C40868F-3FC1-5115-96EA-DD0A9E33DEE4}:3ea'),
- ('textures\\\\_dev_tan.tif.streamingimage', '{8F2BCEF5-C8CE-5B80-8103-8C1D694D012C}:3e8'),
- ('materials/am_rockground.mtl', '{A1DA3D05-A020-5BB5-A608-C4812B7BD733}:0'),
('textures/_dev_purple.tif.streamingimage', '{A2482826-053D-5634-A27B-084B1326AAE5}:3e8'),
- ('A2482826-053D-5634-A27B-084B1326AAE5}:[1002', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'),
- ('project.json', '{B076CDDC-14DF-50F4-A5E9-7518ABB3E851}:0'),
- ('CEAA362B4E505BCEB827CB92EF40A50E', '{CEAA362B-4E50-5BCE-B827-CB92EF40A50E}:1'),
- ('CEAA362B4E505BCEB827CB92EF40A50E', '{CEAA362B-4E50-5BCE-B827-CB92EF40A50E}:2'),
+ ('textures\\_dev_stucco.tif.streamingimage', '{70114D85-D712-5AEB-A816-8FE3A37087AF}:3e8'),
+ ('textures\\\\_dev_tan.tif.streamingimage', '{8F2BCEF5-C8CE-5B80-8103-8C1D694D012C}:3e8'),
('TEXTURES/_DEV_WHITE.tif.streamingimage', '{D83B36F1-61A6-5001-B191-4D0CE282E236}:3e8'),
+ ('textures/_dev_yellow_light.tif.1002.imagemipchain', '{6C40868F-3FC1-5115-96EA-DD0A9E33DEE4}:3ea'),
+ ('textures/_dev_woodland.tif.1002.imagemipchain', '{F3DD193C-5845-569C-A974-AA338B30CF86}:3ea'),
('textures/_dev_woodland.tif.streamingimage', '{F3DD193C-5845-569C-A974-AA338B30CF86}:3e8'),
+ ('textures/_dev_yellow_light.tif.streamingimage', '{6C40868F-3FC1-5115-96EA-DD0A9E33DEE4}:3e8'),
+ ('textures/_dev_yellow_med.tif.1002.imagemipchain', '{BB4DFF57-52BD-525B-9628-68232E31802C}:3ea'),
+ ('textures/lights/flare01.tif.streamingimage', '{D8E49CC4-C743-5F31-A1EC-4AA89163B8F5}:3e8'),
+ # SelfReferenceUUID.txt
+ ('33BCEE02-F322-5688-ABEE-534F6058593F', '{33BCEE02-F322-5688-ABEE-534F6058593F}:0'),
+ ('textures/test_texture_sequence/test_texture_sequence000.png.streamingimage', '{6CC90BEE-0A9F-57A8-9013-7C1D643C0E8E}:3e8'),
+ # _dev_red.tif.streamingimage
+ ('2ef92b8D044E5C278E2BB1AC0374A4E7:1002', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3ea'),
+ # SelfReferenceAssetID.txt
+ ('785A05D2-483E-5B43-A2B9-92ACDAE6E938', '{785A05D2-483E-5B43-A2B9-92ACDAE6E938}:0'),
+ ('textures/test_texture_sequence/test_texture_sequence001.png.streamingimage', '{8A8A37DD-01B9-5D70-92E4-925E2C0FE826}:3e8'),
+ # _dev_purple.tif.1002.imagemipchain
+ ('A2482826-053D-5634-A27B-084B1326AAE5}:[1002', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'),
+ ('textures/_dev_purple_glass.tif.1002.imagemipchain', '{2FCDD831-77D1-5BE1-A4C8-CA47E4F89F19}:3ea'),
]
self.do_missing_dependency_test(expected_product, expected_dependencies,
diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
index 4543888a7c..88188aa6c0 100755
--- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
+++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py
@@ -8,7 +8,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
import os
import logging
-import subprocess
+import sys
import pytest
import time
@@ -128,7 +128,8 @@ class TestAutomationBase:
errors.append(TestRunError("FAILED TEST", error_str))
if return_code and return_code != TestAutomationBase.TEST_FAIL_RETCODE: # Crashed
crash_info = "-- No crash log available --"
- crash_log = os.path.join(workspace.paths.project_log(), 'error.log')
+ crash_log = workspace.paths.crash_log()
+
try:
waiter.wait_for(lambda: os.path.exists(crash_log), timeout=TestAutomationBase.WAIT_FOR_CRASH_LOG)
except AssertionError:
diff --git a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
index bf42579970..1fc71da972 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
@@ -7,60 +7,6 @@
#
if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_FOUNDATION_TEST_SUPPORTED)
- ly_add_pytest(
- NAME AutomatedTesting::EditorTests_Main
- TEST_SUITE main
- TEST_SERIAL
- PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py
- PYTEST_MARKS "not REQUIRES_gpu"
- RUNTIME_DEPENDENCIES
- Legacy::Editor
- AZ::AssetProcessor
- AutomatedTesting.Assets
- COMPONENT
- Editor
- )
-
- ly_add_pytest(
- NAME AutomatedTesting::EditorTests_Main_GPU
- TEST_SUITE main
- TEST_SERIAL
- TEST_REQUIRES gpu
- PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py
- PYTEST_MARKS "REQUIRES_gpu"
- RUNTIME_DEPENDENCIES
- Legacy::Editor
- AZ::AssetProcessor
- AutomatedTesting.Assets
- COMPONENT
- Editor
- )
-
- ly_add_pytest(
- NAME AutomatedTesting::EditorTests_Periodic
- TEST_SUITE periodic
- TEST_SERIAL
- PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Periodic.py
- RUNTIME_DEPENDENCIES
- Legacy::Editor
- AZ::AssetProcessor
- AutomatedTesting.Assets
- COMPONENT
- Editor
- )
-
- ly_add_pytest(
- NAME AutomatedTesting::EditorTests_Sandbox
- TEST_SUITE sandbox
- TEST_SERIAL
- PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Sandbox.py
- RUNTIME_DEPENDENCIES
- Legacy::Editor
- AZ::AssetProcessor
- AutomatedTesting.Assets
- COMPONENT
- Editor
- )
ly_add_pytest(
NAME AutomatedTesting::EditorTests_Main_Optimized
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py
index e4575d4d17..5fa8130302 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py
@@ -95,7 +95,8 @@ def EntityOutliner_EntityOrdering():
entity_outliner_model.dropMimeData(
mime_data, QtCore.Qt.MoveAction, target_row, 0, target_index.parent()
)
- QtWidgets.QApplication.processEvents()
+ # Wait after move to let events (i.e. prefab propagation) process
+ general.idle_wait(1.0)
# Move an entity before another entity in the order by dragging the source above the target
move_entity_before = lambda source_name, target_name: _move_entity(
@@ -119,24 +120,24 @@ def EntityOutliner_EntityOrdering():
# Our new entity should be given a name with a number automatically
new_entity = f"Entity{i+1}"
- # The new entity should be added to the top of its parent entity
- expected_order = [new_entity] + expected_order
+ # The new entity should be added to the bottom of its parent entity
+ expected_order = expected_order + [new_entity]
verify_entities_sorted(expected_order)
- # 3) Move "Entity1" to the top of the order
- move_entity_before("Entity1", "Entity5")
- expected_order = ["Entity1", "Entity5", "Entity4", "Entity3", "Entity2"]
+ # 3) Move "Entity5" to the top of the order
+ move_entity_before("Entity5", "Entity1")
+ expected_order = ["Entity5", "Entity1", "Entity2", "Entity3", "Entity4"]
verify_entities_sorted(expected_order)
- # 4) Move "Entity4" to the bottom of the order
- move_entity_after("Entity4", "Entity2")
- expected_order = ["Entity1", "Entity5", "Entity3", "Entity2", "Entity4"]
+ # 4) Move "Entity2" to the bottom of the order
+ move_entity_after("Entity2", "Entity4")
+ expected_order = ["Entity5", "Entity1", "Entity3", "Entity4", "Entity2"]
verify_entities_sorted(expected_order)
# 5) Add another new entity, ensure the rest of the order is unchanged
create_entity()
- expected_order = ["Entity6", "Entity1", "Entity5", "Entity3", "Entity2", "Entity4"]
+ expected_order = ["Entity5", "Entity1", "Entity3", "Entity4", "Entity2", "Entity6"]
verify_entities_sorted(expected_order)
diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
index ccc4ee9737..d87fd8625b 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py
@@ -49,7 +49,6 @@ class TestAutomationNoAutoTestMode(EditorTestSuite):
from .EditorScripts import AssetPicker_UI_UX 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'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
index 98801b49d6..ba607ede32 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
@@ -11,24 +11,10 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
## DynVeg ##
ly_add_pytest(
- NAME AutomatedTesting::DynamicVegetationTests_Main
+ NAME AutomatedTesting::DynamicVegetationTests_Main_Optimized
TEST_SERIAL
TEST_SUITE main
- PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Main.py
- RUNTIME_DEPENDENCIES
- AZ::AssetProcessor
- Legacy::Editor
- AutomatedTesting.GameLauncher
- AutomatedTesting.Assets
- COMPONENT
- LargeWorlds
- )
-
- ly_add_pytest(
- NAME AutomatedTesting::DynamicVegetationTests_Periodic
- TEST_SERIAL
- TEST_SUITE periodic
- PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Periodic.py
+ PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Main_Optimized.py
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -37,7 +23,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
COMPONENT
LargeWorlds
)
-
ly_add_pytest(
NAME AutomatedTesting::DynamicVegetationTests_Periodic_Optimized
TEST_SERIAL
@@ -52,20 +37,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
LargeWorlds
)
- ly_add_pytest(
- NAME AutomatedTesting::DynamicVegetationTests_Main_Optimized
- TEST_SERIAL
- TEST_SUITE main
- PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Main_Optimized.py
- RUNTIME_DEPENDENCIES
- AZ::AssetProcessor
- Legacy::Editor
- AutomatedTesting.Assets
- AutomatedTesting.GameLauncher
- COMPONENT
- LargeWorlds
- )
-
## LandscapeCanvas ##
ly_add_pytest(
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py
index 84c661873c..fa45e057e2 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py
@@ -72,9 +72,9 @@ def DynamicSliceInstanceSpawner_Embedded_E2E():
# 1) Create a new, temporary level
lvl_name = "tmp_level"
helper.init_idle()
- level_created = general.create_level_no_prompt(lvl_name, 1024, 1, 4096, False)
+ level_created = helper.create_level(lvl_name)
general.idle_wait(1.0)
- Report.critical_result(Tests.level_created, level_created == 0)
+ Report.critical_result(Tests.level_created, level_created)
general.set_current_view_position(512.0, 480.0, 38.0)
# 2) Create a new entity with required vegetation area components and Script Canvas component for launcher test
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py
index de2554034f..2353095849 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py
@@ -73,9 +73,9 @@ def DynamicSliceInstanceSpawner_External_E2E():
# 1) Create a new, temporary level
lvl_name = "tmp_level"
helper.init_idle()
- level_created = general.create_level_no_prompt(lvl_name, 1024, 1, 4096, False)
+ level_created = helper.create_level(lvl_name)
general.idle_wait(1.0)
- Report.critical_result(Tests.level_created, level_created == 0)
+ Report.critical_result(Tests.level_created, level_created)
general.set_current_view_position(512.0, 480.0, 38.0)
# 2) Create a new entity with required vegetation area components and switch the Vegetation Asset List Source
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py
index bf6501f469..130d56937b 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py
@@ -76,9 +76,9 @@ def LayerBlender_E2E_Editor():
# 1) Create a new, temporary level
lvl_name = "tmp_level"
helper.init_idle()
- level_created = general.create_level_no_prompt(lvl_name, 1024, 1, 4096, False)
+ level_created = helper.create_level(lvl_name)
general.idle_wait(1.0)
- Report.critical_result(Tests.level_created, level_created == 0)
+ Report.critical_result(Tests.level_created, level_created)
general.set_current_view_position(500.49, 498.69, 46.66)
general.set_current_view_rotation(-42.05, 0.00, -36.33)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
index 649c7d0776..1153ae2657 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py
@@ -78,7 +78,7 @@ def LayerSpawner_InheritBehaviorFlag():
# Create Vegetation area and assign a valid asset
veg_1 = hydra.Entity("veg_1")
veg_1.create_entity(
- position, ["Vegetation Layer Spawner", "Vegetation Reference Shape", "Vegetation Asset List"]
+ position, ["Vegetation Layer Spawner", "Shape Reference", "Vegetation Asset List"]
)
set_dynamic_slice_asset(veg_1, 2, os.path.join("Slices", "PinkFlower.dynamicslice"))
veg_1.get_set_test(1, "Configuration|Shape Entity Id", blender_entity.id)
@@ -86,7 +86,7 @@ def LayerSpawner_InheritBehaviorFlag():
# Create second vegetation area and assign a valid asset
veg_2 = hydra.Entity("veg_2")
veg_2.create_entity(
- position, ["Vegetation Layer Spawner", "Vegetation Reference Shape", "Vegetation Asset List"]
+ position, ["Vegetation Layer Spawner", "Shape Reference", "Vegetation Asset List"]
)
set_dynamic_slice_asset(veg_2, 2, os.path.join("Slices", "PurpleFlower.dynamicslice"))
veg_2.get_set_test(1, "Configuration|Shape Entity Id", blender_entity.id)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
index 0da200d87a..42604cd2da 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py
@@ -9,7 +9,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
def LayerSpawner_InstancesPlantInAllSupportedShapes():
"""
Summary:
- The level is loaded and vegetation area is created. Then the Vegetation Reference Shape
+ The level is loaded and vegetation area is created. Then the Shape Reference
component of vegetation area is pinned with entities of different shape components to check
if the vegetation plants in different shaped areas.
@@ -67,7 +67,7 @@ def LayerSpawner_InstancesPlantInAllSupportedShapes():
10.0, 10.0, 10.0,
asset_path)
vegetation.remove_component("Box Shape")
- vegetation.add_component("Vegetation Reference Shape")
+ vegetation.add_component("Shape Reference")
# Create surface for planting on
dynveg.create_surface_entity("Surface Entity", entity_position, 60.0, 60.0, 1.0)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py
index ed23af51ad..673e40e397 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py
@@ -12,13 +12,23 @@ import ly_test_tools.environment.file_system as file_system
from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, EditorParallelTest, EditorTestSuite
-@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'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
class TestAutomation(EditorTestSuite):
enable_prefab_system = False
+
+ # Helpers for test asset cleanup
+ def cleanup_test_level(self, workspace):
+ file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "Levels", "tmp_level")],
+ True, True)
+
+ def cleanup_test_slices(self, workspace):
+ file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices",
+ "TestSlice_1.slice")], True, True)
+ file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices",
+ "TestSlice_2.slice")], True, True)
class test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(EditorParallelTest):
from .EditorScripts import DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks as test_module
@@ -38,10 +48,7 @@ class TestAutomation(EditorTestSuite):
class test_SpawnerSlices_SliceCreationAndVisibilityToggleWorks(EditorSingleTest):
# Custom teardown to remove slice asset created during test
def teardown(self, request, workspace, editor, editor_test_results, launcher_platform):
- file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices",
- "TestSlice_1.slice")], True, True)
- file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices",
- "TestSlice_2.slice")], True, True)
+ TestAutomation.cleanup_test_slices(self, workspace)
from .EditorScripts import SpawnerSlices_SliceCreationAndVisibilityToggleWorks as test_module
class test_AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea(EditorParallelTest):
@@ -152,23 +159,29 @@ class TestAutomation(EditorTestSuite):
class test_DynamicSliceInstanceSpawner_Embedded_E2E_Editor(EditorSingleTest):
from .EditorScripts import DynamicSliceInstanceSpawner_Embedded_E2E as test_module
- # Custom teardown to remove test level created during test
+ # Custom setup/teardown to remove test level created during test
+ def setup(self, request, workspace, editor, editor_test_results, launcher_platform):
+ TestAutomation.cleanup_test_level(self, workspace)
+
def teardown(self, request, workspace, editor, editor_test_results, launcher_platform):
- file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "Levels", "tmp_level")],
- True, True)
+ TestAutomation.cleanup_test_level(self, workspace)
class test_DynamicSliceInstanceSpawner_External_E2E_Editor(EditorSingleTest):
from .EditorScripts import DynamicSliceInstanceSpawner_External_E2E as test_module
- # Custom teardown to remove test level created during test
+ # Custom setup/teardown to remove test level created during test
+ def setup(self, request, workspace, editor, editor_test_results, launcher_platform):
+ TestAutomation.cleanup_test_level(self, workspace)
+
def teardown(self, request, workspace, editor, editor_test_results, launcher_platform):
- file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "Levels", "tmp_level")],
- True, True)
-
+ TestAutomation.cleanup_test_level(self, workspace)
+
class test_LayerBlender_E2E_Editor(EditorSingleTest):
from .EditorScripts import LayerBlender_E2E_Editor as test_module
- # Custom teardown to remove test level created during test
+ # Custom setup/teardown to remove test level created during test
+ def setup(self, request, workspace, editor, editor_test_results, launcher_platform):
+ TestAutomation.cleanup_test_level(self, workspace)
+
def teardown(self, request, workspace, editor, editor_test_results, launcher_platform):
- file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "Levels", "tmp_level")],
- True, True)
+ TestAutomation.cleanup_test_level(self, workspace)
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
index 9703423901..c69ce77041 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
@@ -96,7 +96,7 @@ def AreaNodes_DependentComponentsAdded():
'SpawnerAreaNode': [
'Vegetation Layer Spawner',
'Vegetation Asset List',
- 'Vegetation Reference Shape'
+ 'Shape Reference'
],
'MeshBlockerAreaNode': [
'Vegetation Layer Blocker (Mesh)',
@@ -104,7 +104,7 @@ def AreaNodes_DependentComponentsAdded():
],
'BlockerAreaNode': [
'Vegetation Layer Blocker',
- 'Vegetation Reference Shape'
+ 'Shape Reference'
]
}
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
index 417e093567..4dfc227c53 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
@@ -82,7 +82,7 @@ def Edit_DisabledNodeDuplication():
nodes = {
'SpawnerAreaNode': 'Vegetation Asset List',
'MeshBlockerAreaNode': 'Mesh',
- 'BlockerAreaNode': 'Vegetation Reference Shape',
+ 'BlockerAreaNode': 'Shape Reference',
'FastNoiseGradientNode': 'Gradient Transform Modifier',
'ImageGradientNode': 'Gradient Transform Modifier',
'PerlinNoiseGradientNode': 'Gradient Transform Modifier',
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
index c04f9f05f6..63df9a6fcb 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
@@ -104,7 +104,7 @@ def GradientNodes_DependentComponentsAdded():
# we will be checking for
commonComponents = [
'Gradient Transform Modifier',
- 'Vegetation Reference Shape'
+ 'Shape Reference'
]
componentNames = []
for name in gradients:
@@ -114,7 +114,7 @@ def GradientNodes_DependentComponentsAdded():
# Create nodes for the gradients that have additional required dependencies and check if
# the Entity created by adding the node has the appropriate Component and required
- # Gradient Transform Modifier and Vegetation Reference Shape components added automatically to it
+ # Gradient Transform Modifier and Shape Reference components added automatically to it
newGraph = graph.GraphManagerRequestBus(bus.Broadcast, 'GetGraph', newGraphId)
x = 10.0
y = 10.0
diff --git a/AutomatedTesting/Levels/macbeth_shaderballs/macbeth_shaderballs.prefab b/AutomatedTesting/Levels/macbeth_shaderballs/macbeth_shaderballs.prefab
new file mode 100644
index 0000000000..22504f168a
--- /dev/null
+++ b/AutomatedTesting/Levels/macbeth_shaderballs/macbeth_shaderballs.prefab
@@ -0,0 +1,3401 @@
+{
+ "ContainerEntity": {
+ "Id": "ContainerEntity",
+ "Name": "macbeth_shaderballs",
+ "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_[471076350497]": {
+ "Id": "Entity_[471076350497]",
+ "Name": "WorldOrigin",
+ "Components": {
+ "Component_[10118378636607282023]": {
+ "$type": "AZ::Render::EditorImageBasedLightComponent",
+ "Id": 10118378636607282023,
+ "Controller": {
+ "Configuration": {
+ "diffuseImageAsset": {
+ "assetId": {
+ "guid": "{10853039-DC8A-558A-B27E-4433A6386731}",
+ "subId": 3000
+ },
+ "assetHint": "lightingpresets/lowcontrast/blouberg_sunrise_1_4k_iblskyboxcm_ibldiffuse.exr.streamingimage"
+ },
+ "specularImageAsset": {
+ "assetId": {
+ "guid": "{10853039-DC8A-558A-B27E-4433A6386731}",
+ "subId": 2000
+ },
+ "assetHint": "lightingpresets/lowcontrast/blouberg_sunrise_1_4k_iblskyboxcm_iblspecular.exr.streamingimage"
+ },
+ "exposure": 1.0
+ }
+ }
+ },
+ "Component_[10390989140659450689]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 10390989140659450689,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 6066687697346848609
+ },
+ {
+ "ComponentId": 1538992203183232042,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 10118378636607282023,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[1122756123782465575]": {
+ "$type": "EditorLockComponent",
+ "Id": 1122756123782465575
+ },
+ "Component_[1411541685315998773]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 1411541685315998773
+ },
+ "Component_[1538992203183232042]": {
+ "$type": "AZ::Render::EditorGridComponent",
+ "Id": 1538992203183232042
+ },
+ "Component_[16871442125196328877]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 16871442125196328877,
+ "ChildEntityOrderEntryArray": [
+ {
+ "EntityId": "Entity_[604220336673]"
+ },
+ {
+ "EntityId": "Entity_[599925369377]",
+ "SortIndex": 1
+ },
+ {
+ "EntityId": "Entity_[475371317793]",
+ "SortIndex": 2
+ },
+ {
+ "EntityId": "Entity_[509731056161]",
+ "SortIndex": 3
+ },
+ {
+ "EntityId": "Entity_[505436088865]",
+ "SortIndex": 4
+ },
+ {
+ "EntityId": "Entity_[539795827233]",
+ "SortIndex": 5
+ },
+ {
+ "EntityId": "Entity_[569860598305]",
+ "SortIndex": 6
+ }
+ ]
+ },
+ "Component_[18389136819207633744]": {
+ "$type": "SelectionComponent",
+ "Id": 18389136819207633744
+ },
+ "Component_[2967708543517171475]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 2967708543517171475
+ },
+ "Component_[6066687697346848609]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 6066687697346848609,
+ "Parent Entity": "ContainerEntity"
+ },
+ "Component_[7035058231756199033]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 7035058231756199033
+ },
+ "Component_[7861798362721154905]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 7861798362721154905
+ },
+ "Component_[8535986786667781968]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 8535986786667781968
+ }
+ }
+ },
+ "Entity_[475371317793]": {
+ "Id": "Entity_[475371317793]",
+ "Name": "00_Illuminant",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{29C7358C-9899-56DF-8F99-F654C7138DB8}"
+ },
+ "assetHint": "materials/presets/macbeth/00_illuminant.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[471076350497]",
+ "Transform Data": {
+ "Translate": [
+ -0.020035700872540474,
+ 10.880657196044922,
+ 1.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[479666285089]": {
+ "Id": "Entity_[479666285089]",
+ "Name": "09_moderate_red",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{FD3D09E1-9B20-5761-87A2-388ADD3C966A}"
+ },
+ "assetHint": "materials/presets/macbeth/09_moderate_red.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[505436088865]",
+ "Transform Data": {
+ "Translate": [
+ -2.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[483961252385]": {
+ "Id": "Entity_[483961252385]",
+ "Name": "08_purplish_blue",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{0478869F-5E19-5A5C-AA22-0D31972E83B7}"
+ },
+ "assetHint": "materials/presets/macbeth/08_purplish_blue.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[505436088865]",
+ "Transform Data": {
+ "Translate": [
+ -6.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[488256219681]": {
+ "Id": "Entity_[488256219681]",
+ "Name": "07_orange",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{3E414822-FF6A-5A79-BF1A-66F4C48C381D}"
+ },
+ "assetHint": "materials/presets/macbeth/07_orange.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[505436088865]",
+ "Transform Data": {
+ "Translate": [
+ -10.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[492551186977]": {
+ "Id": "Entity_[492551186977]",
+ "Name": "10_purple",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{6A0A0CBE-FE95-5732-B2A9-442ABAC6B3AA}"
+ },
+ "assetHint": "materials/presets/macbeth/10_purple.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[505436088865]",
+ "Transform Data": {
+ "Translate": [
+ 1.8866175413131714,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[496846154273]": {
+ "Id": "Entity_[496846154273]",
+ "Name": "11_yellowish_green",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{8D382D9F-D56E-523E-8372-C372B002B81D}"
+ },
+ "assetHint": "materials/presets/macbeth/11_yellow_green.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[505436088865]",
+ "Transform Data": {
+ "Translate": [
+ 5.886617660522461,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[501141121569]": {
+ "Id": "Entity_[501141121569]",
+ "Name": "12_orange_yellow",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{7C8D9C96-8D79-5AA5-9A1D-DE68760127D7}"
+ },
+ "assetHint": "materials/presets/macbeth/12_orange_yellow.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[505436088865]",
+ "Transform Data": {
+ "Translate": [
+ 9.886617660522461,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[505436088865]": {
+ "Id": "Entity_[505436088865]",
+ "Name": "Row",
+ "Components": {
+ "Component_[10247332857034196288]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 10247332857034196288
+ },
+ "Component_[1050259146293298025]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 1050259146293298025
+ },
+ "Component_[10963468433108777551]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 10963468433108777551,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 5648156935684358836
+ }
+ ]
+ },
+ "Component_[11044618010943237536]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 11044618010943237536
+ },
+ "Component_[11056805018150955063]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 11056805018150955063,
+ "ChildEntityOrderEntryArray": [
+ {
+ "EntityId": "Entity_[488256219681]"
+ },
+ {
+ "EntityId": "Entity_[483961252385]",
+ "SortIndex": 1
+ },
+ {
+ "EntityId": "Entity_[479666285089]",
+ "SortIndex": 2
+ },
+ {
+ "EntityId": "Entity_[492551186977]",
+ "SortIndex": 3
+ },
+ {
+ "EntityId": "Entity_[496846154273]",
+ "SortIndex": 4
+ },
+ {
+ "EntityId": "Entity_[501141121569]",
+ "SortIndex": 5
+ }
+ ]
+ },
+ "Component_[11466054095979053511]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 11466054095979053511
+ },
+ "Component_[1364058654406679998]": {
+ "$type": "SelectionComponent",
+ "Id": 1364058654406679998
+ },
+ "Component_[1550934027474222562]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 1550934027474222562
+ },
+ "Component_[15938036103959223730]": {
+ "$type": "EditorLockComponent",
+ "Id": 15938036103959223730
+ },
+ "Component_[5648156935684358836]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 5648156935684358836,
+ "Parent Entity": "Entity_[471076350497]",
+ "Transform Data": {
+ "Translate": [
+ 0.0,
+ 2.0,
+ 1.0
+ ]
+ }
+ }
+ }
+ },
+ "Entity_[509731056161]": {
+ "Id": "Entity_[509731056161]",
+ "Name": "Row",
+ "Components": {
+ "Component_[10247332857034196288]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 10247332857034196288
+ },
+ "Component_[1050259146293298025]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 1050259146293298025
+ },
+ "Component_[10963468433108777551]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 10963468433108777551,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 5648156935684358836
+ }
+ ]
+ },
+ "Component_[11044618010943237536]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 11044618010943237536
+ },
+ "Component_[11056805018150955063]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 11056805018150955063,
+ "ChildEntityOrderEntryArray": [
+ {
+ "EntityId": "Entity_[522615958049]"
+ },
+ {
+ "EntityId": "Entity_[518320990753]",
+ "SortIndex": 1
+ },
+ {
+ "EntityId": "Entity_[514026023457]",
+ "SortIndex": 2
+ },
+ {
+ "EntityId": "Entity_[526910925345]",
+ "SortIndex": 3
+ },
+ {
+ "EntityId": "Entity_[531205892641]",
+ "SortIndex": 4
+ },
+ {
+ "EntityId": "Entity_[535500859937]",
+ "SortIndex": 5
+ }
+ ]
+ },
+ "Component_[11466054095979053511]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 11466054095979053511
+ },
+ "Component_[1364058654406679998]": {
+ "$type": "SelectionComponent",
+ "Id": 1364058654406679998
+ },
+ "Component_[1550934027474222562]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 1550934027474222562
+ },
+ "Component_[15938036103959223730]": {
+ "$type": "EditorLockComponent",
+ "Id": 15938036103959223730
+ },
+ "Component_[5648156935684358836]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 5648156935684358836,
+ "Parent Entity": "Entity_[471076350497]",
+ "Transform Data": {
+ "Translate": [
+ 0.0,
+ 6.0,
+ 1.0
+ ]
+ }
+ }
+ }
+ },
+ "Entity_[514026023457]": {
+ "Id": "Entity_[514026023457]",
+ "Name": "03_blue_sky",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{65DF9715-8D50-5852-BDDF-345BF9A36AAF}"
+ },
+ "assetHint": "materials/presets/macbeth/03_blue_sky.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[509731056161]",
+ "Transform Data": {
+ "Translate": [
+ -2.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[518320990753]": {
+ "Id": "Entity_[518320990753]",
+ "Name": "02_light_skin",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{0B0603C9-E7C3-5166-98EC-F8B3A4D469FB}"
+ },
+ "assetHint": "materials/presets/macbeth/02_light_skin.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[509731056161]",
+ "Transform Data": {
+ "Translate": [
+ -6.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[522615958049]": {
+ "Id": "Entity_[522615958049]",
+ "Name": "01_dark_skin",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{73B6CE55-0766-51FD-8D9C-92C60862D270}"
+ },
+ "assetHint": "materials/presets/macbeth/01_dark_skin.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[509731056161]",
+ "Transform Data": {
+ "Translate": [
+ -10.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[526910925345]": {
+ "Id": "Entity_[526910925345]",
+ "Name": "04_foliage",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{C11C560D-F984-5836-928A-45CF96179862}"
+ },
+ "assetHint": "materials/presets/macbeth/04_foliage.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[509731056161]",
+ "Transform Data": {
+ "Translate": [
+ 1.8866175413131714,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[531205892641]": {
+ "Id": "Entity_[531205892641]",
+ "Name": "05_blue_flower",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{3326A6D9-FEA4-5CDE-AE4A-8BD28DF3A7CA}"
+ },
+ "assetHint": "materials/presets/macbeth/05_blue_flower.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[509731056161]",
+ "Transform Data": {
+ "Translate": [
+ 5.886617660522461,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[535500859937]": {
+ "Id": "Entity_[535500859937]",
+ "Name": "06_bluish_green",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{BD7A8B80-242E-50CC-900F-9001945C5A0C}"
+ },
+ "assetHint": "materials/presets/macbeth/06_bluish_green.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[509731056161]",
+ "Transform Data": {
+ "Translate": [
+ 9.886617660522461,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[539795827233]": {
+ "Id": "Entity_[539795827233]",
+ "Name": "Row",
+ "Components": {
+ "Component_[10247332857034196288]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 10247332857034196288
+ },
+ "Component_[1050259146293298025]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 1050259146293298025
+ },
+ "Component_[10963468433108777551]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 10963468433108777551,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 5648156935684358836
+ }
+ ]
+ },
+ "Component_[11044618010943237536]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 11044618010943237536
+ },
+ "Component_[11056805018150955063]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 11056805018150955063,
+ "ChildEntityOrderEntryArray": [
+ {
+ "EntityId": "Entity_[552680729121]"
+ },
+ {
+ "EntityId": "Entity_[548385761825]",
+ "SortIndex": 1
+ },
+ {
+ "EntityId": "Entity_[544090794529]",
+ "SortIndex": 2
+ },
+ {
+ "EntityId": "Entity_[556975696417]",
+ "SortIndex": 3
+ },
+ {
+ "EntityId": "Entity_[561270663713]",
+ "SortIndex": 4
+ },
+ {
+ "EntityId": "Entity_[565565631009]",
+ "SortIndex": 5
+ }
+ ]
+ },
+ "Component_[11466054095979053511]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 11466054095979053511
+ },
+ "Component_[1364058654406679998]": {
+ "$type": "SelectionComponent",
+ "Id": 1364058654406679998
+ },
+ "Component_[1550934027474222562]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 1550934027474222562
+ },
+ "Component_[15938036103959223730]": {
+ "$type": "EditorLockComponent",
+ "Id": 15938036103959223730
+ },
+ "Component_[5648156935684358836]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 5648156935684358836,
+ "Parent Entity": "Entity_[471076350497]",
+ "Transform Data": {
+ "Translate": [
+ 0.0,
+ -2.0,
+ 1.0
+ ]
+ }
+ }
+ }
+ },
+ "Entity_[544090794529]": {
+ "Id": "Entity_[544090794529]",
+ "Name": "15_red",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{9C47066E-BD8F-5C1B-B935-933296BBE312}"
+ },
+ "assetHint": "materials/presets/macbeth/15_red.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[539795827233]",
+ "Transform Data": {
+ "Translate": [
+ -2.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[548385761825]": {
+ "Id": "Entity_[548385761825]",
+ "Name": "14_green",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{82346ED7-D369-5EF0-A7E0-70C1082EE073}"
+ },
+ "assetHint": "materials/presets/macbeth/14_green.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[539795827233]",
+ "Transform Data": {
+ "Translate": [
+ -6.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[552680729121]": {
+ "Id": "Entity_[552680729121]",
+ "Name": "13_blue",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{B8972ADB-DBA9-5807-9742-2B14453FDD96}"
+ },
+ "assetHint": "materials/presets/macbeth/13_blue.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[539795827233]",
+ "Transform Data": {
+ "Translate": [
+ -10.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[556975696417]": {
+ "Id": "Entity_[556975696417]",
+ "Name": "16_yellow",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{099BB2A1-F76E-5B77-BCFD-B0A6249F0EA3}"
+ },
+ "assetHint": "materials/presets/macbeth/16_yellow.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[539795827233]",
+ "Transform Data": {
+ "Translate": [
+ 1.8866175413131714,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[561270663713]": {
+ "Id": "Entity_[561270663713]",
+ "Name": "17_magenta",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{2A83451E-0FE6-508E-BAA2-6142AAA53C42}"
+ },
+ "assetHint": "materials/presets/macbeth/17_magenta.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[539795827233]",
+ "Transform Data": {
+ "Translate": [
+ 5.886617660522461,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[565565631009]": {
+ "Id": "Entity_[565565631009]",
+ "Name": "18_cyan",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{6949B983-05D6-50A4-9D43-A6CDAB2BF3F5}"
+ },
+ "assetHint": "materials/presets/macbeth/18_cyan.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[539795827233]",
+ "Transform Data": {
+ "Translate": [
+ 9.886617660522461,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[569860598305]": {
+ "Id": "Entity_[569860598305]",
+ "Name": "Row",
+ "Components": {
+ "Component_[10247332857034196288]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 10247332857034196288
+ },
+ "Component_[1050259146293298025]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 1050259146293298025
+ },
+ "Component_[10963468433108777551]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 10963468433108777551,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 5648156935684358836
+ }
+ ]
+ },
+ "Component_[11044618010943237536]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 11044618010943237536
+ },
+ "Component_[11056805018150955063]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 11056805018150955063,
+ "ChildEntityOrderEntryArray": [
+ {
+ "EntityId": "Entity_[582745500193]"
+ },
+ {
+ "EntityId": "Entity_[578450532897]",
+ "SortIndex": 1
+ },
+ {
+ "EntityId": "Entity_[574155565601]",
+ "SortIndex": 2
+ },
+ {
+ "EntityId": "Entity_[587040467489]",
+ "SortIndex": 3
+ },
+ {
+ "EntityId": "Entity_[591335434785]",
+ "SortIndex": 4
+ },
+ {
+ "EntityId": "Entity_[595630402081]",
+ "SortIndex": 5
+ }
+ ]
+ },
+ "Component_[11466054095979053511]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 11466054095979053511
+ },
+ "Component_[1364058654406679998]": {
+ "$type": "SelectionComponent",
+ "Id": 1364058654406679998
+ },
+ "Component_[1550934027474222562]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 1550934027474222562
+ },
+ "Component_[15938036103959223730]": {
+ "$type": "EditorLockComponent",
+ "Id": 15938036103959223730
+ },
+ "Component_[5648156935684358836]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 5648156935684358836,
+ "Parent Entity": "Entity_[471076350497]",
+ "Transform Data": {
+ "Translate": [
+ 0.0,
+ -6.0,
+ 1.0
+ ]
+ }
+ }
+ }
+ },
+ "Entity_[574155565601]": {
+ "Id": "Entity_[574155565601]",
+ "Name": "21_neutral_6.5",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{ADAA8BF6-1580-5684-A7F5-4B0150117375}"
+ },
+ "assetHint": "materials/presets/macbeth/21_neutral_6-5_0-44d.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[569860598305]",
+ "Transform Data": {
+ "Translate": [
+ -2.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[578450532897]": {
+ "Id": "Entity_[578450532897]",
+ "Name": "20_neutral_8",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{A9BAEC06-A3F6-53E9-9E3E-61E12048FC75}"
+ },
+ "assetHint": "materials/presets/macbeth/20_neutral_8-0_0-23d.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[569860598305]",
+ "Transform Data": {
+ "Translate": [
+ -6.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[582745500193]": {
+ "Id": "Entity_[582745500193]",
+ "Name": "19_white_9.5",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{94E3052F-2B5A-5C28-912A-C0FDC00F5CD3}"
+ },
+ "assetHint": "materials/presets/macbeth/19_white_9-5_0-05d.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[569860598305]",
+ "Transform Data": {
+ "Translate": [
+ -10.113382339477539,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[587040467489]": {
+ "Id": "Entity_[587040467489]",
+ "Name": "22_neutral_5",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{1E45E15B-8035-5775-B796-A77654CDB094}"
+ },
+ "assetHint": "materials/presets/macbeth/22_neutral_5-0_0-70d.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[569860598305]",
+ "Transform Data": {
+ "Translate": [
+ 1.8866175413131714,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[591335434785]": {
+ "Id": "Entity_[591335434785]",
+ "Name": "23_neutral_3.5",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{23C26041-7155-5FE2-8E12-FACFD52DA006}"
+ },
+ "assetHint": "materials/presets/macbeth/23_neutral_3-5_1-05d.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[569860598305]",
+ "Transform Data": {
+ "Translate": [
+ 5.886617660522461,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[595630402081]": {
+ "Id": "Entity_[595630402081]",
+ "Name": "24_black_2",
+ "Components": {
+ "Component_[12222961627447331506]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 12222961627447331506,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{1D83625A-4016-58F0-A94A-13B92B19F5B5}"
+ },
+ "assetHint": "materials/presets/macbeth/24_black_2-0_1-50d.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[12780007764330464223]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 12780007764330464223
+ },
+ "Component_[12904863407657276829]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 12904863407657276829,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 7205597372613518510
+ },
+ {
+ "ComponentId": 8564054653851438099,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 12222961627447331506,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[13729618014821386240]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 13729618014821386240
+ },
+ "Component_[14429836600052599894]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 14429836600052599894
+ },
+ "Component_[14808014799413383215]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14808014799413383215
+ },
+ "Component_[17252932649882883756]": {
+ "$type": "SelectionComponent",
+ "Id": 17252932649882883756
+ },
+ "Component_[2229055145450914672]": {
+ "$type": "EditorLockComponent",
+ "Id": 2229055145450914672
+ },
+ "Component_[2249882080644631374]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 2249882080644631374
+ },
+ "Component_[7205597372613518510]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 7205597372613518510,
+ "Parent Entity": "Entity_[569860598305]",
+ "Transform Data": {
+ "Translate": [
+ 9.886617660522461,
+ -9.999999974752427e-7,
+ 0.0
+ ],
+ "Rotate": [
+ 0.0,
+ 0.0,
+ 180.00001525878906
+ ]
+ }
+ },
+ "Component_[7918371639409185899]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 7918371639409185899
+ },
+ "Component_[8564054653851438099]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 8564054653851438099,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{D0F73AAF-52B7-507C-B045-DBE2FE2D4403}",
+ "subId": 268677693
+ },
+ "assetHint": "objects/shaderball_simple/shaberball_simple_1m.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ }
+ }
+ },
+ "Entity_[599925369377]": {
+ "Id": "Entity_[599925369377]",
+ "Name": "MacBeth_Chart",
+ "Components": {
+ "Component_[10911367092756441312]": {
+ "$type": "EditorLockComponent",
+ "Id": 10911367092756441312
+ },
+ "Component_[11487615730470734577]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 11487615730470734577
+ },
+ "Component_[1380862607750834390]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 1380862607750834390
+ },
+ "Component_[17376808010180534107]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 17376808010180534107
+ },
+ "Component_[18051852481298910543]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 18051852481298910543
+ },
+ "Component_[2468310869499941539]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 2468310869499941539
+ },
+ "Component_[3104847651593575388]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 3104847651593575388,
+ "Parent Entity": "Entity_[471076350497]",
+ "Transform Data": {
+ "Translate": [
+ 0.0,
+ 0.0,
+ 1.0
+ ],
+ "Scale": [
+ 24.748918533325195,
+ 24.748918533325195,
+ 24.748918533325195
+ ],
+ "UniformScale": 24.748918533325195
+ }
+ },
+ "Component_[4039743767801786212]": {
+ "$type": "AZ::Render::EditorMeshComponent",
+ "Id": 4039743767801786212,
+ "Controller": {
+ "Configuration": {
+ "ModelAsset": {
+ "assetId": {
+ "guid": "{767B3209-EDF7-503A-BF3D-6A69DAABC966}",
+ "subId": 285003870
+ },
+ "assetHint": "materialeditor/viewportmodels/plane_1x1.azmodel"
+ },
+ "LodOverride": 255
+ }
+ }
+ },
+ "Component_[4350883917310195183]": {
+ "$type": "EditorMaterialComponent",
+ "Id": 4350883917310195183,
+ "Controller": {
+ "Configuration": {
+ "materials": {
+ "{}": {
+ "MaterialAsset": {
+ "assetId": {
+ "guid": "{6BCA78B0-98F0-5843-A0D9-2FD6AB5B8B95}"
+ },
+ "assetHint": "materials/presets/macbeth/macbeth_lab_16bit_2014_srgb.azmaterial"
+ }
+ }
+ }
+ }
+ },
+ "materialSlotsByLodEnabled": true
+ },
+ "Component_[5382697958657080154]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 5382697958657080154,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 3104847651593575388
+ },
+ {
+ "ComponentId": 4039743767801786212,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 4350883917310195183,
+ "SortIndex": 2
+ }
+ ]
+ },
+ "Component_[5944774294236360498]": {
+ "$type": "SelectionComponent",
+ "Id": 5944774294236360498
+ },
+ "Component_[7918181081161287223]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 7918181081161287223
+ }
+ }
+ },
+ "Entity_[604220336673]": {
+ "Id": "Entity_[604220336673]",
+ "Name": "Camera1",
+ "Components": {
+ "Component_[10875630838724467144]": {
+ "$type": "{CA11DA46-29FF-4083-B5F6-E02C3A8C3A3D} EditorCameraComponent",
+ "Id": 10875630838724467144,
+ "Controller": {
+ "Configuration": {
+ "EditorEntityId": 604220336673
+ }
+ }
+ },
+ "Component_[11853636775353879324]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 11853636775353879324,
+ "Parent Entity": "Entity_[471076350497]",
+ "Transform Data": {
+ "Translate": [
+ -0.088332898914814,
+ -14.735246658325195,
+ 12.247514724731445
+ ],
+ "Rotate": [
+ -34.60991287231445,
+ 0.19504709541797638,
+ -0.282683789730072
+ ]
+ }
+ },
+ "Component_[14115131108729471373]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14115131108729471373
+ },
+ "Component_[14490537709933782275]": {
+ "$type": "SelectionComponent",
+ "Id": 14490537709933782275
+ },
+ "Component_[15389860813854215395]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 15389860813854215395
+ },
+ "Component_[16956210187152487952]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 16956210187152487952
+ },
+ "Component_[3120168445836073859]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 3120168445836073859,
+ "ComponentOrderEntryArray": [
+ {
+ "ComponentId": 11853636775353879324
+ },
+ {
+ "ComponentId": 6418726603140010485,
+ "SortIndex": 1
+ },
+ {
+ "ComponentId": 6573470892650938647,
+ "SortIndex": 2
+ },
+ {
+ "ComponentId": 10875630838724467144,
+ "SortIndex": 3
+ },
+ {
+ "ComponentId": 9127356411199949930,
+ "SortIndex": 4
+ }
+ ]
+ },
+ "Component_[397791896240265054]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 397791896240265054
+ },
+ "Component_[6418726603140010485]": {
+ "$type": "AZ::Render::EditorExposureControlComponent",
+ "Id": 6418726603140010485,
+ "Controller": {
+ "Configuration": {
+ "ExposureControlType": 1,
+ "EyeAdaptationExposureMin": -10.0,
+ "EyeAdaptationExposureMax": 10.0
+ }
+ }
+ },
+ "Component_[6572845495569063152]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 6572845495569063152
+ },
+ "Component_[6573470892650938647]": {
+ "$type": "AZ::Render::EditorPostFxLayerComponent",
+ "Id": 6573470892650938647
+ },
+ "Component_[7175586201406734874]": {
+ "$type": "EditorLockComponent",
+ "Id": 7175586201406734874
+ },
+ "Component_[7393764569438584638]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 7393764569438584638
+ },
+ "Component_[9127356411199949930]": {
+ "$type": "GenericComponentWrapper",
+ "Id": 9127356411199949930,
+ "m_template": {
+ "$type": "FlyCameraInputComponent"
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/AutomatedTesting/Levels/macbeth_shaderballs/tags.txt b/AutomatedTesting/Levels/macbeth_shaderballs/tags.txt
new file mode 100644
index 0000000000..0d6c1880e7
--- /dev/null
+++ b/AutomatedTesting/Levels/macbeth_shaderballs/tags.txt
@@ -0,0 +1,12 @@
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
+0,0,0,0,0,0
diff --git a/AutomatedTesting/Objects/sphere_5lods.fbx b/AutomatedTesting/Objects/sphere_5lods.fbx
new file mode 100644
index 0000000000..965738c933
--- /dev/null
+++ b/AutomatedTesting/Objects/sphere_5lods.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e169277bca473325281d5fe043cffc9196bd3ef46f6bffbea6e0b5e3b7194a1
+size 62700
diff --git a/AutomatedTesting/Objects/sphere_5lods.fbx.assetinfo b/AutomatedTesting/Objects/sphere_5lods.fbx.assetinfo
new file mode 100644
index 0000000000..d46cbf322a
--- /dev/null
+++ b/AutomatedTesting/Objects/sphere_5lods.fbx.assetinfo
@@ -0,0 +1,8 @@
+{
+ "values": [
+ {
+ "$type": "ScriptProcessorRule",
+ "scriptFilename": "Editor/Scripts/auto_lod.py"
+ }
+ ]
+}
diff --git a/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt b/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt
index d3975ced7c..8084defe84 100644
--- a/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt
+++ b/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt
@@ -2,24 +2,24 @@ These tests are mostly done with files that have a different extension between s
The source scan is done first, and will catch files in the source path.
Product path searching is resolved using "endsWith" logic.
textures/_dev_purple.tif.streamingimage
-Back slashes, and project name in the path
-pc/textures/_dev_stucco.tif.streamingimage
+Back slashes
+textures\_dev_stucco.tif.streamingimage
Double back slashes
textures\\_dev_tan.tif.streamingimage
Casing doesn't match
TEXTURES/_DEV_WHITE.tif.streamingimage
Some files have multiple extensions, this verifies that won't trip up the scanner.
textures/_dev_yellow_light.tif.1002.imagemipchain
-Path inline textures/milestone2/ama_grey_02.tif.streamingimage test
+Path inline textures/_dev_woodland.tif.1002.imagemipchain test
Path after=textures/_dev_woodland.tif.streamingimage equal sign
Multiple paths on one line
-Multiple materials/am_grass1.mtl paths materials/am_rockground.mtl on one line
-Path before a UUID
-Path materials/floor_tile.mtl before B92667DC-9F5B-5D72-A29D-99219DD9B691 a UUID
-Path before an asset ID
-Path ui/milestone2menu.uicanvas before an 2ef92b8D044E5C278E2BB1AC0374A4E7:1002 asset ID
-Path after a UUID
-Path after CEAA362B4E505BCEB827CB92EF40A50E a project.json UUID
-Path after an asset ID
-Path after {A2482826-053D-5634-A27B-084B1326AAE5}:[1002] an libs/particles/milestone2particles.xml asset ID
+Multiple textures/_dev_yellow_light.tif.streamingimage paths textures/_dev_yellow_med.tif.1002.imagemipchain on one line
+Path before a UUID for SelfReferenceUUID text file
+Path textures/lights/flare01.tif.streamingimage before 33BCEE02-F322-5688-ABEE-534F6058593F a UUID
+Path before an asset ID for _dev_red image
+Path textures/test_texture_sequence/test_texture_sequence000.png.streamingimage before an 2ef92b8D044E5C278E2BB1AC0374A4E7:1002 asset ID
+Path after a UUID for SelfReferenceAssetID text file
+Path after 785A05D2-483E-5B43-A2B9-92ACDAE6E938 a textures/test_texture_sequence/test_texture_sequence001.png.streamingimage UUID
+Path after an asset ID for _dev_purple image file
+Path after {A2482826-053D-5634-A27B-084B1326AAE5}:[1002] an textures/_dev_purple_glass.tif.1002.imagemipchain asset ID
diff --git a/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt b/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt
index a5ae046b11..df3bcc896e 100644
--- a/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt
+++ b/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt
@@ -3,6 +3,6 @@ TestAssets/RelativeProductPathsNotDependencies.txt
Back slashes
TestAssets\WildcardScanTest1.txt
Casing doesn't match
-libs/particles/milestone2PARTICLES.XML
-Path inline project.json test
+TESTASSETS/ReportONEmISSINGdEPENDENCY.tXT
+Path inline TestAssets/InvalidAssetIdNoReport.txt test
Path after=textures/_dev_Purple.tif equal sign
diff --git a/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt b/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt
index 4cda459232..0b9df7c99d 100644
--- a/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt
+++ b/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt
@@ -1,5 +1,7 @@
+File extensions are separated from file names, so the missing dependency scanner doesn't find when scanning, and only finds the asset IDs in this file.
+
/textures /_dev_Purple . tif, the product ID is for one of the mips.
{A2482826-053D-5634-A27B-084B1326AAE5}:[1002]
_dev_Red . tif, another mip, different formatting.
-2ef92b8D044E5C278E2BB1AC0374A4E7:1003
+2ef92b8D044E5C278E2BB1AC0374A4E7:1000
_dev_White.tif, {D83B36F1-61A6-5001-B191-4D0CE282E236}-1002 asset ID inline.
diff --git a/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt b/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt
index 436d6fb628..91c518ef2f 100644
--- a/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt
+++ b/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt
@@ -1,18 +1,19 @@
Paths are broken up to avoid having them show up as relative path results.
+All references are to other text files in this folder, extensions are omitted to make sure only UUID scanning finds these references.
-This is the UUID for Materials / Default / AM_UV_v1_1K_source . png
-C67BEA9F-09FF-59AA-A7F0-A52B8F987508
-This is the UUID for libs / particles / milestone2particles . xml. This tests UUIDs without separators.
-6BDE282B49C957F7B0714B26579BCA9A
-This is the UUID for SelfReferenceUUID.txt. This tests UUIDs with mixed casing.
+This is the UUID for InvalidAssetIdNoReport
+E68A85B0-131D-5A82-B2D5-BC58EE4062AE
+This is the UUID for InvalidRelativePathsNoReport. This tests UUIDs without separators.
+B3EF12DD306C520EB0A8A6B0D031A195
+This is the UUID for SelfReferenceUUID. This tests UUIDs with mixed casing.
33bcee02F3225688ABEE534F6058593F
-This is a UUID mid-line B076CDDC-14DF-50F4-A5E9-7518ABB3E851, for project . json
+This is a UUID mid-line DD587FBE-16C8-5B98-AE3C-A9F8750B2692, for SelfReferencePath
-Two UUIDs on the same line
-Two UUIDs 345E5C660D6254FF8D0F7C8EE66A2249 mixed on A26C73D1837E5AE59E68F916FA7C3699 the same line
+InvalidUUIDNoReport and MaxIteration31Deep
+Two UUIDs 837412DF-D05F-576D-81AA-ACF360463749 mixed on 3F642A0FDC825696A70A1DA5709744DF the same line
Test UUIDs and Asset IDs mixed on the same line. Relative paths are handled in the relative path tests.
-UUID: slices / MuzzleFlash . slice, AssetID: TestsAssets / WildcardScanTest1 . txt
-This 747D31D71E62553592226173C49CF97E uuid is on the line with 1CB10C43F3245B93A294C602ADEF95F9:[0] a valid asset ID
-UUID: Objects / Lumbertank_turret . cgf, AssetID: TestsAssets / WildcardScanTest2 . txt
-This D92C4661C8985E19BD3597CB2318CFA6:[0] uuid is on the line with 37108522F50459499CD6C8D47A960CF1 a valid asset ID
+OnlyMatchesCorrectLengthUUIDs and WildcardScanTest1
+This 2545AD8B-1B9B-5F93-859D-D8DC1DC2B480 uuid is on the line with 1CB10C43F3245B93A294C602ADEF95F9:[0] a valid asset ID
+RelativeProductPathsNotDependencies and WildcardScanTest2
+This B772953CA08A5D209491530E87D11504:[0] uuid is on the line with D92C4661C8985E19BD3597CB2318CFA6 a valid asset ID
diff --git a/Code/Editor/BaseLibrary.cpp b/Code/Editor/BaseLibrary.cpp
index 9f26630c2c..15742bd254 100644
--- a/Code/Editor/BaseLibrary.cpp
+++ b/Code/Editor/BaseLibrary.cpp
@@ -14,66 +14,6 @@
#include "Include/IBaseLibraryManager.h"
#include
#include
-#include "Undo/IUndoObject.h"
-
-//////////////////////////////////////////////////////////////////////////
-// Undo functionality for libraries.
-//////////////////////////////////////////////////////////////////////////
-
-class CUndoBaseLibrary
- : public IUndoObject
-{
-public:
- CUndoBaseLibrary(CBaseLibrary* pLib, const QString& description, const QString& selectedItem = QString())
- : m_pLib(pLib)
- , m_description(description)
- , m_redo(nullptr)
- , m_selectedItem(selectedItem)
- {
- assert(m_pLib);
-
- m_undo = GetIEditor()->GetSystem()->CreateXmlNode("Undo");
- m_pLib->Serialize(m_undo, false);
- }
-
- QString GetEditorObjectName() override
- {
- return m_selectedItem;
- }
-
-protected:
- int GetSize() override { return sizeof(CUndoBaseLibrary); }
- QString GetDescription() override { return m_description; };
-
- void Undo(bool bUndo) override
- {
- if (bUndo)
- {
- m_redo = GetIEditor()->GetSystem()->CreateXmlNode("Redo");
- m_pLib->Serialize(m_redo, false);
- }
- m_pLib->Serialize(m_undo, true);
- m_pLib->SetModified();
- GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
- }
-
- void Redo() override
- {
- m_pLib->Serialize(m_redo, true);
- m_pLib->SetModified();
- GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
- }
-
-private:
- QString m_description;
- QString m_selectedItem;
- _smart_ptr m_pLib;
- XmlNodeRef m_undo;
- XmlNodeRef m_redo;
-};
-
-
-
//////////////////////////////////////////////////////////////////////////
// CBaseLibrary implementation.
diff --git a/Code/Editor/BaseLibraryItem.cpp b/Code/Editor/BaseLibraryItem.cpp
index b1fba91fad..e3788bc3e4 100644
--- a/Code/Editor/BaseLibraryItem.cpp
+++ b/Code/Editor/BaseLibraryItem.cpp
@@ -29,7 +29,6 @@ public:
assert(libMgr);
m_itemPath = libItem->GetFullName();
- m_description = "Lib item changed: " + m_itemPath;
//serialize the lib item to undo
m_undoCtx.node = GetIEditor()->GetSystem()->CreateXmlNode("Undo");
@@ -45,13 +44,8 @@ public:
m_size = sizeof(CUndoBaseLibraryItem);
m_size += static_cast(xmlStr.GetAllocatedMemory());
m_size += m_itemPath.length();
- m_size += m_description.length();
}
- QString GetEditorObjectName() override
- {
- return m_itemPath;
- }
protected:
int GetSize() override
@@ -59,11 +53,6 @@ protected:
return m_size;
}
- QString GetDescription() override
- {
- return m_description;
- }
-
void Undo(bool bUndo) override
{
//find the libItem
@@ -111,7 +100,6 @@ protected:
}
private:
- QString m_description;
QString m_itemPath;
IDataBaseItem::SerializeContext m_undoCtx; //saved before operation
IDataBaseItem::SerializeContext m_redoCtx; //saved after operation so used for redo
diff --git a/Code/Editor/BaseLibraryManager.cpp b/Code/Editor/BaseLibraryManager.cpp
index 7346ffaf8c..0e51a5238c 100644
--- a/Code/Editor/BaseLibraryManager.cpp
+++ b/Code/Editor/BaseLibraryManager.cpp
@@ -17,120 +17,6 @@
#include "ErrorReport.h"
#include "Undo/IUndoObject.h"
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Undo functionality for Managers, including add library, remove library, and rename library -- Vera, Confetti
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class CUndoBaseLibraryManager
- : public IUndoObject
-{
-public:
- CUndoBaseLibraryManager(CBaseLibraryManager* pMngr, const QString& description, const QString& modifiedManager = nullptr)
- : m_pMngr(pMngr)
- , m_description(description)
- , m_editorObject(modifiedManager)
- {
- assert(m_pMngr);
- SerializeTo(m_undos);
- }
-
- QString GetEditorObjectName() override
- {
- return m_editorObject;
- }
-
-protected:
- int GetSize() override { return sizeof(CUndoBaseLibraryManager); }
- QString GetDescription() override { return m_description; };
-
- void Undo(bool bUndo) override
- {
- if (bUndo)
- {
- SerializeTo(m_redos);
- }
- m_pMngr->ClearAll();
- UnserializeFrom(m_undos);
- GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
- }
-
- void Redo() override
- {
- m_pMngr->ClearAll();
- UnserializeFrom(m_redos);
- GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
- }
-
-private:
- struct LibUndoNode
- : public _i_reference_target_t
- {
- LibUndoNode()
- {
- node = nullptr;
- fileName = "";
- }
- XmlNodeRef node;
- QString fileName;
- };
-
- static const char* const LIBRARY_TAG;
- static const char* const LEVEL_LIBRARY_TAG;
-
- void SerializeTo(std::vector<_smart_ptr >& undos) // Save Library Undo
- {
- undos.clear();
- for (int i = 0; i < m_pMngr->GetLibraryCount(); i++)
- {
- IDataBaseLibrary* library = m_pMngr->GetLibrary(i);
-
- const char* tag = library->IsLevelLibrary() ? LEVEL_LIBRARY_TAG : LIBRARY_TAG;
- XmlNodeRef node = GetIEditor()->GetSystem()->CreateXmlNode(tag);
- QString file = library->GetFilename().isEmpty() ? library->GetFilename() : library->GetName();
- library->Serialize(node, false);
- if (node && !file.isEmpty())
- {
- _smart_ptr undo = new LibUndoNode();
- undo->fileName = file;
- undo->node = node;
- undos.push_back(undo);
- }
- }
- }
-
- void UnserializeFrom(std::vector<_smart_ptr >& undos) // Load Library Undo
- {
- for (int i = 0; i < undos.size(); i++)
- {
- _smart_ptr undo = undos[i];
- if (undo->node && !undo->fileName.isEmpty())
- {
- //AddLibrary adds a .xml to the end of the library path, this will remove the extra for compatibility
- undo->fileName.replace(m_pMngr->GetLibsPath().toLower(), "");
- undo->fileName.replace(".xml", "");
-
- const bool isLevelLibrary = (strcmp(undo->node->getTag(), LEVEL_LIBRARY_TAG) == 0);
-
- IDataBaseLibrary* library = m_pMngr->AddLibrary(undo->fileName, isLevelLibrary);
- library->Serialize(undo->node, true);
- }
- }
- }
-
-
- QString m_description;
- QString m_editorObject;
- CBaseLibraryManager* m_pMngr;
- std::vector<_smart_ptr > m_undos;
- std::vector<_smart_ptr > m_redos;
-};
-
-const char* const CUndoBaseLibraryManager::LIBRARY_TAG = "UndoLibrary";
-const char* const CUndoBaseLibraryManager::LEVEL_LIBRARY_TAG = "UndoLevelLibrary";
-
-
-
//////////////////////////////////////////////////////////////////////////
// CBaseLibraryManager implementation.
//////////////////////////////////////////////////////////////////////////
@@ -606,11 +492,9 @@ void CBaseLibraryManager::RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid)
if (m_bUniqGuidMap)
{
- bool bNewItem = true;
REFGUID oldGuid = pItem->GetGUID();
if (!GuidUtil::IsEmpty(oldGuid))
{
- bNewItem = false;
m_itemsGuidMap.erase(oldGuid);
}
if (GuidUtil::IsEmpty(newGuid))
diff --git a/Code/Editor/CMakeLists.txt b/Code/Editor/CMakeLists.txt
index 693799e08b..3358b49dce 100644
--- a/Code/Editor/CMakeLists.txt
+++ b/Code/Editor/CMakeLists.txt
@@ -131,7 +131,7 @@ ly_add_source_properties(
PROPERTY COMPILE_DEFINITIONS
VALUES
O3DE_COPYRIGHT_YEAR=${LY_VERSION_COPYRIGHT_YEAR}
- LY_BUILD=${LY_VERSION_BUILD_NUMBER}
+ LY_VERSION_BUILD_NUMBER=${LY_VERSION_BUILD_NUMBER}
${LY_PAL_TOOLS_DEFINES}
)
ly_add_source_properties(
diff --git a/Code/Editor/Controls/SplineCtrlEx.cpp b/Code/Editor/Controls/SplineCtrlEx.cpp
index 1dc2ff19e1..bff75af169 100644
--- a/Code/Editor/Controls/SplineCtrlEx.cpp
+++ b/Code/Editor/Controls/SplineCtrlEx.cpp
@@ -82,7 +82,6 @@ protected:
}
int GetSize() override { return sizeof(*this); }
- QString GetDescription() override { return "UndoSplineCtrlEx"; };
void Undo(bool bUndo) override
{
diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp
index ad04e355f5..d5f2305dfb 100644
--- a/Code/Editor/CryEdit.cpp
+++ b/Code/Editor/CryEdit.cpp
@@ -33,6 +33,7 @@ AZ_POP_DISABLE_WARNING
#include
#include
#include
+#include
#include
// Aws Native SDK
@@ -911,13 +912,9 @@ namespace
QWidget* g_splashScreen = nullptr;
}
-QString FormatVersion(const SFileVersion& v)
+QString FormatVersion([[maybe_unused]] const SFileVersion& v)
{
-#if defined(LY_BUILD)
- return QObject::tr("Version %1.%2.%3.%4 - Build %5").arg(v[3]).arg(v[2]).arg(v[1]).arg(v[0]).arg(LY_BUILD);
-#else
- return QObject::tr("Version %1.%2.%3.%4").arg(v[3]).arg(v[2]).arg(v[1]).arg(v[0]);
-#endif
+ return QObject::tr("Version %1").arg(LY_VERSION_BUILD_NUMBER);
}
QString FormatRichTextCopyrightNotice()
@@ -4020,7 +4017,7 @@ void CCryEditApp::OnError(AzFramework::AssetSystem::AssetSystemErrors error)
break;
}
- CryMessageBox(errorMessage.c_str(), "Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
+ QMessageBox::critical(nullptr,"Error",errorMessage.c_str());
}
void CCryEditApp::OnOpenProceduralMaterialEditor()
diff --git a/Code/Editor/CryEditDoc.cpp b/Code/Editor/CryEditDoc.cpp
index 9c6c257ac0..3bcba4d5e0 100644
--- a/Code/Editor/CryEditDoc.cpp
+++ b/Code/Editor/CryEditDoc.cpp
@@ -51,7 +51,6 @@
#include "GameExporter.h"
#include "MainWindow.h"
#include "LevelFileDialog.h"
-#include "StatObjBus.h"
#include "Undo/Undo.h"
#include
@@ -246,9 +245,6 @@ void CCryEditDoc::DeleteContents()
EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, ResetEditorContext);
- // [LY-90904] move this to the EditorVegetationManager component
- InstanceStatObjEventBus::Broadcast(&InstanceStatObjEventBus::Events::ReleaseData);
-
//////////////////////////////////////////////////////////////////////////
// Clear all undo info.
//////////////////////////////////////////////////////////////////////////
@@ -308,8 +304,6 @@ void CCryEditDoc::Save(TDocMultiArchive& arrXmlAr)
// Fog settings ///////////////////////////////////////////////////////
SerializeFogSettings((*arrXmlAr[DMAS_GENERAL]));
-
- SerializeNameSelection((*arrXmlAr[DMAS_GENERAL]));
}
}
AfterSave();
@@ -455,12 +449,6 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
}
}
- if (!isPrefabEnabled)
- {
- // Name Selection groups
- SerializeNameSelection((*arrXmlAr[DMAS_GENERAL]));
- }
-
{
CAutoLogTime logtime("Post Load");
@@ -595,16 +583,6 @@ void CCryEditDoc::SerializeFogSettings(CXmlArchive& xmlAr)
}
}
-void CCryEditDoc::SerializeNameSelection(CXmlArchive& xmlAr)
-{
- IObjectManager* pObjManager = GetIEditor()->GetObjectManager();
-
- if (pObjManager)
- {
- pObjManager->SerializeNameSelection(xmlAr.root, xmlAr.bLoading);
- }
-}
-
void CCryEditDoc::SetModifiedModules(EModifiedModule eModifiedModule, bool boSet)
{
if (!boSet)
diff --git a/Code/Editor/CryEditDoc.h b/Code/Editor/CryEditDoc.h
index e64bdb1308..f7e97d308e 100644
--- a/Code/Editor/CryEditDoc.h
+++ b/Code/Editor/CryEditDoc.h
@@ -24,7 +24,6 @@
#include
#endif
-class CClouds;
struct LightingSettings;
struct IVariable;
struct ICVar;
@@ -124,7 +123,6 @@ public: // Create from serialization only
const char* GetTemporaryLevelName() const;
void DeleteTemporaryLevel();
- CClouds* GetClouds() { return m_pClouds; }
void SetWaterColor(const QColor& col) { m_waterColor = col; }
QColor GetWaterColor() const { return m_waterColor; }
XmlNodeRef& GetFogTemplate() { return m_fogTemplate; }
@@ -163,7 +161,6 @@ protected:
bool LoadEntitiesFromSlice(const QString& sliceFile);
void SerializeFogSettings(CXmlArchive& xmlAr);
virtual void SerializeViewSettings(CXmlArchive& xmlAr);
- void SerializeNameSelection(CXmlArchive& xmlAr);
void LogLoadTime(int time) const;
struct TSaveDocContext
@@ -195,7 +192,6 @@ protected:
QColor m_waterColor = QColor(0, 0, 255);
XmlNodeRef m_fogTemplate;
XmlNodeRef m_environmentTemplate;
- CClouds* m_pClouds;
std::list m_listeners;
bool m_bDocumentReady = false;
ICVar* doc_validate_surface_types = nullptr;
diff --git a/Code/Editor/EditorPreferencesPageViewportManipulator.cpp b/Code/Editor/EditorPreferencesPageViewportManipulator.cpp
index ea00d6a7f0..32e0e5b573 100644
--- a/Code/Editor/EditorPreferencesPageViewportManipulator.cpp
+++ b/Code/Editor/EditorPreferencesPageViewportManipulator.cpp
@@ -10,6 +10,8 @@
#include "EditorPreferencesPageViewportManipulator.h"
+#include
+
// Editor
#include "EditorViewportSettings.h"
#include "Settings.h"
@@ -19,7 +21,17 @@ void CEditorPreferencesPage_ViewportManipulator::Reflect(AZ::SerializeContext& s
serialize.Class()
->Version(1)
->Field("LineBoundWidth", &Manipulators::m_manipulatorLineBoundWidth)
- ->Field("CircleBoundWidth", &Manipulators::m_manipulatorCircleBoundWidth);
+ ->Field("CircleBoundWidth", &Manipulators::m_manipulatorCircleBoundWidth)
+ ->Field("LinearManipulatorAxisLength", &Manipulators::m_linearManipulatorAxisLength)
+ ->Field("PlanarManipulatorAxisLength", &Manipulators::m_planarManipulatorAxisLength)
+ ->Field("SurfaceManipulatorRadius", &Manipulators::m_surfaceManipulatorRadius)
+ ->Field("SurfaceManipulatorOpacity", &Manipulators::m_surfaceManipulatorOpacity)
+ ->Field("LinearManipulatorConeLength", &Manipulators::m_linearManipulatorConeLength)
+ ->Field("LinearManipulatorConeRadius", &Manipulators::m_linearManipulatorConeRadius)
+ ->Field("ScaleManipulatorBoxHalfExtent", &Manipulators::m_scaleManipulatorBoxHalfExtent)
+ ->Field("RotationManipulatorRadius", &Manipulators::m_rotationManipulatorRadius)
+ ->Field("ManipulatorViewBaseScale", &Manipulators::m_manipulatorViewBaseScale)
+ ->Field("FlipManipulatorAxesTowardsView", &Manipulators::m_flipManipulatorAxesTowardsView);
serialize.Class()->Version(2)->Field(
"Manipulators", &CEditorPreferencesPage_ViewportManipulator::m_manipulators);
@@ -36,7 +48,55 @@ void CEditorPreferencesPage_ViewportManipulator::Reflect(AZ::SerializeContext& s
AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_manipulatorCircleBoundWidth, "Circle Bound Width",
"Manipulator Circle Bound Width")
->Attribute(AZ::Edit::Attributes::Min, 0.001f)
- ->Attribute(AZ::Edit::Attributes::Max, 2.0f);
+ ->Attribute(AZ::Edit::Attributes::Max, 2.0f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_linearManipulatorAxisLength, "Linear Manipulator Axis Length",
+ "Length of default Linear Manipulator (for Translation and Scale Manipulators)")
+ ->Attribute(AZ::Edit::Attributes::Min, 0.1f)
+ ->Attribute(AZ::Edit::Attributes::Max, 5.0f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_planarManipulatorAxisLength, "Planar Manipulator Axis Length",
+ "Length of default Planar Manipulator (for Translation Manipulators)")
+ ->Attribute(AZ::Edit::Attributes::Min, 0.1f)
+ ->Attribute(AZ::Edit::Attributes::Max, 5.0f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_surfaceManipulatorRadius, "Surface Manipulator Radius",
+ "Radius of default Surface Manipulator (for Translation Manipulators)")
+ ->Attribute(AZ::Edit::Attributes::Min, 0.05f)
+ ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_surfaceManipulatorOpacity, "Surface Manipulator Opacity",
+ "Opacity of default Surface Manipulator (for Translation Manipulators)")
+ ->Attribute(AZ::Edit::Attributes::Min, 0.01f)
+ ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_linearManipulatorConeLength, "Linear Manipulator Cone Length",
+ "Length of cone for default Linear Manipulator (for Translation Manipulators)")
+ ->Attribute(AZ::Edit::Attributes::Min, 0.05f)
+ ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_linearManipulatorConeRadius, "Linear Manipulator Cone Radius",
+ "Radius of cone for default Linear Manipulator (for Translation Manipulators)")
+ ->Attribute(AZ::Edit::Attributes::Min, 0.05f)
+ ->Attribute(AZ::Edit::Attributes::Max, 0.5f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_scaleManipulatorBoxHalfExtent, "Scale Manipulator Box Half Extent",
+ "Half extent of box for default Scale Manipulator")
+ ->Attribute(AZ::Edit::Attributes::Min, 0.05f)
+ ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_rotationManipulatorRadius, "Rotation Manipulator Radius",
+ "Radius of default Angular Manipulators (for Rotation Manipulators)")
+ ->Attribute(AZ::Edit::Attributes::Min, 0.5f)
+ ->Attribute(AZ::Edit::Attributes::Max, 5.0f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_manipulatorViewBaseScale, "Manipulator View Base Scale",
+ "The base scale to apply to all Manipulator Views (default is 1.0)")
+ ->Attribute(AZ::Edit::Attributes::Min, 0.5f)
+ ->Attribute(AZ::Edit::Attributes::Max, 2.0f)
+ ->DataElement(
+ AZ::Edit::UIHandlers::CheckBox, &Manipulators::m_flipManipulatorAxesTowardsView, "Flip Manipulator Axes Towards View",
+ "Determines whether Planar and Linear Manipulators should switch to face the view (camera) in the Editor");
editContext
->Class("Manipulator Viewport Preferences", "Manipulator Viewport Preferences")
@@ -82,10 +142,32 @@ void CEditorPreferencesPage_ViewportManipulator::OnApply()
{
SandboxEditor::SetManipulatorLineBoundWidth(m_manipulators.m_manipulatorLineBoundWidth);
SandboxEditor::SetManipulatorCircleBoundWidth(m_manipulators.m_manipulatorCircleBoundWidth);
+
+ AzToolsFramework::SetLinearManipulatorAxisLength(m_manipulators.m_linearManipulatorAxisLength);
+ AzToolsFramework::SetPlanarManipulatorAxisLength(m_manipulators.m_planarManipulatorAxisLength);
+ AzToolsFramework::SetSurfaceManipulatorRadius(m_manipulators.m_surfaceManipulatorRadius);
+ AzToolsFramework::SetSurfaceManipulatorOpacity(m_manipulators.m_surfaceManipulatorOpacity);
+ AzToolsFramework::SetLinearManipulatorConeLength(m_manipulators.m_linearManipulatorConeLength);
+ AzToolsFramework::SetLinearManipulatorConeRadius(m_manipulators.m_linearManipulatorConeRadius);
+ AzToolsFramework::SetScaleManipulatorBoxHalfExtent(m_manipulators.m_scaleManipulatorBoxHalfExtent);
+ AzToolsFramework::SetRotationManipulatorRadius(m_manipulators.m_rotationManipulatorRadius);
+ AzToolsFramework::SetFlipManipulatorAxesTowardsView(m_manipulators.m_flipManipulatorAxesTowardsView);
+ AzToolsFramework::SetManipulatorViewBaseScale(m_manipulators.m_manipulatorViewBaseScale);
}
void CEditorPreferencesPage_ViewportManipulator::InitializeSettings()
{
m_manipulators.m_manipulatorLineBoundWidth = SandboxEditor::ManipulatorLineBoundWidth();
m_manipulators.m_manipulatorCircleBoundWidth = SandboxEditor::ManipulatorCircleBoundWidth();
+
+ m_manipulators.m_linearManipulatorAxisLength = AzToolsFramework::LinearManipulatorAxisLength();
+ m_manipulators.m_planarManipulatorAxisLength = AzToolsFramework::PlanarManipulatorAxisLength();
+ m_manipulators.m_surfaceManipulatorRadius = AzToolsFramework::SurfaceManipulatorRadius();
+ m_manipulators.m_surfaceManipulatorOpacity = AzToolsFramework::SurfaceManipulatorOpacity();
+ m_manipulators.m_linearManipulatorConeLength = AzToolsFramework::LinearManipulatorConeLength();
+ m_manipulators.m_linearManipulatorConeRadius = AzToolsFramework::LinearManipulatorConeRadius();
+ m_manipulators.m_scaleManipulatorBoxHalfExtent = AzToolsFramework::ScaleManipulatorBoxHalfExtent();
+ m_manipulators.m_rotationManipulatorRadius = AzToolsFramework::RotationManipulatorRadius();
+ m_manipulators.m_flipManipulatorAxesTowardsView = AzToolsFramework::FlipManipulatorAxesTowardsView();
+ m_manipulators.m_manipulatorViewBaseScale = AzToolsFramework::ManipulatorViewBaseScale();
}
diff --git a/Code/Editor/EditorPreferencesPageViewportManipulator.h b/Code/Editor/EditorPreferencesPageViewportManipulator.h
index 93db6a7035..eb76cec2c5 100644
--- a/Code/Editor/EditorPreferencesPageViewportManipulator.h
+++ b/Code/Editor/EditorPreferencesPageViewportManipulator.h
@@ -41,6 +41,16 @@ private:
float m_manipulatorLineBoundWidth = 0.0f;
float m_manipulatorCircleBoundWidth = 0.0f;
+ float m_linearManipulatorAxisLength = 0.0f;
+ float m_planarManipulatorAxisLength = 0.0f;
+ float m_surfaceManipulatorRadius = 0.0f;
+ float m_surfaceManipulatorOpacity = 0.0f;
+ float m_linearManipulatorConeLength = 0.0f;
+ float m_linearManipulatorConeRadius = 0.0f;
+ float m_scaleManipulatorBoxHalfExtent = 0.0f;
+ float m_rotationManipulatorRadius = 0.0f;
+ float m_manipulatorViewBaseScale = 0.0f;
+ bool m_flipManipulatorAxesTowardsView = false;
};
Manipulators m_manipulators;
diff --git a/Code/Editor/EditorViewportSettings.cpp b/Code/Editor/EditorViewportSettings.cpp
index ae188c7d98..e06b9696e1 100644
--- a/Code/Editor/EditorViewportSettings.cpp
+++ b/Code/Editor/EditorViewportSettings.cpp
@@ -12,6 +12,7 @@
#include
#include
#include
+#include
namespace SandboxEditor
{
@@ -57,31 +58,6 @@ namespace SandboxEditor
constexpr AZStd::string_view CameraDefaultStartingPositionY = "/Amazon/Preferences/Editor/Camera/DefaultStartingPosition/y";
constexpr AZStd::string_view CameraDefaultStartingPositionZ = "/Amazon/Preferences/Editor/Camera/DefaultStartingPosition/z";
- template
- void SetRegistry(const AZStd::string_view setting, T&& value)
- {
- if (auto* registry = AZ::SettingsRegistry::Get())
- {
- registry->Set(setting, AZStd::forward(value));
- }
- }
-
- template
- AZStd::remove_cvref_t GetRegistry(const AZStd::string_view setting, T&& defaultValue)
- {
- AZStd::remove_cvref_t value = AZStd::forward(defaultValue);
- if (const auto* registry = AZ::SettingsRegistry::Get())
- {
- T potentialValue;
- if (registry->Get(potentialValue, setting))
- {
- value = AZStd::move(potentialValue);
- }
- }
-
- return value;
- }
-
struct EditorViewportSettingsCallbacksImpl : public EditorViewportSettingsCallbacks
{
EditorViewportSettingsCallbacksImpl()
@@ -118,399 +94,409 @@ namespace SandboxEditor
AZ::Vector3 CameraDefaultEditorPosition()
{
return AZ::Vector3(
- aznumeric_cast(GetRegistry(CameraDefaultStartingPositionX, 0.0)),
- aznumeric_cast(GetRegistry(CameraDefaultStartingPositionY, -10.0)),
- aznumeric_cast(GetRegistry(CameraDefaultStartingPositionZ, 4.0)));
+ aznumeric_cast(AzToolsFramework::GetRegistry(CameraDefaultStartingPositionX, 0.0)),
+ aznumeric_cast(AzToolsFramework::GetRegistry(CameraDefaultStartingPositionY, -10.0)),
+ aznumeric_cast(AzToolsFramework::GetRegistry(CameraDefaultStartingPositionZ, 4.0)));
}
void SetCameraDefaultEditorPosition(const AZ::Vector3& defaultCameraPosition)
{
- SetRegistry(CameraDefaultStartingPositionX, defaultCameraPosition.GetX());
- SetRegistry(CameraDefaultStartingPositionY, defaultCameraPosition.GetY());
- SetRegistry(CameraDefaultStartingPositionZ, defaultCameraPosition.GetZ());
+ AzToolsFramework::SetRegistry(CameraDefaultStartingPositionX, defaultCameraPosition.GetX());
+ AzToolsFramework::SetRegistry(CameraDefaultStartingPositionY, defaultCameraPosition.GetY());
+ AzToolsFramework::SetRegistry(CameraDefaultStartingPositionZ, defaultCameraPosition.GetZ());
}
AZ::u64 MaxItemsShownInAssetBrowserSearch()
{
- return GetRegistry(AssetBrowserMaxItemsShownInSearchSetting, aznumeric_cast(50));
+ return AzToolsFramework::GetRegistry(AssetBrowserMaxItemsShownInSearchSetting, aznumeric_cast(50));
}
void SetMaxItemsShownInAssetBrowserSearch(const AZ::u64 numberOfItemsShown)
{
- SetRegistry(AssetBrowserMaxItemsShownInSearchSetting, numberOfItemsShown);
+ AzToolsFramework::SetRegistry(AssetBrowserMaxItemsShownInSearchSetting, numberOfItemsShown);
}
bool GridSnappingEnabled()
{
- return GetRegistry(GridSnappingSetting, false);
+ return AzToolsFramework::GetRegistry(GridSnappingSetting, false);
}
void SetGridSnapping(const bool enabled)
{
- SetRegistry(GridSnappingSetting, enabled);
+ AzToolsFramework::SetRegistry(GridSnappingSetting, enabled);
}
float GridSnappingSize()
{
- return aznumeric_cast(GetRegistry(GridSizeSetting, 0.1));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(GridSizeSetting, 0.1));
}
void SetGridSnappingSize(const float size)
{
- SetRegistry(GridSizeSetting, size);
+ AzToolsFramework::SetRegistry(GridSizeSetting, size);
}
bool AngleSnappingEnabled()
{
- return GetRegistry(AngleSnappingSetting, false);
+ return AzToolsFramework::GetRegistry(AngleSnappingSetting, false);
}
void SetAngleSnapping(const bool enabled)
{
- SetRegistry(AngleSnappingSetting, enabled);
+ AzToolsFramework::SetRegistry(AngleSnappingSetting, enabled);
}
float AngleSnappingSize()
{
- return aznumeric_cast(GetRegistry(AngleSizeSetting, 5.0));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(AngleSizeSetting, 5.0));
}
void SetAngleSnappingSize(const float size)
{
- SetRegistry(AngleSizeSetting, size);
+ AzToolsFramework::SetRegistry(AngleSizeSetting, size);
}
bool ShowingGrid()
{
- return GetRegistry(ShowGridSetting, false);
+ return AzToolsFramework::GetRegistry(ShowGridSetting, false);
}
void SetShowingGrid(const bool showing)
{
- SetRegistry(ShowGridSetting, showing);
+ AzToolsFramework::SetRegistry(ShowGridSetting, showing);
}
bool StickySelectEnabled()
{
- return GetRegistry(StickySelectSetting, false);
+ return AzToolsFramework::GetRegistry(StickySelectSetting, false);
}
void SetStickySelectEnabled(const bool enabled)
{
- SetRegistry(StickySelectSetting, enabled);
+ AzToolsFramework::SetRegistry(StickySelectSetting, enabled);
}
float ManipulatorLineBoundWidth()
{
- return aznumeric_cast(GetRegistry(ManipulatorLineBoundWidthSetting, 0.1));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(ManipulatorLineBoundWidthSetting, 0.1));
}
void SetManipulatorLineBoundWidth(const float lineBoundWidth)
{
- SetRegistry(ManipulatorLineBoundWidthSetting, lineBoundWidth);
+ AzToolsFramework::SetRegistry(ManipulatorLineBoundWidthSetting, lineBoundWidth);
}
float ManipulatorCircleBoundWidth()
{
- return aznumeric_cast(GetRegistry(ManipulatorCircleBoundWidthSetting, 0.1));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(ManipulatorCircleBoundWidthSetting, 0.1));
}
void SetManipulatorCircleBoundWidth(const float circleBoundWidth)
{
- SetRegistry(ManipulatorCircleBoundWidthSetting, circleBoundWidth);
+ AzToolsFramework::SetRegistry(ManipulatorCircleBoundWidthSetting, circleBoundWidth);
}
float CameraTranslateSpeed()
{
- return aznumeric_cast(GetRegistry(CameraTranslateSpeedSetting, 10.0));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(CameraTranslateSpeedSetting, 10.0));
}
void SetCameraTranslateSpeed(const float speed)
{
- SetRegistry(CameraTranslateSpeedSetting, speed);
+ AzToolsFramework::SetRegistry(CameraTranslateSpeedSetting, speed);
}
float CameraBoostMultiplier()
{
- return aznumeric_cast(GetRegistry(CameraBoostMultiplierSetting, 3.0));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(CameraBoostMultiplierSetting, 3.0));
}
void SetCameraBoostMultiplier(const float multiplier)
{
- SetRegistry(CameraBoostMultiplierSetting, multiplier);
+ AzToolsFramework::SetRegistry(CameraBoostMultiplierSetting, multiplier);
}
float CameraRotateSpeed()
{
- return aznumeric_cast(GetRegistry(CameraRotateSpeedSetting, 0.005));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(CameraRotateSpeedSetting, 0.005));
}
void SetCameraRotateSpeed(const float speed)
{
- SetRegistry(CameraRotateSpeedSetting, speed);
+ AzToolsFramework::SetRegistry(CameraRotateSpeedSetting, speed);
}
float CameraScrollSpeed()
{
- return aznumeric_cast(GetRegistry(CameraScrollSpeedSetting, 0.02));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(CameraScrollSpeedSetting, 0.02));
}
void SetCameraScrollSpeed(const float speed)
{
- SetRegistry(CameraScrollSpeedSetting, speed);
+ AzToolsFramework::SetRegistry(CameraScrollSpeedSetting, speed);
}
float CameraDollyMotionSpeed()
{
- return aznumeric_cast(GetRegistry(CameraDollyMotionSpeedSetting, 0.01));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(CameraDollyMotionSpeedSetting, 0.01));
}
void SetCameraDollyMotionSpeed(const float speed)
{
- SetRegistry(CameraDollyMotionSpeedSetting, speed);
+ AzToolsFramework::SetRegistry(CameraDollyMotionSpeedSetting, speed);
}
bool CameraOrbitYawRotationInverted()
{
- return GetRegistry(CameraOrbitYawRotationInvertedSetting, false);
+ return AzToolsFramework::GetRegistry(CameraOrbitYawRotationInvertedSetting, false);
}
void SetCameraOrbitYawRotationInverted(const bool inverted)
{
- SetRegistry(CameraOrbitYawRotationInvertedSetting, inverted);
+ AzToolsFramework::SetRegistry(CameraOrbitYawRotationInvertedSetting, inverted);
}
bool CameraPanInvertedX()
{
- return GetRegistry(CameraPanInvertedXSetting, true);
+ return AzToolsFramework::GetRegistry(CameraPanInvertedXSetting, true);
}
void SetCameraPanInvertedX(const bool inverted)
{
- SetRegistry(CameraPanInvertedXSetting, inverted);
+ AzToolsFramework::SetRegistry(CameraPanInvertedXSetting, inverted);
}
bool CameraPanInvertedY()
{
- return GetRegistry(CameraPanInvertedYSetting, true);
+ return AzToolsFramework::GetRegistry(CameraPanInvertedYSetting, true);
}
void SetCameraPanInvertedY(const bool inverted)
{
- SetRegistry(CameraPanInvertedYSetting, inverted);
+ AzToolsFramework::SetRegistry(CameraPanInvertedYSetting, inverted);
}
float CameraPanSpeed()
{
- return aznumeric_cast(GetRegistry(CameraPanSpeedSetting, 0.01));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(CameraPanSpeedSetting, 0.01));
}
void SetCameraPanSpeed(float speed)
{
- SetRegistry(CameraPanSpeedSetting, speed);
+ AzToolsFramework::SetRegistry(CameraPanSpeedSetting, speed);
}
float CameraRotateSmoothness()
{
- return aznumeric_cast(GetRegistry(CameraRotateSmoothnessSetting, 5.0));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(CameraRotateSmoothnessSetting, 5.0));
}
void SetCameraRotateSmoothness(const float smoothness)
{
- SetRegistry(CameraRotateSmoothnessSetting, smoothness);
+ AzToolsFramework::SetRegistry(CameraRotateSmoothnessSetting, smoothness);
}
float CameraTranslateSmoothness()
{
- return aznumeric_cast(GetRegistry(CameraTranslateSmoothnessSetting, 5.0));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(CameraTranslateSmoothnessSetting, 5.0));
}
void SetCameraTranslateSmoothness(const float smoothness)
{
- SetRegistry(CameraTranslateSmoothnessSetting, smoothness);
+ AzToolsFramework::SetRegistry(CameraTranslateSmoothnessSetting, smoothness);
}
bool CameraRotateSmoothingEnabled()
{
- return GetRegistry(CameraRotateSmoothingSetting, true);
+ return AzToolsFramework::GetRegistry(CameraRotateSmoothingSetting, true);
}
void SetCameraRotateSmoothingEnabled(const bool enabled)
{
- SetRegistry(CameraRotateSmoothingSetting, enabled);
+ AzToolsFramework::SetRegistry(CameraRotateSmoothingSetting, enabled);
}
bool CameraTranslateSmoothingEnabled()
{
- return GetRegistry(CameraTranslateSmoothingSetting, true);
+ return AzToolsFramework::GetRegistry(CameraTranslateSmoothingSetting, true);
}
void SetCameraTranslateSmoothingEnabled(const bool enabled)
{
- SetRegistry(CameraTranslateSmoothingSetting, enabled);
+ AzToolsFramework::SetRegistry(CameraTranslateSmoothingSetting, enabled);
}
bool CameraCaptureCursorForLook()
{
- return GetRegistry(CameraCaptureCursorLookSetting, true);
+ return AzToolsFramework::GetRegistry(CameraCaptureCursorLookSetting, true);
}
void SetCameraCaptureCursorForLook(const bool capture)
{
- SetRegistry(CameraCaptureCursorLookSetting, capture);
+ AzToolsFramework::SetRegistry(CameraCaptureCursorLookSetting, capture);
}
float CameraDefaultOrbitDistance()
{
- return aznumeric_cast(GetRegistry(CameraDefaultOrbitDistanceSetting, 20.0));
+ return aznumeric_cast(AzToolsFramework::GetRegistry(CameraDefaultOrbitDistanceSetting, 20.0));
}
void SetCameraDefaultOrbitDistance(const float distance)
{
- SetRegistry(CameraDefaultOrbitDistanceSetting, distance);
+ AzToolsFramework::SetRegistry(CameraDefaultOrbitDistanceSetting, distance);
}
AzFramework::InputChannelId CameraTranslateForwardChannelId()
{
return AzFramework::InputChannelId(
- GetRegistry(CameraTranslateForwardIdSetting, AZStd::string("keyboard_key_alphanumeric_W")).c_str());
+ AzToolsFramework::GetRegistry(CameraTranslateForwardIdSetting, AZStd::string("keyboard_key_alphanumeric_W")).c_str());
}
void SetCameraTranslateForwardChannelId(AZStd::string_view cameraTranslateForwardId)
{
- SetRegistry(CameraTranslateForwardIdSetting, cameraTranslateForwardId);
+ AzToolsFramework::SetRegistry(CameraTranslateForwardIdSetting, cameraTranslateForwardId);
}
AzFramework::InputChannelId CameraTranslateBackwardChannelId()
{
return AzFramework::InputChannelId(
- GetRegistry(CameraTranslateBackwardIdSetting, AZStd::string("keyboard_key_alphanumeric_S")).c_str());
+ AzToolsFramework::GetRegistry(CameraTranslateBackwardIdSetting, AZStd::string("keyboard_key_alphanumeric_S")).c_str());
}
void SetCameraTranslateBackwardChannelId(AZStd::string_view cameraTranslateBackwardId)
{
- SetRegistry(CameraTranslateBackwardIdSetting, cameraTranslateBackwardId);
+ AzToolsFramework::SetRegistry(CameraTranslateBackwardIdSetting, cameraTranslateBackwardId);
}
AzFramework::InputChannelId CameraTranslateLeftChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraTranslateLeftIdSetting, AZStd::string("keyboard_key_alphanumeric_A")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraTranslateLeftIdSetting, AZStd::string("keyboard_key_alphanumeric_A")).c_str());
}
void SetCameraTranslateLeftChannelId(AZStd::string_view cameraTranslateLeftId)
{
- SetRegistry(CameraTranslateLeftIdSetting, cameraTranslateLeftId);
+ AzToolsFramework::SetRegistry(CameraTranslateLeftIdSetting, cameraTranslateLeftId);
}
AzFramework::InputChannelId CameraTranslateRightChannelId()
{
return AzFramework::InputChannelId(
- GetRegistry(CameraTranslateRightIdSetting, AZStd::string("keyboard_key_alphanumeric_D")).c_str());
+ AzToolsFramework::GetRegistry(CameraTranslateRightIdSetting, AZStd::string("keyboard_key_alphanumeric_D")).c_str());
}
void SetCameraTranslateRightChannelId(AZStd::string_view cameraTranslateRightId)
{
- SetRegistry(CameraTranslateRightIdSetting, cameraTranslateRightId);
+ AzToolsFramework::SetRegistry(CameraTranslateRightIdSetting, cameraTranslateRightId);
}
AzFramework::InputChannelId CameraTranslateUpChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraTranslateUpIdSetting, AZStd::string("keyboard_key_alphanumeric_E")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraTranslateUpIdSetting, AZStd::string("keyboard_key_alphanumeric_E")).c_str());
}
void SetCameraTranslateUpChannelId(AZStd::string_view cameraTranslateUpId)
{
- SetRegistry(CameraTranslateUpIdSetting, cameraTranslateUpId);
+ AzToolsFramework::SetRegistry(CameraTranslateUpIdSetting, cameraTranslateUpId);
}
AzFramework::InputChannelId CameraTranslateDownChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraTranslateDownIdSetting, AZStd::string("keyboard_key_alphanumeric_Q")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraTranslateDownIdSetting, AZStd::string("keyboard_key_alphanumeric_Q")).c_str());
}
void SetCameraTranslateDownChannelId(AZStd::string_view cameraTranslateDownId)
{
- SetRegistry(CameraTranslateDownIdSetting, cameraTranslateDownId);
+ AzToolsFramework::SetRegistry(CameraTranslateDownIdSetting, cameraTranslateDownId);
}
AzFramework::InputChannelId CameraTranslateBoostChannelId()
{
return AzFramework::InputChannelId(
- GetRegistry(CameraTranslateBoostIdSetting, AZStd::string("keyboard_key_modifier_shift_l")).c_str());
+ AzToolsFramework::GetRegistry(CameraTranslateBoostIdSetting, AZStd::string("keyboard_key_modifier_shift_l")).c_str());
}
void SetCameraTranslateBoostChannelId(AZStd::string_view cameraTranslateBoostId)
{
- SetRegistry(CameraTranslateBoostIdSetting, cameraTranslateBoostId);
+ AzToolsFramework::SetRegistry(CameraTranslateBoostIdSetting, cameraTranslateBoostId);
}
AzFramework::InputChannelId CameraOrbitChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraOrbitIdSetting, AZStd::string("keyboard_key_modifier_alt_l")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraOrbitIdSetting, AZStd::string("keyboard_key_modifier_alt_l")).c_str());
}
void SetCameraOrbitChannelId(AZStd::string_view cameraOrbitId)
{
- SetRegistry(CameraOrbitIdSetting, cameraOrbitId);
+ AzToolsFramework::SetRegistry(CameraOrbitIdSetting, cameraOrbitId);
}
AzFramework::InputChannelId CameraFreeLookChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraFreeLookIdSetting, AZStd::string("mouse_button_right")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraFreeLookIdSetting, AZStd::string("mouse_button_right")).c_str());
}
void SetCameraFreeLookChannelId(AZStd::string_view cameraFreeLookId)
{
- SetRegistry(CameraFreeLookIdSetting, cameraFreeLookId);
+ AzToolsFramework::SetRegistry(CameraFreeLookIdSetting, cameraFreeLookId);
}
AzFramework::InputChannelId CameraFreePanChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraFreePanIdSetting, AZStd::string("mouse_button_middle")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraFreePanIdSetting, AZStd::string("mouse_button_middle")).c_str());
}
void SetCameraFreePanChannelId(AZStd::string_view cameraFreePanId)
{
- SetRegistry(CameraFreePanIdSetting, cameraFreePanId);
+ AzToolsFramework::SetRegistry(CameraFreePanIdSetting, cameraFreePanId);
}
AzFramework::InputChannelId CameraOrbitLookChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraOrbitLookIdSetting, AZStd::string("mouse_button_left")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraOrbitLookIdSetting, AZStd::string("mouse_button_left")).c_str());
}
void SetCameraOrbitLookChannelId(AZStd::string_view cameraOrbitLookId)
{
- SetRegistry(CameraOrbitLookIdSetting, cameraOrbitLookId);
+ AzToolsFramework::SetRegistry(CameraOrbitLookIdSetting, cameraOrbitLookId);
}
AzFramework::InputChannelId CameraOrbitDollyChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraOrbitDollyIdSetting, AZStd::string("mouse_button_right")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraOrbitDollyIdSetting, AZStd::string("mouse_button_right")).c_str());
}
void SetCameraOrbitDollyChannelId(AZStd::string_view cameraOrbitDollyId)
{
- SetRegistry(CameraOrbitDollyIdSetting, cameraOrbitDollyId);
+ AzToolsFramework::SetRegistry(CameraOrbitDollyIdSetting, cameraOrbitDollyId);
}
AzFramework::InputChannelId CameraOrbitPanChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraOrbitPanIdSetting, AZStd::string("mouse_button_middle")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraOrbitPanIdSetting, AZStd::string("mouse_button_middle")).c_str());
}
void SetCameraOrbitPanChannelId(AZStd::string_view cameraOrbitPanId)
{
- SetRegistry(CameraOrbitPanIdSetting, cameraOrbitPanId);
+ AzToolsFramework::SetRegistry(CameraOrbitPanIdSetting, cameraOrbitPanId);
}
AzFramework::InputChannelId CameraFocusChannelId()
{
- return AzFramework::InputChannelId(GetRegistry(CameraFocusIdSetting, AZStd::string("keyboard_key_alphanumeric_X")).c_str());
+ return AzFramework::InputChannelId(
+ AzToolsFramework::GetRegistry(CameraFocusIdSetting, AZStd::string("keyboard_key_alphanumeric_X")).c_str());
}
void SetCameraFocusChannelId(AZStd::string_view cameraFocusId)
{
- SetRegistry(CameraFocusIdSetting, cameraFocusId);
+ AzToolsFramework::SetRegistry(CameraFocusIdSetting, cameraFocusId);
}
} // namespace SandboxEditor
diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index 132729466c..7323da9e95 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -97,9 +97,6 @@
#include
-#include
-#include
-
AZ_CVAR(
bool, ed_visibility_logTiming, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Output the timing of the new IVisibilitySystem query");
@@ -475,7 +472,7 @@ void EditorViewportWidget::Update()
{
auto start = std::chrono::steady_clock::now();
- m_entityVisibilityQuery.UpdateVisibility(GetCameraState());
+ m_entityVisibilityQuery.UpdateVisibility(m_renderViewport->GetCameraState());
if (ed_visibility_logTiming)
{
@@ -717,7 +714,7 @@ void EditorViewportWidget::RenderAll()
m_debugDisplay->DepthTestOff();
m_manipulatorManager->DrawManipulators(
- *m_debugDisplay, GetCameraState(),
+ *m_debugDisplay, m_renderViewport->GetCameraState(),
BuildMouseInteractionInternal(
AztfVi::MouseButtons(AztfVi::TranslateMouseButtons(QGuiApplication::mouseButtons())), keyboardModifiers,
BuildMousePick(WidgetToViewport(mapFromGlobal(QCursor::pos())))));
@@ -881,31 +878,11 @@ void EditorViewportWidget::OnMenuSelectCurrentCamera()
}
}
-AzFramework::CameraState EditorViewportWidget::GetCameraState()
-{
- return m_renderViewport->GetCameraState();
-}
-
-AZ::Vector3 EditorViewportWidget::PickTerrain(const AzFramework::ScreenPoint& point)
-{
- return LYVec3ToAZVec3(ViewToWorld(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), nullptr, true));
-}
-
-float EditorViewportWidget::TerrainHeight(const AZ::Vector2& position)
-{
- return GetIEditor()->GetTerrainElevation(position.GetX(), position.GetY());
-}
-
void EditorViewportWidget::FindVisibleEntities(AZStd::vector& visibleEntitiesOut)
{
visibleEntitiesOut.assign(m_entityVisibilityQuery.Begin(), m_entityVisibilityQuery.End());
}
-AzFramework::ScreenPoint EditorViewportWidget::ViewportWorldToScreen(const AZ::Vector3& worldPosition)
-{
- return m_renderViewport->ViewportWorldToScreen(worldPosition);
-}
-
QWidget* EditorViewportWidget::GetWidgetForViewportContextMenu()
{
return this;
@@ -2135,7 +2112,7 @@ bool EditorViewportWidget::GetActiveCameraState(AzFramework::CameraState& camera
{
if (m_pPrimaryViewport == this)
{
- cameraState = GetCameraState();
+ cameraState = m_renderViewport->GetCameraState();
return true;
}
diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h
index 0101f2ffef..3d52b2416d 100644
--- a/Code/Editor/EditorViewportWidget.h
+++ b/Code/Editor/EditorViewportWidget.h
@@ -205,8 +205,6 @@ private:
void* GetSystemCursorConstraintWindow() const override;
// AzToolsFramework::MainEditorViewportInteractionRequestBus overrides ...
- AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) override;
- float TerrainHeight(const AZ::Vector2& position) override;
bool ShowingWorldSpace() override;
QWidget* GetWidgetForViewportContextMenu() override;
@@ -293,9 +291,6 @@ private:
// This switches the active camera to the next one in the list of (default, all custom cams).
void CycleCamera();
- AzFramework::CameraState GetCameraState();
- AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition);
-
QPoint WidgetToViewport(const QPoint& point) const;
QPoint ViewportToWidget(const QPoint& point) const;
QSize WidgetToViewport(const QSize& size) const;
diff --git a/Code/Editor/Export/ExportManager.cpp b/Code/Editor/Export/ExportManager.cpp
index 5527aa6ce6..b27b7e0387 100644
--- a/Code/Editor/Export/ExportManager.cpp
+++ b/Code/Editor/Export/ExportManager.cpp
@@ -35,20 +35,8 @@
#include "Resource.h"
#include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h"
-#include
-#include
-
namespace
{
- inline Export::Vector3D Vec3ToVector3D(const Vec3& vec)
- {
- Export::Vector3D ret;
- ret.x = vec.x;
- ret.y = vec.y;
- ret.z = vec.z;
- return ret;
- }
-
const float kTangentDelta = 0.01f;
const float kAspectRatio = 1.777778f;
const int kReserveCount = 7; // x,y,z,rot_x,rot_y,rot_z,fov
@@ -106,22 +94,22 @@ void Export::CData::Clear()
// CExportManager
CExportManager::CExportManager()
: m_isPrecaching(false)
- , m_pBaseObj(nullptr)
- , m_FBXBakedExportFPS(0.0f)
, m_fScale(100.0f)
+ , m_bAnimationExport(false)
+ , m_pBaseObj(nullptr)
, // this scale is used by CryEngine RC
- m_bAnimationExport(false)
+ m_FBXBakedExportFPS(0.0f)
, m_bExportLocalCoords(false)
+ , m_bExportOnlyPrimaryCamera(false)
, m_numberOfExportFrames(0)
, m_pivotEntityObject(nullptr)
, m_bBakedKeysSequenceExport(true)
, m_animTimeExportPrimarySequenceCurrentTime(0.0f)
, m_animKeyTimeExport(true)
, m_soundKeyTimeExport(true)
- , m_bExportOnlyPrimaryCamera(false)
{
- RegisterExporter(new COBJExporter());
- RegisterExporter(new COCMExporter());
+ CExportManager::RegisterExporter(new COBJExporter());
+ CExportManager::RegisterExporter(new COCMExporter());
}
@@ -313,203 +301,6 @@ void CExportManager::AddEntityAnimationData(AZ::EntityId entityId)
ProcessEntityAnimationTrack(entityId, pObj, AnimParamType::Rotation);
}
-
-void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh, Matrix34A* pTm)
-{
- if (m_isPrecaching || !pObj)
- {
- return;
- }
-
- pObj->m_MeshHash = reinterpret_cast(pIndMesh);
- IIndexedMesh::SMeshDescription meshDesc;
- pIndMesh->GetMeshDescription(meshDesc);
-
- // if we have subset of meshes we need to duplicate vertices,
- // keep transformation of submesh,
- // and store new offset for indices
- int newOffsetIndex = pObj->GetVertexCount();
-
- if (meshDesc.m_nVertCount)
- {
- pObj->m_vertices.reserve(meshDesc.m_nVertCount + newOffsetIndex);
- pObj->m_normals.reserve(meshDesc.m_nVertCount + newOffsetIndex);
- }
-
- for (int v = 0; v < meshDesc.m_nVertCount; ++v)
- {
- Vec3 n = meshDesc.m_pNorms[v].GetN();
- Vec3 tmp = (meshDesc.m_pVerts ? meshDesc.m_pVerts[v] : meshDesc.m_pVertsF16[v].ToVec3());
- if (pTm)
- {
- tmp = pTm->TransformPoint(tmp);
- }
-
- pObj->m_vertices.push_back(Vec3ToVector3D(tmp * m_fScale));
- pObj->m_normals.push_back(Vec3ToVector3D(n));
- }
-
- if (meshDesc.m_nCoorCount)
- {
- pObj->m_texCoords.reserve(meshDesc.m_nCoorCount + newOffsetIndex);
- }
-
- for (int v = 0; v < meshDesc.m_nCoorCount; ++v)
- {
- Vec2 uv = meshDesc.m_pTexCoord[v].GetUV();
- uv.y = 1.0f - uv.y;
- pObj->m_texCoords.push_back({uv.x,uv.y});
- }
-
- if (pIndMesh->GetSubSetCount() && !(pIndMesh->GetSubSetCount() == 1 && pIndMesh->GetSubSet(0).nNumIndices == 0))
- {
- for (int i = 0; i < pIndMesh->GetSubSetCount(); ++i)
- {
- Export::CMesh* pMesh = new Export::CMesh();
-
- const SMeshSubset& sms = pIndMesh->GetSubSet(i);
- const vtx_idx* pIndices = &meshDesc.m_pIndices[sms.nFirstIndexId];
- int nTris = sms.nNumIndices / 3;
- pMesh->m_faces.reserve(nTris);
- for (int f = 0; f < nTris; ++f)
- {
- Export::Face face;
- face.idx[0] = *(pIndices++) + newOffsetIndex;
- face.idx[1] = *(pIndices++) + newOffsetIndex;
- face.idx[2] = *(pIndices++) + newOffsetIndex;
- pMesh->m_faces.push_back(face);
- }
-
- pObj->m_meshes.push_back(pMesh);
- }
- }
- else
- {
- Export::CMesh* pMesh = new Export::CMesh();
- if (meshDesc.m_nFaceCount == 0 && meshDesc.m_nIndexCount != 0 && meshDesc.m_pIndices != nullptr)
- {
- const vtx_idx* pIndices = &meshDesc.m_pIndices[0];
- int nTris = meshDesc.m_nIndexCount / 3;
- pMesh->m_faces.reserve(nTris);
- for (int f = 0; f < nTris; ++f)
- {
- Export::Face face;
- face.idx[0] = *(pIndices++) + newOffsetIndex;
- face.idx[1] = *(pIndices++) + newOffsetIndex;
- face.idx[2] = *(pIndices++) + newOffsetIndex;
- pMesh->m_faces.push_back(face);
- }
- }
- else
- {
- pMesh->m_faces.reserve(meshDesc.m_nFaceCount);
- for (int f = 0; f < meshDesc.m_nFaceCount; ++f)
- {
- Export::Face face;
- face.idx[0] = meshDesc.m_pFaces[f].v[0];
- face.idx[1] = meshDesc.m_pFaces[f].v[1];
- face.idx[2] = meshDesc.m_pFaces[f].v[2];
- pMesh->m_faces.push_back(face);
- }
- }
-
- pObj->m_meshes.push_back(pMesh);
- }
-}
-
-
-bool CExportManager::AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm)
-{
- IIndexedMesh* pIndMesh = nullptr;
-
- if (pStatObj->GetSubObjectCount())
- {
- for (int i = 0; i < pStatObj->GetSubObjectCount(); i++)
- {
- IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(i);
- if (pSubObj && pSubObj->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj)
- {
- pIndMesh = nullptr;
- if (m_isOccluder)
- {
- if (pSubObj->pStatObj->GetLodObject(2))
- {
- pIndMesh = pSubObj->pStatObj->GetLodObject(2)->GetIndexedMesh(true);
- }
- if (!pIndMesh && pSubObj->pStatObj->GetLodObject(1))
- {
- pIndMesh = pSubObj->pStatObj->GetLodObject(1)->GetIndexedMesh(true);
- }
- }
- if (!pIndMesh)
- {
- pIndMesh = pSubObj->pStatObj->GetIndexedMesh(true);
- }
- if (pIndMesh)
- {
- AddMesh(pObj, pIndMesh, pTm);
- }
- }
- }
- }
-
- if (!pIndMesh)
- {
- if (m_isOccluder)
- {
- if (pStatObj->GetLodObject(2))
- {
- pIndMesh = pStatObj->GetLodObject(2)->GetIndexedMesh(true);
- }
- if (!pIndMesh && pStatObj->GetLodObject(1))
- {
- pIndMesh = pStatObj->GetLodObject(1)->GetIndexedMesh(true);
- }
- }
- if (!pIndMesh)
- {
- pIndMesh = pStatObj->GetIndexedMesh(true);
- }
- if (pIndMesh)
- {
- AddMesh(pObj, pIndMesh, pTm);
- }
- }
-
- return true;
-}
-
-bool CExportManager::AddMeshes(Export::CObject* pObj)
-{
- if (m_pBaseObj->GetType() == OBJTYPE_AZENTITY)
- {
- CEntityObject* pEntityObject = (CEntityObject*)m_pBaseObj;
- IRenderNode* pEngineNode = pEntityObject->GetEngineNode();
-
- if (pEngineNode)
- {
- if (!m_isPrecaching)
- {
- for (int i = 0; i < pEngineNode->GetSlotCount(); ++i)
- {
- Matrix34A tm;
- IStatObj* pStatObj = pEngineNode->GetEntityStatObj(i, 0, &tm);
- if (pStatObj)
- {
- Matrix34A objTM = m_pBaseObj->GetWorldTM();
- objTM.Invert();
- tm = objTM * tm;
- AddStatObj(pObj, pStatObj, &tm);
- }
- }
- }
- }
- }
-
- return true;
-}
-
-
bool CExportManager::AddObject(CBaseObject* pBaseObj)
{
if (m_isOccluder)
@@ -531,7 +322,6 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj)
if (m_isPrecaching)
{
- AddMeshes(nullptr);
return true;
}
@@ -542,7 +332,6 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj)
m_objectMap[pBaseObj] = int(m_data.m_objects.size() - 1);
- AddMeshes(pObj);
m_pBaseObj = nullptr;
return true;
@@ -1227,15 +1016,6 @@ bool CExportManager::ImportFromFile(const char* filename)
return bRet;
}
-bool CExportManager::ExportSingleStatObj(IStatObj* pStatObj, const char* filename)
-{
- Export::CObject* pObj = new Export::CObject(Path::GetFileName(filename).toUtf8().data());
- AddStatObj(pObj, pStatObj);
- m_data.m_objects.push_back(pObj);
- ExportToFile(filename, true);
- return true;
-}
-
void CExportManager::SaveNodeKeysTimeToXML()
{
CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence();
diff --git a/Code/Editor/Export/ExportManager.h b/Code/Editor/Export/ExportManager.h
index 14318be957..6908bcf0f7 100644
--- a/Code/Editor/Export/ExportManager.h
+++ b/Code/Editor/Export/ExportManager.h
@@ -139,18 +139,11 @@ public:
bool ImportFromFile(const char* filename);
const Export::CData& GetData() const {return m_data; };
- //! Exports the stat obj to the obj file specified
- //! returns true if succeeded, otherwise false
- bool ExportSingleStatObj(IStatObj* pStatObj, const char* filename) override;
-
void SetBakedKeysSequenceExport(bool bBaked){m_bBakedKeysSequenceExport = bBaked; };
void SaveNodeKeysTimeToXML();
private:
- void AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh, Matrix34A* pTm = nullptr);
- bool AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm = nullptr);
- bool AddMeshes(Export::CObject* pObj);
bool AddObject(CBaseObject* pBaseObj);
void SolveHierarchy();
diff --git a/Code/Editor/GameEngine.cpp b/Code/Editor/GameEngine.cpp
index 6f434eda98..e82832fc21 100644
--- a/Code/Editor/GameEngine.cpp
+++ b/Code/Editor/GameEngine.cpp
@@ -35,7 +35,6 @@
// CryCommon
#include
-#include
#include
// Editor
@@ -157,20 +156,20 @@ struct SSystemUserCallback
}
}
- int ShowMessage(const char* text, const char* caption, unsigned int uType) override
+ void ShowMessage(const char* text, const char* caption, unsigned int uType) override
{
if (CCryEditApp::instance()->IsInAutotestMode())
{
- return IDOK;
+ return;
}
const UINT kMessageBoxButtonMask = 0x000f;
if (!GetIEditor()->IsInGameMode() && (uType == 0 || uType == MB_OK || !(uType & kMessageBoxButtonMask)))
{
static_cast(GetIEditor())->AddErrorMessage(text, caption);
- return IDOK;
+ return;
}
- return CryMessageBox(text, caption, uType);
+ CryMessageBox(text, caption, uType);
}
void OnSplashScreenDone()
@@ -595,13 +594,6 @@ void CGameEngine::SwitchToInEditor()
// Enable accelerators.
GetIEditor()->EnableAcceleratos(true);
-
- // reset UI system
- if (gEnv->pLyShine)
- {
- gEnv->pLyShine->Reset();
- }
-
// [Anton] - order changed, see comments for CGameEngine::SetSimulationMode
//! Send event to switch out of game.
GetIEditor()->GetObjectManager()->SendEvent(EVENT_OUTOFGAME);
diff --git a/Code/Editor/GameEngine.h b/Code/Editor/GameEngine.h
index 4104e9aeac..5a77fc2fb1 100644
--- a/Code/Editor/GameEngine.h
+++ b/Code/Editor/GameEngine.h
@@ -8,17 +8,11 @@
// Description : The game engine for editor
-
-
-#ifndef CRYINCLUDE_EDITOR_GAMEENGINE_H
-#define CRYINCLUDE_EDITOR_GAMEENGINE_H
-
#pragma once
#if !defined(Q_MOC_RUN)
#include
#include "LogFile.h"
-#include "CryListenerSet.h"
#include "Util/ModalWindowDismisser.h"
#endif
@@ -159,5 +153,3 @@ private:
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
};
-
-#endif // CRYINCLUDE_EDITOR_GAMEENGINE_H
diff --git a/Code/Editor/GameExporter.cpp b/Code/Editor/GameExporter.cpp
index ae1095b03a..a768861b90 100644
--- a/Code/Editor/GameExporter.cpp
+++ b/Code/Editor/GameExporter.cpp
@@ -146,13 +146,11 @@ bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportE
exportSuccessful = false;
}
- if (exportSuccessful)
+ if (exportSuccessful && m_bAutoExportMode)
{
- if (m_bAutoExportMode)
- {
- // Remove read-only flags.
- CrySetFileAttributes(m_levelPak.m_sPath.toUtf8().data(), FILE_ATTRIBUTE_NORMAL);
- }
+ // Remove read-only flags.
+ auto perms = QFile::permissions(m_levelPak.m_sPath) | QFile::Permission::WriteOwner;
+ QFile::setPermissions(m_levelPak.m_sPath, perms);
}
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/IEditor.h b/Code/Editor/IEditor.h
index 7c49819d83..48c8392f32 100644
--- a/Code/Editor/IEditor.h
+++ b/Code/Editor/IEditor.h
@@ -508,8 +508,6 @@ struct IEditor
virtual CBaseObject* NewObject(const char* typeName, const char* fileName = "", const char* name = "", float x = 0.0f, float y = 0.0f, float z = 0.0f, bool modifyDoc = true) = 0;
//! Delete object
virtual void DeleteObject(CBaseObject* obj) = 0;
- //! Clone object
- virtual CBaseObject* CloneObject(CBaseObject* obj) = 0;
//! Get current selection group
virtual CSelectionGroup* GetSelection() = 0;
virtual CBaseObject* GetSelectedObject() = 0;
diff --git a/Code/Editor/IEditorImpl.cpp b/Code/Editor/IEditorImpl.cpp
index 66c64d5bef..e5df6be58e 100644
--- a/Code/Editor/IEditorImpl.cpp
+++ b/Code/Editor/IEditorImpl.cpp
@@ -397,11 +397,6 @@ void CEditorImpl::Update()
// Make sure this is not called recursively
m_bUpdates = false;
- //@FIXME: Restore this latter.
- //if (GetGameEngine() && GetGameEngine()->IsLevelLoaded())
- {
- m_pObjectManager->Update();
- }
if (IsInPreviewMode())
{
SetModifiedFlag(false);
@@ -687,13 +682,6 @@ void CEditorImpl::DeleteObject(CBaseObject* obj)
GetObjectManager()->DeleteObject(obj);
}
-CBaseObject* CEditorImpl::CloneObject(CBaseObject* obj)
-{
- SetModifiedFlag();
- GetIEditor()->SetModifiedModule(eModifiedBrushes);
- return GetObjectManager()->CloneObject(obj);
-}
-
CBaseObject* CEditorImpl::GetSelectedObject()
{
if (m_pObjectManager->GetSelection()->GetCount() != 1)
diff --git a/Code/Editor/IEditorImpl.h b/Code/Editor/IEditorImpl.h
index 26701edec2..4976c0c1ca 100644
--- a/Code/Editor/IEditorImpl.h
+++ b/Code/Editor/IEditorImpl.h
@@ -141,7 +141,6 @@ public:
const SGizmoParameters& GetGlobalGizmoParameters() override;
CBaseObject* NewObject(const char* typeName, const char* fileName = "", const char* name = "", float x = 0.0f, float y = 0.0f, float z = 0.0f, bool modifyDoc = true) override;
void DeleteObject(CBaseObject* obj) override;
- CBaseObject* CloneObject(CBaseObject* obj) override;
IObjectManager* GetObjectManager() override;
// This will return a null pointer if CrySystem is not loaded before
// Global Sandbox Settings are loaded from the registry before CrySystem
diff --git a/Code/Editor/IconManager.cpp b/Code/Editor/IconManager.cpp
index 820213bbd9..a9d31aef7b 100644
--- a/Code/Editor/IconManager.cpp
+++ b/Code/Editor/IconManager.cpp
@@ -21,8 +21,6 @@
#include "Util/Image.h"
#include "Util/ImageUtil.h"
-#include
-
#define HELPER_MATERIAL "Objects/Helper"
namespace
@@ -38,7 +36,6 @@ namespace
CIconManager::CIconManager()
{
ZeroStruct(m_icons);
- ZeroStruct(m_objects);
}
//////////////////////////////////////////////////////////////////////////
@@ -61,13 +58,7 @@ void CIconManager::Done()
void CIconManager::Reset()
{
// Do not unload objects. but clears them.
- int i;
- for (i = 0; i < sizeof(m_objects) / sizeof(m_objects[0]); i++)
- {
- delete m_objects[i];
- m_objects[i] = nullptr;
- }
- for (i = 0; i < eIcon_COUNT; i++)
+ for (int i = 0; i < eIcon_COUNT; i++)
{
m_icons[i] = 0;
}
@@ -110,12 +101,6 @@ int CIconManager::GetIconTexture(EIcon icon)
return m_icons[icon];
}
-//////////////////////////////////////////////////////////////////////////
-IStatObj* CIconManager::GetObject(EStatObject)
-{
- return nullptr;
-}
-
//////////////////////////////////////////////////////////////////////////
QImage* CIconManager::GetIconBitmap(const char* filename, bool& bHaveAlpha, uint32 effects /*=0*/)
{
diff --git a/Code/Editor/IconManager.h b/Code/Editor/IconManager.h
index 7183f036ed..7e9be63665 100644
--- a/Code/Editor/IconManager.h
+++ b/Code/Editor/IconManager.h
@@ -8,11 +8,6 @@
// Description : Manages Textures used by Icon.
-
-
-#ifndef CRYINCLUDE_EDITOR_ICONMANAGER_H
-#define CRYINCLUDE_EDITOR_ICONMANAGER_H
-
#pragma once
#include "Include/IIconManager.h" // for IIconManager
@@ -31,7 +26,7 @@ class CIconManager
public:
// Construction
CIconManager();
- ~CIconManager();
+ ~CIconManager() override;
void Init();
void Done();
@@ -41,8 +36,6 @@ public:
// Operations
virtual int GetIconTexture(EIcon icon);
-
- virtual IStatObj* GetObject(EStatObject object);
virtual int GetIconTexture(const char* iconName);
//////////////////////////////////////////////////////////////////////////
@@ -61,7 +54,6 @@ public:
private:
StdMap m_textures;
- IStatObj* m_objects[eStatObject_COUNT];
int m_icons[eIcon_COUNT];
//////////////////////////////////////////////////////////////////////////
@@ -70,5 +62,3 @@ private:
typedef std::map IconsMap;
IconsMap m_iconBitmapsMap;
};
-
-#endif // CRYINCLUDE_EDITOR_ICONMANAGER_H
diff --git a/Code/Editor/Include/IDisplayViewport.h b/Code/Editor/Include/IDisplayViewport.h
index 132c62804c..2dab2802c7 100644
--- a/Code/Editor/Include/IDisplayViewport.h
+++ b/Code/Editor/Include/IDisplayViewport.h
@@ -6,9 +6,6 @@
*
*/
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H
#pragma once
struct DisplayContext;
@@ -22,7 +19,6 @@ struct IDisplayViewport
{
virtual void Update() = 0;
virtual float GetScreenScaleFactor(const Vec3& position) const = 0;
- virtual bool HitTestLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& hitpoint, int pixelRadius, float* pToCameraDistance = 0) const = 0;
/**
* Gets the distance of the point on screen to the line defined by the two points, converted to screenspace.
@@ -48,12 +44,9 @@ struct IDisplayViewport
virtual Vec3 WorldToView3D(const Vec3& worldPoint, int flags = 0) const = 0;
virtual Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const = 0;
virtual void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const = 0;
- virtual float GetGridStep() const = 0;
virtual void setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir) = 0;
- virtual void setHitcontext(QPoint& vp, Vec3& raySrc, Vec3& rayDir) = 0;
virtual float GetAspectRatio() const = 0;
- virtual const ::Plane* GetConstructionPlane() const = 0;
virtual bool IsBoundsVisible(const AABB& box) const = 0;
@@ -62,5 +55,3 @@ struct IDisplayViewport
virtual CViewport *asCViewport() { return nullptr; }
};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H
diff --git a/Code/Editor/Include/IExportManager.h b/Code/Editor/Include/IExportManager.h
index ea802134b6..ce79e52e15 100644
--- a/Code/Editor/Include/IExportManager.h
+++ b/Code/Editor/Include/IExportManager.h
@@ -8,14 +8,9 @@
// Description : Export geometry interfaces
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEXPORTMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IEXPORTMANAGER_H
#pragma once
#define EXP_NAMESIZE 32
-struct IStatObj;
enum class AnimParamType;
namespace Export
@@ -178,18 +173,10 @@ struct IExporter
virtual void Release() = 0;
};
-
-
// IExportManager: interface to export manager
struct IExportManager
{
//! Register exporter
//! return true if succeed, otherwise false
virtual bool RegisterExporter(IExporter* pExporter) = 0;
-
- virtual bool ExportSingleStatObj(IStatObj* pStatObj, const char* filename) = 0;
};
-
-
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IEXPORTMANAGER_H
diff --git a/Code/Editor/Include/IIconManager.h b/Code/Editor/Include/IIconManager.h
index 4925e47ae8..2407ea31bd 100644
--- a/Code/Editor/Include/IIconManager.h
+++ b/Code/Editor/Include/IIconManager.h
@@ -6,12 +6,8 @@
*
*/
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
#pragma once
-struct IStatObj;
struct IMaterial;
class CBitmap;
@@ -56,12 +52,9 @@ enum EIconEffect
struct IIconManager
{
virtual ~IIconManager() = default;
- virtual IStatObj* GetObject(EStatObject object) = 0;
virtual int GetIconTexture(EIcon icon) = 0;
virtual int GetIconTexture(const char* iconName) = 0;
virtual QImage* GetIconBitmap(const char* filename, bool& haveAlpha, uint32 effects = 0) = 0;
// Register an Icon for the specific command
virtual void RegisterCommandIcon([[maybe_unused]] const char* filename, [[maybe_unused]] int nCommandId) {}
};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H
diff --git a/Code/Editor/Include/IObjectManager.h b/Code/Editor/Include/IObjectManager.h
index 0a7bc8dcca..b612bcb80c 100644
--- a/Code/Editor/Include/IObjectManager.h
+++ b/Code/Editor/Include/IObjectManager.h
@@ -5,10 +5,6 @@
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
#pragma once
#include
@@ -29,32 +25,15 @@ class CObjectArchive;
class CViewport;
struct HitContext;
enum class ImageRotationDegrees;
-struct IStatObj;
class CBaseObject;
class XmlNodeRef;
#include "ObjectEvent.h"
-enum SerializeFlags
-{
- SERIALIZE_ALL = 0,
- SERIALIZE_ONLY_SHARED = 1,
- SERIALIZE_ONLY_NOTSHARED = 2,
-};
-
//////////////////////////////////////////////////////////////////////////
typedef std::vector CBaseObjectsArray;
typedef std::pair< bool(CALLBACK*)(CBaseObject const&, void*), void* > BaseObjectFilterFunctor;
-struct IObjectSelectCallback
-{
- //! Called when object is selected.
- //! Return true if selection should proceed, or false to abort object selection.
- virtual bool OnSelectObject(CBaseObject* obj) = 0;
- //! Return true if object can be selected.
- virtual bool CanSelectObject(CBaseObject* obj) = 0;
-};
-
//////////////////////////////////////////////////////////////////////////
//
// Interface to access editor objects scene graph.
@@ -78,10 +57,6 @@ public:
virtual void DeleteObject(CBaseObject* obj) = 0;
virtual void DeleteSelection(CSelectionGroup* pSelection) = 0;
virtual void DeleteAllObjects() = 0;
- virtual CBaseObject* CloneObject(CBaseObject* obj) = 0;
-
- virtual void BeginEditParams(CBaseObject* obj, int flags) = 0;
- virtual void EndEditParams(int flags = 0) = 0;
//! Get number of objects manager by ObjectManager (not contain sub objects of groups).
virtual int GetObjectCount() const = 0;
@@ -90,27 +65,9 @@ public:
//! @param layer if 0 get objects for all layers, or layer to get objects from.
virtual void GetObjects(CBaseObjectsArray& objects) const = 0;
- //! Get array of objects that pass the filter.
- //! @param filter The filter functor, return true if you want to get the certain obj, return false if want to skip it.
- virtual void GetObjects(CBaseObjectsArray& objects, BaseObjectFilterFunctor const& filter) const = 0;
-
//! Display objects on specified display context.
virtual void Display(DisplayContext& dc) = 0;
- //! Called when selecting without selection helpers - this is needed since
- //! the visible object cache is normally not updated when not displaying helpers.
- virtual void ForceUpdateVisibleObjectCache(DisplayContext& dc) = 0;
-
- //! Check intersection with objects.
- //! Find intersection with nearest to ray origin object hit by ray.
- //! If distance tollerance is specified certain relaxation applied on collision test.
- //! @return true if hit any object, and fills hitInfo structure.
- virtual bool HitTest(HitContext& hitInfo) = 0;
-
- //! Check intersection with an object.
- //! @return true if hit, and fills hitInfo structure.
- virtual bool HitTestObject(CBaseObject* obj, HitContext& hc) = 0;
-
//! Gets a radius to be used for hit tests on the axis helpers, like the transform gizmo.
//! @return the axis helper hit radius.
virtual int GetAxisHelperHitRadius() const = 0;
@@ -137,59 +94,18 @@ public:
//! Find objects which intersect with a given AABB.
virtual void FindObjectsInAABB(const AABB& aabb, std::vector& result) const = 0;
- //////////////////////////////////////////////////////////////////////////
- // Operations on objects.
- //////////////////////////////////////////////////////////////////////////
- //! Makes object visible or invisible.
- virtual void HideObject(CBaseObject* obj, bool hide) = 0;
- //! Shows the last hidden object based on hidden ID
- virtual void ShowLastHiddenObject() = 0;
- //! Freeze object, making it unselectable.
- virtual void FreezeObject(CBaseObject* obj, bool freeze) = 0;
- //! Unhide all hidden objects.
- virtual void UnhideAll() = 0;
- //! Unfreeze all frozen objects.
- virtual void UnfreezeAll() = 0;
-
//////////////////////////////////////////////////////////////////////////
// Object Selection.
//////////////////////////////////////////////////////////////////////////
virtual bool SelectObject(CBaseObject* obj, bool bUseMask = true) = 0;
virtual void UnselectObject(CBaseObject* obj) = 0;
- //! Select objects within specified distance from given position.
- //! Return number of selected objects.
- virtual int SelectObjects(const AABB& box, bool bUnselect = false) = 0;
-
- virtual void SelectEntities(std::set& s) = 0;
-
- virtual int MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, bool bIsCopy = false) = 0;
-
- //! Selects/Unselects all objects within 2d rectangle in given viewport.
- virtual void SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect) = 0;
- virtual void FindObjectsInRect(CViewport* view, const QRect& rect, std::vector& guids) = 0;
-
//! Clear default selection set.
//! @Return number of objects removed from selection.
virtual int ClearSelection() = 0;
- //! Deselect all current selected objects and selects object that were unselected.
- //! @Return number of selected objects.
- virtual int InvertSelection() = 0;
-
//! Get current selection.
virtual CSelectionGroup* GetSelection() const = 0;
- //! Get named selection.
- virtual CSelectionGroup* GetSelection(const QString& name) const = 0;
- // Get selection group names
- virtual void GetNameSelectionStrings(QStringList& names) = 0;
- //! Change name of current selection group.
- //! And store it in list.
- virtual void NameSelection(const QString& name) = 0;
- //! Set one of name selections as current selection.
- virtual void SetSelection(const QString& name) = 0;
- //! Removes one of named selections.
- virtual void RemoveSelection(const QString& name) = 0;
//! Delete all objects in current selection group.
virtual void DeleteSelection() = 0;
@@ -198,54 +114,11 @@ public:
virtual QString GenerateUniqueObjectName(const QString& typeName) = 0;
//! Register object name in object manager, needed for generating uniq names.
virtual void RegisterObjectName(const QString& name) = 0;
- //! Enable/Disable generating of unique object names (Enabled by default).
- //! Return previous value.
- virtual bool EnableUniqObjectNames(bool bEnable) = 0;
//! Find object class by name.
virtual CObjectClassDesc* FindClass(const QString& className) = 0;
- virtual void GetClassCategories(QStringList& categories) = 0;
- virtual void GetClassCategoryToolClassNamePairs(std::vector< std::pair >& categoryToolClassNamePairs) = 0;
- virtual void GetClassTypes(const QString& category, QStringList& types) = 0;
-
- //! Export objects to xml.
- //! When onlyShared is true ony objects with shared flags exported, overwise only not shared object exported.
- virtual void Export(const QString& levelPath, XmlNodeRef& rootNode, bool onlyShared) = 0;
- //! Export only entities to xml.
- virtual void ExportEntities(XmlNodeRef& rootNode) = 0;
-
- //! Serialize Objects in manager to specified XML Node.
- //! @param flags Can be one of SerializeFlags.
- virtual void Serialize(XmlNodeRef& rootNode, bool bLoading, int flags = SERIALIZE_ALL) = 0;
- virtual void SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading) = 0;
-
- //! Load objects from object archive.
- //! @param bSelect if set newly loaded object will be selected.
- virtual void LoadObjects(CObjectArchive& ar, bool bSelect) = 0;
virtual void ChangeObjectId(REFGUID oldId, REFGUID newId) = 0;
- virtual bool IsDuplicateObjectName(const QString& newName) const = 0;
- virtual void ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const = 0;
- virtual void ChangeObjectName(CBaseObject* obj, const QString& newName) = 0;
-
- //! while loading PreFabs we need to force this IDs
- //! to force always the same IDs, on each load.
- //! needed for RAM-maps assignments
- virtual uint32 ForceID() const = 0;
- virtual void ForceID(uint32 FID) = 0;
-
- //! Convert object of one type to object of another type.
- //! Original object is deleted.
- virtual bool ConvertToType(CBaseObject* pObject, const QString& typeName) = 0;
-
- //! Set new selection callback.
- //! @return previous selection callback.
- virtual IObjectSelectCallback* SetSelectCallback(IObjectSelectCallback* callback) = 0;
-
- // Enables/Disables creating of game objects.
- virtual void SetCreateGameObject(bool enable) = 0;
- //! Return true if objects loaded from xml should immidiatly create game objects associated with them.
- virtual bool IsCreateGameObjects() const = 0;
virtual IGizmoManager* GetGizmoManager() = 0;
@@ -253,34 +126,9 @@ public:
//! Invalidate visibily settings of objects.
virtual void InvalidateVisibleList() = 0;
- //////////////////////////////////////////////////////////////////////////
- // ObjectManager notification Callbacks.
- //////////////////////////////////////////////////////////////////////////
- virtual void AddObjectEventListener(EventListener* listener) = 0;
- virtual void RemoveObjectEventListener(EventListener* listener) = 0;
-
- //////////////////////////////////////////////////////////////////////////
- // Used to indicate starting and ending of objects loading.
- //////////////////////////////////////////////////////////////////////////
- virtual void StartObjectsLoading(int numObjects) = 0;
- virtual void EndObjectsLoading() = 0;
-
//////////////////////////////////////////////////////////////////////////
// Gathers all resources used by all objects.
virtual void GatherUsedResources(CUsedResources& resources) = 0;
virtual bool IsLightClass(CBaseObject* pObject) = 0;
-
- virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue) = 0;
- virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue) = 0;
-
- virtual bool IsReloading() const = 0;
-
- // Set bSkipUpdate to true if you want to skip update objects on the idle loop.
- virtual void SetSkipUpdate(bool bSkipUpdate) = 0;
-
- virtual void SetExportingLevel(bool bExporting) = 0;
- virtual bool IsExportingLevelInprogress() const = 0;
};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
diff --git a/Code/Editor/Include/ObjectEvent.h b/Code/Editor/Include/ObjectEvent.h
index e59bca6111..a117a8f8f1 100644
--- a/Code/Editor/Include/ObjectEvent.h
+++ b/Code/Editor/Include/ObjectEvent.h
@@ -14,7 +14,6 @@
//! Standart objects types.
enum ObjectType
{
- OBJTYPE_DUMMY = 1 << 20,
OBJTYPE_AZENTITY = 1 << 21,
};
diff --git a/Code/Editor/LayoutWnd.cpp b/Code/Editor/LayoutWnd.cpp
index aa2a008844..ea125ca3d4 100644
--- a/Code/Editor/LayoutWnd.cpp
+++ b/Code/Editor/LayoutWnd.cpp
@@ -487,7 +487,6 @@ bool CLayoutWnd::LoadConfig()
CreateLayout((EViewLayout)layout, false);
- bool bRebindViewports = false;
if (m_splitWnd)
{
const QString str = settings.value("Viewports").toString();
@@ -498,14 +497,12 @@ bool CLayoutWnd::LoadConfig()
{
break;
}
- bRebindViewports = true;
if (!resToken.isEmpty())
{
m_viewType[nIndex] = resToken;
}
nIndex++;
}
- ;
}
BindViewports();
diff --git a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp
index 656440f16e..67d89ad967 100644
--- a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp
+++ b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp
@@ -9,7 +9,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp b/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
index 39a89670ef..64b7d36d30 100644
--- a/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
+++ b/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp
@@ -63,16 +63,6 @@ namespace ObjectManagerPythonBindingsUnitTests
EXPECT_TRUE(behaviorContext->m_methods.find("get_selection_center") != behaviorContext->m_methods.end());
EXPECT_TRUE(behaviorContext->m_methods.find("get_selection_aabb") != behaviorContext->m_methods.end());
- EXPECT_TRUE(behaviorContext->m_methods.find("hide_object") != behaviorContext->m_methods.end());
- EXPECT_TRUE(behaviorContext->m_methods.find("is_object_hidden") != behaviorContext->m_methods.end());
- EXPECT_TRUE(behaviorContext->m_methods.find("unhide_object") != behaviorContext->m_methods.end());
- EXPECT_TRUE(behaviorContext->m_methods.find("hide_all_objects") != behaviorContext->m_methods.end());
- EXPECT_TRUE(behaviorContext->m_methods.find("unhide_all_objects") != behaviorContext->m_methods.end());
-
- EXPECT_TRUE(behaviorContext->m_methods.find("freeze_object") != behaviorContext->m_methods.end());
- EXPECT_TRUE(behaviorContext->m_methods.find("is_object_frozen") != behaviorContext->m_methods.end());
- EXPECT_TRUE(behaviorContext->m_methods.find("unfreeze_object") != behaviorContext->m_methods.end());
-
EXPECT_TRUE(behaviorContext->m_methods.find("delete_object") != behaviorContext->m_methods.end());
EXPECT_TRUE(behaviorContext->m_methods.find("delete_selected") != behaviorContext->m_methods.end());
diff --git a/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp b/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp
index 81dcae9129..473ddd81f7 100644
--- a/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp
+++ b/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp
@@ -8,7 +8,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp
index f6744ec2d2..38e433c3a3 100644
--- a/Code/Editor/MainWindow.cpp
+++ b/Code/Editor/MainWindow.cpp
@@ -576,7 +576,6 @@ void MainWindow::closeEvent(QCloseEvent* event)
}
// Close all edit panels.
GetIEditor()->ClearSelection();
- GetIEditor()->GetObjectManager()->EndEditParams();
// force clean up of all deferred deletes, so that we don't have any issues with windows from plugins not being deleted yet
qApp->sendPostedEvents(nullptr, QEvent::DeferredDelete);
diff --git a/Code/Editor/Objects/AxisGizmo.cpp b/Code/Editor/Objects/AxisGizmo.cpp
index a603b2615d..7215853854 100644
--- a/Code/Editor/Objects/AxisGizmo.cpp
+++ b/Code/Editor/Objects/AxisGizmo.cpp
@@ -329,7 +329,6 @@ bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point
hc.b2DViewport = view->GetType() != ET_ViewportCamera;
hc.point2d = point;
view->ViewToWorldRay(point, hc.raySrc, hc.rayDir);
- bool bHit = false;
if (HitTest(hc))
{
switch (hc.manipulatorMode)
@@ -344,7 +343,6 @@ bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point
view->SetCurrentCursor(STD_CURSOR_SCALE);
break;
}
- bHit = true;
}
}
}
diff --git a/Code/Editor/Objects/BaseObject.cpp b/Code/Editor/Objects/BaseObject.cpp
index b721dba56b..86840789dd 100644
--- a/Code/Editor/Objects/BaseObject.cpp
+++ b/Code/Editor/Objects/BaseObject.cpp
@@ -33,8 +33,6 @@
#include "ViewManager.h"
#include "IEditorImpl.h"
#include "GameEngine.h"
-#include
-#include
// To use the Andrew's algorithm in order to make convex hull from the points, this header is needed.
#include "Util/GeometryUtil.h"
@@ -53,18 +51,16 @@ class CUndoBaseObject
: public IUndoObject
{
public:
- CUndoBaseObject(CBaseObject* pObj, const char* undoDescription);
+ CUndoBaseObject(CBaseObject* pObj);
protected:
int GetSize() override { return sizeof(*this); }
- QString GetDescription() override { return m_undoDescription; };
QString GetObjectName() override;
void Undo(bool bUndo) override;
void Redo() override;
protected:
- QString m_undoDescription;
GUID m_guid;
XmlNodeRef m_undo;
XmlNodeRef m_redo;
@@ -77,11 +73,10 @@ class CUndoBaseObjectMinimal
: public IUndoObject
{
public:
- CUndoBaseObjectMinimal(CBaseObject* obj, const char* undoDescription, int flags);
+ CUndoBaseObjectMinimal(CBaseObject* obj, int flags);
protected:
int GetSize() override { return sizeof(*this); }
- QString GetDescription() override { return m_undoDescription; };
QString GetObjectName() override;
void Undo(bool bUndo) override;
@@ -101,7 +96,6 @@ private:
void SetTransformsFromState(CBaseObject* pObject, const StateStruct& state, bool bUndo);
GUID m_guid;
- QString m_undoDescription;
StateStruct m_undoState;
StateStruct m_redoState;
};
@@ -167,7 +161,6 @@ private:
}
int GetSize() override { return sizeof(CUndoAttachBaseObject); }
- QString GetDescription() override { return "Attachment Changed"; }
GUID m_attachedObjectGUID;
GUID m_parentObjectGUID;
@@ -176,11 +169,10 @@ private:
};
//////////////////////////////////////////////////////////////////////////
-CUndoBaseObject::CUndoBaseObject(CBaseObject* obj, const char* undoDescription)
+CUndoBaseObject::CUndoBaseObject(CBaseObject* obj)
{
// Stores the current state of this object.
assert(obj != 0);
- m_undoDescription = undoDescription;
m_guid = obj->GetId();
m_redo = nullptr;
@@ -254,11 +246,10 @@ void CUndoBaseObject::Redo()
}
//////////////////////////////////////////////////////////////////////////
-CUndoBaseObjectMinimal::CUndoBaseObjectMinimal(CBaseObject* pObj, const char* undoDescription, [[maybe_unused]] int flags)
+CUndoBaseObjectMinimal::CUndoBaseObjectMinimal(CBaseObject* pObj, [[maybe_unused]] int flags)
{
// Stores the current state of this object.
assert(pObj != nullptr);
- m_undoDescription = undoDescription;
m_guid = pObj->GetId();
ZeroStruct(m_redoState);
@@ -287,7 +278,7 @@ QString CUndoBaseObjectMinimal::GetObjectName()
void CUndoBaseObjectMinimal::Undo(bool bUndo)
{
CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
- if (!pObject || pObject->GetType() == OBJTYPE_DUMMY)
+ if (!pObject)
{
return;
}
@@ -316,7 +307,7 @@ void CUndoBaseObjectMinimal::Undo(bool bUndo)
void CUndoBaseObjectMinimal::Redo()
{
CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid);
- if (!pObject || pObject->GetType() == OBJTYPE_DUMMY)
+ if (!pObject)
{
return;
}
@@ -382,7 +373,6 @@ CBaseObject::CBaseObject()
, m_rotate(IDENTITY)
, m_scale(1, 1, 1)
, m_guid(GUID_NULL)
- , m_floorNumber(-1)
, m_flags(0)
, m_nTextureIcon(0)
, m_color(QColor(255, 255, 255))
@@ -398,11 +388,9 @@ CBaseObject::CBaseObject()
, m_bMatrixInWorldSpace(false)
, m_bMatrixValid(false)
, m_bWorldBoxValid(false)
- , m_nMaterialLayersMask(0)
, m_nMinSpec(0)
, m_vDrawIconPos(0, 0, 0)
, m_nIconFlags(0)
- , m_hideOrder(CBaseObject::s_invalidHiddenID)
{
m_worldBounds.min.Set(0, 0, 0);
m_worldBounds.max.Set(0, 0, 0);
@@ -431,7 +419,6 @@ bool CBaseObject::Init([[maybe_unused]] IEditor* ie, CBaseObject* prev, [[maybe_
SetLocalTM(prev->GetPos(), prev->GetRotation(), prev->GetScale());
SetArea(prev->GetArea());
SetColor(prev->GetColor());
- m_nMaterialLayersMask = prev->m_nMaterialLayersMask;
SetMinSpec(prev->GetMinSpec(), false);
// Copy all basic variables.
@@ -488,7 +475,7 @@ void CBaseObject::SetName(const QString& name)
return;
}
- StoreUndo("Name");
+ StoreUndo();
// Notification is expensive and not required if this is during construction.
bool notify = (!m_name.isEmpty());
@@ -500,7 +487,6 @@ void CBaseObject::SetName(const QString& name)
if (notify)
{
NotifyListeners(ON_RENAME);
- static_cast(GetIEditor()->GetObjectManager())->NotifyObjectListeners(this, ON_RENAME);
}
}
@@ -529,47 +515,6 @@ const QString& CBaseObject::GetName() const
return m_name;
}
-//////////////////////////////////////////////////////////////////////////
-QString CBaseObject::GetWarningsText() const
-{
- QString warnings;
-
- if (gSettings.viewports.bShowScaleWarnings)
- {
- const EScaleWarningLevel scaleWarningLevel = GetScaleWarningLevel();
- if (scaleWarningLevel == eScaleWarningLevel_Rescaled)
- {
- warnings += "\\n Warning: Object Scale is not 100%.";
- }
- else if (scaleWarningLevel == eScaleWarningLevel_RescaledNonUniform)
- {
- warnings += "\\n Warning: Object has non-uniform scale.";
- }
- }
-
- if (gSettings.viewports.bShowRotationWarnings)
- {
- const ERotationWarningLevel rotationWarningLevel = GetRotationWarningLevel();
-
- if (rotationWarningLevel == eRotationWarningLevel_Rotated)
- {
- warnings += "\\n Warning: Object is rotated.";
- }
- else if (rotationWarningLevel == eRotationWarningLevel_RotatedNonRectangular)
- {
- warnings += "\\n Warning: Object is rotated non-orthogonally.";
- }
- }
-
- return warnings;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsSameClass(CBaseObject* obj)
-{
- return GetClassDesc() == obj->GetClassDesc();
-}
-
//////////////////////////////////////////////////////////////////////////
bool CBaseObject::SetPos(const Vec3& pos, int flags)
{
@@ -615,7 +560,7 @@ bool CBaseObject::SetPos(const Vec3& pos, int flags)
//////////////////////////////////////////////////////////////////////////
if (!bPositionDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
{
- StoreUndo("Position", true, flags);
+ StoreUndo(true, flags);
}
if (!bPositionDelegated)
@@ -659,7 +604,7 @@ bool CBaseObject::SetRotation(const Quat& rotate, int flags)
if (!bRotationDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
{
- StoreUndo("Rotate", true, flags);
+ StoreUndo(true, flags);
}
if (!bRotationDelegated)
@@ -704,7 +649,7 @@ bool CBaseObject::SetScale(const Vec3& scale, int flags)
if (!bScaleDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0)
{
- StoreUndo("Scale", true, flags);
+ StoreUndo(true, flags);
}
if (!bScaleDelegated)
@@ -763,7 +708,7 @@ void CBaseObject::ChangeColor(const QColor& color)
return;
}
- StoreUndo("Color", true);
+ StoreUndo(true);
SetColor(color);
SetModified(false);
@@ -783,7 +728,7 @@ void CBaseObject::SetArea(float area)
return;
}
- StoreUndo("Area", true);
+ StoreUndo(true);
m_flattenArea = area;
SetModified(false);
@@ -1183,47 +1128,6 @@ bool CBaseObject::CanBeDrawn(const DisplayContext& dc, bool& outDisplaySelection
return bResult;
}
-//////////////////////////////////////////////////////////////////////////
-int CBaseObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags)
-{
- AZ_PROFILE_FUNCTION(Editor);
-
- if (event == eMouseMove || event == eMouseLDown)
- {
- Vec3 pos;
- if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN)
- {
- pos = view->MapViewToCP(point);
- }
- else
- {
- // Snap to terrain.
- bool hitTerrain;
- pos = view->ViewToWorld(point, &hitTerrain);
- if (hitTerrain)
- {
- pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y) + 1.0f;
- }
- pos = view->SnapToGrid(pos);
- }
- SetPos(pos);
-
- if (event == eMouseLDown)
- {
- return MOUSECREATE_OK;
- }
- }
-
- if (event == eMouseWheel)
- {
- float angle = 1;
- Quat rot = GetRotation();
- rot.SetRotationXYZ(Ang3(0.f, 0.f, rot.GetRotZ() + DEG2RAD(flags > 0 ? angle * (-1) : angle)));
- SetRotation(rot);
- }
- return MOUSECREATE_CONTINUE;
-}
-
//////////////////////////////////////////////////////////////////////////
void CBaseObject::OnEvent(ObjectEvent event)
{
@@ -1237,18 +1141,13 @@ void CBaseObject::OnEvent(ObjectEvent event)
//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetShared([[maybe_unused]] bool bShared)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::SetHidden(bool bHidden, uint64 hiddenID, bool bAnimated)
+void CBaseObject::SetHidden(bool bHidden, bool bAnimated)
{
if (CheckFlags(OBJFLAG_HIDDEN) != bHidden)
{
if (!bAnimated)
{
- StoreUndo("Hide Object");
+ StoreUndo();
}
if (bHidden)
@@ -1260,7 +1159,6 @@ void CBaseObject::SetHidden(bool bHidden, uint64 hiddenID, bool bAnimated)
ClearFlags(OBJFLAG_HIDDEN);
}
- m_hideOrder = hiddenID;
UpdateVisibility(!IsHidden());
}
}
@@ -1270,7 +1168,7 @@ void CBaseObject::SetFrozen(bool bFrozen)
{
if (CheckFlags(OBJFLAG_FROZEN) != bFrozen)
{
- StoreUndo("Freeze Object");
+ StoreUndo();
if (bFrozen)
{
SetFlags(OBJFLAG_FROZEN);
@@ -1356,14 +1254,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
if (ar.bLoading)
{
// Loading.
- if (ar.ShouldResetInternalMembers())
- {
- m_flags = 0;
- m_flattenArea = 0.0f;
- m_nMinSpec = 0;
- m_scale.Set(1.0f, 1.0f, 1.0f);
- }
-
int flags = 0;
int oldFlags = m_flags;
@@ -1403,7 +1293,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
xmlNode->getAttr("LookAt", lookatId);
xmlNode->getAttr("Material", mtlName);
xmlNode->getAttr("MinSpec", nMinSpec);
- xmlNode->getAttr("FloorNumber", m_floorNumber);
if (nMinSpec <= CONFIG_VERYHIGH_SPEC) // Ignore invalid values.
{
@@ -1467,18 +1356,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
SetModified(false);
//////////////////////////////////////////////////////////////////////////
-
- if (ar.bUndo)
- {
- // If we are selected update UI Panel.
- xmlNode->getAttr("HideOrder", m_hideOrder);
- }
-
- // We reseted the min spec and deserialized it so set it internally
- if (ar.ShouldResetInternalMembers())
- {
- SetMinSpec(m_nMinSpec);
- }
}
else
{
@@ -1490,7 +1367,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
xmlNode->setAttr("Id", m_guid);
xmlNode->setAttr("Name", GetName().toUtf8().data());
- xmlNode->setAttr("HideOrder", m_hideOrder);
if (m_parent)
{
@@ -1507,8 +1383,6 @@ void CBaseObject::Serialize(CObjectArchive& ar)
xmlNode->setAttr("Pos", GetPos());
}
- xmlNode->setAttr("FloorNumber", m_floorNumber);
-
xmlNode->setAttr("Rotate", m_rotate);
if (!IsEquivalent(GetScale(), Vec3(1, 1, 1), 0))
@@ -1601,13 +1475,8 @@ CBaseObject* CBaseObject::FindObject(REFGUID id) const
}
//////////////////////////////////////////////////////////////////////////
-void CBaseObject::StoreUndo(const char* UndoDescription, bool minimal, int flags)
+void CBaseObject::StoreUndo(bool minimal, int flags)
{
- if (m_objType == OBJTYPE_DUMMY)
- {
- return;
- }
-
// Don't use Sandbox undo for AZ entities, except for the move & scale tools, which rely on it.
const bool isGizmoTool = 0 != (flags & (eObjectUpdateFlags_MoveTool | eObjectUpdateFlags_ScaleTool | eObjectUpdateFlags_UserInput));
if (!isGizmoTool && 0 != (m_flags & OBJFLAG_DONT_SAVE))
@@ -1619,28 +1488,18 @@ void CBaseObject::StoreUndo(const char* UndoDescription, bool minimal, int flags
{
if (minimal)
{
- CUndo::Record(new CUndoBaseObjectMinimal(this, UndoDescription, flags));
+ CUndo::Record(new CUndoBaseObjectMinimal(this, flags));
}
else
{
- CUndo::Record(new CUndoBaseObject(this, UndoDescription));
+ CUndo::Record(new CUndoBaseObject(this));
}
}
}
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsCreateGameObjects() const
-{
- return GetObjectManager()->IsCreateGameObjects();
-}
-
//////////////////////////////////////////////////////////////////////////
QString CBaseObject::GetTypeName() const
{
- if (m_objType == OBJTYPE_DUMMY)
- {
- return "";
- }
QString className = m_classDesc->ClassName();
QString subClassName = strstr(className.toUtf8().data(), "::");
if (subClassName.isEmpty())
@@ -1901,85 +1760,6 @@ bool CBaseObject::HitTestRect(HitContext& hc)
return bHit;
}
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::HitHelperTest(HitContext& hc)
-{
- return HitHelperAtTest(hc, GetWorldPos());
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::HitHelperAtTest(HitContext& hc, const Vec3& pos)
-{
- AZ_PROFILE_FUNCTION(Editor);
-
- bool bResult = false;
-
- if (m_nTextureIcon && (gSettings.viewports.bShowIcons || gSettings.viewports.bShowSizeBasedIcons) && !hc.bUseSelectionHelpers)
- {
- int iconSizeX = OBJECT_TEXTURE_ICON_SIZEX;
- int iconSizeY = OBJECT_TEXTURE_ICON_SIZEY;
-
- if (gSettings.viewports.bDistanceScaleIcons)
- {
- float fScreenScale = hc.view->GetScreenScaleFactor(pos);
-
- iconSizeX = static_cast(static_cast(iconSizeX) * OBJECT_TEXTURE_ICON_SCALE / fScreenScale);
- iconSizeY = static_cast(static_cast(iconSizeY) * OBJECT_TEXTURE_ICON_SCALE / fScreenScale);
- }
-
- // Hit Test icon of this object.
- Vec3 testPos = pos;
- int y0 = -(iconSizeY / 2);
- int y1 = +(iconSizeY / 2);
- if (CheckFlags(OBJFLAG_SHOW_ICONONTOP))
- {
- Vec3 objectPos = GetWorldPos();
-
- AABB box;
- GetBoundBox(box);
- testPos.z = (pos.z - objectPos.z) + box.max.z;
- y0 = -(iconSizeY);
- y1 = 0;
- }
- QPoint pnt = hc.view->WorldToView(testPos);
-
- if (hc.point2d.x() >= pnt.x() - (iconSizeX / 2) && hc.point2d.x() <= pnt.x() + (iconSizeX / 2) &&
- hc.point2d.y() >= pnt.y() + y0 && hc.point2d.y() <= pnt.y() + y1)
- {
- hc.dist = hc.raySrc.GetDistance(testPos) - 0.2f;
- hc.iconHit = true;
- bResult = true;
- }
- }
- else if (hc.bUseSelectionHelpers)
- {
- // Check potentially children first
- bResult = HitHelperTestForChildObjects(hc);
-
- // If no hit check this object
- if (!bResult)
- {
- // Hit test helper.
- Vec3 w = pos - hc.raySrc;
- w = hc.rayDir.Cross(w);
- float d = w.GetLengthSquared();
-
- static const float screenScaleToRadiusFactor = 0.008f;
- const float radius = hc.view->GetScreenScaleFactor(pos) * screenScaleToRadiusFactor;
- const float pickDistance = hc.raySrc.GetDistance(pos);
- if (d < radius * radius + hc.distanceTolerance && hc.dist >= pickDistance)
- {
- hc.dist = pickDistance;
- hc.object = this;
- bResult = true;
- }
- }
- }
-
-
- return bResult;
-}
-
//////////////////////////////////////////////////////////////////////////
CBaseObject* CBaseObject::GetChild(size_t const i) const
{
@@ -1987,47 +1767,6 @@ CBaseObject* CBaseObject::GetChild(size_t const i) const
return m_childs[i];
}
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsChildOf(CBaseObject* node)
-{
- CBaseObject* p = m_parent;
- while (p && p != node)
- {
- p = p->m_parent;
- }
- if (p == node)
- {
- return true;
- }
- return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::CloneChildren(CBaseObject* pFromObject)
-{
- if (pFromObject == nullptr)
- {
- return;
- }
-
- for (size_t i = 0, nChildCount(pFromObject->GetChildCount()); i < nChildCount; ++i)
- {
- CBaseObject* pFromChildObject = pFromObject->GetChild(i);
-
- CBaseObject* pChildClone = GetObjectManager()->CloneObject(pFromChildObject);
- if (pChildClone == nullptr)
- {
- continue;
- }
-
- pChildClone->CloneChildren(pFromChildObject);
- AddMember(pChildClone, false);
- }
-}
-
//////////////////////////////////////////////////////////////////////////
void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos)
{
@@ -2044,7 +1783,6 @@ void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos)
return;
}
- static_cast(GetObjectManager())->NotifyObjectListeners(child, ON_PREATTACHED);
child->NotifyListeners(bKeepPos ? ON_PREATTACHEDKEEPXFORM : ON_PREATTACHED);
pTransformDelegate = m_pTransformDelegate;
@@ -2089,7 +1827,6 @@ void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos)
m_pTransformDelegate = pTransformDelegate;
child->m_pTransformDelegate = pChildTransformDelegate;
- static_cast(GetObjectManager())->NotifyObjectListeners(child, ON_ATTACHED);
child->NotifyListeners(ON_ATTACHED);
NotifyListeners(ON_CHILDATTACHED);
@@ -2127,7 +1864,6 @@ void CBaseObject::DetachThis(bool bKeepPos)
{
CScopedSuspendUndo suspendUndo;
- static_cast(GetObjectManager())->NotifyObjectListeners(this, ON_PREDETACHED);
NotifyListeners(bKeepPos ? ON_PREDETACHEDKEEPXFORM : ON_PREDETACHED);
pTransformDelegate = m_pTransformDelegate;
@@ -2158,7 +1894,6 @@ void CBaseObject::DetachThis(bool bKeepPos)
SetTransformDelegate(pTransformDelegate);
- static_cast(GetObjectManager())->NotifyObjectListeners(this, ON_DETACHED);
NotifyListeners(ON_DETACHED);
}
}
@@ -2262,12 +1997,6 @@ Matrix34 CBaseObject::GetParentAttachPointWorldTM() const
return Matrix34(IDENTITY);
}
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IsParentAttachmentValid() const
-{
- return true;
-}
-
//////////////////////////////////////////////////////////////////////////
void CBaseObject::InvalidateTM([[maybe_unused]] int flags)
{
@@ -2418,7 +2147,7 @@ void CBaseObject::SetLookAt(CBaseObject* target)
return;
}
- StoreUndo("Change LookAt");
+ StoreUndo();
if (m_lookat)
{
@@ -2543,63 +2272,6 @@ void CBaseObject::Validate(IErrorReport* report)
//////////////////////////////////////////////////////////////////////////
};
-//////////////////////////////////////////////////////////////////////////
-Ang3 CBaseObject::GetWorldAngles() const
-{
- if (m_scale == Vec3(1, 1, 1))
- {
- Quat q = Quat(GetWorldTM());
- Ang3 angles = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(q)));
- return angles;
- }
- else
- {
- Matrix34 tm = GetWorldTM();
- tm.OrthonormalizeFast();
- Quat q = Quat(tm);
- Ang3 angles = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(q)));
- return angles;
- }
-};
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx)
-{
- CBaseObject* pFromParent = pFromObject->GetParent();
- if (pFromParent)
- {
- SetFloorNumber(pFromObject->GetFloorNumber());
-
- CBaseObject* pFromParentInContext = ctx.FindClone(pFromParent);
- if (pFromParentInContext)
- {
- pFromParentInContext->AddMember(this, false);
- }
- else
- {
- pFromParent->AddMember(this, false);
- }
- }
- if (pFromObject->ShouldCloneChildren())
- {
- for (int i = 0; i < pFromObject->GetChildCount(); i++)
- {
- CBaseObject* pChildObject = pFromObject->GetChild(i);
- CBaseObject* pClonedChild = GetObjectManager()->CloneObject(pChildObject);
- ctx.AddClone(pChildObject, pClonedChild);
- }
- for (int i = 0; i < pFromObject->GetChildCount(); i++)
- {
- CBaseObject* pChildObject = pFromObject->GetChild(i);
- CBaseObject* pClonedChild = ctx.FindClone(pChildObject);
- if (pClonedChild)
- {
- pClonedChild->PostClone(pChildObject, ctx);
- }
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////
void CBaseObject::GatherUsedResources(CUsedResources& resources)
{
@@ -2635,79 +2307,6 @@ void CBaseObject::SetMinSpec(uint32 nSpec, bool bSetChildren)
}
}
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::OnPropertyChanged(IVariable*)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::OnMultiSelPropertyChanged(IVariable*)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::OnMenuShowInAssetBrowser()
-{
- if (!IsSelected())
- {
- CUndo undo("Select Object");
- GetIEditor()->GetObjectManager()->ClearSelection();
- GetIEditor()->SelectObject(this);
- }
-
- GetIEditor()->ExecuteCommand("asset_browser.show_viewport_selection");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBaseObject::OnContextMenu(QMenu* menu)
-{
- if (!menu->isEmpty())
- {
- menu->addSeparator();
- }
- CUsedResources resources;
- GatherUsedResources(resources);
-
- static_cast(GetIEditor())->OnObjectContextMenuOpened(menu, this);
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CBaseObject::IntersectRayMesh(const Vec3& raySrc, const Vec3& rayDir, SRayHitInfo& outHitInfo) const
-{
- const float fRenderMeshTestDistance = 0.2f;
- IRenderNode* pRenderNode = GetEngineNode();
- if (!pRenderNode)
- {
- return false;
- }
-
- Matrix34 worldTM;
- IStatObj* pStatObj = pRenderNode->GetEntityStatObj(0, 0, &worldTM);
- if (!pStatObj)
- {
- return false;
- }
-
- // transform decal into object space
- Matrix34 worldTM_Inverted = worldTM.GetInverted();
- Matrix33 worldRot(worldTM_Inverted);
- worldRot.Transpose();
- // put hit direction into the object space
- Vec3 vRayDir = rayDir.GetNormalized() * worldRot;
- // put hit position into the object space
- Vec3 vHitPos = worldTM_Inverted.TransformPoint(raySrc);
- Vec3 vLineP1 = vHitPos - vRayDir * fRenderMeshTestDistance;
-
- memset(&outHitInfo, 0, sizeof(outHitInfo));
- outHitInfo.inReferencePoint = vHitPos;
- outHitInfo.inRay.origin = vLineP1;
- outHitInfo.inRay.direction = vRayDir;
- outHitInfo.bInFirstHit = false;
- outHitInfo.bUseCache = false;
-
- return pStatObj->RayIntersection(outHitInfo, nullptr);
-}
-
//////////////////////////////////////////////////////////////////////////
EScaleWarningLevel CBaseObject::GetScaleWarningLevel() const
{
diff --git a/Code/Editor/Objects/BaseObject.h b/Code/Editor/Objects/BaseObject.h
index ab14437659..f78755e81d 100644
--- a/Code/Editor/Objects/BaseObject.h
+++ b/Code/Editor/Objects/BaseObject.h
@@ -35,8 +35,6 @@ struct SSubObjSelectionModifyContext;
struct SRayHitInfo;
class CPopupMenuItem;
class QMenu;
-struct IRenderNode;
-struct IStatObj;
//////////////////////////////////////////////////////////////////////////
typedef _smart_ptr CBaseObjectPtr;
@@ -119,15 +117,6 @@ enum ObjectFlags
#define ERF_GET_WRITABLE(flags) (flags)
-//////////////////////////////////////////////////////////////////////////
-//! This flags passed to CBaseObject::BeginEditParams method.
-enum ObjectEditFlags
-{
- OBJECT_CREATE = 0x001,
- OBJECT_EDIT = 0x002,
- OBJECT_COLLAPSE_OBJECTPANEL = 0x004
-};
-
//////////////////////////////////////////////////////////////////////////
//! Return values from CBaseObject::MouseCreateCallback method.
enum MouseCreateResult
@@ -137,19 +126,6 @@ enum MouseCreateResult
MOUSECREATE_OK, //!< Accept this object.
};
-//////////////////////////////////////////////////////////////////////////
-// Interface to the object create with the mouse callback.
-//////////////////////////////////////////////////////////////////////////
-struct IMouseCreateCallback
-{
- virtual void Release() = 0;
- virtual MouseCreateResult OnMouseEvent(CViewport* view, EMouseEvent event, QPoint& point, int flags) = 0;
- // Some process of creation need to be able to be displayed such as creation for custom solid.
- virtual void Display([[maybe_unused]] DisplayContext& dc){}
- // Called after accepting an object to see if new object creation mode should be continued.
- virtual bool ContinueCreation() = 0;
-};
-
// Flags used for object interaction
enum EObjectUpdateFlags
{
@@ -261,22 +237,11 @@ public:
/** Check if both object are of same class.
*/
- virtual bool IsSameClass(CBaseObject* obj);
- virtual void SetDefaultType() { m_objType = OBJTYPE_DUMMY; };
virtual ObjectType GetType() const
{
- if (m_objType == OBJTYPE_DUMMY)
- {
- return m_objType;
- }
- else
- {
- return m_classDesc->GetObjectType();
- }
+ return m_classDesc->GetObjectType();
};
- // const char* GetTypeName() const { return m_classDesc->ClassName(); };
QString GetTypeName() const;
- virtual QString GetTypeDescription() const { return m_classDesc->ClassName(); };
//////////////////////////////////////////////////////////////////////////
// Flags.
@@ -289,8 +254,6 @@ public:
// Hidden ID
//////////////////////////////////////////////////////////////////////////
static const uint64 s_invalidHiddenID = 0;
- uint64 GetHideOrder() const { return m_hideOrder; }
- void SetHideOrder(uint64 newID) { m_hideOrder = newID; }
//! Returns true if object hidden.
bool IsHidden() const;
@@ -307,26 +270,19 @@ public:
virtual bool IsSelectable() const;
// Return texture icon.
- bool HaveTextureIcon() const { return m_nTextureIcon != 0; };
int GetTextureIcon() const { return m_nTextureIcon; }
void SetTextureIcon(int nTexIcon) { m_nTextureIcon = nTexIcon; }
- //! Set shared between missions flag.
- virtual void SetShared(bool bShared);
//! Set object hidden status.
- virtual void SetHidden(bool bHidden, uint64 hiddenId = CBaseObject::s_invalidHiddenID, bool bAnimated = false);
+ virtual void SetHidden(bool bHidden, bool bAnimated = false);
//! Set object frozen status.
virtual void SetFrozen(bool bFrozen);
//! Set object selected status.
virtual void SetSelected(bool bSelect);
- //! Return associated 3DEngine render node
- virtual IRenderNode* GetEngineNode() const { return nullptr; };
//! Set object highlighted (Note: not selected)
virtual void SetHighlight(bool bHighlight);
//! Check if object is highlighted.
bool IsHighlighted() const { return CheckFlags(OBJFLAG_HIGHLIGHT); }
- //! Check if object can have measurement axises.
- virtual bool HasMeasurementAxis() const { return true; }
//! Check if the object is isolated when the editor is in Isolation Mode
virtual bool IsIsolated() const { return false; }
@@ -345,8 +301,6 @@ public:
//////////////////////////////////////////////////////////////////////////
//! Get name of object.
const QString& GetName() const;
- virtual QString GetComment() const { return QString(); }
- virtual QString GetWarningsText() const;
//! Change name of object.
virtual void SetName(const QString& name);
@@ -376,10 +330,6 @@ public:
//! Get object scale.
const Vec3 GetScale() const;
- virtual bool StartScaling() { return false; }
- virtual bool GetUntransformedScale([[maybe_unused]] Vec3& scale) const { return false; }
- virtual bool TransformScale([[maybe_unused]] const Vec3& scale) { return false; }
-
//! Set flatten area.
void SetArea(float area);
float GetArea() const { return m_flattenArea; };
@@ -397,8 +347,6 @@ public:
// CHILDS
//////////////////////////////////////////////////////////////////////////
- //! Return true if node have childs.
- bool HaveChilds() const { return !m_childs.empty(); }
//! Return true if have attached childs.
size_t GetChildCount() const { return m_childs.size(); }
@@ -406,10 +354,6 @@ public:
CBaseObject* GetChild(size_t const i) const;
//! Return parent node if exist.
CBaseObject* GetParent() const { return m_parent; };
- //! Scans hierarchy up to determine if we child of specified node.
- virtual bool IsChildOf(CBaseObject* node);
- //! Clone Children
- void CloneChildren(CBaseObject* pFromObject);
//! Attach new child node.
//! @param bKeepPos if true Child node will keep its world space position.
virtual void AttachChild(CBaseObject* child, bool bKeepPos = true);
@@ -422,8 +366,6 @@ public:
virtual void DetachAll(bool bKeepPos = true);
// Detach this node from parent.
virtual void DetachThis(bool bKeepPos = true);
- // Returns the link parent.
- virtual CBaseObject* GetLinkParent() const { return GetParent(); }
//////////////////////////////////////////////////////////////////////////
// MATRIX
@@ -437,15 +379,11 @@ public:
// Gets matrix of parent attachment point
virtual Matrix34 GetParentAttachPointWorldTM() const;
- // Checks if the attachment point is valid
- virtual bool IsParentAttachmentValid() const;
-
//! Set position in world space.
virtual void SetWorldPos(const Vec3& pos, int flags = 0);
//! Get position in world space.
Vec3 GetWorldPos() const { return GetWorldTM().GetTranslation(); };
- Ang3 GetWorldAngles() const;
//! Set xform of object given in world space.
virtual void SetWorldTM(const Matrix34& tm, int flags = 0);
@@ -460,12 +398,6 @@ public:
// Interface to be implemented in plugins.
//////////////////////////////////////////////////////////////////////////
- //! Called when object is being created (use GetMouseCreateCallback for more advanced mouse creation callback).
- virtual int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags);
- // Return pointer to the callback object used when creating object by the mouse.
- // If this function return nullptr MouseCreateCallback method will be used instead.
- virtual IMouseCreateCallback* GetMouseCreateCallback() { return nullptr; };
-
//! Draw object to specified viewport.
virtual void Display([[maybe_unused]] DisplayContext& disp) {}
@@ -477,10 +409,6 @@ public:
//! Return true if was hit.
virtual bool HitTestRect(HitContext& hc);
- //! Perform intersection testing of this object based on its icon helper.
- //! Return true if was hit.
- virtual bool HitHelperTest(HitContext& hc);
-
//! Get bounding box of object in world coordinate space.
virtual void GetBoundBox(AABB& box);
@@ -500,8 +428,6 @@ public:
//! @param bUndo true if loading or saving data for Undo/Redo purposes.
virtual void Serialize(CObjectArchive& ar);
- //// Pre load called before serialize after all objects where completly loaded.
- //virtual void PreLoad( CObjectArchive &ar ) {};
// Post load called after all objects where completely loaded.
virtual void PostLoad([[maybe_unused]] CObjectArchive& ar) {};
@@ -513,9 +439,6 @@ public:
//! Override in derived classes, to handle specific events.
virtual void OnEvent(ObjectEvent event);
- //! Generate dynamic context menu for the object
- virtual void OnContextMenu(QMenu* menu);
-
//////////////////////////////////////////////////////////////////////////
// LookAt Target.
//////////////////////////////////////////////////////////////////////////
@@ -523,13 +446,11 @@ public:
CBaseObject* GetLookAt() const { return m_lookat; };
//! Returns true if this object is a look-at target.
bool IsLookAtTarget() const;
- CBaseObject* GetLookAtSource() const { return m_lookatSource; };
-
IObjectManager* GetObjectManager() const;
//! Store undo information for this object.
- void StoreUndo(const char* undoDescription, bool minimal = false, int flags = 0);
+ void StoreUndo(bool minimal = false, int flags = 0);
//! Add event listener callback.
void AddEventListener(EventListener* listener);
@@ -548,52 +469,21 @@ public:
//! Check if specified object is very similar to this one.
virtual bool IsSimilarObject(CBaseObject* pObject);
- //////////////////////////////////////////////////////////////////////////
- // Material Layers Mask.
- //////////////////////////////////////////////////////////////////////////
- virtual void SetMaterialLayersMask(uint32 nLayersMask) { m_nMaterialLayersMask = nLayersMask; }
- uint32 GetMaterialLayersMask() const { return m_nMaterialLayersMask; };
-
//////////////////////////////////////////////////////////////////////////
// Object minimal usage spec (All/Low/Medium/High)
//////////////////////////////////////////////////////////////////////////
uint32 GetMinSpec() const { return m_nMinSpec; }
virtual void SetMinSpec(uint32 nSpec, bool bSetChildren = true);
- //////////////////////////////////////////////////////////////////////////
- // SubObj selection.
- //////////////////////////////////////////////////////////////////////////
- // Return true if object support selecting of this sub object element type.
- virtual bool StartSubObjSelection([[maybe_unused]] int elemType) { return false; };
- virtual void EndSubObjectSelection() {};
- virtual void ModifySubObjSelection([[maybe_unused]] SSubObjSelectionModifyContext& modCtx) {};
- virtual void AcceptSubObjectModify() {};
-
//! In This function variables of the object must be initialized.
virtual void InitVariables() {};
- //////////////////////////////////////////////////////////////////////////
- // Procedural Floor Management.
- //////////////////////////////////////////////////////////////////////////
- int GetFloorNumber() const { return m_floorNumber; };
- void SetFloorNumber(int floorNumber) { m_floorNumber = floorNumber; };
-
- virtual void OnPropertyChanged(IVariable*);
- virtual void OnMultiSelPropertyChanged(IVariable*);
-
//! Draw a reddish highlight indicating its budget usage.
virtual void DrawBudgetUsage(DisplayContext& dc, const QColor& color);
- bool IntersectRayMesh(const Vec3& raySrc, const Vec3& rayDir, SRayHitInfo& outHitInfo) const;
-
- virtual void EditTags([[maybe_unused]] bool alwaysTag) {}
- virtual bool SupportsEditTags() const { return false; }
-
bool CanBeHightlighted() const;
bool IsSkipSelectionHelper() const;
- virtual IStatObj* GetIStatObj() { return nullptr; }
-
// Invalidates cached transformation matrix.
// nWhyFlags - Flags that indicate the reason for matrix invalidation.
virtual void InvalidateTM(int nWhyFlags);
@@ -612,26 +502,14 @@ protected:
//! Optional file parameter specify initial object or script for this object.
virtual bool Init(IEditor* ie, CBaseObject* prev, const QString& file);
- //////////////////////////////////////////////////////////////////////////
- //! Must be called after cloning the object on clone of object.
- //! This will make sure object references are cloned correctly.
- virtual void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx);
-
//! Must be implemented by derived class to create game related objects.
virtual bool CreateGameObject() { return true; };
- //! If true, all attached chilren will be cloned when the parent object is cloned.
- virtual bool ShouldCloneChildren() const { return true; }
-
/** Called when object is about to be deleted.
- All Game resources should be freed in this function.
+ All Game resources should be freed in this function.
*/
virtual void Done();
- /** Change current id of object.
- */
- //virtual void SetId( uint32 objectId ) { m_id = objectId; };
-
//! Call this to delete an object.
virtual void DeleteThis() = 0;
@@ -682,17 +560,11 @@ protected:
// Function can be used by derived classes.
bool HitTestRectBounds(HitContext& hc, const AABB& box);
- // Do helper hit testing as specific location.
- bool HitHelperAtTest(HitContext& hc, const Vec3& pos);
-
// Do helper hit testing taking child objects into account (e.g. opened prefab)
virtual bool HitHelperTestForChildObjects([[maybe_unused]] HitContext& hc) { return false; }
CBaseObject* FindObject(REFGUID id) const;
- // Returns true if game objects should be created.
- bool IsCreateGameObjects() const;
-
// Helper gizmo functions.
void AddGizmo(CGizmo* gizmo);
void RemoveGizmo(CGizmo* gizmo);
@@ -703,14 +575,6 @@ protected:
//! Only used by ObjectManager.
bool IsPotentiallyVisible() const;
- //////////////////////////////////////////////////////////////////////////
- // May be overridden in derived classes to handle helpers scaling.
- //////////////////////////////////////////////////////////////////////////
- virtual void SetHelperScale([[maybe_unused]] float scale) {};
- virtual float GetHelperScale() { return 1.0f; };
-
- void SetNameInternal(const QString& name) { m_name = name; }
-
void SetDrawTextureIconProperties(DisplayContext& dc, const Vec3& pos, float alpha = 1.0f, int texIconFlags = 0);
const Vec3& GetTextureIconDrawPos(){ return m_vDrawIconPos; };
int GetTextureIconFlags(){ return m_nIconFlags; };
@@ -732,8 +596,6 @@ private:
friend class CObjectArchive;
friend class CSelectionGroup;
- void OnMenuShowInAssetBrowser();
-
//! Set class description for this object,
//! Only called once after creation by ObjectManager.
void SetClassDesc(CObjectClassDesc* classDesc);
@@ -741,9 +603,6 @@ private:
EScaleWarningLevel GetScaleWarningLevel() const;
ERotationWarningLevel GetRotationWarningLevel() const;
- // auto resolving
- void OnMtlResolved(uint32 id, bool success, const char* orgName, const char* newName);
-
bool IsInSelectionBox() const { return m_bInSelectionBox; }
void SetId(REFGUID guid) { m_guid = guid; }
@@ -766,13 +625,10 @@ private:
//! Unique object Id.
GUID m_guid;
- // floor number of object if procedural object flag is set
- int m_floorNumber;
-
//! Flags of this object.
int m_flags;
- // Id of the texture icon for this object.
+ //! Id of the texture icon for this object.
int m_nTextureIcon;
//! Display color.
@@ -823,13 +679,10 @@ private:
mutable uint32 m_bMatrixValid : 1;
mutable uint32 m_bWorldBoxValid : 1;
uint32 m_bInSelectionBox : 1;
- uint32 m_nMaterialLayersMask : 8;
uint32 m_nMinSpec : 8;
Vec3 m_vDrawIconPos;
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
- uint64 m_hideOrder;
};
Q_DECLARE_METATYPE(CBaseObject*)
diff --git a/Code/Editor/Objects/DisplayContext.h b/Code/Editor/Objects/DisplayContext.h
index f4df4f95c6..8f54be78fe 100644
--- a/Code/Editor/Objects/DisplayContext.h
+++ b/Code/Editor/Objects/DisplayContext.h
@@ -81,11 +81,38 @@ struct SANDBOX_API DisplayContext
// Draw functions
//////////////////////////////////////////////////////////////////////////
//! Set current materialc color.
- void SetColor(float r, float g, float b, float a = 1) { m_color4b = ColorB(static_cast(r * 255.0f), static_cast(g * 255.0f), static_cast(b * 255.0f), static_cast(a * 255.0f)); };
- void SetColor(const Vec3& color, float a = 1) { m_color4b = ColorB(static_cast(color.x * 255.0f), static_cast(color.y * 255.0f), static_cast(color.z * 255.0f), static_cast(a * 255.0f)); };
- void SetColor(const QColor& rgb, float a) { m_color4b = ColorB(static_cast(rgb.red()), static_cast(rgb.green()), static_cast(rgb.blue()), static_cast(a * 255.0f)); };
- void SetColor(const QColor& color) { m_color4b = ColorB(static_cast(color.red()), static_cast(color.green()), static_cast(color.blue()), static_cast(color.alpha())); };
- void SetColor(const ColorB& color) { m_color4b = color; };
+ void SetColor(float r, float g, float b, float a = 1)
+ {
+ m_color4b = ColorB(
+ static_cast(r * 255.0f), static_cast(g * 255.0f), static_cast(b * 255.0f), static_cast(a * 255.0f));
+ };
+ void SetColor(const Vec3& color, float a = 1)
+ {
+ m_color4b = ColorB(
+ static_cast(color.x * 255.0f), static_cast(color.y * 255.0f), static_cast(color.z * 255.0f),
+ static_cast(a * 255.0f));
+ };
+ void SetColor(const AZ::Vector3& color, float a = 1)
+ {
+ m_color4b = ColorB(
+ static_cast(color.GetX() * 255.0f), static_cast(color.GetY() * 255.0f), static_cast(color.GetZ() * 255.0f),
+ static_cast(a * 255.0f));
+ };
+ void SetColor(const QColor& rgb, float a)
+ {
+ m_color4b = ColorB(
+ static_cast(rgb.red()), static_cast(rgb.green()), static_cast(rgb.blue()), static_cast(a * 255.0f));
+ };
+ void SetColor(const QColor& color)
+ {
+ m_color4b = ColorB(
+ static_cast(color.red()), static_cast(color.green()), static_cast(color.blue()),
+ static_cast(color.alpha()));
+ };
+ void SetColor(const ColorB& color)
+ {
+ m_color4b = color;
+ };
void SetAlpha(float a = 1) { m_color4b.a = static_cast(a * 255.0f); };
ColorB GetColor() const { return m_color4b; }
@@ -108,6 +135,7 @@ struct SANDBOX_API DisplayContext
void DrawTrianglesIndexed(const AZStd::vector& vertices, const AZStd::vector& indices, const ColorB& color);
// Draw wireframe box.
void DrawWireBox(const Vec3& min, const Vec3& max);
+ void DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max);
// Draw filled box
void DrawSolidBox(const Vec3& min, const Vec3& max);
void DrawSolidOBB(const Vec3& center, const Vec3& axisX, const Vec3& axisY, const Vec3& axisZ, const Vec3& halfExtents);
diff --git a/Code/Editor/Objects/DisplayContextShared.inl b/Code/Editor/Objects/DisplayContextShared.inl
index e884f874e0..1fbd2ef7b6 100644
--- a/Code/Editor/Objects/DisplayContextShared.inl
+++ b/Code/Editor/Objects/DisplayContextShared.inl
@@ -225,6 +225,12 @@ void DisplayContext::DrawWireBox(const Vec3& min, const Vec3& max)
pRenderAuxGeom->DrawAABB(AABB(min, max), m_matrixStack[m_currentMatrix], false, m_color4b, eBBD_Faceted);
}
+void DisplayContext::DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max)
+{
+ pRenderAuxGeom->DrawAABB(
+ AABB(Vec3(min.GetX(), min.GetY(), min.GetZ()), Vec3(max.GetX(), max.GetY(), max.GetZ())),
+ m_matrixStack[m_currentMatrix], false, m_color4b, eBBD_Faceted);
+}
//////////////////////////////////////////////////////////////////////////
void DisplayContext::DrawSolidBox(const Vec3& min, const Vec3& max)
{
diff --git a/Code/Editor/Objects/EntityObject.cpp b/Code/Editor/Objects/EntityObject.cpp
index ae847da160..86512377c6 100644
--- a/Code/Editor/Objects/EntityObject.cpp
+++ b/Code/Editor/Objects/EntityObject.cpp
@@ -28,8 +28,7 @@
#include "HitContext.h"
#include "Objects/SelectionGroup.h"
-#include
-#include
+static constexpr int VIEW_DISTANCE_MULTIPLIER_MAX = 100;
//////////////////////////////////////////////////////////////////////////
//! Undo Entity Link
@@ -58,7 +57,6 @@ public:
protected:
void Release() override { delete this; };
int GetSize() override { return sizeof(*this); }; // Return size of xml state.
- QString GetDescription() override { return "Entity Link"; };
QString GetObjectName() override{ return ""; };
void Undo([[maybe_unused]] bool bUndo) override
@@ -139,7 +137,6 @@ private:
}
int GetSize() override { return sizeof(CUndoAttachEntity); }
- QString GetDescription() override { return "Attachment Changed"; }
GUID m_attachedEntityGUID;
CEntityObject::EAttachmentType m_attachmentType;
@@ -151,8 +148,6 @@ private:
// CBase implementation.
//////////////////////////////////////////////////////////////////////////
-float CEntityObject::m_helperScale = 1;
-
namespace
{
CEntityObject* s_pPropertyPanelEntityObject = nullptr;
@@ -163,12 +158,9 @@ namespace
//////////////////////////////////////////////////////////////////////////
CEntityObject::CEntityObject()
- : m_listeners(1)
{
m_bLoadFailed = false;
- m_visualObject = nullptr;
-
m_box.min.Set(0, 0, 0);
m_box.max.Set(0, 0, 0);
@@ -223,7 +215,7 @@ CEntityObject::CEntityObject()
mv_ratioLOD = 100;
mv_viewDistanceMultiplier = 1.0f;
mv_ratioLOD.SetLimits(0, 255);
- mv_viewDistanceMultiplier.SetLimits(0.0f, IRenderNode::VIEW_DISTANCE_MULTIPLIER_MAX);
+ mv_viewDistanceMultiplier.SetLimits(0.0f, VIEW_DISTANCE_MULTIPLIER_MAX);
m_physicsState = nullptr;
@@ -247,7 +239,6 @@ CEntityObject::CEntityObject()
m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnProjectInAllDirsChange(var); });
m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnProjectorFOVChange(var); });
m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnProjectorTextureChange(var); });
- m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnPropertyChange(var); });
m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnRadiusChange(var); });
}
@@ -295,11 +286,6 @@ void CEntityObject::Done()
ReleaseEventTargets();
RemoveAllEntityLinks();
- for (CListenerSet::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
- {
- notifier->OnDone();
- }
-
CBaseObject::Done();
}
@@ -365,12 +351,6 @@ void CEntityObject::SetTransformDelegate(ITransformDelegate* pTransformDelegate)
ResetCallbacks();
}
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::IsSameClass(CBaseObject* obj)
-{
- return (GetClassDesc() == obj->GetClassDesc());
-}
-
//////////////////////////////////////////////////////////////////////////
bool CEntityObject::ConvertFromObject(CBaseObject* object)
{
@@ -458,33 +438,10 @@ bool CEntityObject::HitTest(HitContext& hc)
return false;
}
-//////////////////////////////////////////////////////////////////////////
-bool CEntityObject::HitHelperTest(HitContext& hc)
-{
- bool bResult = CBaseObject::HitHelperTest(hc);
- if (bResult)
- {
- hc.object = this;
- }
-
- return bResult;
-}
-
//////////////////////////////////////////////////////////////////////////
bool CEntityObject::HitTestRect(HitContext& hc)
{
- bool bResult = false;
-
- if (m_visualObject && !gSettings.viewports.bShowIcons && !gSettings.viewports.bShowSizeBasedIcons)
- {
- AABB box;
- box.SetTransformedAABB(GetWorldTM(), m_visualObject->GetAABB());
- bResult = HitTestRectBounds(hc, box);
- }
- else
- {
- bResult = CBaseObject::HitTestRect(hc);
- }
+ bool bResult = CBaseObject::HitTestRect(hc);
if (bResult)
{
@@ -494,42 +451,6 @@ bool CEntityObject::HitTestRect(HitContext& hc)
return bResult;
}
-//////////////////////////////////////////////////////////////////////////
-int CEntityObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags)
-{
- AZ_PROFILE_FUNCTION(Entity);
-
- if (event == eMouseMove || event == eMouseLDown)
- {
- Vec3 pos;
- // Rise Entity above ground on Bounding box amount.
- if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN)
- {
- pos = view->MapViewToCP(point);
- }
- else
- {
- // Snap to terrain.
- bool hitTerrain;
- pos = view->ViewToWorld(point, &hitTerrain);
- if (hitTerrain)
- {
- pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y);
- pos.z = pos.z - m_box.min.z;
- }
- pos = view->SnapToGrid(pos);
- }
- SetPos(pos);
-
- if (event == eMouseLDown)
- {
- return MOUSECREATE_OK;
- }
- return MOUSECREATE_CONTINUE;
- }
- return CBaseObject::MouseCreateCallback(view, event, point, flags);
-}
-
//////////////////////////////////////////////////////////////////////////
IVariable* CEntityObject::FindVariableInSubBlock(CVarBlockPtr& properties, IVariable* pSubBlockVar, const char* pVarName)
{
@@ -680,11 +601,6 @@ void CEntityObject::SetName(const QString& name)
CBaseObject::SetName(name);
- CListenerSet listeners = m_listeners;
- for (CListenerSet::Notifier notifier(listeners); notifier.IsValid(); notifier.Next())
- {
- notifier->OnNameChanged(name.toUtf8().data());
- }
}
//////////////////////////////////////////////////////////////////////////
@@ -697,19 +613,6 @@ void CEntityObject::SetSelected(bool bSelect)
UpdateLightProperty();
}
- for (CListenerSet::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next())
- {
- notifier->OnSelectionChanged(bSelect);
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnPropertyChange([[maybe_unused]] IVariable* var)
-{
- if (s_ignorePropertiesUpdate)
- {
- return;
- }
}
template
@@ -941,11 +844,9 @@ void CEntityObject::Serialize(CObjectArchive& ar)
m_eventTargets.emplace_back(AZStd::move(et));
if (targetId != GUID_NULL)
{
- using namespace AZStd::placeholders;
ar.SetResolveCallback(
this, targetId,
- [this](CBaseObject* object, unsigned int index) { ResolveEventTarget(object, index); },
- i);
+ [this,i](CBaseObject* object) { ResolveEventTarget(object, i); });
}
}
}
@@ -1154,12 +1055,6 @@ XmlNodeRef CEntityObject::Export([[maybe_unused]] const QString& levelPath, XmlN
objNode->setAttr("MinSpec", ( uint32 )GetMinSpec());
}
- uint32 nMtlLayersMask = GetMaterialLayersMask();
- if (nMtlLayersMask != 0)
- {
- objNode->setAttr("MatLayersMask", nMtlLayersMask);
- }
-
if (mv_hiddenInGame)
{
objNode->setAttr("HiddenInGame", true);
@@ -1256,11 +1151,6 @@ void CEntityObject::OnEvent(ObjectEvent event)
case EVENT_CONFIG_SPEC_CHANGE:
{
- IObjectManager* objMan = GetIEditor()->GetObjectManager();
- if (objMan && objMan->IsLightClass(this))
- {
- OnPropertyChange(nullptr);
- }
break;
}
default:
@@ -1350,56 +1240,6 @@ QString CEntityObject::GetLightAnimation() const
return "";
}
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx)
-{
- CBaseObject::PostClone(pFromObject, ctx);
-
- CEntityObject* pFromEntity = ( CEntityObject* )pFromObject;
- // Clone event targets.
- if (!pFromEntity->m_eventTargets.empty())
- {
- size_t numTargets = pFromEntity->m_eventTargets.size();
- for (size_t i = 0; i < numTargets; i++)
- {
- CEntityEventTarget& et = pFromEntity->m_eventTargets[i];
- CBaseObject* pClonedTarget = ctx.FindClone(et.target);
- if (!pClonedTarget)
- {
- pClonedTarget = et.target; // If target not cloned, link to original target.
- }
-
- // Add cloned event.
- AddEventTarget(pClonedTarget, et.event, et.sourceEvent, true);
- }
- }
-
- // Clone links.
- if (!pFromEntity->m_links.empty())
- {
- int numTargets = static_cast(pFromEntity->m_links.size());
- for (int i = 0; i < numTargets; i++)
- {
- CEntityLink& et = pFromEntity->m_links[i];
- CBaseObject* pClonedTarget = ctx.FindClone(et.target);
- if (!pClonedTarget)
- {
- pClonedTarget = et.target; // If target not cloned, link to original target.
- }
-
- // Add cloned event.
- if (pClonedTarget)
- {
- AddEntityLink(et.name, pClonedTarget->GetId());
- }
- else
- {
- AddEntityLink(et.name, GUID_NULL);
- }
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////
void CEntityObject::ResolveEventTarget(CBaseObject* object, unsigned int index)
{
@@ -1554,7 +1394,7 @@ void CEntityObject::OnObjectEvent(CBaseObject* target, int event)
//////////////////////////////////////////////////////////////////////////
int CEntityObject::AddEventTarget(CBaseObject* target, const QString& event, const QString& sourceEvent, [[maybe_unused]] bool bUpdateScript)
{
- StoreUndo("Add EventTarget");
+ StoreUndo();
CEntityEventTarget et;
et.target = target;
et.event = event;
@@ -1588,7 +1428,7 @@ void CEntityObject::RemoveEventTarget(int index, [[maybe_unused]] bool bUpdateSc
{
if (index >= 0 && index < m_eventTargets.size())
{
- StoreUndo("Remove EventTarget");
+ StoreUndo();
if (m_eventTargets[index].pLineGizmo)
{
@@ -1624,7 +1464,7 @@ int CEntityObject::AddEntityLink(const QString& name, GUID targetEntityId)
}
}
- StoreUndo("Add EntityLink");
+ StoreUndo();
CLineGizmo* pLineGizmo = nullptr;
@@ -1672,7 +1512,7 @@ void CEntityObject::RemoveEntityLink(int index)
if (index >= 0 && index < m_links.size())
{
CEntityLink& link = m_links[index];
- StoreUndo("Remove EntityLink");
+ StoreUndo();
if (link.pLineGizmo)
{
@@ -1695,7 +1535,7 @@ void CEntityObject::RenameEntityLink(int index, const QString& newName)
{
if (index >= 0 && index < m_links.size())
{
- StoreUndo("Rename EntityLink");
+ StoreUndo();
if (m_links[index].pLineGizmo)
{
@@ -1842,18 +1682,6 @@ void CEntityObject::OnLoadFailed()
GetIEditor()->GetErrorReport()->ReportError(err);
}
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::SetHelperScale(float scale)
-{
- m_helperScale = scale;
-}
-
-//////////////////////////////////////////////////////////////////////////
-float CEntityObject::GetHelperScale()
-{
- return m_helperScale;
-}
-
//////////////////////////////////////////////////////////////////////////
//! Analyze errors for this object.
void CEntityObject::Validate(IErrorReport* report)
@@ -1901,19 +1729,6 @@ bool CEntityObject::IsSimilarObject(CBaseObject* pObject)
return false;
}
-//////////////////////////////////////////////////////////////////////////
-void CEntityObject::OnContextMenu(QMenu* pMenu)
-{
- if (!pMenu->isEmpty())
- {
- pMenu->addSeparator();
- }
-
- // Events
-
- CBaseObject::OnContextMenu(pMenu);
-}
-
//////////////////////////////////////////////////////////////////////////
void CEntityObject::PreInitLightProperty()
{
@@ -2171,16 +1986,6 @@ void CEntityObject::StoreUndoEntityLink(CSelectionGroup* pGroup)
}
}
-void CEntityObject::RegisterListener(IEntityObjectListener* pListener)
-{
- m_listeners.Add(pListener);
-}
-
-void CEntityObject::UnregisterListener(IEntityObjectListener* pListener)
-{
- m_listeners.Remove(pListener);
-}
-
template
T CEntityObject::GetEntityProperty(const char* pName, T defaultvalue) const
{
diff --git a/Code/Editor/Objects/EntityObject.h b/Code/Editor/Objects/EntityObject.h
index a4f4752b75..c3e379bccc 100644
--- a/Code/Editor/Objects/EntityObject.h
+++ b/Code/Editor/Objects/EntityObject.h
@@ -16,10 +16,7 @@
#include "BaseObject.h"
#include "IMovieSystem.h"
-#include "IEntityObjectListener.h"
#include "Gizmo.h"
-#include "CryListenerSet.h"
-#include "StatObjBus.h"
#include
#endif
@@ -81,11 +78,6 @@ public:
//////////////////////////////////////////////////////////////////////////
// Overrides from CBaseObject.
//////////////////////////////////////////////////////////////////////////
- //! Return type name of Entity.
- QString GetTypeDescription() const override { return GetEntityClass(); };
-
- //////////////////////////////////////////////////////////////////////////
- bool IsSameClass(CBaseObject* obj) override;
bool Init(IEditor* ie, CBaseObject* prev, const QString& file) override;
void InitVariables() override;
@@ -102,16 +94,12 @@ public:
void SetEntityPropertyFloat(const char* name, float value);
void SetEntityPropertyString(const char* name, const QString& value);
- int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) override;
- void OnContextMenu(QMenu* menu) override;
-
void SetName(const QString& name) override;
void SetSelected(bool bSelect) override;
void GetLocalBounds(AABB& box) override;
bool HitTest(HitContext& hc) override;
- bool HitHelperTest(HitContext& hc) override;
bool HitTestRect(HitContext& hc) override;
void UpdateVisibility(bool bVisible) override;
bool ConvertFromObject(CBaseObject* object) override;
@@ -139,14 +127,9 @@ public:
EAttachmentType GetAttachType() const { return m_attachmentType; }
QString GetAttachTarget() const { return m_attachmentTarget; }
- void SetHelperScale(float scale) override;
- float GetHelperScale() override;
-
void GatherUsedResources(CUsedResources& resources) override;
bool IsSimilarObject(CBaseObject* pObject) override;
- bool HasMeasurementAxis() const override { return false; }
-
bool IsIsolated() const override { return false; }
//////////////////////////////////////////////////////////////////////////
@@ -220,20 +203,12 @@ public:
static void StoreUndoEntityLink(CSelectionGroup* pGroup);
- void RegisterListener(IEntityObjectListener* pListener);
- void UnregisterListener(IEntityObjectListener* pListener);
-
protected:
template
void SetEntityProperty(const char* name, T value);
template
T GetEntityProperty(const char* name, T defaultvalue) const;
- //////////////////////////////////////////////////////////////////////////
- //! Must be called after cloning the object on clone of object.
- //! This will make sure object references are cloned correctly.
- void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx) override;
-
//! Draw default object items.
void DrawProjectorPyramid(DisplayContext& dc, float dist);
void DrawProjectorFrustum(DisplayContext& dc, Vec2 size, float dist);
@@ -242,10 +217,6 @@ protected:
CVarBlock* CloneProperties(CVarBlock* srcProperties);
- //////////////////////////////////////////////////////////////////////////
- //! Callback called when one of entity properties have been modified.
- void OnPropertyChange(IVariable* var);
-
//////////////////////////////////////////////////////////////////////////
void OnObjectEvent(CBaseObject* target, int event) override;
void ResolveEventTarget(CBaseObject* object, unsigned int index);
@@ -327,7 +298,6 @@ protected:
// Used for light entities
float m_projectorFOV;
- IStatObj* m_visualObject;
AABB m_box;
//////////////////////////////////////////////////////////////////////////
@@ -388,8 +358,6 @@ protected:
XmlNodeRef m_physicsState;
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
- static float m_helperScale;
-
EAttachmentType m_attachmentType;
bool m_bEnableReload;
@@ -433,7 +401,6 @@ private:
void ForceVariableUpdate();
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
- CListenerSet m_listeners;
std::vector< std::pair > m_callbacks;
AZStd::fixed_vector< IVariable::OnSetCallback, VariableCallbackIndex::Count > m_onSetCallbacksCache;
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
diff --git a/Code/Editor/Objects/IEntityObjectListener.h b/Code/Editor/Objects/IEntityObjectListener.h
deleted file mode 100644
index 9072a837d0..0000000000
--- a/Code/Editor/Objects/IEntityObjectListener.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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
- *
- */
-
-#pragma once
-
-class IEntityObjectListener
-{
-public:
- virtual ~IEntityObjectListener() = default;
-
- virtual void OnNameChanged(const char* pName) = 0;
- virtual void OnSelectionChanged(const bool bSelected) = 0;
- virtual void OnDone() = 0;
-};
-
diff --git a/Code/Editor/Objects/ObjectLoader.cpp b/Code/Editor/Objects/ObjectLoader.cpp
index 9596265bb9..63ac4c93af 100644
--- a/Code/Editor/Objects/ObjectLoader.cpp
+++ b/Code/Editor/Objects/ObjectLoader.cpp
@@ -28,19 +28,12 @@ CObjectArchive::CObjectArchive(IObjectManager* objMan, XmlNodeRef xmlRoot, bool
m_nFlags = 0;
node = xmlRoot;
m_pCurrentErrorReport = GetIEditor()->GetErrorReport();
- m_pGeometryPak = nullptr;
- m_pCurrentObject = nullptr;
m_bNeedResolveObjects = false;
- m_bProgressBarEnabled = true;
}
//////////////////////////////////////////////////////////////////////////
CObjectArchive::~CObjectArchive()
{
- if (m_pGeometryPak)
- {
- delete m_pGeometryPak;
- }
// Always make sure objects are resolved when loading from archive.
if (bLoading && m_bNeedResolveObjects)
{
@@ -74,31 +67,6 @@ void CObjectArchive::SetResolveCallback(CBaseObject* fromObject, REFGUID objectI
}
}
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor2 func, uint32 userData)
-{
- if (objectId == GUID_NULL)
- {
- func(0, userData);
- return;
- }
-
- CBaseObject* object = m_objectManager->FindObject(objectId);
- if (object && !(m_nFlags & eObjectLoader_MakeNewIDs))
- {
- // Object is already resolved. immidiatly call callback.
- func(object, userData);
- }
- else
- {
- Callback cb;
- cb.fromObject = fromObject;
- cb.func2 = func;
- cb.userData = userData;
- m_resolveCallbacks.insert(Callbacks::value_type(objectId, cb));
- }
-}
-
//////////////////////////////////////////////////////////////////////////
GUID CObjectArchive::ResolveID(REFGUID id)
{
@@ -117,10 +85,7 @@ void CObjectArchive::ResolveObjects()
{
CWaitProgress wait("Loading Objects", false);
- if (m_bProgressBarEnabled)
- {
- wait.Start();
- }
+ wait.Start();
GetIEditor()->SuspendUndo();
//////////////////////////////////////////////////////////////////////////
@@ -129,10 +94,7 @@ void CObjectArchive::ResolveObjects()
int numObj = static_cast(m_loadedObjects.size());
for (i = 0; i < numObj; i++)
{
- if (m_bProgressBarEnabled)
- {
- wait.Step((i * 100) / numObj);
- }
+ wait.Step((i * 100) / numObj);
SLoadedObjectInfo& obj = m_loadedObjects[i];
m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
@@ -204,30 +166,20 @@ void CObjectArchive::ResolveObjects()
{
(cb.func1)(object);
}
- if (cb.func2)
- {
- (cb.func2)(object, cb.userData);
- }
}
m_resolveCallbacks.clear();
//////////////////////////////////////////////////////////////////////////
{
CWaitProgress wait("Creating Objects", false);
- if (m_bProgressBarEnabled)
- {
- wait.Start();
- }
+ wait.Start();
//////////////////////////////////////////////////////////////////////////
// Serialize All Objects from XML.
//////////////////////////////////////////////////////////////////////////
int numObj = static_cast(m_loadedObjects.size());
for (i = 0; i < numObj; i++)
{
- if (m_bProgressBarEnabled)
- {
- wait.Step((i * 100) / numObj);
- }
+ wait.Step((i * 100) / numObj);
SLoadedObjectInfo& obj = m_loadedObjects[i];
m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject);
@@ -258,8 +210,6 @@ void CObjectArchive::ResolveObjects()
m_bNeedResolveObjects = false;
m_pCurrentErrorReport->SetCurrentValidatorObject(nullptr);
- m_sequenceIdRemap.clear();
- m_pendingIds.clear();
}
//////////////////////////////////////////////////////////////////////////
@@ -272,7 +222,6 @@ void CObjectArchive::SaveObject(CBaseObject* pObject)
if (m_savedObjects.find(pObject) == m_savedObjects.end())
{
- m_pCurrentObject = pObject;
m_savedObjects.insert(pObject);
// If this object was not saved before.
XmlNodeRef objNode = node->newChild("Object");
@@ -307,45 +256,6 @@ CBaseObject* CObjectArchive::LoadObject(const XmlNodeRef& objNode, CBaseObject*
return pObject;
}
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::LoadObjects(XmlNodeRef& rootObjectsNode)
-{
- int numObjects = rootObjectsNode->getChildCount();
- for (int i = 0; i < numObjects; i++)
- {
- XmlNodeRef objNode = rootObjectsNode->getChild(i);
- LoadObject(objNode, nullptr);
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::ReportError(CErrorRecord& err)
-{
- if (m_pCurrentErrorReport)
- {
- m_pCurrentErrorReport->ReportError(err);
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::SetErrorReport(CErrorReport* errReport)
-{
- if (errReport)
- {
- m_pCurrentErrorReport = errReport;
- }
- else
- {
- m_pCurrentErrorReport = GetIEditor()->GetErrorReport();
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::ShowErrors()
-{
- GetIEditor()->GetErrorReport()->Display();
-}
-
//////////////////////////////////////////////////////////////////////////
void CObjectArchive::MakeNewIds(bool bEnable)
{
@@ -359,70 +269,8 @@ void CObjectArchive::MakeNewIds(bool bEnable)
}
}
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::SetShouldResetInternalMembers(bool reset)
-{
- if (reset)
- {
- m_nFlags |= eObjectLoader_ResetInternalMembers;
- }
- else
- {
- m_nFlags &= ~(eObjectLoader_ResetInternalMembers);
- }
-}
-
//////////////////////////////////////////////////////////////////////////
void CObjectArchive::RemapID(REFGUID oldId, REFGUID newId)
{
m_IdRemap[oldId] = newId;
}
-
-//////////////////////////////////////////////////////////////////////////
-CPakFile* CObjectArchive::GetGeometryPak(const char* sFilename)
-{
- if (m_pGeometryPak)
- {
- return m_pGeometryPak;
- }
- m_pGeometryPak = new CPakFile;
- m_pGeometryPak->Open(sFilename);
- return m_pGeometryPak;
-}
-
-//////////////////////////////////////////////////////////////////////////
-CBaseObject* CObjectArchive::GetCurrentObject()
-{
- return m_pCurrentObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectArchive::AddSequenceIdMapping(uint32 oldId, uint32 newId)
-{
- assert(oldId != newId);
- assert(GetIEditor()->GetMovieSystem()->FindSequenceById(oldId) || stl::find(m_pendingIds, oldId));
- assert(GetIEditor()->GetMovieSystem()->FindSequenceById(newId) == nullptr);
- assert(stl::find(m_pendingIds, newId) == false);
- m_sequenceIdRemap[oldId] = newId;
- m_pendingIds.push_back(newId);
-}
-
-//////////////////////////////////////////////////////////////////////////
-uint32 CObjectArchive::RemapSequenceId(uint32 id) const
-{
- std::map::const_iterator itr = m_sequenceIdRemap.find(id);
- if (itr == m_sequenceIdRemap.end())
- {
- return id;
- }
- else
- {
- return itr->second;
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjectArchive::IsAmongPendingIds(uint32 id) const
-{
- return stl::find(m_pendingIds, id);
-}
diff --git a/Code/Editor/Objects/ObjectLoader.h b/Code/Editor/Objects/ObjectLoader.h
index a491e50da0..fc1014ad03 100644
--- a/Code/Editor/Objects/ObjectLoader.h
+++ b/Code/Editor/Objects/ObjectLoader.h
@@ -6,18 +6,13 @@
*
*/
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
#pragma once
#include "Util/GuidUtil.h"
#include "ErrorReport.h"
+#include
-#include
-
-class CPakFile;
class CErrorRecord;
struct IObjectManager;
@@ -43,63 +38,27 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
//! Resolve callback with only one parameter of CBaseObject.
typedef AZStd::function ResolveObjRefFunctor1;
- //! Resolve callback with two parameters one is pointer to CBaseObject and second use data integer.
- typedef AZStd::function ResolveObjRefFunctor2;
-
- /** Register Object id.
- @param objectId Original object id from the file.
- @param realObjectId Changed object id.
- */
- //void RegisterObjectId( int objectId,int realObjectId );
// Return object ID remapped after loading.
GUID ResolveID(REFGUID id);
//! Set object resolve callback, it will be called once object with specified Id is loaded.
void SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor1 func);
- //! Set object resolve callback, it will be called once object with specified Id is loaded.
- void SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor2 func, uint32 userData);
//! Resolve all object ids and call callbacks on resolved objects.
void ResolveObjects();
// Save object to archive.
void SaveObject(CBaseObject* pObject);
- //! Load multiple objects from archive.
- void LoadObjects(XmlNodeRef& rootObjectsNode);
-
//! Load one object from archive.
CBaseObject* LoadObject(const XmlNodeRef& objNode, CBaseObject* pPrevObject = nullptr);
- //////////////////////////////////////////////////////////////////////////
- int GetLoadedObjectsCount() { return static_cast(m_loadedObjects.size()); }
- CBaseObject* GetLoadedObject(int nIndex) const { return m_loadedObjects[nIndex].pObject; }
-
//! If true new loaded objects will be assigned new GUIDs.
void MakeNewIds(bool bEnable);
//! Remap object ids.
void RemapID(REFGUID oldId, REFGUID newId);
- //! Report error during loading.
- void ReportError(CErrorRecord& err);
- //! Assigner different error report class.
- void SetErrorReport(CErrorReport* errReport);
- //! Display collected error reports.
- void ShowErrors();
-
- void EnableProgressBar(bool bEnable) { m_bProgressBarEnabled = bEnable; };
-
- CPakFile* GetGeometryPak(const char* sFilename);
- CBaseObject* GetCurrentObject();
-
- void AddSequenceIdMapping(uint32 oldId, uint32 newId);
- uint32 RemapSequenceId(uint32 id) const;
- bool IsAmongPendingIds(uint32 id) const;
-
- void SetShouldResetInternalMembers(bool reset);
- bool ShouldResetInternalMembers() const { return m_nFlags & eObjectLoader_ResetInternalMembers; }
-
private:
struct SLoadedObjectInfo
{
@@ -110,22 +69,19 @@ private:
bool operator <(const SLoadedObjectInfo& oi) const { return nSortOrder < oi.nSortOrder; }
};
-
IObjectManager* m_objectManager;
struct Callback
{
ResolveObjRefFunctor1 func1;
- ResolveObjRefFunctor2 func2;
- uint32 userData;
_smart_ptr fromObject;
- Callback() { func1 = 0; func2 = 0; userData = 0; };
+ Callback() { func1 = 0; }
};
typedef std::multimap Callbacks;
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
Callbacks m_resolveCallbacks;
// Set of all saved objects to this archive.
- typedef std::set<_smart_ptr > ObjectsSet;
+ typedef AZStd::set<_smart_ptr > ObjectsSet;
ObjectsSet m_savedObjects;
//typedef std::multimap > OrderedObjects;
@@ -138,20 +94,11 @@ private:
enum EObjectLoaderFlags
{
eObjectLoader_MakeNewIDs = 0x0001, // If true new loaded objects will be assigned new GUIDs.
- eObjectLoader_ResetInternalMembers = 0x0004, // In case we are deserializing and we would like to wipe all previous state
};
int m_nFlags;
IErrorReport* m_pCurrentErrorReport;
- CPakFile* m_pGeometryPak;
- CBaseObject* m_pCurrentObject;
bool m_bNeedResolveObjects;
- bool m_bProgressBarEnabled;
- // This table is used when there is any collision of ids while importing TrackView sequences.
- std::map m_sequenceIdRemap;
- std::vector m_pendingIds;
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
};
-
-#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H
diff --git a/Code/Editor/Objects/ObjectManager.cpp b/Code/Editor/Objects/ObjectManager.cpp
index df3371a31c..1dea6ece7f 100644
--- a/Code/Editor/Objects/ObjectManager.cpp
+++ b/Code/Editor/Objects/ObjectManager.cpp
@@ -50,7 +50,7 @@ public:
GUID guid;
public:
- virtual ~CXMLObjectClassDesc() = default;
+ virtual ~CXMLObjectClassDesc() = default;
REFGUID ClassID() override
{
return guid;
@@ -81,60 +81,27 @@ CObjectManager* g_pObjectManager = nullptr;
//////////////////////////////////////////////////////////////////////////
CObjectManager::CObjectManager()
- : m_lastHideMask(0)
- , m_maxObjectViewDistRatio(0.00001f)
- , m_currSelection(&m_defaultSelection)
- , m_nLastSelCount(0)
+ : m_currSelection(&m_defaultSelection)
, m_bSelectionChanged(false)
- , m_selectCallback(nullptr)
- , m_currEditObject(nullptr)
- , m_bSingleSelection(false)
- , m_createGameObjects(true)
- , m_bGenUniqObjectNames(true)
, m_gizmoManager(new CGizmoManager())
- , m_pLoadProgress(nullptr)
- , m_loadedObjects(0)
- , m_totalObjectsToLoad(0)
, m_bExiting(false)
, m_isUpdateVisibilityList(false)
, m_currentHideCount(CBaseObject::s_invalidHiddenID)
- , m_bInReloading(false)
- , m_bSkipObjectUpdate(false)
- , m_bLevelExporting(false)
{
g_pObjectManager = this;
- RegisterObjectClasses();
-
m_objectsByName.reserve(1024);
- LoadRegistry();
}
//////////////////////////////////////////////////////////////////////////
CObjectManager::~CObjectManager()
{
m_bExiting = true;
- SaveRegistry();
DeleteAllObjects();
delete m_gizmoManager;
}
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::RegisterObjectClasses()
-{
- LoadRegistry();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::SaveRegistry()
-{
-}
-
-void CObjectManager::LoadRegistry()
-{
-}
-
//////////////////////////////////////////////////////////////////////////
CBaseObject* CObjectManager::NewObject(CObjectClassDesc* cls, CBaseObject* prev, const QString& file, const char* newObjectName)
{
@@ -186,17 +153,6 @@ CBaseObject* CObjectManager::NewObject(CObjectClassDesc* cls, CBaseObject* prev,
if (obj->GetType() != OBJTYPE_AZENTITY)
{
GetIEditor()->RecordUndo(new CUndoBaseObjectNew(obj));
-
- // check for script entities
- const char* scriptClassName = "";
- CEntityObject* entityObj = qobject_cast(obj);
- QByteArray entityClass; // Leave it outside of the if. Otherwise buffer is deleted.
- if (entityObj)
- {
- entityClass = entityObj->GetEntityClass().toUtf8();
- scriptClassName = entityClass.data();
- }
-
}
}
@@ -318,12 +274,6 @@ CBaseObject* CObjectManager::NewObject(CObjectArchive& ar, CBaseObject* pUndoObj
}
}
- m_loadedObjects++;
- if (m_pLoadProgress && m_totalObjectsToLoad > 0)
- {
- m_pLoadProgress->Step((m_loadedObjects * 100) / m_totalObjectsToLoad);
- }
-
return pObject;
}
@@ -351,10 +301,6 @@ CBaseObject* CObjectManager::NewObject(const QString& typeName, CBaseObject* pre
void CObjectManager::DeleteObject(CBaseObject* obj)
{
AZ_PROFILE_FUNCTION(Editor);
- if (m_currEditObject == obj)
- {
- EndEditParams();
- }
if (!obj)
{
@@ -367,7 +313,6 @@ void CObjectManager::DeleteObject(CBaseObject* obj)
return;
}
- NotifyObjectListeners(obj, CBaseObject::ON_PREDELETE);
obj->NotifyListeners(CBaseObject::ON_PREDELETE);
// Must be after object DetachAll to support restoring Parent/Child relations.
@@ -377,7 +322,7 @@ void CObjectManager::DeleteObject(CBaseObject* obj)
// Store undo for all child objects.
for (int i = 0; i < obj->GetChildCount(); i++)
{
- obj->GetChild(i)->StoreUndo("DeleteParent");
+ obj->GetChild(i)->StoreUndo();
}
CUndo::Record(new CUndoBaseObjectDelete(obj));
}
@@ -388,8 +333,6 @@ void CObjectManager::DeleteObject(CBaseObject* obj)
obj->Done();
- NotifyObjectListeners(obj, CBaseObject::ON_DELETE);
-
RemoveObject(obj);
}
@@ -462,22 +405,10 @@ void CObjectManager::DeleteAllObjects()
{
AZ_PROFILE_FUNCTION(Editor);
- EndEditParams();
-
ClearSelection();
- int i;
InvalidateVisibleList();
- // Delete all selection groups.
- std::vector sel;
- stl::map_to_vector(m_selections, sel);
- for (i = 0; i < sel.size(); i++)
- {
- delete sel[i];
- }
- m_selections.clear();
-
TBaseObjects objectsHolder;
GetAllObjects(objectsHolder);
@@ -485,7 +416,7 @@ void CObjectManager::DeleteAllObjects()
m_objects.clear();
m_objectsByName.clear();
- for (i = 0; i < objectsHolder.size(); i++)
+ for (int i = 0; i < objectsHolder.size(); i++)
{
objectsHolder[i]->Done();
}
@@ -499,17 +430,6 @@ void CObjectManager::DeleteAllObjects()
m_animatedAttachedEntities.clear();
}
-CBaseObject* CObjectManager::CloneObject(CBaseObject* obj)
-{
- AZ_PROFILE_FUNCTION(Editor);
- assert(obj);
- //CRuntimeClass *cls = obj->GetRuntimeClass();
- //CBaseObject *clone = (CBaseObject*)cls->CreateObject();
- //clone->CloneCopy( obj );
- CBaseObject* clone = NewObject(obj->GetClassDesc(), obj);
- return clone;
-}
-
//////////////////////////////////////////////////////////////////////////
CBaseObject* CObjectManager::FindObject(REFGUID guid) const
{
@@ -620,7 +540,6 @@ bool CObjectManager::AddObject(CBaseObject* obj)
RegisterObjectName(obj->GetName());
InvalidateVisibleList();
- NotifyObjectListeners(obj, CBaseObject::ON_ADD);
return true;
}
@@ -641,12 +560,6 @@ void CObjectManager::RemoveObject(CBaseObject* obj)
// Remove this object from selection groups.
m_currSelection->RemoveObject(obj);
- std::vector sel;
- stl::map_to_vector(m_selections, sel);
- for (int i = 0; i < sel.size(); i++)
- {
- sel[i]->RemoveObject(obj);
- }
m_objectsByName.erase(AZ::Crc32(obj->GetName().toUtf8().data(), obj->GetName().toUtf8().count(), true));
@@ -674,54 +587,7 @@ void CObjectManager::ChangeObjectId(REFGUID oldGuid, REFGUID newGuid)
CBaseObjectPtr pRemappedObject = (*it).second;
pRemappedObject->SetId(newGuid);
m_objects.erase(it);
- m_objects.insert(std::make_pair(newGuid, pRemappedObject));
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const
-{
- CBaseObject* pExisting = FindObject(newName);
- if (pExisting)
- {
- QString sRenameWarning = QObject::tr("%1 \"%2\" was NOT renamed to \"%3\" because %4 with the same name already exists.")
- .arg(obj->GetClassDesc()->ClassName())
- .arg(obj->GetName())
- .arg(newName)
- .arg(pExisting->GetClassDesc()->ClassName()
- );
-
- // If id is taken.
- CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "%s", sRenameWarning.toUtf8().data());
-
- if (bShowMsgBox)
- {
- QMessageBox::critical(QApplication::activeWindow(), QString(), sRenameWarning);
- }
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::ChangeObjectName(CBaseObject* obj, const QString& newName)
-{
- assert(obj);
-
- if (newName != obj->GetName())
- {
- if (IsDuplicateObjectName(newName))
- {
- return;
- }
-
- // Remove previous name from map
- const AZ::Crc32 oldNameCrc(obj->GetName().toUtf8().data(), obj->GetName().count(), true);
- m_objectsByName.erase(oldNameCrc);
-
- obj->SetName(newName);
-
- // Add new name to map
- const AZ::Crc32 nameCrc(newName.toUtf8().data(), newName.count(), true);
- m_objectsByName[nameCrc] = obj;
+ m_objects.insert(AZStd::make_pair(newGuid, pRemappedObject));
}
}
@@ -742,28 +608,9 @@ void CObjectManager::GetObjects(CBaseObjectsArray& objects) const
}
}
-void CObjectManager::GetObjects(CBaseObjectsArray& objects, BaseObjectFilterFunctor const& filter) const
-{
- objects.clear();
- objects.reserve(m_objects.size());
- for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it)
- {
- assert(it->second);
- if (filter.first(*it->second, filter.second))
- {
- objects.push_back(it->second);
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////
void CObjectManager::SendEvent(ObjectEvent event)
{
- if (event == EVENT_RELOAD_ENTITY)
- {
- m_bInReloading = true;
- }
-
for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
{
CBaseObject* obj = it->second;
@@ -772,7 +619,6 @@ void CObjectManager::SendEvent(ObjectEvent event)
if (event == EVENT_RELOAD_ENTITY)
{
- m_bInReloading = false;
GetIEditor()->Notify(eNotify_OnReloadTrackView);
}
}
@@ -792,93 +638,6 @@ void CObjectManager::SendEvent(ObjectEvent event, const AABB& bounds)
}
}
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::Update()
-{
- if (m_bSkipObjectUpdate)
- {
- return;
- }
-
- QWidget* prevActiveWindow = QApplication::activeWindow();
-
- // Restore focus if it changed.
- if (prevActiveWindow && QApplication::activeWindow() != prevActiveWindow)
- {
- prevActiveWindow->setFocus();
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::HideObject(CBaseObject* obj, bool hide)
-{
- assert(obj != 0);
- if (hide)
- {
- obj->SetHidden(hide, ++m_currentHideCount);
- }
- else
- {
- obj->SetHidden(false);
- }
- InvalidateVisibleList();
-}
-
-void CObjectManager::ShowLastHiddenObject()
-{
- uint64 mostRecentID = CBaseObject::s_invalidHiddenID;
- CBaseObject* mostRecentObject = nullptr;
- for (const auto& it : m_objects)
- {
- CBaseObject* obj = it.second;
-
- uint64 hiddenID = obj->GetHideOrder();
-
- if (hiddenID > mostRecentID)
- {
- mostRecentID = hiddenID;
- mostRecentObject = obj;
- }
- }
-
- if (mostRecentObject != nullptr)
- {
- mostRecentObject->SetHidden(false);
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::UnhideAll()
-{
- for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
- {
- CBaseObject* obj = it->second;
- obj->SetHidden(false);
- }
-
- InvalidateVisibleList();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::FreezeObject(CBaseObject* obj, bool freeze)
-{
- assert(obj != 0);
- // Remove object from main object set and put it to hidden set.
- obj->SetFrozen(freeze);
- InvalidateVisibleList();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::UnfreezeAll()
-{
- for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
- {
- CBaseObject* obj = it->second;
- obj->SetFrozen(false);
- }
- InvalidateVisibleList();
-}
-
//////////////////////////////////////////////////////////////////////////
bool CObjectManager::SelectObject(CBaseObject* obj, bool bUseMask)
{
@@ -894,14 +653,6 @@ bool CObjectManager::SelectObject(CBaseObject* obj, bool bUseMask)
return false;
}
- if (m_selectCallback)
- {
- if (!m_selectCallback->OnSelectObject(obj))
- {
- return true;
- }
- }
-
m_currSelection->AddObject(obj);
// while in ComponentMode we never explicitly change selection (the entity will always be selected).
@@ -921,14 +672,6 @@ bool CObjectManager::SelectObject(CBaseObject* obj, bool bUseMask)
return true;
}
-void CObjectManager::SelectEntities(std::set& s)
-{
- for (std::set::iterator it = s.begin(), end = s.end(); it != end; ++it)
- {
- SelectObject(*it);
- }
-}
-
void CObjectManager::UnselectObject(CBaseObject* obj)
{
// while in ComponentMode we never explicitly change selection (the entity will always be selected).
@@ -947,139 +690,6 @@ void CObjectManager::UnselectObject(CBaseObject* obj)
m_currSelection->RemoveObject(obj);
}
-CSelectionGroup* CObjectManager::GetSelection(const QString& name) const
-{
- CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr);
- return selection;
-}
-
-void CObjectManager::GetNameSelectionStrings(QStringList& names)
-{
- for (TNameSelectionMap::iterator it = m_selections.begin(); it != m_selections.end(); ++it)
- {
- names.push_back(it->first);
- }
-}
-
-void CObjectManager::NameSelection(const QString& name)
-{
- if (m_currSelection->IsEmpty())
- {
- return;
- }
-
- CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr);
- if (selection)
- {
- assert(selection != 0);
- // Check if trying to rename itself to the same name.
- if (selection == m_currSelection)
- {
- return;
- }
- m_selections.erase(name);
- delete selection;
- }
- selection = new CSelectionGroup;
- selection->Copy(*m_currSelection);
- selection->SetName(name);
- m_selections[name] = selection;
- m_currSelection = selection;
- m_defaultSelection.RemoveAll();
-}
-
-void CObjectManager::SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading)
-{
- if (!rootNode)
- {
- return;
- }
-
- _smart_ptr tmpGroup(nullptr);
-
- QString selRootStr("NameSelection");
- QString selNodeStr("NameSelectionNode");
- QString selNodeNameStr("name");
- QString idStr("id");
- QString objAttrStr("obj");
-
- XmlNodeRef startNode = rootNode->findChild(selRootStr.toUtf8().data());
-
- if (bLoading)
- {
- m_selections.erase(m_selections.begin(), m_selections.end());
-
- if (startNode)
- {
- for (int selNodeNo = 0; selNodeNo < startNode->getChildCount(); ++selNodeNo)
- {
- XmlNodeRef selNode = startNode->getChild(selNodeNo);
- tmpGroup = new CSelectionGroup;
-
- for (int objIDNodeNo = 0; objIDNodeNo < selNode->getChildCount(); ++objIDNodeNo)
- {
- GUID curID = GUID_NULL;
- XmlNodeRef idNode = selNode->getChild(objIDNodeNo);
- if (!idNode->getAttr(idStr.toUtf8().data(), curID))
- {
- continue;
- }
-
- if (curID != GUID_NULL)
- {
- if (GetIEditor()->GetObjectManager()->FindObject(curID))
- {
- tmpGroup->AddObject(GetIEditor()->GetObjectManager()->FindObject(curID));
- }
- }
- }
-
- if (tmpGroup->GetCount() > 0)
- {
- QString nameStr;
- if (!selNode->getAttr(selNodeNameStr.toUtf8().data(), nameStr))
- {
- continue;
- }
- tmpGroup->SetName(nameStr);
- m_selections[nameStr] = tmpGroup;
- }
- }
- }
- }
- else
- {
- startNode = rootNode->newChild(selRootStr.toUtf8().data());
- CSelectionGroup* objSelection = nullptr;
-
- for (TNameSelectionMap::iterator it = m_selections.begin(); it != m_selections.end(); ++it)
- {
- XmlNodeRef selectionNameNode = startNode->newChild(selNodeStr.toUtf8().data());
- selectionNameNode->setAttr(selNodeNameStr.toUtf8().data(), it->first.toUtf8().data());
- objSelection = it->second;
-
- if (!objSelection)
- {
- continue;
- }
-
- if (objSelection->GetCount() == 0)
- {
- continue;
- }
-
- for (int i = 0; i < objSelection->GetCount(); ++i)
- {
- if (objSelection->GetObject(i))
- {
- XmlNodeRef objNode = selectionNameNode->newChild(objAttrStr.toUtf8().data());
- objNode->setAttr(idStr.toUtf8().data(), GuidUtil::ToString(objSelection->GetObject(i)->GetId()));
- }
- }
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////
int CObjectManager::ClearSelection()
{
@@ -1133,63 +743,6 @@ int CObjectManager::ClearSelection()
return numSel;
}
-//////////////////////////////////////////////////////////////////////////
-int CObjectManager::InvertSelection()
-{
- AZ_PROFILE_FUNCTION(Editor);
-
- int selCount = 0;
- // iterate all objects.
- for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it)
- {
- CBaseObject* pObj = it->second;
- if (pObj->IsSelected())
- {
- UnselectObject(pObj);
- }
- else
- {
- if (SelectObject(pObj))
- {
- selCount++;
- }
- }
- }
- return selCount;
-}
-
-void CObjectManager::SetSelection(const QString& name)
-{
- AZ_PROFILE_FUNCTION(Editor);
- CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr);
- if (selection)
- {
- UnselectCurrent();
- assert(selection != 0);
- m_currSelection = selection;
- SelectCurrent();
- }
-}
-
-void CObjectManager::RemoveSelection(const QString& name)
-{
- AZ_PROFILE_FUNCTION(Editor);
-
- QString selName = name;
- CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr);
- if (selection)
- {
- if (selection == m_currSelection)
- {
- UnselectCurrent();
- m_currSelection = &m_defaultSelection;
- m_defaultSelection.RemoveAll();
- }
- delete selection;
- m_selections.erase(selName);
- }
-}
-
void CObjectManager::SelectCurrent()
{
AZ_PROFILE_FUNCTION(Editor);
@@ -1261,157 +814,7 @@ void CObjectManager::Display(DisplayContext& dc)
}
}
-void CObjectManager::ForceUpdateVisibleObjectCache([[maybe_unused]] DisplayContext& dc)
-{
- AZ_Assert(false, "CObjectManager::ForceUpdateVisibleObjectCache is legacy/deprecated and should not be used.");
-}
-
-void CObjectManager::FindDisplayableObjects([[maybe_unused]] DisplayContext& dc, [[maybe_unused]] bool bDisplay)
-{
- AZ_Assert(false, "CObjectManager::FindDisplayableObjects is legacy/deprecated and should not be used.");
-}
-
-void CObjectManager::BeginEditParams(CBaseObject* obj, int flags)
-{
- assert(obj != 0);
- if (obj == m_currEditObject)
- {
- return;
- }
-
- if (GetSelection()->GetCount() > 1)
- {
- return;
- }
-
- QWidget* prevActiveWindow = QApplication::activeWindow();
-
- if (m_currEditObject)
- {
- //if (obj->GetClassDesc() != m_currEditObject->GetClassDesc())
- if (!obj->IsSameClass(m_currEditObject))
- {
- EndEditParams(flags);
- }
- }
-
- m_currEditObject = obj;
-
- if (flags & OBJECT_CREATE)
- {
- // Unselect all other objects.
- ClearSelection();
- // Select this object.
- SelectObject(obj, false);
- }
-
- m_bSingleSelection = true;
-
- // Restore focus if it changed.
- // OBJECT_EDIT is used by the EntityOutliner when items are selected. Using it here to prevent shifting focus to the EntityInspector on select.
- if (!(flags & OBJECT_EDIT) && prevActiveWindow && QApplication::activeWindow() != prevActiveWindow)
- {
- prevActiveWindow->setFocus();
- }
-}
-
-void CObjectManager::EndEditParams([[maybe_unused]] int flags)
-{
- m_bSingleSelection = false;
- m_currEditObject = nullptr;
- //m_bSelectionChanged = false; // don't need to clear for ungroup
-}
-
-//! Select objects within specified distance from given position.
-int CObjectManager::SelectObjects(const AABB& box, bool bUnselect)
-{
- AZ_PROFILE_FUNCTION(Editor);
- int numSel = 0;
-
- AABB objBounds;
- for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
- {
- CBaseObject* obj = it->second;
-
- if (obj->IsHidden())
- {
- continue;
- }
-
- obj->GetBoundBox(objBounds);
- if (box.IsIntersectBox(objBounds))
- {
- numSel++;
- if (!bUnselect)
- {
- SelectObject(obj);
- }
- else
- {
- UnselectObject(obj);
- }
- }
- }
- return numSel;
-}
-
//////////////////////////////////////////////////////////////////////////
-int CObjectManager::MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, [[maybe_unused]] bool bIsCopy)
-{
- AABB objBounds;
-
- Vec3 src = (box.min + box.max) / 2;
- Vec3 dst = src + offset;
- float alpha = 0.0f;
- switch (rotation)
- {
- case ImageRotationDegrees::Rotate90:
- alpha = gf_halfPI;
- break;
- case ImageRotationDegrees::Rotate180:
- alpha = gf_PI;
- break;
- case ImageRotationDegrees::Rotate270:
- alpha = gf_PI + gf_halfPI;
- break;
- default:
- break;
- }
-
- float cosa = cos(alpha);
- float sina = sin(alpha);
-
- for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
- {
- CBaseObject* obj = it->second;
-
- if (obj->GetParent())
- {
- continue;
- }
-
- obj->GetBoundBox(objBounds);
- if (box.IsIntersectBox(objBounds))
- {
- if (rotation == ImageRotationDegrees::Rotate0)
- {
- obj->SetPos(obj->GetPos() - src + dst);
- }
- else
- {
- Vec3 pos = obj->GetPos() - src;
- Vec3 newPos(pos);
- newPos.x = cosa * pos.x - sina * pos.y;
- newPos.y = sina * pos.x + cosa * pos.y;
- obj->SetPos(newPos + dst);
- Quat q;
- obj->SetRotation(q.CreateRotationZ(alpha) * obj->GetRotation());
- }
- }
- }
- return 0;
-}
-
bool CObjectManager::IsObjectDeletionAllowed(CBaseObject* pObject)
{
if (!pObject)
@@ -1442,95 +845,12 @@ void CObjectManager::DeleteSelection()
objects.AddObject(m_currSelection->GetObject(i));
}
- RemoveSelection(m_currSelection->GetName());
m_currSelection = &m_defaultSelection;
m_defaultSelection.RemoveAll();
DeleteSelection(&objects);
}
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::HitTestObject(CBaseObject* obj, HitContext& hc)
-{
- AZ_PROFILE_FUNCTION(Editor);
-
- if (obj->IsFrozen())
- {
- return false;
- }
-
- if (obj->IsHidden())
- {
- return false;
- }
-
- // This object is rejected by deep selection.
- if (obj->CheckFlags(OBJFLAG_NO_HITTEST))
- {
- return false;
- }
-
- ObjectType objType = obj->GetType();
-
- // Check if this object type is masked for selection.
- if (!(objType & gSettings.objectSelectMask))
- {
- return false;
- }
-
- const bool bSelectionHelperHit = obj->HitHelperTest(hc);
-
- if (hc.bUseSelectionHelpers && !bSelectionHelperHit)
- {
- return false;
- }
-
- if (!bSelectionHelperHit)
- {
- // Fast checking.
- if (hc.bounds && !obj->IntersectRectBounds(*hc.bounds))
- {
- return false;
- }
-
- // Do 2D space testing.
- if (hc.nSubObjFlags == 0)
- {
- Ray ray(hc.raySrc, hc.rayDir);
- if (!obj->IntersectRayBounds(ray))
- {
- return false;
- }
- }
- else if (!obj->HitTestRect(hc))
- {
- return false;
- }
- }
-
- return (bSelectionHelperHit || obj->HitTest(hc));
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::HitTest([[maybe_unused]] HitContext& hitInfo)
-{
- AZ_Assert(false, "CObjectManager::HitTest is legacy/deprecated and should not be used.");
- return false;
-}
-
-void CObjectManager::FindObjectsInRect(
- [[maybe_unused]] CViewport* view, [[maybe_unused]] const QRect& rect, [[maybe_unused]] std::vector& guids)
-{
- AZ_Assert(false, "CObjectManager::FindObjectsInRect is legacy/deprecated and should not be used.");
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::SelectObjectsInRect(
- [[maybe_unused]] CViewport* view, [[maybe_unused]] const QRect& rect, [[maybe_unused]] bool bSelect)
-{
- AZ_Assert(false, "CObjectManager::SelectObjectsInRect is legacy/deprecated and should not be used.");
-}
-
//////////////////////////////////////////////////////////////////////////
uint16 FindPossibleObjectNameNumber(std::set& numberSet)
{
@@ -1581,50 +901,9 @@ void CObjectManager::RegisterObjectName(const QString& name)
}
}
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::UpdateRegisterObjectName(const QString& name)
-{
- // Remove all numbers from the end of typename.
- QString typeName = name;
- int nameLen = typeName.length();
- int len = nameLen;
-
- while (len > 0 && typeName[len - 1].isDigit())
- {
- len--;
- }
-
- typeName = typeName.left(len);
-
- uint16 num = 1;
- if (len < nameLen)
- {
- num = (uint16)atoi((const char*)name.toUtf8().data() + len) + 0;
- }
-
- NameNumbersMap::iterator it = m_nameNumbersMap.find(typeName);
-
- if (it != m_nameNumbersMap.end())
- {
- if (it->second.end() != it->second.find(num))
- {
- it->second.erase(num);
- if (it->second.empty())
- {
- m_nameNumbersMap.erase(it);
- }
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////
QString CObjectManager::GenerateUniqueObjectName(const QString& theTypeName)
{
- if (!m_bGenUniqObjectNames)
- {
- return theTypeName;
- }
-
QString typeName = theTypeName;
const int subIndex = theTypeName.indexOf("::");
if (subIndex != -1 && subIndex > typeName.length() - 2)
@@ -1659,14 +938,6 @@ QString CObjectManager::GenerateUniqueObjectName(const QString& theTypeName)
return str;
}
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::EnableUniqObjectNames(bool bEnable)
-{
- bool bPrev = m_bGenUniqObjectNames;
- m_bGenUniqObjectNames = bEnable;
- return bPrev;
-}
-
//////////////////////////////////////////////////////////////////////////
CObjectClassDesc* CObjectManager::FindClass(const QString& className)
{
@@ -1678,64 +949,6 @@ CObjectClassDesc* CObjectManager::FindClass(const QString& className)
return nullptr;
}
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::GetClassCategories(QStringList& categories)
-{
- std::vector classes;
- CClassFactory::Instance()->GetClassesBySystemID(ESYSTEM_CLASS_OBJECT, classes);
- std::set cset;
- for (int i = 0; i < classes.size(); i++)
- {
- QString category = classes[i]->Category();
- if (!category.isEmpty())
- {
- cset.insert(category);
- }
- }
- categories.clear();
- categories.reserve(static_cast(cset.size()));
- for (std::set::iterator cit = cset.begin(); cit != cset.end(); ++cit)
- {
- categories.push_back(*cit);
- }
-}
-
-void CObjectManager::GetClassCategoryToolClassNamePairs(std::vector< std::pair >& categoryToolClassNamePairs)
-{
- std::vector classes;
- CClassFactory::Instance()->GetClassesBySystemID(ESYSTEM_CLASS_OBJECT, classes);
- std::set< std::pair > cset;
- for (int i = 0; i < classes.size(); i++)
- {
- QString category = classes[i]->Category();
- QString toolClassName = ((CObjectClassDesc*)classes[i])->GetToolClassName();
- if (!category.isEmpty())
- {
- cset.insert(std::pair(category, toolClassName));
- }
- }
- categoryToolClassNamePairs.clear();
- categoryToolClassNamePairs.reserve(cset.size());
- for (std::set< std::pair >::iterator cit = cset.begin(); cit != cset.end(); ++cit)
- {
- categoryToolClassNamePairs.push_back(*cit);
- }
-}
-
-void CObjectManager::GetClassTypes(const QString& category, QStringList& types)
-{
- std::vector classes;
- CClassFactory::Instance()->GetClassesBySystemID(ESYSTEM_CLASS_OBJECT, classes);
- for (int i = 0; i < classes.size(); i++)
- {
- QString cat = classes[i]->Category();
- if (QString::compare(cat, category, Qt::CaseInsensitive) == 0 && classes[i]->IsEnabled())
- {
- types.push_back(classes[i]->ClassName());
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////
void CObjectManager::RegisterClassTemplate(const XmlNodeRef& templ)
{
@@ -1800,181 +1013,6 @@ void CObjectManager::RegisterCVars()
"Adjust the hit radius used for axis helpers, like the transform gizmo.");
}
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::Serialize(XmlNodeRef& xmlNode, bool bLoading, int flags)
-{
- if (!xmlNode)
- {
- return;
- }
-
- if (bLoading)
- {
- m_loadedObjects = 0;
-
- if (flags == SERIALIZE_ONLY_NOTSHARED)
- {
- DeleteNotSharedObjects();
- }
- else if (flags == SERIALIZE_ONLY_SHARED)
- {
- DeleteSharedObjects();
- }
- else
- {
- DeleteAllObjects();
- }
-
-
- XmlNodeRef root = xmlNode->findChild("Objects");
-
- int totalObjects = 0;
-
- if (root)
- {
- root->getAttr("NumObjects", totalObjects);
- }
-
-
- StartObjectsLoading(totalObjects);
-
- CObjectArchive ar(this, xmlNode, true);
-
- // Loading.
- if (root)
- {
- ar.node = root;
- LoadObjects(ar, false);
- }
- EndObjectsLoading();
- }
- else
- {
- // Saving.
- XmlNodeRef root = xmlNode->newChild("Objects");
-
- CObjectArchive ar(this, root, false);
-
- // Save all objects to XML.
- for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
- {
- CBaseObject* obj = it->second;
-
- if (obj->CheckFlags(OBJFLAG_DONT_SAVE))
- {
- continue;
- }
-
- if ((flags == SERIALIZE_ONLY_SHARED) && !obj->CheckFlags(OBJFLAG_SHARED))
- {
- continue;
- }
- else if ((flags == SERIALIZE_ONLY_NOTSHARED) && obj->CheckFlags(OBJFLAG_SHARED))
- {
- continue;
- }
-
- XmlNodeRef objNode = root->newChild("Object");
- ar.node = objNode;
- obj->Serialize(ar);
- }
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::LoadObjects(CObjectArchive& objectArchive, bool bSelect)
-{
- m_bLoadingObjects = true;
-
- XmlNodeRef objectsNode = objectArchive.node;
- int numObjects = objectsNode->getChildCount();
- for (int i = 0; i < numObjects; i++)
- {
- objectArchive.node = objectsNode->getChild(i);
- CBaseObject* obj = objectArchive.LoadObject(objectsNode->getChild(i));
- if (obj && bSelect)
- {
- SelectObject(obj);
- }
- }
- EndObjectsLoading(); // End progress bar, here, Resolve objects have his own.
- objectArchive.ResolveObjects();
-
- InvalidateVisibleList();
-
- m_bLoadingObjects = false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::Export(const QString& levelPath, XmlNodeRef& rootNode, bool onlyShared)
-{
- // Clear export files.
- QFile::remove(QStringLiteral("%1TagPoints.ini").arg(levelPath));
- QFile::remove(QStringLiteral("%1Volumes.ini").arg(levelPath));
-
- // Save all objects to XML.
- for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
- {
- CBaseObject* obj = it->second;
- // Export Only shared objects.
- if ((obj->CheckFlags(OBJFLAG_SHARED) && onlyShared) ||
- (!obj->CheckFlags(OBJFLAG_SHARED) && !onlyShared))
- {
- obj->Export(levelPath, rootNode);
- }
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::ExportEntities(XmlNodeRef& rootNode)
-{
- // Save all objects to XML.
- for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it)
- {
- CBaseObject* obj = it->second;
- if (qobject_cast(obj))
- {
- obj->Export("", rootNode);
- }
- }
-}
-
-void CObjectManager::DeleteNotSharedObjects()
-{
- TBaseObjects objects;
- GetAllObjects(objects);
- for (int i = 0; i < objects.size(); i++)
- {
- CBaseObject* obj = objects[i];
- if (!obj->CheckFlags(OBJFLAG_SHARED))
- {
- DeleteObject(obj);
- }
- }
-}
-
-void CObjectManager::DeleteSharedObjects()
-{
- TBaseObjects objects;
- GetAllObjects(objects);
- for (int i = 0; i < objects.size(); i++)
- {
- CBaseObject* obj = objects[i];
- if (obj->CheckFlags(OBJFLAG_SHARED))
- {
- DeleteObject(obj);
- }
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-IObjectSelectCallback* CObjectManager::SetSelectCallback(IObjectSelectCallback* callback)
-{
- IObjectSelectCallback* prev = m_selectCallback;
- m_selectCallback = callback;
- return prev;
-}
-
//////////////////////////////////////////////////////////////////////////
void CObjectManager::InvalidateVisibleList()
{
@@ -2016,27 +1054,6 @@ void CObjectManager::UpdateVisibilityList()
m_isUpdateVisibilityList = false;
}
-//////////////////////////////////////////////////////////////////////////
-bool CObjectManager::ConvertToType(CBaseObject* pObject, const QString& typeName)
-{
- QString message = QString("Convert ") + pObject->GetName() + " to " + typeName;
- CUndo undo(message.toUtf8().data());
-
- CBaseObjectPtr pNewObject = GetIEditor()->NewObject(typeName.toUtf8().data());
- if (pNewObject)
- {
- if (pNewObject->ConvertFromObject(pObject))
- {
- DeleteObject(pObject);
- return true;
- }
- DeleteObject(pNewObject);
- }
-
- Log((message + " is failed.").toUtf8().data());
- return false;
-}
-
//////////////////////////////////////////////////////////////////////////
void CObjectManager::SetObjectSelected(CBaseObject* pObject, bool bSelect)
{
@@ -2065,69 +1082,6 @@ void CObjectManager::SetObjectSelected(CBaseObject* pObject, bool bSelect)
m_gizmoManager->AddGizmo(new CAxisGizmo(pObject));
}
}
-
- if (bSelect)
- {
- NotifyObjectListeners(pObject, CBaseObject::ON_SELECT);
- }
- else
- {
- NotifyObjectListeners(pObject, CBaseObject::ON_UNSELECT);
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::HideTransformManipulators()
-{
- m_gizmoManager->DeleteAllTransformManipulators();
-}
-
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::AddObjectEventListener(EventListener* listener)
-{
- stl::push_back_unique(m_objectEventListeners, listener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::RemoveObjectEventListener(EventListener* listener)
-{
- stl::find_and_erase(m_objectEventListeners, listener);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::NotifyObjectListeners(CBaseObject* pObject, CBaseObject::EObjectListenerEvent event)
-{
- std::list::iterator next;
- for (std::list::iterator it = m_objectEventListeners.begin(); it != m_objectEventListeners.end(); it = next)
- {
- next = it;
- ++next;
- // Call listener callback.
- (*it)->OnObjectEvent(pObject, event);
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::StartObjectsLoading(int numObjects)
-{
- if (m_pLoadProgress)
- {
- return;
- }
- m_pLoadProgress = new CWaitProgress("Loading Objects");
- m_totalObjectsToLoad = numObjects;
- m_loadedObjects = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::EndObjectsLoading()
-{
- if (m_pLoadProgress)
- {
- delete m_pLoadProgress;
- }
- m_pLoadProgress = nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -2175,130 +1129,6 @@ bool CObjectManager::IsLightClass(CBaseObject* pObject)
return false;
}
-void CObjectManager::FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue)
-{
- CBaseObjectsArray objects;
- GetObjects(objects);
-
- for (size_t i = 0, n = objects.size(); i < n; ++i)
- {
- CBaseObject* pObject = objects[i];
- if (qobject_cast(pObject))
- {
- CEntityObject* pEntity = static_cast(pObject);
- CVarBlock* pProperties2 = pEntity->GetProperties2();
- if (pProperties2)
- {
- IVariable* pVariable = pProperties2->FindVariable(property2Name);
- if (pVariable)
- {
- QString sValue;
- pVariable->Get(sValue);
- if (sValue == oldValue)
- {
- pEntity->StoreUndo("Rename Property2");
-
- pVariable->Set(newValue);
- }
- }
- }
- }
- }
-}
-
-void CObjectManager::FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue)
-{
- CBaseObjectsArray objects;
- GetObjects(objects);
-
- for (size_t i = 0, n = objects.size(); i < n; ++i)
- {
- CBaseObject* pObject = objects[i];
- if (qobject_cast(pObject))
- {
- CEntityObject* pEntity = static_cast(pObject);
- CVarBlock* pProperties2 = pEntity->GetProperties2();
- if (pProperties2)
- {
- IVariable* pVariable = pProperties2->FindVariable(property2Name);
- IVariable* pOtherVariable = pProperties2->FindVariable(otherProperty2Name);
- if (pVariable && pOtherVariable)
- {
- QString sValue;
- pVariable->Get(sValue);
-
- QString sOtherValue;
- pOtherVariable->Get(sOtherValue);
-
- if ((sValue == oldValue) && (sOtherValue == otherValue))
- {
- pEntity->StoreUndo("Rename Property2 If");
-
- pVariable->Set(newValue);
- }
- }
- }
- }
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::HitTestObjectAgainstRect(CBaseObject* pObj, CViewport* view, HitContext hc, std::vector& guids)
-{
- if (!pObj->IsSelectable())
- {
- return;
- }
-
- AABB box;
-
- // Retrieve world space bound box.
- pObj->GetBoundBox(box);
-
- // Check if object visible in viewport.
- if (!view->IsBoundsVisible(box))
- {
- return;
- }
-
- if (pObj->HitTestRect(hc))
- {
- stl::push_back_unique(guids, pObj->GetId());
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CObjectManager::SelectObjectInRect(CBaseObject* pObj, CViewport* view, HitContext hc, bool bSelect)
-{
- if (!pObj->IsSelectable())
- {
- return;
- }
-
- AABB box;
-
- // Retrieve world space bound box.
- pObj->GetBoundBox(box);
-
- // Check if object visible in viewport.
- if (!view->IsBoundsVisible(box))
- {
- return;
- }
-
- if (pObj->HitTestRect(hc))
- {
- if (bSelect)
- {
- SelectObject(pObj);
- }
- else
- {
- UnselectObject(pObj);
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////
namespace
{
@@ -2378,93 +1208,6 @@ namespace
}
}
- bool PyIsObjectHidden(const char* objName)
- {
- CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
- if (!pObject)
- {
- throw std::logic_error((QString("\"") + objName + "\" is an invalid object name.").toUtf8().data());
- }
- return pObject->IsHidden();
- }
-
- void PyHideAllObjects()
- {
- CBaseObjectsArray baseObjects;
- GetIEditor()->GetObjectManager()->GetObjects(baseObjects);
-
- if (baseObjects.size() <= 0)
- {
- throw std::logic_error("Objects not found.");
- }
-
- CUndo undo("Hide All Objects");
- for (int i = 0; i < baseObjects.size(); i++)
- {
- GetIEditor()->GetObjectManager()->HideObject(baseObjects[i], true);
- }
- }
-
- void PyUnHideAllObjects()
- {
- CUndo undo("Unhide All Objects");
- GetIEditor()->GetObjectManager()->UnhideAll();
- }
-
- void PyHideObject(const char* objName)
- {
- CUndo undo("Hide Object");
-
- CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
- if (pObject)
- {
- GetIEditor()->GetObjectManager()->HideObject(pObject, true);
- }
- }
-
- void PyUnhideObject(const char* objName)
- {
- CUndo undo("Unhide Object");
-
- CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
- if (pObject)
- {
- GetIEditor()->GetObjectManager()->HideObject(pObject, false);
- }
- }
-
- void PyFreezeObject(const char* objName)
- {
- CUndo undo("Freeze Object");
-
- CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
- if (pObject)
- {
- GetIEditor()->GetObjectManager()->FreezeObject(pObject, true);
- }
- }
-
- void PyUnfreezeObject(const char* objName)
- {
- CUndo undo("Unfreeze Object");
-
- CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
- if (pObject)
- {
- GetIEditor()->GetObjectManager()->FreezeObject(pObject, false);
- }
- }
-
- bool PyIsObjectFrozen(const char* objName)
- {
- CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName);
- if (!pObject)
- {
- throw std::logic_error((QString("\"") + objName + "\" is an invalid object name.").toUtf8().data());
- }
- return pObject->IsFrozen();
- }
-
void PyDeleteObject(const char* objName)
{
CUndo undo("Delete Object");
@@ -2652,16 +1395,6 @@ namespace AzToolsFramework
addLegacyGeneral(behaviorContext->Method("get_selection_center", PyGetSelectionCenter, nullptr, "Returns the center point of the selection group."));
addLegacyGeneral(behaviorContext->Method("get_selection_aabb", PyGetSelectionAABB, nullptr, "Returns the aabb of the selection group."));
- addLegacyGeneral(behaviorContext->Method("hide_object", PyHideObject, nullptr, "Hides a specified object."));
- addLegacyGeneral(behaviorContext->Method("is_object_hidden", PyIsObjectHidden, nullptr, "Checks if object is hidden and returns a bool value."));
- addLegacyGeneral(behaviorContext->Method("unhide_object", PyUnhideObject, nullptr, "Unhides a specified object."));
- addLegacyGeneral(behaviorContext->Method("hide_all_objects", PyHideAllObjects, nullptr, "Hides all objects."));
- addLegacyGeneral(behaviorContext->Method("unhide_all_objects", PyUnHideAllObjects, nullptr, "Unhides all objects."));
-
- addLegacyGeneral(behaviorContext->Method("freeze_object", PyFreezeObject, nullptr, "Freezes a specified object."));
- addLegacyGeneral(behaviorContext->Method("is_object_frozen", PyIsObjectFrozen, nullptr, "Checks if object is frozen and returns a bool value."));
- addLegacyGeneral(behaviorContext->Method("unfreeze_object", PyUnfreezeObject, nullptr, "Unfreezes a specified object."));
-
addLegacyGeneral(behaviorContext->Method("delete_object", PyDeleteObject, nullptr, "Deletes a specified object."));
addLegacyGeneral(behaviorContext->Method("delete_selected", PyDeleteSelected, nullptr, "Deletes selected object(s)."));
diff --git a/Code/Editor/Objects/ObjectManager.h b/Code/Editor/Objects/ObjectManager.h
index 7389dfa6a1..fb16c2fec3 100644
--- a/Code/Editor/Objects/ObjectManager.h
+++ b/Code/Editor/Objects/ObjectManager.h
@@ -8,10 +8,6 @@
// Description : ObjectManager definition.
-
-
-#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
-#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
#pragma once
#include "IObjectManager.h"
@@ -42,12 +38,10 @@ public:
CObjectManagerLevelIsExporting()
{
AZ::ObjectManagerEventBus::Broadcast(&AZ::ObjectManagerEventBus::Events::OnExportingStarting);
- GetIEditor()->GetObjectManager()->SetExportingLevel(true);
}
~CObjectManagerLevelIsExporting()
{
- GetIEditor()->GetObjectManager()->SetExportingLevel(false);
AZ::ObjectManagerEventBus::Broadcast(&AZ::ObjectManagerEventBus::Events::OnExportingFinished);
}
};
@@ -66,20 +60,12 @@ public:
CObjectManager();
~CObjectManager();
- void RegisterObjectClasses();
-
CBaseObject* NewObject(CObjectClassDesc* cls, CBaseObject* prev = 0, const QString& file = "", const char* newObjectName = nullptr) override;
CBaseObject* NewObject(const QString& typeName, CBaseObject* prev = 0, const QString& file = "", const char* newEntityName = nullptr) override;
void DeleteObject(CBaseObject* obj) override;
void DeleteSelection(CSelectionGroup* pSelection) override;
void DeleteAllObjects() override;
- CBaseObject* CloneObject(CBaseObject* obj) override;
-
- void BeginEditParams(CBaseObject* obj, int flags) override;
- void EndEditParams(int flags = 0) override;
- // Hides all transform manipulators.
- void HideTransformManipulators();
//! Get number of objects manager by ObjectManager (not contain sub objects of groups).
int GetObjectCount() const override;
@@ -88,30 +74,9 @@ public:
//! @param layer if 0 get objects for all layers, or layer to get objects from.
void GetObjects(CBaseObjectsArray& objects) const override;
- //! Get array of objects that pass the filter.
- //! @param filter The filter functor, return true if you want to get the certain obj, return false if want to skip it.
- void GetObjects(CBaseObjectsArray& objects, BaseObjectFilterFunctor const& filter) const override;
-
- //! Update objects.
- void Update();
-
//! Display objects on display context.
void Display(DisplayContext& dc) override;
- //! Called when selecting without selection helpers - this is needed since
- //! the visible object cache is normally not updated when not displaying helpers.
- void ForceUpdateVisibleObjectCache(DisplayContext& dc) override;
-
- //! Check intersection with objects.
- //! Find intersection with nearest to ray origin object hit by ray.
- //! If distance tollerance is specified certain relaxation applied on collision test.
- //! @return true if hit any object, and fills hitInfo structure.
- bool HitTest(HitContext& hitInfo) override;
-
- //! Check intersection with an object.
- //! @return true if hit, and fills hitInfo structure.
- bool HitTestObject(CBaseObject* obj, HitContext& hc) override;
-
//! Send event to all objects.
//! Will cause OnEvent handler to be called on all objects.
void SendEvent(ObjectEvent event) override;
@@ -134,76 +99,28 @@ public:
//! Find objects which intersect with a given AABB.
void FindObjectsInAABB(const AABB& aabb, std::vector& result) const override;
- //////////////////////////////////////////////////////////////////////////
- // Operations on objects.
- //////////////////////////////////////////////////////////////////////////
- //! Makes object visible or invisible.
- void HideObject(CBaseObject* obj, bool hide) override;
- //! Shows the last hidden object based on hidden ID
- void ShowLastHiddenObject() override;
- //! Freeze object, making it unselectable.
- void FreezeObject(CBaseObject* obj, bool freeze) override;
- //! Unhide all hidden objects.
- void UnhideAll() override;
- //! Unfreeze all frozen objects.
- void UnfreezeAll() override;
-
//////////////////////////////////////////////////////////////////////////
// Object Selection.
//////////////////////////////////////////////////////////////////////////
bool SelectObject(CBaseObject* obj, bool bUseMask = true) override;
void UnselectObject(CBaseObject* obj) override;
- //! Select objects within specified distance from given position.
- //! Return number of selected objects.
- int SelectObjects(const AABB& box, bool bUnselect = false) override;
-
- void SelectEntities(std::set& s) override;
-
- int MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, bool bIsCopy = false) override;
-
- //! Selects/Unselects all objects within 2d rectangle in given viewport.
- void SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect) override;
- void FindObjectsInRect(CViewport* view, const QRect& rect, std::vector& guids) override;
-
//! Clear default selection set.
//! @Return number of objects removed from selection.
int ClearSelection() override;
- //! Deselect all current selected objects and selects object that were unselected.
- //! @Return number of selected objects.
- int InvertSelection() override;
-
//! Get current selection.
CSelectionGroup* GetSelection() const override { return m_currSelection; };
- //! Get named selection.
- CSelectionGroup* GetSelection(const QString& name) const override;
- // Get selection group names
- void GetNameSelectionStrings(QStringList& names) override;
- //! Change name of current selection group.
- //! And store it in list.
- void NameSelection(const QString& name) override;
- //! Set one of name selections as current selection.
- void SetSelection(const QString& name) override;
- void RemoveSelection(const QString& name) override;
bool IsObjectDeletionAllowed(CBaseObject* pObject);
//! Delete all objects in selection group.
void DeleteSelection() override;
- uint32 ForceID() const override{return m_ForceID; }
- void ForceID(uint32 FID) override{m_ForceID = FID; }
-
//! Generates uniq name base on type name of object.
QString GenerateUniqueObjectName(const QString& typeName) override;
//! Register object name in object manager, needed for generating uniq names.
void RegisterObjectName(const QString& name) override;
- //! Decrease name number and remove if it was last in object manager, needed for generating uniq names.
- void UpdateRegisterObjectName(const QString& name);
- //! Enable/Disable generating of unique object names (Enabled by default).
- //! Return previous value.
- bool EnableUniqObjectNames(bool bEnable) override;
//! Register XML template of runtime class.
void RegisterClassTemplate(const XmlNodeRef& templ);
@@ -215,52 +132,10 @@ public:
//! Find object class by name.
CObjectClassDesc* FindClass(const QString& className) override;
- void GetClassCategories(QStringList& categories) override;
- void GetClassCategoryToolClassNamePairs(std::vector< std::pair >& categoryToolClassNamePairs) override;
- void GetClassTypes(const QString& category, QStringList& types) override;
-
- //! Export objects to xml.
- //! When onlyShared is true ony objects with shared flags exported, overwise only not shared object exported.
- void Export(const QString& levelPath, XmlNodeRef& rootNode, bool onlyShared) override;
- void ExportEntities(XmlNodeRef& rootNode) override;
-
- //! Serialize Objects in manager to specified XML Node.
- //! @param flags Can be one of SerializeFlags.
- void Serialize(XmlNodeRef& rootNode, bool bLoading, int flags = SERIALIZE_ALL) override;
-
- void SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading) override;
-
- //! Load objects from object archive.
- //! @param bSelect if set newly loaded object will be selected.
- void LoadObjects(CObjectArchive& ar, bool bSelect) override;
-
- //! Delete from Object manager all objects without SHARED flag.
- void DeleteNotSharedObjects();
- //! Delete from Object manager all objects with SHARED flag.
- void DeleteSharedObjects();
bool AddObject(CBaseObject* obj);
void RemoveObject(CBaseObject* obj);
void ChangeObjectId(REFGUID oldId, REFGUID newId) override;
- bool IsDuplicateObjectName(const QString& newName) const override
- {
- return FindObject(newName) ? true : false;
- }
- void ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const override;
- void ChangeObjectName(CBaseObject* obj, const QString& newName) override;
-
- //! Convert object of one type to object of another type.
- //! Original object is deleted.
- bool ConvertToType(CBaseObject* pObject, const QString& typeName) override;
-
- //! Set new selection callback.
- //! @return previous selection callback.
- IObjectSelectCallback* SetSelectCallback(IObjectSelectCallback* callback) override;
-
- // Enables/Disables creating of game objects.
- void SetCreateGameObject(bool enable) override { m_createGameObjects = enable; };
- //! Return true if objects loaded from xml should immidiatly create game objects associated with them.
- bool IsCreateGameObjects() const override { return m_createGameObjects; };
//////////////////////////////////////////////////////////////////////////
//! Get access to gizmo manager.
@@ -270,33 +145,12 @@ public:
//! Invalidate visibily settings of objects.
void InvalidateVisibleList() override;
- //////////////////////////////////////////////////////////////////////////
- // ObjectManager notification Callbacks.
- //////////////////////////////////////////////////////////////////////////
- void AddObjectEventListener(EventListener* listener) override;
- void RemoveObjectEventListener(EventListener* listener) override;
-
- //////////////////////////////////////////////////////////////////////////
- // Used to indicate starting and ending of objects loading.
- //////////////////////////////////////////////////////////////////////////
- void StartObjectsLoading(int numObjects) override;
- void EndObjectsLoading() override;
-
//////////////////////////////////////////////////////////////////////////
// Gathers all resources used by all objects.
void GatherUsedResources(CUsedResources& resources) override;
bool IsLightClass(CBaseObject* pObject) override;
- virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue) override;
- virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue) override;
-
- bool IsReloading() const override { return m_bInReloading; }
- void SetSkipUpdate(bool bSkipUpdate) override { m_bSkipObjectUpdate = bSkipUpdate; }
-
- void SetExportingLevel(bool bExporting) override { m_bLevelExporting = bExporting; }
- bool IsExportingLevelInprogress() const override { return m_bLevelExporting; }
-
int GetAxisHelperHitRadius() const override { return m_axisHelperHitRadius; }
private:
@@ -317,29 +171,12 @@ private:
void SelectCurrent();
void SetObjectSelected(CBaseObject* pObject, bool bSelect);
- // Recursive functions potentially taking into child objects into account
- void SelectObjectInRect(CBaseObject* pObj, CViewport* view, HitContext hc, bool bSelect);
- void HitTestObjectAgainstRect(CBaseObject* pObj, CViewport* view, HitContext hc, std::vector& guids);
-
- void SaveRegistry();
- void LoadRegistry();
-
- void NotifyObjectListeners(CBaseObject* pObject, CBaseObject::EObjectListenerEvent event);
-
- void FindDisplayableObjects(DisplayContext& dc, bool bDisplay);
-
private:
- typedef std::map Objects;
+ typedef AZStd::map Objects;
Objects m_objects;
- typedef std::unordered_map ObjectsByNameCrc;
+ typedef AZStd::unordered_map ObjectsByNameCrc;
ObjectsByNameCrc m_objectsByName;
- typedef std::map TNameSelectionMap;
- TNameSelectionMap m_selections;
-
- //! Used for forcing IDs of "GetEditorObjectID" of PreFabs, as they used to have random IDs on each load
- uint32 m_ForceID;
-
//! Array of currently visible objects.
TBaseObjects m_visibleObjects;
@@ -349,16 +186,11 @@ private:
unsigned int m_lastComputedVisibility = 0; // when the object manager itself last updated visibility (since it also has a cache)
int m_lastHideMask = 0;
- float m_maxObjectViewDistRatio;
-
//////////////////////////////////////////////////////////////////////////
// Selection.
//! Current selection group.
CSelectionGroup* m_currSelection;
- int m_nLastSelCount;
bool m_bSelectionChanged;
- IObjectSelectCallback* m_selectCallback;
- bool m_bLoadingObjects;
// True while performing a select or deselect operation on more than one object.
// Prevents individual undo/redo commands for every object, allowing bulk undo/redo
@@ -367,20 +199,9 @@ private:
//! Default selection.
CSelectionGroup m_defaultSelection;
- CBaseObjectPtr m_currEditObject;
- bool m_bSingleSelection;
-
- bool m_createGameObjects;
- bool m_bGenUniqObjectNames;
-
// Object manager also handles Gizmo manager.
CGizmoManager* m_gizmoManager;
- //////////////////////////////////////////////////////////////////////////
- // Loading progress.
- CWaitProgress* m_pLoadProgress;
- int m_loadedObjects;
- int m_totalObjectsToLoad;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
@@ -389,10 +210,6 @@ private:
typedef std::map, stl::less_stricmp > NameNumbersMap;
NameNumbersMap m_nameNumbersMap;
- //////////////////////////////////////////////////////////////////////////
- // Listeners.
- std::list m_objectEventListeners;
-
bool m_bExiting;
std::unordered_set m_animatedAttachedEntities;
@@ -401,10 +218,6 @@ private:
uint64 m_currentHideCount;
- bool m_bInReloading;
- bool m_bSkipObjectUpdate;
- bool m_bLevelExporting;
-
int m_axisHelperHitRadius = 20;
};
@@ -426,4 +239,3 @@ namespace AzToolsFramework
} // namespace AzToolsFramework
-#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H
diff --git a/Code/Editor/Objects/ObjectManagerLegacyUndo.h b/Code/Editor/Objects/ObjectManagerLegacyUndo.h
index 721d188171..29dc2aa4ae 100644
--- a/Code/Editor/Objects/ObjectManagerLegacyUndo.h
+++ b/Code/Editor/Objects/ObjectManagerLegacyUndo.h
@@ -24,12 +24,11 @@ public:
CUndoBaseObjectNew(CBaseObject* object);
protected:
- virtual int GetSize() override { return sizeof(*this); }; // Return size of xml state.
- virtual QString GetDescription() override { return "New BaseObject"; };
- virtual QString GetObjectName() override { return m_object->GetName(); };
+ int GetSize() override { return sizeof(*this); } // Return size of xml state.
+ QString GetObjectName() override { return m_object->GetName(); }
- virtual void Undo(bool bUndo) override;
- virtual void Redo() override;
+ void Undo(bool bUndo) override;
+ void Redo() override;
private:
CBaseObjectPtr m_object;
@@ -47,12 +46,11 @@ public:
CUndoBaseObjectDelete(CBaseObject* object);
protected:
- virtual int GetSize() override { return sizeof(*this); }; // Return size of xml state.
- virtual QString GetDescription() override { return "Delete BaseObject"; };
- virtual QString GetObjectName() override { return m_object->GetName(); };
+ int GetSize() override { return sizeof(*this); } // Return size of xml state.
+ QString GetObjectName() override { return m_object->GetName(); }
- virtual void Undo(bool bUndo) override;
- virtual void Redo() override;
+ void Undo(bool bUndo) override;
+ void Redo() override;
private:
CBaseObjectPtr m_object;
@@ -73,20 +71,19 @@ public:
* This Undo command can be used for either Legacy or Component Entities, though for
* performance reasons Component Entities are typically undone using CUndoBaseObjectBulkSelect
*
- * @param pObj The object to perform the undo/redo operation on.
+ * @param object The object to perform the undo/redo operation on.
* @param isSelect This is true if you are trying to undo a select operation, and false if
* trying to undo a deselect operation
*/
CUndoBaseObjectSelect(CBaseObject* object, bool isSelect);
protected:
- virtual void Release() override { delete this; };
- virtual int GetSize() override { return sizeof(*this); }; // Return size of xml state.
- virtual QString GetDescription() override { return "Select Object"; };
- virtual QString GetObjectName() override;
+ void Release() override { delete this; }
+ int GetSize() override { return sizeof(*this); } // Return size of xml state.
+ QString GetObjectName() override;
- virtual void Undo(bool bUndo) override;
- virtual void Redo() override;
+ void Undo(bool bUndo) override;
+ void Redo() override;
private:
GUID m_guid;
@@ -116,7 +113,6 @@ public:
protected:
int GetSize() override { return sizeof(*this); } // Return size of xml state.
- QString GetDescription() override { return QObject::tr("Select Objects"); }
/*
* Deselects the objects
@@ -153,7 +149,6 @@ public:
protected:
int GetSize() override { return sizeof(*this); } // Return size of xml state.
- QString GetDescription() override { return QObject::tr("Select Objects"); }
void Undo(bool bUndo) override;
diff --git a/Code/Editor/Objects/SelectionGroup.cpp b/Code/Editor/Objects/SelectionGroup.cpp
index 06d881d607..95a3cc7b14 100644
--- a/Code/Editor/Objects/SelectionGroup.cpp
+++ b/Code/Editor/Objects/SelectionGroup.cpp
@@ -18,8 +18,6 @@
#include "ViewManager.h"
#include "Include/IObjectManager.h"
-#include
-
//////////////////////////////////////////////////////////////////////////
CSelectionGroup::CSelectionGroup()
: m_ref(1)
@@ -226,7 +224,6 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma
m_bVertexSnapped = false;
FilterParents();
- Vec3 newPos;
bool bValidFollowGeometryMode(true);
if (point.x() == -1 || point.y() == -1)
@@ -234,8 +231,6 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma
bValidFollowGeometryMode = false;
}
- SRayHitInfo pickedInfo;
-
if (moveFlag == eMS_FollowGeometryPosNorm)
{
if (m_LastestMoveSelectionFlag != eMS_FollowGeometryPosNorm)
@@ -249,6 +244,8 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma
}
m_LastestMoveSelectionFlag = moveFlag;
+ Vec3 zeroPickedInfo_vHitNormal;
+ Vec3 zeroPickedInfo_vHitPos;
for (int i = 0; i < GetFilteredCount(); i++)
{
@@ -264,16 +261,15 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma
Vec3 zaxis = m_LastestMovedObjectRot * Vec3(0, 0, 1);
zaxis.Normalize();
Quat nq;
- nq.SetRotationV0V1(zaxis, pickedInfo.vHitNormal);
- obj->SetPos(pickedInfo.vHitPos);
+ nq.SetRotationV0V1(zaxis, zeroPickedInfo_vHitNormal);
+ obj->SetPos(zeroPickedInfo_vHitPos);
obj->SetRotation(nq * m_LastestMovedObjectRot);
continue;
}
- Matrix34 wtm = obj->GetWorldTM();
+ const Matrix34 &wtm = obj->GetWorldTM();
Vec3 wp = wtm.GetTranslation();
-
- newPos = wp + offset;
+ Vec3 newPos = wp + offset;
if (moveFlag == eMS_FollowTerrain)
{
// Make sure object keeps it height.
@@ -465,17 +461,6 @@ void CSelectionGroup::SetScale(const Vec3& scale, int referenceCoordSys)
Scale(relScale, referenceCoordSys);
}
-
-void CSelectionGroup::StartScaling()
-{
- for (int i = 0; i < GetFilteredCount(); i++)
- {
- CBaseObject* obj = GetFilteredObject(i);
- obj->StartScaling();
- }
-}
-
-
//////////////////////////////////////////////////////////////////////////
void CSelectionGroup::Align()
{
@@ -533,45 +518,6 @@ void CSelectionGroup::ResetTransformation()
}
}
-//////////////////////////////////////////////////////////////////////////
-void CSelectionGroup::Clone(CSelectionGroup& newGroup)
-{
- IObjectManager* pObjMan = GetIEditor()->GetObjectManager();
- assert(pObjMan);
-
- int i;
- CObjectCloneContext cloneContext;
-
- FilterParents();
-
- //////////////////////////////////////////////////////////////////////////
- // Clone every object.
- for (i = 0; i < GetFilteredCount(); i++)
- {
- CBaseObject* pFromObject = GetFilteredObject(i);
- CBaseObject* newObj = pObjMan->CloneObject(pFromObject);
- if (!newObj) // can be null, e.g. sequence can't be cloned
- {
- continue;
- }
-
- cloneContext.AddClone(pFromObject, newObj);
- newGroup.AddObject(newObj);
- }
-
- //////////////////////////////////////////////////////////////////////////
- // Only after everything was cloned, call PostClone on all cloned objects.
- for (i = 0; i < newGroup.GetCount(); ++i)
- {
- CBaseObject* pFromObject = GetFilteredObject(i);
- CBaseObject* pClonedObject = newGroup.GetObject(i);
- if (pClonedObject)
- {
- pClonedObject->PostClone(pFromObject, cloneContext);
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////
void CSelectionGroup::SendEvent(ObjectEvent event)
{
diff --git a/Code/Editor/Objects/SelectionGroup.h b/Code/Editor/Objects/SelectionGroup.h
index 600bce5f26..8d979d23be 100644
--- a/Code/Editor/Objects/SelectionGroup.h
+++ b/Code/Editor/Objects/SelectionGroup.h
@@ -98,7 +98,6 @@ public:
//! Resets rotation and scale to identity and (1.0f, 1.0f, 1.0f)
void ResetTransformation();
//! Scale objects in selection by given scale.
- void StartScaling();
void Scale(const Vec3& scale, int referenceCoordSys);
void SetScale(const Vec3& scale, int referenceCoordSys);
//! Align objects in selection to surface normal
@@ -106,11 +105,6 @@ public:
//! Very special method to move contents of a voxel.
void MoveContent(const Vec3& offset);
- //////////////////////////////////////////////////////////////////////////
- //! Clone objects in this group and add cloned objects to new selection group.
- //! Only topmost parent objects will be added to this selection group.
- void Clone(CSelectionGroup& newGroup);
-
// Send event to all objects in selection group.
void SendEvent(ObjectEvent event);
diff --git a/Code/Editor/Plugin.cpp b/Code/Editor/Plugin.cpp
index 4f6fe0279d..68f8d8833b 100644
--- a/Code/Editor/Plugin.cpp
+++ b/Code/Editor/Plugin.cpp
@@ -14,6 +14,7 @@
// Editor
#include "Include/IViewPane.h"
+#include
CClassFactory* CClassFactory::s_pInstance = nullptr;
CAutoRegisterClassHelper* CAutoRegisterClassHelper::s_pFirst = nullptr;
@@ -79,7 +80,7 @@ void CClassFactory::RegisterClass(IClassDesc* pClassDesc)
existingUUIDString,
findByGuid->second->ClassName().toUtf8().data());
- CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate UUID", MB_OK);
+ QMessageBox::critical(nullptr,"Invalid class registration - Duplicate UUID",QString::fromLatin1(errorMessageBuffer));
return;
}
@@ -107,7 +108,7 @@ void CClassFactory::RegisterClass(IClassDesc* pClassDesc)
newUUIDString,
existingUUIDString);
- CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate Class Name", MB_OK);
+ QMessageBox::critical(nullptr, "Invalid class registration - Duplicate Class Name", QString::fromLatin1(errorMessageBuffer));
return;
}
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
index 8957b6ced6..fbb700723b 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp
@@ -36,7 +36,6 @@
#include
#include
#include
-#include
#include
#include
@@ -48,14 +47,12 @@
/**
* Scalars for icon drawing behavior.
*/
-static const int s_kIconSize = 36; /// Icon display size (in pixels)
-
CComponentEntityObject::CComponentEntityObject()
- : m_hasIcon(false)
+ : m_accentType(AzToolsFramework::EntityAccentType::None)
+ , m_hasIcon(false)
, m_entityIconVisible(false)
, m_iconOnlyHitTest(false)
, m_drawAccents(true)
- , m_accentType(AzToolsFramework::EntityAccentType::None)
, m_isIsolated(false)
, m_iconTexture(nullptr)
{
@@ -243,7 +240,7 @@ void CComponentEntityObject::SetSelected(bool bSelect)
}
bool anySelected = false;
-
+
AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(anySelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
if (!anySelected)
@@ -266,18 +263,6 @@ void CComponentEntityObject::SetHighlight(bool bHighlight)
}
}
-IRenderNode* CComponentEntityObject::GetEngineNode() const
-{
- // It's possible for AZ::Entities to have multiple IRenderNodes.
- // However, the editor currently expects a single IRenderNode per "editor object".
- // Therefore, return the highest priority handler.
- if (auto* renderNodeHandler = LmbrCentral::RenderNodeRequestBus::FindFirstHandler(m_entityId))
- {
- return renderNodeHandler->GetRenderNode();
- }
- return nullptr;
-}
-
void CComponentEntityObject::OnEntityNameChanged(const AZStd::string& name)
{
if (m_nameReentryGuard)
@@ -331,14 +316,6 @@ void CComponentEntityObject::DetachThis(bool /*bKeepPos*/)
}
}
-CBaseObject* CComponentEntityObject::GetLinkParent() const
-{
- AZ::EntityId parentId;
- EBUS_EVENT_ID_RESULT(parentId, m_entityId, AZ::TransformBus, GetParentId);
-
- return CComponentEntityObject::FindObjectForEntity(parentId);
-}
-
bool CComponentEntityObject::IsFrozen() const
{
return CheckFlags(OBJFLAG_FROZEN);
@@ -358,16 +335,6 @@ void CComponentEntityObject::OnEntityLockChanged(bool locked)
CEntityObject::SetFrozen(locked);
}
-void CComponentEntityObject::SetHidden(
- bool bHidden, [[maybe_unused]] uint64 hiddenId /*=CBaseObject::s_invalidHiddenID*/, [[maybe_unused]] bool bAnimated /*=false*/)
-{
- if (m_visibilityFlagReentryGuard)
- {
- EditorActionScope flagChange(m_visibilityFlagReentryGuard);
- AzToolsFramework::SetEntityVisibility(m_entityId, !bHidden);
- }
-}
-
void CComponentEntityObject::OnEntityVisibilityChanged(bool visible)
{
CEntityObject::SetHidden(!visible);
@@ -612,66 +579,6 @@ void CComponentEntityObject::OnTransformChanged([[maybe_unused]] const AZ::Trans
}
}
-int CComponentEntityObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags)
-{
- if (event == eMouseMove || event == eMouseLDown)
- {
- Vec3 pos;
- if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN)
- {
- pos = view->MapViewToCP(point);
- }
- else
- {
- // Snap to terrain.
- bool hitTerrain;
- pos = view->ViewToWorld(point, &hitTerrain);
- if (hitTerrain)
- {
- pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y);
- }
- pos = view->SnapToGrid(pos);
- }
-
- pos = view->SnapToGrid(pos);
- SetPos(pos);
-
- if (event == eMouseLDown)
- {
- return MOUSECREATE_OK;
- }
-
- return MOUSECREATE_CONTINUE;
- }
-
- return CBaseObject::MouseCreateCallback(view, event, point, flags);
-}
-
-bool CComponentEntityObject::HitHelperTest(HitContext& hc)
-{
- bool hit = CEntityObject::HitHelperTest(hc);
- if (!hit && m_entityId.IsValid())
- {
- // Pick against icon in screen space.
- if (IsEntityIconVisible())
- {
- const QPoint entityScreenPos = hc.view->WorldToView(GetWorldPos());
- const float screenPosX = static_cast(entityScreenPos.x());
- const float screenPosY = static_cast(entityScreenPos.y());
- const float iconRange = static_cast(s_kIconSize / 2);
-
- if ((hc.point2d.x() >= screenPosX - iconRange && hc.point2d.x() <= screenPosX + iconRange)
- && (hc.point2d.y() >= screenPosY - iconRange && hc.point2d.y() <= screenPosY + iconRange))
- {
- hc.dist = hc.raySrc.GetDistance(GetWorldPos());
- hc.iconHit = true;
- return true;
- }
- }
- }
- return hit;
-}
-
bool CComponentEntityObject::HitTest(HitContext& hc)
{
AZ_PROFILE_FUNCTION(Entity);
@@ -907,11 +814,6 @@ void CComponentEntityObject::DrawDefault(DisplayContext& dc, const QColor& label
DrawAccent(dc);
}
-IStatObj* CComponentEntityObject::GetIStatObj()
-{
- return nullptr;
-}
-
bool CComponentEntityObject::IsIsolated() const
{
return m_isIsolated;
@@ -952,11 +854,6 @@ void CComponentEntityObject::SetWorldPos(const Vec3& pos, int flags)
CEntityObject::SetWorldPos(pos, flags);
}
-void CComponentEntityObject::OnContextMenu(QMenu* /*pMenu*/)
-{
- // Deliberately bypass the base class implementation (CEntityObject::OnContextMenu()).
-}
-
void CComponentEntityObject::SetupEntityIcon()
{
bool hideIconInViewport = false;
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
index bb19f4d77e..7ccea8da84 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h
@@ -56,27 +56,21 @@ public:
bool SetScale(const Vec3& scale, int flags) override;
void InvalidateTM(int nWhyFlags) override;
void Display(DisplayContext& disp) override;
- void OnContextMenu(QMenu* pMenu) override;
- int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) override;
- bool HitHelperTest(HitContext& hc) override;
bool HitTest(HitContext& hc) override;
void GetLocalBounds(AABB& box) override;
void GetBoundBox(AABB& box) override;
void SetName(const QString& name) override;
bool IsFrozen() const override;
void SetFrozen(bool bFrozen) override;
- void SetHidden(bool bHidden, uint64 hiddenId = CBaseObject::s_invalidHiddenID, bool bAnimated = false) override;
void SetSelected(bool bSelect) override;
void SetHighlight(bool bHighlight) override;
- IRenderNode* GetEngineNode() const override;
void AttachChild(CBaseObject* child, bool bKeepPos = true) override;
void DetachAll(bool bKeepPos = true) override;
void DetachThis(bool bKeepPos = true) override;
- CBaseObject* GetLinkParent() const override;
XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode) override;
void DeleteEntity() override;
void DrawDefault(DisplayContext& dc, const QColor& labelColor = QColor(255, 255, 255)) override;
- IStatObj* GetIStatObj() override;
+
bool IsIsolated() const override;
bool IsSelected() const override;
bool IsSelectable() const override;
@@ -88,12 +82,6 @@ public:
// Component entity highlighting (accenting) is taken care of elsewhere
void DrawHighlight(DisplayContext& /*dc*/) override {};
- // Don't auto-clone children. Cloning happens in groups with reference fixups,
- // and individually selected objercts should be cloned as individuals.
- bool ShouldCloneChildren() const override { return false; }
-
-
-
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
index 64bd943d63..9342c17a37 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
@@ -447,7 +447,7 @@ void SandboxIntegrationManager::OnEndUndo(const char* label, bool changed)
// Add the undo only after we know it's got a legit change, we can't remove undos from the cry undo system so we do it here instead of OnBeginUndo
if (changed && CUndo::IsRecording())
{
- CUndo::Record(new CToolsApplicationUndoLink(label));
+ CUndo::Record(new CToolsApplicationUndoLink());
}
if (m_startedUndoRecordingNestingLevel)
{
@@ -498,13 +498,11 @@ void SandboxIntegrationManager::EntityParentChanged(
// before finally being saved, it will result in all of those layers saving, too.
AZ::EntityId oldAncestor = oldParentId;
- bool wasNotInLayer = false;
AZ::EntityId oldLayer;
do
{
if (!oldAncestor.IsValid())
{
- wasNotInLayer = true;
break;
}
@@ -530,13 +528,11 @@ void SandboxIntegrationManager::EntityParentChanged(
AZ::EntityId newAncestor = newParentId;
- bool isGoingToRootScene = false;
AZ::EntityId newLayer;
do
{
if (!newAncestor.IsValid())
{
- isGoingToRootScene = true;
break;
}
@@ -1400,7 +1396,7 @@ void SandboxIntegrationManager::ContextMenu_NewEntity()
{
worldPosition = AzToolsFramework::FindClosestPickIntersection(
view->GetViewportId(), AzFramework::ScreenPointFromVector2(m_contextMenuViewPoint), AzToolsFramework::EditorPickRayLength,
- GetDefaultEntityPlacementDistance());
+ AzToolsFramework::GetDefaultEntityPlacementDistance());
}
CreateNewEntityAtPosition(worldPosition);
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
index 9afa944438..7fe2881b92 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
@@ -306,8 +306,7 @@ class CToolsApplicationUndoLink
{
public:
- CToolsApplicationUndoLink(const char* description)
- : m_description(description)
+ CToolsApplicationUndoLink()
{
}
@@ -316,11 +315,6 @@ public:
return 0;
}
- QString GetDescription() override
- {
- return m_description.c_str();
- }
-
void Undo(bool bUndo = true) override
{
// Always run the undo even if the flag was set to false, that just means that undo wasn't expressly desired, but can be used in cases of canceling the current super undo.
@@ -354,8 +348,6 @@ public:
w->setFocus(Qt::OtherFocusReason);
}
}
-
- AZStd::string m_description;
};
#endif // CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_SANDBOXINTEGRATION_H
diff --git a/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake b/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake
index c1f1a531e8..1c6efbdf2c 100644
--- a/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake
+++ b/Code/Editor/Plugins/EditorCommon/editorcommon_files.cmake
@@ -13,7 +13,6 @@ set(FILES
EditorCommonAPI.h
ActionOutput.h
ActionOutput.cpp
- UiEditorDLLBus.h
DockTitleBarWidget.cpp
DockTitleBarWidget.h
SaveUtilities/AsyncSaveRunner.h
diff --git a/Code/Editor/TrackView/SoundKeyUIControls.cpp b/Code/Editor/TrackView/SoundKeyUIControls.cpp
index 8c18b58aed..f001937e82 100644
--- a/Code/Editor/TrackView/SoundKeyUIControls.cpp
+++ b/Code/Editor/TrackView/SoundKeyUIControls.cpp
@@ -108,18 +108,15 @@ void CSoundKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selec
{
ISoundKey soundKey;
keyHandle.GetKey(&soundKey);
- bool bChangedSoundFile = false;
if (pVar == mv_startTrigger.GetVar())
{
QString sFilename = mv_startTrigger;
- bChangedSoundFile = sFilename != soundKey.sStartTrigger.c_str();
soundKey.sStartTrigger = sFilename.toUtf8().data();
}
else if (pVar == mv_stopTrigger.GetVar())
{
QString sFilename = mv_stopTrigger;
- bChangedSoundFile = sFilename != soundKey.sStopTrigger.c_str();
soundKey.sStopTrigger = sFilename.toUtf8().data();
}
diff --git a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
index a14da0ae09..2907bebdb4 100644
--- a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
+++ b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
@@ -2233,7 +2233,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
if (pTrack && inRange)
{
- bool keyCreated = false;
if (bTryAddKeysInGroup && pNode->GetParentNode()) // Add keys in group
{
CTrackViewTrackBundle tracksInGroup = pNode->GetTracksByParam(pTrack->GetParameterType());
@@ -2248,8 +2247,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
pCurrTrack->CreateKey(keyTime);
undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
- keyCreated = true;
}
}
else // A compound track
@@ -2262,8 +2259,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
pSubTrack->CreateKey(keyTime);
undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
- keyCreated = true;
}
}
}
@@ -2276,15 +2271,13 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
pTrack->CreateKey(keyTime);
undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
-
- keyCreated = true;
}
}
else // A compound track
{
if (pTrack->GetValueType() == AnimValueType::RGB)
{
- keyCreated = CreateColorKey(pTrack, keyTime);
+ CreateColorKey(pTrack, keyTime);
}
else
{
@@ -2295,7 +2288,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
if (IsOkToAddKeyHere(pSubTrack, keyTime))
{
pSubTrack->CreateKey(keyTime);
- keyCreated = true;
}
}
undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId());
@@ -2617,7 +2609,6 @@ void CTrackViewDopeSheetBase::DrawSelectTrack(const Range& timeRange, QPainter*
void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc)
{
int x0 = TimeToClient(timeRange.start);
- float t0 = timeRange.start;
const QBrush prevBrush = painter->brush();
painter->setBrush(m_visibilityBrush);
@@ -2648,7 +2639,6 @@ void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* pa
painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient);
}
- t0 = time;
x0 = x;
}
int x = TimeToClient(timeRange.end);
diff --git a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
index 2fd46b0fc5..a17d92ac0a 100644
--- a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
+++ b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
@@ -198,7 +198,6 @@ void CTrackViewKeyPropertiesDlg::OnKeySelectionChanged(CTrackViewSequence* seque
m_wndProps->setEnabled(false);
m_wndTrackProps->setEnabled(false);
- bool bAssigned = false;
if (selectedKeys.GetKeyCount() > 0 && selectedKeys.AreAllKeysOfSameType())
{
CTrackViewTrack* pTrack = selectedKeys.GetKey(0).GetTrack();
@@ -215,12 +214,6 @@ void CTrackViewKeyPropertiesDlg::OnKeySelectionChanged(CTrackViewSequence* seque
{
AddVars(m_keyControls[i]);
}
-
- if (m_keyControls[i]->OnKeySelectionChange(selectedKeys))
- {
- bAssigned = true;
- }
-
break;
}
}
diff --git a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
index 352f2f3699..b80818db0d 100644
--- a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
+++ b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
@@ -57,7 +57,6 @@ protected:
}
int GetSize() override { return sizeof(*this); }
- QString GetDescription() override { return "UndoTrackViewSplineCtrl"; };
void Undo(bool bUndo) override
{
diff --git a/Code/Editor/TrackView/TrackViewUndo.h b/Code/Editor/TrackView/TrackViewUndo.h
index ff5964ec7f..7f3b4737a1 100644
--- a/Code/Editor/TrackView/TrackViewUndo.h
+++ b/Code/Editor/TrackView/TrackViewUndo.h
@@ -6,9 +6,6 @@
*
*/
-
-#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
-#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
#pragma once
#include "TrackViewTrack.h"
@@ -27,11 +24,10 @@ public:
CUndoComponentEntityTrackObject(CTrackViewTrack* track);
protected:
- virtual int GetSize() override { return sizeof(*this); }
- virtual QString GetDescription() override { return "Undo Component Entity Track Modify"; };
+ int GetSize() override { return sizeof(*this); }
- virtual void Undo(bool bUndo) override;
- virtual void Redo() override;
+ void Undo(bool bUndo) override;
+ void Redo() override;
private:
@@ -50,5 +46,3 @@ private:
CTrackViewTrackMemento m_undo;
CTrackViewTrackMemento m_redo;
};
-
-#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H
diff --git a/Code/Editor/Undo/IUndoObject.h b/Code/Editor/Undo/IUndoObject.h
index 47d853dd9a..3791b76d48 100644
--- a/Code/Editor/Undo/IUndoObject.h
+++ b/Code/Editor/Undo/IUndoObject.h
@@ -8,10 +8,6 @@
// Description : Interface for implementation of IUndo objects.
-
-
-#ifndef CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
-#define CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
#pragma once
#include
@@ -26,8 +22,6 @@ struct IUndoObject
virtual void Release() { delete this; };
//! Return size of this Undo object.
virtual int GetSize() = 0;
- //! Return description of this Undo object.
- virtual QString GetDescription() = 0;
//! Undo this object.
//! @param bUndo If true this operation called in response to Undo operation.
@@ -37,14 +31,5 @@ struct IUndoObject
virtual void Redo() = 0;
// Returns the name of undo object
- virtual QString GetObjectName(){ return QString(); };
-
- // Returns the name of related editor object.
- // Ex: For a undo action which would modify value for var "Emitter Strength" of emitter "Level.example",
- // this function will return emitter name "Level.example" - Vera, Confetti
- virtual QString GetEditorObjectName() { return QString(); };
-
- virtual bool IsChanged([[maybe_unused]] unsigned int& compareValue) const { return false; }
+ virtual QString GetObjectName(){ return QString(); }
};
-
-#endif // CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H
diff --git a/Code/Editor/Util/Image.cpp b/Code/Editor/Util/Image.cpp
index 773bfa93d2..8b26f54075 100644
--- a/Code/Editor/Util/Image.cpp
+++ b/Code/Editor/Util/Image.cpp
@@ -75,17 +75,16 @@ void CImageEx::ReverseUpDown()
}
uint32* pPixData = GetData();
- uint32* pReversePix = new uint32[GetWidth() * GetHeight()];
-
- for (int i = GetHeight() - 1, i2 = 0; i >= 0; i--, i2++)
+ const int height = GetHeight();
+ const int width = GetWidth();
+ for (int i = 0; i < height / 2; i++)
{
- for (int k = 0; k < GetWidth(); k++)
+ for (int j = 0; j < width; j++)
{
- pReversePix[i2 * GetWidth() + k] = pPixData[i * GetWidth() + k];
+ AZStd::swap(pPixData[i * width + j], pPixData[(height - 1 - i) * width + j]);
}
}
- Attach(pReversePix, GetWidth(), GetHeight());
}
void CImageEx::FillAlpha(unsigned char value)
diff --git a/Code/Editor/Util/ImageGif.cpp b/Code/Editor/Util/ImageGif.cpp
index 67c5911344..336584b959 100644
--- a/Code/Editor/Util/ImageGif.cpp
+++ b/Code/Editor/Util/ImageGif.cpp
@@ -197,11 +197,9 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
return false;
}
- int numcols;
unsigned char ch, ch1;
uint8* ptr1;
int i;
- short transparency = -1;
TImage outImageIndex;
@@ -246,7 +244,6 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
HasColormap = ((ch & COLORMAPMASK) ? true : false);
BitsPerPixel = (ch & 7) + 1;
- numcols = ColorMapSize = 1 << BitsPerPixel;
BitMask = ColorMapSize - 1;
Background = NEXTBYTE; /* background color... not used. */
@@ -290,10 +287,6 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
{
case GRAPHIC_EXT:
ch = NEXTBYTE;
- if (ptr[0] & 0x1)
- {
- transparency = ptr[3]; /* transparent color index */
- }
ptr += ch;
break;
case PLAINTEXT_EXT:
@@ -317,9 +310,6 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
}
}
- //if (transparency >= 0)
- //mfSet_transparency(transparency);
-
/* Now read in values from the image descriptor */
ch = NEXTBYTE;
diff --git a/Code/Editor/Util/KDTree.cpp b/Code/Editor/Util/KDTree.cpp
deleted file mode 100644
index af06a58c9f..0000000000
--- a/Code/Editor/Util/KDTree.cpp
+++ /dev/null
@@ -1,572 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "KDTree.h"
-
-#include
-
-class KDTreeNode
-{
-public:
- KDTreeNode()
- {
- pChildren[0] = nullptr;
- pChildren[1] = nullptr;
- pVertexIndices = nullptr;
- }
- ~KDTreeNode()
- {
- if (!IsLeaf())
- {
- if (pChildren[0])
- {
- delete pChildren[0];
- }
- if (pChildren[1])
- {
- delete pChildren[1];
- }
- }
- else if (GetVertexBufferSize() > 1)
- {
- if (pVertexIndices)
- {
- delete [] pVertexIndices;
- }
- }
- }
- uint32 GetVertexBufferSize() const
- {
- return nVertexIndexBufferSize;
- }
- float GetSplitPos() const
- {
- return splitPos;
- }
- void SetSplitPos(float pos)
- {
- splitPos = pos;
- }
- CKDTree::ESplitAxis GetSplitAxis() const
- {
- if (splitAxis == 0)
- {
- return CKDTree::eSA_X;
- }
- if (splitAxis == 1)
- {
- return CKDTree::eSA_Y;
- }
- if (splitAxis == 2)
- {
- return CKDTree::eSA_Z;
- }
- return CKDTree::eSA_Invalid;
- }
- void SetSplitAxis(const CKDTree::ESplitAxis& axis)
- {
- splitAxis = axis;
- }
- bool IsLeaf() const
- {
- return pChildren[0] == nullptr && pChildren[1] == nullptr;
- }
- KDTreeNode* GetChild(uint32 nIndex) const
- {
- if (nIndex > 1)
- {
- return nullptr;
- }
- return pChildren[nIndex];
- }
- void SetChild(uint32 nIndex, KDTreeNode* pNode)
- {
- if (nIndex > 1)
- {
- return;
- }
- if (pChildren[nIndex])
- {
- delete pChildren[nIndex];
- }
- pChildren[nIndex] = pNode;
- }
- const AABB& GetBoundBox()
- {
- return boundbox;
- }
- void SetBoundBox(const AABB& aabb)
- {
- boundbox = aabb;
- }
- void SetVertexIndexBuffer(std::vector& vertexInfos)
- {
- nVertexIndexBufferSize = (uint32)vertexInfos.size();
- if (nVertexIndexBufferSize == 0)
- {
- return;
- }
- if (nVertexIndexBufferSize == 1)
- {
- oneIndex = vertexInfos[0];
- }
- else
- {
- pVertexIndices = new uint32[nVertexIndexBufferSize];
- memcpy(pVertexIndices, &vertexInfos[0], sizeof(uint32) * nVertexIndexBufferSize);
- }
- }
- uint32 GetVertexIndex(uint32 nIndex) const
- {
- if (GetVertexBufferSize() == 1)
- {
- return oneIndex & 0x00FFFFFF;
- }
-
- return pVertexIndices[nIndex] & 0x00FFFFFF;
- }
- uint32 GetObjIndex(uint32 nIndex) const
- {
- if (GetVertexBufferSize() == 1)
- {
- return (oneIndex & 0xFF000000) >> 24;
- }
-
- return (pVertexIndices[nIndex] & 0xFF000000) >> 24;
- }
-
-private:
- union
- {
- float splitPos; // Interior
- uint32 oneIndex; // Leaf
- uint32* pVertexIndices; // Leaf : high 8bits - object index, low 24bits - vertex index
- };
- union
- {
- uint32 splitAxis; // Interior
- uint32 nVertexIndexBufferSize; // Leaf
- };
- AABB boundbox; // Both
- KDTreeNode* pChildren[2]; // Interior
-};
-
-CKDTree::ESplitAxis SearchForBestSplitAxis(const AABB& aabb)
-{
- float xsize = aabb.max.x - aabb.min.x;
- float ysize = aabb.max.y - aabb.min.y;
- float zsize = aabb.max.z - aabb.min.z;
-
- CKDTree::ESplitAxis axis;
- if (xsize > ysize && xsize > zsize)
- {
- axis = CKDTree::eSA_X;
- }
- else if (ysize > zsize && ysize > xsize)
- {
- axis = CKDTree::eSA_Y;
- }
- else
- {
- axis = CKDTree::eSA_Z;
- }
-
- return axis;
-}
-
-bool SearchForBestSplitPos(CKDTree::ESplitAxis axis, const std::vector& statObjList, std::vector& indices, float& outBestSplitPos)
-{
- if (axis != CKDTree::eSA_X && axis != CKDTree::eSA_Y && axis != CKDTree::eSA_Z)
- {
- return false;
- }
-
- outBestSplitPos = 0;
-
- int nSizeOfIndices = static_cast(indices.size());
-
- for (int i = 0; i < nSizeOfIndices; ++i)
- {
- int nObjIndex = (indices[i] & 0xFF000000) >> 24;
- int nVertexIndex = (indices[i] & 0xFFFFFF);
-
- const CKDTree::SStatObj* pObj = &statObjList[nObjIndex];
-
- const IIndexedMesh* pMesh = pObj->pStatObj->GetIndexedMesh();
- if (pMesh == nullptr)
- {
- continue;
- }
-
- IIndexedMesh::SMeshDescription meshDesc;
- pMesh->GetMeshDescription(meshDesc);
-
- if (meshDesc.m_pVerts)
- {
- outBestSplitPos += pObj->tm.TransformPoint(meshDesc.m_pVerts[nVertexIndex])[axis];
- }
- else if (meshDesc.m_pVertsF16)
- {
- outBestSplitPos += pObj->tm.TransformPoint(meshDesc.m_pVertsF16[nVertexIndex].ToVec3())[axis];
- }
- }
-
- outBestSplitPos /= nSizeOfIndices;
-
- return true;
-}
-
-struct SSplitInfo
-{
- AABB aboveBoundbox;
- std::vector aboveIndices;
- AABB belowBoundbox;
- std::vector belowIndices;
-};
-
-bool SplitNode(const std::vector& statObjList, const AABB& boundbox, const std::vector& indices, CKDTree::ESplitAxis splitAxis, float splitPos, SSplitInfo& outInfo)
-{
- if (splitAxis != CKDTree::eSA_X && splitAxis != CKDTree::eSA_Y && splitAxis != CKDTree::eSA_Z)
- {
- return false;
- }
-
- outInfo.aboveBoundbox = boundbox;
- outInfo.belowBoundbox = boundbox;
-
- outInfo.aboveBoundbox.max[splitAxis] = splitPos;
- outInfo.belowBoundbox.min[splitAxis] = splitPos;
-
- uint32 iIndexSize = (uint32)indices.size();
- outInfo.aboveIndices.reserve(iIndexSize);
- outInfo.belowIndices.reserve(iIndexSize);
-
- for (uint32 i = 0; i < iIndexSize; ++i)
- {
- int nObjIndex = (indices[i] & 0xFF000000) >> 24;
- int nVertexIndex = indices[i] & 0xFFFFFF;
-
- const CKDTree::SStatObj* pObj = &statObjList[nObjIndex];
-
- const IIndexedMesh* pMesh = pObj->pStatObj->GetIndexedMesh();
- if (pMesh == nullptr)
- {
- return false;
- }
-
- IIndexedMesh::SMeshDescription meshDesc;
- pMesh->GetMeshDescription(meshDesc);
-
- Vec3 vPos;
- if (meshDesc.m_pVerts)
- {
- vPos = pObj->tm.TransformPoint(meshDesc.m_pVerts[nVertexIndex]);
- }
- else if (meshDesc.m_pVertsF16)
- {
- vPos = pObj->tm.TransformPoint(meshDesc.m_pVertsF16[nVertexIndex].ToVec3());
- }
- else
- {
- continue;
- }
-
- if (vPos[splitAxis] < splitPos)
- {
- outInfo.aboveIndices.push_back(indices[i]);
- assert(outInfo.aboveBoundbox.IsContainPoint(vPos));
- }
- else
- {
- outInfo.belowIndices.push_back(indices[i]);
- assert(outInfo.belowBoundbox.IsContainPoint(vPos));
- }
- }
-
- return true;
-}
-
-CKDTree::CKDTree()
-{
- m_pRootNode = nullptr;
-}
-
-CKDTree::~CKDTree()
-{
- if (m_pRootNode)
- {
- delete m_pRootNode;
- }
-}
-
-bool CKDTree::Build(IStatObj* pStatObj)
-{
- if (pStatObj == nullptr)
- {
- return false;
- }
-
- m_StatObjectList.clear();
-
- if (pStatObj->GetIndexedMesh(true))
- {
- SStatObj rootObj;
- rootObj.tm.SetIdentity();
- rootObj.pStatObj = pStatObj;
- m_StatObjectList.push_back(rootObj);
- }
-
- ConstructStatObjList(pStatObj, Matrix34::CreateIdentity());
-
- AABB entireBoundBox;
- entireBoundBox.Reset();
-
- std::vector indices;
- for (int i = 0, iStatObjSize = static_cast(m_StatObjectList.size()); i < iStatObjSize; ++i)
- {
- IIndexedMesh* pMesh = m_StatObjectList[i].pStatObj->GetIndexedMesh(true);
- if (pMesh == nullptr)
- {
- continue;
- }
-
- IIndexedMesh::SMeshDescription meshDesc;
- pMesh->GetMeshDescription(meshDesc);
-
- for (int k = 0; k < meshDesc.m_nVertCount; ++k)
- {
- entireBoundBox.Add(m_StatObjectList[i].tm.TransformPoint(meshDesc.m_pVerts[k]));
- indices.push_back((i << 24) | k);
- }
- }
-
- if (m_pRootNode)
- {
- delete m_pRootNode;
- }
-
- m_pRootNode = new KDTreeNode;
- BuildRecursively(m_pRootNode, entireBoundBox, indices);
-
- return true;
-}
-
-void CKDTree::BuildRecursively(KDTreeNode* pNode, const AABB& boundbox, std::vector& indices) const
-{
- pNode->SetBoundBox(boundbox);
-
- if (indices.size() <= s_MinimumVertexSizeInLeafNode)
- {
- pNode->SetVertexIndexBuffer(indices);
- return;
- }
-
- ESplitAxis splitAxis = SearchForBestSplitAxis(boundbox);
- float splitPos(0);
- SearchForBestSplitPos(splitAxis, m_StatObjectList, indices, splitPos);
- pNode->SetSplitAxis(splitAxis);
- pNode->SetSplitPos(splitPos);
-
- SSplitInfo splitInfo;
- if (!SplitNode(m_StatObjectList, boundbox, indices, splitAxis, splitPos, splitInfo))
- {
- return;
- }
-
- if (splitInfo.aboveIndices.empty() || splitInfo.belowIndices.empty())
- {
- pNode->SetVertexIndexBuffer(indices);
- return;
- }
-
- KDTreeNode* pChild0 = new KDTreeNode;
- KDTreeNode* pChild1 = new KDTreeNode;
-
- pNode->SetChild(0, pChild0);
- pNode->SetChild(1, pChild1);
-
- BuildRecursively(pChild0, splitInfo.aboveBoundbox, splitInfo.aboveIndices);
- BuildRecursively(pChild1, splitInfo.belowBoundbox, splitInfo.belowIndices);
-}
-
-void CKDTree::ConstructStatObjList(IStatObj* pStatObj, const Matrix34& matParent)
-{
- if (pStatObj == nullptr)
- {
- return;
- }
- for (int i = 0, nChildObjSize(pStatObj->GetSubObjectCount()); i < nChildObjSize; ++i)
- {
- IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(i);
- SStatObj s;
- s.tm = matParent * pSubObj->localTM;
- if (pSubObj->pStatObj && pSubObj->pStatObj->GetIndexedMesh(true))
- {
- s.pStatObj = pSubObj->pStatObj;
- m_StatObjectList.push_back(s);
- }
- ConstructStatObjList(pSubObj->pStatObj, s.tm);
- }
-}
-
-bool CKDTree::FindNearestVertex(const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const
-{
- return FindNearestVertexRecursively(m_pRootNode, raySrc, rayDir, vVertexBoxSize, localCameraPos, outPos, vOutHitPosOnCube);
-}
-
-AABB GetNodeBoundBox(KDTreeNode* pNode, float vVertexBoxSize, const Vec3& localCameraPos)
-{
- AABB nodeAABB = pNode->GetBoundBox();
- float fScreenFactorMin = localCameraPos.GetDistance(nodeAABB.min);
- Vec3 vBoundBoxMin(fScreenFactorMin * vVertexBoxSize, fScreenFactorMin * vVertexBoxSize, fScreenFactorMin * vVertexBoxSize);
- float fScreenFactorMax = localCameraPos.GetDistance(nodeAABB.max);
- Vec3 vBoundBoxMax(fScreenFactorMax * vVertexBoxSize, fScreenFactorMax * vVertexBoxSize, fScreenFactorMax * vVertexBoxSize);
- nodeAABB.min -= vBoundBoxMin;
- nodeAABB.max += vBoundBoxMax;
- return nodeAABB;
-}
-
-bool CKDTree::FindNearestVertexRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const
-{
- if (!pNode)
- {
- return false;
- }
-
- Vec3 vHitPos;
- AABB nodeAABB = GetNodeBoundBox(pNode, vVertexBoxSize, localCameraPos);
- if (!pNode->GetBoundBox().IsContainPoint(raySrc) && !Intersect::Ray_AABB(raySrc, rayDir, nodeAABB, vHitPos))
- {
- return false;
- }
-
- if (pNode->IsLeaf())
- {
- if (m_StatObjectList.empty())
- {
- return false;
- }
-
- uint32 nVBuffSize = pNode->GetVertexBufferSize();
- if (nVBuffSize == 0)
- {
- return false;
- }
-
- float fNearestDist = 3e10f;
-
- for (uint32 i = 0; i < nVBuffSize; ++i)
- {
- uint32 nVertexIndex = pNode->GetVertexIndex(i);
- uint32 nObjIndex = pNode->GetObjIndex(i);
-
- assert(nObjIndex < m_StatObjectList.size());
-
- const SStatObj* pStatObjInfo = &(m_StatObjectList[nObjIndex]);
-
- IIndexedMesh* pMesh = m_StatObjectList[nObjIndex].pStatObj->GetIndexedMesh();
- if (pMesh == nullptr)
- {
- continue;
- }
-
- IIndexedMesh::SMeshDescription meshDesc;
- pMesh->GetMeshDescription(meshDesc);
-
- Vec3 vCandidatePos(0, 0, 0);
- if (meshDesc.m_pVerts)
- {
- vCandidatePos = pStatObjInfo->tm.TransformPoint(meshDesc.m_pVerts[nVertexIndex]);
- }
- else if (meshDesc.m_pVertsF16)
- {
- vCandidatePos = pStatObjInfo->tm.TransformPoint(meshDesc.m_pVertsF16[nVertexIndex].ToVec3());
- }
- else
- {
- continue;
- }
-
- float fScreenFactor = localCameraPos.GetDistance(vCandidatePos);
- Vec3 vBoundBox(fScreenFactor * vVertexBoxSize, fScreenFactor * vVertexBoxSize, fScreenFactor * vVertexBoxSize);
-
- Vec3 vHitPosOnCube;
- if (Intersect::Ray_AABB(raySrc, rayDir, AABB(vCandidatePos - vBoundBox, vCandidatePos + vBoundBox), vHitPosOnCube))
- {
- float fDist = vHitPosOnCube.GetDistance(raySrc);
- if (fDist < fNearestDist)
- {
- fNearestDist = fDist;
- outPos = vCandidatePos;
- vOutHitPosOnCube = vHitPosOnCube;
- }
- }
- }
-
- if (fNearestDist < 3e10f)
- {
- return true;
- }
-
- return false;
- }
-
- Vec3 vNearestPos0, vNearestPos0OnCube;
- Vec3 vNearestPos1, vNearestPos1OnCube;
- bool bFoundChild0 = FindNearestVertexRecursively(pNode->GetChild(0), raySrc, rayDir, vVertexBoxSize, localCameraPos, vNearestPos0, vNearestPos0OnCube);
- bool bFoundChild1 = FindNearestVertexRecursively(pNode->GetChild(1), raySrc, rayDir, vVertexBoxSize, localCameraPos, vNearestPos1, vNearestPos1OnCube);
-
- if (bFoundChild0 && bFoundChild1)
- {
- float fDist0 = raySrc.GetDistance(vNearestPos0OnCube);
- float fDist1 = raySrc.GetDistance(vNearestPos1OnCube);
- if (fDist0 < fDist1)
- {
- outPos = vNearestPos0;
- vOutHitPosOnCube = vNearestPos0OnCube;
- }
- else
- {
- outPos = vNearestPos1;
- vOutHitPosOnCube = vNearestPos1OnCube;
- }
- }
- else if (bFoundChild0 && !bFoundChild1)
- {
- outPos = vNearestPos0;
- vOutHitPosOnCube = vNearestPos0OnCube;
- }
- else if (!bFoundChild0 && bFoundChild1)
- {
- outPos = vNearestPos1;
- vOutHitPosOnCube = vNearestPos1OnCube;
- }
-
- return bFoundChild0 || bFoundChild1;
-}
-
-void CKDTree::GetPenetratedBoxes(const Vec3& raySrc, const Vec3& rayDir, std::vector& outBoxes)
-{
- GetPenetratedBoxesRecursively(m_pRootNode, raySrc, rayDir, outBoxes);
-}
-
-void CKDTree::GetPenetratedBoxesRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, std::vector& outBoxes)
-{
- Vec3 vHitPos;
- if (!pNode || (!pNode->GetBoundBox().IsContainPoint(raySrc) && !Intersect::Ray_AABB(raySrc, rayDir, pNode->GetBoundBox(), vHitPos)))
- {
- return;
- }
-
- outBoxes.push_back(pNode->GetBoundBox());
-
- GetPenetratedBoxesRecursively(pNode->GetChild(0), raySrc, rayDir, outBoxes);
- GetPenetratedBoxesRecursively(pNode->GetChild(1), raySrc, rayDir, outBoxes);
-}
diff --git a/Code/Editor/Util/KDTree.h b/Code/Editor/Util/KDTree.h
deleted file mode 100644
index df25a9ded7..0000000000
--- a/Code/Editor/Util/KDTree.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_UTIL_KDTREE_H
-#define CRYINCLUDE_EDITOR_UTIL_KDTREE_H
-#pragma once
-
-struct IStatObj;
-
-class KDTreeNode;
-
-class CKDTree
-{
-public:
-
- CKDTree();
- ~CKDTree();
-
- bool Build(IStatObj* pStatObj);
- bool FindNearestVertex(const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const;
- void GetPenetratedBoxes(const Vec3& raySrc, const Vec3& rayDir, std::vector& outBoxes);
-
- enum ESplitAxis
- {
- eSA_X = 0,
- eSA_Y,
- eSA_Z,
- eSA_Invalid
- };
-
- struct SStatObj
- {
- Matrix34 tm;
- IStatObj* pStatObj;
- };
-
-private:
-
- void BuildRecursively(KDTreeNode* pNode, const AABB& boundbox, std::vector& indices) const;
- bool FindNearestVertexRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const;
- void GetPenetratedBoxesRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, std::vector