Handle particle spawners in env and delete expired ids

Rebased by Zeno (2016-04-2016)
This commit is contained in:
obneq 2016-04-28 01:58:09 +10:00 committed by Craig Robbins
parent 26a9a85129
commit 6278da296b
4 changed files with 62 additions and 22 deletions

@ -50,6 +50,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define LBM_NAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_:" #define LBM_NAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_:"
// A number that is much smaller than the timeout for particle spawners should/could ever be
#define PARTICLE_SPAWNER_NO_EXPIRY -1024.f
Environment::Environment(): Environment::Environment():
m_time_of_day_speed(0), m_time_of_day_speed(0),
m_time_of_day(9000), m_time_of_day(9000),
@ -1544,6 +1547,49 @@ void ServerEnvironment::step(float dtime)
*/ */
removeRemovedObjects(); removeRemovedObjects();
} }
/*
Manage particle spawner expiration
*/
if (m_particle_management_interval.step(dtime, 1.0)) {
for (std::map<u32, float>::iterator i = m_particle_spawners.begin();
i != m_particle_spawners.end(); ) {
//non expiring spawners
if (i->second == PARTICLE_SPAWNER_NO_EXPIRY) {
++i;
continue;
}
i->second -= 1.0f;
if (i->second <= 0.f)
m_particle_spawners.erase(i++);
else
++i;
}
}
}
u32 ServerEnvironment::addParticleSpawner(float exptime)
{
// Timers with lifetime 0 do not expire
float time = exptime > 0.f ? exptime : PARTICLE_SPAWNER_NO_EXPIRY;
u32 id = 0;
for (;;) { // look for unused particlespawner id
id++;
std::map<u32, float>::iterator f;
f = m_particle_spawners.find(id);
if (f == m_particle_spawners.end()) {
m_particle_spawners[id] = time;
break;
}
}
return id;
}
void ServerEnvironment::deleteParticleSpawner(u32 id)
{
m_particle_spawners.erase(id);
} }
ServerActiveObject* ServerEnvironment::getActiveObject(u16 id) ServerActiveObject* ServerEnvironment::getActiveObject(u16 id)

@ -337,6 +337,9 @@ public:
// env_meta.txt doesn't exist (e.g. new world) // env_meta.txt doesn't exist (e.g. new world)
void loadDefaultMeta(); void loadDefaultMeta();
u32 addParticleSpawner(float exptime);
void deleteParticleSpawner(u32 id);
/* /*
External ActiveObject interface External ActiveObject interface
------------------------------------------- -------------------------------------------
@ -516,6 +519,10 @@ private:
// Estimate for general maximum lag as determined by server. // Estimate for general maximum lag as determined by server.
// Can raise to high values like 15s with eg. map generation mods. // Can raise to high values like 15s with eg. map generation mods.
float m_max_lag_estimate; float m_max_lag_estimate;
// Particles
IntervalLimiter m_particle_management_interval;
std::map<u32, float> m_particle_spawners;
}; };
#ifndef SERVER #ifndef SERVER

@ -3194,19 +3194,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
peer_id = player->peer_id; peer_id = player->peer_id;
} }
u32 id = 0; u32 id = m_env->addParticleSpawner(spawntime);
for(;;) // look for unused particlespawner id
{
id++;
if (std::find(m_particlespawner_ids.begin(),
m_particlespawner_ids.end(), id)
== m_particlespawner_ids.end())
{
m_particlespawner_ids.push_back(id);
break;
}
}
SendAddParticleSpawner(peer_id, amount, spawntime, SendAddParticleSpawner(peer_id, amount, spawntime,
minpos, maxpos, minvel, maxvel, minacc, maxacc, minpos, maxpos, minvel, maxvel, minacc, maxacc,
minexptime, maxexptime, minsize, maxsize, minexptime, maxexptime, minsize, maxsize,
@ -3229,13 +3217,16 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
peer_id = player->peer_id; peer_id = player->peer_id;
} }
m_particlespawner_ids.erase( m_env->deleteParticleSpawner(id);
std::remove(m_particlespawner_ids.begin(),
m_particlespawner_ids.end(), id),
m_particlespawner_ids.end());
SendDeleteParticleSpawner(peer_id, id); SendDeleteParticleSpawner(peer_id, id);
} }
void Server::deleteParticleSpawnerAll(u32 id)
{
m_env->deleteParticleSpawner(id);
SendDeleteParticleSpawner(PEER_ID_INEXISTENT, id);
}
Inventory* Server::createDetachedInventory(const std::string &name) Inventory* Server::createDetachedInventory(const std::string &name)
{ {
if(m_detached_inventories.count(name) > 0){ if(m_detached_inventories.count(name) > 0){

@ -287,6 +287,7 @@ public:
const std::string &playername); const std::string &playername);
void deleteParticleSpawner(const std::string &playername, u32 id); void deleteParticleSpawner(const std::string &playername, u32 id);
void deleteParticleSpawnerAll(u32 id);
// Creates or resets inventory // Creates or resets inventory
Inventory* createDetachedInventory(const std::string &name); Inventory* createDetachedInventory(const std::string &name);
@ -662,11 +663,6 @@ private:
// key = name // key = name
std::map<std::string, Inventory*> m_detached_inventories; std::map<std::string, Inventory*> m_detached_inventories;
/*
Particles
*/
std::vector<u32> m_particlespawner_ids;
DISABLE_CLASS_COPY(Server); DISABLE_CLASS_COPY(Server);
}; };