diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-28 14:20:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-28 14:20:58 +0100 |
| commit | d2d359d67c5c35351ed953448430536c57db1522 (patch) | |
| tree | 95f1027d97b3e6fb9ceb21f7b768730d81f6beb1 /servers/physics_2d/physics_server_2d_sw.cpp | |
| parent | bbbdabc771662d0effb739237967982cd201ea89 (diff) | |
| parent | 60d486acc80de3ccf621df769fac27aa27ad4a10 (diff) | |
Merge pull request #37379 from akien-mga/server-renames-followup
More server renames for consistency after #37361
Diffstat (limited to 'servers/physics_2d/physics_server_2d_sw.cpp')
| -rw-r--r-- | servers/physics_2d/physics_server_2d_sw.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/servers/physics_2d/physics_server_2d_sw.cpp b/servers/physics_2d/physics_server_2d_sw.cpp index cd1f14b69d..e2a482e960 100644 --- a/servers/physics_2d/physics_server_2d_sw.cpp +++ b/servers/physics_2d/physics_server_2d_sw.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* physics_2d_server_sw.cpp */ +/* physics_server_2d_sw.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -29,6 +29,7 @@ /*************************************************************************/ #include "physics_server_2d_sw.h" + #include "broad_phase_2d_basic.h" #include "broad_phase_2d_hash_grid.h" #include "collision_solver_2d_sw.h" @@ -1321,7 +1322,7 @@ void PhysicsServer2DSW::init() { last_step = 0.001; iterations = 8; // 8? stepper = memnew(Step2DSW); - direct_state = memnew(Physics2DDirectBodyStateSW); + direct_state = memnew(PhysicsDirectBodyState2DSW); }; void PhysicsServer2DSW::step(real_t p_step) { @@ -1334,7 +1335,7 @@ void PhysicsServer2DSW::step(real_t p_step) { doing_sync = false; last_step = p_step; - Physics2DDirectBodyStateSW::singleton->step = p_step; + PhysicsDirectBodyState2DSW::singleton->step = p_step; island_count = 0; active_objects = 0; collision_pairs = 0; |