DISTRHO
/
Cardinal
mirror of https://github.com/DISTRHO/Cardinal.git
1
0
Fork 0
Code Issues 0 Releases 18 Wiki Activity
Browse Source

Fix non-debug builds; Special DPF tweaks; Disable auto-save 

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
6fbd38b858
commit
c19b9fd34d
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
6 changed files with 22 additions and 9 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      dpf
  2. +4
    -1
      plugins/Cardinal/CardinalPlugin.cpp
  3. +3
    -1
      plugins/Cardinal/CardinalUI.cpp
  4. +5
    -1
      plugins/Cardinal/GL/glew.h
  5. +6
    -5
      plugins/Cardinal/Window.cpp
  6. +3
    -0
      plugins/Cardinal/dep.cpp

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit d8f66c1e06cafedf000fe75afcf67b96b3efbc6c
Subproject commit a1322bc0c5814633ec3c82080540a2657f4f4486

+ 4
- 1
plugins/Cardinal/CardinalPlugin.cpp View File

@@ -32,7 +32,9 @@
#include <osdialog.h> #include <osdialog.h>
#undef DEBUG
#ifdef NDEBUG
# undef DEBUG
#endif
#include "DistrhoPlugin.hpp" #include "DistrhoPlugin.hpp"
START_NAMESPACE_DISTRHO START_NAMESPACE_DISTRHO
@@ -54,6 +56,7 @@ struct Initializer {
using namespace rack; using namespace rack;
settings::devMode = true; settings::devMode = true;
settings::autosaveInterval = 0;
system::init(); system::init();
asset::init(); asset::init();
logger::init(); logger::init();


+ 3
- 1
plugins/Cardinal/CardinalUI.cpp View File

@@ -24,7 +24,9 @@
#include <ui/common.hpp> #include <ui/common.hpp>
#include <window/Window.hpp> #include <window/Window.hpp>


#undef DEBUG
#ifdef NDEBUG
# undef DEBUG
#endif
#include "DistrhoUI.hpp" #include "DistrhoUI.hpp"
#include "ResizeHandle.hpp" #include "ResizeHandle.hpp"




+ 5
- 1
plugins/Cardinal/GL/glew.h View File

@@ -1,3 +1,7 @@
#pragma once #pragma once
#undef DEBUG

#ifdef NDEBUG
# undef DEBUG
#endif

#include "OpenGL.hpp" #include "OpenGL.hpp"

+ 6
- 5
plugins/Cardinal/Window.cpp View File

@@ -15,7 +15,9 @@
#include <plugin.hpp> // used in Window::screenshot #include <plugin.hpp> // used in Window::screenshot
#include <system.hpp> // used in Window::screenshot #include <system.hpp> // used in Window::screenshot


#undef DEBUG
#ifdef NDEBUG
# undef DEBUG
#endif
#include "DistrhoUI.hpp" #include "DistrhoUI.hpp"


namespace rack { namespace rack {
@@ -74,7 +76,7 @@ struct Window::Internal {


int frame = 0; int frame = 0;
bool ignoreNextMouseDelta = false; bool ignoreNextMouseDelta = false;
int frameSwapInterval = -1;
int frameSwapInterval = 1;
double monitorRefreshRate = 60.0; // FIXME double monitorRefreshRate = 60.0; // FIXME
double frameTime = 0.0; double frameTime = 0.0;
double lastFrameDuration = 0.0; double lastFrameDuration = 0.0;
@@ -102,8 +104,7 @@ Window::Window() {
INFO("UI pointer: %p", lastUI); INFO("UI pointer: %p", lastUI);


vg = lastUI->getContext(); vg = lastUI->getContext();
INFO("NanoVG context: %p", vg);
// fbVg = nvgCreateSharedGL2(vg, nvgFlags);
fbVg = nvgCreateSharedGL2(vg, NVG_ANTIALIAS);


// Load default Blendish font // Load default Blendish font
uiFont = loadFont(asset::system("res/fonts/DejaVuSans.ttf")); uiFont = loadFont(asset::system("res/fonts/DejaVuSans.ttf"));
@@ -154,7 +155,7 @@ void Window::step() {
double t1 = 0.0, t2 = 0.0, t3 = 0.0, t4 = 0.0, t5 = 0.0; double t1 = 0.0, t2 = 0.0, t3 = 0.0, t4 = 0.0, t5 = 0.0;


// Make event handlers and step() have a clean NanoVG context // Make event handlers and step() have a clean NanoVG context
nvgReset(vg);
// nvgReset(vg);


bndSetFont(uiFont->handle); bndSetFont(uiFont->handle);




+ 3
- 0
plugins/Cardinal/dep.cpp View File

@@ -2,6 +2,9 @@


#include <common.hpp> // for fopen_u8 #include <common.hpp> // for fopen_u8


#ifdef NDEBUG
# undef DEBUG
#endif
#include "OpenGL.hpp" #include "OpenGL.hpp"


#define BLENDISH_IMPLEMENTATION #define BLENDISH_IMPLEMENTATION


Write Preview
Loading…
Cancel
Save