More major repair work. New OS X 10.10 SDK example project. New project structure. New Tutorials / Examples.

5 files changed, 0 insertions, 230 deletions

diff --git a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/main.cpp b/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/main.cpp
deleted file mode 100644
index b232966..0000000
--- a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "ofMain.h"
-#include "mp.h"
-#include "ofAppGlutWindow.h"
-
-//========================================================================
-int main( ){
-
-    ofAppGlutWindow window;
-	ofSetupOpenGL(&window, 1024,768, OF_WINDOW);			// <-------- setup the GL context
-
-	// this kicks off the running of my app
-	// can be OF_WINDOW or OF_FULLSCREEN
-	// pass in width and height too:
-	ofRunApp( new mp());
-
-}
diff --git a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.cpp b/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.cpp
deleted file mode 100644
index 57970cf..0000000
--- a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include "mp.h"
-
-//--------------------------------------------------------------
-void mp::setup(){
-	ofEnableAlphaBlending();
-	ofSetupScreen();
-	ofBackground(0, 0, 0);
-	ofSetVerticalSync(true);
-//	pyd.setup("localhost", 23612);
-//	pyd.clear();
-	
-	
-	maxiAtomBook::loadMPTKXmlBook(ofToDataPath("book100.xml"), book);
-	sort(book.atoms.begin(), book.atoms.end(), maxiAtom::atomSortPositionAsc);
-	atomBuffer.resize(512);
-	atomData.resize(book.atoms[0]->length);
-
-	ofxMaxiSettings::setup(44100, 2, 512);
-	ofSoundStreamSetup(maxiSettings::channels,0,this, maxiSettings::sampleRate, maxiSettings::bufferSize, 4);/* Call this last ! */
-	
-//	flArr test;
-//	maxiCollider::createGabor(test, maxiMap::linexp(atom->frequency, 0, 0.2, 20, 20000), 44100, atom->length, atom->phase, 0.3, atom->amp / 40.0);
-	
-}
-
-
-
-//--------------------------------------------------------------
-void mp::update(){
-	flArr test;
-	//generate atoms from mouse position
-//	maxiCollider::createGabor(test, maxiMap::linexp((float)mouseX/ofGetWidth(), 0, 1, 100, 10000) * (1.0 + (ofRandomuf() * 0.2)), 
-//					   maxiSettings::sampleRate, 
-//					   maxiMap::linlin((float)mouseY / ofGetHeight(), 0, 1, 2000, 40000) * (1.0 + (ofRandomuf() * 0.3)), 
-//					   ofRandomf() * PI, 0.3, 0.05);
-//	atomStream.addAtom(test);
-
-	//play book back one atom at a time
-//	static int atomIdx=0;
-//	maxiGaborAtom *atom = (maxiGaborAtom*) book.atoms[atomIdx % book.atoms.size()];
-//	maxiCollider::createGabor(test, maxiMap::linlin(atom->frequency, 0.0, 1.0, 20, 20000), 44100, atom->length, atom->phase, 0.3, atom->amp / 30.0);
-//	atomStream.addAtom(test);	
-//	atomIdx++;
-//	cout << (atomIdx % book.atoms.size()) << ", " <<  maxiMap::linlin(atom->frequency, 0.0, 1.0, 20, 20000) << ", " << atom->amp << endl;
-
-}
-
-//--------------------------------------------------------------
-void mp::draw(){
-
-}
-
-void mp::audioRequested 	(float * output, int bufferSize, int nChannels){
-	atomPlayer.play(book, atomStream, output, bufferSize);
-	
-	memset(&atomBuffer[0], 0, sizeof(float) * bufferSize);
-	atomStream.fillNextBuffer(&(atomBuffer[0]), bufferSize);
-	for (int i = 0; i < bufferSize; i++){
-		output[i*nChannels    ] = output[i*nChannels + 1] = atomBuffer[i]; 
-	}
-	
-}
-
-
-//--------------------------------------------------------------
-void mp::keyPressed(int key){
-
-}
-
-//--------------------------------------------------------------
-void mp::keyReleased(int key){
-
-}
-
-//--------------------------------------------------------------
-void mp::mouseMoved(int x, int y ){
-
-}
-
-//--------------------------------------------------------------
-void mp::mouseDragged(int x, int y, int button){
-
-}
-
-//--------------------------------------------------------------
-void mp::mousePressed(int x, int y, int button){
-
-}
-
-//--------------------------------------------------------------
-void mp::mouseReleased(int x, int y, int button){
-
-}
-
-//--------------------------------------------------------------
-void mp::windowResized(int w, int h){
-
-}
-
-//--------------------------------------------------------------
-void mp::gotMessage(ofMessage msg){
-
-}
-
-//--------------------------------------------------------------
-void mp::dragEvent(ofDragInfo dragInfo){ 
-
-}
\ No newline at end of file
diff --git a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.h b/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.h
deleted file mode 100644
index 1e8d6b6..0000000
--- a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "ofMain.h"
-#include "ofxMaxim.h"
-#include "maxiAtoms.h"
-//#include "pyOSCDebug.h"
-
-class mp : public ofBaseApp{
-
-	public:
-		void setup();
-		void update();
-		void draw();
-
-		void keyPressed  (int key);
-		void keyReleased(int key);
-		void mouseMoved(int x, int y );
-		void mouseDragged(int x, int y, int button);
-		void mousePressed(int x, int y, int button);
-		void mouseReleased(int x, int y, int button);
-		void windowResized(int w, int h);
-		void dragEvent(ofDragInfo dragInfo);
-		void gotMessage(ofMessage msg);
-	
-		void audioRequested 	(float * input, int bufferSize, int nChannels); /* output method */
-
-//	pyOSCDebug pyd;
-	maxiAccelerator atomStream;
-	maxiAtomBook book;
-	maxiAtomBookPlayer atomPlayer;
-	
-	flArr atomBuffer;
-	flArr atomData;
-	
-
-
-};
diff --git a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.cpp b/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.cpp
deleted file mode 100644
index 3af8084..0000000
--- a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  pyOSCDebug.cpp
- *  bastardPop
- *
- *  Created by Chris on 25/10/2011.
- *  Copyright 2011 Goldsmiths Creative Computing. All rights reserved.
- *
- */
-
-#include "pyOSCDebug.h"
-
-pyOSCDebug::pyOSCDebug() {
-	ready = false;
-}
-
-void pyOSCDebug::setup(string host, int port) {
-	osc.setup(host, port);
-	ready = true;
-}
-
-void pyOSCDebug::clear() {
-	if (ready) {
-		ofxOscMessage m;
-		m.setAddress("/clear");
-		osc.sendMessage(m);
-	}
-}
-
-
-void pyOSCDebug::send(vector<float> data) {
-	send(&(data[0]), data.size());
-}
-
-void pyOSCDebug::send(float *data, unsigned int count) {
-	if (ready) {
-		ofxOscMessage m;
-		m.setAddress("/data");
-		for(int i=0; i < count; i++) {
-			m.addFloatArg(data[i]);
-		}
-		osc.sendMessage(m);
-	}
-}
-
-
diff --git a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h b/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h
deleted file mode 100644
index 020f0fd..0000000
--- a/ofxMaxim/examples/OSX/ofxMaximExamples007OSX/maxiAtomSynthesis/src/pyOSCDebug.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  pyOSCDebug.h
- *  bastardPop
- *
- *  Created by Chris on 25/10/2011.
- *  Copyright 2011 Goldsmiths Creative Computing. All rights reserved.
- *
- */
-
-#include "ofxOSC.h"
-#include <vector>
-
-class pyOSCDebug {
-public:
-	pyOSCDebug();
-	void setup(string host, int port);
-	void clear();
-	void send(vector<float> data);
-	void send(float *data, unsigned int count);
-private:
-	ofxOscSender osc;
-	bool ready;
-	
-};
\ No newline at end of file