Merge PR #130

kosua20 · Jul 31, 2023 · 34e7fe7 · 34e7fe7
1 parent 1222089
commit 34e7fe7
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/resources/shaders/flashes.frag b/resources/shaders/flashes.frag
@@ -1,5 +1,5 @@
 #version 330
-#define SETS_COUNT 8
+#define SETS_COUNT 12
 
 
 in INTERFACE {

diff --git a/resources/shaders/majorKeys.frag b/resources/shaders/majorKeys.frag
@@ -4,7 +4,7 @@ in INTERFACE {
 	vec2 uv;
 } In ;
 
-#define SETS_COUNT 8
+#define SETS_COUNT 12
 #define MAJOR_COUNT 75
 
 uniform bool highlightKeys;

diff --git a/resources/shaders/minorKeys.frag b/resources/shaders/minorKeys.frag
@@ -5,7 +5,7 @@ in INTERFACE {
 	float id;
 } In ;
 
-#define SETS_COUNT 8
+#define SETS_COUNT 12
 
 uniform bool highlightKeys;
 uniform bool horizontalMode = false;

diff --git a/resources/shaders/notes.frag b/resources/shaders/notes.frag
@@ -1,5 +1,5 @@
 #version 330
-#define SETS_COUNT 8
+#define SETS_COUNT 12
 
 in INTERFACE {
 	vec2 uv;

diff --git a/resources/shaders/particles.vert b/resources/shaders/particles.vert
@@ -1,5 +1,5 @@
 #version 330
-#define SETS_COUNT 8
+#define SETS_COUNT 12
 
 layout(location = 0) in vec2 v;
 

diff --git a/src/rendering/SetOptions.cpp b/src/rendering/SetOptions.cpp
@@ -40,7 +40,7 @@ int SetOptions::apply(int note, int channel, int track, double start) const {
 		case SetMode::SPLIT:
 			return note < key ? 0 : 1;
 		case SetMode::KEY:
-			return noteShift[note % 12] % SETS_COUNT;
+			return (note % 12) % SETS_COUNT;
 		case SetMode::LIST:
 		{
 			// For each channel, find the corresponding key, and test

diff --git a/src/rendering/SetOptions.h b/src/rendering/SetOptions.h
@@ -5,7 +5,7 @@
 #include <array>
 #include <string>
 
-#define SETS_COUNT 8
+#define SETS_COUNT 12
 
 enum class SetMode : int {
 	CHANNEL = 0,

diff --git a/src/resources/shaders.cpp b/src/resources/shaders.cpp