comparison SequenceController.h @ 41:ba426cc4e6e1

better sequence gen , same for easy (1) and hard (many ) seq
fixed judder on sliders

 #include <iostream>
 #include "ofMain.h"
 #include "presetManager.h"
 #include "TrainingScoreManager.h"
 
-#define MIN_TARGETS_IN_SEQUENCE 1
+#define MIN_TARGETS_IN_SEQUENCE 3
 #define NUM_REPETITIONS_AT_LEVEL 2
 #define MAX_TARGETS_IN_SEQUENCE 3
 #define MIN_TEMPO   70
 #define MAX_TEMPO   500
 #define TEMPO_RANDOM_AMOUNT
 #define MAX_TIME 2800
 #define MIN_TIME 200
 #define NUM_TEMPO_STEPS 20
+#define END_NEUTRAL_MATCH 0
 
 #define NUM_PRESETS 8
 #define SPACER_BARS false
 #define NO_GUIDES_LEVEL false
 

     TrainingTestResult getResultForPreviousStep();
     int getTotNumRuns(){return totNumRuns;};
 private:
     void generateSteps();
     void generateCountIn(int countInLength);
-    void generateARun(int run, int numInSequence);
+    void generateRun(int run, int numInSequence);
+    void generateARun(int run, int numInSequence); // use this
     void generateAnEasyRun(int run, int numInSequence = 1);
     void generateASoundOnlyRun(int run, int numInSequence);
     vector<int> randomSequence(int numInSequence);
     vector<int> nonRandomSequence(int numInSequence);
     int getRandomButNot(int max, vector<int> notThese);
+    void makeGuidedSequence(vector<int> stepPresetIndices, int run, AnimStep& nextStep);
+    void makeMatchingSequence(vector<int> stepPresetIndices, int run, AnimStep& nextStep);
+    void makePreview(vector<int> stepPresetIndices, int run, AnimStep& nextStep);
 protected:
     vector<AnimStep> steps;
     vector<AnimStep>::iterator currentStep;
     float tempoInc;
     int timeInc;