godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Rename WorldMarginShape to WorldBoundaryShape

Browse Source
This commit is contained in:
PouleyKetchoupp
2021-09-14 10:52:35 -07:00
parent fd17ce1890
commit bb75aec8bc
42 changed files with 214 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/bullet/shape_bullet.cpp
View File

@@ -110,7 +110,7 @@ btEmptyShape *ShapeBullet::create_shape_empty() {
return bulletnew(btEmptyShape);
}
btStaticPlaneShape *ShapeBullet::create_shape_plane(const btVector3 &planeNormal, btScalar planeConstant) {
btStaticPlaneShape *ShapeBullet::create_shape_world_boundary(const btVector3 &planeNormal, btScalar planeConstant) {
return bulletnew(btStaticPlaneShape(planeNormal, planeConstant));
}
@@ -164,32 +164,32 @@ btRayShape *ShapeBullet::create_shape_ray(real_t p_length, bool p_slips_on_slope
return r;
}
/* PLANE */
/* World boundary */
PlaneShapeBullet::PlaneShapeBullet() :
WorldBoundaryShapeBullet::WorldBoundaryShapeBullet() :
ShapeBullet() {}
void PlaneShapeBullet::set_data(const Variant &p_data) {
void WorldBoundaryShapeBullet::set_data(const Variant &p_data) {
setup(p_data);
}
Variant PlaneShapeBullet::get_data() const {
Variant WorldBoundaryShapeBullet::get_data() const {
return plane;
}
PhysicsServer3D::ShapeType PlaneShapeBullet::get_type() const {
return PhysicsServer3D::SHAPE_PLANE;
PhysicsServer3D::ShapeType WorldBoundaryShapeBullet::get_type() const {
return PhysicsServer3D::SHAPE_WORLD_BOUNDARY;
}
void PlaneShapeBullet::setup(const Plane &p_plane) {
void WorldBoundaryShapeBullet::setup(const Plane &p_plane) {
plane = p_plane;
notifyShapeChanged();
}
btCollisionShape *PlaneShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
btCollisionShape *WorldBoundaryShapeBullet::create_bt_shape(const btVector3 &p_implicit_scale, real_t p_extra_edge) {
btVector3 btPlaneNormal;
G_TO_B(plane.normal, btPlaneNormal);
return prepare(PlaneShapeBullet::create_shape_plane(btPlaneNormal, plane.d));
return prepare(WorldBoundaryShapeBullet::create_shape_world_boundary(btPlaneNormal, plane.d));
}
/* Sphere */