seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename variable names for some singletons

Browse Source
This commit is contained in:
Aaron Franke
2022-04-26 22:52:53 -05:00
parent 14caf9ee73
commit 0ae00a07d6
7 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
servers/physics_server_2d_wrap_mt.cpp
View File

@ -37,7 +37,7 @@ void PhysicsServer2DWrapMT::thread_exit() {
}
void PhysicsServer2DWrapMT::thread_step(real_t p_delta) {
physics_2d_server->step(p_delta);
physics_server_2d->step(p_delta);
step_sem.post();
}
@ -50,7 +50,7 @@ void PhysicsServer2DWrapMT::_thread_callback(void *_instance) {
void PhysicsServer2DWrapMT::thread_loop() {
server_thread = Thread::get_caller_id();
physics_2d_server->init();
physics_server_2d->init();
exit.clear();
step_thread_up.set();
@ -61,7 +61,7 @@ void PhysicsServer2DWrapMT::thread_loop() {
command_queue.flush_all(); // flush all
physics_2d_server->finish();
physics_server_2d->finish();
}
/* EVENT QUEUING */
@ -71,7 +71,7 @@ void PhysicsServer2DWrapMT::step(real_t p_step) {
command_queue.push(this, &PhysicsServer2DWrapMT::thread_step, p_step);
} else {
command_queue.flush_all(); //flush all pending from other threads
physics_2d_server->step(p_step);
physics_server_2d->step(p_step);
}
}
@ -83,15 +83,15 @@ void PhysicsServer2DWrapMT::sync() {
step_sem.wait(); //must not wait if a step was not issued
}
}
physics_2d_server->sync();
physics_server_2d->sync();
}
void PhysicsServer2DWrapMT::flush_queries() {
physics_2d_server->flush_queries();
physics_server_2d->flush_queries();
}
void PhysicsServer2DWrapMT::end_sync() {
physics_2d_server->end_sync();
physics_server_2d->end_sync();
}
void PhysicsServer2DWrapMT::init() {
@ -102,7 +102,7 @@ void PhysicsServer2DWrapMT::init() {
OS::get_singleton()->delay_usec(1000);
}
} else {
physics_2d_server->init();
physics_server_2d->init();
}
}
@ -111,13 +111,13 @@ void PhysicsServer2DWrapMT::finish() {
command_queue.push(this, &PhysicsServer2DWrapMT::thread_exit);
thread.wait_to_finish();
} else {
physics_2d_server->finish();
physics_server_2d->finish();
}
}
PhysicsServer2DWrapMT::PhysicsServer2DWrapMT(PhysicsServer2D *p_contained, bool p_create_thread) :
command_queue(p_create_thread) {
physics_2d_server = p_contained;
physics_server_2d = p_contained;
create_thread = p_create_thread;
pool_max_size = GLOBAL_GET("memory/limits/multithreaded_server/rid_pool_prealloc");
@ -132,6 +132,6 @@ PhysicsServer2DWrapMT::PhysicsServer2DWrapMT(PhysicsServer2D *p_contained, bool
}
PhysicsServer2DWrapMT::~PhysicsServer2DWrapMT() {
memdelete(physics_2d_server);
memdelete(physics_server_2d);
//finish();
}