asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix typo in Bullet method name: "collisin" -> "collision"

Browse source 
This method is not exposed to scripting, so compatibility with
existing projects should be preserved.
This commit is contained in:
Hugo Locurcio 2021-07-07 22:07:32 +02:00
parent 31143baa57
commit 4a140294fe
No known key found for this signature in database
GPG key ID: 39E8F8BE30B0A49C
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/bullet/bullet_physics_server.cpp
View file

@ -563,14 +563,14 @@ void BulletPhysicsServer::body_clear_shapes(RID p_body) {
}
void BulletPhysicsServer::body_attach_object_instance_id(RID p_body, uint32_t p_id) {
CollisionObjectBullet *body = get_collisin_object(p_body);
CollisionObjectBullet *body = get_collision_object(p_body);
ERR_FAIL_COND(!body);
body->set_instance_id(p_id);
}
uint32_t BulletPhysicsServer::body_get_object_instance_id(RID p_body) const {
CollisionObjectBullet *body = get_collisin_object(p_body);
CollisionObjectBullet *body = get_collision_object(p_body);
ERR_FAIL_COND_V(!body, 0);
return body->get_instance_id();
@ -1550,7 +1550,7 @@ int BulletPhysicsServer::get_process_info(ProcessInfo p_info) {
return 0;
}
CollisionObjectBullet *BulletPhysicsServer::get_collisin_object(RID p_object) const {
CollisionObjectBullet *BulletPhysicsServer::get_collision_object(RID p_object) const {
if (rigid_body_owner.owns(p_object)) {
return rigid_body_owner.getornull(p_object);
}
@ -1563,7 +1563,7 @@ CollisionObjectBullet *BulletPhysicsServer::get_collisin_object(RID p_object) co
return nullptr;
}
RigidCollisionObjectBullet *BulletPhysicsServer::get_rigid_collisin_object(RID p_object) const {
RigidCollisionObjectBullet *BulletPhysicsServer::get_rigid_collision_object(RID p_object) const {
if (rigid_body_owner.owns(p_object)) {
return rigid_body_owner.getornull(p_object);
}

4
modules/bullet/bullet_physics_server.h
View file

@ -400,8 +400,8 @@ public:
virtual int get_process_info(ProcessInfo p_info);
CollisionObjectBullet *get_collisin_object(RID p_object) const;
RigidCollisionObjectBullet *get_rigid_collisin_object(RID p_object) const;
CollisionObjectBullet *get_collision_object(RID p_object) const;
RigidCollisionObjectBullet *get_rigid_collision_object(RID p_object) const;
/// Internal APIs
public:

2
modules/bullet/space_bullet.cpp
View file

@ -290,7 +290,7 @@ bool BulletPhysicsDirectSpaceState::rest_info(RID p_shape, const Transform &p_sh
}
Vector3 BulletPhysicsDirectSpaceState::get_closest_point_to_object_volume(RID p_object, const Vector3 p_point) const {
RigidCollisionObjectBullet *rigid_object = space->get_physics_server()->get_rigid_collisin_object(p_object);
RigidCollisionObjectBullet *rigid_object = space->get_physics_server()->get_rigid_collision_object(p_object);
ERR_FAIL_COND_V(!rigid_object, Vector3());
btVector3 out_closest_point(0, 0, 0);