Configure shadow outline in applications
This commit is contained in:
parent
0d2e4af712
commit
c175dec5d8
14 changed files with 23 additions and 0 deletions
|
@ -345,6 +345,7 @@ void displayStreamingDebug ()
|
||||||
//----------------//
|
//----------------//
|
||||||
// Create a shadow when displaying a text.
|
// Create a shadow when displaying a text.
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
// Set the font size.
|
// Set the font size.
|
||||||
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
||||||
// Set the text color
|
// Set the text color
|
||||||
|
@ -390,6 +391,7 @@ void displayStreamingDebug ()
|
||||||
|
|
||||||
// No more shadow when displaying a text.
|
// No more shadow when displaying a text.
|
||||||
TextContext->setShaded(false);
|
TextContext->setShaded(false);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -567,6 +569,7 @@ void displayNetDebug ()
|
||||||
//----------------//
|
//----------------//
|
||||||
// Create a shadow when displaying a text.
|
// Create a shadow when displaying a text.
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
// Set the font size.
|
// Set the font size.
|
||||||
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
||||||
// Set the text color
|
// Set the text color
|
||||||
|
|
|
@ -134,6 +134,7 @@ void CGraph::renderGraph ()
|
||||||
if (TextContext != NULL)
|
if (TextContext != NULL)
|
||||||
{
|
{
|
||||||
TextContext->setShaded (false);
|
TextContext->setShaded (false);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
TextContext->setHotSpot (UTextContext::MiddleLeft);
|
TextContext->setHotSpot (UTextContext::MiddleLeft);
|
||||||
TextContext->setColor (frontCol);
|
TextContext->setColor (frontCol);
|
||||||
TextContext->setFontSize (10);
|
TextContext->setFontSize (10);
|
||||||
|
|
|
@ -807,6 +807,7 @@ void CTestGroundFX::displayFXBoxes() const
|
||||||
Driver->setFrustum(fr);
|
Driver->setFrustum(fr);
|
||||||
TextContext->setColor(CRGBA::Green);
|
TextContext->setColor(CRGBA::Green);
|
||||||
TextContext->setShaded(false);
|
TextContext->setShaded(false);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
TextContext->setFontSize(12);
|
TextContext->setFontSize(12);
|
||||||
//
|
//
|
||||||
float size = 0.4f;
|
float size = 0.4f;
|
||||||
|
|
|
@ -157,6 +157,7 @@ CViewBase *CChatTextManager::createMsgText(const ucstring &cstMsg, NLMISC::CRGBA
|
||||||
CViewText *vt = new CViewText(CViewText::TCtorParam());
|
CViewText *vt = new CViewText(CViewText::TCtorParam());
|
||||||
// get parameters from config.xml
|
// get parameters from config.xml
|
||||||
vt->setShadow(isTextShadowed());
|
vt->setShadow(isTextShadowed());
|
||||||
|
vt->setShadowOutline(false);
|
||||||
vt->setFontSize(getTextFontSize());
|
vt->setFontSize(getTextFontSize());
|
||||||
vt->setMultiLine(true);
|
vt->setMultiLine(true);
|
||||||
vt->setTextMode(justified ? CViewText::Justified : CViewText::DontClipWord);
|
vt->setTextMode(justified ? CViewText::Justified : CViewText::DontClipWord);
|
||||||
|
|
|
@ -880,6 +880,7 @@ void CDBGroupListSheetText::setup()
|
||||||
text->setFontSize(_TextTemplate.getFontSize());
|
text->setFontSize(_TextTemplate.getFontSize());
|
||||||
text->setColor(_TextTemplate.getColor());
|
text->setColor(_TextTemplate.getColor());
|
||||||
text->setShadow(_TextTemplate.getShadow());
|
text->setShadow(_TextTemplate.getShadow());
|
||||||
|
text->setShadowOutline(_TextTemplate.getShadowOutline());
|
||||||
text->setLineMaxW(_TextTemplate.getLineMaxW());
|
text->setLineMaxW(_TextTemplate.getLineMaxW());
|
||||||
text->setMultiLine(_TextTemplate.getMultiLine());
|
text->setMultiLine(_TextTemplate.getMultiLine());
|
||||||
if(text->getMultiLine())
|
if(text->getMultiLine())
|
||||||
|
|
|
@ -95,6 +95,7 @@ void CDBGroupListSheetTextBrickComposition::CSheetChildBrick::init(CDBGroupListS
|
||||||
text->setFontSize(compoList->getTextTemplate().getFontSize());
|
text->setFontSize(compoList->getTextTemplate().getFontSize());
|
||||||
text->setColor(compoList->getTextTemplate().getColor());
|
text->setColor(compoList->getTextTemplate().getColor());
|
||||||
text->setShadow(compoList->getTextTemplate().getShadow());
|
text->setShadow(compoList->getTextTemplate().getShadow());
|
||||||
|
text->setShadowOutline(compoList->getTextTemplate().getShadowOutline());
|
||||||
text->setMultiLine(false);
|
text->setMultiLine(false);
|
||||||
text->setModulateGlobalColor(compoList->getTextTemplate().getModulateGlobalColor());
|
text->setModulateGlobalColor(compoList->getTextTemplate().getModulateGlobalColor());
|
||||||
|
|
||||||
|
|
|
@ -121,6 +121,7 @@ void CDBGroupListSheetTextShare::CSheetChildShare::init(CDBGroupListSheetText *p
|
||||||
text->setFontSize(compoList->getTextTemplate().getFontSize());
|
text->setFontSize(compoList->getTextTemplate().getFontSize());
|
||||||
text->setColor(compoList->getTextTemplate().getColor());
|
text->setColor(compoList->getTextTemplate().getColor());
|
||||||
text->setShadow(compoList->getTextTemplate().getShadow());
|
text->setShadow(compoList->getTextTemplate().getShadow());
|
||||||
|
text->setShadowOutline(compoList->getTextTemplate().getShadowOutline());
|
||||||
text->setMultiLine(false);
|
text->setMultiLine(false);
|
||||||
text->setModulateGlobalColor(compoList->getTextTemplate().getModulateGlobalColor());
|
text->setModulateGlobalColor(compoList->getTextTemplate().getModulateGlobalColor());
|
||||||
// Add it to the scrolled list.
|
// Add it to the scrolled list.
|
||||||
|
@ -139,6 +140,7 @@ void CDBGroupListSheetTextShare::CSheetChildShare::init(CDBGroupListSheetText *p
|
||||||
text->setFontSize(compoList->getTextTemplate().getFontSize());
|
text->setFontSize(compoList->getTextTemplate().getFontSize());
|
||||||
text->setColor(compoList->getTextTemplate().getColor());
|
text->setColor(compoList->getTextTemplate().getColor());
|
||||||
text->setShadow(compoList->getTextTemplate().getShadow());
|
text->setShadow(compoList->getTextTemplate().getShadow());
|
||||||
|
text->setShadowOutline(compoList->getTextTemplate().getShadowOutline());
|
||||||
text->setMultiLine(false);
|
text->setMultiLine(false);
|
||||||
text->setModulateGlobalColor(compoList->getTextTemplate().getModulateGlobalColor());
|
text->setModulateGlobalColor(compoList->getTextTemplate().getModulateGlobalColor());
|
||||||
// Add it to the scrolled list.
|
// Add it to the scrolled list.
|
||||||
|
|
|
@ -2333,6 +2333,7 @@ void CGroupMap::createLMWidgets(const std::vector<CContLandMark> &lms)
|
||||||
|
|
||||||
pNewText->setColor(CRGBA(255,255,255,255));
|
pNewText->setColor(CRGBA(255,255,255,255));
|
||||||
pNewText->setShadow(true);
|
pNewText->setShadow(true);
|
||||||
|
pNewText->setShadowOutline(false);
|
||||||
pNewText->setShadowColor(CRGBA(0,0,0,255));
|
pNewText->setShadowColor(CRGBA(0,0,0,255));
|
||||||
pNewText->setModulateGlobalColor(false);
|
pNewText->setModulateGlobalColor(false);
|
||||||
pNewText->Type = rCLM.Type;
|
pNewText->Type = rCLM.Type;
|
||||||
|
|
|
@ -1924,6 +1924,7 @@ bool mainLoop()
|
||||||
|
|
||||||
// Create a shadow when displaying a text.
|
// Create a shadow when displaying a text.
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
// Set the font size.
|
// Set the font size.
|
||||||
TextContext->setFontSize(10);
|
TextContext->setFontSize(10);
|
||||||
// Set the text color
|
// Set the text color
|
||||||
|
@ -2586,6 +2587,7 @@ void displaySpecialTextProgress(const char *text)
|
||||||
{
|
{
|
||||||
// Create a shadow when displaying a text.
|
// Create a shadow when displaying a text.
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
// Set the font size.
|
// Set the font size.
|
||||||
TextContext->setFontSize(12);
|
TextContext->setFontSize(12);
|
||||||
// Set the text color
|
// Set the text color
|
||||||
|
|
|
@ -80,6 +80,7 @@ void displayDebug()
|
||||||
//----------------//
|
//----------------//
|
||||||
// Create a shadow when displaying a text.
|
// Create a shadow when displaying a text.
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
// Set the font size.
|
// Set the font size.
|
||||||
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
||||||
// Set the text color
|
// Set the text color
|
||||||
|
@ -470,6 +471,7 @@ void displayDebug()
|
||||||
|
|
||||||
// No more shadow when displaying a text.
|
// No more shadow when displaying a text.
|
||||||
TextContext->setShaded(false);
|
TextContext->setShaded(false);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
}// displayDebug //
|
}// displayDebug //
|
||||||
|
|
||||||
// ********************************************************************
|
// ********************************************************************
|
||||||
|
@ -491,6 +493,7 @@ void displayDebugFps()
|
||||||
//----------------//
|
//----------------//
|
||||||
// Create a shadow when displaying a text.
|
// Create a shadow when displaying a text.
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
// Set the font size.
|
// Set the font size.
|
||||||
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
||||||
// Set the text color
|
// Set the text color
|
||||||
|
@ -533,6 +536,7 @@ void displayDebugUIUnderMouse()
|
||||||
//----------------//
|
//----------------//
|
||||||
// Create a shadow when displaying a text.
|
// Create a shadow when displaying a text.
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
// Set the font size.
|
// Set the font size.
|
||||||
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
TextContext->setFontSize(ClientCfg.DebugFontSize);
|
||||||
|
|
||||||
|
@ -707,6 +711,7 @@ void displayHelp()
|
||||||
|
|
||||||
// Create a shadow when displaying a text.
|
// Create a shadow when displaying a text.
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
// Set the font size.
|
// Set the font size.
|
||||||
TextContext->setFontSize(ClientCfg.HelpFontSize);
|
TextContext->setFontSize(ClientCfg.HelpFontSize);
|
||||||
// Set the text color
|
// Set the text color
|
||||||
|
@ -763,6 +768,7 @@ void displayHelp()
|
||||||
|
|
||||||
// No more shadow when displaying a text.
|
// No more shadow when displaying a text.
|
||||||
TextContext->setShaded(false);
|
TextContext->setShaded(false);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
}// displayHelp //
|
}// displayHelp //
|
||||||
|
|
||||||
// ********************************************************************
|
// ********************************************************************
|
||||||
|
|
|
@ -1789,6 +1789,7 @@ void CEditor::waitScenarioScreen()
|
||||||
if (!waitScreen)
|
if (!waitScreen)
|
||||||
{
|
{
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
TextContext->setFontSize(40);
|
TextContext->setFontSize(40);
|
||||||
TextContext->setColor(CRGBA::White);
|
TextContext->setColor(CRGBA::White);
|
||||||
|
|
||||||
|
|
|
@ -829,6 +829,7 @@ void CTimedFXManager::displayFXBoxes(TDebugDisplayMode displayMode) const
|
||||||
Driver->setFrustum(fr);
|
Driver->setFrustum(fr);
|
||||||
TextContext->setColor(CRGBA::Blue);
|
TextContext->setColor(CRGBA::Blue);
|
||||||
TextContext->setShaded(false);
|
TextContext->setShaded(false);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
TextContext->setFontSize(10);
|
TextContext->setFontSize(10);
|
||||||
//
|
//
|
||||||
float size = 0.4f;
|
float size = 0.4f;
|
||||||
|
|
|
@ -309,6 +309,7 @@ void CDisplay::init (CMainFrame *pMF)
|
||||||
_TextContext->setFontGenerator(NLMISC::CPath::getWindowsDirectory() + "Fonts\\arial.ttf");
|
_TextContext->setFontGenerator(NLMISC::CPath::getWindowsDirectory() + "Fonts\\arial.ttf");
|
||||||
_TextContext->setKeep800x600Ratio(true);
|
_TextContext->setKeep800x600Ratio(true);
|
||||||
_TextContext->setShaded(true);
|
_TextContext->setShaded(true);
|
||||||
|
_TextContext->setShadeOutline(false);
|
||||||
_TextContext->setShadeColor(NLMISC::CRGBA::Black);
|
_TextContext->setShadeColor(NLMISC::CRGBA::Black);
|
||||||
}
|
}
|
||||||
catch(...)
|
catch(...)
|
||||||
|
|
|
@ -327,6 +327,7 @@ void initCore()
|
||||||
ConfigFile->getVar("ScreenFull").asInt()==0));
|
ConfigFile->getVar("ScreenFull").asInt()==0));
|
||||||
TextContext = Driver->createTextContext(CPath::lookup(ConfigFile->getVar("FontName").asString()));
|
TextContext = Driver->createTextContext(CPath::lookup(ConfigFile->getVar("FontName").asString()));
|
||||||
TextContext->setShaded(true);
|
TextContext->setShaded(true);
|
||||||
|
TextContext->setShadeOutline(false);
|
||||||
TextContext->setKeep800x600Ratio(false);
|
TextContext->setKeep800x600Ratio(false);
|
||||||
// You can't call displayLoadingState() before init the loading state system
|
// You can't call displayLoadingState() before init the loading state system
|
||||||
displayLoadingState("Initialize Loading");
|
displayLoadingState("Initialize Loading");
|
||||||
|
|
Loading…
Reference in a new issue