diff options
| author | Comment <tim@gray.(none)> | 2013-06-29 12:34:21 +0100 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2013-06-29 12:34:21 +0100 |
| commit | b0464b8b1f4496a35a6ad3a6bfac5cc9e02101ea (patch) | |
| tree | f8b6e9c30530b7fabdf7496afb40edc4fe04c195 /06_performance/src/oni.h | |
| parent | 1a7e15a63d78a6351028d977b90052f6b0d6bf7d (diff) | |
fixed after performance version, baffling
Diffstat (limited to '06_performance/src/oni.h')
| -rw-r--r-- | 06_performance/src/oni.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/06_performance/src/oni.h b/06_performance/src/oni.h index 305d8f1..ed761cb 100644 --- a/06_performance/src/oni.h +++ b/06_performance/src/oni.h @@ -43,10 +43,10 @@ class syncOniPlayer{ LUT=NULL; makeLUT(); playerActive=false; -<<<<<<< HEAD +//<<<<<<< HEAD points.reserve(100000); //operator new seems to be causing crshes? -======= ->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e +//======= +//>>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e } ~syncOniPlayer(){ stop(); @@ -95,10 +95,10 @@ class oniManager{ int getNumClips(); int getNumParticles(); syncOniPlayer* getCurrentPlayer(); -<<<<<<< HEAD +//<<<<<<< HEAD string getCurrentFile(); -======= ->>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e +//======= +//>>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e void update(); void drawWindows(); void drawCloud(int step); |