Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
7 changed files with 96 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

48
tests/test_main.cpp
View file

@ -160,10 +160,10 @@ struct GodotTestCaseListener : public doctest::IReporter {
SignalWatcher *signal_watcher = nullptr;
PhysicsServer3D *physics_3d_server = nullptr;
PhysicsServer2D *physics_2d_server = nullptr;
NavigationServer3D *navigation_3d_server = nullptr;
NavigationServer2D *navigation_2d_server = nullptr;
PhysicsServer3D *physics_server_3d = nullptr;
PhysicsServer2D *physics_server_2d = nullptr;
NavigationServer3D *navigation_server_3d = nullptr;
NavigationServer2D *navigation_server_2d = nullptr;
void test_case_start(const doctest::TestCaseData &p_in) override {
SignalWatcher::get_singleton()->_clear_signals();
@ -190,14 +190,14 @@ struct GodotTestCaseListener : public doctest::IReporter {
RenderingServerDefault::get_singleton()->init();
RenderingServerDefault::get_singleton()->set_render_loop_enabled(false);
physics_3d_server = PhysicsServer3DManager::new_default_server();
physics_3d_server->init();
physics_server_3d = PhysicsServer3DManager::new_default_server();
physics_server_3d->init();
physics_2d_server = PhysicsServer2DManager::new_default_server();
physics_2d_server->init();
physics_server_2d = PhysicsServer2DManager::new_default_server();
physics_server_2d->init();
navigation_3d_server = NavigationServer3DManager::new_default_server();
navigation_2d_server = memnew(NavigationServer2D);
navigation_server_3d = NavigationServer3DManager::new_default_server();
navigation_server_2d = memnew(NavigationServer2D);
memnew(InputMap);
InputMap::get_singleton()->load_default();
@ -225,26 +225,26 @@ struct GodotTestCaseListener : public doctest::IReporter {
clear_default_theme();
if (navigation_3d_server) {
memdelete(navigation_3d_server);
navigation_3d_server = nullptr;
if (navigation_server_3d) {
memdelete(navigation_server_3d);
navigation_server_3d = nullptr;
}
if (navigation_2d_server) {
memdelete(navigation_2d_server);
navigation_2d_server = nullptr;
if (navigation_server_2d) {
memdelete(navigation_server_2d);
navigation_server_2d = nullptr;
}
if (physics_3d_server) {
physics_3d_server->finish();
memdelete(physics_3d_server);
physics_3d_server = nullptr;
if (physics_server_3d) {
physics_server_3d->finish();
memdelete(physics_server_3d);
physics_server_3d = nullptr;
}
if (physics_2d_server) {
physics_2d_server->finish();
memdelete(physics_2d_server);
physics_2d_server = nullptr;
if (physics_server_2d) {
physics_server_2d->finish();
memdelete(physics_server_2d);
physics_server_2d = nullptr;
}
if (Input::get_singleton()) {