Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed rendering on battle end screen

Browse Source
This commit is contained in:
Mark Vejvoda 2012-05-28 02:36:12 +00:00
parent e014ecbd94
commit 68bfe9e455
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/glest_game/graphics/renderer.cpp
View File

@ -190,8 +190,8 @@ Renderer::Renderer() : BaseRenderer() {
//list3dMenu=0; //list3dMenu=0;
//list3dMenuValid=false; //list3dMenuValid=false;
//customlist3dMenu=NULL; //customlist3dMenu=NULL;
mm3d = NULL; this->mm3d = NULL;
custom_mm3d = NULL; this->custom_mm3d = NULL;
this->program = NULL; this->program = NULL;
@ -554,6 +554,9 @@ void Renderer::reset2d() {
void Renderer::reset3dMenu() { void Renderer::reset3dMenu() {
assertGl(); assertGl();
glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SINGLE_COLOR); glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SINGLE_COLOR);
//printf("In [%s::%s Line: %d] this->custom_mm3d [%p] this->mm3d [%p]\n",__FILE__,__FUNCTION__,__LINE__,this->custom_mm3d,this->mm3d);
if(this->custom_mm3d != NULL) { if(this->custom_mm3d != NULL) {
render3dMenuSetup(this->custom_mm3d); render3dMenuSetup(this->custom_mm3d);
//glCallList(*this->customlist3dMenu); //glCallList(*this->customlist3dMenu);
@ -7148,6 +7151,8 @@ void Renderer::init3dListMenu(const MainMenu *mm) {
} }
this->mm3d = mm; this->mm3d = mm;
//printf("In [%s::%s Line: %d] this->custom_mm3d [%p] this->mm3d [%p]\n",__FILE__,__FUNCTION__,__LINE__,this->custom_mm3d,this->mm3d);
/* /*
assertGl(); assertGl();

4
source/glest_game/main/battle_end.cpp
View File

@ -121,16 +121,18 @@ void BattleEnd::render() {
canRender(); canRender();
incrementFps(); incrementFps();
//printf("In [%s::%s Line: %d] renderToTexture [%p]\n",__FILE__,__FUNCTION__,__LINE__,renderToTexture);
if(renderToTexture != NULL) { if(renderToTexture != NULL) {
//printf("Rendering from texture!\n"); //printf("Rendering from texture!\n");
renderer.clearBuffers(); renderer.clearBuffers();
renderer.reset3dMenu(); renderer.reset3dMenu();
renderer.clearZBuffer(); renderer.clearZBuffer();
renderer.renderBackground(renderToTexture);
renderer.reset2d(); renderer.reset2d();
renderer.renderBackground(renderToTexture);
renderer.renderButton(&buttonExit); renderer.renderButton(&buttonExit);
//exit message box //exit message box

2
source/glest_game/menu/main_menu.cpp
View File

@ -136,6 +136,8 @@ void MainMenu::render() {
renderer.reset3dMenu(); renderer.reset3dMenu();
renderer.clearZBuffer(); renderer.clearZBuffer();
//printf("In [%s::%s Line: %d] menuBackgroundVideo [%p]\n",__FILE__,__FUNCTION__,__LINE__,menuBackgroundVideo);
if(menuBackgroundVideo == NULL) { if(menuBackgroundVideo == NULL) {
renderer.loadCameraMatrix(menuBackground.getCamera()); renderer.loadCameraMatrix(menuBackground.getCamera());
renderer.renderMenuBackground(&menuBackground); renderer.renderMenuBackground(&menuBackground);