mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-23 00:12:49 +02:00
Code Issues Projects Releases Wiki Activity

better performance for attack warnings ( old code is just commented, will be removed after testing in multiplayer )

Browse Source
This commit is contained in:
Titus Tscharntke
2010-12-29 18:23:54 +00:00
parent 89a6ae3fe4
commit 41899507a9
1 changed files with 134 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
source/glest_game/world/unit_updater.cpp
View File

@@ -188,11 +188,11 @@ void UnitUpdater::updateUnitCommand(Unit *unit) {
//if unit has command process it
if(unit->anyCommand()) {
CommandClass cc=unit->getCurrCommand()->getCommandType()->commandTypeClass;
if(unit->isOperative() && (!(cc==ccStop || cc==ccAttack)) )
{//stop and attack already check for themselves
Unit *sighted;
attackerOnSight(unit, &sighted);
}
// if(unit->isOperative() && (!(cc==ccStop || cc==ccAttack)) )
// {//stop and attack already check for themselves
// Unit *sighted;
// attackerOnSight(unit, &sighted);
// }
unit->getCurrCommand()->getCommandType()->update(this, unit);
}
@@ -207,12 +207,12 @@ void UnitUpdater::updateUnitCommand(Unit *unit) {
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
unit->giveCommand(new Command(unit->getType()->getFirstCtOfClass(ccStop)));
}
else
{
// buidings have no stop skill but hav to check for attackers too.
Unit *sighted;
attackerOnSight(unit, &sighted);
}
// else
// {
// // buidings have no stop skill but have to check for attackers too.
// Unit *sighted;
// attackerOnSight(unit, &sighted);
// }
}
if(chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s] Line: %d took msecs: %lld --------------------------- [END OF METHOD] ---------------------------\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
@@ -367,7 +367,6 @@ void UnitUpdater::updateAttack(Unit *unit) {
else {
//compute target pos
Vec2i pos;
//Command *nextCommand;
if(command->getUnit()!=NULL) {
pos= command->getUnit()->getCenteredPos();
}
@@ -1792,10 +1791,27 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
}
if( result &&
unit->getTeam()==world->getThisTeamIndex() && //must be in local players team.
!(unit->isAlly(enemySeen)))
if(result)
{
const Unit* teamUnit;
const Unit* enemyUnit;
bool onlyEnemyUnits=true;
if(unit->getTeam()==world->getThisTeamIndex())
{
teamUnit=unit;
enemyUnit=enemySeen;
onlyEnemyUnits=false;
}
else if(enemySeen->getTeam()==world->getThisTeamIndex() )
{
teamUnit=enemySeen;
enemyUnit=unit;
onlyEnemyUnits=false;
}
if(!onlyEnemyUnits && enemyUnit->getTeam()!=world->getThisTeamIndex())
{
Vec2f enemyFloatCenter = enemyUnit->getFloatCenteredPos();
// find nearest Attack and cleanup old dates
AttackWarningData *nearest=NULL;
float currentDistance;
@@ -1807,7 +1823,7 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
delete toDelete; // old one
}
else {
currentDistance=floor(floatCenter.dist(attackWarnings[i]->attackPosition)); // no need for streflops here!
currentDistance=floor(enemyFloatCenter.dist(attackWarnings[i]->attackPosition)); // no need for streflops here!
if( nearest==NULL ){
nearest=attackWarnings[i];
nearestDistance=currentDistance;
@@ -1827,8 +1843,8 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
if(nearestDistance<attackWarnRange)
{// update entry with current values
nearest->lastFrameCount=world->getFrameCount();
nearest->attackPosition.x=enemySeen->getFloatCenteredPos().x;
nearest->attackPosition.y=enemySeen->getFloatCenteredPos().y;
nearest->attackPosition.x=enemyFloatCenter.x;
nearest->attackPosition.y=enemyFloatCenter.y;
}
else
{//Must be a different Attack!
@@ -1840,13 +1856,70 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
{
AttackWarningData* awd= new AttackWarningData();
awd->lastFrameCount=world->getFrameCount();
awd->attackPosition.x=enemySeen->getFloatCenteredPos().x;
awd->attackPosition.y=enemySeen->getFloatCenteredPos().y;
awd->attackPosition.x=enemyFloatCenter.x;
awd->attackPosition.y=enemyFloatCenter.y;
attackWarnings.push_back(awd);
SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound());
world->addAttackEffects(enemySeen);
world->addAttackEffects(enemyUnit);
}
}
}
// if( result &&
// unit->getTeam()==world->getThisTeamIndex() && //must be in local players team.
// !(unit->isAlly(enemySeen)))
// {
// // find nearest Attack and cleanup old dates
// AttackWarningData *nearest=NULL;
// float currentDistance;
// float nearestDistance;
// for(int i = attackWarnings.size()-1; i>-1; --i) {
// if(world->getFrameCount()-attackWarnings[i]->lastFrameCount>200) { //after 200 frames attack break we warn again
// AttackWarningData *toDelete=attackWarnings[i];
// attackWarnings.erase(attackWarnings.begin()+i);
// delete toDelete; // old one
// }
// else {
// currentDistance=floor(floatCenter.dist(attackWarnings[i]->attackPosition)); // no need for streflops here!
// if( nearest==NULL ){
// nearest=attackWarnings[i];
// nearestDistance=currentDistance;
// }
// else {
//
// if( currentDistance< nearestDistance ){
// nearest=attackWarnings[i];
// nearestDistance=currentDistance;
// }
// }
// }
// }
//
// if(nearest!=NULL)
// { // does it fit?
// if(nearestDistance<attackWarnRange)
// {// update entry with current values
// nearest->lastFrameCount=world->getFrameCount();
// nearest->attackPosition.x=enemySeen->getFloatCenteredPos().x;
// nearest->attackPosition.y=enemySeen->getFloatCenteredPos().y;
// }
// else
// {//Must be a different Attack!
// nearest=NULL; //set to null to force a new entry in next step
// }
// }
// // add new attack
// if(nearest==NULL) // no else!
// {
// AttackWarningData* awd= new AttackWarningData();
// awd->lastFrameCount=world->getFrameCount();
// awd->attackPosition.x=enemySeen->getFloatCenteredPos().x;
// awd->attackPosition.y=enemySeen->getFloatCenteredPos().y;
// attackWarnings.push_back(awd);
// SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound());
// world->addAttackEffects(enemySeen);
// }
// }
return result;