From beb679ccab88229a54ca2498cd2d84c69fa7dfc3 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Mon, 14 Aug 2023 18:11:48 +0200 Subject: [PATCH] dual_angle now also matrix --- config.cpp | 3 ++- pattern2.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config.cpp b/config.cpp index 64b76545..4dd33d39 100644 --- a/config.cpp +++ b/config.cpp @@ -3023,7 +3023,8 @@ EX int config3 = addHook(hooks_configfile, 100, [] { param_f(linepatterns::meridian_prec2, "meridian_prec2"); param_f(linepatterns::dual_length, "dual_length"); - param_f(linepatterns::dual_angle, "dual_angle"); + param_matrix(linepatterns::dual_angle.v2, "dual_angle", 2); + param_matrix(linepatterns::dual_angle.v3, "dual_angle3", 3); param_f(twopoint_xscale, "twopoint_xscale"); param_i(twopoint_xshape, "twopoint_xshape"); diff --git a/pattern2.cpp b/pattern2.cpp index 108cda4a..093bdaeb 100644 --- a/pattern2.cpp +++ b/pattern2.cpp @@ -2680,14 +2680,14 @@ EX namespace linepatterns { } EX ld dual_length = 0; - EX ld dual_angle = 0; + EX trans23 dual_angle; hyperpoint dualpoint(cell *c) { if(!aperiodic) return tile_center(); if(dual_length && c->master->c7 == c) - return MirrorX * xspinpush0(dual_angle * degree, dual_length); + return MirrorX * dual_angle.get() * xpush0(dual_length); if(dual_length) - return xspinpush0(dual_angle * degree, dual_length); + return dual_angle.get() * xpush0(dual_length); return tile_center(); }