- changed messagebox back to normal color and fixed lua displaytext to NOT fade
This commit is contained in:
parent
a28a20fd77
commit
34ff4bb2e7
|
@ -1297,7 +1297,7 @@ void Game::render2d(){
|
|||
|
||||
renderer.renderText(
|
||||
scriptManager.getDisplayText(), coreData.getMenuFontNormal(),
|
||||
fontColor, 200, 680, false);
|
||||
Vec3f(fontColor.x,fontColor.y,fontColor.z), 200, 680, false);
|
||||
}
|
||||
|
||||
if(program != NULL) program->renderProgramMsgBox();
|
||||
|
|
|
@ -1059,15 +1059,14 @@ void Renderer::renderButton(const GraphicButton *button){
|
|||
|
||||
//button
|
||||
Vec4f fontColor;
|
||||
|
||||
if(game!=NULL){
|
||||
fontColor=game->getGui()->getDisplay()->getColor();
|
||||
fontColor.w = GraphicComponent::getFade();
|
||||
}
|
||||
else {
|
||||
//if(game!=NULL){
|
||||
// fontColor=game->getGui()->getDisplay()->getColor();
|
||||
// fontColor.w = GraphicComponent::getFade();
|
||||
//}
|
||||
//else {
|
||||
// white shadowed is default ( in the menu for example )
|
||||
fontColor=Vec4f(1.f, 1.f, 1.f, GraphicComponent::getFade());
|
||||
}
|
||||
//}
|
||||
|
||||
//Vec4f color= Vec4f(1.f, 1.f, 1.f, GraphicComponent::getFade());
|
||||
Vec4f color= fontColor;
|
||||
|
@ -1212,14 +1211,13 @@ void Renderer::renderMessageBox(const GraphicMessageBox *messageBox){
|
|||
}
|
||||
|
||||
Vec4f fontColor;
|
||||
|
||||
if(game!=NULL){
|
||||
fontColor=game->getGui()->getDisplay()->getColor();
|
||||
}
|
||||
else {
|
||||
//if(game!=NULL){
|
||||
// fontColor=game->getGui()->getDisplay()->getColor();
|
||||
//}
|
||||
//else {
|
||||
// white shadowed is default ( in the menu for example )
|
||||
fontColor=Vec4f(1.f, 1.f, 1.f, 1.0f);
|
||||
}
|
||||
//}
|
||||
|
||||
//text
|
||||
renderTextShadow(
|
||||
|
|
Loading…
Reference in New Issue
Block a user