Make line_of_sight return blocking node position

stujones11 · ShadowNinja · commit d9ef072305b9 · 2013-12-12T16:11:00.000-05:00
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
@@ -1308,8 +1308,9 @@ minetest.set_mapgen_params(MapgenParams)
 ^ flags and flagmask are in the same format and have the same options as 'mgflags' in minetest.conf
 minetest.clear_objects()
 ^ clear all objects in the environments
-minetest.line_of_sight(pos1,pos2,stepsize) ->true/false
-^ checkif there is a direct line of sight between pos1 and pos2
+minetest.line_of_sight(pos1, pos2, stepsize) -> true/false, pos
+^ Check if there is a direct line of sight between pos1 and pos2
+^ Returns the position of the blocking node when false
 ^ pos1 First position
 ^ pos2 Second position
 ^ stepsize smaller gives more accurate results but requires more computing
diff --git a/src/environment.cpp b/src/environment.cpp
@@ -354,7 +354,7 @@ ServerMap & ServerEnvironment::getServerMap()
 	return *m_map;
 }
 
-bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize)
+bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize, v3s16 *p)
 {
 	float distance = pos1.getDistanceFrom(pos2);
 
@@ -372,6 +372,9 @@ bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize)
 		MapNode n = getMap().getNodeNoEx(pos);
 
 		if(n.param0 != CONTENT_AIR) {
+			if (p) {
+				*p = pos;
+			}
 			return false;
 		}
 	}
diff --git a/src/environment.h b/src/environment.h
@@ -295,7 +295,7 @@ class ServerEnvironment : public Environment
 	void step(f32 dtime);
 	
 	//check if there's a line of sight between two positions
-	bool line_of_sight(v3f pos1, v3f pos2, float stepsize=1.0);
+	bool line_of_sight(v3f pos1, v3f pos2, float stepsize=1.0, v3s16 *p=NULL);
 
 	u32 getGameTime() { return m_game_time; }
 
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
@@ -648,7 +648,7 @@ int ModApiEnvMod::l_clear_objects(lua_State *L)
 	return 0;
 }
 
-// minetest.line_of_sight(pos1, pos2, stepsize) -> true/false
+// minetest.line_of_sight(pos1, pos2, stepsize) -> true/false, pos
 int ModApiEnvMod::l_line_of_sight(lua_State *L) {
 	float stepsize = 1.0;
 
@@ -663,7 +663,13 @@ int ModApiEnvMod::l_line_of_sight(lua_State *L) {
 		stepsize = lua_tonumber(L, 3);
 	}
 
-	lua_pushboolean(L, env->line_of_sight(pos1,pos2,stepsize));
+	v3s16 p;
+	bool success = env->line_of_sight(pos1, pos2, stepsize, &p);
+	lua_pushboolean(L, success);
+	if (!success) {
+		push_v3s16(L, p);
+		return 2;
+	}
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ ServerMap & ServerEnvironment::getServerMap()`
`354`	`354`	`return *m_map;`
`355`	`355`	`}`
`356`	`356`
`357`		`-bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize)`
	`357`	`+bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize, v3s16 *p)`
`358`	`358`	`{`
`359`	`359`	`float distance = pos1.getDistanceFrom(pos2);`
`360`	`360`
`@@ -372,6 +372,9 @@ bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, float stepsize)`
`372`	`372`	`MapNode n = getMap().getNodeNoEx(pos);`
`373`	`373`
`374`	`374`	`if(n.param0 != CONTENT_AIR) {`
	`375`	`+ if (p) {`
	`376`	`+ *p = pos;`
	`377`	`+ }`
`375`	`378`	`return false;`
`376`	`379`	`}`
`377`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ int ModApiEnvMod::l_clear_objects(lua_State *L)`
`648`	`648`	`return 0;`
`649`	`649`	`}`
`650`	`650`
`651`		`-// minetest.line_of_sight(pos1, pos2, stepsize) -> true/false`
	`651`	`+// minetest.line_of_sight(pos1, pos2, stepsize) -> true/false, pos`
`652`	`652`	`int ModApiEnvMod::l_line_of_sight(lua_State *L) {`
`653`	`653`	`float stepsize = 1.0;`
`654`	`654`
`@@ -663,7 +663,13 @@ int ModApiEnvMod::l_line_of_sight(lua_State *L) {`
`663`	`663`	`stepsize = lua_tonumber(L, 3);`
`664`	`664`	`}`
`665`	`665`
`666`		`- lua_pushboolean(L, env->line_of_sight(pos1,pos2,stepsize));`
	`666`	`+ v3s16 p;`
	`667`	`+ bool success = env->line_of_sight(pos1, pos2, stepsize, &p);`
	`668`	`+ lua_pushboolean(L, success);`
	`669`	`+ if (!success) {`
	`670`	`+ push_v3s16(L, p);`
	`671`	`+ return 2;`
	`672`	`+ }`
`667`	`673`	`return 1;`
`668`	`674`	`}`
`669`	`675`