diff options
| author | Andreas Haas <Hinsbart@users.noreply.github.com> | 2017-10-02 23:10:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 23:10:36 +0200 |
| commit | 5303efb2fabd668bef18b7ac7606426692e5d6bb (patch) | |
| tree | b699146047e60501afbfa09c36161d8ae408a223 /main/performance.cpp | |
| parent | 1e9465096d9c738057aad81d5046b85777155f87 (diff) | |
| parent | 4537977d6dd2a76580d9ab611a18634efab55c74 (diff) | |
Merge pull request #11659 from AndreaCatania/prephysics
Renamed fixed_process to physics_process
Diffstat (limited to 'main/performance.cpp')
| -rw-r--r-- | main/performance.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/performance.cpp b/main/performance.cpp index 4dac6c119e..0f3383c4a8 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -42,7 +42,7 @@ void Performance::_bind_methods() { BIND_ENUM_CONSTANT(TIME_FPS); BIND_ENUM_CONSTANT(TIME_PROCESS); - BIND_ENUM_CONSTANT(TIME_FIXED_PROCESS); + BIND_ENUM_CONSTANT(TIME_PHYSICS_PROCESS); BIND_ENUM_CONSTANT(MEMORY_STATIC); BIND_ENUM_CONSTANT(MEMORY_DYNAMIC); BIND_ENUM_CONSTANT(MEMORY_STATIC_MAX); @@ -78,7 +78,7 @@ String Performance::get_monitor_name(Monitor p_monitor) const { "time/fps", "time/process", - "time/fixed_process", + "time/physics_process", "memory/static", "memory/dynamic", "memory/static_max", @@ -114,7 +114,7 @@ float Performance::get_monitor(Monitor p_monitor) const { switch (p_monitor) { case TIME_FPS: return Engine::get_singleton()->get_frames_per_second(); case TIME_PROCESS: return _process_time; - case TIME_FIXED_PROCESS: return _fixed_process_time; + case TIME_PHYSICS_PROCESS: return _physics_process_time; case MEMORY_STATIC: return Memory::get_mem_usage(); case MEMORY_DYNAMIC: return MemoryPool::total_memory; case MEMORY_STATIC_MAX: return Memory::get_mem_max_usage(); @@ -158,14 +158,14 @@ void Performance::set_process_time(float p_pt) { _process_time = p_pt; } -void Performance::set_fixed_process_time(float p_pt) { +void Performance::set_physics_process_time(float p_pt) { - _fixed_process_time = p_pt; + _physics_process_time = p_pt; } Performance::Performance() { _process_time = 0; - _fixed_process_time = 0; + _physics_process_time = 0; singleton = this; } |