LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Return nil if the raycasts don't hit anything (issue #335)

Browse Source
This commit is contained in:
Bart van Strien
2012-01-08 13:27:10 +01:00
parent c1f68e058d
commit 7c1e1fd0db
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/Fixture.cpp
+2 -1
View File
@@ -273,7 +273,8 @@ namespace box2d
input.maxFraction = maxFraction; input.maxFraction = maxFraction;
b2Transform transform(b2Vec2(x, y), b2Rot(r)); b2Transform transform(b2Vec2(x, y), b2Rot(r));
b2RayCastOutput output; b2RayCastOutput output;
fixture->RayCast(&output, input, childIndex); if (!fixture->RayCast(&output, input, childIndex))
return 0; // Nothing hit.
lua_pushnumber(L, Physics::scaleUp(output.normal.x)); lua_pushnumber(L, Physics::scaleUp(output.normal.x));
lua_pushnumber(L, Physics::scaleUp(output.normal.y)); lua_pushnumber(L, Physics::scaleUp(output.normal.y));
lua_pushnumber(L, output.fraction); lua_pushnumber(L, output.fraction);
src/modules/physics/box2d/Shape.cpp
+2 -1
View File
@@ -107,7 +107,8 @@ namespace box2d
input.maxFraction = maxFraction; input.maxFraction = maxFraction;
b2Transform transform(b2Vec2(x, y), b2Rot(r)); b2Transform transform(b2Vec2(x, y), b2Rot(r));
b2RayCastOutput output; b2RayCastOutput output;
shape->RayCast(&output, input, transform, childIndex); if (!shape->RayCast(&output, input, transform, childIndex))
return 0; // No hit.
lua_pushnumber(L, Physics::scaleUp(output.normal.x)); lua_pushnumber(L, Physics::scaleUp(output.normal.x));
lua_pushnumber(L, Physics::scaleUp(output.normal.y)); lua_pushnumber(L, Physics::scaleUp(output.normal.y));
lua_pushnumber(L, output.fraction); lua_pushnumber(L, output.fraction);