From 36ea8604dfcad0fb7412186b8f90dc7286b907ee Mon Sep 17 00:00:00 2001
From: Carmine De Rosa <dslaky@gmail.com>
Date: Sat, 16 May 2020 11:05:31 +0200
Subject: [PATCH] draw pattern

---
 C/draw.cpp    |  36 ++++++++++++++++++++++++++++++++++++
 C/inputs.cpp  |   7 ++++++-
 C/loaders.cpp |   3 +++
 C/main.cpp    |  17 +++++++++--------
 C/players.cpp |   1 +
 C/sonquencer  | Bin 20088 -> 20352 bytes
 6 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 C/draw.cpp

diff --git a/C/draw.cpp b/C/draw.cpp
new file mode 100644
index 0000000..d2f7cab
--- /dev/null
+++ b/C/draw.cpp
@@ -0,0 +1,36 @@
+void drawRects(int step){
+
+  SDL_RenderClear(renderer);
+
+  int cols = matrix[1];
+  int rows = matrix[0];
+  int colWidth = ((600-5)/cols)-5;
+  int rowHeight = ((300-5)/rows)-5;
+
+  for(int i=0; i<rows; i++) {
+    for(int y=0; y<cols; y++) {
+      SDL_Rect rect;
+      rect.x = (colWidth+5)*y+5;
+      rect.y = (rowHeight+5)*i+5;
+      rect.w = colWidth;
+      rect.h = rowHeight;
+
+      if(pattern[i][y] == 1) {
+        SDL_SetRenderDrawColor(renderer, 50, 255, 50, 255);
+      } else {
+        SDL_SetRenderDrawColor(renderer, 50, 50, 50, 255);
+      }
+      SDL_RenderFillRect(renderer, &rect);
+
+      if(step == y) {
+        SDL_SetRenderDrawColor(renderer, 200, 200, 200, 255);
+        SDL_RenderDrawRect(renderer, &rect);
+      }
+
+      SDL_SetRenderDrawColor(renderer, 100, 100, 100, 255);
+    }
+  }
+
+  SDL_RenderPresent(renderer);
+}
+
diff --git a/C/inputs.cpp b/C/inputs.cpp
index bf732e5..afd941c 100644
--- a/C/inputs.cpp
+++ b/C/inputs.cpp
@@ -1,4 +1,4 @@
-void inputActions(SDL_Event e, int step) {
+void inputActions(SDL_Event e) {
   switch (e.key.keysym.sym) {
     case SDLK_1:
       setSample(1, step);
@@ -12,6 +12,11 @@ void inputActions(SDL_Event e, int step) {
     case SDLK_4:
       setSample(4, step);
       break;
+
+    case SDLK_p:
+      play = !play;
+      step = 0;
+      break;
     default:
       break;
   }
diff --git a/C/loaders.cpp b/C/loaders.cpp
index 10a0b39..4514c07 100644
--- a/C/loaders.cpp
+++ b/C/loaders.cpp
@@ -68,6 +68,7 @@ void loadPattern(int patternNum) {
   matrix[0] = rows;
   matrix[1] = cols;
 
+
   for(int i=0; i<rows; i++) {
     for(int y=0; y<cols; y++) {
       printf("%d ", pattern[i][y]);
@@ -75,6 +76,8 @@ void loadPattern(int patternNum) {
     printf("\n");
   }
 
+  drawRects(0);
+
   fclose(fp);
   if(line) {free(line);}
   loadBank(bank);
diff --git a/C/main.cpp b/C/main.cpp
index 09ac52d..2fbc4fa 100644
--- a/C/main.cpp
+++ b/C/main.cpp
@@ -13,9 +13,15 @@
 #define PATTERN_COLS 32
 
 Mix_Chunk* samples[NUM_WAVEFORMS];
+SDL_Window* window;
+SDL_Renderer* renderer;
+
 int pattern[PATTERN_ROWS][PATTERN_COLS];
 int matrix[] = {PATTERN_ROWS, PATTERN_COLS};
+bool play = false;
+int step = 0;
 
+#include "draw.cpp"
 #include "players.cpp"
 #include "loaders.cpp"
 #include "inputs.cpp"
@@ -23,18 +29,13 @@ int matrix[] = {PATTERN_ROWS, PATTERN_COLS};
 int main(int argc, char** argv) {
 
   bool done = false;
-  bool play = true;
   int timer = 0;
-  int step = 0;
-  int stepDuration = 500;
-
-  SDL_Window* window;
-  SDL_Renderer* renderer;
+  int stepDuration = 200;
 
   SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO );
   atexit(SDL_Quit);
 
-  window = SDL_CreateWindow("Sonquencer", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 400, 300, 0);
+  window = SDL_CreateWindow("Sonquencer", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 600, 300, 0);
   renderer = SDL_CreateRenderer(window, -1, 0);
 
   SDL_SetRenderDrawColor(renderer, 100, 100, 100, 255);
@@ -58,7 +59,7 @@ int main(int argc, char** argv) {
             SDL_Quit();
             return 0;
           } else {
-            inputActions(event, step);
+            inputActions(event);
           }
           break;
         case SDL_QUIT:
diff --git a/C/players.cpp b/C/players.cpp
index 544b71f..b3ac490 100644
--- a/C/players.cpp
+++ b/C/players.cpp
@@ -4,6 +4,7 @@ void playPattern(int *timer, int duration, int *step) {
   usleep(1000);
 
   if(*timer == 0) {
+    drawRects(*step-1);
     for(int i=0; i<matrix[0]; i++) {
       if(pattern[i][*step-1] == 1) {
         Mix_PlayChannel(-1, samples[i], 0);
diff --git a/C/sonquencer b/C/sonquencer
index a5d1c523dc6d457f3022c3fc32705be9a88e6e56..3d0f22f9527a6805ea1336203e6bf76cf3c43778 100755
GIT binary patch
delta 4819
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
TvwmKf*sd7V-HhK?cH92|gHxwL

delta 3990
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
QDX<(b(RojUYjM_p0pC}?DgXcg