fixed after performance version, baffling

1 files changed, 1 insertions, 25 deletions

diff --git a/06_performance/src/oni.cpp b/06_performance/src/oni.cpp
index f4544a9..944a884 100644
--- a/06_performance/src/oni.cpp
+++ b/06_performance/src/oni.cpp
@@ -48,11 +48,7 @@ void syncOniPlayer::pause(){
 	}
 }
 bool syncOniPlayer::isPlaying(){
-<<<<<<< HEAD
 	if (players.size()&&playerActive) return players[0]->isPlaying();
-=======
-	if (players.size()) return players[0]->isPlaying();
->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
 	else return false;
 }
 int syncOniPlayer::getCurrentFrame(){
@@ -117,23 +113,14 @@ void syncOniPlayer::drawPoints(float _birth,float life,float dx,float dy, float
 	//glEnable(GL_PROGRAM_POINT_SIZE);
     //glEnable(GL_POINT_SMOOTH);
     //glHint(GL_POINT_SMOOTH_HINT, GL_NICEST);
-<<<<<<< HEAD
     //glEnable( GL_BLEND );
     //glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
-=======
-    glEnable( GL_BLEND );
-    glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
     //glPointSize( size);
     //glBegin(GL_POINTS);
 
 	if (playerActive){
 		//apply envelope
-<<<<<<< HEAD
 		float attackSeconds=0.5f;
-=======
-		float attackSeconds=2.0f;
->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
 		float playOutFraction=0.9f;
 		float birth;
 		float clipTime=ofGetElapsedTimef()-startTime;
@@ -186,21 +173,14 @@ void syncOniPlayer::drawPoints(float _birth,float life,float dx,float dy, float
 	    }
 	}
 	//glEnd();
-<<<<<<< HEAD
     //glDisable( GL_BLEND );
-=======
-    glDisable( GL_BLEND );
->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
     //glDisable(GL_PROGRAM_POINT_SIZE);
 }
 int syncOniPlayer::getNumParticles(){
 	return points.size()-pointPool.size();
-<<<<<<< HEAD
 }
 string syncOniPlayer::getCurrentFile(){
 	return filenames[0]+" "+audio;
-=======
->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
 }
 void syncOniPlayer::stop(){
 	soundplayer.stop();
@@ -240,12 +220,8 @@ void oniManager::init(const char* filename){
 }
 void oniManager::startPlayer(int newplayer){
 	if (players.size()>newplayer){
-	    if (playing>-1) players[playing].stop();
-<<<<<<< HEAD
+	    //if (playing>-1) players[playing].stop();
 	    usleep(10000);
-=======
-	    //usleep(500000);
->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
 	    playing=newplayer;
 	    players[playing].play();
 	}