birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,658 Commits 3 Branches 3 Tags
75d7c61ba1070cc167ef9fe01bf73eadcbf3a20f
Commit Graph

153 Commits

Author SHA1 Message Date
puvvadar 5e0acc11ef Merge commit 'b533a9566a0a221dd4f70486ab2a3d397bcae5c7' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:56 -08:00
puvvadar 724ff3b011 Merge commit 'd222aeef48ad10224958e682294e704c10ee06df' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:47 -08:00
puvvadar b37f75f060 Merge commit '713a3916f5c101c324f8e2f2e06b49bf521da783' into puvvadar/gitflow_211118_o3de 2021-11-18 09:42:23 -08:00
puvvadar 33cb674355 Merge commit 'e34ea3bcaa0306699804072c6bce6eb01f65fc52' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:30 -08:00
puvvadar 4c8bb5694b Merge commit '593f03efb4996ae8bb8e1f53a55e2ba00e022449' into puvvadar/gitflow_211118_o3de 2021-11-18 09:37:11 -08:00
puvvadar 07e99650d0 Merge commit 'a6164ca2cd3f573fd7735c3825568b1e25b12c2b' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:53 -08:00
Tom Hulton-Harrop b533a9566a Fix for viewport not updating correctly when switching camera views (#5719) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-18 09:11:46 +00:00
santorac 2774ac1811 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 13:24:56 -08:00
Guthrie Adams 713a3916f5 Merge pull request #5691 from aws-lumberyard-dev/Atom/guthadam/material_editor_viewport_settings_previews_uses_thumbnail_widget 
Replacing material editor lighting preset selection dialog exr previews with lighting preset thumbnails
 2021-11-17 14:57:52 -06:00
santorac be9db80f99 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 12:15:57 -08:00
Tom Hulton-Harrop e34ea3bcaa Fixes for viewport selection issues (#5494) 
* improvements to editor selection in the viewport

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix issue with being able to select icons that are not showing for entities inside entity containers

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update comment after review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates to viewport picking code to simplify the api

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test to replicate near clip intersection issue

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* small tidy-up changes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates to how we perform world to screen and screen to world calculations, added test coverage and some tidy-up

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add some more tests for ViewportInteractionImpl

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* minor tweaks before PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix typo in fix

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for manipulator test framework tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates to RPI::View and RenderPipeline after review feedback from VickyAtAZ

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add constexpr to ScreenPoint, ScreenVector and ScreenSize initializing constructors

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add PrintTo functions for Screen* types

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* downgrade error to warning temporarily

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* check incoming view is null

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove pragma optimize off

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-17 17:12:21 +00:00
Guthrie Adams cb552256f8 Moved asynchronous image loading function to atom tools framework 
Moved settings registry wrapper function to atom tools framework
Created registry settings with default values for preview configurations based on asset type
Changed lighting preset previews and thumbnails to use reflective material
Created registry settings for preset selection dialog borders, padding, sizes
Updated shared preview utility functions to compare against registered asset types instead of passing them in individually

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-17 10:55:14 -06:00
Tom Hulton-Harrop 593f03efb4 Camera fixes follow-up (#5703) 
* allow unconstrained camera when tracking transform and fix some camera interpolation issues

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* tests for interpolation fixes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test for camera constraints change

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following review feeedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-17 16:23:01 +00:00
Tom Hulton-Harrop a6164ca2cd Fix for camera roll behavior when in 'Be this camera' mode (#5658) 
* fix for camera roll behavior when in 'Be this camera' mode

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates for camera tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for failing unit test - require default function

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-17 12:27:23 +00:00
santorac 9f7815fa04 Fixed up a couple incorrectly or incompletely resolved merge conflicts. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-11-16 10:35:49 -08:00
santorac db3d41ad9d Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-16 10:06:28 -08:00
santorac 224e0bd20f Removed the 'data-warnings' concept for checking before saving a material document. It's no longer necessary since we no longer replace the original data with placeholders. 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-11-16 00:02:20 -08:00
amzn-sean 38a03817bb Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409) 
Replaced and removed the CryTimer (gEnv->pTimer). The new TimeSystem is a merger of the current time functionality found in the engine.

* Rename TimeSystemComponent.h/.cpp to TimeSystem.h/.cpp
* Adding New TimeSystem
* remove old timer cvars
* small improvements to the time system.
 - updated parts to use the time conversion functions.
 - in AdvanceTickDeltaTimes applying t_simulationTickScale is now uses doubles instead of floats.
* Replace gEnv->pTimer / ITimer usages with TimeSystem
* Updating usages of AZ::TimeMs{ 0 } and AZ::TimeUs{ 0 } to AZ::Time::ZeroTimeMs and AZ::Time::ZeroTimeUs
* red code the CryTimer
* using TimeUs instead of TimeMs is some cases + updating usages of old cvars to new

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-11-15 12:11:58 +00:00
Guthrie Adams 7d51912a6e updated comments 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:46:17 -06:00
Guthrie Adams b379c489b5 updated comment 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:45:04 -06:00
Guthrie Adams ed4f7965da Created function to get relative paths to referenced files that will fall back to asset folder relative paths under certain conditions 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:44:25 -06:00
Guthrie Adams f18f838da6 material editor and exporter save source materials with relative paths 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:43:51 -06:00
santorac f27203a5fa Updated Material Editor to use the available default fallback images to visually indicate a missing texture. 
Material Editor also warns the user when saving a material that is populated with fallback image references.
Factored out the path strings for the default images to ImateSystemInterface.h.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-11-10 19:28:42 -08:00
santorac cd28d210ab Working on making Material Editor able to open materials that have missing textures. 
Made it a warning instead of an error when MaterialAssetCreator can't find a texture.
Updated the Material Editor's MaterialDocument class to not elevate warnings to errors.
Material Editor uses new features in TraceRecorder to show a message dialog when warnings are detected so the user is notified of the missing texture.

Next I will work on making MaterialAssetCreator put a "missing" texture in place of the requested one.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-11-10 14:02:17 -08:00
Guthrie Adams b14e0958ce updated comments 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:20 -05:00
Guthrie Adams b643a8c80f updated comment 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:12 -05:00
Guthrie Adams 84ca17e7cb Created function to get relative paths to referenced files that will fall back to asset folder relative paths under certain conditions 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:10 -05:00
Guthrie Adams 620e522f86 material editor and exporter save source materials with relative paths 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-03 17:30:07 -05:00
jonawals a1ee7b5a31 Merge pull request #4725 from aws-lumberyard-dev/hultonha_LYN-7394_focus_cursor 
Updates to support 'lock'/'forbidden' cursor when in Focus Mode
 2021-10-20 14:55:01 +01:00
Steve Pham e6464335af Fix Vulkan issues with VK_ERROR_OUT_OF_DATE caused by the swapchain not being updated on a resize (#4740) 
- Updated the RenderViewportWidget::event method to call 'SendWindowResizeEvent' on specific events
- Moved the onResize to one of the events in RenderViewportWidget::event

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-10-18 09:09:55 -07:00
hultonha 3d4c060fb5 updates to improve cursor lock behavior 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 15:19:38 +01:00
hultonha 1d6542c274 initial wip code to update cursor states 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 13:28:58 +01:00
Guthrie Adams ed9ecb3906 adding missing includes to fix build 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-14 23:43:35 -05:00
Guthrie Adams c8be25a9ce Converted preview renderer to use AZ::Interface 
Made some files private when exposing public interfaces
Updated a few comments

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-14 20:22:48 -05:00
Guthrie Adams 343a13a134 updating comments 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-12 16:44:54 -05:00
Guthrie Adams 91592d2218 Merge branch 'development' into Atom/guthadam/thumbnail_and_preview_refactor 2021-10-12 13:21:11 -05:00
Guthrie Adams 26aa7495a2 Changed preview renderer states to use construction and destruction instead of start and stop functions to make sure everything is shut down cleanly 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-12 11:26:14 -05:00
hultonha 5c859cb134 Fix camera drift issues (#4576) 
* remove some unused code in RenderViewportWidget and make viewing devicePixelRatioF easier

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates to how cursor positions are calculate to handle the viewport widget moving

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* remove optional for previous position

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add test to capture error with moving the widget

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* minor comment updates before publishing PR

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-11 16:23:24 +01:00
Guthrie Adams 9f92bd2d33 Compile again after renaming and moving files 
Cleaned up namespaces
Renamed a couple of functions and added comments

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-10 01:45:13 -05:00
Guthrie Adams 2c6cfdd7dc Implemented support for semi-live previews of materials in the material property inspector. 
Changed thumbnailer bus to use const pixmap
Changed capture request call back to use const pixmap instead of image
Replaced scene and pipeline members with constructor parameters
Added material preview renderer to editor material system component with new requests and notifications
Changed material property inspector details group to persistent heading so the preview image widget would not get destroyed during refreshes. But this was also a backlog task.
Changed common preview render camera to use lookat
Moved default asset caching to thumbnail renderer

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-09 18:17:50 -05:00
Guthrie Adams 76b4dafbb3 Everything compiling again after moving preview renderer to atom tools framework 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-08 04:33:45 -05:00
Guthrie Adams 569318e9e1 Moved preview renderer files to atom tools framework 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-10-08 02:56:24 -05:00
Guthrie Adams 050de68f7d Merge branch 'development' into Atom/guthadam/material_editor_replace_modified_color_with_indicator 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

# Conflicts:
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.h
 2021-10-01 16:39:57 -05:00
santorac c0d8020786 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes 2021-09-30 09:30:17 -07:00
SergeyAMZN 08e020f2b1 Merge pull request #4251 from aws-lumberyard-dev/nvsickle/RevertFrameTimer 
Revert "Refresh rate driven rendering tick logic (#3375)"
 2021-09-30 14:51:45 +01:00
santorac 62e268bec7 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes 2021-09-30 01:36:42 -07:00
hultonha ab0aa4973f Remove camera LookAtAfterInterpolation (#4391) 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-30 08:43:48 +01:00
Artur K 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>
 2021-09-29 11:31:01 -05:00
hultonha c34b6ffe3b Overhaul of how camera orbit/pivot behavior works (#4345) 
* overhaul to how camera orbit/pivot behavior works

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update naming from orbit to pivot

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix camera unit tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add additional tests for new camera pivot behavior

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix comment and add additional info for tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-29 10:11:49 +01:00
santorac 3753ee6f1c Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes 2021-09-28 22:12:18 -07:00