BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

collisionMoveSimple: use std::vector instead of std::list, this improve the performances

Browse Source
This commit is contained in:
Loic Blot 2015-03-05 18:08:19 +01:00
parent 6c09b34edc
commit c00eed90d3
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/collision.cpp
View File

@ -300,16 +300,14 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
/* add object boxes to cboxes */ /* add object boxes to cboxes */
std::list<ActiveObject*> objects; std::vector<ActiveObject*> objects;
#ifndef SERVER #ifndef SERVER
ClientEnvironment *c_env = dynamic_cast<ClientEnvironment*>(env); ClientEnvironment *c_env = dynamic_cast<ClientEnvironment*>(env);
if (c_env != 0) if (c_env != 0) {
{
f32 distance = speed_f.getLength(); f32 distance = speed_f.getLength();
std::vector<DistanceSortedActiveObject> clientobjects; std::vector<DistanceSortedActiveObject> clientobjects;
c_env->getActiveObjects(pos_f,distance * 1.5,clientobjects); c_env->getActiveObjects(pos_f,distance * 1.5,clientobjects);
for (size_t i=0; i < clientobjects.size(); i++) for (size_t i=0; i < clientobjects.size(); i++) {
{
if ((self == 0) || (self != clientobjects[i].obj)) { if ((self == 0) || (self != clientobjects[i].obj)) {
objects.push_back((ActiveObject*)clientobjects[i].obj); objects.push_back((ActiveObject*)clientobjects[i].obj);
} }
@ -319,12 +317,10 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
#endif #endif
{ {
ServerEnvironment *s_env = dynamic_cast<ServerEnvironment*>(env); ServerEnvironment *s_env = dynamic_cast<ServerEnvironment*>(env);
if (s_env != 0) if (s_env != 0) {
{
f32 distance = speed_f.getLength(); f32 distance = speed_f.getLength();
std::set<u16> s_objects = s_env->getObjectsInsideRadius(pos_f,distance * 1.5); std::set<u16> s_objects = s_env->getObjectsInsideRadius(pos_f,distance * 1.5);
for (std::set<u16>::iterator iter = s_objects.begin(); iter != s_objects.end(); iter++) for (std::set<u16>::iterator iter = s_objects.begin(); iter != s_objects.end(); iter++) {
{
ServerActiveObject *current = s_env->getActiveObject(*iter); ServerActiveObject *current = s_env->getActiveObject(*iter);
if ((self == 0) || (self != current)) { if ((self == 0) || (self != current)) {
objects.push_back((ActiveObject*)current); objects.push_back((ActiveObject*)current);
@ -333,16 +329,14 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
} }
} }
for (std::list<ActiveObject*>::const_iterator iter = objects.begin();iter != objects.end(); ++iter) for (std::vector<ActiveObject*>::const_iterator iter = objects.begin();
{ iter != objects.end(); ++iter) {
ActiveObject *object = *iter; ActiveObject *object = *iter;
if (object != NULL) if (object != NULL) {
{
aabb3f object_collisionbox; aabb3f object_collisionbox;
if (object->getCollisionBox(&object_collisionbox) && if (object->getCollisionBox(&object_collisionbox) &&
object->collideWithObjects()) object->collideWithObjects()) {
{
cboxes.push_back(object_collisionbox); cboxes.push_back(object_collisionbox);
is_unloaded.push_back(false); is_unloaded.push_back(false);
is_step_up.push_back(false); is_step_up.push_back(false);