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

Remove the unnecessary sync() and the restrictions it imposes on 3D Physics.

Browse Source
This commit is contained in:
Marcel Admiraal
2020-09-18 10:24:57 +01:00
parent 31d0f8ad8d
commit fc72c3fdf5
9 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
servers/physics/physics_server_sw.cpp
View File

@@ -196,7 +196,7 @@ PhysicsDirectSpaceState *PhysicsServerSW::space_get_direct_state(RID p_space) {
SpaceSW *space = space_owner.get(p_space);
ERR_FAIL_COND_V(!space, NULL);
ERR_FAIL_COND_V_MSG(!doing_sync || space->is_locked(), NULL, "Space state is inaccessible right now, wait for iteration or physics process notification.");
ERR_FAIL_COND_V_MSG(space->is_locked(), NULL, "Space state is inaccessible right now, wait for iteration or physics process notification.");
return space->get_direct_state();
}
@@ -979,7 +979,7 @@ PhysicsDirectBodyState *PhysicsServerSW::body_get_direct_state(RID p_body) {
BodySW *body = body_owner.get(p_body);
ERR_FAIL_COND_V(!body, NULL);
ERR_FAIL_COND_V_MSG(!doing_sync || body->get_space()->is_locked(), NULL, "Body state is inaccessible right now, wait for iteration or physics process notification.");
ERR_FAIL_COND_V_MSG(body->get_space()->is_locked(), NULL, "Body state is inaccessible right now, wait for iteration or physics process notification.");
direct_state->body = body;
return direct_state;
@@ -1408,7 +1408,6 @@ void PhysicsServerSW::set_active(bool p_active) {
void PhysicsServerSW::init() {
doing_sync = true;
last_step = 0.001;
iterations = 8; // 8?
stepper = memnew(StepSW);
@@ -1424,8 +1423,6 @@ void PhysicsServerSW::step(real_t p_step) {
_update_shapes();
doing_sync = false;
last_step = p_step;
PhysicsDirectBodyStateSW::singleton->step = p_step;
@@ -1442,10 +1439,6 @@ void PhysicsServerSW::step(real_t p_step) {
#endif
}
void PhysicsServerSW::sync(){
};
void PhysicsServerSW::flush_queries() {
#ifndef _3D_DISABLED
@@ -1453,8 +1446,6 @@ void PhysicsServerSW::flush_queries() {
if (!active)
return;
doing_sync = true;
flushing_queries = true;
uint64_t time_beg = OS::get_singleton()->get_ticks_usec();