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

- made some small performance updates for rendering and updated beta version number

Browse Source
This commit is contained in:
Mark Vejvoda 2010-06-25 05:41:50 +00:00
parent 848d953bd7
commit 646e8593f4
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/facilities/game_util.cpp
View File

@ -26,7 +26,7 @@ using namespace Shared::Platform;
namespace Glest{ namespace Game{
const string mailString= "contact_game@glest.org";
const string glestVersionString= "v3.3.5-beta12";
const string glestVersionString= "v3.3.5-beta13";
string getCrashDumpFileName(){
return "glest" + glestVersionString + ".dmp";

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

@ -458,7 +458,7 @@ void Renderer::renderParticleManager(ResourceScope rs){
}
void Renderer::swapBuffers(){
glFlush();
//glFlush(); // should not be required - http://www.opengl.org/wiki/Common_Mistakes
GraphicsInterface::getInstance().getCurrentContext()->swapBuffers();
}

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

@ -106,10 +106,10 @@ void BattleEnd::render(){
Vec3f color = stats.getPlayerColor(i);
if(stats.getPlayerName(i) != "") {
textRenderer->render(stats.getPlayerName(i).c_str(), textX, bm+400, false, color);
textRenderer->render(stats.getPlayerName(i).c_str(), textX, bm+400, false, &color);
}
else {
textRenderer->render((lang.get("Player")+" "+intToStr(i+1)).c_str(), textX, bm+400,false, color);
textRenderer->render((lang.get("Player")+" "+intToStr(i+1)).c_str(), textX, bm+400,false, &color);
}
textRenderer->render(stats.getVictory(i)? lang.get("Victory").c_str(): lang.get("Defeat").c_str(), textX, bm+360);
textRenderer->render(controlString, textX, bm+320);

4
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -1147,6 +1147,7 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) {
// First save Used slots
//for(int i=0; i<mapInfo.players; ++i)
int AIPlayerCount = 0;
for(int i = 0; i < GameConstants::maxPlayers; ++i) {
ControlType ct= static_cast<ControlType>(listBoxControls[i].getSelectedItemIndex());
if(ct != ctClosed) {
@ -1173,7 +1174,8 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) {
gameSettings->setNetworkPlayerName(slotIndex, Config::getInstance().getString("NetPlayerName",Socket::getHostName().c_str()));
}
else {
gameSettings->setNetworkPlayerName(slotIndex, "Closed");
AIPlayerCount++;
gameSettings->setNetworkPlayerName(slotIndex, string("AI") + intToStr(AIPlayerCount));
}
factionCount++;

2
source/shared_lib/include/graphics/gl/text_renderer_gl.h
View File

@ -32,7 +32,7 @@ public:
TextRenderer2DGl();
virtual void begin(const Font2D *font);
virtual void render(const string &text, int x, int y, bool centered, Vec3f color);
virtual void render(const string &text, int x, int y, bool centered, Vec3f *color=NULL);
virtual void end();
};

2
source/shared_lib/include/graphics/text_renderer.h
View File

@ -30,7 +30,7 @@ public:
virtual ~TextRenderer2D(){};
virtual void begin(const Font2D *font)= 0;
virtual void render(const string &text, int x, int y, bool centered= false,Vec3f color=Vec3f(-1.0))= 0;
virtual void render(const string &text, int x, int y, bool centered= false,Vec3f *color=NULL)= 0;
virtual void end()= 0;
};

8
source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp
View File

@ -32,14 +32,14 @@ void TextRenderer2DGl::begin(const Font2D *font){
this->font= static_cast<const Font2DGl*>(font);
}
void TextRenderer2DGl::render(const string &text, int x, int y, bool centered, Vec3f color) {
void TextRenderer2DGl::render(const string &text, int x, int y, bool centered, Vec3f *color) {
assert(rendering);
assertGl();
if(color.x >= 0) {
if(color != NULL) {
glPushAttrib(GL_CURRENT_BIT);
glColor3fv(color.ptr());
glColor3fv(color->ptr());
}
int line=0;
@ -73,7 +73,7 @@ void TextRenderer2DGl::render(const string &text, int x, int y, bool centered, V
}
}
if(color.x >= 0) {
if(color != NULL) {
glPopAttrib();
}
assertGl();