Skip to content

Commit

Permalink
[fx] Add a ArrayGen object to generate arrays easily
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcelerier
jcelerier committed Aug 14, 2024
1 parent 0608740 commit 2bf22bb
Show file tree
Hide file tree
Showing 4 changed files with 167 additions and 34 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/libossia
Submodule libossia updated 3 files
+1 −1 3rdparty/rnd
+4 −0 src/ossia/math/math_expression.cpp
+1 −0 src/ossia/math/math_expression.hpp
27 changes: 27 additions & 0 deletions src/plugins/score-plugin-fx/Fx/MathGenerator.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,33 @@ static void miniMathItem(
}
}

static void miniMathItem(
const tuplet::tuple<Control::LineEdit, Control::IntSpinBox>& controls,
Process::LineEdit& edit, Process::IntSpinBox& count,
const Process::ProcessModel& process, QGraphicsItem& parent, QObject& context,
const Process::Context& doc)
{
using namespace Process;
using namespace std;
using namespace tuplet;
const Process::PortFactoryList& portFactory
= doc.app.interfaces<Process::PortFactoryList>();

auto count_item
= makeControlNoText(get<1>(controls), count, parent, context, doc, portFactory);
count_item.control.setPos(15, 0);
auto edit_item
= makeControlNoText(get<0>(controls), edit, parent, context, doc, portFactory);
edit_item.control.setTextWidth(100);
edit_item.control.setPos(15, 25);

if(auto obj = dynamic_cast<score::ResizeableItem*>(&parent))
{
QObject::connect(
&edit_item.control, &score::QGraphicsLineEdit::sizeChanged, obj,
&score::ResizeableItem::childrenSizeChanged);
}
}
static void mathItem(
const tuplet::tuple<
Control::LineEdit, Control::FloatSlider, Control::FloatSlider,
Expand Down
157 changes: 131 additions & 26 deletions src/plugins/score-plugin-fx/Fx/MathMapping.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ struct GenericMathMapping
{
auto res = e.expr.result();

e.px = e.x;
if constexpr(requires { e.x; })
e.px = e.x;

store_output(e, res);
}
}
Expand Down Expand Up @@ -163,6 +165,49 @@ struct GenericMathMapping
GenericMathMapping::exec_scalar(v.timestamp, self, output);
}
}
static bool resize(const std::string& expr, State& self, int sz)
{
if(std::ssize(self.expressions) == sz)
return true;

self.expressions.resize(sz);
int i = 0;
for(auto& e : self.expressions)
{
e.init(self.cur_time, self.cur_deltatime, self.cur_pos);
e.instance = i++;
if(!e.expr.set_expression(expr))
return false;
e.expr.seed_random(
UINT64_C(0xda3e39cb94b95bdb), UINT64_C(0x853c49e6748fea9b) * (1 + i));
}
return true;
}

static void run_polyphonic(
int size, ossia::value_port& output, const std::string& expr,
const ossia::token_request& tk, ossia::exec_state_facade st, State& self)
{
resize(expr, self, size);

auto ratio = st.modelToSamples();
auto parent_dur = tk.parent_duration.impl * ratio;

int64_t new_time = tk.prev_date.impl * ratio;
setMathExpressionTiming(self, new_time, self.last_value_time, parent_dur);
self.last_value_time = new_time;

GenericMathMapping::exec_polyphonic(0, self, output);

std::vector<ossia::value> res;
res.resize(self.expressions.size());
for(int i = 0; i < self.expressions.size(); i++)
res[i] = (float)self.expressions[i].po;

// Combine
output.write_value(res, 0);
}

static void run_polyphonic(
const ossia::value_port& input, ossia::value_port& output, const std::string& expr,
const ossia::token_request& tk, ossia::exec_state_facade st, State& self)
Expand All @@ -178,22 +223,6 @@ struct GenericMathMapping
if(!val)
return;

auto resize = [&expr, &self](int sz) {
if(std::ssize(self.expressions) == sz)
return true;

self.expressions.resize(sz);
int i = 0;
for(auto& e : self.expressions)
{
e.init(self.cur_time, self.cur_deltatime, self.cur_pos);
e.instance = i++;
if(!e.expr.set_expression(expr))
return false;
}
return true;
};

int64_t new_time = tk.prev_date.impl * ratio + v.timestamp;
setMathExpressionTiming(self, new_time, self.last_value_time, parent_dur);
self.last_value_time = new_time;
Expand All @@ -205,40 +234,40 @@ struct GenericMathMapping
case ossia::val_type::IMPULSE:
break;
case ossia::val_type::INT:
if(!resize(1))
if(!resize(expr, self, 1))
return;
self.expressions[0].x = *v.value.target<int>();
break;
case ossia::val_type::FLOAT:
if(!resize(1))
if(!resize(expr, self, 1))
return;
self.expressions[0].x = *v.value.target<float>();
break;
case ossia::val_type::BOOL:
if(!resize(1))
if(!resize(expr, self, 1))
return;
self.expressions[0].x = *v.value.target<bool>() ? 1.f : 0.f;
break;
case ossia::val_type::STRING:
if(!resize(1))
if(!resize(expr, self, 1))
return;
self.expressions[0].x = ossia::convert<float>(v.value);
break;
case ossia::val_type::VEC2F:
if(!resize(2))
if(!resize(expr, self, 2))
return;
self.expressions[0].x = (*v.value.target<ossia::vec2f>())[0];
self.expressions[1].x = (*v.value.target<ossia::vec2f>())[1];
break;
case ossia::val_type::VEC3F:
if(!resize(3))
if(!resize(expr, self, 3))
return;
self.expressions[0].x = (*v.value.target<ossia::vec3f>())[0];
self.expressions[1].x = (*v.value.target<ossia::vec3f>())[1];
self.expressions[2].x = (*v.value.target<ossia::vec3f>())[2];
break;
case ossia::val_type::VEC4F:
if(!resize(4))
if(!resize(expr, self, 4))
return;
self.expressions[0].x = (*v.value.target<ossia::vec4f>())[0];
self.expressions[1].x = (*v.value.target<ossia::vec4f>())[1];
Expand All @@ -248,7 +277,7 @@ struct GenericMathMapping
case ossia::val_type::LIST: {
auto& arr = *v.value.target<std::vector<ossia::value>>();
const auto N = std::ssize(arr);
if(!resize(N))
if(!resize(expr, self, N))
return;
for(int i = 0; i < N; i++)
self.expressions[i].x = ossia::convert<float>(arr[i]);
Expand All @@ -257,7 +286,7 @@ struct GenericMathMapping
case ossia::val_type::MAP: {
auto& arr = *v.value.target<ossia::value_map_type>();
const auto N = std::ssize(arr);
if(!resize(N))
if(!resize(expr, self, N))
return;
int i = 0;
for(auto& [k, v] : arr)
Expand Down Expand Up @@ -741,6 +770,78 @@ struct Node
};
}

