Guthrie Adams
f1e8d37b86
holding pen for refactor
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams
c772529b05
Merge branch 'development' into lawalfua/atomToolsMainWindow
4 years ago
Guthrie Adams
1c181af94e
fixing problems with document tab management
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams
d6f08151cc
removed unused headers and forwards
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams
782e8465a4
removed StatusBarWidget class references
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams
44a007547c
minor reformatting and removed unused headers from ME/SMCApplication.*
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Dayo Lawal
cb5e2c71ff
Typo fix2
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
32ba658e5e
Typo fix
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
e507236257
Addressing requests
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Esteban Papp
19d79f1559
Merge branch 'development' into cmake/SPEC-2513_w4267
4 years ago
Dayo Lawal
e8d685211b
CreateMenu/CreateTabBar
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
602da53ebe
Merging upstream
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
bf7512ebf4
Merge fix
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
f8c8181b0c
Bug fix (updating WindowComponent)
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
259bc3f85e
ATWindowNotificationBus and ATFactoryRequestBus
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Guthrie Adams
b594132a47
using command line parameter instead of member
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams
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
Dayo Lawal
4eacd076da
Fixing ME and ATWindowNotificationBus
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
2ed07c2a6a
delete MEWindowsRequestBus
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Esteban Papp
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
4 years ago
Dayo Lawal
63ed78d267
status_bar
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
58ff2d8cab
AtomToolsMainWindowRequestBus
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
8eb9205711
AtomToolsMainWindow
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Guthrie Adams
b357cd0000
Merge pull request #2605 from aws-lumberyard-dev/Atom/guthadam/updating_atomtoolsappication_comments_and_formatting
...
AtomToolsApplication minor comments/formatting
4 years ago
Guthrie Adams
2237439a0e
Material Editor: changing preset errors to warnings
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Guthrie Adams
4465b52de5
AtomToolsApplication minor comments/formatting
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Dayo Lawal
3cd40b151e
Merge remote-tracking branch 'upstream/development' into atomToolsApplication
4 years ago
pappeste
97f9ac870d
Atom
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Dayo Lawal
4b0527c07f
Moving comments
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
5cb001dffd
More fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
06b3f7d964
Undoing adding reflect and adding target names to functions
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
e3083c7310
Reflect() fix
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
61038ccd03
Reflect()
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
4b97a416a3
GetCriticalAssetFilters()
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
7122f1b761
More refractoring
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
50f6ea8385
Using GetBuildTargetName() and other fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
4306b57230
More replacement with target name
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
78b07a0869
Fixing errors and streamlining more to base class
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
c1998d8d3c
AtomToolsApplication working with SMC
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
002a4a4a21
AtomToolsApplication working with MatEditor
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Esteban Papp
706233f72c
Merge branch 'development' into cmake/SPEC-7179
4 years ago
Guthrie Adams
7cb2f62d4b
Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication
...
Addition of a base AzQtToolsApplication class
4 years ago
Dayo Lawal
0ffd151da6
Removing name setting in main.cpp for Atom tools
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Esteban Papp
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
4 years ago
Steve Pham
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>
4 years ago
Esteban Papp
7c9653087d
Builds Windows nounity and unity
...
Builds Linux nounity and unity
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Dayo Lawal
6a0257b509
Reverting changes to AtomTools windows
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
9c63968833
Style fixing
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
92ead794fa
Removal of AzQtAppWindow
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
d36d1defab
Styling fixes and AzQtAppWindow changes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
27466154be
AzQtApplication Window
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
c86535f892
Styling fixes
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
c63c42c7f4
Adding comments and changing QApplication org/app names
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
6f44393f3a
Moved logging to AzToolsFramework, working with MatEditor and SMC
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
b365f8bddf
Fixing problem with FileIO (exception in Environment.h)
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
df18e53ab4
WriteStartupLog() not implemented
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
f930185077
WriteStartupLog() implemented in base class (unresolved external)
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
ecede42501
Fixing logging and cleaning up AzQtApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
81c3414cd1
Adding back OnOutput to MaterialEditor for override
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
e45028c9d8
Fixing MaterialEditorApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
31a2ccb041
Addressing change requests for pull request
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
1cadf34dc3
Removing commenting and unnecessary header files
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
5872138671
AzQtApplication 2
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
d3d9b600f9
AzQtApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Dayo Lawal
975be6a480
MaterialEditor inheriting from ToolsApplication
...
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
4 years ago
Steve Pham
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
Terry Michaels
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
guthadam
104e24519c
ATOM-15861 fixed material editor screen capture and test scripts
5 years ago
Qing Tao
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
Steve Pham
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
5 years ago
mnaumov
5a276b11b0
Fixing includes
5 years ago
mnaumov
4de1d90994
[ATOM-15292] Camera no longer resets when typing something
5 years ago
guthadam
7e231c8e36
LYN-4547 prepending O3DE to the material editor application name
5 years ago
guthadam
1339d453fc
Adding PAL implementation for Linux
5 years ago
guthadam
af42705bc9
Fixing linux build
5 years ago
guthadam
6675d06b67
Fixing linux build
5 years ago
guthadam
0fbeec7f17
Enabling linux compilation
5 years ago
guthadam
e85b5a8c48
Fixing material editor startup and critical asset issues
...
Added builder and tool aliases
Added dependency to Atom Bridge
5 years ago
guthadam
d67628d88c
ATOM-15701 changed material inspector highlight color
5 years ago
Chris Santora
de4e6957e8
Made a bunch of display name and description updates to core material types.
...
- Renamed "Details" group to "Overview".
- Renamed "UV Names" group to "UV Sets".
- Renamed "General" group to "General Settings".
- Renamed "Parallax" group to "Displacement".
- Renamed "Texture Map" properties to just "Texture". In cases where a specific type of texture is mentioned like "roughness texture map" I called this "roughness map" (which is more common according to google).
- Renamed "Heightmap" to "Height map" (which is more common according to google).
ATOM-14002 [Material Editor] Revisit user facing organization and layout of material types
5 years ago
guthadam
c2822a4063
ATOM-15649 sorting material types in create material dialog
5 years ago
greerdv
d8b74110ff
Merge branch 'main' into transform-float-scale
5 years ago
AMZN-mnaumov
5788c379bb
Merge pull request #890 from aws-lumberyard-dev/Atom/mnaumov/Atom-15538
...
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
5 years ago
mnaumov
78451c5898
PR feedback
5 years ago
greerdv
42c5801c52
Merge branch 'main' into transform-float-scale
5 years ago
AMZN-mnaumov
26a1b96380
Merge pull request #888 from aws-lumberyard-dev/Atom/mnaumov/Atom-15463
...
[ATOM-15463] Adjusting combo box width
5 years ago
guthadam
a05b131cc8
ATOM-15612 fix material editor crash when group doesn't exist
5 years ago
greerdv
945f55378e
merge from main
5 years ago
mnaumov
6ee8c6daa5
[ATOM-15538] Material Editor camera zoom speed adjusts to model size
5 years ago
mnaumov
5c18c6ee47
Adjusting combo box width
5 years ago
greerdv
7def4741cd
merge from main
5 years ago
Chris Santora
70c8ef99ef
Updates in response to code review, from gadams3.
...
Cleaned up code around MaterialFunctor's QueryMaterialPropertyMetadata and QueryMaterialPropertyGroupMetadata.
Removed unnecessary "groupHeader->setObjectName(...)"
Simplified code in MaterialInspector::OnDocumentPropertyGroupVisibilityChanged.
5 years ago
Chris Santora
e429c8e06a
Fixed issues after merging latest main, as well as some edge cases I didn't notice before.
...
The structure of InspectorWidget::m_groups changed, so I had to update my new code accordingly.
Updated the InspectorWidget::m_groups code a bit to be more readable.
Discovered the initial property group visiblity state wasn't being set correctly when a material was first opened, so groups weren't initially hidden when they should have been. This had to be fixed in different ways for MaterialEditor's inspector and MaterialComponent's inspector.
ATOM-14688 Disable Individual Layers
5 years ago
Chris Santora
37a1b77d50
Merge branch 'main' into Atom/santorac/NewLayeringWorkflow
5 years ago
Chris Santora
53188a12da
Made StandardMultilayerPBR hide a layer's property groups when that layer is disabled.
...
ATOM-14688 Disable Individual Layers
- Added new SetMaterialPropertyGroupVisibility functions to the material functors.
- Updated the MaterialFunctor::EditorContext to include parameters for handling material property group metadata.
- Updated the material inspector(s) to apply the property group visiblity changes from the material functor, to hide or show the property groups.
- Moved some code from MaterialPropertyDescriptor.h/cpp to a new MaterialDynamicMetadata.h/cpp, since these aren't really related to the MaterialPropertyDescriptor code. It's more for material functors to use.
- Also fixed the casing for the "GetMaterialPropertyValue_Image" lua function, since I was already in this code (ATOM-14793 "Fix Inconsistent Casing For LuaMaterialFunctorRuntimeContext")
Tested in MaterialEditor and in in the main Editor's MaterialComponent property override inspector.
5 years ago
Guthrie Adams
e915133bbf
Merge pull request #687 from aws-lumberyard-dev/Atom/guthadam/ATOM-15128
...
ATOM-15128 replacing material editor icon
5 years ago
guthadam
cf0d3af78e
ATOM-15128 replacing material editor icon
5 years ago
guthadam
9725c9beab
Recording/restoring viewport settings group expansion
5 years ago
guthadam
5437843390
Created material editor settings dialog
...
Activated settings menu option
Moved viewport camera controller initialization before viewport settings restoration
5 years ago
guthadam
1dda6dabe4
Added support for expanding/collapsing material inspector groups by name
...
Saving/restoring material inspector group expansion state
5 years ago
guthadam
9de3071e21
Merge branch 'main' into Atom/guthadam/ATOM-15486
5 years ago
guthadam
e9165ed911
Added save state keys to most of the RPEs in the material editor and component to save expand/collapse state
...
Saving main window fancy docking state so all of the dock widgets save/restore visibly and positioning
Added window decoration wrapper inside material editor main window for saving/restoring window position, size, state
Added object names to several QT widgets so that their state could be captured and restored
5 years ago
AMZN-mnaumov
1743d9631b
Merge pull request #634 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14850
...
[ATOM-14850] Re-adding 'Create Material' to folder context menu
5 years ago
mnaumov
ff75a39526
Restoring 'Create New Material' to folder context menu
5 years ago
mnaumov
dfd0cbb0fd
Material Editor camera controller zoom respects viewport boundary
5 years ago
guthadam
e80de63d55
ATOM-15486 Saving material editor user settings
...
https://jira.agscollab.com/browse/ATOM-15486
5 years ago
guthadam
6b1f0c53a5
Injecting --activateWindow every time new process sends command line
...
Updated comments
5 years ago
guthadam
80f692118b
ATOM-15451 always bring material editor and foreground when launching
...
Bus, command line option, and handler to activate material editor window
Made sure that material editor action in Ly tools menu is not checked/checkable
Ly editor pushes command line option to use the same RHI
https://jira.agscollab.com/browse/LYN-2610
https://jira.agscollab.com/browse/ATOM-15451
https://jira.agscollab.com/browse/ATOM-13742
5 years ago
Guthrie Adams
eb25e0bd33
Merge pull request #504 from aws-lumberyard-dev/Atom/guthadam/ATOM-15439
...
ATOM-15439 Implement basic local socket and server for IPC in material editor and other tools
5 years ago
guthadam
9d0f9e9e3a
ATOM-14065 fix problems with material editor details group property descriptions
...
Moved the code that automatically appended a script variable name to a property description out of the dynamic property class and into the material property conversion utility functions.
Added proper descriptions for the material type and parent material placeholder properties
https://jira.agscollab.com/browse/ATOM-14065
5 years ago
guthadam
f58f8805be
Removed bad test code
5 years ago
guthadam
fae33e9235
ATOM-15439 Implement basic local socket and server for IPC in material editor and other tools
...
This replaces grid hub usage in the material editor. It allows material editor and other tools to intercommunicate on the local host. This will allow enforcing that there is only one instance of the material editor running. Opening a second instance will forward command line options to the first instance running a local server.
https://jira.agscollab.com/browse/ATOM-15439
https://jira.agscollab.com/browse/ATOM-13742
5 years ago
mnaumov
6a0df12de2
PR feedback
5 years ago
mnaumov
88e654cd17
Merge main
5 years ago
mnaumov
3ae4bb22df
Adding tone mapping option to Material Editor
5 years ago
AMZN-koppersr
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
Guthrie Adams
3c8421036a
Merge pull request #389 from aws-lumberyard-dev/Atom/guthadam/ATOM-15371
...
ATOM-15371 Adding missing RHI dependency to Atom tools
5 years ago
Guthrie Adams
518c6cb760
Merge pull request #385 from aws-lumberyard-dev/Atom/guthadam/ATOM-14003
...
ATOM-14003 adding image thumbnails to material inspector properties
5 years ago
guthadam
33749519db
ATOM-15371 Adding missing RHI dependency to Atom tools
...
This was causing error message spam and possibly other issues when launching the tools.
https://jira.agscollab.com/browse/ATOM-15371
5 years ago
Guthrie Adams
428feb6967
Merge pull request #376 from aws-lumberyard-dev/Atom/guthadam/ATOM-15372
...
ATOM-15372 Restoring material browser filter logic
5 years ago
guthadam
5cac07b4c1
ATOM-14003 adding image thumbnails to material inspector properties
...
https://jira.agscollab.com/browse/ATOM-14003
5 years ago
guthadam
5593350f84
ATOM-15372 Restoring material browser filter logic
...
Restoring material browser filter logic to only show folders with content that matches the filter.
This change was originally introduced with the functionality to create a new folder within the material browser. Creating a new, empty folder would not display the folder in the browser because it did not have any content that matched the filter. While that makes sense to address the issue with the create folder command, it makes it extremely difficult and navigate the browser to find assets that match the filter because every folder that does not match the filter is also displayed in the tree. We can revisit issues with the create folder action later.
https://jira.agscollab.com/browse/ATOM-15372
5 years ago
mnaumov
5f33337fec
Merge main
5 years ago
greerdv
b113f09a71
first pass of changing transform to use float for scale internally rather than Vector3
5 years ago
mnaumov
fdcb19f45a
Reverting some unused code
5 years ago
mnaumov
91f027a05c
PR feedback
5 years ago
Chris Burel
61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
...
Add newlines to the end of all files
5 years ago
Chris Burel
28170ffe41
Add newlines to the end of all files
5 years ago
nvsickle
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
mnaumov
09a0676b9c
Adding custom title to PropertyAssetCtrl
5 years ago
Guthrie Adams
62d2971103
Merge pull request #227 from aws-lumberyard-dev/Atom/guthadam/ATOM-15221_cherrypick
...
Cherry picking material editor error message box trace reporting from 1.0 to main
5 years ago
guthadam
215931a1ae
Updating trace recorder to allow limiting the number of messages stored
5 years ago
guthadam
0e6fea21fc
ATOM-15221 Material Editor: Capturing trace warnings and errors to display in error message boxes
...
https://jira.agscollab.com/browse/ATOM-15221
5 years ago
mnaumov
af00191e82
merge from main
5 years ago
AMZN-mnaumov
f4a57663fa
Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
...
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
5 years ago
mnaumov
d1ba2155c5
PR feedback
5 years ago
Guthrie Adams
2cd2550771
Merge pull request #124 from aws-lumberyard-dev/Atom/guthadam/ATOM-5921
...
ATOM-5921 Material Editor: Select newly created materials in the asset browser
5 years ago
mnaumov
34be0cd4b5
Fixing string search
5 years ago
mnaumov
6abf17439a
Adding "Create New Material" context menu option to folder in Material Editor
...
Improving MaterialBrowser filter to show empty folders
5 years ago
Guthrie Adams
3b4e424d38
Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950
...
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
5 years ago
AMZN-mnaumov
dc7cc77be6
Merge pull request #123 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15269
...
[ATOM-15269] disabling source control thumbnails in material editor
5 years ago
guthadam
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
guthadam
d614b357e5
ATOM-5921 Material Editor: Select newly created materials in the asset browser
...
The code was previously using asset browser notifications to listen for new files being added in order to select newly created materials.
Attempting to change the selection within the notification failed because the new entry still had not been added.
Now the material browser queues and processes the selection on tick.
https://jira.agscollab.com/browse/ATOM-5921
5 years ago
mnaumov
b3cc14dd5c
disabling source control thumbnails in material editor
5 years ago
mnaumov
db9b0f141f
Double click launches Material Editor
5 years ago
Guthrie Adams
c05b83915c
Merge pull request #115 from aws-lumberyard-dev/Atom/guthadam/ATOM-15267
...
[ATOM-15267] Material Editor: Create material dialog respects default standard PBR selection
5 years ago
AMZN-mnaumov
b8b90c42e2
Merge pull request #52 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15236
...
[ATOM-15236] Fixing camera panning and zooming
5 years ago
guthadam
854167c68e
Ensure default material selection works when dialog is opened
...
https://jira.agscollab.com/browse/ATOM-15267
5 years ago
AMZN-mnaumov
c5c7332642
Merge pull request #92 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14101
...
[ATOM-14101] Adding "copy name" and "copy path" to Material Editor
5 years ago
guthadam
e0b66223e4
Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes
5 years ago
mnaumov
d3520ddcf1
Adding "copy name" and "copy path" to Material Editor
5 years ago
guthadam
2baa0db2de
Standardizing dialog button boxes across material editor and component
...
Making dialogs modal
https://jira.agscollab.com/browse/ATOM-15173
https://jira.agscollab.com/browse/ATOM-15174
5 years ago
qingtao
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
mnaumov
28ccb5d381
Fixing camera panning and zooming
5 years ago
alexpete
8469c9ca0a
Integrating github/staging through commit 5f214be
5 years ago
alexpete
1044dc3da1
Integrating github/staging through commit ab87ed9
5 years ago
alexpete
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
5 years ago
alexpete
75dc720198
Integrating latest 47acbe8
5 years ago
alexpete
a10351f38d
Initial commit
5 years ago