3dec5d3b71
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder * Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file * Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message * Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and @ENGINEROOT@/EngineAssets/Editor path for engine tool assets * Updating references to Icons and other assets to account for moving the Engine and Editor folder under a single EngineAssets folder * Moving the Engine Settings Registry folder from Engine/Registry -> Registry * Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator * Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now * Fixed Atom Shader Preprocessing when running using an External Project * Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable * Updated the Install_Common.cmake ly_setup_others function to install the EngineAssets directory and the each of the Gem's Assets directory while maintaining the relative directory structure to the Engine Root Also updated the install step to install the Registry folder at the engine root * Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder * Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder * Updated the LyTestTools and C++ code to point that the new location of the AssetProcessorPlatformConfig.setreg file inside of the Registry folder * Renamed Test AssetProcessor*Config.ini files to have the .setreg extension * Converted the AssetProcessor test setreg files from ini format to json format using the SerializeContextTools convert-ini command * Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder * Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames * Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder * Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available * Updating the Install_common.cmake logic to copy any "Assets" folder to the install layout. The Script has also been updated to copy over the "Assets" folder in the Engine Root to the install layout instead of an "EngineAssets" folder * Updating References to EngineAssets source asset folder in code to be the Assets source folder * Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders * Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner * Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the output prefix, but instead place the source asset root into a subdirectory * Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory * Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
190 lines
14 KiB
XML
190 lines
14 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<tree>
|
|
<ignored path="Particles.Color.Emitter Strength2" />
|
|
<ignored path="Particles.Color.Random Lerp Strength" />
|
|
<ignored path="Particles.Color.Particle Age2" />
|
|
<ignored path="Particles.Color.Random Lerp Age" />
|
|
<ignored path="Particles.Color.Color" />
|
|
<ignored path="Particles.Color.Random Lerp Color" />
|
|
<panel name="Comment">
|
|
<item name="Comment" as="Emitter.Comment" />
|
|
</panel>
|
|
<panel name="Emitter">
|
|
<item name="Enabled" as="Emitter.Enabled" visibility="cpu,gpu"/>
|
|
<item name="Particle Type" as="Emitter.Emitter_Type" onUpdateCallback="resolveVisibility"/>
|
|
<item name="Relative Particle Movement" as="Movement.Move_Rel_Emitter" visibility="cpu" />
|
|
<item name="Parameter Inheritance" as="Emitter.Inheritance" advanced="yes" visibility="cpu"/>
|
|
<item name="Spawn Indirection" as="Emitter.Spawn_Indirection" advanced="yes" visibility="cpu"/>
|
|
<item name="Attach Type" as="Location.Attach_Type" advanced="yes" visibility="cpu"/>
|
|
<item name="Attach Form" as="Location.Attach_Form" advanced="yes" visibility="cpu"/>
|
|
<group name="Particle Numbers And Timing">
|
|
<item name="Count" as="Emitter.Count" visibility="cpu,gpu"/>
|
|
<item name="Maintain Density" as="Emitter.Maintain_Density" advanced="yes" visibility="cpu"/>
|
|
<item name="Continuous" as="Timing.Continuous" visibility="cpu,gpu"/>
|
|
<item name="Spawn Delay" as="Timing.Spawn_Delay" visibility="cpu"/>
|
|
<item name="Emitter Lifetime" as="Timing.Emitter_Life_Time" visibility="cpu,gpu"/>
|
|
<item name="Pulse Period" as="Timing.Pulse_Period" visibility="cpu,gpu"/>
|
|
</group>
|
|
<group name="Location">
|
|
<item name="Position Offset" as="Location.Position_Offset" visibility="cpu,gpu" />
|
|
<item name="Random Offset" as="Location.Random_Offset" visibility="cpu,gpu"/>
|
|
<item name="Offset Roundness" as="Location.Offset_Roundness" advanced="yes" visibility="cpu,gpu" />
|
|
<item name="Offset Inner Fraction" as="Location.Offset_Inner_Fraction" advanced="yes" visibility="cpu,gpu"/>
|
|
</group>
|
|
<group name="Angles">
|
|
<item name="Focus Angle" as="Angles.Focus_Angle" visibility="cpu"/>
|
|
<item name="Focus Azimuth" as="Angles.Focus_Azimuth" advanced="yes" visibility="cpu" />
|
|
<item name="Focus Camera Direction" as="Angles.Focus_Camera_Dir" advanced="yes" visibility="cpu"/>
|
|
<item name="Focus Gravity Direction" as="Angles.Focus_Gravity_Dir" advanced="yes" visibility="cpu"/>
|
|
<item name="Focus Rotates Emitter" as="Angles.Focus_Rotates_Emitter" advanced="yes" visibility="cpu"/>
|
|
<item name="Emit Offset Dir" as="Angles.Emit_Offset_Dir" advanced="yes" visibility="cpu" />
|
|
<item name="Emit Angle" as="Angles.Emit_Angle" visibility="cpu"/>
|
|
<item name="Orient To Velocity" as="Angles.Orient_To_Velocity" advanced="yes" visibility="cpu,gpu"/>
|
|
<item name="Curvature" as="Angles.Curvature" advanced="yes" visibility="cpu" />
|
|
</group>
|
|
</panel>
|
|
<panel name="Particles">
|
|
<item name="Particle Life Time" as="Timing.Particle_Life_Time" visibility="cpu,gpu"/>
|
|
<item name="Remain While Visible" as="Timing.Remain_While_Visible" visibility="cpu"/>
|
|
<item name="Facing" as="Angles.Facing" visibility="cpu"/>
|
|
<item name="Facing" as="Angles.Facing_Gpu" visibility="gpu"/>
|
|
<group name="Appearance">
|
|
<item name="Material" as="Appearance.Material" visibility="cpu"/>
|
|
<item name="Blend Type" as="Appearance.Blend_Type" visibility="cpu,gpu"/>
|
|
<item name="Sorting Method" as="Appearance.Sort_Method" visibility="gpu"/>
|
|
<item name="Sorting Convergence" as="Appearance.Sort_Convergance_Per_Frame" visibility="gpu"/>
|
|
<!-- <item name="Type" as="Particles.Source" /> -->
|
|
<item name="Texture" as="Appearance.Texture" visibility="cpu,gpu"/>
|
|
<item name="Texture Tiling" as="Appearance.Texture_Tiling" visibility="cpu,gpu"/>
|
|
<item name="Color" as="Appearance.Color" visibility="cpu,gpu">
|
|
<relation scr="Particles.Color" slot="alpha" dst="Appearance.Alpha" />
|
|
<relation scr="Particles.Color" slot="randomColor" dst="Appearance.Color.Color" />
|
|
<relation scr="Particles.Color" slot="randomColorEnable" dst="Appearance.Color.Random_Lerp_Color" />
|
|
<relation scr="Particles.Color" slot="randomAlpha" dst="Appearance.Alpha.Color" />
|
|
<relation scr="Particles.Color" slot="randomAlphaEnable" dst="Appearance.Alpha.Random_Lerp_Color" />
|
|
<relation scr="Particles.Color.Particle_Age" slot="alpha" dst="Appearance.Alpha.Particle_Age" />
|
|
<relation scr="Particles.Color.Particle_Age" slot="randomGradient" dst="Appearance.Color.Particle_Age2" />
|
|
<relation scr="Particles.Color.Particle_Age" slot="randomGradientEnable" dst="Appearance.Color.Random_Lerp_Age" />
|
|
<relation scr="Particles.Color.Particle_Age" slot="randomAlpha" dst="Appearance.Alpha.Particle_Age2" />
|
|
<relation scr="Particles.Color.Particle_Age" slot="randomAlphaEnable" dst="Appearance.Alpha.Random_Lerp_Age" />
|
|
<relation scr="Particles.Color.Emitter_Strength" slot="alpha" dst="Appearance.Alpha.Emitter_Strength" />
|
|
<relation scr="Particles.Color.Emitter_Strength" slot="randomGradient" dst="Appearance.Color.Emitter_Strength2" />
|
|
<relation scr="Particles.Color.Emitter_Strength" slot="randomGradientEnable" dst="Appearance.Color.Random_Lerp_Strength" />
|
|
<relation scr="Particles.Color.Emitter_Strength" slot="randomAlpha" dst="Appearance.Alpha.Emitter_Strength2" />
|
|
<relation scr="Particles.Color.Emitter_Strength" slot="randomAlphaEnable" dst="Appearance.Alpha.Random_Lerp_Strength" />
|
|
</item>
|
|
<item name="Alpha Clip" as="Appearance.Alpha_Clip" advanced="yes" visibility="cpu"/>
|
|
<item name="Tessellation" as="Appearance.Tessellation" advanced="yes" visibility="cpu"/>
|
|
<item name="Soft Particle" as="Appearance.Soft_Particle" advanced="yes" visibility="cpu"/>
|
|
<item name="Geometry" as="Appearance.Geometry" visibility="cpu"/>
|
|
<item name="Geometry in Pieces" as="Appearance.Geometry_Pieces" visibility="cpu"/>
|
|
<item name="Geometry No Offset" as="Appearance.No_Offset" advanced="yes" visibility="cpu"/>
|
|
</group>
|
|
<group name="Shape" visibility="cpu">
|
|
<item name="Octagonal Shape" as="Appearance.Octagonal_Shape" visibility="cpu"/>
|
|
</group>
|
|
</panel>
|
|
<panel name="Lighting">
|
|
<item name="Light Source" as="Lighting.Light_Source" visibility="cpu"/>
|
|
<item name="Diffuse Lighting" as="Lighting.Diffuse_Lighting" visibility="cpu,gpu"/>
|
|
<item name="Diffuse Backlighting" as="Lighting.Diffuse_Backlighting" visibility="cpu,gpu"/>
|
|
<item name="Emissive Lighting" as="Lighting.Emissive_Lighting" visibility="cpu,gpu"/>
|
|
<item name="Receive Shadows" as="Lighting.Receive_Shadows" advanced="yes" visibility="cpu"/>
|
|
<item name="Cast Shadows" as="Lighting.Cast_Shadows" advanced="yes" visibility="cpu"/>
|
|
<item name="Not Affected By Fog" as="Lighting.Not_Affected_By_Fog" advanced="yes" visibility="cpu"/>
|
|
<item name="Global Illumination" as="Lighting.Global_Illumination" advanced="yes" visibility="cpu"/>
|
|
</panel>
|
|
<panel name="Size">
|
|
<item name="Lock Aspect Ratio" as="Size.Maintain_Aspect_Ratio" onUpdateCallback="aspectFixRatio(Size.Maintain_Aspect_Ratio,Size.Size_X,Size.Size_Y,Size.Size_X]Size.Size_X.Random,Size.Size_Y]Size.Size_Y.Random,[Size.Size_X]Size.Size_X.Particle Age,[Size.Size_Y]Size.Size_Y.Particle Age,[Size.Size_X]Size.Size_X.Emitter Strength,[Size.Size_Y]Size.Size_Y.Emitter Strength)" visibility="cpu,gpu" />
|
|
<item name="Size X" as="Size.Size_X" onUpdateCallback="aspectFixRatio(Size.Maintain_Aspect_Ratio,Size.Size_X,Size.Size_Y)" visibility="cpu,gpu">
|
|
<item name="Random" as="Random" onUpdateCallback="keepFloatEqual([[Size.Maintain_Aspect_Ratio,Size.Size_X.Random,[[Size.Size_Y]Size.Size_Y.Random)" />
|
|
<item name="Particle Age" as="Particle Age" onUpdateCallback="keepCurveEqual([[Size.Maintain_Aspect_Ratio,Size.Size_X.Particle Age,[[Size.Size_Y]Size.Size_Y.Particle Age)" />
|
|
<item name="Emitter Strength" as="Emitter Strength" onUpdateCallback="keepCurveEqual([[Size.Maintain_Aspect_Ratio,Size.Size_X.Emitter Strength,[[Size.Size_Y]Size.Size_Y.Emitter Strength)" />
|
|
</item>
|
|
<item name="Size Y" as="Size.Size_Y" onUpdateCallback="aspectFixRatio(Size.Maintain_Aspect_Ratio,Size.Size_X,Size.Size_Y)" visibility="cpu,gpu">
|
|
<item name="Random" as="Random" onUpdateCallback="keepFloatEqual([[Size.Maintain_Aspect_Ratio,[[Size.Size_X]Size.Size_X.Random,Size.Size_Y.Random)" />
|
|
<item name="Particle Age" as="Particle Age" onUpdateCallback="keepCurveEqual([[Size.Maintain_Aspect_Ratio,[[Size.Size_X]Size.Size_X.Particle Age,Size.Size_Y.Particle Age)" />
|
|
<item name="Emitter Strength" as="Emitter Strength" onUpdateCallback="keepCurveEqual([[Size.Maintain_Aspect_Ratio,[[Size.Size_X]Size.Size_X.Emitter Strength,Size.Size_Y.Emitter Strength)" />
|
|
</item>
|
|
<item name="Pivot X" as="Size.Pivot_X" advanced="yes" visibility="cpu,gpu"/>
|
|
<item name="Pivot Y" as="Size.Pivot_Y" advanced="yes" visibility="cpu,gpu"/>
|
|
<item name="Stretch" as="Size.Stretch" advanced="yes" visibility="cpu,gpu"/>
|
|
<item name="Tail Length" as="Size.Tail_Length" advanced="yes" visibility="cpu"/>
|
|
<item name="Min Pixels" as="Size.Min_Pixels" advanced="yes" visibility="cpu"/>
|
|
<item name="Connection" as="Size.Connection" advanced="yes" visibility="cpu"/>
|
|
</panel>
|
|
<panel name="Rotation">
|
|
<item name="Init Angles" as="Rotation.Init_Angles" visibility="cpu,gpu"/>
|
|
<item name="Rotation Rate X" as="Rotation.Rotation_Rate_X" visibility="cpu,gpu"/>
|
|
<item name="Rotation Rate Y" as="Rotation.Rotation_Rate_Y" visibility="cpu,gpu"/>
|
|
<item name="Rotation Rate Z" as="Rotation.Rotation_Rate_Z" visibility="cpu,gpu"/>
|
|
<item name="Random Angles" as="Rotation.Random_Angles" visibility="cpu,gpu"/>
|
|
</panel>
|
|
<panel name="Movement">
|
|
<item name="Speed" as="Movement.Speed" visibility="cpu,gpu"/>
|
|
<item name="Acceleration" as="Movement.Acceleration" visibility="cpu,gpu"/>
|
|
<item name="Inherit Velocity" as="Movement.Inherit_Velocity" visibility="cpu,gpu"/>
|
|
<item name="Bind Emitter To Camera" as="Movement.Bind_Emitter_To_Camera" advanced="yes" visibility="cpu"/>
|
|
<item name="Space Loop" as="Movement.Space_Loop" advanced="yes" visibility="cpu"/>
|
|
<group name="External Forces">
|
|
<item name="Air Resistance" as="Movement.Air_Resistance" visibility="cpu,gpu"/>
|
|
<item name="Gravity Scale" as="Movement.Gravity_Scale" visibility="cpu,gpu"/>
|
|
<item name="Turbulence 3D Speed" as="Movement.Turbulence3DSpeed" advanced="yes" visibility="cpu,gpu"/>
|
|
<item name="Turbulence Size" as="Movement.Turbulence_Size" advanced="yes" visibility="cpu,gpu"/>
|
|
<item name="Turbulence Speed" as="Movement.Turbulence_Speed" advanced="yes" visibility="cpu,gpu"/>
|
|
<item name="Target Attraction" as="Movement.Target_Attraction" advanced="yes" visibility="cpu"/>
|
|
</group>
|
|
</panel>
|
|
<panel name="Collision">
|
|
<item name="Collide Depth Buffer" as="Collision.Collide_Depth_Buffer" advanced="yes" visibility="gpu"/>
|
|
<item name="Physics Type" as="Collision.Physics_Type" visibility="cpu"/>
|
|
<item name="Collide Terrain" as="Collision.Collide_Terrain" visibility="cpu"/>
|
|
<item name="Collide Static Objects" as="Collision.Collide_Static_Objects" visibility="cpu"/>
|
|
<item name="Collide Dynamic Objects" as="Collision.Collide_Dynamic_Objects" visibility="cpu"/>
|
|
<item name="Die On Collide" as="Collision.Final_Collision" visibility="cpu,gpu"/>
|
|
<item name="Use Self Collision" as="Collision.Use_Self_Collision" physics="azphysics" />
|
|
<item name="Collision Layer" as="Collision.Collision_Layer" visibility="cpu,gpu" physics="azphysics" />
|
|
<item name="Collides With" as="Collision.Collision_Group" visibility="cpu,gpu" physics="azphysics" />
|
|
<item name="Physics Material" as="Collision.Physics_Material" advanced="yes" visibility="cpu" physics="azphysics" />
|
|
<item name="Max Collision Events" as="Collision.Max_Collision_Events" visibility="cpu"/>
|
|
<item name="Bounciness" as="Collision.Elasticity" visibility="cpu,gpu"/>
|
|
<item name="Collision Fraction" as="Collision.Collision_Fraction" advanced="yes" visibility="cpu"/>
|
|
<item name="Collision Cutoff Distance" as="Collision.Collision_Cutoff_Distance" advanced="yes" visibility="cpu"/>
|
|
<item name="Surface Type" as="Collision.Surface_Type" advanced="yes" visibility="cpu" physics="cryphysics" />
|
|
<item name="Dynamic Friction" as="Collision.Dynamic_Friction" advanced="yes" visibility="cpu"/>
|
|
<item name="Thickness" as="Collision.Thickness" advanced="yes" visibility="cpu,gpu"/>
|
|
<item name="Density" as="Collision.Density" advanced="yes" visibility="cpu"/>
|
|
</panel>
|
|
<panel name="Visibility">
|
|
<item name="View Distance Adjust" as="Visibility.View_Distance_Adjust" visibility="cpu"/>
|
|
<item name="Camera Non Facing Fade" as="Visibility.Camera_Non_Facing_Fade" advanced="yes" visibility="cpu"/>
|
|
<item name="Sort Offset" as="Visibility.Sort_Offset" visibility="cpu"/>
|
|
<item name="Sort Bounds Scale" as="Visibility.Sort_Bounds_Scale" advanced="yes" visibility="cpu"/>
|
|
<item name="Draw Near" as="Visibility.Draw_Near" advanced="yes" visibility="cpu"/>
|
|
<item name="Draw On Top" as="Visibility.Draw_On_Top" advanced="yes" visibility="cpu"/>
|
|
<item name="Visible Indoors" as="Visibility.Visible_Indoors" advanced="yes" visibility="cpu"/>
|
|
<item name="Visible Underwater" as="Visibility.Visible_Underwater" advanced="yes" visibility="cpu"/>
|
|
</panel>
|
|
<panel name="Advanced">
|
|
<item name="Force Generation" as="Advanced.Force_Generation" visibility="cpu"/>
|
|
<item name="Fill Rate Cost" as="Advanced.Fill_Rate_Cost" visibility="cpu"/>
|
|
<item name="Heat Scale" as="Advanced.Heat_Scale" visibility="cpu"/>
|
|
<item name="Sort Quality" as="Advanced.Sort_Quality" visibility="cpu"/>
|
|
<item name="Half Res" as="Advanced.Half_Res" visibility="cpu,gpu"/>
|
|
<item name="Streamable" as="Advanced.Streamable" visibility="cpu"/>
|
|
<item name="Volume Fog" as="Advanced.Volume_Fog" visibility="cpu"/>
|
|
<item name="Volume Thicknesss" as="Advanced.Volume_Thickness" visibility="cpu"/>
|
|
</panel>
|
|
<panel name="Configuration">
|
|
<item name="Config Min" as="Configuration.Config_Min" visibility="cpu"/>
|
|
<item name="Config Max" as="Configuration.Config_Max" visibility="cpu"/>
|
|
<item name="Platforms" as="Configuration.Platforms" visibility="cpu"/>
|
|
</panel>
|
|
<panel name="Audio">
|
|
<item name="Start Trigger" as="Audio.Start_Trigger" visibility="cpu"/>
|
|
<item name="Stop Trigger" as="Audio.Stop_Trigger" visibility="cpu"/>
|
|
<item name="Sound FXParam" as="Audio.Sound_FXParam" visibility="cpu"/>
|
|
<item name="Sound Control Time" as="Audio.Sound_Control_Time" visibility="cpu"/>
|
|
</panel>
|
|
</tree>
|