Green-Sky/totato
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new timing circuit (dynamic interval)

Browse Source 
needs windows fix (f msvc stl)
This commit is contained in:
Green Sky 2024-02-03 16:15:08 +01:00
parent 343c8e7012
commit 8b3af55834
No known key found for this signature in database
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main.cpp
View File

@ -29,6 +29,7 @@
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <cstdint> #include <cstdint>
#include <cmath>
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include <atomic> #include <atomic>
@ -124,7 +125,7 @@ int main(int argc, char** argv) {
#endif #endif
const auto started_at = std::chrono::steady_clock::now(); const auto started_at = std::chrono::steady_clock::now();
auto last_time = std::chrono::steady_clock::now(); auto last_time_tick = std::chrono::steady_clock::now();
std::string config_path {"config.json"}; std::string config_path {"config.json"};
@ -291,28 +292,45 @@ int main(int argc, char** argv) {
conf.dump(); conf.dump();
std::this_thread::sleep_for(std::chrono::milliseconds(10)); // at startup, just to be safe std::this_thread::sleep_for(std::chrono::milliseconds(25)); // at startup, just to be safe
float last_min_interval {0.1f};
while (!quit) { while (!quit) {
//auto new_time = std::chrono::steady_clock::now(); auto new_time = std::chrono::steady_clock::now();
const float time_delta_tick = std::chrono::duration<float, std::chrono::seconds::period>(new_time - last_time_tick).count();
// TODO: implement the equivalent of screen->nextTick() for plugs
const bool tick = time_delta_tick >= last_min_interval;
if (tick) {
quit = !tc.iterate(); quit = !tc.iterate();
tcm.iterate(/*time_delta*/0.02f); tcm.iterate(time_delta_tick);
ttm.iterate(); ttm.iterate();
mts.iterate(); mts.iterate();
const float pm_interval = pm.tick(/*time_delta*/0.02f); const float pm_interval = pm.tick(time_delta_tick);
mc.iterate(0.02f); mc.iterate(time_delta_tick);
mcd.iterate(0.02f); mcd.iterate(time_delta_tick);
const float tox_interval = std::pow(tc.toxIterationInterval(), 1.6f) / 1000.f;
//std::this_thread::sleep_for( // time left to get to 60fps last_min_interval = std::min<float>(
//std::chrono::duration<float, std::chrono::seconds::period>(0.0166f) // 60fps frame duration tox_interval,
//- std::chrono::duration<float, std::chrono::seconds::period>(std::chrono::steady_clock::now() - new_time) // time used for rendering pm_interval
//); );
std::this_thread::sleep_for(std::chrono::milliseconds(20)); // HACK: until i figure out the best main loop
// dont sleep and do an extra check
last_time_tick = new_time;
//std::cout << "M: time_delta_tick: " << time_delta_tick << "\n";
//std::cout << "M: last_min_interval: " << last_min_interval << " (t:" << tox_interval << " p:" << pm_interval << ")\n";
} else {
// TODO: replace with something that works on windows
const float sleep_dur = std::max(last_min_interval-time_delta_tick, 0.001f);
std::this_thread::sleep_for(std::chrono::milliseconds(int64_t(sleep_dur*1000)));
}
} }
conf.dump(); conf.dump();