Commit Graph

21 Commits

Author SHA1 Message Date
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
rgba16f bb92e4c0b8 Font update to dynamic draw per view (#1085)
* Move AtomFont over to use the new per viewport dynamic draw context.

Remove scene tracking and listening for bootstrap scene created.
Remove build dependency on the Bootstrap gem.
Add build dependency on the AtomBridge gem.
FFont's are now initialized with a viewport Id.
Remove previous DynamicDraw context per scene system.
Verify FFont can get a dynamic draw context before attempting initialization.
Ensure a render scene exists before attempting font initialization (as a proxy for rendering has begun)

* Move AtomFont FFont to use ShaderInputNameIndex's

This allowed removing all of the InitFont function as no longer need to query compiled shader info for constant data offsets.

* cache the AZ::Name used to find the dynamic draw context rather than recreate it each use
2021-06-02 19:49:38 -05:00
michabr 8bd4c8d974 Add back text drawing using Draw2d (#928)
This is used by the UI Editor's viewport and also by LyShine to display debug text.
2021-05-26 20:51:05 -07:00
rgba16f 6b2028c756 fix ly shine inverted font colors
Make AtomFont use the same vertex color format as LyShine.
2021-05-26 13:38:03 -05:00
rgba16f d4bad61f9a DebugDraw gem fixes for Atom (#885)
* Work in progress on adapting the DebugDraw gem to use AzFramework::DebugDisplayRequests API

* Cleanup fixes for DebugDisplayRequestBus & DebugDraw gem.

Remove SandboxIntegration implementation of the DebugDisplayRequestBus
Add DrawWireCylinder & DrawWireCone to the DebugDisplayRequestBus interface
Remove SetFillMode & DrawTexture functions from the DebugDisplayRequestBus interface
Fixup uses of the SetFillMode api, replace with new Draw[Wire|Solid]X functions.
Fixes to the DebugDraw gem to get it compiling with new warnings settings.

* Changes to get the DebugDraw gem working with Atom/RHI/Code/Include/Atom/RHI

Add GetWidth, GetHeight, GetDepth utility accessors to RHI::Viewport
Start cleaning out unnecessary Cry includes from DebugDraw gem
Fixes for AtomFont FFont.cpp 3d screen aligned text drawing.
Clean out no longer supported code for 3d text to render multiple strings for the same entity location

* Cleanup some unused or commented code

* Update with PR feedback from Nick Van Sickle
2021-05-24 16:49:00 -05:00
nvsickle f7a9b28000 Make AtomFont's API use copy semantics for string_view 2021-05-14 12:37:35 -07:00
nvsickle 8fd5c30e13 Address some build/review feedback 2021-05-12 17:47:10 -07:00
nvsickle 559798251d Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-12 11:55:51 -07:00
nvsickle cdca18ca25 Use a smart viewport context pointer in AtomFont to avoid a crash 2021-05-11 18:26:05 -07:00
nvsickle 7ff5c0e105 Add multiline spacing and GetTextSize to Atom Font 2021-05-11 12:18:04 -07:00
bosnichd 440c40e490 Remove (almost) all references to pRenderer (#651)
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
2021-05-10 10:05:15 -06:00
mbalfour 066a1eddf5 Moved null check before setting the status to "initializing". Otherwise, if the first call to InitFont() is with a null render scene, the status will get stuck in initializing forever and fonts will never render. This does NOT fix the text being drawn in the wrong location, that's a separate bug. 2021-05-06 13:42:52 -05:00
rgba16f d115c89043 Fixes for using the DebugDisplayRequestBus in game mode 2021-05-03 11:48:48 -05:00
nvsickle 33b485767f Address reviewer feedback, make FFont initialization state an atomic state machine 2021-04-20 11:49:59 -07:00
nvsickle dee0f84704 Clarified lazy initialization and added some thread sanity logic after discussion with @rgba16f 2021-04-19 17:00:36 -07:00
nvsickle 8fc69113c9 Get the default viewport context on demand in FFont, as it may change 2021-04-19 15:08:06 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00