Use std::vector instead of std::set for Environment::getObjectsInsideRadius

nerzhul · nerzhul · commit 0c634a97197d · 2015-04-16T18:37:29.000+02:00
We are only iterating sequentially, we don't need a set here
Also use a vector reference instead of a copy
diff --git a/src/collision.cpp b/src/collision.cpp
@@ -318,8 +318,9 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
 			ServerEnvironment *s_env = dynamic_cast<ServerEnvironment*>(env);
 			if (s_env != 0) {
 				f32 distance = speed_f.getLength();
-				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++) {
+				std::vector<u16> s_objects;
+				s_env->getObjectsInsideRadius(s_objects, pos_f, distance * 1.5);
+				for (std::vector<u16>::iterator iter = s_objects.begin(); iter != s_objects.end(); iter++) {
 					ServerActiveObject *current = s_env->getActiveObject(*iter);
 					if ((self == 0) || (self != current)) {
 						objects.push_back((ActiveObject*)current);
diff --git a/src/environment.cpp b/src/environment.cpp
@@ -840,9 +840,8 @@ bool ServerEnvironment::swapNode(v3s16 p, const MapNode &n)
 	return true;
 }
 
-std::set<u16> ServerEnvironment::getObjectsInsideRadius(v3f pos, float radius)
+void ServerEnvironment::getObjectsInsideRadius(std::vector<u16> &objects, v3f pos, float radius)
 {
-	std::set<u16> objects;
 	for(std::map<u16, ServerActiveObject*>::iterator
 			i = m_active_objects.begin();
 			i != m_active_objects.end(); ++i)
@@ -852,9 +851,8 @@ std::set<u16> ServerEnvironment::getObjectsInsideRadius(v3f pos, float radius)
 		v3f objectpos = obj->getBasePosition();
 		if(objectpos.getDistanceFrom(pos) > radius)
 			continue;
-		objects.insert(id);
+		objects.push_back(id);
 	}
-	return objects;
 }
 
 void ServerEnvironment::clearAllObjects()
diff --git a/src/environment.h b/src/environment.h
@@ -305,7 +305,7 @@ class ServerEnvironment : public Environment
 	bool swapNode(v3s16 p, const MapNode &n);
 
 	// Find all active objects inside a radius around a point
-	std::set<u16> getObjectsInsideRadius(v3f pos, float radius);
+	void getObjectsInsideRadius(std::vector<u16> &objects, v3f pos, float radius);
 
 	// Clear all objects, loading and going through every MapBlock
 	void clearAllObjects();
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
@@ -438,10 +438,11 @@ int ModApiEnvMod::l_get_objects_inside_radius(lua_State *L)
 	// Do it
 	v3f pos = checkFloatPos(L, 1);
 	float radius = luaL_checknumber(L, 2) * BS;
-	std::set<u16> ids = env->getObjectsInsideRadius(pos, radius);
+	std::vector<u16> ids;
+	env->getObjectsInsideRadius(ids, pos, radius);
 	ScriptApiBase *script = getScriptApiBase(L);
 	lua_createtable(L, ids.size(), 0);
-	std::set<u16>::const_iterator iter = ids.begin();
+	std::vector<u16>::const_iterator iter = ids.begin();
 	for(u32 i = 0; iter != ids.end(); iter++) {
 		ServerActiveObject *obj = env->getActiveObject(*iter);
 		// Insert object reference into table

Original file line number	Diff line number	Diff line change
`@@ -840,9 +840,8 @@ bool ServerEnvironment::swapNode(v3s16 p, const MapNode &n)`
`840`	`840`	`return true;`
`841`	`841`	`}`
`842`	`842`
`843`		`-std::set<u16> ServerEnvironment::getObjectsInsideRadius(v3f pos, float radius)`
	`843`	`+void ServerEnvironment::getObjectsInsideRadius(std::vector<u16> &objects, v3f pos, float radius)`
`844`	`844`	`{`
`845`		`- std::set<u16> objects;`
`846`	`845`	`for(std::map<u16, ServerActiveObject*>::iterator`
`847`	`846`	`i = m_active_objects.begin();`
`848`	`847`	`i != m_active_objects.end(); ++i)`
`@@ -852,9 +851,8 @@ std::set<u16> ServerEnvironment::getObjectsInsideRadius(v3f pos, float radius)`
`852`	`851`	`v3f objectpos = obj->getBasePosition();`
`853`	`852`	`if(objectpos.getDistanceFrom(pos) > radius)`
`854`	`853`	`continue;`
`855`		`- objects.insert(id);`
	`854`	`+ objects.push_back(id);`
`856`	`855`	`}`
`857`		`- return objects;`
`858`	`856`	`}`
`859`	`857`
`860`	`858`	`void ServerEnvironment::clearAllObjects()`