namespace ArrayGenerator
{
struct Node
{
struct Metadata : Control::Meta_base
{
static const constexpr auto prettyName = "Arraygen";
static const constexpr auto objectKey = "ArrayGenerator";
static const constexpr auto category = "Control/Generators";
static const constexpr auto author = "ossia score, ExprTK (Arash Partow)";
static const constexpr auto kind = Process::ProcessCategory::Mapping;
static const constexpr auto description
= "Applies a math expression to each member of an input.";
static const constexpr auto tags = std::array<const char*, 0>{};
static const uuid_constexpr auto uuid
= make_uuid("cf3df02f-a563-4e92-a739-b321d3a84252");

static const constexpr value_out value_outs[]{"out"};

static const constexpr auto controls = tuplet::make_tuple(
Control::LineEdit("Expression", "x"), Control::IntSpinBox("Size", 0, 1024, 12));
};
struct State
{
struct Expr
{
void init(double& cur_time, double& cur_deltatime, double& cur_pos)
{
expr.add_variable("i", instance);

expr.add_variable("po", po);

expr.add_variable("t", cur_time);
expr.add_variable("dt", cur_deltatime);
expr.add_variable("pos", cur_pos);
expr.add_constants();

expr.register_symbol_table();
}
double instance;

double po;

ossia::math_expression expr;
};

boost::container::static_vector<Expr, 1024> expressions;
double cur_time{};
double cur_deltatime{};
double cur_pos{};

int64_t last_value_time{};

//bool ok = false;
};

using control_policy = ossia::safe_nodes::last_tick;

static void
run(const std::string& expr, int size, ossia::value_port& output,
const ossia::token_request& tk, ossia::exec_state_facade st, State& self)
{
GenericMathMapping<State>::run_polyphonic(size, output, expr, tk, st, self);
}

template <typename... Args>
static void item(Args&&... args)
{
Nodes::miniMathItem(Metadata::controls, std::forward<Args>(args)...);
}
};
}
namespace ArrayMapping
{
struct Node
Expand Down Expand Up @@ -839,6 +940,10 @@ struct HasCustomUI<Nodes::MicroMapping::Node> : std::true_type
{
};
template <>
struct HasCustomUI<Nodes::ArrayGenerator::Node> : std::true_type
{
};
template <>
struct HasCustomUI<Nodes::ArrayMapping::Node> : std::true_type
{
};
Expand Down
15 changes: 8 additions & 7 deletions src/plugins/score-plugin-fx/score_plugin_fx.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,14 @@ std::vector<score::InterfaceBase*> score_plugin_fx::factories(
Nodes::MidiHiRes::Input, Nodes::MidiHiRes::Output, Nodes::MidiUtil::Node,
Nodes::Metro::Node, Nodes::Envelope::Node, Nodes::Quantifier::Node,
Nodes::MathGenerator::Node, Nodes::MathAudioGenerator::Node,
Nodes::MathMapping::Node, Nodes::MicroMapping::Node, Nodes::ArrayMapping::Node,
Nodes::MathAudioFilter::Node, Nodes::EmptyValueMapping::Node,
Nodes::EmptyMidiMapping::Node, Nodes::EmptyAudioMapping::Node,
Nodes::FactorOracle::Node, Nodes::FactorOracle2::Node,
Nodes::FactorOracle2MIDI::Node, Nodes::PitchToValue::Node,
Nodes::ValueFilter::v1::Node, Nodes::ValueFilter::v2::Node,
Nodes::RateLimiter::Node, Nodes::AudioLooper::Node>(ctx, key);
Nodes::MathMapping::Node, Nodes::MicroMapping::Node, Nodes::ArrayGenerator::Node,
Nodes::ArrayMapping::Node, Nodes::MathAudioFilter::Node,
Nodes::EmptyValueMapping::Node, Nodes::EmptyMidiMapping::Node,
Nodes::EmptyAudioMapping::Node, Nodes::FactorOracle::Node,
Nodes::FactorOracle2::Node, Nodes::FactorOracle2MIDI::Node,
Nodes::PitchToValue::Node, Nodes::ValueFilter::v1::Node,
Nodes::ValueFilter::v2::Node, Nodes::RateLimiter::Node, Nodes::AudioLooper::Node>(
ctx, key);
}

auto score_plugin_fx::required() const -> std::vector<score::PluginKey>
Expand Down

0 comments on commit 2bf22bb

Please sign in to comment.