Commit Graph

92 Commits

Author SHA1 Message Date
rhhong 0c86198fd9 CR feedback; add ability to update the render in the preference window.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-11-02 23:09:42 -07:00
rhhong f089187f3a Merge branch 'development' into animation/rhhong/render_settings_merge
Signed-off-by: rhhong <rhhong@amazon.com>
2021-11-01 23:06:09 -07:00
Qing Tao 8da6bea073 ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene crea… (#5153)
* ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene created by PreviewRenderer but not the Main Scene
Deprecate GetDefaultScene() function.
Update all the places which use GetDefaultScene to use Scene::GetFeatureProcessorFromEntityId or GetMainScene.
Tested with Editor, UI Editor, Material Editor, game launcher.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-11-01 14:26:55 -07:00
rhhong c79bf7a0c1 load render option in atom render plugin and use render actor settings in atom debug draw
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-30 22:37:05 -07:00
rhhong faa87f56c9 Fix build error
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-27 10:18:24 -07:00
rhhong edb50480f4 Calculate camera view projection each frame so we can have a fixed size viewport.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-26 14:58:34 -07:00
rhhong 43b572e22a CR feedback. Use one color instead of a color array.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-26 12:28:47 -07:00
rhhong 20f9e80648 wireframe rendering
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-26 08:14:34 -07:00
rhhong 3e686ca9ce fix linux build
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-25 21:17:38 -07:00
rhhong ebf84c49ac code review feedback. Also add the renderflag as qsettings.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-25 19:11:36 -07:00
rhhong 8595805c47 [WIP] Adding rendering options
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-25 01:32:12 -07:00
rhhong bfa600ede4 CR feedback
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-18 22:29:36 -07:00
rhhong 32833c68c7 CR feedback
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-18 22:27:21 -07:00
rhhong 13781a759f Add toolbar for anim viewport and some more camera controls.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-17 16:40:47 -07:00
Roman 129d249cb4 Do not delete the actor instance if it's belong to an entity. (#4624)
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-12 17:53:30 +02:00
rhhong 38efd58173 Fix merging issue with camera input
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:54:30 -07:00
rhhong 4d2f65c4d8 code review feedback 2
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:39 -07:00
rhhong a448caea7c fix broken build
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:38 -07:00
rhhong 265d3792f0 fix broken build
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:36 -07:00
rhhong 5fca7ffd86 CR feedback
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:34 -07:00
rhhong 646369c1b5 update camera naming and behavior after the merge in
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:29 -07:00
rhhong 10febe2a4b Move some utility class and settings to a setting file.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:27 -07:00
rhhong ffa637d115 Code cleanup
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:24 -07:00
rhhong 47a2240fc3 Using modular camera system to replace the camera entity.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:21 -07:00
rhhong 09f9e5c6c3 CR feedback
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:19 -07:00
rhhong 82bfbd5c98 Add ability to load actor from the ui
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:16 -07:00
rhhong b7900bf646 render an actor
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:11 -07:00
rhhong d185338978 Code clean
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:08 -07:00
rhhong cda2bb9d4d Add anim viewport renderer
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:05 -07:00
rhhong c4a3162c85 CR feedback - code cleaning
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:20:00 -07:00
rhhong af9448d4ea delete auto moc header
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:19:55 -07:00
rhhong f2b449c4b9 Registering an empty atom render plugin in the emfxatom gem.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-07 14:19:48 -07:00
Esteban Papp a7780b6dbe Gems/Atom*
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-10 20:16:11 -07:00
Steve Pham 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>
2021-08-30 13:10:41 -07:00
Esteban Papp 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
2021-08-24 10:43:48 -07:00
Esteban Papp 804d833bb9 Gems/Atom
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 13:01:33 -07:00
Kyle Birnbaum 2b1f4c2fc0 Merge branch 'development' into ExposeLodControls 2021-08-20 12:45:00 -07:00
Kyle B b53a085700 Merge branch 'development' into ExposeLodControls 2021-08-20 12:14:59 -07:00
pappeste 33cbc2db21 AtomLyIntegration
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:10:42 -07:00
Chris Burel 1837d05169 Rename EMotionFX class members to follow the m_ naming convention
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 16:40:35 -07:00
Chris Burel 2cfee517a0 Adjust EMotionFXAtom to work with the new EMotionFX size_t API
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-09 09:22:38 -07:00
Benjamin Jillich 868d718a18 Added automatic bounding box expansion, fixed several bugs in the aabb calculations and removed node OBBs (#2871)
Merge pull request #2871 from aws-lumberyard-dev/jillich/EmfxAabbImprovements
2021-08-09 01:19:42 -07:00
Kyle B 51271fa15b Created group for Lod component data
Signed-off-by: Kyle B <kylebirnbaum@gmail.com>
2021-08-06 16:57:00 -07:00
Benjamin Jillich 8a47476498 Merge branch 'development' into jillich/EmfxAabbImprovements 2021-08-05 15:13:29 +02:00
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-02 18:03:04 -07:00
Kyle B 5b88d96eec Exposed fields to the mesh component giving greater Lod control from the editor
Signed-off-by: Kyle B <kylebirnbaum@gmail.com>
2021-08-02 13:36:10 -07:00
Benjamin Jillich b840b24de2 Ported the actor and a few other places
* Fixed a bug with updating the static aabb for actors. It called that before the mesh was loaded resulting in an invalid aabb.
* Ported a few more places to AZ::Aabb from MCore::AABB

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-08-02 14:38:20 +02:00
santorac b407e501e3 Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion 2021-07-30 14:54:14 -07:00
Chris Santora fec79a7d53 Moved the material slot list from ModelLodAsset to ModelAsset, so all the slots live in one main list. This removes data duplication between LODs and cleans up the code a bit.
I had to update the ModelLod class to take in both the ModelLodAsset and ModelAsset for initialization so it can fetch the slots for each mesh.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-07-30 11:41:02 -07:00
Chris Santora 3daf3f7d7a Fixed an issue with Actors where the material slot IDs were incorrect, and caused the displayed slot labels to be all "<unknown>" (and likely other issues).
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-07-30 11:40:59 -07:00