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

delayed loading of previews

This commit is contained in:
Titus Tscharntke 2011-03-31 00:33:40 +00:00
parent a3029e6e25
commit 2a48f8e290
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
source/glest_game/menu/menu_state_scenario.cpp
View File

@ -37,6 +37,8 @@ MenuStateScenario::MenuStateScenario(Program *program, MainMenu *mainMenu, const
containerName = "Scenario";
enableScenarioTexturePreview=false;
scenarioLogoTexture=NULL;
previewLoadDelayTimer=time(NULL);
needToLoadTextures=true;
Lang &lang= Lang::getInstance();
NetworkManager &networkManager= NetworkManager::getInstance();
@ -51,21 +53,24 @@ MenuStateScenario::MenuStateScenario(Program *program, MainMenu *mainMenu, const
this->dirList = dirList;
int startY=100;
int startX=350;
labelInfo.registerGraphicComponent(containerName,"labelInfo");
labelInfo.init(350, 350);
labelInfo.init(startX, startY+130);
labelInfo.setFont(CoreData::getInstance().getMenuFontNormal());
buttonReturn.registerGraphicComponent(containerName,"buttonReturn");
buttonReturn.init(350, 200, 125);
buttonReturn.init(startX, startY, 125);
buttonPlayNow.registerGraphicComponent(containerName,"buttonPlayNow");
buttonPlayNow.init(525, 200, 125);
buttonPlayNow.init(startX+175, startY, 125);
listBoxScenario.registerGraphicComponent(containerName,"listBoxScenario");
listBoxScenario.init(350, 400, 190);
listBoxScenario.init(startX, startY+160, 190);
labelScenario.registerGraphicComponent(containerName,"labelScenario");
labelScenario.init(350, 430);
labelScenario.init(startX, startY+190);
buttonReturn.setText(lang.get("Return"));
buttonPlayNow.setText(lang.get("PlayNow"));
@ -160,7 +165,8 @@ void MenuStateScenario::render(){
Renderer &renderer= Renderer::getInstance();
if(scenarioLogoTexture != NULL) {
renderer.renderBackground(scenarioLogoTexture);
renderer.renderTextureQuad(300,350,400,300,scenarioLogoTexture,1.0f);
//renderer.renderBackground(scenarioLogoTexture);
}
if(mainMessageBox.getEnabled()){
@ -199,6 +205,14 @@ void MenuStateScenario::update(){
launchGame();
}
}
if(needToLoadTextures){
// this delay is done to make it possible to switch faster
if(difftime(time(NULL), previewLoadDelayTimer) >= 2){
loadScenarioPreviewTexture();
needToLoadTextures= false;
}
}
}
void MenuStateScenario::launchGame(){
@ -322,24 +336,28 @@ void MenuStateScenario::loadScenarioInfo(string file, ScenarioInfo *scenarioInfo
scenarioInfo->fogOfWar = true;
scenarioInfo->fogOfWar_exploredFlag = false;
}
scenarioLogoTexture = NULL;
previewLoadDelayTimer=time(NULL);
needToLoadTextures=true;
}
void MenuStateScenario::loadScenarioPreviewTexture(){
enableScenarioTexturePreview = true;
if(enableScenarioTexturePreview == true) {
GameSettings gameSettings;
loadGameSettings(scenarioInfo, &gameSettings);
if(enableScenarioTexturePreview == true) {
GameSettings gameSettings;
loadGameSettings(&scenarioInfo, &gameSettings);
string scenarioLogo = "";
bool loadingImageUsed = false;
string scenarioLogo = "";
bool loadingImageUsed = false;
Game::extractScenarioLogoFile(&gameSettings, scenarioLogo, loadingImageUsed);
if(scenarioLogo != "") {
scenarioLogoTexture = Renderer::findFactionLogoTexture(scenarioLogo);
Game::extractScenarioLogoFile(&gameSettings, scenarioLogo, loadingImageUsed);
if(scenarioLogo != "") {
scenarioLogoTexture = Renderer::findFactionLogoTexture(scenarioLogo);
}
else {
scenarioLogoTexture = NULL;
}
}
else {
scenarioLogoTexture = NULL;
}
}
}
void MenuStateScenario::loadGameSettings(const ScenarioInfo *scenarioInfo, GameSettings *gameSettings){

4
source/glest_game/menu/menu_state_scenario.h
View File

@ -49,6 +49,9 @@ private:
string autoloadScenarioName;
time_t previewLoadDelayTimer;
bool needToLoadTextures;
bool enableScenarioTexturePreview;
Texture2D *scenarioLogoTexture;
@ -70,6 +73,7 @@ private:
void loadScenarioInfo(string file, ScenarioInfo *scenarioInfo);
void loadGameSettings(const ScenarioInfo *scenarioInfo, GameSettings *gameSettings);
void loadScenarioPreviewTexture();
Difficulty computeDifficulty(const ScenarioInfo *scenarioInfo);
ControlType strToControllerType(const string &str);
void showMessageBox(const string &text, const string &header, bool toggle);