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

Merge pull request #29020 from raphael10241024/inertia

Browse source 
Fix some shape2d get_moment_of_inertia error
This commit is contained in:
Rémi Verschelde 2019-05-28 10:23:55 +02:00 committed by GitHub
commit 6305030ee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servers/physics_2d/shape_2d_sw.cpp
View file

@ -240,12 +240,7 @@ bool SegmentShape2DSW::intersect_segment(const Vector2 &p_begin, const Vector2 &
real_t SegmentShape2DSW::get_moment_of_inertia(real_t p_mass, const Size2 &p_scale) const { real_t SegmentShape2DSW::get_moment_of_inertia(real_t p_mass, const Size2 &p_scale) const {
Vector2 s[2] = { a * p_scale, b * p_scale }; return p_mass * ((a * p_scale).distance_squared_to(b * p_scale)) / 12;
real_t l = s[1].distance_to(s[0]);
Vector2 ofs = (s[0] + s[1]) * 0.5;
return p_mass * (l * l / 12.0 + ofs.length_squared());
} }
void SegmentShape2DSW::set_data(const Variant &p_data) { void SegmentShape2DSW::set_data(const Variant &p_data) {
@ -318,7 +313,9 @@ bool CircleShape2DSW::intersect_segment(const Vector2 &p_begin, const Vector2 &p
real_t CircleShape2DSW::get_moment_of_inertia(real_t p_mass, const Size2 &p_scale) const { real_t CircleShape2DSW::get_moment_of_inertia(real_t p_mass, const Size2 &p_scale) const {
return (radius * radius) * (p_scale.x * 0.5 + p_scale.y * 0.5); real_t a = radius * p_scale.x;
real_t b = radius * p_scale.y;
return p_mass * (a * a + b * b) / 4;
} }
void CircleShape2DSW::set_data(const Variant &p_data) { void CircleShape2DSW::set_data(const Variant &p_data) {
@ -637,7 +634,7 @@ real_t ConvexPolygonShape2DSW::get_moment_of_inertia(real_t p_mass, const Size2
aabb.expand_to(points[i].pos * p_scale); aabb.expand_to(points[i].pos * p_scale);
} }
return p_mass * aabb.size.dot(aabb.size) / 12.0 + p_mass * (aabb.position + aabb.size * 0.5).length_squared(); return p_mass * aabb.size.dot(aabb.size) / 12.0;
} }
void ConvexPolygonShape2DSW::set_data(const Variant &p_data) { void ConvexPolygonShape2DSW::set_data(const Variant &p_data) {