birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into Atom/dmcdiar/ATOM-15517

Browse Source
This commit is contained in:
Doug McDiarmid
2021-06-02 00:10:55 -07:00
parent 982c30eefd 0f699cfd47
commit 35d7ee5e53
182 changed files with 5870 additions and 2129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp
+2 -2
View File
@@ -1328,7 +1328,7 @@ namespace AZ::AtomBridge
params.m_hAlign = center ? AzFramework::TextHorizontalAlignment::Center : AzFramework::TextHorizontalAlignment::Left; //! Horizontal text alignment
params.m_monospace = false; //! disable character proportional spacing
params.m_depthTest = false; //! Test character against the depth buffer
params.m_virtual800x600ScreenSize = true; //! Text placement and size are scaled relative to a virtual 800x600 resolution
params.m_virtual800x600ScreenSize = false; //! Text placement and size are scaled in viewport pixel coordinates
params.m_scaleWithWindow = false; //! Font gets bigger as the window gets bigger
params.m_multiline = true; //! text respects ascii newline characters
@@ -1364,7 +1364,7 @@ namespace AZ::AtomBridge
params.m_hAlign = center ? AzFramework::TextHorizontalAlignment::Center : AzFramework::TextHorizontalAlignment::Left; //! Horizontal text alignment
params.m_monospace = false; //! disable character proportional spacing
params.m_depthTest = false; //! Test character against the depth buffer
params.m_virtual800x600ScreenSize = true; //! Text placement and size are scaled relative to a virtual 800x600 resolution
params.m_virtual800x600ScreenSize = false; //! Text placement and size are scaled in viewport pixel coordinates
params.m_scaleWithWindow = false; //! Font gets bigger as the window gets bigger
params.m_multiline = true; //! text respects ascii newline characters
Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ namespace AZ::Render
m_drawParams.m_hAlign = AzFramework::TextHorizontalAlignment::Right;
m_drawParams.m_monospace = false;
m_drawParams.m_depthTest = false;
m_drawParams.m_virtual800x600ScreenSize = true;
m_drawParams.m_virtual800x600ScreenSize = false;
m_drawParams.m_scaleWithWindow = false;
m_drawParams.m_multiline = true;
m_drawParams.m_lineSpacing = 0.5f;
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
+1 -1
View File
@@ -184,7 +184,7 @@ namespace AZ
void MaterialPropertyInspector::AddUvNamesGroup()
{
const AZStd::string groupNameId = AZ::RPI::UvGroupName;
const AZStd::string groupDisplayName = "UV Names";
const AZStd::string groupDisplayName = "UV Sets";
const AZStd::string groupDescription = "UV set names in this material, which can be renamed to match those in the model.";
auto& group = m_groups[groupNameId];