[UI] Image post-processing and full presentation/window rework
[GPU] Add FXAA post-processing [UI] Add FidelityFX FSR and CAS post-processing [UI] Add blue noise dithering from 10bpc to 8bpc [GPU] Apply the DC PWL gamma ramp closer to the spec, supporting fully white color [UI] Allow the GPU CP thread to present on the host directly, bypassing the UI thread OS paint event [UI] Allow variable refresh rate (or tearing) [UI] Present the newest frame (restart) on DXGI [UI] Replace GraphicsContext with a far more advanced Presenter with more coherent surface connection and UI overlay state management [UI] Connect presentation to windows via the Surface class, not native window handles [Vulkan] Switch to simpler Vulkan setup with no instance/device separation due to interdependencies and to pass fewer objects around [Vulkan] Lower the minimum required Vulkan version to 1.0 [UI/GPU] Various cleanup, mainly ComPtr usage [UI] Support per-monitor DPI awareness v2 on Windows [UI] DPI-scale Dear ImGui [UI] Replace the remaining non-detachable window delegates with unified window event and input listeners [UI] Allow listeners to safely destroy or close the window, and to register/unregister listeners without use-after-free and the ABA problem [UI] Explicit Z ordering of input listeners and UI overlays, top-down for input, bottom-up for drawing [UI] Add explicit window lifecycle phases [UI] Replace Window virtual functions with explicit desired state, its application, actual state, its feedback [UI] GTK: Apply the initial size to the drawing area [UI] Limit internal UI frame rate to that of the monitor [UI] Hide the cursor using a timer instead of polling due to no repeated UI thread paints with GPU CP thread presentation, and only within the window
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
******************************************************************************
|
||||
* Xenia : Xbox 360 Emulator Research Project *
|
||||
******************************************************************************
|
||||
* Copyright 2015 Ben Vanik. All rights reserved. *
|
||||
* Copyright 2022 Ben Vanik. All rights reserved. *
|
||||
* Released under the BSD license - see LICENSE in the root for more details. *
|
||||
******************************************************************************
|
||||
*/
|
||||
@@ -10,10 +10,14 @@
|
||||
#ifndef XENIA_UI_IMGUI_DRAWER_H_
|
||||
#define XENIA_UI_IMGUI_DRAWER_H_
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "xenia/ui/immediate_drawer.h"
|
||||
#include "xenia/ui/presenter.h"
|
||||
#include "xenia/ui/window.h"
|
||||
#include "xenia/ui/window_listener.h"
|
||||
|
||||
struct ImDrawData;
|
||||
@@ -23,43 +27,73 @@ struct ImGuiIO;
|
||||
namespace xe {
|
||||
namespace ui {
|
||||
|
||||
class GraphicsContext;
|
||||
class ImGuiDialog;
|
||||
class Window;
|
||||
|
||||
class ImGuiDrawer : public WindowListener {
|
||||
class ImGuiDrawer : public WindowInputListener, public UIDrawer {
|
||||
public:
|
||||
ImGuiDrawer(Window* window);
|
||||
ImGuiDrawer(Window* window, size_t z_order);
|
||||
~ImGuiDrawer();
|
||||
|
||||
void SetupDefaultInput() {}
|
||||
|
||||
ImGuiIO& GetIO();
|
||||
void RenderDrawLists();
|
||||
|
||||
void AddDialog(ImGuiDialog* dialog);
|
||||
void RemoveDialog(ImGuiDialog* dialog);
|
||||
|
||||
// SetPresenter may be called from the destructor.
|
||||
void SetPresenter(Presenter* new_presenter);
|
||||
void SetImmediateDrawer(ImmediateDrawer* new_immediate_drawer);
|
||||
void SetPresenterAndImmediateDrawer(Presenter* new_presenter,
|
||||
ImmediateDrawer* new_immediate_drawer) {
|
||||
SetPresenter(new_presenter);
|
||||
SetImmediateDrawer(new_immediate_drawer);
|
||||
}
|
||||
|
||||
void Draw(UIDrawContext& ui_draw_context) override;
|
||||
|
||||
protected:
|
||||
void Initialize();
|
||||
void SetupFont();
|
||||
|
||||
void RenderDrawLists(ImDrawData* data);
|
||||
|
||||
void OnKeyDown(KeyEvent* e) override;
|
||||
void OnKeyUp(KeyEvent* e) override;
|
||||
void OnKeyChar(KeyEvent* e) override;
|
||||
void OnMouseDown(MouseEvent* e) override;
|
||||
void OnMouseMove(MouseEvent* e) override;
|
||||
void OnMouseUp(MouseEvent* e) override;
|
||||
void OnMouseWheel(MouseEvent* e) override;
|
||||
|
||||
static ImGuiDrawer* current_drawer_;
|
||||
|
||||
Window* window_ = nullptr;
|
||||
GraphicsContext* graphics_context_ = nullptr;
|
||||
|
||||
ImGuiContext* internal_state_ = nullptr;
|
||||
std::unique_ptr<ImmediateTexture> font_texture_;
|
||||
void OnKeyDown(KeyEvent& e) override;
|
||||
void OnKeyUp(KeyEvent& e) override;
|
||||
void OnKeyChar(KeyEvent& e) override;
|
||||
void OnMouseDown(MouseEvent& e) override;
|
||||
void OnMouseMove(MouseEvent& e) override;
|
||||
void OnMouseUp(MouseEvent& e) override;
|
||||
void OnMouseWheel(MouseEvent& e) override;
|
||||
// For now, no need for OnDpiChanged because redrawing is done continuously.
|
||||
|
||||
private:
|
||||
void OnKey(KeyEvent* e, bool is_down);
|
||||
void Initialize();
|
||||
|
||||
void SetupFontTexture();
|
||||
|
||||
void RenderDrawLists(ImDrawData* data, UIDrawContext& ui_draw_context);
|
||||
|
||||
void ClearInput();
|
||||
void OnKey(KeyEvent& e, bool is_down);
|
||||
void UpdateMousePosition(const MouseEvent& e);
|
||||
|
||||
Window* window_;
|
||||
size_t z_order_;
|
||||
|
||||
ImGuiContext* internal_state_ = nullptr;
|
||||
|
||||
// All currently-attached dialogs that get drawn.
|
||||
std::vector<ImGuiDialog*> dialogs_;
|
||||
// Using an index, not an iterator, because after the erasure, the adjustment
|
||||
// must be done for the vector element indices that would be in the iterator
|
||||
// range that would be invalidated.
|
||||
// SIZE_MAX if not currently in the dialog loop.
|
||||
size_t dialog_loop_next_index_ = SIZE_MAX;
|
||||
|
||||
Presenter* presenter_ = nullptr;
|
||||
|
||||
ImmediateDrawer* immediate_drawer_ = nullptr;
|
||||
// Resources specific to an immediate drawer - must be destroyed before
|
||||
// detaching the presenter.
|
||||
std::unique_ptr<ImmediateTexture> font_texture_;
|
||||
|
||||
double frame_time_tick_frequency_;
|
||||
uint64_t last_frame_time_ticks_;
|
||||
};
|
||||
|
||||
} // namespace ui
|
||||
|
||||
Reference in New Issue
Block a user