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

- in team mode always render two set of resources: 

- First set of resources is the team of selected units
  - SEcond set of resources is the team total
This commit is contained in:
SoftCoder 2014-01-29 22:47:55 -08:00
parent ce375073c1
commit b4807ed169
3 changed files with 171 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2334,25 +2334,37 @@ void Renderer::renderClock() {
} }
} }
bool Renderer::renderResourcesInTeamMode() {
bool result = false;
if(game != NULL && game->getGui() != NULL) {
if(game->isFlagType1BitEnabled(ft1_allow_shared_team_units) == true ||
game->isFlagType1BitEnabled(ft1_allow_shared_team_resources) == true) {
result = true;
}
}
return result;
}
void Renderer::renderResourceStatus() { void Renderer::renderResourceStatus() {
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) { if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
return; return;
} }
const Metrics &metrics = Metrics::getInstance();
const World *world = game->getWorld(); const World *world = game->getWorld();
if(world->getThisFactionIndex() < 0 || if(world->getThisFactionIndex() < 0 ||
world->getThisFactionIndex() >= world->getFactionCount()) { world->getThisFactionIndex() >= world->getFactionCount()) {
return; return;
} }
const Faction *thisFaction = world->getFaction(world->getThisFactionIndex()); const Faction *thisFaction = world->getFaction(world->getThisFactionIndex());
const Vec4f fontColor = game->getGui()->getDisplay()->getColor();
assertGl();
assertGl();
glPushAttrib(GL_ENABLE_BIT); glPushAttrib(GL_ENABLE_BIT);
int rowsRendered = 0;
int resourceCountRendered = 0; int resourceCountRendered = 0;
for(int techTreeResourceTypeIndex = 0; for(int techTreeResourceTypeIndex = 0;
techTreeResourceTypeIndex < world->getTechTree()->getResourceTypeCount(); techTreeResourceTypeIndex < world->getTechTree()->getResourceTypeCount();
@ -2367,125 +2379,70 @@ void Renderer::renderResourceStatus() {
const Faction *factionForResourceView = thisFaction; const Faction *factionForResourceView = thisFaction;
bool localFactionResourcesOnly = false; bool localFactionResourcesOnly = false;
if(game != NULL && game->getGui() != NULL) { if(renderResourcesInTeamMode() == true) {
if(game->isFlagType1BitEnabled(ft1_allow_shared_team_units) == true || const Gui *gui = game->getGui();
game->isFlagType1BitEnabled(ft1_allow_shared_team_resources) == true) { if(gui != NULL) {
const Gui *gui = game->getGui(); const Selection *selection = gui->getSelection();
if(gui != NULL) { if(selection != NULL && selection->getCount() > 0 && selection->getFrontUnit() != NULL) {
const Selection *selection = gui->getSelection(); const Unit *selectedUnit = selection->getFrontUnit();
if(selection != NULL && selection->getCount() > 0 && selection->getFrontUnit() != NULL) { // if(selectedUnit != NULL && selectedUnit->getType()->hasSkillClass(scBeBuilt) == true) {
//
// if(selectedUnit->getFactionIndex() == thisFaction->getIndex() ||
// selectedUnit->getFaction()->isAlly(thisFaction) == true) {
//
// factionForResourceView = selectedUnit->getFaction();
// localFactionResourcesOnly = true;
// }
// }
const Unit *selectedUnit = selection->getFrontUnit(); if(selectedUnit != NULL && selectedUnit->getFaction()->isAlly(thisFaction) == true) {
if(selectedUnit != NULL && selectedUnit->getType()->hasSkillClass(scBeBuilt) == true) { factionForResourceView = selectedUnit->getFaction();
localFactionResourcesOnly = true;
if(selectedUnit->getFactionIndex() == thisFaction->getIndex() ||
selectedUnit->getFaction()->isAlly(thisFaction) == true) {
factionForResourceView = selectedUnit->getFaction();
localFactionResourcesOnly = true;
}
}
} }
} }
else {
factionForResourceView = thisFaction;
localFactionResourcesOnly = true;
}
} }
} }
//if any unit produces the resource //if any unit produces the resource
bool showResource = world->showResourceTypeForFaction(rt, factionForResourceView, localFactionResourcesOnly); bool showResource = world->showResourceTypeForFaction(rt, factionForResourceView, false);
//draw resource status
if(showResource == true) { if(showResource == true) {
rowsRendered = renderResource(factionForResourceView,localFactionResourcesOnly,
rt, 0, resourceCountRendered);
}
}
if(localFactionResourcesOnly == true) { // If we rendered single player resources above and we are in team mode,
string str = "*"; // lets render team totals next
Vec4f resourceFontColor = Vec4f(factionForResourceView->getTexture()->getPixmapConst()->getPixel3f(0,0)); if(renderResourcesInTeamMode() == true) {
int resourceCol = 0; if(rowsRendered > 0 || resourceCountRendered > 0) {
int resourceRow = 0; rowsRendered++;
}
resourceCountRendered = 0;
for(int techTreeResourceTypeIndex = 0;
techTreeResourceTypeIndex < world->getTechTree()->getResourceTypeCount();
++techTreeResourceTypeIndex) {
if(renderText3DEnabled == true) { const ResourceType *rt = world->getTechTree()->getResourceType(techTreeResourceTypeIndex);
renderTextShadow3D(
str, CoreData::getInstance().getDisplayFontSmall3D(), if ( rt->getDisplayInHud() == false ) {
resourceFontColor, continue;
resourceCol * 100 + 190, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
else {
renderTextShadow(
str, CoreData::getInstance().getDisplayFontSmall(),
resourceFontColor,
resourceCol * 100 + 190, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
} }
const Resource *r = factionForResourceView->getResource(rt,localFactionResourcesOnly); const Faction *factionForResourceView = thisFaction;
string str = intToStr(r->getAmount()); bool localFactionResourcesOnly = false;
glEnable(GL_TEXTURE_2D); bool showResource = world->showResourceTypeForFaction(rt, factionForResourceView, localFactionResourcesOnly);
if(showResource == true) {
Vec4f resourceFontColor = fontColor; renderResource(factionForResourceView,localFactionResourcesOnly,
rt, rowsRendered, resourceCountRendered);
bool isNegativeConsumableDisplayCycle = false;
if(rt->getClass() == rcConsumable) {
// Show in yellow/orange/red font if negative
if(r->getBalance() * 5 + r->getAmount() < 0) {
if(time(NULL) % 2 == 0) {
isNegativeConsumableDisplayCycle = true;
if(r->getBalance() * 1 + r->getAmount() < 0) {
glColor3f(RED.x,RED.y,RED.z);
resourceFontColor = RED;
}
else if(r->getBalance() * 3 + r->getAmount() < 0) {
glColor3f(ORANGE.x,ORANGE.y,ORANGE.z);
resourceFontColor = ORANGE;
}
else if(r->getBalance() * 5 + r->getAmount() < 0) {
glColor3f(YELLOW.x,YELLOW.y,YELLOW.z);
resourceFontColor = YELLOW;
}
}
}
} }
if(isNegativeConsumableDisplayCycle == false) {
glColor3f(1.f, 1.f, 1.f);
}
const int MAX_RESOURCES_PER_ROW = 6;
int resourceRow = (resourceCountRendered > 0 ? resourceCountRendered / MAX_RESOURCES_PER_ROW : 0);
int resourceCol = resourceCountRendered % MAX_RESOURCES_PER_ROW;
renderQuad(resourceCol * 100 + 200, metrics.getVirtualH()-30 - (30 * resourceRow), 16, 16, rt->getImage());
if(rt->getClass() != rcStatic) {
str+= "/" + intToStr(factionForResourceView->getStoreAmount(rt,localFactionResourcesOnly));
}
if(rt->getClass() == rcConsumable) {
str+= "(";
if(r->getBalance() > 0) {
str+= "+";
}
str+= intToStr(r->getBalance()) + ")";
}
glDisable(GL_TEXTURE_2D);
if(renderText3DEnabled == true) {
renderTextShadow3D(
str, CoreData::getInstance().getDisplayFontSmall3D(),
resourceFontColor,
resourceCol * 100 + 220, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
else {
renderTextShadow(
str, CoreData::getInstance().getDisplayFontSmall(),
resourceFontColor,
resourceCol * 100 + 220, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
++resourceCountRendered;
} }
} }
@ -2494,6 +2451,105 @@ void Renderer::renderResourceStatus() {
assertGl(); assertGl();
} }
int Renderer::renderResource(const Faction *factionForResourceView,bool localFactionResourcesOnly,
const ResourceType *rt, int startRow, int &resourceCountRendered) {
const Metrics &metrics = Metrics::getInstance();
//draw resource status
if(localFactionResourcesOnly == true) {
string str = "*";
Vec4f resourceFontColor = Vec4f(factionForResourceView->getTexture()->getPixmapConst()->getPixel3f(0,0));
int resourceCol = 0;
int resourceRow = startRow;
if(renderText3DEnabled == true) {
renderTextShadow3D(
str, CoreData::getInstance().getDisplayFontSmall3D(),
resourceFontColor,
resourceCol * 100 + 190, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
else {
renderTextShadow(
str, CoreData::getInstance().getDisplayFontSmall(),
resourceFontColor,
resourceCol * 100 + 190, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
}
const Resource *r = factionForResourceView->getResource(rt,localFactionResourcesOnly);
string str = intToStr(r->getAmount());
glEnable(GL_TEXTURE_2D);
const Vec4f fontColor = game->getGui()->getDisplay()->getColor();
Vec4f resourceFontColor = fontColor;
bool isNegativeConsumableDisplayCycle = false;
if(rt->getClass() == rcConsumable) {
// Show in yellow/orange/red font if negative
if(r->getBalance() * 5 + r->getAmount() < 0) {
if(time(NULL) % 2 == 0) {
isNegativeConsumableDisplayCycle = true;
if(r->getBalance() * 1 + r->getAmount() < 0) {
glColor3f(RED.x,RED.y,RED.z);
resourceFontColor = RED;
}
else if(r->getBalance() * 3 + r->getAmount() < 0) {
glColor3f(ORANGE.x,ORANGE.y,ORANGE.z);
resourceFontColor = ORANGE;
}
else if(r->getBalance() * 5 + r->getAmount() < 0) {
glColor3f(YELLOW.x,YELLOW.y,YELLOW.z);
resourceFontColor = YELLOW;
}
}
}
}
if(isNegativeConsumableDisplayCycle == false) {
glColor3f(1.f, 1.f, 1.f);
}
const int MAX_RESOURCES_PER_ROW = 6;
int resourceRow = startRow + (resourceCountRendered > 0 ? resourceCountRendered / MAX_RESOURCES_PER_ROW : 0);
int resourceCol = resourceCountRendered % MAX_RESOURCES_PER_ROW;
renderQuad(resourceCol * 100 + 200, metrics.getVirtualH()-30 - (30 * resourceRow), 16, 16, rt->getImage());
if(rt->getClass() != rcStatic) {
str+= "/" + intToStr(factionForResourceView->getStoreAmount(rt,localFactionResourcesOnly));
}
if(rt->getClass() == rcConsumable) {
str+= "(";
if(r->getBalance() > 0) {
str+= "+";
}
str+= intToStr(r->getBalance()) + ")";
}
glDisable(GL_TEXTURE_2D);
if(renderText3DEnabled == true) {
renderTextShadow3D(
str, CoreData::getInstance().getDisplayFontSmall3D(),
resourceFontColor,
resourceCol * 100 + 220, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
else {
renderTextShadow(
str, CoreData::getInstance().getDisplayFontSmall(),
resourceFontColor,
resourceCol * 100 + 220, metrics.getVirtualH()-30 - (30 * resourceRow), false);
}
++resourceCountRendered;
return resourceRow;
}
void Renderer::renderSelectionQuad() { void Renderer::renderSelectionQuad() {
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) { if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
return; return;

6
source/glest_game/graphics/renderer.h
View File

@ -694,6 +694,12 @@ private:
void render2dMenuSetup(); void render2dMenuSetup();
void render3dSetup(); void render3dSetup();
void render3dMenuSetup(const MainMenu *mm); void render3dMenuSetup(const MainMenu *mm);
bool renderResourcesInTeamMode();
int renderResource(const Faction *factionForResourceView,
bool localFactionResourcesOnly, const ResourceType *rt,
int startRow, int &resourceCountRendered);
}; };
}} //end namespace }} //end namespace

6
source/glest_game/network/server_interface.cpp
View File

@ -1044,11 +1044,7 @@ void ServerInterface::checkForCompletedClientsUsingLoop(
} }
std::string ServerInterface::getIpAddress(bool mutexLock) { std::string ServerInterface::getIpAddress(bool mutexLock) {
string result = ""; string result = serverSocket.getIpAddress();
//MutexSafeWrapper safeMutexSlot((mutexLock == true ? mutexSocket : NULL),CODE_AT_LINE);
//if(serverSocket != NULL) {
result = serverSocket.getIpAddress();
//}
return result; return result;
} }