BogaudioModules

commit 5dd63fa4701944a700d3ebdf6452ad22e2c45ab9
parent c5cffa3b075e7e3ac80acd18877277601491d1cc
Author: Matt Demanett <matt@demanett.net>
Date:   Thu, 16 Apr 2020 22:49:16 -0400

Add 16HP template; template module fixes.

Diffstat:
A
res/SixteenHP.svg
 | 
0

M
scripts/modules_to_plugin_json.rb
 | 
5
++++-
M
src/bogaudio.cpp
 | 
1
+
M
src/template_panels.cpp
 | 
47
+++++++++++++++++++++++++++++++++++------------
M
src/template_panels.hpp
 | 
1
+

5 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/res/SixteenHP.svg b/res/SixteenHP.svg
Binary files differ.
diff --git a/scripts/modules_to_plugin_json.rb b/scripts/modules_to_plugin_json.rb
@@ -11,7 +11,10 @@ flags << '-DEXPERIMENTAL=1' if ENV['EXPERIMENTAL']
 models = `c++ #{flags.join(' ')} -E src/bogaudio.cpp 2>&1 | grep addModel`
 models = models.split.map do |s|
   s.sub(/^\s*p->addModel\(([^)]+)\);\s*$/, '\1')
-end.reject { |m| m =~ /^model.*HP$/ }
+end
+unless ENV['BLANKS'] == '1'
+  models.reject! { |m| m =~ /^model.*HP$/ }
+end
 
 modules = []
 models.each do |model|
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -215,6 +215,7 @@ void init(rack::Plugin *p) {
 	p->addModel(modelTwelveHP);
 	p->addModel(modelThirteenHP);
 	p->addModel(modelFifteenHP);
+	p->addModel(modelSixteenHP);
 	p->addModel(modelEighteenHP);
 	p->addModel(modelTwentyHP);
 	p->addModel(modelTwentyTwoHP);
diff --git a/src/template_panels.cpp b/src/template_panels.cpp
@@ -18,7 +18,7 @@ struct ThreeHPWidget : ModuleWidget {
   }
 };
 
-Model* modelThreeHP = rack::createModel<Module, ThreeHPWidget>("Bogaudio-ThreeHP");
+Model* modelThreeHP = bogaudio::createModel<Module, ThreeHPWidget>("Bogaudio-ThreeHP", "THREEHP", "Template/blank", "Blank");
 
 
 struct SixHPWidget : ModuleWidget {
@@ -38,7 +38,7 @@ struct SixHPWidget : ModuleWidget {
   }
 };
 
-Model* modelSixHP = rack::createModel<Module, SixHPWidget>("Bogaudio-SixHP");
+Model* modelSixHP = bogaudio::createModel<Module, SixHPWidget>("Bogaudio-SixHP", "SIXHP", "Template/blank", "Blank");
 
 
 struct EightHPWidget : ModuleWidget {
@@ -58,7 +58,7 @@ struct EightHPWidget : ModuleWidget {
   }
 };
 
-Model* modelEightHP = rack::createModel<Module, EightHPWidget>("Bogaudio-EightHP");
+Model* modelEightHP = bogaudio::createModel<Module, EightHPWidget>("Bogaudio-EightHP", "EIGHTHP", "Template/blank", "Blank");
 
 
 struct TenHPWidget : ModuleWidget {
@@ -80,7 +80,7 @@ struct TenHPWidget : ModuleWidget {
 	}
 };
 
-Model* modelTenHP = rack::createModel<Module, TenHPWidget>("Bogaudio-TenHP");
+Model* modelTenHP = bogaudio::createModel<Module, TenHPWidget>("Bogaudio-TenHP", "TENHP", "Template/blank", "Blank");
 
 
 struct TwelveHPWidget : ModuleWidget {
@@ -102,7 +102,8 @@ struct TwelveHPWidget : ModuleWidget {
   }
 };
 
