Commit Graph

45 Commits

Author SHA1 Message Date
Tom Hulton-Harrop 6ffc2620e4 Updates to EMFX cameras and better support for character follow behavior (#7676)
* initial wip change to help resolve EMFX camera viewport issue

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

* some updates to add/remove camera input API

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

* add additional comments and remove some optimize off calls

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

* improvements to camera behavior in EMFX editor

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

* add some tests for add/remove logic for cameras

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2022-02-21 09:44:21 +00:00
Roman 464b225042 Prevent the character to go out of bound in animation viewport (#7667)
* Prevent the character to go out of bound

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

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
2022-02-18 12:51:13 -08:00
Roman f72c7da4a3 Change rotation camera to use RMB, and add orbit rotation camera using LMB + alt (#7610)
* Change rotation camera to use RMB, and add orbit rotation camera using LMB + Alt

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

* add lookScrollCamera

Signed-off-by: rhhong <rhhong@amazon.com>
2022-02-16 08:38:51 -08:00
Roman da421b7056 Change actorRenderFlag to use AZ ENUM CLASS instead of azstd::bitset (#7542)
* Fixes the problem with using actor render flags in actor component

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

* In progress work for actor render flag rework

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

* add an utlity function to check bit

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

* code cleanup

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

* More CR cleanup

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

* build fix

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

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
2022-02-14 13:27:37 -08:00
Roman be242f9c71 Fix a problem about rotation and scale manipulator (#7451)
* Load workspace should activate the graph by default.

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

* Fixed the bug with rotation and scale manipulator

Signed-off-by: rhhong <rhhong@amazon.com>
2022-02-07 09:50:31 -08:00
Roman 5509764fc2 Make atom render viewport the default for animation editor. (#7282)
* Make atom render viewport the default for animation editor.

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

* Fixed the automated test problem caused by making atom vp the default

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

* Fix another test failure

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

* fix failed test

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

* more fix to the automation test

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

* we don't need to manuelly call init on the ragdoll plugin anymore

Signed-off-by: rhhong <rhhong@amazon.com>
2022-02-02 11:46:00 -08:00
Roman 79f4fee960 Manipulator for params (#7231)
Signed-off-by: rhhong <rhhong@amazon.com>
2022-01-30 09:55:40 -08:00
Roman e2c4c0e5e3 Atom viewport render option bugfix (#7158)
* Render option bugfix

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

* add aznumeric_cast

Signed-off-by: rhhong <rhhong@amazon.com>
2022-01-26 19:41:38 -08:00
Roman 55146d037a Add manipulator for atom render plugin in animation editor. (#7068)
* small bugfix

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

* ActorInstanceId default to -1 when no %lastresult matches

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

* CR feedback - wrap function to get the first available editor actor instance.

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

* Remove mcore inline

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

* Fixed the bug that delete an instance from actor manager crashes the editor.

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

* Move the manipulator controller.

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

* Add manipulator icon

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

* Add manipulators

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

* move more option to renderOption, and loading all going through the plugin

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

* code cleanup

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

* code cleanup

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

* more code cleanup

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

* CR FEEDBACK

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

* Fix profile_nounity build

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

* CR feedback - move more code to azToolsframework and share them between animation editor and editorlib

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

* Using the MouseViewportRequests in viewportMessage and remove the custom bus

Signed-off-by: rhhong <rhhong@amazon.com>
2022-01-25 11:25:18 -08:00
Roman 3a4eb3785a small bugfix (#6420)
Signed-off-by: rhhong <rhhong@amazon.com>
2021-12-15 13:21:22 -08: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
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
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 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
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
Roman 2c58da46dc Follow character option (#5538)
* Follow character option

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

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
2021-11-11 13:57:52 -08:00
Roman aa229976f3 Render Colliders (#5434)
* Render Colliders

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

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
2021-11-09 13:42:56 -08: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
Roman 77d02ea657 Add some debug rendering options. (#4950)
* [WIP] Adding rendering options

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

* code review feedback. Also add the renderflag as qsettings.

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

* fix broken test

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

* fix linux build

Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-26 10:59:02 +02: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