Skip to content
Snippets Groups Projects

Resolves #343 GUI and Frame Refactor

Merged Nicolas Pope requested to merge feature/gui2 into master
Compare and Show latest version
18 files
+ 231
177
Compare changes
  • Side-by-side
  • Inline
Files
18
@@ -39,7 +39,7 @@ void Camera::update(double delta) {
auto *mod = screen->getModule<ftl::gui2::Statistics>();
mod->getJSON(StatisticsPanel::PERFORMANCE_INFO)["FPS"] = n/diff;
mod->getJSON(StatisticsPanel::PERFORMANCE_INFO)["Latency"] = l;
mod->getJSON(StatisticsPanel::PERFORMANCE_INFO)["Latency"] = std::to_string(int(l))+std::string("ms");
if (live_) mod->getJSON(StatisticsPanel::MEDIA_STATUS)["LIVE"] = nlohmann::json{{"icon", ENTYPO_ICON_VIDEO_CAMERA},{"value", true},{"colour","#0000FF"},{"size",28}};
auto ptr = std::atomic_load(&latest_);
Loading