diff options
| author | Rémi Verschelde | 2017-12-11 10:35:09 +0100 |
|---|---|---|
| committer | GitHub | 2017-12-11 10:35:09 +0100 |
| commit | dfb3634c3462adb3d9f0bf1e2e7b4261c3313b80 (patch) | |
| tree | 5686d27865e80aab6d60abc2e8e34fc2138a38a9 /modules/bullet/collision_object_bullet.h | |
| parent | 237be766d4b0247d7ded0a9b85da12a989c561c8 (diff) | |
| parent | b546cd50a36a809ba8beb8da1126d41c3b19294b (diff) | |
| download | godot-dfb3634c3462adb3d9f0bf1e2e7b4261c3313b80.tar.gz godot-dfb3634c3462adb3d9f0bf1e2e7b4261c3313b80.tar.zst godot-dfb3634c3462adb3d9f0bf1e2e7b4261c3313b80.zip | |
Merge pull request #13836 from AndreaCatania/scale
Fixed bullet scale on get_transform and joints
Diffstat (limited to 'modules/bullet/collision_object_bullet.h')
| -rw-r--r-- | modules/bullet/collision_object_bullet.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/bullet/collision_object_bullet.h b/modules/bullet/collision_object_bullet.h index 51e48909e..7d4659b64 100644 --- a/modules/bullet/collision_object_bullet.h +++ b/modules/bullet/collision_object_bullet.h @@ -114,7 +114,7 @@ protected: bool m_isStatic; bool ray_pickable; btCollisionObject *bt_collision_object; - btVector3 body_scale; + Vector3 body_scale; SpaceBullet *space; VSet<RID> exceptions; @@ -146,6 +146,8 @@ public: _FORCE_INLINE_ bool is_ray_pickable() const { return ray_pickable; } void set_body_scale(const Vector3 &p_new_scale); + const Vector3 &get_body_scale() const { return body_scale; } + btVector3 get_bt_body_scale() const; virtual void on_body_scale_changed(); void add_collision_exception(const CollisionObjectBullet *p_ignoreCollisionObject); |