mirror of
https://github.com/open-goal/jak-project
synced 2026-06-17 23:21:41 -04:00
c87db7e670
The main thing that was done here was to slightly modify the new subtitle-v2 JSON schema to be more similar to the existing one so that it can properly be used in Crowdin. Draft while I double-check the diff myself Along the way the following was also done (among other things): - got rid of as much duplication as was feasible in the serialization and editor code - separated the text serialization code from the subtitle code for better organization - simplified "base language" in the editor. The new subtitle format has built-in support for defining a base language so the editor doesn't have to be used as a crutch. Also, cutscenes only defined in the base come first in the list now as that is generally the order you'd work from (what you havn't done first) - got rid of the GOAL subtitle format code completely - switched jak 2 text translations to the JSON format as well - found a few mistakes in the jak 1 subtitle metadata files - added a couple minor features to the editor - consolidate and removed complexity, ie. recently all jak 1 hints were forced to the `named` type, so I got rid of the two types as there isn't a need anymore. - removed subtitle editor groups for jak 1, the only reason they existed was so when the GOAL file was manually written out they were somewhat organized, the editor has a decent filter control, there's no need for them. - removed the GOAL -> JSON python script helper, it's been a month or so and no one has come forward with existing translations that they need help with migrating. If they do need it, the script will be in the git history. I did some reasonably through testing in Jak1/Jak 2 and everything seemed to work. But more testing is always a good idea. --------- Co-authored-by: ManDude <7569514+ManDude@users.noreply.github.com>
172 lines
5.8 KiB
C++
172 lines
5.8 KiB
C++
|
|
#include "debug_gui.h"
|
|
|
|
#include <algorithm>
|
|
|
|
#include "common/global_profiler/GlobalProfiler.h"
|
|
|
|
#include "game/graphics/gfx.h"
|
|
|
|
#include "third-party/imgui/imgui.h"
|
|
#include "third-party/imgui/imgui_style.h"
|
|
|
|
void FrameTimeRecorder::finish_frame() {
|
|
m_frame_times[m_idx++] = m_compute_timer.getMs();
|
|
if (m_idx == SIZE) {
|
|
m_idx = 0;
|
|
}
|
|
}
|
|
|
|
void FrameTimeRecorder::start_frame() {
|
|
m_compute_timer.start();
|
|
float frame_time = m_fps_timer.getSeconds();
|
|
m_last_frame_time = (0.9 * m_last_frame_time) + (0.1 * frame_time);
|
|
m_fps_timer.start();
|
|
}
|
|
|
|
void FrameTimeRecorder::draw_window(const DmaStats& /*dma_stats*/) {
|
|
auto* p_open = &m_open;
|
|
ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoDecoration |
|
|
ImGuiWindowFlags_AlwaysAutoResize |
|
|
ImGuiWindowFlags_NoSavedSettings |
|
|
ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav;
|
|
|
|
const float PAD = 10.0f;
|
|
const ImGuiViewport* viewport = ImGui::GetMainViewport();
|
|
ImVec2 work_pos = viewport->WorkPos; // Use work area to avoid menu-bar/task-bar, if any!
|
|
ImVec2 work_size = viewport->WorkSize;
|
|
ImVec2 window_pos, window_pos_pivot;
|
|
window_pos.x = (work_pos.x + work_size.x - PAD);
|
|
window_pos.y = (work_pos.y + work_size.y - PAD);
|
|
window_pos_pivot.x = 1.0f;
|
|
window_pos_pivot.y = 1.0f;
|
|
ImGui::SetNextWindowPos(window_pos, ImGuiCond_Always, window_pos_pivot);
|
|
|
|
ImGui::SetNextWindowBgAlpha(0.85f); // Transparent background
|
|
if (ImGui::Begin("Frame Timing", p_open, window_flags)) {
|
|
// ImGui::Text("DMA: sync ms %.1f, tc %4d, sz %3d KB, ch %d", dma_stats.sync_time_ms,
|
|
// dma_stats.num_tags, (dma_stats.num_data_bytes) / (1 << 10),
|
|
// dma_stats.num_chunks);
|
|
float worst = 0, total = 0;
|
|
for (auto x : m_frame_times) {
|
|
worst = std::max(x, worst);
|
|
total += x;
|
|
}
|
|
if (total / SIZE > 17.) {
|
|
ImGui::TextColored(ImVec4(1.0, 0.3, 0.3, 1.0), "avg: %.1f", total / SIZE);
|
|
} else {
|
|
ImGui::Text("avg: %.1f", total / SIZE);
|
|
}
|
|
ImGui::SameLine();
|
|
if (worst > 17.) {
|
|
ImGui::TextColored(ImVec4(1.0, 0.3, 0.3, 1.0), "worst: %.1f", worst);
|
|
} else {
|
|
ImGui::Text("worst: %.1f", worst);
|
|
}
|
|
ImGui::SameLine();
|
|
ImGui::Text("fps-avg: %.1f", 1.f / m_last_frame_time);
|
|
|
|
ImGui::Separator();
|
|
ImGui::PlotLines(
|
|
"0-20ms",
|
|
[](void* data, int idx) {
|
|
auto* me = (FrameTimeRecorder*)data;
|
|
return me->m_frame_times[(me->m_idx + idx) % SIZE];
|
|
},
|
|
(void*)this, SIZE, 0, nullptr, 0, 20., ImVec2(300, 40));
|
|
|
|
ImGui::Checkbox("Run", &m_play);
|
|
ImGui::SameLine();
|
|
if (ImGui::Button("Single Frame Advance")) {
|
|
m_single_frame = true;
|
|
}
|
|
ImGui::SameLine();
|
|
ImGui::Checkbox("GLFinish", &do_gl_finish);
|
|
}
|
|
ImGui::End();
|
|
}
|
|
|
|
void OpenGlDebugGui::start_frame() {
|
|
m_frame_timer.start_frame();
|
|
}
|
|
|
|
void OpenGlDebugGui::finish_frame() {
|
|
m_frame_timer.finish_frame();
|
|
}
|
|
|
|
void OpenGlDebugGui::draw(const DmaStats& dma_stats) {
|
|
if (ImGui::BeginMainMenuBar()) {
|
|
if (ImGui::BeginMenu("Debugging")) {
|
|
ImGui::MenuItem("Frame Time Plot", nullptr, &m_draw_frame_time);
|
|
ImGui::MenuItem("Render Debug", nullptr, &m_draw_debug);
|
|
ImGui::MenuItem("Profiler", nullptr, &m_draw_profiler);
|
|
ImGui::MenuItem("Small Profiler", nullptr, &small_profiler);
|
|
ImGui::MenuItem("Loader", nullptr, &m_draw_loader);
|
|
ImGui::EndMenu();
|
|
}
|
|
|
|
if (ImGui::BeginMenu("Tools")) {
|
|
if (ImGui::BeginMenu("Screenshot")) {
|
|
ImGui::MenuItem("Screenshot Next Frame!", nullptr, &m_want_screenshot);
|
|
ImGui::InputText("File", m_screenshot_save_name, 50);
|
|
ImGui::InputInt("Width", &screenshot_width);
|
|
ImGui::InputInt("Height", &screenshot_height);
|
|
ImGui::InputInt("MSAA", &screenshot_samples);
|
|
ImGui::Checkbox("Screenshot on F2", &screenshot_hotkey_enabled);
|
|
ImGui::EndMenu();
|
|
}
|
|
ImGui::MenuItem("Subtitle Editor", nullptr, &m_subtitle_editor);
|
|
ImGui::EndMenu();
|
|
}
|
|
|
|
if (ImGui::BeginMenu("Settings")) {
|
|
if (ImGui::TreeNode("ImGui Styling (restart required for these)")) {
|
|
ImGui::InputInt("Font Size", &Gfx::g_debug_settings.imgui_font_size);
|
|
ImGui::Checkbox("Monospaced Font", &Gfx::g_debug_settings.monospaced_font);
|
|
if (ImGui::Checkbox("Alternate Style", &Gfx::g_debug_settings.alternate_style)) {
|
|
if (Gfx::g_debug_settings.alternate_style) {
|
|
ImGui::applyAlternateStyle();
|
|
} else {
|
|
ImGui::applyClassicStyle();
|
|
}
|
|
}
|
|
ImGui::TreePop();
|
|
}
|
|
ImGui::Checkbox("Ignore Hide ImGui Bind", &Gfx::g_debug_settings.ignore_hide_imgui);
|
|
if (ImGui::BeginMenu("Frame Rate")) {
|
|
ImGui::Checkbox("Framelimiter", &Gfx::g_global_settings.framelimiter);
|
|
ImGui::InputFloat("Target FPS", &target_fps_input);
|
|
if (ImGui::MenuItem("Apply")) {
|
|
Gfx::g_global_settings.target_fps = target_fps_input;
|
|
}
|
|
ImGui::Separator();
|
|
ImGui::Checkbox("Accurate Lag Mode", &Gfx::g_global_settings.experimental_accurate_lag);
|
|
ImGui::Checkbox("Sleep in Frame Limiter", &Gfx::g_global_settings.sleep_in_frame_limiter);
|
|
ImGui::EndMenu();
|
|
}
|
|
ImGui::MenuItem("Filters", nullptr, &m_filters_menu);
|
|
ImGui::EndMenu();
|
|
}
|
|
|
|
if (ImGui::BeginMenu("Event Profiler")) {
|
|
if (ImGui::Checkbox("Record", &record_events)) {
|
|
prof().set_enable(record_events);
|
|
}
|
|
ImGui::MenuItem("Dump to file", nullptr, &dump_events);
|
|
ImGui::EndMenu();
|
|
}
|
|
|
|
if (ImGui::BeginMenu("Debug Mode")) {
|
|
if (ImGui::MenuItem("Reboot now!")) {
|
|
want_reboot_in_debug = true;
|
|
}
|
|
ImGui::EndMenu();
|
|
}
|
|
}
|
|
ImGui::EndMainMenuBar();
|
|
|
|
if (m_draw_frame_time) {
|
|
m_frame_timer.draw_window(dma_stats);
|
|
}
|
|
}
|