From 7e495b5645d38d889fc31c6d4329303a19d9b3c9 Mon Sep 17 00:00:00 2001 From: Zithia Satazaki Date: Sun, 27 Mar 2022 20:44:04 -0400 Subject: [PATCH] unionize note scratch --- xybrid/nodelib/instrumentcore.h | 5 ++++- xybrid/nodes/instrument/2x03.h | 1 - xybrid/nodes/instrument/thicc.h | 1 - xybrid/nodes/instrument/xriek.h | 1 - xybrid/nodes/sampler/beatpad.h | 1 - xybrid/nodes/sampler/capaxitor.h | 1 - 6 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xybrid/nodelib/instrumentcore.h b/xybrid/nodelib/instrumentcore.h index 2d30a4b..d6b0aeb 100644 --- a/xybrid/nodelib/instrumentcore.h +++ b/xybrid/nodelib/instrumentcore.h @@ -45,7 +45,10 @@ namespace Xybrid::NodeLib { double adsrTime = 0; uint8_t adsrPhase = 0; - std::array scratch{0.0}; + union { + std::array scratch {0.0}; + std::array ptr; + }; Note() = default; Note(InstrumentCore*, uint16_t id); diff --git a/xybrid/nodes/instrument/2x03.h b/xybrid/nodes/instrument/2x03.h index d77defd..abb9b85 100644 --- a/xybrid/nodes/instrument/2x03.h +++ b/xybrid/nodes/instrument/2x03.h @@ -41,4 +41,3 @@ namespace Xybrid::Instruments { //void drawCustomChrome(QPainter*, const QStyleOptionGraphicsItem*) override; }; } - diff --git a/xybrid/nodes/instrument/thicc.h b/xybrid/nodes/instrument/thicc.h index 5bc9488..37bcbc1 100644 --- a/xybrid/nodes/instrument/thicc.h +++ b/xybrid/nodes/instrument/thicc.h @@ -29,4 +29,3 @@ namespace Xybrid::Instruments { void onGadgetCreated() override; }; } - diff --git a/xybrid/nodes/instrument/xriek.h b/xybrid/nodes/instrument/xriek.h index c27828d..22748ae 100644 --- a/xybrid/nodes/instrument/xriek.h +++ b/xybrid/nodes/instrument/xriek.h @@ -25,4 +25,3 @@ namespace Xybrid::Instruments { void onGadgetCreated() override; }; } - diff --git a/xybrid/nodes/sampler/beatpad.h b/xybrid/nodes/sampler/beatpad.h index 448d1a1..4aaec6f 100644 --- a/xybrid/nodes/sampler/beatpad.h +++ b/xybrid/nodes/sampler/beatpad.h @@ -51,4 +51,3 @@ namespace Xybrid::Instruments { void initUI(UI::NodeUIScene*) override; }; } - diff --git a/xybrid/nodes/sampler/capaxitor.h b/xybrid/nodes/sampler/capaxitor.h index b9fd39e..99952dc 100644 --- a/xybrid/nodes/sampler/capaxitor.h +++ b/xybrid/nodes/sampler/capaxitor.h @@ -47,4 +47,3 @@ namespace Xybrid::Instruments { //void initUI(UI::NodeUIScene*) override; }; } -