diff --git a/plugins/HetrickCV b/plugins/HetrickCV index 2fc83df..4dc7c53 160000 --- a/plugins/HetrickCV +++ b/plugins/HetrickCV @@ -1 +1 @@ -Subproject commit 2fc83df75154c32b83addd3ed68b35eb6156ca0d +Subproject commit 4dc7c53b9f230bfd4f6c4deb432c477a65188ac0 diff --git a/plugins/Makefile b/plugins/Makefile index 6fc35a2..d81b7b8 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -741,12 +741,13 @@ HAMPTONHARMONICS_CUSTOM = Arp Progress PLUGIN_FILES += $(filter-out HetrickCV/src/HetrickCV.cpp,$(wildcard HetrickCV/src/*.cpp)) PLUGIN_FILES += $(wildcard HetrickCV/src/DSP/*.cpp) +PLUGIN_FILES += $(wildcard HetrickCV/src/DSP/Phasors/*.cpp) PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/arr.cpp) PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/Domain.cpp) PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/scl.cpp) # modules/types which are present in other plugins -HETRICKCV_CUSTOM = ASR BlankPanel FlipFlop MidSide MinMax +HETRICKCV_CUSTOM = ASR BlankPanel FlipFlop MidSide MinMax PanelBaseWidget InverterWidget # -------------------------------------------------------------- # ImpromptuModular diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 35fd776..bc49f13 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -397,6 +397,8 @@ void saveGtgPluginDefault(const char*, int) {} #define modelFlipFlop modelHetrickCVFlipFlop #define modelMidSide modelHetrickCVMidSide #define modelMinMax modelHetrickCVMinMax +#define PanelBaseWidget HetrickCVPanelBaseWidget +#define InverterWidget HetrickCVInverterWidget extern Model* modelTwoToFour; extern Model* modelAnalogToDigital; extern Model* modelASR; @@ -421,15 +423,47 @@ extern Model* modelExponent; extern Model* modelFBSineChaos; extern Model* modelFlipFlop; extern Model* modelFlipPan; +extern Model* modelGateDelay; extern Model* modelGateJunction; +extern Model* modelGateJunctionExp; extern Model* modelGingerbread; extern Model* modelLogicCombine; extern Model* modelMidSide; extern Model* modelMinMax; +extern Model* modelPhaseDrivenSequencer; +extern Model* modelPhaseDrivenSequencer32; +extern Model* modelPhasorAnalyzer; +extern Model* modelPhasorBurstGen; +extern Model* modelPhasorDivMult; +extern Model* modelPhasorEuclidean; +extern Model* modelPhasorGates; +extern Model* modelPhasorGates32; +extern Model* modelPhasorGates64; +extern Model* modelPhasorGen; +extern Model* modelPhasorGeometry; +extern Model* modelPhasorHumanizer; +extern Model* modelPhasorMixer; +extern Model* modelPhasorOctature; +extern Model* modelPhasorQuadrature; +extern Model* modelPhasorRandom; +extern Model* modelPhasorRanger; +extern Model* modelPhasorReset; +extern Model* modelPhasorRhythmGroup; +extern Model* modelPhasorShape; +extern Model* modelPhasorShift; +extern Model* modelPhasorStutter; +extern Model* modelPhasorSubstepShape; +extern Model* modelPhasorSwing; +extern Model* modelPhasorTimetable; +extern Model* modelPhasorToClock; +extern Model* modelPhasorToLFO; +extern Model* modelPhasorToWaveforms; +extern Model* modelProbability; extern Model* modelRandomGates; extern Model* modelRotator; extern Model* modelRungler; extern Model* modelScanner; +extern Model* modelVectorMix; extern Model* modelWaveshape; extern Model* modelXYToPolar; #undef modelASR @@ -437,6 +471,8 @@ extern Model* modelXYToPolar; #undef modelFlipFlop #undef modelMidSide #undef modelMinMax +#undef PanelBaseWidget +#undef InverterWidget // ImpromptuModular /* NOTE too much noise in original include, do this a different way @@ -2113,6 +2149,8 @@ static void initStatic__HetrickCV() #define modelFlipFlop modelHetrickCVFlipFlop #define modelMidSide modelHetrickCVMidSide #define modelMinMax modelHetrickCVMinMax +#define PanelBaseWidget HetrickCVPanelBaseWidget +#define InverterWidget HetrickCVInverterWidget p->addModel(modelTwoToFour); p->addModel(modelAnalogToDigital); p->addModel(modelASR); @@ -2137,15 +2175,47 @@ static void initStatic__HetrickCV() p->addModel(modelFBSineChaos); p->addModel(modelFlipFlop); p->addModel(modelFlipPan); + p->addModel(modelGateDelay); p->addModel(modelGateJunction); + p->addModel(modelGateJunctionExp); p->addModel(modelGingerbread); p->addModel(modelLogicCombine); p->addModel(modelMidSide); p->addModel(modelMinMax); + p->addModel(modelPhaseDrivenSequencer); + p->addModel(modelPhaseDrivenSequencer32); + p->addModel(modelPhasorAnalyzer); + p->addModel(modelPhasorBurstGen); + p->addModel(modelPhasorDivMult); + p->addModel(modelPhasorEuclidean); + p->addModel(modelPhasorGates); + p->addModel(modelPhasorGates32); + p->addModel(modelPhasorGates64); + p->addModel(modelPhasorGen); + p->addModel(modelPhasorGeometry); + p->addModel(modelPhasorHumanizer); + p->addModel(modelPhasorMixer); + p->addModel(modelPhasorOctature); + p->addModel(modelPhasorQuadrature); + p->addModel(modelPhasorRandom); + p->addModel(modelPhasorRanger); + p->addModel(modelPhasorReset); + p->addModel(modelPhasorRhythmGroup); + p->addModel(modelPhasorShape); + p->addModel(modelPhasorShift); + p->addModel(modelPhasorStutter); + p->addModel(modelPhasorSubstepShape); + p->addModel(modelPhasorSwing); + p->addModel(modelPhasorTimetable); + p->addModel(modelPhasorToClock); + p->addModel(modelPhasorToLFO); + p->addModel(modelPhasorToWaveforms); + p->addModel(modelProbability); p->addModel(modelRandomGates); p->addModel(modelRotator); p->addModel(modelRungler); p->addModel(modelScanner); + p->addModel(modelVectorMix); p->addModel(modelWaveshape); p->addModel(modelXYToPolar); #undef modelASR @@ -2153,6 +2223,8 @@ static void initStatic__HetrickCV() #undef modelFlipFlop #undef modelMidSide #undef modelMinMax +#undef PanelBaseWidget +#undef InverterWidget } } diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index ad14bbf..398086e 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -66,7 +66,6 @@ enum DarkMode { kModeDHE, kModeDrumKit, kModeESeries, - kModeHetrickCV, kModeJW, kModeLilacLoop, kModeLittleUtils, @@ -261,49 +260,6 @@ static const struct { // Custom, runtime dark mode used with permission { kModeESeries,"/ESeries/res/E340.svg", {}, -1 }, // CC0-1.0 - { kModeHetrickCV, "/HetrickCV/res/1OpChaos.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/2OpChaos.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/2To4.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/3OpChaos.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/ASR.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/AToD.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/BinaryGate.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/BinaryNoise.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Bitshift.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Boolean3.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/ChaoticAttractors.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/ClockedNoise.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Comparator.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Contrast.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Crackle.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/DataCompander.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Delta.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/DToA.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Dust.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Exponent.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/FBSineChaos.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/FlipFlop.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/FlipPan.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/GateJunction.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Gingerbread.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/LogicCombiner.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/LogicInverter.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/MidSide.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/MinMax.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/RandomGates.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Rotator.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Rungler.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Scanner.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/TrigShaper.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Waveshape.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/XYToPolar.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel1.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel2.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel3.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel5.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel6.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel7.svg", {}, -1}, - { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel8.svg", {}, -1}, // BSD-3-Clause { kModeJW, "/JW-Modules/res/Add5.svg", {}, -1 }, { kModeJW, "/JW-Modules/res/BlankPanel1hp.svg", {}, -1 },