03adf700fe
Merge branch 'development' into redcode/driller_removal
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-03 13:35:16 -08:00
799cc68de2
no message
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-03 11:38:49 -08:00
393c369055
Fixed pass warning in ASV
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-12-02 23:33:56 -08:00
0b9497cd45
Changes call from AZ_TRACE to AZ_PROFILE. AZ_TRACE uses a driller bus that is going to be removed
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-02 17:12:25 -08:00
cbb5179b4c
Add a missing #include and [[maybe_unused]] ( #5960 )
...
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-29 08:21:55 -07:00
5bd751531d
Update return type for viewport screen functions ( #5803 )
...
* update return type for viewport screen functions
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add tests for AZ::Matrix3x4::CreateFromMatrix4x4 and add TransformPoint to Matrix3x4
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update NDC -> Ndc
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates following review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* updates and improvements following PR feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add forward declaration of Matrix3x4 type
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update where forward declarations are defined for Matrix3x4
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-24 09:17:43 +00:00
6eec6c8f8e
Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de
...
Merge stabilization/2110
2021-11-19 15:46:16 -08:00
b89f5ee0c4
fixed tests
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-19 10:39:35 -06:00
e97f5de94a
Updated material version warning messages to include the affected asset
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-18 15:48:47 -06:00
724ff3b011
Merge commit 'd222aeef48ad10224958e682294e704c10ee06df' into puvvadar/gitflow_211118_o3de
2021-11-18 09:42:47 -08:00
33cb674355
Merge commit 'e34ea3bcaa0306699804072c6bce6eb01f65fc52' into puvvadar/gitflow_211118_o3de
2021-11-18 09:37:30 -08:00
c6f5bcb3df
Merge commit '92510df37386a952a490f72d304dc8d0087a94e4' into puvvadar/gitflow_211118_o3de
2021-11-18 09:36:29 -08:00
e52cbd2bb3
Render joint names ( #5685 )
...
* render solid skeleton option
Signed-off-by: rhhong <rhhong@amazon.com >
* Fix broken build
Signed-off-by: rhhong <rhhong@amazon.com >
* CR update
Signed-off-by: rhhong <rhhong@amazon.com >
* Render joint names
Signed-off-by: rhhong <rhhong@amazon.com >
* CR update
Signed-off-by: rhhong <rhhong@amazon.com >
* CR update
Signed-off-by: rhhong <rhhong@amazon.com >
2021-11-18 06:42:41 -08:00
e4563c0058
Update RPISystem::GetCurrentTime() to use TimeSystem ( #5613 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-11-18 14:31:02 +00:00
dc98a56d45
Clang/Clazy pass over AzCore ( #5045 )
...
* Multiple cleanups ( tidy etc. )
Coalesce nested namespaces.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Multiple cleanups ( tidy etc. ) cntd.
Converted Uuid into POD ( defaulted the constructor )
Add `&/const &` to `for` loops that benefit from their use
Some Qt optimizations ( string ref, prevent container detaches, etc. )
Replace `::bind` in a few places.
Replaced the use of AZ_CRC with AZ_CRC_CE in a few places.
Replace a few `typedef`s with `using`s
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Linux compilation fix.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Apply review suggestions.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Fix vs2019 build
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Small clang re-format in StringFunc.cpp
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Apply reviewer's suggestions.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-11-18 10:09:22 +00:00
be9db80f99
Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-17 12:15:57 -08:00
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
8b82452a1b
Updated ResolvePathReference to also early-return when the path is empty. @gadams3 said this would be helpful to him.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 17:30:33 -08:00
92510df373
Fix missing clip to world matrix data ( #5677 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-16 16:34:43 -08:00
5cf65012b1
Updated RPI.Edit's AssetUtils to use the same TraceLevel enum as RPI.Reflect's AssetUtils. This is now used in GetImageAssetReference to remove a redundant error message since the error is also reported in MaterialSourceData and MaterialTypeSourceData.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 12:31:33 -08:00
284a44d74c
Updated AssetUtils::ResolvePathReference to avoid "The second join parameter is an absolute path" warnings from StringFunc::Path::Join.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 11:45:26 -08:00
0dcf49affc
Merge commit 'b0dfe26232b318e520887af65cd579ec87016636' into amzn-tommy/gitflow_211116_o3de2
...
Signed-off-by: Tommy Walton <waltont@amazon.com >
2021-11-16 11:45:09 -08:00
783bb72944
Merge commit 'f1d9e7ae28bf0667487c939aa32b1ef833da80f4' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:26 -08:00
db3d41ad9d
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-16 10:06:28 -08:00
a789d7b762
Minor code cleanup.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-16 00:00:10 -08:00
2657620846
Minor code cleanup.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-15 23:56:10 -08:00
aa85963a2b
Fixed MaterialPropertyValue::FromAny to preserve the Hint string when converting Asset objects. This fixed an issue where the hint didn't show up in the Material Component's instance inspector.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-15 23:21:21 -08:00
7d849cc0d2
Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component.
...
I actually tried this approach before and it didn't seem to work the way we needed, but I realized that's because PropertyAssetCtrl wasn't handling missing assets properly. I fixed a few issues there including showing the error button when the asset can't be found, and fixing a broken reference to the error icon file.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-15 16:51:22 -08:00
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
4d3c977d58
Merge pull request #5585 from aws-lumberyard-dev/Atom/guthadam/cherrypick_material_relative_paths_to_stab
...
Cherry pick material editor saves relative paths to external references and test support to stabilization
2021-11-12 14:54:36 -06:00
b0dfe26232
The Build Time Stamp of ShaderAsset And ( #5373 )
...
* The Build Time Stamp of ShaderAsset And
ShaderVariantAsset Should Be Based On
GetTimeUTCMilliSecond()
GetTimeNowMicroseconds() is useful to measure time stamp differences.
GetTimeUTCMilliSecond() is for time stamps based on absolute clock/wall time.
* Updated DiffuseGlobalIllumination precompiled shaders
Co-authored-by: dmcdiar <dmcdiar@amazon.com >
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com >
2021-11-12 13:51:07 -06:00
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
e1e282484f
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-11 13:13:23 -08:00
f1d9e7ae28
Skybox hot reloading - fix black screen when running the editor for the first time with a clean cache ( #5529 )
...
* Add a default fallback image when a StreamingImageAsset fails to load
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Don't release a missing/invalid texture reference in the skybox component. Hold on to the reference so that it can hot-reload
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Don't release a missing/invalid texture reference in the ibl component. Hold on to the reference so that it can hot-reload
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Use a different fallback image depending on the status of the asset. Including a setting to use a friendly image that is less obnoxious for anything that might have been missed in a release build
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Adding the stubbed in fallback textures
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Updated the seedlist for the RPI to include the fallback images. It only needs the default and the missing asset images, since the AP doesn't run in release builds, the asset status will always be unknown, not processing or failed to process, so if an asset is not bundled, it is just missing.
Signed-off-by: Tommy Walton <waltont@amazon.com >
* Switched to GetAssetIdByPath and removed some tabs
Signed-off-by: Tommy Walton <waltont@amazon.com >
2021-11-11 12:55:06 -08:00
57989c35db
Changed material builder to not fail on warnings.
...
The main reason for this is to give consistent results between the AP and Material Editor, where a placholder texture can be used if a texture is missing. Otherwise, you could get a placeholder texture in Material Editor and stale data in the runtime; this inconsistency would be confusing.
As a consequence, it is possible for example that the user could mess up the name of a property in a .material file and not notice the problem because it is now a warning instead of an error. If warnings-as-errors is desirable, you can enable the new "/O3DE/Atom/RPI/MaterialBuilder/WarningsAsErrors" registry setting.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-11 12:50:17 -08:00
8d5dd4e35f
Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-11-11 10:15:52 -08:00
2812ec2024
Fix brute force mesh intersection function ( #5447 )
...
* fix brute force mesh intersection function
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add test for brute force ray intersection fix
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* refactor tests to remove as much duplication and provide API for future tests if required
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* small updates after review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update following review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for pointer offset
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-11 16:33:08 +00:00
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
2783248f03
Merge remote-tracking branch 'origin/Atom/amzn-tommy/ATOM-16289_SkyboxHotReloading' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-10 14:04:35 -08:00
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
9a470f35ad
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/amzn-tommy/ATOM-16289_SkyboxHotReloading
...
Signed-off-by: Tommy Walton <waltont@amazon.com >
2021-11-10 13:20:47 -08:00
09b9d371e0
Use a different fallback image depending on the status of the asset. Including a setting to use a friendly image that is less obnoxious for anything that might have been missed in a release build
...
Signed-off-by: Tommy Walton <waltont@amazon.com >
2021-11-10 13:20:25 -08:00
21a254e9dc
Fixed a type with pass filter ( #5506 )
...
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com >
2021-11-10 13:15:04 -08:00
04c6f3cc94
cherry-pick 48f3bb7d
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:37:15 -06:00
824da6cabf
update comment and error message
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:34:35 -06:00
c73b6bbe27
Changing lua material functor script loading code to pass the correct sub ID for a compiled script asset
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:33:48 -06:00
287f08a33c
Fix parent material loading
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:33:10 -06:00
086859d49a
updated comments and error messages
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:32:27 -06:00
fbebf04161
cherry-pick c0acbe7b
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 13:31:24 -06:00
6ea951214c
Moving material type asset PostInit call to be consistent with material asset
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-10 12:58:47 -06:00
Esteban Papp
antonmic
bosnichd
Tom Hulton-Harrop
puvvadar
Guthrie Adams
Roman
amzn-sean
Artur K
santorac
Alex Peterson
Tommy Walton
Guthrie Adams
galibzon
Nicholas Van Sickle
Qing Tao