mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-03 16:16:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add info and fullscreen buttons. Make a lot more robust

Browse source
This commit is contained in:
R2DLiu 2020-08-22 20:11:52 -04:00
commit 78ef189315
16 changed files with 78 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -46,7 +46,7 @@ option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence, show the current gam
option(ENABLE_ANALYTICS "Enables opt-in Analytics collection" OFF)
# Enable Playback build for Slippi. TODO: turn off for normal builds
option(SLIPPI_PLAYBACK "Enable Playback changes" OFF)
option(SLIPPI_PLAYBACK "Enable Playback changes" ON)
option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)

2
Externals/open-vcdiff/src/vcdecoder.cc vendored
View file

@ -324,7 +324,7 @@ class VCDiffStreamingDecoderImpl {
// The default maximum target file size (and target window size) if
// SetMaximumTargetFileSize() is not called.
static const size_t kDefaultMaximumTargetFileSize = 134217728U; // 128 MB
static const size_t kDefaultMaximumTargetFileSize = 268435456U; // 128 MB
// The largest value that can be passed to SetMaximumTargetWindowSize().
// Using a larger value will result in an error.

4
Source/Android/jni/MainAndroid.cpp
View file

@ -157,6 +157,10 @@ void Host_PlaybackSeek()
{
}
void Host_Fullscreen()
{
}
static bool MsgAlert(const char* caption, const char* text, bool yes_no, Common::MsgType /*style*/)
{
JNIEnv* env = IDCache::GetEnvForThread();

4
Source/Core/Core/CMakeLists.txt
View file

@ -479,8 +479,8 @@ add_library(core
Slippi/SlippiReplayComm.h
Slippi/SlippiSavestate.cpp
Slippi/SlippiSavestate.h
Slippi/SlippiTimer.cpp
Slippi/SlippiTimer.h
Slippi/SlippiUser.cpp
Slippi/SlippiUser.h
)

1
Source/Core/Core/Host.h
View file

@ -47,3 +47,4 @@ void Host_TitleChanged();
void Host_LowerWindow();
void Host_Exit();
void Host_PlaybackSeek();
void Host_Fullscreen();

11
Source/Core/Core/Slippi/SlippiPlayback.cpp
View file

@ -7,7 +7,6 @@
#include "Common/Logging/Log.h"
#include "Core/Core.h"
#include "Core/ConfigManager.h"
#include "Core/HW/EXI/EXI_DeviceSlippi.h"
#include "Core/NetPlayClient.h"
#include "Core/State.h"
@ -74,7 +73,7 @@ void SlippiPlaybackStatus::startThreads()
void SlippiPlaybackStatus::prepareSlippiPlayback(s32& frameIndex)
{
// block if there's too many diffs being processed
while (shouldRunThreads && numDiffsProcessing > 3)
while (shouldRunThreads && numDiffsProcessing > 2)
{
INFO_LOG(SLIPPI, "Processing too many diffs, blocking main process");
cv_processingDiff.wait(processingLock);
@ -205,7 +204,7 @@ void SlippiPlaybackStatus::seekToFrame()
}
else
{
// If this diff has been processed, load it
// If this diff exists, load it
if (futureDiffs.count(closestStateFrame) > 0)
{
loadState(closestStateFrame);
@ -241,7 +240,13 @@ void SlippiPlaybackStatus::seekToFrame()
Core::SetState(Core::State::Paused);
setHardFFW(false);
}
else {
// In the case where we don't need to fastforward, we're already at the frame we want!
// Update currentPlaybackFrame accordingly
g_playbackStatus->currentPlaybackFrame = targetFrameNum;
}
// We've reached the frame we want. Reset targetFrameNum and release mutex so another seek can be performed
targetFrameNum = INT_MAX;
Core::SetState(prevState);
seekMtx.unlock();

12
Source/Core/Core/Slippi/SlippiPlayback.h
View file

@ -2,12 +2,14 @@
#include <climits>
#include <future>
#include <open-vcdiff/src/google/vcdecoder.h>
#include <open-vcdiff/src/google/vcencoder.h>
#include <SlippiLib/SlippiGame.h>
#include <unordered_map>
#include <vector>
#include <open-vcdiff/src/google/vcdecoder.h>
#include <open-vcdiff/src/google/vcencoder.h>
#include <SlippiLib/SlippiGame.h>
#include "Core/ConfigManager.h"
#include "../../Common/CommonTypes.h"
class SlippiPlaybackStatus
@ -22,8 +24,8 @@ public:
volatile bool shouldRunThreads = false;
bool isHardFFW = false;
bool isSoftFFW = false;
bool origOCEnable;
float origOCFactor;
bool origOCEnable = SConfig::GetInstance().m_OCEnable;
float origOCFactor = SConfig::GetInstance().m_OCFactor;
s32 lastFFWFrame = INT_MIN;
s32 currentPlaybackFrame = INT_MIN;

46
Source/Core/Core/Slippi/SlippiTimer.cpp
View file

@ -1,46 +0,0 @@
// SLIPPITODO: refactor with qt
/*#include "SlippiTimer.h"
#include "DolphinWX/Frame.h"
#include "SlippiPlayback.h"
extern std::unique_ptr<SlippiPlaybackStatus> g_playbackStatus;
void SlippiTimer::Notify()
{
if (!m_slider || !m_text)
{
// If there is no slider, do nothing
return;
}
int totalSeconds = (int)((g_playbackStatus->latestFrame - Slippi::GAME_FIRST_FRAME) / 60);
int totalMinutes = (int)(totalSeconds / 60);
int totalRemainder = (int)(totalSeconds % 60);
int currSeconds = int((g_playbackStatus->currentPlaybackFrame - Slippi::GAME_FIRST_FRAME) / 60);
int currMinutes = (int)(currSeconds / 60);
int currRemainder = (int)(currSeconds % 60);
// Position string (i.e. MM:SS)
char endTime[6];
sprintf(endTime, "%02d:%02d", totalMinutes, totalRemainder);
char currTime[6];
sprintf(currTime, "%02d:%02d", currMinutes, currRemainder);
std::string time = std::string(currTime) + " / " + std::string(endTime);
// Setup the slider and gauge min/max values
int minValue = m_slider->GetMin();
int maxValue = m_slider->GetMax();
if (maxValue != (int)g_playbackStatus->latestFrame || minValue != Slippi::PLAYBACK_FIRST_SAVE)
{
m_slider->SetRange(Slippi::PLAYBACK_FIRST_SAVE, (int)(g_playbackStatus->latestFrame));
}
// Only update values while not actively seeking
if (g_playbackStatus->targetFrameNum == INT_MAX && m_slider->isDraggingSlider == false)
{
m_text->SetLabel(_(time));
m_slider->SetValue(g_playbackStatus->currentPlaybackFrame);
}
}*/

30
Source/Core/Core/Slippi/SlippiTimer.h
View file

@ -1,30 +0,0 @@
// SLIPPITODO: refactor with qt
/*#ifndef SLIPPI_TIMER_HEADER
#define SLIPPI_TIMER_HEADER
#include <wx/timer.h>
#include <wx/stattext.h>
#include <Core/../DolphinWX/PlaybackSlider.h>
class CFrame;
class SlippiTimer : public wxTimer
{
public:
SlippiTimer(CFrame* mainFrame, PlaybackSlider* slider, wxStaticText* text) {
m_frame = mainFrame;
m_slider = slider;
m_text = text;
}
// Called each time the timer's timeout expires
void Notify() wxOVERRIDE;
CFrame* m_frame;
PlaybackSlider* m_slider;
wxStaticText* m_text;
};
#endif
*/

1
Source/Core/DolphinNoGUI/MainNoGUI.cpp
View file

@ -110,6 +110,7 @@ void Host_TitleChanged()
void Host_LowerWindow() {}
void Host_Exit() {}
void Host_PlaybackSeek() {}
void Host_Fullscreen() {}
static std::unique_ptr<Platform> GetPlatform(const optparse::Values& options)
{

5
Source/Core/DolphinQt/Host.cpp
View file

@ -188,3 +188,8 @@ void Host_PlaybackSeek()
{
Host::GetInstance()->RequestSeek();
}
void Host_Fullscreen()
{
Host::GetInstance()->RequestFullscreen();
}

3
Source/Core/DolphinQt/Host.h
View file

@ -40,7 +40,8 @@ signals:
void RequestLowerWindow();
void RequestExit();
void RequestSeek();
void RequestFullscreen();
private:
Host();

1
Source/Core/DolphinQt/MainWindow.cpp
View file

@ -632,6 +632,7 @@ void MainWindow::ConnectRenderWidget()
void MainWindow::ConnectHost()
{
connect(Host::GetInstance(), &Host::RequestStop, this, &MainWindow::RequestStop);
connect(Host::GetInstance(), &Host::RequestFullscreen, this, &MainWindow::FullScreen);
}
void MainWindow::ConnectStack()

43
Source/Core/VideoCommon/OnScreenDisplay.cpp
View file

@ -11,13 +11,9 @@
#include <imgui.h>
#include "Common/CommonTypes.h"
#include "Common/Timer.h"
#include "Core/ConfigManager.h"
#include "Core/Slippi/SlippiPlayback.h"
#include "VideoCommon/OnScreenDisplay.h"
#ifdef IS_PLAYBACK
@ -25,6 +21,7 @@
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
#include <imgui_internal.h>
#include "Core/Core.h"
#include "Core/Host.h"
@ -158,6 +155,7 @@ static std::string GetTimeForFrame(s32 currFrame) {
return std::string(currTime);
}
bool showHelp = false;
u32 idle_tick = Common::Timer::GetTimeMs();
ImVec2 prev_mouse(0, 0);
@ -462,10 +460,45 @@ void DrawSlippiPlaybackControls()
if (ButtonCustom(ICON_FA_FAST_FORWARD, ImVec2(32.0f, 32.0f))) {
INFO_LOG(SLIPPI, "fast_foward");
if (g_playbackStatus->targetFrameNum == INT_MAX) {
g_playbackStatus->targetFrameNum = g_playbackStatus->currentPlaybackFrame - 1200;
g_playbackStatus->targetFrameNum = g_playbackStatus->currentPlaybackFrame + 1200;
Host_PlaybackSeek();
}
}
ImGui::SameLine(ImGui::GetWindowWidth() - 64.0f);
if (ButtonCustom(ICON_FA_QUESTION_CIRCLE, ImVec2(32.0f, 32.0f))) {
showHelp = !showHelp;
}
ImGui::SameLine(ImGui::GetWindowWidth() - 32.0f);
if (ButtonCustom(ICON_FA_EXPAND, ImVec2(32.0f, 32.0f))) {
INFO_LOG(SLIPPI, "fullscreen");
Host_Fullscreen();
}
if (g_playbackStatus->isHardFFW) {
INFO_LOG(SLIPPI, "Ffw");
}
if (showHelp) {
ImGui::GetWindowDrawList()->AddRectFilled(
ImVec2(ImGui::GetWindowWidth() - 300.0f, ImGui::GetWindowHeight() - 200.0f),
ImVec2(ImGui::GetWindowWidth() - 50.0f, ImGui::GetWindowHeight() - 40.0f),
ImGui::ColorConvertFloat4ToU32(ImVec4(0.0f, 0.0f, 0.0f, 0.8f * alpha)));
ImGui::SetCursorPos(ImVec2(ImGui::GetWindowWidth() - 290.0f, ImGui::GetWindowHeight() - 190.0f));
ImGui::Text("Play/Pause: Spacebar");
ImGui::SetCursorPos(ImVec2(ImGui::GetWindowWidth() - 290.0f, ImGui::GetWindowHeight() - 170.0f));
ImGui::Text("Step Back (5s): Left Arrow");
ImGui::SetCursorPos(ImVec2(ImGui::GetWindowWidth() - 290.0f, ImGui::GetWindowHeight() - 150.0f));
ImGui::Text("Step Forward (5s): Right Arrow");
ImGui::SetCursorPos(ImVec2(ImGui::GetWindowWidth() - 290.0f, ImGui::GetWindowHeight() - 130.0f));
ImGui::Text("Jump Back (20s): Shift + Left Arrow");
ImGui::SetCursorPos(ImVec2(ImGui::GetWindowWidth() - 290.0f, ImGui::GetWindowHeight() - 110.0f));
ImGui::Text("Jump Forward (20s): Shift + Right Arrow");
ImGui::SetCursorPos(ImVec2(ImGui::GetWindowWidth() - 290.0f, ImGui::GetWindowHeight() - 90.0f));
ImGui::Text("Frame Advance: Period");
ImGui::SetCursorPos(ImVec2(ImGui::GetWindowWidth() - 290.0f, ImGui::GetWindowHeight() - 70.0f));
ImGui::Text("Big jumps/seeks may take several seconds.");
}
ImGui::PopStyleVar();
ImGuiWindow* window = ImGui::GetCurrentWindow();
ImGui::SetCursorPos(ImVec2(135.0f, window->DC.CursorPosPrevLine.y + 6.0f));

7
Source/Core/VideoCommon/RenderBase.cpp
View file

@ -521,9 +521,10 @@ void Renderer::DrawDebugText()
if (ImGui::Begin("FPS", nullptr,
ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoInputs |
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoNav |
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing))
ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoMove |
ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoScrollbar |
ImGuiWindowFlags_NoNav | ImGuiWindowFlags_AlwaysAutoResize |
ImGuiWindowFlags_NoFocusOnAppearing))
{
ImGui::TextColored(ImVec4(0.0f, 1.0f, 1.0f, 1.0f), "FPS: %.2f", m_fps_counter.GetFPS());
}

3
Source/UnitTests/StubHost.cpp
View file

@ -58,3 +58,6 @@ void Host_Exit()
void Host_PlaybackSeek()
{
}
void Host_Fullscreen()
{
}