mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-27 04:36:18 +00:00
remove margins. Seek bar updates with replay
This commit is contained in:
parent
86572ceb24
commit
5fa1476592
3 changed files with 22 additions and 5 deletions
|
@ -715,7 +715,6 @@ void CEXISlippi::prepareGameInfo(u8* payload)
|
||||||
if (replayCommSettings.rollbackDisplayMethod == "off" &&
|
if (replayCommSettings.rollbackDisplayMethod == "off" &&
|
||||||
(replayCommSettings.mode == "normal" || replayCommSettings.mode == "queue"))
|
(replayCommSettings.mode == "normal" || replayCommSettings.mode == "queue"))
|
||||||
{
|
{
|
||||||
OSD::DrawSlippiPlaybackControls();
|
|
||||||
g_playbackStatus->startThreads();
|
g_playbackStatus->startThreads();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,8 +20,12 @@
|
||||||
#include "Common/Timer.h"
|
#include "Common/Timer.h"
|
||||||
#include "Core/Core.h"
|
#include "Core/Core.h"
|
||||||
#include "Core/ConfigManager.h"
|
#include "Core/ConfigManager.h"
|
||||||
|
#include "Core/Slippi/SlippiPlayback.h"
|
||||||
#include "VideoCommon/OnScreenDisplay.h"
|
#include "VideoCommon/OnScreenDisplay.h"
|
||||||
#include "VideoCommon/IconsFontAwesome4.h"
|
#include "VideoCommon/IconsFontAwesome4.h"
|
||||||
|
|
||||||
|
extern std::unique_ptr<SlippiPlaybackStatus> g_playbackStatus;
|
||||||
|
|
||||||
namespace OSD
|
namespace OSD
|
||||||
{
|
{
|
||||||
constexpr float LEFT_MARGIN = 10.0f; // Pixels to the left of OSD messages.
|
constexpr float LEFT_MARGIN = 10.0f; // Pixels to the left of OSD messages.
|
||||||
|
@ -295,6 +299,8 @@ bool SliderCustomBehavior(const ImRect& bb, ImGuiID id, int* v, int v_min, int v
|
||||||
if (isHeld)
|
if (isHeld)
|
||||||
window->DrawList->AddRectFilled(ImVec2(0, 0), ImGui::GetIO().DisplaySize, ImGui::ColorConvertFloat4ToU32(ImVec4(0.0f, 0.0f, 0.0f, 0.5f)));
|
window->DrawList->AddRectFilled(ImVec2(0, 0), ImGui::GetIO().DisplaySize, ImGui::ColorConvertFloat4ToU32(ImVec4(0.0f, 0.0f, 0.0f, 0.5f)));
|
||||||
|
|
||||||
|
window->DrawList->AddRectFilled(ImVec2(0, ImGui::GetWindowHeight() - 36), ImVec2(ImGui::GetWindowWidth(), ImGui::GetWindowHeight()), ImGui::ColorConvertFloat4ToU32(ImVec4(0.0f, 0.0f, 0.0f, 0.75f * style.Alpha)));
|
||||||
|
|
||||||
// Grey background line
|
// Grey background line
|
||||||
window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Max.y - 6), ImVec2(bb.Max.x, bb.Max.y - 6), ImGui::ColorConvertFloat4ToU32(ImVec4(1.0f, 1.0f, 1.0f, 0.5f * style.Alpha)), 4);
|
window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Max.y - 6), ImVec2(bb.Max.x, bb.Max.y - 6), ImGui::ColorConvertFloat4ToU32(ImVec4(1.0f, 1.0f, 1.0f, 0.5f * style.Alpha)), 4);
|
||||||
|
|
||||||
|
@ -310,10 +316,10 @@ bool SliderCustomBehavior(const ImRect& bb, ImGuiID id, int* v, int v_min, int v
|
||||||
}
|
}
|
||||||
|
|
||||||
// Progress bar
|
// Progress bar
|
||||||
if (!isHeld)
|
if (!isHeld)
|
||||||
|
frame = g_playbackStatus->currentPlaybackFrame;
|
||||||
window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Max.y - 6), ImVec2(curr_grab_bb.Min.x, bb.Max.y - 6), ImGui::ColorConvertFloat4ToU32(ImVec4(0.0f, 1.0f, 0.0f, style.Alpha)), 4);
|
window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Max.y - 6), ImVec2(curr_grab_bb.Min.x, bb.Max.y - 6), ImGui::ColorConvertFloat4ToU32(ImVec4(0.0f, 1.0f, 0.0f, style.Alpha)), 4);
|
||||||
|
|
||||||
//window->DrawList->AddRectFilled(ImVec2(grab_bb.Min.x, bb.Min.y + 2), ImVec2(grab_bb.Max.x + valuesize.x, bb.Min.y + 14), ColorConvertFloat4ToU32(ImVec4(0.21f, 0.20f, 0.21f, 1.00f)), 3);
|
|
||||||
return value_changed;
|
return value_changed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -384,7 +390,11 @@ void DrawSlippiPlaybackControls()
|
||||||
s32 diff = currTime - idle_tick;
|
s32 diff = currTime - idle_tick;
|
||||||
diff = diff < 1000 ? 0 : diff - 1000;
|
diff = diff < 1000 ? 0 : diff - 1000;
|
||||||
auto alpha = std::max(0.0001f, 1.0f - (diff / 1000.0f));
|
auto alpha = std::max(0.0001f, 1.0f - (diff / 1000.0f));
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, alpha);
|
|
||||||
|
ImGuiStyle& style = ImGui::GetStyle();
|
||||||
|
style.WindowBorderSize = 0.0f;
|
||||||
|
style.Alpha = alpha;
|
||||||
|
style.WindowPadding = ImVec2(0.0f, 0.0f);
|
||||||
|
|
||||||
if (ImGui::Begin(window_name.c_str(), nullptr,
|
if (ImGui::Begin(window_name.c_str(), nullptr,
|
||||||
ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
|
ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
|
||||||
|
@ -417,7 +427,6 @@ void DrawSlippiPlaybackControls()
|
||||||
INFO_LOG(SLIPPI, "fast_foward");
|
INFO_LOG(SLIPPI, "fast_foward");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ImGui::PopStyleVar();
|
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
}
|
}
|
||||||
} // namespace OSD
|
} // namespace OSD
|
||||||
|
|
|
@ -50,6 +50,8 @@
|
||||||
#include "Core/HW/VideoInterface.h"
|
#include "Core/HW/VideoInterface.h"
|
||||||
#include "Core/Host.h"
|
#include "Core/Host.h"
|
||||||
#include "Core/Movie.h"
|
#include "Core/Movie.h"
|
||||||
|
#include "Core/Slippi/SlippiReplayComm.h"
|
||||||
|
#include "Core/Slippi/SlippiPlayback.h"
|
||||||
|
|
||||||
#include "InputCommon/ControllerInterface/ControllerInterface.h"
|
#include "InputCommon/ControllerInterface/ControllerInterface.h"
|
||||||
|
|
||||||
|
@ -86,6 +88,9 @@
|
||||||
#include "VideoCommon/VideoConfig.h"
|
#include "VideoCommon/VideoConfig.h"
|
||||||
#include "VideoCommon/XFMemory.h"
|
#include "VideoCommon/XFMemory.h"
|
||||||
|
|
||||||
|
extern std::unique_ptr<SlippiPlaybackStatus> g_playbackStatus;
|
||||||
|
extern std::unique_ptr<SlippiReplayComm> g_replayComm;
|
||||||
|
|
||||||
std::unique_ptr<Renderer> g_renderer;
|
std::unique_ptr<Renderer> g_renderer;
|
||||||
|
|
||||||
static float AspectToWidescreen(float aspect)
|
static float AspectToWidescreen(float aspect)
|
||||||
|
@ -1253,8 +1258,12 @@ void Renderer::Swap(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height, u6
|
||||||
{
|
{
|
||||||
auto lock = GetImGuiLock();
|
auto lock = GetImGuiLock();
|
||||||
|
|
||||||
|
if (g_replayComm->getSettings().rollbackDisplayMethod == "off" && g_playbackStatus->inSlippiPlayback)
|
||||||
|
OSD::DrawSlippiPlaybackControls();
|
||||||
|
|
||||||
DrawDebugText();
|
DrawDebugText();
|
||||||
OSD::DrawMessages();
|
OSD::DrawMessages();
|
||||||
|
|
||||||
ImGui::Render();
|
ImGui::Render();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue