From cb7ec4965e6ec3d2142522c5c110b240f800e55d Mon Sep 17 00:00:00 2001 From: Comment Date: Mon, 20 May 2013 08:55:30 +0100 Subject: vamp wrapper begun --- TRSS_02_rec/Makefile | 2 - TRSS_02_rec/addons.make | 5 -- TRSS_02_rec/config.make | 56 ------------- TRSS_02_rec/src/main.cpp | 17 ---- TRSS_02_rec/src/testApp.cpp | 199 -------------------------------------------- TRSS_02_rec/src/testApp.h | 42 ---------- 6 files changed, 321 deletions(-) delete mode 100755 TRSS_02_rec/Makefile delete mode 100644 TRSS_02_rec/addons.make delete mode 100755 TRSS_02_rec/config.make delete mode 100644 TRSS_02_rec/src/main.cpp delete mode 100644 TRSS_02_rec/src/testApp.cpp delete mode 100644 TRSS_02_rec/src/testApp.h (limited to 'TRSS_02_rec') diff --git a/TRSS_02_rec/Makefile b/TRSS_02_rec/Makefile deleted file mode 100755 index 2d83a77..0000000 --- a/TRSS_02_rec/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -include config.make -include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/Makefile.examples diff --git a/TRSS_02_rec/addons.make b/TRSS_02_rec/addons.make deleted file mode 100644 index 0b4df47..0000000 --- a/TRSS_02_rec/addons.make +++ /dev/null @@ -1,5 +0,0 @@ -ofxOpenNI -ofxFenster -ofxGui -ofxXmlSettings -ofxMayaCam diff --git a/TRSS_02_rec/config.make b/TRSS_02_rec/config.make deleted file mode 100755 index 821a73a..0000000 --- a/TRSS_02_rec/config.make +++ /dev/null @@ -1,56 +0,0 @@ -# add custom variables to this file - -# OF_ROOT allows to move projects outside apps/* just set this variable to the -# absoulte path to the OF root folder - -OF_ROOT = ../../openFrameworks - - -# USER_CFLAGS allows to pass custom flags to the compiler -# for example search paths like: -# USER_CFLAGS = -I src/objects - -USER_CFLAGS = -I $(OF_ROOT)/addons/ofxOpenNI/include/openni -I $(OF_ROOT)/addons/ofxOpenNI/include/nite -I $(OF_ROOT)/addons/ofxOpenNI/src - - -# USER_LDFLAGS allows to pass custom flags to the linker -# for example libraries like: -# USER_LDFLAGS = libs/libawesomelib.a - -USER_LDFLAGS = -lOpenNI - - -EXCLUDE_FROM_SOURCE="bin,.xcodeproj,obj" - -# change this to add different compiler optimizations to your project - -USER_COMPILER_OPTIMIZATION = -march=native -mtune=native -Os - - -# android specific, in case you want to use different optimizations -USER_LIBS_ARM = -USER_LIBS_ARM7 = -USER_LIBS_NEON = - -# android optimizations - -ANDROID_COMPILER_OPTIMIZATION = -Os - -NDK_PLATFORM = android-8 - -# uncomment this for custom application name (if the folder name is different than the application name) -#APPNAME = folderName - -# uncomment this for custom package name, must be the same as the java package that contains OFActivity -#PKGNAME = cc.openframeworks.$(APPNAME) - - - - - -# linux arm flags - -LINUX_ARM7_COMPILER_OPTIMIZATIONS = -march=armv7-a -mtune=cortex-a8 -finline-functions -funroll-all-loops -O3 -funsafe-math-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=hard -mfpu=vfp - - - diff --git a/TRSS_02_rec/src/main.cpp b/TRSS_02_rec/src/main.cpp deleted file mode 100644 index 87dc35f..0000000 --- a/TRSS_02_rec/src/main.cpp +++ /dev/null @@ -1,17 +0,0 @@ - -#include "testApp.h" -#include "ofMain.h" -#include "ofAppGlutWindow.h" - -//======================================================================== -int main( ){ - - ofAppGlutWindow window; - ofSetupOpenGL(&window, 1600,900, OF_FULLSCREEN); // <-------- 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 testApp()); - -} diff --git a/TRSS_02_rec/src/testApp.cpp b/TRSS_02_rec/src/testApp.cpp deleted file mode 100644 index 376d357..0000000 --- a/TRSS_02_rec/src/testApp.cpp +++ /dev/null @@ -1,199 +0,0 @@ -#include "testApp.h" - -//-------------------------------------------------------------- -void testApp::setup() { - - ofSetLogLevel(OF_LOG_NOTICE); - - numDevices = openNIRecorders[0].getNumDevices(); - - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - //openNIRecorders[deviceID].setLogLevel(OF_LOG_VERBOSE); - openNIRecorders[deviceID].setup(false); - openNIRecorders[deviceID].addDepthGenerator(); - openNIRecorders[deviceID].addImageGenerator(); - openNIRecorders[deviceID].setRegister(true); // this registers all the image pixels to the depth pixels - openNIRecorders[deviceID].setMirror(true); // flips the image and depth sensors - openNIRecorders[deviceID].start(); - - openNIPlayers[deviceID].setup(false); - openNIPlayers[deviceID].start(); - - filenames[deviceID]=""; - } - - isLive=true; - isRecording=false; - - verdana.loadFont(ofToDataPath("verdana.ttf"), 10); - - startSound.loadSound("tone1.wav"); - stopSound.loadSound("tone0.wav");; -} - - -string testApp::generateFileName(int cam) { - - string _root = "kinectRecord_"; - - string _timestamp = ofToString(ofGetDay()) + - ofToString(ofGetMonth()) + - ofToString(ofGetYear()) + - ofToString(ofGetHours()) + - ofToString(ofGetMinutes()) + - ofToString(ofGetSeconds()); - - string _filename = (_root + ofToString(cam)+"_"+_timestamp + ".oni"); - - return _filename; - -} - -//-------------------------------------------------------------- -void testApp::update(){ - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - if (isLive) { - openNIRecorders[deviceID].update(); - if (isRecording){ - recorded++; - } - } - else { - openNIPlayers[deviceID].update(); - } - } -} - -//-------------------------------------------------------------- -void testApp::draw(){ - ofBackground(0, 0, 0); - ofSetColor(255, 255, 255); - - ofPushMatrix(); - - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - ofTranslate(0, deviceID * 450); - if (isLive) { - //openNIRecorders[deviceID].drawDebug(); // draws all generators - openNIRecorders[deviceID].drawDepth(200, 0,600,450); - openNIRecorders[deviceID].drawImage(800, 0,600,450); - } - else { - //openNIPlayers[deviceID].drawDebug(); - openNIPlayers[deviceID].drawDepth(200, 0,600,450); - openNIPlayers[deviceID].drawImage(800, 0,600,450); - } - } - - ofPopMatrix(); - - ofSetColor(255, 255, 255); - string msg = "MILLIS: " + ofToString(ofGetElapsedTimeMillis()) + "\nFPS: " + ofToString(ofGetFrameRate()); - if (isRecording) { - msg +="\nrecorded "+ofToString(recorded); - } - if (!isLive) { - msg +="\n"+filenames[0]; - } - verdana.drawString(msg, 10, 10); -} - -//-------------------------------------------------------------- -void testApp::exit(){ - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - openNIRecorders[deviceID].stop(); - openNIPlayers[deviceID].stop(); - } -} - -//-------------------------------------------------------------- -void testApp::keyPressed(int key){ - switch (key) { - case 's': - case 'S': - if (isRecording) { - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - openNIRecorders[deviceID].stopRecording(); - stopSound.play(); - } - isRecording = false; - break; - } else { - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - filenames[deviceID]=generateFileName(deviceID); - openNIRecorders[deviceID].startRecording(generateFileName(deviceID)); - startSound.play(); - } - isRecording = true; - recorded=0; - break; - } - break; - case 'p': - case 'P': - if (filenames[0] != "" && !isRecording && isLive) { - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - openNIRecorders[deviceID].stopRecording(); - } - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - openNIPlayers[deviceID].startPlayer(filenames[deviceID]); - } - isLive = false; - //whichUser=&playUser; - //whichImage=&playImage; - } else { - isLive = true; - //whichUser=&recordUser; - //whichImage=&recordImage; - } - break; - } - - /* why do this? - switch (key) { - case 't': - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - openNIRecorders[deviceID].toggleRegister(); - } - break; - case 'x': - for (int deviceID = 0; deviceID < numDevices; deviceID++){ - openNIRecorders[deviceID].stop(); - } - break; - default: - break; - } - */ -} - -//-------------------------------------------------------------- -void testApp::keyReleased(int key){ - -} - -//-------------------------------------------------------------- -void testApp::mouseMoved(int x, int y ){ - -} - -//-------------------------------------------------------------- -void testApp::mouseDragged(int x, int y, int button){ - -} - -//-------------------------------------------------------------- -void testApp::mousePressed(int x, int y, int button){ - -} - -//-------------------------------------------------------------- -void testApp::mouseReleased(int x, int y, int button){ - -} - -//-------------------------------------------------------------- -void testApp::windowResized(int w, int h){ - -} - diff --git a/TRSS_02_rec/src/testApp.h b/TRSS_02_rec/src/testApp.h deleted file mode 100644 index ffb92e9..0000000 --- a/TRSS_02_rec/src/testApp.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef _TEST_APP -#define _TEST_APP - -#include "ofxOpenNI.h" -#include "ofMain.h" - -#define MAX_DEVICES 2 - -class testApp : public ofBaseApp{ - -public: - void setup(); - void update(); - void draw(); - void exit(); - - 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); - string generateFileName(int cam); - - int numDevices; - ofxOpenNI openNIRecorders[MAX_DEVICES]; - ofxOpenNI openNIPlayers[MAX_DEVICES]; - string filenames[MAX_DEVICES]; - - bool isLive, isRecording; - - ofTrueTypeFont verdana; - - ofSoundPlayer startSound; - ofSoundPlayer stopSound; - - int recorded; - -}; - -#endif -- cgit v1.2.3