mirror of https://github.com/PCSX2/pcsx2.git
recording: improvements so frame will be less likely to appear un-rendered
This commit is contained in:
parent
32047c6130
commit
566d0c846f
|
@ -156,7 +156,8 @@ void InputRecording::ControllerInterrupt(u8 &data, u8 &port, u16 &bufCount, u8 b
|
|||
if (bufIndex == PadData::END_INDEX_CONTROLLER_BUFFER) {
|
||||
padData[port]->LogPadData(port);
|
||||
// As well as re-render the virtual pad UI, if applicable
|
||||
if (virtualPads[port] && virtualPads[port]->IsShown())
|
||||
// - Don't render if it's minimized
|
||||
if (virtualPads[port] && virtualPads[port]->IsShown() && !virtualPads[port]->IsIconized())
|
||||
{
|
||||
virtualPads[port]->Redraw();
|
||||
}
|
||||
|
|
|
@ -98,10 +98,12 @@ VirtualPad::VirtualPad(wxWindow* parent, wxWindowID id, const wxString& title, i
|
|||
// Bind Window Events
|
||||
Bind(wxEVT_ERASE_BACKGROUND, &VirtualPad::OnEraseBackground, this);
|
||||
Bind(wxEVT_CLOSE_WINDOW, &VirtualPad::OnClose, this);
|
||||
Bind(wxEVT_ICONIZE, &VirtualPad::OnIconize, this);
|
||||
// Temporary Paint event handler so the window displays properly before the controller-interrupt routine takes over with manual drawing.
|
||||
// The reason for this is in order to minimize the performance impact, we need total control over when render is called
|
||||
// Windows redraws the window _alot_ otherwise which leads to major performance problems (when GS is using the software renderer)
|
||||
Bind(wxEVT_PAINT, &VirtualPad::OnPaint, this);
|
||||
// DevCon.WriteLn("Paint Event Bound");
|
||||
|
||||
// Finalize layout
|
||||
SetIcons(wxGetApp().GetIconBundle());
|
||||
|
@ -118,27 +120,35 @@ void VirtualPad::OnClose(wxCloseEvent & event)
|
|||
// Re-bind the Paint event in case this is due to a game being opened/closed
|
||||
manualRedrawMode = false;
|
||||
Bind(wxEVT_PAINT, &VirtualPad::OnPaint, this);
|
||||
// DevCon.WriteLn("Paint Event Bound");
|
||||
Hide();
|
||||
}
|
||||
|
||||
void VirtualPad::OnIconize(wxIconizeEvent &event)
|
||||
{
|
||||
if (event.IsIconized())
|
||||
{
|
||||
manualRedrawMode = false;
|
||||
Bind(wxEVT_PAINT, &VirtualPad::OnPaint, this);
|
||||
// DevCon.WriteLn("Paint Event Bound");
|
||||
}
|
||||
}
|
||||
|
||||
void VirtualPad::OnEraseBackground(wxEraseEvent &event)
|
||||
{
|
||||
// Intentionally Empty
|
||||
// See - https://wiki.wxwidgets.org/Flicker-Free_Drawing
|
||||
}
|
||||
|
||||
void VirtualPad::OnPaint(wxPaintEvent &evt)
|
||||
void VirtualPad::OnPaint(wxPaintEvent &event)
|
||||
{
|
||||
// DevCon.WriteLn("Paint Event Called");
|
||||
wxPaintDC dc(this);
|
||||
Render(dc);
|
||||
}
|
||||
|
||||
void VirtualPad::Redraw()
|
||||
{
|
||||
if (!manualRedrawMode) {
|
||||
Unbind(wxEVT_PAINT, &VirtualPad::OnPaint, this);
|
||||
manualRedrawMode = true;
|
||||
}
|
||||
wxClientDC dc(this);
|
||||
Render(dc);
|
||||
}
|
||||
|
@ -178,6 +188,13 @@ void VirtualPad::Render(wxDC &dc)
|
|||
bdc.DrawBitmap(virtualPadData.background.image, virtualPadData.background.coords, true);
|
||||
clearScreenRequired = false;
|
||||
|
||||
// Switch to Manual Rendering once the first user action on the VirtualPad is taken
|
||||
if (!manualRedrawMode && !renderQueue.empty()) {
|
||||
// DevCon.WriteLn("Paint Event Unbound");
|
||||
Unbind(wxEVT_PAINT, &VirtualPad::OnPaint, this);
|
||||
manualRedrawMode = true;
|
||||
}
|
||||
|
||||
// NOTE - there is yet another (and I think final) micro-optimization that can be done:
|
||||
// It can be assumed that if the element has already been drawn to the screen (and not cleared) that we can skip rendering it
|
||||
//
|
||||
|
|
|
@ -69,16 +69,17 @@ private:
|
|||
std::map<wxWindowID, AnalogVector *> analogElements;
|
||||
|
||||
/// Event Listeners
|
||||
void OnEraseBackground(wxEraseEvent& event);
|
||||
void OnPaint(wxPaintEvent & evt);
|
||||
void Render(wxDC& dc);
|
||||
void OnClose(wxCloseEvent &event);
|
||||
void OnIconize(wxIconizeEvent &event);
|
||||
void OnEraseBackground(wxEraseEvent &event);
|
||||
void OnPaint(wxPaintEvent &event);
|
||||
void Render(wxDC &dc);
|
||||
|
||||
void OnNormalButtonPress(wxCommandEvent &event);
|
||||
void OnPressureButtonPressureChange(wxCommandEvent &event);
|
||||
void OnAnalogSliderChange(wxCommandEvent &event);
|
||||
void OnAnalogSpinnerChange(wxCommandEvent &event);
|
||||
void OnIgnoreRealController(wxCommandEvent const &event);
|
||||
void OnNormalButtonPress(wxCommandEvent &event);
|
||||
void OnPressureButtonPressureChange(wxCommandEvent &event);
|
||||
|
||||
/// GUI Creation Utility Functions
|
||||
float scalingFactor = 1.0;
|
||||
|
|
|
@ -221,7 +221,7 @@ bool ControllerPressureButton::UpdateData(u8 &padDataVal, bool ignoreRealControl
|
|||
}
|
||||
button.prevPressureVal = padDataVal;
|
||||
padDataVal = button.pressure;
|
||||
return button.prevPressedVal != button.pressure;
|
||||
return button.prevPressureVal != button.pressure;
|
||||
}
|
||||
|
||||
bool AnalogVector::UpdateData(u8 &padDataVal, bool ignoreRealController, bool readOnly)
|
||||
|
|
Loading…
Reference in New Issue