6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-10 12:29:01 +00:00
Code Issues Projects Releases Wiki Activity

Rejigs ScanTarget relationship from pull to push, so it can be set whenever it is safe.

Browse Source
This commit is contained in:
Thomas Harte 2020-06-21 18:25:38 -04:00
parent 336dffefe0
commit c5d8d9127b
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OSBindings/Qt/mainwindow.cpp
View File

@ -217,7 +217,7 @@ void MainWindow::launchMachine() {
// TODO: in the future, hypothetically, deal with non-scan producers. // TODO: in the future, hypothetically, deal with non-scan producers.
const auto scan_producer = machine->scan_producer(); const auto scan_producer = machine->scan_producer();
if(scan_producer) { if(scan_producer) {
scan_producer->set_scan_target(ui->openGLWidget->getScanTarget()); ui->openGLWidget->setScanProducer(scan_producer);
} }
// Install audio output if required. // Install audio output if required.

32
OSBindings/Qt/scantargetwidget.cpp
View File

@ -20,7 +20,26 @@ void ScanTargetWidget::initializeGL() {
void ScanTargetWidget::paintGL() { void ScanTargetWidget::paintGL() {
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
if(isConnected) {
// Gmynastics ahoy: if a producer has been specified or previously connected then:
//
// (i) if it's a new producer, generate a new scan target and pass it on;
// (ii) in any case, check whether the underlyiung framebuffer has changed; and
// (iii) draw.
//
// The slightly convoluted scan target forwarding arrangement works around an issue
// with QOpenGLWidget under macOS, which I did not fully diagnose, in which creating
// a scan target in ::initializeGL did not work (and no other arrangement really works
// with regard to starting up).
if(isConnected || producer) {
if(producer) {
isConnected = true;
framebuffer = defaultFramebufferObject();
scanTarget = std::make_unique<Outputs::Display::OpenGL::ScanTarget>(framebuffer);
producer->set_scan_target(scanTarget.get());
producer = nullptr;
}
// Qt reserves the right to change the framebuffer object due to window resizes or if setParent is called; // Qt reserves the right to change the framebuffer object due to window resizes or if setParent is called;
// therefore check whether it has changed. // therefore check whether it has changed.
const auto newFramebuffer = defaultFramebufferObject(); const auto newFramebuffer = defaultFramebufferObject();
@ -52,12 +71,7 @@ void ScanTargetWidget::resizeGL(int w, int h) {
glViewport(0, 0, w, h); glViewport(0, 0, w, h);
} }
Outputs::Display::OpenGL::ScanTarget *ScanTargetWidget::getScanTarget() { void ScanTargetWidget::setScanProducer(MachineTypes::ScanProducer *producer) {
makeCurrent(); this->producer = producer;
if(!scanTarget) { repaint();
isConnected = true;
framebuffer = defaultFramebufferObject();
scanTarget = std::make_unique<Outputs::Display::OpenGL::ScanTarget>(framebuffer);
}
return scanTarget.get();
} }

7
OSBindings/Qt/scantargetwidget.h
View File

@ -4,6 +4,8 @@
#include <QOpenGLWidget> #include <QOpenGLWidget>
#include "../../Outputs/OpenGL/ScanTarget.hpp" #include "../../Outputs/OpenGL/ScanTarget.hpp"
#include "../../Machines/ScanProducer.hpp"
#include "../../ClockReceiver/VSyncPredictor.hpp" #include "../../ClockReceiver/VSyncPredictor.hpp"
class ScanTargetWidget : public QOpenGLWidget class ScanTargetWidget : public QOpenGLWidget
@ -12,7 +14,9 @@ class ScanTargetWidget : public QOpenGLWidget
ScanTargetWidget(QWidget *parent = nullptr); ScanTargetWidget(QWidget *parent = nullptr);
~ScanTargetWidget(); ~ScanTargetWidget();
Outputs::Display::OpenGL::ScanTarget *getScanTarget(); // Sets the current scan producer; this scan producer will be
// handed a suitable scan target as soon as one exists.
void setScanProducer(MachineTypes::ScanProducer *);
protected: protected:
void initializeGL() override; void initializeGL() override;
@ -26,6 +30,7 @@ class ScanTargetWidget : public QOpenGLWidget
Time::VSyncPredictor vsyncPredictor; Time::VSyncPredictor vsyncPredictor;
bool isConnected = false; bool isConnected = false;
GLuint framebuffer = 0; GLuint framebuffer = 0;
MachineTypes::ScanProducer *producer = nullptr;
private slots: private slots:
void vsync(); void vsync();