Make headless Window a complete stub, fixes crashes
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
parent
70e22614be
commit
daa29759f3
1 changed files with 18 additions and 137 deletions
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* DISTRHO Cardinal Plugin
|
* DISTRHO Cardinal Plugin
|
||||||
* Copyright (C) 2021 Filipe Coelho <falktx@falktx.com>
|
* Copyright (C) 2021-2022 Filipe Coelho <falktx@falktx.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License as
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
@ -51,16 +51,10 @@ static const math::Vec minWindowSize = math::Vec(1228, 666);
|
||||||
|
|
||||||
|
|
||||||
void Font::loadFile(const std::string& filename, NVGcontext* vg) {
|
void Font::loadFile(const std::string& filename, NVGcontext* vg) {
|
||||||
this->vg = vg;
|
|
||||||
handle = nvgCreateFont(vg, filename.c_str(), filename.c_str());
|
|
||||||
if (handle < 0)
|
|
||||||
throw Exception("Failed to load font %s", filename.c_str());
|
|
||||||
INFO("Loaded font %s", filename.c_str());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Font::~Font() {
|
Font::~Font() {
|
||||||
// There is no NanoVG deleteFont() function yet, so do nothing
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -70,18 +64,10 @@ std::shared_ptr<Font> Font::load(const std::string& filename) {
|
||||||
|
|
||||||
|
|
||||||
void Image::loadFile(const std::string& filename, NVGcontext* vg) {
|
void Image::loadFile(const std::string& filename, NVGcontext* vg) {
|
||||||
this->vg = vg;
|
|
||||||
handle = nvgCreateImage(vg, filename.c_str(), NVG_IMAGE_REPEATX | NVG_IMAGE_REPEATY);
|
|
||||||
if (handle <= 0)
|
|
||||||
throw Exception("Failed to load image %s", filename.c_str());
|
|
||||||
INFO("Loaded image %s", filename.c_str());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Image::~Image() {
|
Image::~Image() {
|
||||||
// TODO What if handle is invalid?
|
|
||||||
if (handle >= 0)
|
|
||||||
nvgDeleteImage(vg, handle);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -90,115 +76,39 @@ std::shared_ptr<Image> Image::load(const std::string& filename) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
struct WindowParams {
|
|
||||||
float rackBrightness = 1.0f;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct Window::Internal
|
|
||||||
{
|
|
||||||
Context* context = nullptr;
|
|
||||||
Window* self = nullptr;
|
|
||||||
|
|
||||||
math::Vec size = minWindowSize;
|
|
||||||
std::string lastWindowTitle;
|
|
||||||
|
|
||||||
int mods = 0;
|
|
||||||
int frame = 0;
|
|
||||||
int frameSwapInterval = 1;
|
|
||||||
double monitorRefreshRate = 60.0; // FIXME
|
|
||||||
double frameTime = 0.0;
|
|
||||||
double lastFrameDuration = 0.0;
|
|
||||||
|
|
||||||
std::map<std::string, std::shared_ptr<Font>> fontCache;
|
|
||||||
std::map<std::string, std::shared_ptr<Image>> imageCache;
|
|
||||||
|
|
||||||
bool fbDirtyOnSubpixelChange = true;
|
|
||||||
int fbCount = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
Window::Window() {
|
Window::Window() {
|
||||||
internal = new Internal;
|
windowRatio = minWindowSize.x / minWindowSize.y;
|
||||||
internal->context = APP;
|
widget::Widget::ContextCreateEvent e;
|
||||||
internal->self = this;
|
APP->scene->onContextCreate(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
Window::~Window() {
|
|
||||||
// internal->stopThread(5000);
|
|
||||||
|
|
||||||
|
Window::~Window() {
|
||||||
if (APP->scene) {
|
if (APP->scene) {
|
||||||
widget::Widget::ContextDestroyEvent e;
|
widget::Widget::ContextDestroyEvent e;
|
||||||
APP->scene->onContextDestroy(e);
|
APP->scene->onContextDestroy(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fonts and Images in the cache must be deleted before the NanoVG context is deleted
|
|
||||||
internal->fontCache.clear();
|
|
||||||
internal->imageCache.clear();
|
|
||||||
|
|
||||||
delete internal;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
math::Vec Window::getSize() {
|
math::Vec Window::getSize() {
|
||||||
return internal->size;
|
return minWindowSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Window::setSize(math::Vec size) {
|
void Window::setSize(math::Vec) {
|
||||||
internal->size = size.max(minWindowSize);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Window::run() {
|
void Window::run() {
|
||||||
internal->frame = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Window::step() {
|
void Window::step() {
|
||||||
double frameTime = system::getTime();
|
|
||||||
double lastFrameTime = internal->frameTime;
|
|
||||||
internal->frameTime = frameTime;
|
|
||||||
internal->lastFrameDuration = frameTime - lastFrameTime;
|
|
||||||
internal->fbCount = 0;
|
|
||||||
// DEBUG("%.2lf Hz", 1.0 / internal->lastFrameDuration);
|
|
||||||
|
|
||||||
// Make event handlers and step() have a clean NanoVG context
|
|
||||||
nvgReset(vg);
|
|
||||||
|
|
||||||
if (uiFont != nullptr)
|
|
||||||
bndSetFont(uiFont->handle);
|
|
||||||
|
|
||||||
// Get framebuffer/window ratio
|
|
||||||
windowRatio = internal->size.x / internal->size.y;
|
|
||||||
|
|
||||||
if (APP->scene) {
|
|
||||||
// Resize scene
|
|
||||||
APP->scene->box.size = internal->size;
|
|
||||||
|
|
||||||
// Step scene
|
|
||||||
APP->scene->step();
|
|
||||||
|
|
||||||
// Update and render
|
|
||||||
nvgBeginFrame(vg, internal->size.x, internal->size.y, pixelRatio);
|
|
||||||
nvgScale(vg, pixelRatio, pixelRatio);
|
|
||||||
|
|
||||||
// Draw scene
|
|
||||||
widget::Widget::DrawArgs args;
|
|
||||||
args.vg = vg;
|
|
||||||
args.clipBox = APP->scene->box.zeroPos();
|
|
||||||
APP->scene->draw(args);
|
|
||||||
|
|
||||||
glViewport(0, 0, internal->size.x, internal->size.y);
|
|
||||||
glClearColor(0.0, 0.0, 0.0, 1.0);
|
|
||||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
|
|
||||||
nvgEndFrame(vg);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal->frame++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void Window::activateContext() {
|
void Window::activateContext() {
|
||||||
// glfwMakeContextCurrent(win);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -228,7 +138,7 @@ bool Window::isCursorLocked() {
|
||||||
|
|
||||||
|
|
||||||
int Window::getMods() {
|
int Window::getMods() {
|
||||||
return internal->mods;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -242,73 +152,44 @@ bool Window::isFullScreen() {
|
||||||
|
|
||||||
|
|
||||||
double Window::getMonitorRefreshRate() {
|
double Window::getMonitorRefreshRate() {
|
||||||
return internal->monitorRefreshRate;
|
return 60;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
double Window::getFrameTime() {
|
double Window::getFrameTime() {
|
||||||
return internal->frameTime;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
double Window::getLastFrameDuration() {
|
double Window::getLastFrameDuration() {
|
||||||
return internal->lastFrameDuration;
|
return 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
double Window::getFrameDurationRemaining() {
|
double Window::getFrameDurationRemaining() {
|
||||||
double frameDurationDesired = internal->frameSwapInterval / internal->monitorRefreshRate;
|
return 0.0;
|
||||||
return frameDurationDesired - (system::getTime() - internal->frameTime);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<Font> Window::loadFont(const std::string& filename) {
|
std::shared_ptr<Font> Window::loadFont(const std::string& filename) {
|
||||||
const auto& pair = internal->fontCache.find(filename);
|
return std::make_shared<Font>();
|
||||||
if (pair != internal->fontCache.end())
|
|
||||||
return pair->second;
|
|
||||||
|
|
||||||
// Load font
|
|
||||||
std::shared_ptr<Font> font;
|
|
||||||
try {
|
|
||||||
font = std::make_shared<Font>();
|
|
||||||
font->loadFile(filename, vg);
|
|
||||||
}
|
|
||||||
catch (Exception& e) {
|
|
||||||
WARN("%s", e.what());
|
|
||||||
font = NULL;
|
|
||||||
}
|
|
||||||
internal->fontCache[filename] = font;
|
|
||||||
return font;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
std::shared_ptr<Image> Window::loadImage(const std::string& filename) {
|
std::shared_ptr<Image> Window::loadImage(const std::string& filename) {
|
||||||
const auto& pair = internal->imageCache.find(filename);
|
return std::make_shared<Image>();
|
||||||
if (pair != internal->imageCache.end())
|
|
||||||
return pair->second;
|
|
||||||
|
|
||||||
// Load image
|
|
||||||
std::shared_ptr<Image> image;
|
|
||||||
try {
|
|
||||||
image = std::make_shared<Image>();
|
|
||||||
image->loadFile(filename, vg);
|
|
||||||
}
|
|
||||||
catch (Exception& e) {
|
|
||||||
WARN("%s", e.what());
|
|
||||||
image = NULL;
|
|
||||||
}
|
|
||||||
internal->imageCache[filename] = image;
|
|
||||||
return image;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool& Window::fbDirtyOnSubpixelChange() {
|
bool& Window::fbDirtyOnSubpixelChange() {
|
||||||
return internal->fbDirtyOnSubpixelChange;
|
static bool _fbDirtyOnSubpixelChange;
|
||||||
|
return _fbDirtyOnSubpixelChange;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int& Window::fbCount() {
|
int& Window::fbCount() {
|
||||||
return internal->fbCount;
|
static int _fbCount;
|
||||||
|
return _fbCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue