Header cleanup

Author: dhemery

src/gui/widget.cpp

@@ -1,18 +1,19 @@
 #include <random>
-#include "asset.hpp"
-#include "components.hpp"
-#include "engine.hpp"
-#include "math.hpp"
-#include "plugin.hpp"
-#include "rack.hpp"
+
+#include <app.hpp>
+#include <components.hpp>
+#include <engine.hpp>
+#include <math.hpp>
+#include <plugin.hpp>
+
 #include "widget.h"
 
 extern rack::Plugin *plugin;
 
 namespace DHE {
 Widget::Widget(rack::Module *module, int widget_hp, const char *background) {
   setModule(module);
-  box.size = rack::Vec(widget_hp*RACK_GRID_WIDTH, RACK_GRID_HEIGHT);
+  box.size = rack::Vec{(float) widget_hp*RACK_GRID_WIDTH, (float) RACK_GRID_HEIGHT};
 
   auto *panel = new rack::SVGPanel();
   panel->box.size = box.size;
@@ -51,4 +52,12 @@ void Widget::install_screws() {
     }
   }
 }
+
+void Widget::moveTo(rack::Rect &box, rack::Vec pos) {
+  box.pos = pos.minus(box.size.mult(0.5f));
+}
+
+void Widget::moveTo(rack::Rect &box, float x, float y) {
+  moveTo(box, {x, y});
+}
 }

src/gui/widget.h

@@ -1,10 +1,9 @@
 #ifndef DHE_GUI_WIDGET_H
 #define DHE_GUI_WIDGET_H
 
-#include "app.hpp"
-#include "engine.hpp"
-#include "math.hpp"
-#include "rack.hpp"
+#include <app.hpp>
+#include <math.hpp>
+#include <rack.hpp>
 
 namespace DHE {
 class Widget : public rack::ModuleWidget {
@@ -14,7 +13,7 @@ class Widget : public rack::ModuleWidget {
   Widget(rack::Module *module, int widget_hp, const char *background);
 
   rack::Vec center() {
-  return box.getCenter();
+    return box.getCenter();
   }
 
   float height() const {
@@ -27,7 +26,7 @@ class Widget : public rack::ModuleWidget {
 
   template<class T>
   void install_input(int index, float x, float y) {
-    auto input{rack::createInput<T>(rack::Vec(x, y), module, index)};
+    auto input{rack::createInput<T>({x, y}, module, index)};
     moveTo(input->box, x, y);
     addInput(input);
   }
@@ -47,7 +46,7 @@ class Widget : public rack::ModuleWidget {
   }
 
   template<class T>
-  void install_light(int index, float x, float y, float initial = 0.5f) {
+  void install_light(int index, float x, float y, float initial = 0.f) {
     auto light{rack::createLight<T>({x, y}, module, index)};
     moveTo(light->box, x, y);
     addChild(light);
@@ -64,14 +63,9 @@ class Widget : public rack::ModuleWidget {
     moveTo(widget->box, pos);
     addChild(widget);
   }
+  static void moveTo(rack::Rect &box, rack::Vec pos);
 
-  static void moveTo(rack::Rect &box, rack::Vec pos) {
-    box.pos = pos.minus(box.size.mult(0.5f));
-  }
-
-  static void moveTo(rack::Rect &box, float x, float y) {
-    moveTo(box, {x, y});
-  }
+  static void moveTo(rack::Rect &box, float x, float y);
 
   void install_screws();
 };

src/plugin/dhe-modules.cpp

@@ -1,18 +1,23 @@
-#include <upstage/upstage-widget.h>
-#include <upstage/upstage.h>
-#include "dhe-modules.h"
 #include "stage/stage-widget.h"
-#include "stage/stage.h"
+#include "upstage/upstage-widget.h"
 
 rack::Plugin *plugin;
 
+namespace DHE {
+template<typename TWidget, typename... TTag>
+void installModule(std::string moduleSlug, TTag... tags) {
+  plugin->addModel(rack::createModel<TWidget>(plugin->slug, moduleSlug, moduleSlug, tags...));
+}
+}
+
 void init(rack::Plugin *p) {
   plugin = p;
-  p->slug = DHE::MANUFACTURER;
+  p->slug = "DHE-Modules";
   p->version = TOSTRING(VERSION);
   p->website = "https://github.com/dhemery/DHE-Modules";
   p->manual = "https://github.com/dhemery/DHE-Modules/wiki";
 
-  DHE::installModule<DHE::StageWidget, rack::ModelTag>(p, "Stage", rack::ENVELOPE_GENERATOR_TAG);
-  DHE::installModule<DHE::UpstageWidget, rack::ModelTag>(p, "Upstage", rack::ENVELOPE_GENERATOR_TAG);
+  DHE::installModule<DHE::StageWidget, rack::ModelTag>("Stage", rack::ENVELOPE_GENERATOR_TAG);
+  DHE::installModule<DHE::UpstageWidget, rack::ModelTag>("Upstage", rack::ENVELOPE_GENERATOR_TAG);
 }
+

src/plugin/dhe-modules.h

@@ -1,17 +1,8 @@
 #ifndef DHE_PLUGIN_DHE_MODULES_H
 #define DHE_PLUGIN_DHE_MODULES_H
 
-#include "plugin.hpp"
+#include <plugin.hpp>
 
 extern rack::Plugin *plugin;
 
-namespace DHE {
-static constexpr char const *MANUFACTURER = "DHE-Modules";
-
-template<typename TWidget, typename... TTag>
-static void installModule(rack::Plugin *plugin, std::string moduleSlug, TTag... tags) {
-  plugin->addModel(rack::createModel<TWidget>(MANUFACTURER, moduleSlug, moduleSlug, tags...));
-}
-
-};
 #endif

src/stage/stage.cpp

@@ -1,4 +1,7 @@
 #include <cmath>
+
+#include <engine.hpp>
+
 #include "stage.h"
 
 namespace DHE {

src/stage/stage.h

@@ -3,9 +3,7 @@
 
 #include <memory>
 
-#include "dsp/digital.hpp"
-#include "rack.hpp"
-#include "plugin.hpp"
+#include <engine.hpp>
 
 #include "util/d-flip-flop.h"
 #include "util/ramp.h"

src/upstage/upstage.h

@@ -6,8 +6,8 @@
 #define DHE_UPSTAGE_UPSTAGE_H
 
 #include <algorithm>
+#include <engine.hpp>
 
-#include "engine.hpp"
 #include "util/range.h"
 
 namespace DHE {