mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-23 23:15:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use the gravity constant to calculate weights

Browse Source
This commit is contained in:
Johan Manuel 2017-07-04 14:57:15 +02:00
parent 6f63a01302
commit 00afca31c6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/2d/physics_body_2d.cpp
View File

@ -554,11 +554,12 @@ real_t RigidBody2D::get_inertia() const {
void RigidBody2D::set_weight(real_t p_weight) { void RigidBody2D::set_weight(real_t p_weight) {
set_mass(p_weight / 9.8); set_mass(p_weight / real_t(GLOBAL_DEF("physics/2d/default_gravity", 98)) / 10);
} }
real_t RigidBody2D::get_weight() const { real_t RigidBody2D::get_weight() const {
return mass * 9.8; return mass * real_t(GLOBAL_DEF("physics/2d/default_gravity", 98)) / 10;
} }
void RigidBody2D::set_friction(real_t p_friction) { void RigidBody2D::set_friction(real_t p_friction) {

4
scene/3d/physics_body.cpp
View File

@ -520,11 +520,11 @@ real_t RigidBody::get_mass() const {
void RigidBody::set_weight(real_t p_weight) { void RigidBody::set_weight(real_t p_weight) {
set_mass(p_weight / 9.8); set_mass(p_weight / real_t(GLOBAL_DEF("physics/3d/default_gravity", 9.8)));
} }
real_t RigidBody::get_weight() const { real_t RigidBody::get_weight() const {
return mass * 9.8; return mass * real_t(GLOBAL_DEF("physics/3d/default_gravity", 9.8));
} }
void RigidBody::set_friction(real_t p_friction) { void RigidBody::set_friction(real_t p_friction) {

1
scene/resources/world_2d.cpp
View File

@ -32,7 +32,6 @@
#include "servers/visual_server.h" #include "servers/visual_server.h"
//#include "servers/spatial_sound_2d_server.h" //#include "servers/spatial_sound_2d_server.h"
#include "global_config.h" #include "global_config.h"
#include "global_config.h"
#include "scene/2d/camera_2d.h" #include "scene/2d/camera_2d.h"
#include "scene/2d/visibility_notifier_2d.h" #include "scene/2d/visibility_notifier_2d.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"