birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,358 Commits 3 Branches 3 Tags
14683bf3eff17aa5c4eeed09fa5237c616cf45db
Commit Graph

832 Commits

Author SHA1 Message Date
Jonny Galloway cbba00d473 Atom/16852 (#6316) 
* discover build folder, don't assume or require

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* update config_utils, no cyclical imports

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* improved docstrings and some code formatting

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* updates to config.py

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* updates to config_utils.py

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* dccsi bootstrap changes

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* fixed testing for bootstrap externally

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* added note for installing substance automation toolkit for tool dev

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* based on user feedback suppress global debug by default in IDE

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* small adjustments

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>
 2021-12-15 08:25:23 -08:00
Artur K 53b88d4752 Preapre codebase for FileRequest compiletime improvements (#6192) 
* Preapre codebase for FileRequest compiletime improvements

This is preparing grounds for the next PR that will contain the 'meat'
of the changes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove spurious newline.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-12-10 13:08:24 +00:00
Tom Hulton-Harrop 633a9e939a Update modular viewport camera controller interface (#6282) 
* update modular viewport camera controller interface to make follow behaviors easier

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

* updates following PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-10 09:49:43 +00:00
dmcdiarmid-ly 4e7a45a6c5 Merge branch 'development' into Atom/dmcdiar/ATOM-16896 2021-12-09 17:21:47 -07:00
Tom Hulton-Harrop c2341a7e3c Fix for change with axis gizmo labels not appearing (#6256) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-09 09:30:51 +00:00
dmcdiarmid-ly c58a742296 Switched to a single merged ProbeData texture instead of separate textures for Relocation and Classification. 
Switched to HDR irradiance.
SDK Update.
Fixed a Vulkan validation error on RayTracingSceneSrg::MeshInfo.
Improvements to DiffuseProbeGrid blending.

Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
 2021-12-08 18:35:45 -07:00
Esteban Papp bb685ee40b Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 18:12:48 -08:00
Esteban Papp 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
Roman 28f38ca009 Update the deformer in the atom debug draw (#6095) 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-12-02 14:15:59 -08:00
Esteban Papp 59ef6f983f Removes Driller from ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 13:55:00 -08:00
Roman b897b2084c BUGFIX improve the start up time of the atom render plugin (#6065) 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-12-01 20:50:51 -08:00
Esteban Papp fb6e6e339f Add CRC validator (#5857) 
* Adds crc validation checks

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes invalid CRCs

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes test to smoke suite

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* excludes some test data from the validator

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* uses pathlib instead of os.path

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes wrong path to test scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Escape not needed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-30 15:07:57 -08:00
Esteban Papp 7c30adb66c Removes _vs2019 from jenkins jobs and documentation (#5855) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-30 11:10:02 -08:00
Roman 6cb53891ed Store camera settings (#6013) 
* load and save camera options

Signed-off-by: rhhong <rhhong@amazon.com>

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-30 08:32:11 -08:00
Roman c59f973900 Add joint selection visual support (#5860) 
* Render joint orientation

Signed-off-by: rhhong <rhhong@amazon.com>

* joint selection will affect rendering result in emfx atom debug draw

Signed-off-by: rhhong <rhhong@amazon.com>

* Render line skeleton with joint selection

Signed-off-by: rhhong <rhhong@amazon.com>

* bug fix

Signed-off-by: rhhong <rhhong@amazon.com>

* fix build error

Signed-off-by: rhhong <rhhong@amazon.com>

* CR feedback - checking the actor instances for joint selection

Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-29 08:39:43 -08:00
Guthrie Adams ff631ac07c Merge pull request #5897 from aws-lumberyard-dev/Atom/guthadam/fix_model_previews 
Fixed a bug with model previews and thumbnails.
 2021-11-29 10:29:24 -06:00
Artur K eca2e36687 Fix clang 13 compilation problems (#5791) 
* Fix clang 13 compilation problems

Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda
which replaces missing `Draw2dLabel` functionality ( added TODO marker
there )

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* apply review suggestions

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix type in assert message

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-11-25 09:24:39 +00:00
Guthrie Adams 357648a424 Fixed a bug with model previews and thumbnails. 
A source model asset can have multiple products including models and materials.
It’s not guaranteed that the first entry in the list of products for a model asset will be a model.
In this case the first product was the default material asset.
This caused some model previews to render a gray sphere depicting the default material.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-24 14:42:07 -06:00
Tom Hulton-Harrop 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
Roman a3a4038aca Added joint orientation rendering (#5821) 
* Render joint orientation

Signed-off-by: rhhong <rhhong@amazon.com>

* fix build error

Signed-off-by: rhhong <rhhong@amazon.com>

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-22 11:38:35 -08:00
Roman bb906da58c when follow up camera option is on, then load another character, it should zoom to this character. (#5758) 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-20 14:59:36 -08:00
puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de 
Merge stabilization/2110
 2021-11-19 15:46:16 -08:00
puvvadar 8b5a322d67 Merge commit '9cbd323a3b799c3cc7fb285a96ba7ed2cace896b' into puvvadar/gitflow_211118_o3de 2021-11-19 09:16:20 -08:00
puvvadar c677fbff18 Merge commit '12e3a652d72865cc4a70c54487f5424abf6c9b81' into puvvadar/gitflow_211118_o3de 2021-11-19 09:15:43 -08:00
antonmic cf4ef5e73b Addressed feedback from previous PR plus some cleanup 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-11-18 13:37:06 -08:00
Roman 8e02a82866 Disable option that are currently not available. (#5742) 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-18 11:05:47 -08:00
antonmic 12e3a652d7 Merge pull request #5737 from aws-lumberyard-dev/Atom/antonmic/FixForCapsuleAuxGeom 
Fixed capsule auxgeom draw for lights and other aux geom issues
 2021-11-18 10:16:31 -08:00
puvvadar 27648dea0e Merge commit 'f18f5318c0559c1a899fcf04f219bea387f454f4' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:21 -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 9f886de5f6 Merge commit 'dd1d515e37d4692e587c21df43a674c7134ad43b' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:21 -08:00
Tom Hulton-Harrop f18f5318c0 Fix for gizmo axis text not displaying correctly on high dpi screens (#5745) 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-18 15:34:30 +00:00
Roman 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
antonmic 8587c8e033 Fixed capsule auxgeom draw for lights and other aux geom issues 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-11-17 22:55:29 -08:00
santorac 2774ac1811 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 13:24:56 -08:00
santorac be9db80f99 Merge branch 'stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-17 12:15:57 -08:00
Tommy Walton 1e42261d76 Merge remote-tracking branch 'upstream/development' into amzn-tommy/gitflow_211116_o3de2 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-11-17 09:04:04 -08: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
Guthrie Adams 123b422709 Updated shared preview fit to camera logic and viewing angle 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-17 10:12:07 -06:00
Roman 9b6e2ed51d render solid skeleton option (#5610) 
* 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>
 2021-11-17 08:05:03 -08:00
Tommy Walton 783bb72944 Merge commit 'f1d9e7ae28bf0667487c939aa32b1ef833da80f4' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 11:41:26 -08:00
mrieggeramzn dd1d515e37 Atom/mriegger/normaloffsetbiasarealight (#4917) 
* Adding directional light shadow bias
* Adding normal offset bias for projected shadows

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
 2021-11-16 11:08:25 -08:00
santorac db3d41ad9d Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures 2021-11-16 10:06:28 -08:00
Roman 9a72dd7446 Bugfix - Render normal is incomplete when multiple mesh present. (#5605) 
Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-16 00:17:40 -08:00
santorac 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
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 1689b880fe added version to material component exporter 
deleted unnecessary checks

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-11 21:45:53 -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
Nicholas Van Sickle 2c2c1d8137 Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21 
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
 2021-11-11 15:04:18 -08:00