seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose body_test_motion in 3D physics server

Browse Source 
Results are exposed through PhysicsTestMotionResult, the same way it's
done for 2D.

Also cleaned a few things in the 2D version.
This commit is contained in:
PouleyKetchoupp
2021-07-02 18:04:39 -07:00
parent cbf6d51d01
commit c89476ad41
9 changed files with 169 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
servers/physics_server.h
View File

@ -214,11 +214,15 @@ public:
PhysicsShapeQueryResult();
};
class PhysicsTestMotionResult;
class PhysicsServer : public Object {
GDCLASS(PhysicsServer, Object);
static PhysicsServer *singleton;
virtual bool _body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, const Ref<PhysicsTestMotionResult> &p_result = Ref<PhysicsTestMotionResult>());
protected:
static void _bind_methods();
@ -479,16 +483,11 @@ public:
Vector3 collision_point;
Vector3 collision_normal;
Vector3 collider_velocity;
int collision_local_shape;
ObjectID collider_id;
int collision_local_shape = 0;
ObjectID collider_id = 0;
RID collider;
int collider_shape;
int collider_shape = 0;
Variant collider_metadata;
MotionResult() {
collision_local_shape = 0;
collider_id = 0;
collider_shape = 0;
}
};
virtual bool body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result = nullptr, bool p_exclude_raycast_shapes = true) = 0;
@ -762,6 +761,32 @@ public:
~PhysicsServer();
};
class PhysicsTestMotionResult : public Reference {
GDCLASS(PhysicsTestMotionResult, Reference);
PhysicsServer::MotionResult result;
bool colliding = false;
friend class PhysicsServer;
protected:
static void _bind_methods();
public:
PhysicsServer::MotionResult *get_result_ptr() const { return const_cast<PhysicsServer::MotionResult *>(&result); }
//bool is_colliding() const;
Vector3 get_motion() const;
Vector3 get_motion_remainder() const;
Vector3 get_collision_point() const;
Vector3 get_collision_normal() const;
Vector3 get_collider_velocity() const;
ObjectID get_collider_id() const;
RID get_collider_rid() const;
Object *get_collider() const;
int get_collider_shape() const;
};
typedef PhysicsServer *(*CreatePhysicsServerCallback)();
class PhysicsServerManager {