aboutsummaryrefslogtreecommitdiff
path: root/servers/physics_2d_server.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2014-02-22 20:28:19 -0300
committerJuan Linietsky2014-02-22 20:28:19 -0300
commit7ca29bfaa7a23d06374c2456e0360c911bd9aa3e (patch)
treedc615e0c7a55dff92af81be0ff2555e1f9485eba /servers/physics_2d_server.cpp
parentb62ec387f340220e11902daab8484fcb85d28cda (diff)
downloadgodot-7ca29bfaa7a23d06374c2456e0360c911bd9aa3e.tar.gz
godot-7ca29bfaa7a23d06374c2456e0360c911bd9aa3e.tar.zst
godot-7ca29bfaa7a23d06374c2456e0360c911bd9aa3e.zip
Diffstat (limited to 'servers/physics_2d_server.cpp')
-rw-r--r--servers/physics_2d_server.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp
index cbf5cffce..0851ad59e 100644
--- a/servers/physics_2d_server.cpp
+++ b/servers/physics_2d_server.cpp
@@ -145,7 +145,7 @@ Variant Physics2DDirectSpaceState::_intersect_shape(const RID& p_shape, const Ma
ShapeResult *res=(ShapeResult*)alloca(p_result_max*sizeof(ShapeResult));
- int rc = intersect_shape(p_shape,p_xform,Vector2(),res,p_result_max,exclude,p_user_mask);
+ int rc = intersect_shape(p_shape,p_xform,Vector2(),0,res,p_result_max,exclude,p_user_mask);
if (rc==0)
return Variant();
@@ -163,15 +163,13 @@ Variant Physics2DDirectSpaceState::_intersect_shape(const RID& p_shape, const Ma
Variant Physics2DDirectSpaceState::_cast_motion(const RID& p_shape, const Matrix32& p_xform,const Vector2& p_motion,const Vector<RID>& p_exclude,uint32_t p_user_mask) {
+#if 0
Set<RID> exclude;
for(int i=0;i<p_exclude.size();i++)
exclude.insert(p_exclude[i]);
-
- MotionCastCollision mcc;
-
- bool result = cast_motion(p_shape,p_xform,p_motion,mcc,exclude,p_user_mask);
+ bool result = cast_motion(p_shape,p_xform,p_motion,0,mcc,exclude,p_user_mask);
if (!result)
return Variant();
@@ -185,7 +183,8 @@ Variant Physics2DDirectSpaceState::_cast_motion(const RID& p_shape, const Matrix
d["shape"]=mcc.shape;
return d;
-
+#endif
+ return Variant();
}