commit 55a493db3c82764119e9f1ffbe0c6c03b6c5c7b3
parent ca9a9ffde61532bf094176969df61984d79dcf3e
Author: Adam M <[email protected]>
Date: Thu, 21 May 2020 08:14:46 -0500
Fix penerator sine mode, fix pequencer layout and reset input
Diffstat:
4 files changed, 75 insertions(+), 62 deletions(-)
diff --git a/res/ComputerscareSolyPequencerPanel.svg b/res/ComputerscareSolyPequencerPanel.svg
@@ -27,8 +27,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.9999999"
- inkscape:cx="30.501852"
- inkscape:cy="319.59181"
+ inkscape:cx="34.717698"
+ inkscape:cy="276.34433"
inkscape:document-units="mm"
inkscape:current-layer="g1669"
showgrid="false"
@@ -39,8 +39,8 @@
inkscape:snap-bbox-edge-midpoints="true"
inkscape:window-width="1097"
inkscape:window-height="853"
- inkscape:window-x="294"
- inkscape:window-y="0"
+ inkscape:window-x="79"
+ inkscape:window-y="1"
inkscape:window-maximized="0"
inkscape:snap-global="false"
showguides="false"
@@ -130,19 +130,21 @@
sodipodi:role="line">debug</tspan></text>
</g>
<g
- inkscape:groupmode="layer"
- id="layer3"
- inkscape:label="bg" />
- <g
style="display:inline"
transform="translate(0,-196.45832)"
id="g1669"
inkscape:groupmode="layer"
inkscape:label="Layer 1 copy">
<path
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0"
+ id="path1773"
+ d="m 15.881848,219.40192 -15.88814939,0.2433 -0.03823873,-23.14003 4.39072482,-0.0159 8.1775143,2.52634 2.17313,10.80621 1.181582,0.36949 z"
+ style="fill:#747474;fill-opacity:1;stroke:none;stroke-width:0.49483484;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
inkscape:connector-curvature="0"
id="path1647"
- d="m 8.8786219,205.72349 -7.3856972,-7.67753 0.738749,15.65303 -0.93662,65.71451 -0.76588703,10.38104 0.308947,5.56858 1.45447203,1.27054 13.5938013,0.37061 0.01249,-88.38133 z"
+ d="m 9.0657106,218.86647 -7.5727859,-20.82051 0.738749,15.65303 -0.93662,65.71451 -0.76588703,10.38104 0.308947,5.56858 1.45447203,1.27054 13.5938013,0.37061 -0.03428,-79.0269 z"
style="opacity:1;vector-effect:none;fill:#ececec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.26300001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
sodipodi:nodetypes="cccccccccc" />
<g
@@ -275,14 +277,8 @@
inkscape:connector-curvature="0" />
</g>
<path
- style="fill:#232224;fill-opacity:1;stroke:none;stroke-width:0.47089523;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 15.839959,214.02463 -2.303661,-1.27492 0.0614,3.66931 -0.04201,5.83331 2.355046,1.82263 z"
- id="path890"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccc" />
- <path
style="fill:#626262;fill-opacity:1;stroke:none;stroke-width:0.53296405;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 1.9745243,224.3018 -1.94771373,-4.72299 c 6.04481953,-0.0555 10.07442143,-0.26556 13.65415243,-0.0155 l 2.032314,4.32142 c -4.541363,0.0382 -9.1972788,0.39611 -13.7387527,0.41714 z"
+ d="m 1.9745243,224.3018 -1.94771373,-4.72299 c 6.04481953,-0.0555 10.04134843,-0.464 13.62107943,-0.21394 l 2.263825,4.08991 c -4.541363,0.0382 -9.3957168,0.82606 -13.9371907,0.84709 z"
id="path892"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
@@ -293,12 +289,6 @@
d="m 1.1094411,206.11319 1.0068811,-0.0793 4.8564349,0.67614 -1.3820584,1.89778 -5.58532408,-1.42243 z"
style="fill:#626262;fill-opacity:1;stroke:none;stroke-width:0.53296405;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
- sodipodi:nodetypes="cccccc"
- inkscape:connector-curvature="0"
- id="path875"
- d="m 12.21722,200.01556 -1.378965,-2.08751 1.429246,17.1681 3.652562,-0.98657 -3.125289,-6.83263 z"
- style="fill:#232224;fill-opacity:1;stroke:none;stroke-width:0.45396167;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
style="fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.46019867;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 13.7771,219.35515 -13.74179493,0.2433 -0.03307292,-23.14003 10.87037685,2.51044 1.879558,10.80621 1.011234,0.36949 z"
id="rect888"
@@ -321,8 +311,13 @@
id="path1631"
inkscape:connector-curvature="0" />
<path
+ style="fill:#b8b8b8;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+ d="m 12.509831,199.00493 -1.653646,-0.0413 -10.84791677,-2.497 H 4.332552 Z"
+ id="path1777"
+ inkscape:connector-curvature="0" />
+ <path
style="fill:none;stroke:#000000;stroke-width:0.6756435;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 8.7163688,198.98001 c -0.7974259,1.80914 1.6179202,3.67489 1.5707702,1.10609 -0.04253,-1.17889 -0.224534,-2.4761 -0.02216,-1.13037 0.226936,1.45165 0.421028,4.61262 -0.8304651,5.27644 -0.4498329,0.23654 -1.020826,0.2271 -1.3812147,-0.27926"
+ d="m 8.7163688,198.98001 c -0.7974259,1.80914 1.6179202,3.67489 1.5707702,1.10609 -0.04253,-1.17889 -0.13099,-1.91484 0.164924,-1.22392 0.226936,1.45165 0.23394,4.70617 -1.0175531,5.36999 -0.4498329,0.23654 -1.020826,0.2271 -1.3812147,-0.27926"
id="path1633"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
@@ -377,38 +372,38 @@
id="path1656"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.20883998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 2.873497,225.3115 c -0.081561,0.27412 -0.061112,0.54851 -0.059148,0.82306 0.1567279,0.0357 0.3045018,0.17116 0.6534564,0.11661"
+ style="fill:none;stroke:#000000;stroke-width:0.22756486px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 2.8771113,225.51929 c -0.081511,0.32568 -0.061075,0.65168 -0.059112,0.97787 0.1566329,0.0424 0.3043172,0.20335 0.6530603,0.13854"
id="path878"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.48174649px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 3.2192481,225.13287 c -0.07202,-0.0514 -0.1440357,-0.10268 -0.2160542,-0.15401"
+ style="fill:none;stroke:#000000;stroke-width:0.52494055px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 3.2226529,225.30707 C 3.1506765,225.246 3.0787045,225.18508 3.0067296,225.12409"
id="path880"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.24508016px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 4.8018246,225.13988 c -0.036099,0.34143 0.044159,0.68306 0.1785934,1.02171 0.00523,0.038 -0.010442,0.18309 -0.026609,0.0768 -0.072649,-0.13209 -0.1738564,-0.26312 -0.1966879,-0.39762 -0.042714,-0.15524 -0.021976,-0.31135 0.018056,-0.46619 0.00444,-0.12043 -0.1119702,-0.24978 0.054626,-0.36367 0.1697591,-0.07 0.4813318,-0.0347 0.6934997,-0.008 0.4021743,0.0544 0.5013441,0.20565 0.5498113,0.32874 0.032677,0.11957 0.099598,0.23786 0.088624,0.35819 0.00618,0.19725 0.096939,0.39256 0.1726959,0.58782 0.00776,0.0177 -0.00407,0.0354 -0.00559,0.0532"
+ style="fill:none;stroke:#000000;stroke-width:0.26705438px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 4.8042701,225.3154 c -0.036077,0.40564 0.044132,0.81153 0.1784852,1.21387 0.00523,0.0452 -0.010436,0.21753 -0.026593,0.0913 -0.072605,-0.15694 -0.173751,-0.31261 -0.1965687,-0.47241 -0.042688,-0.18444 -0.021963,-0.36991 0.018045,-0.55387 0.00444,-0.14308 -0.1119023,-0.29676 0.054593,-0.43207 0.1696562,-0.0832 0.48104,-0.0412 0.6930793,-0.01 0.4019306,0.0646 0.5010402,0.24433 0.5494781,0.39057 0.032657,0.14206 0.099538,0.2826 0.08857,0.42556 0.00618,0.23435 0.09688,0.4664 0.1725913,0.69838 0.00776,0.021 -0.00407,0.0421 -0.00559,0.0632"
id="path882"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.24508016px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 8.1830312,226.84765 c 0.047918,-0.31891 -0.417458,-0.6173 -0.4446087,-0.93514 -0.1565677,-0.32124 -0.432244,-0.66089 -0.2979738,-0.9773 0.7304778,0.14271 1.5416265,0.30411 1.9344609,0.56498 0.6121064,0.19547 -0.1136246,0.42795 -0.8197176,0.31682 -0.2673653,0.008 -0.5450176,0.0454 -0.8084511,0.009"
+ style="fill:none;stroke:#000000;stroke-width:0.26705438px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 8.1834273,227.34437 c 0.047889,-0.37889 -0.417205,-0.73341 -0.4443392,-1.11103 -0.1564728,-0.38166 -0.431982,-0.78519 -0.2977932,-1.16111 0.730035,0.16955 1.5406921,0.36131 1.9332884,0.67124 0.6117353,0.23224 -0.1135558,0.50844 -0.8192208,0.37641 -0.2672032,0.01 -0.5446872,0.0539 -0.8079611,0.0107"
id="path884"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.26218793px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 10.378161,224.98829 c 0.0024,0.23552 -0.0046,0.47104 0.003,0.70655 0.180566,0.12029 0.404763,0.23344 0.560059,0.35646 0.112341,0.0991 0.426558,0.0649 0.368868,-0.0343 0.196225,-0.12409 0.131751,-0.26829 0.14298,-0.40329 0.0037,-0.17881 0.09687,-0.35669 0.04727,-0.53672 -0.04909,-0.1395 -0.07219,0.0832 0.04691,0.12936 0.07994,0.27791 0.153633,0.55691 0.288494,0.83317 0.07493,0.0836 0.189302,0.16505 0.205548,0.25283"
+ style="fill:none;stroke:#000000;stroke-width:0.28569606px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.377227,225.13529 c 0.0024,0.27982 -0.0046,0.55964 0.003,0.83944 0.180456,0.14292 0.404517,0.27735 0.559719,0.42351 0.112273,0.11774 0.4263,0.0771 0.368645,-0.0407 0.196106,-0.14743 0.131671,-0.31875 0.142893,-0.47914 0.0037,-0.21245 0.09681,-0.42378 0.04724,-0.63767 -0.04906,-0.16574 -0.07215,0.0988 0.04688,0.15369 0.07989,0.33018 0.15354,0.66165 0.288319,0.98987 0.07489,0.0993 0.189187,0.1961 0.205423,0.30039"
id="path886"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.22219135px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 13.195095,224.75235 c 0.203668,0.53242 1.076538,1.0313 0.950595,1.57713 l -0.07089,0.0602"
+ style="fill:none;stroke:#000000;stroke-width:0.24211332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 13.192453,224.85498 c 0.203545,0.63256 1.075886,1.22527 0.950019,1.87376 l -0.07085,0.0715"
id="path888"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#000000;stroke-width:0.22219135px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 12.480246,225.07172 c 0.825297,0.008 1.67786,-0.0321 2.47464,0.0564"
+ style="fill:none;stroke:#000000;stroke-width:0.24211332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 12.478037,225.23442 c 0.824797,0.01 1.676843,-0.0381 2.47314,0.067"
id="path891"
inkscape:connector-curvature="0" />
<path
@@ -539,10 +534,10 @@
id="path983"
inkscape:connector-curvature="0" />
<rect
- style="fill:#a7a7a7;fill-opacity:1;stroke:none;stroke-width:0.21378359;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.60101007;paint-order:stroke fill markers"
+ style="fill:#a7a7a7;fill-opacity:1;stroke:none;stroke-width:0.22807027;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.60101007;paint-order:stroke fill markers"
id="rect1739"
width="5.8869791"
- height="5.9861979"
+ height="6.8130207"
x="10.021093"
y="217.52577" />
<path
@@ -561,14 +556,24 @@
d="m 14.791059,218.16392 c -0.05792,-10e-4 -0.115908,-10e-4 -0.173857,-10e-4 -0.02963,0.004 -0.07077,-0.004 -0.09952,9.1e-4 -0.0061,9.2e-4 -0.0215,0.008 -0.016,0.006 0.09689,-0.0337 0.193461,-0.0678 0.290191,-0.10175 -0.04646,0.0167 -0.05818,0.0468 -0.06618,0.0777 -0.01391,0.0465 -0.02236,0.0933 -0.0267,0.14049 -0.0025,0.0387 -0.0037,0.0775 -0.0034,0.11629 -0.0064,0.0416 0.01858,0.0776 0.04761,0.1138 0.04674,0.0407 0.100849,0.0777 0.162964,0.10929 0.06892,0.0312 0.146799,0.0467 0.230012,0.0545 0.08761,0.006 0.17595,0.006 0.263954,0.005 0.05316,1.6e-4 0.106283,-0.001 0.159422,-0.002 0.01714,-3.1e-4 0.0091,-1.5e-4 0.0242,-4.6e-4 0,0 -0.29043,0.1321 -0.29043,0.1321 v 0 c -0.01393,-2.3e-4 -0.0064,-1.2e-4 -0.02242,-2.9e-4 -0.05095,-1.7e-4 -0.101901,-0.001 -0.152863,-9.1e-4 -0.08859,-9.2e-4 -0.177563,-9.2e-4 -0.265449,-0.009 -0.08713,-0.0103 -0.170317,-0.0288 -0.240891,-0.0635 -0.06565,-0.0337 -0.120895,-0.0737 -0.171502,-0.11636 -0.03313,-0.0383 -0.0632,-0.0774 -0.05836,-0.12221 7.31e-4,-0.0394 -2.13e-4,-0.0788 0.0045,-0.11813 0.0053,-0.0473 0.01199,-0.0945 0.02444,-0.14132 0.0048,-0.032 0.0092,-0.0711 0.04984,-0.0938 0.301106,-0.10773 0.231165,-0.11969 0.440625,-0.11554 0.05969,1e-4 0.119413,1.3e-4 0.179069,-0.001 0,0 -0.289281,0.13142 -0.289281,0.13142 z"
inkscape:connector-curvature="0" />
<path
- style="fill:#4f4f4f;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
- d="m 10.056016,223.42736 -1.4499373,-0.37417 0.093545,-4.91108 1.3096203,-0.60804 z"
+ style="fill:#4f4f4f;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 10.026783,224.33361 -1.4207043,-1.28042 0.093545,-4.91108 1.3344253,-0.61631 z"
id="path1747"
- inkscape:connector-curvature="0" />
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
<path
style="fill:#626262;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
d="m 5.3086409,219.4985 4.7006031,-0.11693 -1.3797791,3.01681 z"
id="path1771"
inkscape:connector-curvature="0" />
+ <path
+ style="fill:#aaaaaa;stroke:none;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
+ d="m 12.749609,209.77017 1.934766,0.0413 1.198893,0.38034 -2.133203,-0.0413 z"
+ id="path1775"
+ inkscape:connector-curvature="0" />
</g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="bg" />
</svg>
diff --git a/src/ComputerscareGolyPenerator.cpp b/src/ComputerscareGolyPenerator.cpp
@@ -106,7 +106,7 @@ struct PeneratorDisplay : TransparentWidget {
Points pts = Points();
nvgTranslate(args.vg, box.size.x / 2, box.size.y/2);
- pts.linear(ch, Vec(0, -box.size.y/2), Vec(0, 2*box.size.y/ch));
+ pts.linear(ch, Vec(0, -box.size.y/2), Vec(0, 3*box.size.y/ch));
std::vector<Vec> polyVals;
std::vector<NVGcolor> colors;
std::vector<Vec> thicknesses;
@@ -148,11 +148,11 @@ struct ComputerscareGolyPeneratorWidget : ModuleWidget {
float yy;
// ParamWidget* stepsKnob = createParam<LrgKnob>(Vec(108, 30), module, ComputerscarePatchSequencer::STEPS_PARAM);
- addLabeledKnob("Algo", 5, 140, module, ComputerscareGolyPenerator::ALGORITHM, 0, 0, true);
- addLabeledKnob("A", 10, 250, module, ComputerscareGolyPenerator::IN_OFFSET, 0, 0);
- addLabeledKnob("B", 20, 300, module, ComputerscareGolyPenerator::IN_SCALE, 0, 0);
- addLabeledKnob("C", 30, 260, module, ComputerscareGolyPenerator::OUT_SCALE, 0, 0);
- addLabeledKnob("D", 30, 310, module, ComputerscareGolyPenerator::OUT_OFFSET, 0, 0);
+ addLabeledKnob<SmoothKnob>("Algo", 5, 140, module, ComputerscareGolyPenerator::ALGORITHM, 0, 0, true);
+ addLabeledKnob<SmoothKnob>("In Offset", 10, 250, module, ComputerscareGolyPenerator::IN_OFFSET, 0, 0);
+ addLabeledKnob<SmallKnob>("In Scale", 20, 300, module, ComputerscareGolyPenerator::IN_SCALE, 0, 0);
+ addLabeledKnob<SmallKnob>("Out Scale", 30, 260, module, ComputerscareGolyPenerator::OUT_SCALE, 0, 0);
+ addLabeledKnob<SmoothKnob>("Out Offset", 30, 310, module, ComputerscareGolyPenerator::OUT_OFFSET, 0, 0);
//addLabeledKnob("ch out",5,90,module,ComputerscareGolyPenerator::POLY_CHANNELS,-2,0);
@@ -162,11 +162,14 @@ struct ComputerscareGolyPeneratorWidget : ModuleWidget {
addOutput(createOutput<PointingUpPentagonPort>(Vec(18, 184), module, ComputerscareGolyPenerator::POLY_OUTPUT));
}
+
+
+ template <typename BASE>
void addLabeledKnob(std::string label, int x, int y, ComputerscareGolyPenerator *module, int paramIndex, float labelDx, float labelDy, bool snap = false) {
smallLetterDisplay = new SmallLetterDisplay();
smallLetterDisplay->box.size = Vec(5, 10);
- smallLetterDisplay->fontSize = 21;
+ smallLetterDisplay->fontSize = 14;
smallLetterDisplay->value = label;
smallLetterDisplay->textAlign = 1;
@@ -174,7 +177,7 @@ struct ComputerscareGolyPeneratorWidget : ModuleWidget {
addParam(createParam<MediumDotSnapKnob>(Vec(x, y), module, paramIndex));
}
else {
- addParam(createParam<SmoothKnob>(Vec(x, y), module, paramIndex));
+ addParam(createParam<BASE>(Vec(x, y), module, paramIndex));
}
smallLetterDisplay->box.pos = Vec(x + labelDx, y - 12 + labelDy);
diff --git a/src/ComputerscareSolyPequencer.cpp b/src/ComputerscareSolyPequencer.cpp
@@ -108,7 +108,7 @@ struct ComputerscareSolyPequencer : ComputerscarePolyModule {
}
if (j <= numReset) {
- if (resetTriggers[j].process(inputs[RESET_INPUT].getVoltage(j))) {
+ if (currentReset[j]/*resetTriggers[j].process(inputs[RESET_INPUT].getVoltage(j))*/) {
currentStep[j] = 0;
}
}
diff --git a/src/golyFunctions.cpp b/src/golyFunctions.cpp
@@ -7,7 +7,18 @@ Goly::Goly() {
}
//[A,B,C,D]
+/*
+ std::vector<float> golyParams =
+ {
+ gp[0]= params[IN_OFFSET].getValue(), //-1,1
+ gp[1]= params[IN_SCALE].getValue(), //-2,2
+ gp[2]= arams[OUT_SCALE].getValue(), //-20, 20
+ gp[3]= params[OUT_OFFSET].getValue()}; // -10,10
+
+
+*/
void Goly::invoke(int algorithm, std::vector<float> gp, int num = 16) {
+ float trigFactor = 2*M_PI / num;
switch (algorithm)
{
case 1: // code to be executed if n = 1;
@@ -39,21 +50,15 @@ void Goly::invoke(int algorithm, std::vector<float> gp, int num = 16) {
}
break;
case 4:
- float trigFactor;
+ //sin wave
for (int i = 0; i < num; i++) {
- trigFactor = 5.f + ((float) (i) ) * 2.f * M_PI / (16 * expf(gp[0]));
- float val = 0.f;
- for (int j = 1; j < 6; j++) {
- val += gp[j] * sinf(trigFactor * j);
- }
- currentValues[i] = val;
+ float ip = (float)i / num;
+ float d = trigFactor*(ip - gp[0]);
+ currentValues[i] = gp[2] * (1+sinf(d*exp(2*gp[1]+2)))/2 + gp[3];
}
break;
-
+
default:
- /*for (int i = 0; i < 16; i++) {
- currentValues[i] = 0.f;
- }*/
int k = 0;
}
