summaryrefslogtreecommitdiff
path: root/plugingui
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2018-06-16 01:12:49 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2018-08-12 11:13:52 +0200
commit1dfdc13bb191321a096ceae605b80bde0d627398 (patch)
tree8522ea4cdb4642061dcb8c86c4d27bdd1245f152 /plugingui
parent3f259e92bf1a25a8db521a587b6d612e356b22bc (diff)
Better structures.
Diffstat (limited to 'plugingui')
-rw-r--r--plugingui/drumkittab.cc70
-rw-r--r--plugingui/drumkittab.h20
2 files changed, 71 insertions, 19 deletions
diff --git a/plugingui/drumkittab.cc b/plugingui/drumkittab.cc
index f132aed..388f43e 100644
--- a/plugingui/drumkittab.cc
+++ b/plugingui/drumkittab.cc
@@ -26,6 +26,7 @@
*/
#include "drumkittab.h"
+#include <algorithm>
#include <iomanip>
#include <sstream>
@@ -45,7 +46,7 @@ DrumkitTab::DrumkitTab(Widget* parent,
/*, settings_notifier(settings_notifier)
, config(config)*/
{
- loadImageFiles("/home/chaot/Programming/drumgizmo/crocellkit01.png", "/home/chaot/Programming/drumgizmo/crocellkit01_map.png");
+ init("/home/chaot/Programming/drumgizmo/crocellkit01.png", "/home/chaot/Programming/drumgizmo/crocellkit01_map.png");
velocity_label.move(10, height()-velocity_label.height()-5);
updateVelocityLabel();
@@ -142,27 +143,28 @@ void DrumkitTab::mouseLeaveEvent()
void DrumkitTab::triggerAudition(int x, int y, bool show_hit)
{
- auto map_colour = map_image->getPixel(x - drumkit_image_x, y - drumkit_image_y);
- if (map_colour.alpha() == 0.0) { return; }
-
- auto it = colour_to_instrument.find(map_colour);
- if (it == colour_to_instrument.end())
+ // FIXME: introduce matrix/grid class and then make notation more beautiful.
+ auto pos = (x - drumkit_image_x) + (y - drumkit_image_y)*map_image->width();
+ auto index = pos_to_colour_index[pos];
+ if (index == -1)
{
return;
}
+ auto const& colour = colours[index];
+ auto const& instrument = to_instrument_name[index];
++settings.audition_counter;
- settings.audition_instrument = it->second;
+ settings.audition_instrument = instrument;
settings.audition_velocity = current_velocity;
if (show_hit)
{
Painter painter(*this);
- painter.drawRestrictedImage(drumkit_image_x, drumkit_image_y, map_colour, *map_image);
+ painter.drawRestrictedImage(drumkit_image_x, drumkit_image_y, colour, *map_image);
shows_instrument_overlay = true;
}
- current_instrument = it->second;
+ current_instrument = instrument;
updateInstrumentLabel();
redraw();
@@ -181,18 +183,52 @@ void DrumkitTab::updateInstrumentLabel()
instrument_name_label.resizeToText();
}
-void DrumkitTab::loadImageFiles(std::string const& image_file, std::string const& map_file)
+void DrumkitTab::init(std::string const& image_file, std::string const& map_file)
{
drumkit_image = std::make_unique<Image>(image_file);
map_image = std::make_unique<Image>(map_file);
- // TODO: actually use mapping from drumkit file here
- colour_to_instrument = {
- {Colour(0), "Snare"},
- {Colour(255./255, 15./255, 55./255), "KdrumL"},
- {Colour(154./255, 153./255, 33./255), "HihatClosed"},
- {Colour(248./255, 221./255, 37./255), "Tom4"}
- };
+ // collect all colours and build lookup table
+ auto const height = map_image->height();
+ auto const width = map_image->width();
+
+ colours.clear();
+ pos_to_colour_index.assign(height*width, -1);
+ to_instrument_name.clear();
+
+ for (std::size_t y = 0; y < map_image->height(); ++y)
+ {
+ for (std::size_t x = 0; x < map_image->width(); ++x)
+ {
+ auto colour = map_image->getPixel(x, y);
+
+ if (colour.alpha() == 1.)
+ {
+ continue;
+ }
+
+ auto it = std::find(colours.begin(), colours.end(), colour);
+ if (it == colours.end())
+ {
+ colours.push_back(colour);
+ }
+
+ int index = std::distance(colours.begin(), it);
+ pos_to_colour_index[x + y*width] = index;
+ }
+ }
+
+ // set instrument names
+ to_instrument_name.resize(colours.size());
+ for (std::size_t i = 0; i < colours.size(); ++i)
+ {
+ for (auto const& pair: colour_instrument_pairs)
+ {
+ if (pair.colour == colours[i]) {
+ to_instrument_name[i] = pair.instrument;
+ }
+ }
+ }
}
} // GUI::
diff --git a/plugingui/drumkittab.h b/plugingui/drumkittab.h
index 64806fd..1c99e6d 100644
--- a/plugingui/drumkittab.h
+++ b/plugingui/drumkittab.h
@@ -57,13 +57,29 @@ public:
void scrollEvent(ScrollEvent* scrollEvent) override;
void mouseLeaveEvent() override;
- void loadImageFiles(std::string const& image_file, std::string const& map_file);
+ void init(std::string const& image_file, std::string const& map_file);
private:
float current_velocity{.5};
std::string current_instrument{""};
- std::unordered_map<Colour, std::string, ColourHasher> colour_to_instrument;
+ std::vector<Colour> colours;
+ std::vector<int> pos_to_colour_index;
+ std::vector<std::string> to_instrument_name;
+
+ struct ColourInstrumentPair
+ {
+ Colour colour;
+ std::string instrument;
+ };
+ // FIXME: load this from instrument file
+ std::vector<ColourInstrumentPair> colour_instrument_pairs = {
+ {Colour(0), "Snare"},
+ {Colour(255./255, 15./255, 55./255), "KdrumL"},
+ {Colour(154./255, 153./255, 33./255), "HihatClosed"},
+ {Colour(248./255, 221./255, 37./255), "Tom4"}
+ };
+
bool shows_overlay{false};
bool shows_instrument_overlay{false};