-Model* modelTwelveHP = rack::createModel<Module, TwelveHPWidget>("Bogaudio-TwelveHP");
+Model* modelTwelveHP = bogaudio::createModel<Module, TwelveHPWidget>("Bogaudio-TwelveHP", "TWELVEHP", "Template/blank", "Blank");
+
 
 struct ThirteenHPWidget : ModuleWidget {
   ThirteenHPWidget(Module* module) {
@@ -123,7 +124,7 @@ struct ThirteenHPWidget : ModuleWidget {
   }
 };
 
-Model* modelThirteenHP = rack::createModel<Module, ThirteenHPWidget>("Bogaudio-ThirteenHP");
+Model* modelThirteenHP = bogaudio::createModel<Module, ThirteenHPWidget>("Bogaudio-ThirteenHP", "THIRTEENHP", "Template/blank", "Blank");
 
 
 struct FifteenHPWidget : ModuleWidget {
@@ -145,7 +146,29 @@ struct FifteenHPWidget : ModuleWidget {
   }
 };
 
-Model* modelFifteenHP = rack::createModel<Module, FifteenHPWidget>("Bogaudio-FifteenHP");
+Model* modelFifteenHP = bogaudio::createModel<Module, FifteenHPWidget>("Bogaudio-FifteenHP", "FIFTEENHP", "Template/blank", "Blank");
+
+
+struct SixteenHPWidget : ModuleWidget {
+  SixteenHPWidget(Module* module) {
+	  setModule(module);
+  	box.size = Vec(RACK_GRID_WIDTH * 16, RACK_GRID_HEIGHT);
+
+  	{
+  		SvgPanel *panel = new SvgPanel();
+  		panel->box.size = box.size;
+  		panel->setBackground(APP->window->loadSvg(asset::plugin(pluginInstance, "res/SixteenHP.svg")));
+  		addChild(panel);
+  	}
+
+  	addChild(createWidget<ScrewSilver>(Vec(15, 0)));
+  	addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 0)));
+  	addChild(createWidget<ScrewSilver>(Vec(15, 365)));
+  	addChild(createWidget<ScrewSilver>(Vec(box.size.x - 30, 365)));
+  }
+};
+
+Model* modelSixteenHP = bogaudio::createModel<Module, SixteenHPWidget>("Bogaudio-SixteenHP", "SIXTEENHP", "Template/blank", "Blank");
 
 
 struct EighteenHPWidget : ModuleWidget {
@@ -167,7 +190,7 @@ struct EighteenHPWidget : ModuleWidget {
   }
 };
 
-Model* modelEighteenHP = rack::createModel<Module, EighteenHPWidget>("Bogaudio-EighteenHP");
+Model* modelEighteenHP = bogaudio::createModel<Module, EighteenHPWidget>("Bogaudio-EighteenHP", "EIGHTEENHP", "Template/blank", "Blank");
 
 
 struct TwentyHPWidget : ModuleWidget {
@@ -189,7 +212,7 @@ struct TwentyHPWidget : ModuleWidget {
   }
 };
 
-Model* modelTwentyHP = rack::createModel<Module, TwentyHPWidget>("Bogaudio-TwentyHP");
+Model* modelTwentyHP = bogaudio::createModel<Module, TwentyHPWidget>("Bogaudio-TwentyHP", "TWENTYHP", "Template/blank", "Blank");
 
 
 struct TwentyTwoHPWidget : ModuleWidget {
@@ -211,7 +234,7 @@ struct TwentyTwoHPWidget : ModuleWidget {
   }
 };
 
-Model* modelTwentyTwoHP = rack::createModel<Module, TwentyTwoHPWidget>("Bogaudio-TwentyTwoHP");
+Model* modelTwentyTwoHP = bogaudio::createModel<Module, TwentyTwoHPWidget>("Bogaudio-TwentyTwoHP", "TWENTYTWOHP", "Template/blank", "Blank");
 
 
 struct TwentyFiveHPWidget : ModuleWidget {
@@ -233,7 +256,7 @@ struct TwentyFiveHPWidget : ModuleWidget {
   }
 };
 
-Model* modelTwentyFiveHP = rack::createModel<Module, TwentyFiveHPWidget>("Bogaudio-TwentyFiveHP");
+Model* modelTwentyFiveHP = bogaudio::createModel<Module, TwentyFiveHPWidget>("Bogaudio-TwentyFiveHP", "TWENTYFIVEHP", "Template/blank", "Blank");
 
 
 struct ThirtyHPWidget : ModuleWidget {
@@ -255,4 +278,4 @@ struct ThirtyHPWidget : ModuleWidget {
   }
 };
 
-Model* modelThirtyHP = rack::createModel<Module, ThirtyHPWidget>("Bogaudio-ThirtyHP");
+Model* modelThirtyHP = bogaudio::createModel<Module, ThirtyHPWidget>("Bogaudio-ThirtyHP", "THIRTYHP", "Template/blank", "Blank");
diff --git a/src/template_panels.hpp b/src/template_panels.hpp
@@ -9,6 +9,7 @@ extern Model* modelTenHP;
 extern Model* modelTwelveHP;
 extern Model* modelThirteenHP;
 extern Model* modelFifteenHP;
+extern Model* modelSixteenHP;
 extern Model* modelEighteenHP;
 extern Model* modelTwentyHP;
 extern Model* modelTwentyTwoHP;