Skip to content
Snippets Groups Projects
Commit 473a78fa authored by James Carty's avatar James Carty
Browse files

fixing

parent c7951af7
Branches
No related merge requests found
No preview for this file type
#pragma once
#include "ofMain.h"
#include "ofxBeat.h"
#include "beatDetection.h"
class disco {
public:
disco();
void setup();
void update(float, float);
void draw();
private:
int counter = 0;
int loops = 32;
float prevBeat;
};
\ No newline at end of file
File deleted
......@@ -13,9 +13,9 @@ void ofApp::setup() {
ofEnableDepthTest();
newBeat.setup(); //initialise FFT / Beat detection
technoVisual.setup();
electroVisual.setup();
//discoVisual.setup();
//technoVisual.setup();
//electroVisual.setup();
discoVisual.setup();
ofSoundStreamListDevices();
ofEnableSmoothing();
......@@ -46,12 +46,12 @@ void ofApp::draw() {
//electroVisual.update(newBeat.returnBeat(), newBeat.returnHiHat());
electroVisual.update(x, y);
//electroVisual.update(x, y);
//discoVisual.update(newBeat.returnBeat(), newBeat.returnHiHat());
//discoVisual.update(x,y);
discoVisual.update(x,y);
......
......@@ -2,6 +2,7 @@
#include "ofMain.h"
#include "ofxBeat.h"
#include "beatDetection.h"
#include "disco.h"
#include "techno.h"
#include "electro.h"
......@@ -32,7 +33,7 @@ public:
float y = 0;
//disco discoVisual;
disco discoVisual;
techno technoVisual;
electro electroVisual;
beatDetection newBeat;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment