first performance version

1 files changed, 9 insertions, 0 deletions

diff --git a/06_performance/src/oni.h b/06_performance/src/oni.h
index 821dba7..305d8f1 100644
--- a/06_performance/src/oni.h
+++ b/06_performance/src/oni.h
@@ -43,6 +43,10 @@ class syncOniPlayer{
 			LUT=NULL;
 			makeLUT();
 			playerActive=false;
+<<<<<<< HEAD
+			points.reserve(100000); //operator new seems to be causing crshes?
+=======
+>>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
 		}
 		~syncOniPlayer(){
 			stop();
@@ -64,6 +68,7 @@ class syncOniPlayer{
 		int getCurrentFrame();
 		float getPosition();
 		int getNumParticles();
+		string getCurrentFile();
 		void drawWindows();
 		void drawCloud(int step);
 		void drawPoints(float birth,float life,float dx,float dy, float dz,float size);
@@ -90,6 +95,10 @@ class oniManager{
 		int getNumClips();
 		int getNumParticles();
 		syncOniPlayer* getCurrentPlayer();
+<<<<<<< HEAD
+		string getCurrentFile();
+=======
+>>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
 		void update();
 		void drawWindows();
 		void drawCloud(int step);