18652fabea
fix other configurtion typos to be configuration
...
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
46ad2f684b
fixes the configurtion typo to be configuration instead and increases the test timeout to 60 sec from 30 sec
...
Signed-off-by: jromnoa <jromnoa@amazon.com>
4 years ago
4c9f456ea5
Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
# Conflicts:
# Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp
4 years ago
f44169f7fa
Cleanup SerializeContext.h pt.1 ( #4264 )
...
* Remove AssetSerializer inclusion from SerializeContext header
Moved a few Reflect methods to new cpp files.
In addition, some preparations for further header dependency reductions.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix smoke test lua failures.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Windows build fixes.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Missing license headers
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix white-space issues.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix inheritance list wrapping broken by older clang-format
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
ebcf3723f9
Material Component: Can set material property overrides on default materials
...
No longer need to assign material overrides to set/edit properties in UI or script
Material component will load and use the default material for a slot if no override is assigned
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
0bcf275ed2
updated/removed platform specific files
...
fixed warning message
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
88ee878025
deleting platform specific code from ME and SMC
...
fixed ME viewport
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
45c0430f96
Merge branch 'Atom/guthadam/atomtools_updating_cmake_config' into Atom/guthadam/atomtools_updating_cmake_config_plus_bootstrap
4 years ago
d9cbc97ec0
ATOM-16063 Remove SetShaderResourceGroupCallback in scene and update scene srg handling ( #3969 )
...
ATOM-16273 Compiling SceneSRG before updating it can cause a gpu crash
Changes include:
1. Removed Scene::SetShaderResourceGroupCallback() function and clean up code which use this function.
2. Moved SceneTimeSrg.azsli to RPI's DefaultSceneSrg folder and setup the constants in RPI::Scene
3. Add AZ::Event for Scene's update srg event which features and update scene srg at proper place
4. UpdateTransformServcie FP to use PrepareSceneSrg event handler.
5. Clean up shaders and srgs used in project templates.
Signed-off-by: Qing Tao <qingtao@amazon.com>
5 years ago
c2b2cc060a
WIP
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
de9e991ccc
merge development
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
88121f3bb4
move JsonUtils to AzCore
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
5044204839
Move JsonUtils.h for support of SC serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
30fee96c43
Moved material editor document system buses and system components to atom tools framework
...
Renamed document related buses and components to have generic names
Added a base document class with default implementation from which other application specific documents can be derived to work with the document system
Added document factory function registration to the document system request bus so that each application can specify the type of document it creates
Updated all comments and messaging to only refer to documents, not materials or material documents
Updated material editor and shader management console to conform to the new buses
This will provide a first pass of a common interface for a document management system that can be shared by multiple applications
Corrected status bar message copy and paste errors
Updated all test scripts to use the new buses
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
2237439a0e
Material Editor: changing preset errors to warnings
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
1f9b284de2
Merge branch 'development' into cmake/SPEC-7179
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
# Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
# Code/Editor/Plugins/EditorCommon/stdafx.cpp
# Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
# Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
# Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
# Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
# Code/Tools/AssetProcessor/native/precompiled.h
# Code/Tools/Standalone/StandaloneTools_precompiled.h
# Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
# Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
# Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
# Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
# Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
# Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
# Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
# Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
# Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
# Gems/Blast/Code/Source/StdAfx.cpp
# Gems/Camera/Code/Source/Camera_precompiled.h
# Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
# Gems/FastNoise/Code/Source/FastNoise_precompiled.h
# Gems/Gestures/Code/Source/Gestures_precompiled.h
# Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
# Gems/GraphCanvas/Code/precompiled.h
# Gems/ImGui/Code/Source/ImGui_precompiled.h
# Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
# Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
# Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
# Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
# Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
# Gems/LyShine/Code/Source/LyShine_precompiled.h
# Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
# Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
# Gems/Maestro/Code/Source/Maestro_precompiled.h
# Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
# Gems/Metastream/Code/Source/Metastream_precompiled.h
# Gems/Microphone/Code/Source/Microphone_precompiled.h
# Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
# Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
# Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
# Gems/PhysX/Code/Source/PhysX_precompiled.h
# Gems/PhysX/Code/physx_unsupported_files.cmake
# Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
# Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
# Gems/ScriptCanvas/Code/Editor/precompiled.h
# Gems/ScriptCanvas/Code/Source/precompiled.h
# Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
# Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
# Gems/ScriptEvents/Code/Source/precompiled.h
# Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
# Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
# Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
# Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
# Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
# Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
# Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
# Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
# Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
# Gems/Twitch/Code/Source/Twitch_precompiled.h
# Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
5 years ago
38261d0800
Shorten copyright headers by splitting into 2 lines ( #2213 )
...
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines
Signed-off-by: Steve Pham <spham@amazon.com>
5 years ago
7c9653087d
Builds Windows nounity and unity
...
Builds Linux nounity and unity
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com>
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com>
5 years ago
104e24519c
ATOM-15861 fixed material editor screen capture and test scripts
5 years ago
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
5 years ago
5a276b11b0
Fixing includes
5 years ago
4de1d90994
[ATOM-15292] Camera no longer resets when typing something
5 years ago
d8b74110ff
Merge branch 'main' into transform-float-scale
5 years ago
78451c5898
PR feedback
5 years ago
6ee8c6daa5
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
5 years ago
7def4741cd
merge from main
5 years ago
5437843390
Created material editor settings dialog
...
Activated settings menu option
Moved viewport camera controller initialization before viewport settings restoration
5 years ago
9de3071e21
Merge branch 'main' into Atom/guthadam/ATOM-15486
5 years ago
dfd0cbb0fd
Material Editor camera controller zoom respects viewport boundary
5 years ago
e80de63d55
ATOM-15486 Saving material editor user settings
...
https://jira.agscollab.com/browse/ATOM-15486
5 years ago
88e654cd17
Merge main
5 years ago
3ae4bb22df
Adding tone mapping option to Material Editor
5 years ago
5e4094b258
Revamped AzFramework::Scene ( #332 )
...
Updated AzFramework::Scene to allow it to serve as the one-stop location for localized singletons. Localized singletons in this case are instance that can only occur once in an environment but multiple times within an application. As an example, this allows settings up a single camera per viewport for instance.
Highlights of changes:
Replaced the original ebuses with interfaces and events for easy of use and performance.
Removed the Entity Context specific code and moved that to new locations within the Entity Context itself.
Allowed basic inheritance. If a subsystem isn't found in a scene the parent can optionally be searched.
Scenes can enter a zombie state and avoid immediately being deleted. This is needed for situations where subsystems can't be destroyed until async calls have been completed.
5 years ago
b113f09a71
first pass of changing transform to use float for scale internally rather than Vector3
5 years ago
fb2ca8e02c
Fix Editor crash in test teardown calling set_view_pane_layout
...
If Atom isn't initialized and able to produce a ViewportContext, the Editor would crash. This attempts to make the initialization fail a bit more gracefully and fixes the crash in the cases I've tested.
5 years ago
8fead27c45
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
...
Remove option from presets
Updated code to select current default options
Will data drive default options with editor settings or settings registry in upcoming tasks
https://jira.agscollab.com/browse/ATOM-13950
5 years ago
b8b90c42e2
Merge pull request #52 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15236
...
[ATOM-15236] Fixing camera panning and zooming
5 years ago
fa7f61cf0d
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
...
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
5 years ago
28ccb5d381
Fixing camera panning and zooming
5 years ago
8469c9ca0a
Integrating github/staging through commit 5f214be
5 years ago
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
5 years ago
75dc720198
Integrating latest 47acbe8
5 years ago
a10351f38d
Initial commit
5 years ago
jromnoa
Guthrie Adams
Artur K
Qing Tao
chcurran
Esteban Papp
Steve Pham
mnaumov
greerdv
AMZN-koppersr
nvsickle
AMZN-mnaumov
qingtao
alexpete