diff options
Diffstat (limited to 'src/Runtime/Source')
11 files changed, 6 insertions, 62 deletions
diff --git a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp index d225d0ed..a4b3bc7e 100644 --- a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp +++ b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBindingImplTranslation.cpp @@ -654,11 +654,8 @@ struct SRuntimePropertyParser #define Text_Tracking ATTRIBUTE_TRACKING #define Text_DropShadow ATTRIBUTE_DROPSHADOW #define Text_DropShadowStrength ATTRIBUTE_DROPSHADOWSTRENGTH -#define Text_DropShadowOffset ATTRIBUTE_DROPSHADOWOFFSET #define Text_DropShadowOffsetX ATTRIBUTE_DROPSHADOWOFFSETX #define Text_DropShadowOffsetY ATTRIBUTE_DROPSHADOWOFFSETY -#define Text_DropShadowHorizontalAlignment ATTRIBUTE_DROPSHADOWHORZALIGN -#define Text_DropShadowVerticalAlignment ATTRIBUTE_DROPSHADOWVERTALIGN #define Text_WordWrap ATTRIBUTE_WORDWRAP #define Text_BoundingBox ATTRIBUTE_BOUNDINGBOX #define Text_BoundingBox_X ATTRIBUTE_BOUNDINGBOX_X diff --git a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp index 995b5704..766ce9ed 100644 --- a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp +++ b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp @@ -226,11 +226,8 @@ const char *GetAttributeString(const EAttribute inAttribute) case ATTRIBUTE_FONT: return "font"; case ATTRIBUTE_DROPSHADOW: return "dropshadow"; case ATTRIBUTE_DROPSHADOWSTRENGTH: return "dropshadowstrength"; - case ATTRIBUTE_DROPSHADOWOFFSET: return "dropshadowoffset"; case ATTRIBUTE_DROPSHADOWOFFSETX: return "dropshadowoffsetx"; case ATTRIBUTE_DROPSHADOWOFFSETY: return "dropshadowoffsety"; - case ATTRIBUTE_DROPSHADOWHORZALIGN: return "dropshadowhorzalign"; - case ATTRIBUTE_DROPSHADOWVERTALIGN: return "dropshadowvertalign"; case ATTRIBUTE_BOUNDINGBOX: return "boundingbox"; case ATTRIBUTE_BOUNDINGBOX_X: return "boundingbox.x"; case ATTRIBUTE_BOUNDINGBOX_Y: return "boundingbox.y"; diff --git a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h index 3cbc165a..b2aa2280 100644 --- a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h +++ b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h @@ -217,11 +217,8 @@ enum EAttribute { ATTRIBUTE_FONT = 0x03412331, // font ATTRIBUTE_DROPSHADOW = 0x03E3F231, // dropshadow ATTRIBUTE_DROPSHADOWSTRENGTH = 0x03F8B7D0, // dropshadowstrength - ATTRIBUTE_DROPSHADOWOFFSET = 0x024A9C5E, // dropshadowoffset ATTRIBUTE_DROPSHADOWOFFSETX = 0x013298AA, // dropshadowoffsetx ATTRIBUTE_DROPSHADOWOFFSETY = 0x013398E9, // dropshadowoffsety - ATTRIBUTE_DROPSHADOWHORZALIGN = 0x00D1BC39, // dropshadowhorzalign - ATTRIBUTE_DROPSHADOWVERTALIGN = 0x038D589B, // dropshadowvertalign ATTRIBUTE_BOUNDINGBOX = 0x02F3B6D9, // boundingbox ATTRIBUTE_BOUNDINGBOX_X = 0x0272C10F, // boundingbox.x ATTRIBUTE_BOUNDINGBOX_Y = 0x0273C14E, // boundingbox.y diff --git a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt index 8eec133f..6a9508ef 100644 --- a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt +++ b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt @@ -184,11 +184,8 @@ size font dropshadow dropshadowstrength -dropshadowoffset dropshadowoffsetx dropshadowoffsety -dropshadowhorzalign -dropshadowvertalign boundingbox boundingbox.x boundingbox.y diff --git a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldRenderer.cpp b/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldRenderer.cpp index 21a090a8..960e0a2f 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldRenderer.cpp +++ b/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldRenderer.cpp @@ -864,8 +864,6 @@ size_t getTextHashValue(const SText &text) hashCombine(hashValue, text.m_DropShadowStrength); hashCombine(hashValue, text.m_VerticalAlignment); hashCombine(hashValue, text.m_HorizontalAlignment); - hashCombine(hashValue, text.m_DropShadowVerticalAlignment); - hashCombine(hashValue, text.m_DropShadowHorizontalAlignment); return hashValue; } diff --git a/src/Runtime/Source/runtimerender/Qt3DSQtTextRenderer.cpp b/src/Runtime/Source/runtimerender/Qt3DSQtTextRenderer.cpp index 4de7f9be..637aba94 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSQtTextRenderer.cpp +++ b/src/Runtime/Source/runtimerender/Qt3DSQtTextRenderer.cpp @@ -545,33 +545,6 @@ struct Qt3DSQtTextRenderer : public ITextRenderer break; // Do nothing } - qreal shadowOffsetX = qreal(inSrcText.m_FontSize * inSrcText.m_DropShadowOffsetX) / 1000.; - qreal shadowOffsetY = qreal(inSrcText.m_FontSize * inSrcText.m_DropShadowOffsetY) / 1000.; - // To be removed in 2.x (when UIP version is next updated) - if (inSrcText.m_DropShadow && shadowOffsetX == 0. && shadowOffsetY == 0.) { - const qreal offset = qreal(inSrcText.m_DropShadowOffset) / 10.; - switch (inSrcText.m_DropShadowHorizontalAlignment) { - case TextHorizontalAlignment::Left: - shadowOffsetX = -offset; - break; - case TextHorizontalAlignment::Right: - shadowOffsetX = offset; - break; - default: - break; - } - switch (inSrcText.m_DropShadowVerticalAlignment) { - case TextVerticalAlignment::Top: - shadowOffsetY = -offset; - break; - case TextVerticalAlignment::Bottom: - shadowOffsetY = offset; - break; - default: - break; - } - } - int wordWrapFlags = 0; if (dynamicTextArea) { wordWrapFlags = Qt::TextDontClip; @@ -607,6 +580,10 @@ struct Qt3DSQtTextRenderer : public ITextRenderer QRectF bound(xTranslation, qreal(nextHeight), lineWidths.at(i), lineHeight); QRectF actualBound; if (inSrcText.m_DropShadow) { + qreal shadowOffsetX = qreal(inSrcText.m_FontSize * inSrcText.m_DropShadowOffsetX) + / 1000.; + qreal shadowOffsetY = qreal(inSrcText.m_FontSize * inSrcText.m_DropShadowOffsetY) + / 1000.; QRectF boundShadow(xTranslation + shadowOffsetX, nextHeight + shadowOffsetY, qreal(lineWidths.at(i)), lineHeight); // shadow is a darker shade of the given font color diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.cpp index 304e64b6..5711d36f 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.cpp +++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTextureCache.cpp @@ -55,14 +55,11 @@ struct hash<STextRenderInfo> retval = retval ^ hash<float>()(inInfo.m_Tracking); retval = retval ^ hash<bool>()(inInfo.m_DropShadow); retval = retval ^ hash<float>()(inInfo.m_DropShadowStrength); - retval = retval ^ hash<float>()(inInfo.m_DropShadowOffset); // To be removed in 2.x (when UIP version is next updated) retval = retval ^ hash<float>()(inInfo.m_DropShadowOffsetX); retval = retval ^ hash<float>()(inInfo.m_DropShadowOffsetY); retval = retval ^ hash<float>()(inInfo.m_BoundingBox.x); retval = retval ^ hash<float>()(inInfo.m_BoundingBox.y); retval = retval ^ hash<int>()(static_cast<int>(inInfo.m_Elide)); - retval = retval ^ hash<int>()(static_cast<int>(inInfo.m_DropShadowHorizontalAlignment)); // To be removed in 2.x (when UIP version is next updated) - retval = retval ^ hash<int>()(static_cast<int>(inInfo.m_DropShadowVerticalAlignment)); // To be removed in 2.x (when UIP version is next updated) retval = retval ^ hash<int>()(static_cast<int>(inInfo.m_WordWrap)); retval = retval ^ hash<bool>()(inInfo.m_EnableAcceleratedFont); return retval; @@ -92,10 +89,6 @@ struct STextRenderInfoAndHash && m_Info.m_Tracking == inOther.m_Info.m_Tracking && m_Info.m_DropShadow == inOther.m_Info.m_DropShadow && m_Info.m_DropShadowStrength == inOther.m_Info.m_DropShadowStrength - && m_Info.m_DropShadowOffset == inOther.m_Info.m_DropShadowOffset - && m_Info.m_DropShadowHorizontalAlignment - == inOther.m_Info.m_DropShadowHorizontalAlignment - && m_Info.m_DropShadowVerticalAlignment == inOther.m_Info.m_DropShadowVerticalAlignment && m_Info.m_BoundingBox == inOther.m_Info.m_BoundingBox && m_Info.m_WordWrap == inOther.m_Info.m_WordWrap && m_Info.m_EnableAcceleratedFont == inOther.m_Info.m_EnableAcceleratedFont diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h index 72ea9c15..bbaaa38d 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h +++ b/src/Runtime/Source/runtimerender/Qt3DSRenderTextTypes.h @@ -173,11 +173,8 @@ namespace render { QT3DSF32 m_Tracking; // space between letters bool m_DropShadow; QT3DSF32 m_DropShadowStrength; - QT3DSF32 m_DropShadowOffset; // To be removed in 2.x (when UIP version is next updated) QT3DSF32 m_DropShadowOffsetX; QT3DSF32 m_DropShadowOffsetY; - TextHorizontalAlignment::Enum m_DropShadowHorizontalAlignment; // To be removed in 2.x (when UIP version is next updated) - TextVerticalAlignment::Enum m_DropShadowVerticalAlignment; // To be removed in 2.x (when UIP version is next updated) TextWordWrap::Enum m_WordWrap; QT3DSVec2 m_BoundingBox; TextElide::Enum m_Elide; @@ -185,7 +182,7 @@ namespace render { QT3DSF32 m_ScaleX; // Pixel scale in X QT3DSF32 m_ScaleY; // Pixel scale in Y - bool m_EnableAcceleratedFont; ///< use NV path rendering + bool m_EnableAcceleratedFont; // use NV path rendering STextRenderInfo(); ~STextRenderInfo(); diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp index ce8dd631..9aad3973 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp +++ b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPLoader.cpp @@ -843,11 +843,8 @@ struct SRenderUIPLoader : public IDOMReferenceResolver #define Text_Tracking "tracking" #define Text_DropShadow "dropshadow" #define Text_DropShadowStrength "dropshadowstrength" -#define Text_DropShadowOffset "dropshadowoffset" // To be removed in 2.x (when UIP version is next updated) #define Text_DropShadowOffsetX "dropshadowoffsetx" #define Text_DropShadowOffsetY "dropshadowoffsety" -#define Text_DropShadowHorizontalAlignment "dropshadowhorzalign" // To be removed in 2.x (when UIP version is next updated) -#define Text_DropShadowVerticalAlignment "dropshadowvertalign" // To be removed in 2.x (when UIP version is next updated) #define Text_WordWrap "wordwrap" #define Text_BoundingBox "boundingbox" #define Text_Elide "elide" diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.h b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.h index 8ba74eae..16ce139d 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.h +++ b/src/Runtime/Source/runtimerender/Qt3DSRenderUIPSharedTranslation.h @@ -452,11 +452,8 @@ namespace render { HANDLE_QT3DS_RENDER_PROPERTY(Text, Tracking, TextDirty) \ HANDLE_QT3DS_RENDER_PROPERTY(Text, DropShadow, TextDirty) \ HANDLE_QT3DS_RENDER_PROPERTY(Text, DropShadowStrength, TextDirty) \ - HANDLE_QT3DS_RENDER_PROPERTY(Text, DropShadowOffset, TextDirty) \ HANDLE_QT3DS_RENDER_PROPERTY(Text, DropShadowOffsetX, TextDirty) \ HANDLE_QT3DS_RENDER_PROPERTY(Text, DropShadowOffsetY, TextDirty) \ - HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Text, DropShadowHorizontalAlignment, TextDirty) \ - HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Text, DropShadowVerticalAlignment, TextDirty) \ HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Text, WordWrap, TextDirty) \ HANDLE_QT3DS_RENDER_REAL_VEC2_PROPERTY(Text, BoundingBox, TextDirty) \ HANDLE_QT3DS_RENDER_ENUM_PROPERTY(Text, Elide, TextDirty) \ diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp index b76240b4..40a20c48 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderText.cpp @@ -39,11 +39,8 @@ STextRenderInfo::STextRenderInfo() , m_Tracking(0) , m_DropShadow(false) , m_DropShadowStrength(80) - , m_DropShadowOffset(10) , m_DropShadowOffsetX(0) , m_DropShadowOffsetY(0) - , m_DropShadowHorizontalAlignment(TextHorizontalAlignment::Right) - , m_DropShadowVerticalAlignment(TextVerticalAlignment::Bottom) , m_WordWrap(TextWordWrap::WrapWord) , m_BoundingBox(QT3DSVec2(0 ,0)) , m_Elide(TextElide::ElideNone) @@ -60,7 +57,7 @@ STextRenderInfo::~STextRenderInfo() SText::SText() : SNode(GraphObjectTypes::Text) , m_TextColor(1, 1, 1, 1) - , m_TextTexture(NULL) + , m_TextTexture(nullptr) { m_Bounds.setEmpty(); } |