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>
4 years ago
c2b2cc060a
WIP
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
fa0f2a1007
Fix unused warnings release ( #3677 )
...
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
d590a91fe7
Implemented helper method of QFileDialog::getSaveFileName to prevent user from saving files with invalid names.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
d91dbe3d92
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
...
JSON serialization of SC Editor Assets
4 years ago
9c7b55a31d
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
# Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
# Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
# Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
4 years ago
794c22c02e
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
2c6e105d27
restored view menu entries for dock widgets
...
renamed document tab functions
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
78f90f2707
updated ME and SMC main window classes to use AtomToolsDocumentMainWindow
...
separated common and document menu creation
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
c19c4af1e1
Gems/Atom
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
5997313bb5
AtomTools: moved more startup code from main cpp files into the base application class
...
Deleted a bunch of unused headers
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
5900b9a55f
Merge pull request #3314 from aws-lumberyard-dev/Atom/guthadam/atomtools_fix_multiple_app_instances
...
AtomTools: fix multiple material editor processes launching
4 years ago
dc6bfd8500
Merge pull request #3278 from aws-lumberyard-dev/Atom/guthadam/atomtools_wrapping_status_message_functions
...
AtomTools: added status message helper functions
4 years ago
4b3ce6738f
AtomTools: fix multiple material editor processes launching
...
Atom tools launch or check for the existence of a local server in order to prevent multiple application processes from running. These checks were being done far too late, after initialization and asset processing, leaving time for multiple processes to start before the server or checks. Zombie processes could start and run indefinitely without user interaction because the event loop was being entered despite the request to exit the application early.
These changes launch the server and checks immediately after the application object is constructed and exit before any other work is done if the application will not be run.
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
de9e991ccc
merge development
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
88121f3bb4
move JsonUtils to AzCore
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
036114a5a7
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
4 years ago
8ebaf10840
AtomTools: added status message helper functions
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
e6b5342c07
Gems/Atom
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
58f8b563d0
fix them all
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
ae4ad7dcac
fixed formatting
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
5044204839
Move JsonUtils.h for support of SC serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
364ac51502
Removed errors from unimplemented status functions
...
Updated shader management console trace messages
Renamed document rebuild function to reopen
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 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>
4 years ago
98ba833c78
Merge branch 'development' into Atom/guthadam/atomtools_refactor_main
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
2afd3b0959
Merge pull request #3052 from aws-lumberyard-dev/Atom/guthadam/atomtools_refactor_move_mainwindow_bus
...
AtomTools: move main window bus reflection to atom tools
4 years ago
fb1ee0f037
updated undo/redo messages
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
e0410385d5
AtomTools: fixing status bar messages
...
fixed problems with status bar messages not appearing
added status bar messages to shader management console
got rid of central widget variable and moved layout to atom tools window base class
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
3142367fa8
move main window bus reflection to atom tools
...
update python scripts
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
f1e8d37b86
holding pen for refactor
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
c772529b05
Merge branch 'development' into lawalfua/atomToolsMainWindow
4 years ago
1c181af94e
fixing problems with document tab management
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
d6f08151cc
removed unused headers and forwards
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
782e8465a4
removed StatusBarWidget class references
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
44a007547c
minor reformatting and removed unused headers from ME/SMCApplication.*
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
cb5e2c71ff
Typo fix2
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
32ba658e5e
Typo fix
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
e507236257
Addressing requests
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
19d79f1559
Merge branch 'development' into cmake/SPEC-2513_w4267
4 years ago
e8d685211b
CreateMenu/CreateTabBar
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
602da53ebe
Merging upstream
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
bf7512ebf4
Merge fix
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
f8c8181b0c
Bug fix (updating WindowComponent)
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
259bc3f85e
ATWindowNotificationBus and ATFactoryRequestBus
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
b594132a47
using command line parameter instead of member
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
f269d222b7
Fixing issues with shader management console startup
...
Updating test scripts
Synchronizing SMC and ME application classes
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
4eacd076da
Fixing ME and ATWindowNotificationBus
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
4 years ago
63ed78d267
status_bar
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
58ff2d8cab
AtomToolsMainWindowRequestBus
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
8eb9205711
AtomToolsMainWindow
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
b357cd0000
Merge pull request #2605 from aws-lumberyard-dev/Atom/guthadam/updating_atomtoolsappication_comments_and_formatting
...
AtomToolsApplication minor comments/formatting
5 years ago
2237439a0e
Material Editor: changing preset errors to warnings
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
4465b52de5
AtomToolsApplication minor comments/formatting
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
5 years ago
3cd40b151e
Merge remote-tracking branch 'upstream/development' into atomToolsApplication
5 years ago
97f9ac870d
Atom
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
4b0527c07f
Moving comments
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
5cb001dffd
More fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
06b3f7d964
Undoing adding reflect and adding target names to functions
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
e3083c7310
Reflect() fix
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
61038ccd03
Reflect()
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
4b97a416a3
GetCriticalAssetFilters()
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
7122f1b761
More refractoring
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
50f6ea8385
Using GetBuildTargetName() and other fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
4306b57230
More replacement with target name
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
78b07a0869
Fixing errors and streamlining more to base class
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
c1998d8d3c
AtomToolsApplication working with SMC
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
002a4a4a21
AtomToolsApplication working with MatEditor
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
706233f72c
Merge branch 'development' into cmake/SPEC-7179
5 years ago
7cb2f62d4b
Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication
...
Addition of a base AzQtToolsApplication class
5 years ago
0ffd151da6
Removing name setting in main.cpp for Atom tools
...
Signed-off-by: Dayo Lawal <lawalfua@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
6a0257b509
Reverting changes to AtomTools windows
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
9c63968833
Style fixing
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
92ead794fa
Removal of AzQtAppWindow
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
d36d1defab
Styling fixes and AzQtAppWindow changes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
27466154be
AzQtApplication Window
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
c86535f892
Styling fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
c63c42c7f4
Adding comments and changing QApplication org/app names
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
6f44393f3a
Moved logging to AzToolsFramework, working with MatEditor and SMC
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
b365f8bddf
Fixing problem with FileIO (exception in Environment.h)
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
df18e53ab4
WriteStartupLog() not implemented
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
f930185077
WriteStartupLog() implemented in base class (unresolved external)
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
ecede42501
Fixing logging and cleaning up AzQtApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
81c3414cd1
Adding back OnOutput to MaterialEditor for override
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
e45028c9d8
Fixing MaterialEditorApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
31a2ccb041
Addressing change requests for pull request
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
1cadf34dc3
Removing commenting and unnecessary header files
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
5872138671
AzQtApplication 2
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
d3d9b600f9
AzQtApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
5 years ago
975be6a480
MaterialEditor inheriting from ToolsApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.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
149863c527
Removed Amazon as Company for QSettings ( #1649 )
...
* Removed Amazon as Company for QSettings
Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
104e24519c
ATOM-15861 fixed material editor screen capture and test scripts
5 years ago
c29cfaafa4
ATOM-15287 Materials Disappear When Hot Reloading Parent Materials ( #1532 )
...
The issue was because the material wasn't compiled when creating the draw packet
5 years ago
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
5 years ago
5a276b11b0
Fixing includes
5 years ago
Qing Tao
Guthrie Adams
Steve Pham
Chris Galvan
Esteban Papp
carlitosan
Guthrie Adams
pappeste
Dayo Lawal
Dayo Lawal
Terry Michaels
mnaumov