1
0
Fork 0

Use a vizia generic UI for Diopser

This commit is contained in:
Robbert van der Helm 2022-03-22 18:32:02 +01:00
parent ff000565e5
commit 101075795d
4 changed files with 44 additions and 71 deletions

2
Cargo.lock generated
View file

@ -801,7 +801,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"fftw", "fftw",
"nih_plug", "nih_plug",
"nih_plug_iced", "nih_plug_vizia",
"triple_buffer", "triple_buffer",
] ]

View file

@ -16,7 +16,7 @@ simd = ["nih_plug/simd"]
[dependencies] [dependencies]
nih_plug = { path = "../../", features = ["assert_process_allocs"] } nih_plug = { path = "../../", features = ["assert_process_allocs"] }
nih_plug_iced = { path = "../../nih_plug_iced" } nih_plug_vizia = { path = "../../nih_plug_vizia" }
# For the GUI # For the GUI
fftw = "0.7" fftw = "0.7"

View file

@ -14,85 +14,58 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
use nih_plug::prelude::{Editor, GuiContext}; use nih_plug::prelude::Editor;
use nih_plug_iced::widgets as nih_widgets; use nih_plug_vizia::vizia::*;
use nih_plug_iced::widgets::generic_ui::GenericUi; use nih_plug_vizia::widgets::*;
use nih_plug_iced::*; use nih_plug_vizia::{assets, create_vizia_editor, ViziaState};
use std::pin::Pin; use std::pin::Pin;
use std::sync::Arc; use std::sync::Arc;
use crate::DiopserParams; use crate::DiopserParams;
/// VIZIA uses points instead of pixels for text
const POINT_SCALE: f32 = 0.75;
#[derive(Lens)]
// TODO: Lens requires everything to be marked as `pub`
pub struct Data {
params: Pin<Arc<DiopserParams>>,
}
impl Model for Data {}
// Makes sense to also define this here, makes it a bit easier to keep track of // Makes sense to also define this here, makes it a bit easier to keep track of
pub(crate) fn default_state() -> Arc<IcedState> { pub(crate) fn default_state() -> Arc<ViziaState> {
IcedState::from_size(360, 300) ViziaState::from_size(360, 300)
} }
pub(crate) fn create( pub(crate) fn create(
params: Pin<Arc<DiopserParams>>, params: Pin<Arc<DiopserParams>>,
editor_state: Arc<IcedState>, editor_state: Arc<ViziaState>,
) -> Option<Box<dyn Editor>> { ) -> Option<Box<dyn Editor>> {
create_iced_editor::<DiopserEditor>(editor_state, params) create_vizia_editor(editor_state, move |cx| {
} Data {
params: params.clone(),
struct DiopserEditor {
params: Pin<Arc<DiopserParams>>,
context: Arc<dyn GuiContext>,
generic_ui_state: nih_widgets::generic_ui::State<nih_widgets::generic_ui::GenericSlider>,
}
#[derive(Debug, Clone, Copy)]
enum Message {
/// Update a parameter's value.
ParamUpdate(nih_widgets::ParamMessage),
}
impl IcedEditor for DiopserEditor {
type Executor = executor::Default;
type Message = Message;
type InitializationFlags = Pin<Arc<DiopserParams>>;
fn new(
params: Self::InitializationFlags,
context: Arc<dyn GuiContext>,
) -> (Self, Command<Self::Message>) {
let editor = DiopserEditor {
params,
context,
generic_ui_state: Default::default(),
};
(editor, Command::none())
}
fn context(&self) -> &dyn GuiContext {
self.context.as_ref()
}
fn update(
&mut self,
_window: &mut WindowQueue,
message: Self::Message,
) -> Command<Self::Message> {
match message {
Message::ParamUpdate(message) => self.handle_param_message(message),
} }
.build(cx);
Command::none() VStack::new(cx, |cx| {
} Label::new(cx, "Diopser")
.font(assets::NOTO_SANS_THIN)
.font_size(40.0 * POINT_SCALE)
.height(Pixels(50.0))
.child_top(Stretch(1.0))
.child_bottom(Pixels(0.0))
// Make this more or less align with the parameters column
.right(Percentage(14.0));
fn view(&mut self) -> Element<'_, Self::Message> { ScrollView::new(cx, 0.0, 0.0, false, true, |cx| {
GenericUi::new(&mut self.generic_ui_state, self.params.as_ref()).map(Message::ParamUpdate) GenericUI::new(cx, Data::params);
} })
.width(Percentage(100.0));
fn background_color(&self) -> nih_plug_iced::Color { })
nih_plug_iced::Color { .row_between(Pixels(0.0))
r: 0.98, .child_left(Stretch(1.0))
g: 0.98, .child_right(Stretch(1.0));
b: 0.98, })
a: 1.0,
}
}
} }

View file

@ -23,7 +23,7 @@ compile_error!("Compiling without SIMD support is currently not supported");
extern crate nih_plug; extern crate nih_plug;
use nih_plug::prelude::*; use nih_plug::prelude::*;
use nih_plug_iced::IcedState; use nih_plug_vizia::ViziaState;
use std::pin::Pin; use std::pin::Pin;
use std::simd::f32x2; use std::simd::f32x2;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
@ -50,7 +50,7 @@ const MAX_AUTOMATION_STEP_SIZE: u32 = 512;
// - A proper GUI // - A proper GUI
struct Diopser { struct Diopser {
params: Pin<Arc<DiopserParams>>, params: Pin<Arc<DiopserParams>>,
editor_state: Arc<IcedState>, editor_state: Arc<ViziaState>,
/// Needed for computing the filter coefficients. /// Needed for computing the filter coefficients.
sample_rate: f32, sample_rate: f32,