/CollidoscopeApp/src - Diff - Collidoscope

     /*
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
     #include "AudioEngine.h"
     #include "cinder/app/App.h"
     //FIXME remove App.h include

     /*
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
      This file incorporates work covered by the following copyright and permission notice:
         Copyright (c) 2014, The Cinder Project
         This code is intended to be used with the Cinder C++ library, http://libcinder.org
         Redistribution and use in source and binary forms, with or without modification, are permitted provided that
         the following conditions are met:
         * Redistributions of source code must retain the above copyright notice, this list of conditions and
         the following disclaimer.
         * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
         the following disclaimer in the documentation and/or other materials provided with the distribution.
         THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
         WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
         PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
         ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
         TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
         HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
         NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
         POSSIBILITY OF SUCH DAMAGE.
     */
     #include "BufferToWaveRecorderNode.h"
     #include "cinder/audio/Context.h"
     #include "cinder/audio/Target.h"

     /*
      Copyright (C) 2015  Fiore Martin
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
     #include "Chunk.h"
     #include "DrawInfo.h"
-...
     void Chunk::draw( const DrawInfo& di, ci::gl::BatchRef &batch ){
         using namespace ci;
         gl::pushModelMatrix();
         const float chunkHeight = mAnimate * mAudioTop * di.getMaxChunkHeight();
-...
     void Chunk::drawBar( const DrawInfo& di, ci::gl::BatchRef &batch ){
     	using namespace ci;
         using namespace ci;
         gl::pushModelMatrix();
-...
     const float Chunk::kWidth = 7.0f;
     const float Chunk::kHalfWidth = 3.5f;
     const float Chunk::kHalfWidth = 3.5f;

     /*
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
     #include "cinder/app/App.h"
     #include "cinder/app/RendererGl.h"
     #include "cinder/gl/gl.h"
-...
     class CollidoscopeApp : public App {
       public:
     	void setup() override;
         void setup() override;
         void setupGraphics();
         void receiveCommands();
     	void keyDown( KeyEvent event ) override;
     	void update() override;
     	void draw() override;
         void keyDown( KeyEvent event ) override;
         void update() override;
         void draw() override;
         void resize() override;
     	Config mConfig;
         Config mConfig;
         collidoscope::MIDI mMIDI;
         AudioEngine mAudioEngine;
         array< shared_ptr< Wave >, NUM_WAVES > mWaves;
         array< shared_ptr< DrawInfo >, NUM_WAVES > mDrawInfos;
         array< shared_ptr< Oscilloscope >, NUM_WAVES > mOscilloscopes;
-...
         };
             break;
     	case 'm' :
     		mAudioEngine.setGrainDurationCoeff(0, 8);
     		break;
         case 'm' :
             mAudioEngine.setGrainDurationCoeff(0, 8);
             break;
         case 'n': {
             mAudioEngine.setGrainDurationCoeff( 0, 1 );
-...
     void CollidoscopeApp::draw()
+    {
     	gl::clear( Color( 0, 0, 0 ) );
         gl::clear( Color( 0, 0, 0 ) );
         for ( int i = 0; i < NUM_WAVES; i++ ){
             if ( i == 1 ){
-...
                     mWaves[waveIdx]->getSelection().setSize( numSelectionChunks );
                     // how many samples in one selection ?
     				size_t selectionSize = mWaves[waveIdx]->getSelection().getSize() * (mConfig.getWaveLen() * mAudioEngine.getSampleRate() / mConfig.getNumChunks());
                     size_t selectionSize = mWaves[waveIdx]->getSelection().getSize() * (mConfig.getWaveLen() * mAudioEngine.getSampleRate() / mConfig.getNumChunks());
                     mAudioEngine.setSelectionSize( waveIdx, selectionSize );
                 };

     /*
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
     #include "Config.h"

     /*
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
     #include "cinder/Log.h"

     /*
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
     #include "MIDI.h"
     #include "Config.h"

     /*
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
     #include "PGranularNode.h"
     #include "cinder/audio/Context.h"

     /*
      Copyright (C) 2015  Fiore Martin
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
     #include "ParticleController.h"
     #include "cinder/Rand.h"

     /*
      Copyright (C) 2015  Fiore Martin
      Copyright (C) 2016  Queen Mary University of London
      Author: Fiore Martin
      This file is part of Collidoscope.
      Collidoscope is free software: you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
      GNU General Public License for more details.
      You should have received a copy of the GNU General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
     */
     #include "Wave.h"
     #include "DrawInfo.h"
-...
     Wave::Wave( size_t numChunks, Color selectionColor ):
         mNumChunks( numChunks ),
     	mSelection( this, selectionColor ),
     	mColor(Color(0.5f, 0.5f, 0.5f)),
         mSelection( this, selectionColor ),
         mColor(Color(0.5f, 0.5f, 0.5f)),
         mFilterCoeff( 1.0f )
+    {
     	mChunks.reserve( numChunks );
         mChunks.reserve( numChunks );
     	for ( size_t i = 0; i < numChunks; i++ ){
     		mChunks.emplace_back( i );
+    	}
         for ( size_t i = 0; i < numChunks; i++ ){
             mChunks.emplace_back( i );
+        }
         // init cinder batch drawing
         auto lambert = gl::ShaderDef().color();
-...
     void Wave::reset( bool onlyChunks )
+    {
     	for (size_t i = 0; i < getSize(); i++){
     		mChunks[i].reset();
+    	}
         for (size_t i = 0; i < getSize(); i++){
             mChunks[i].reset();
+        }
     	if (onlyChunks)
     		return;
         if (onlyChunks)
             return;
     	mSelection.setToNull();
         mSelection.setToNull();
+    }
     void Wave::setChunk(size_t index, float bottom, float top)
+    {
     	Chunk &c = mChunks[index];
     	c.setTop(top);
     	c.setBottom(bottom);
         Chunk &c = mChunks[index];
         c.setTop(top);
         c.setBottom(bottom);
+    }
     inline const Chunk & Wave::getChunk(size_t index)
+    {
     	return mChunks[index];
         return mChunks[index];
+    }
     void Wave::update( double secondsPerChunk, const DrawInfo& di ) {
-...
     void Wave::draw( const DrawInfo& di ){
     	/* ########### draw the particles ########## */
         /* ########### draw the particles ########## */
     #ifdef USE_PARTICLES
     	mParticleController.draw();
         mParticleController.draw();
     #endif
     	/* ########### draw the wave ########## */
     	/* scale the wave to fit the window */
     	gl::pushModelView();
         /* ########### draw the wave ########## */
         /* scale the wave to fit the window */
         gl::pushModelView();
     	const float wavePixelLen =  ( mNumChunks * ( 2 + Chunk::kWidth ) );
     	/* scale the x-axis for the wave to fit the window precisely */
     	gl::scale( ((float)di.getWindowWidth() ) / wavePixelLen , 1.0f);
     	/* draw the chunks */
     	if (mSelection.isNull()){
     		/* no selection: all chunks the same color */
     		gl::color(mColor);
     		for (size_t i = 0; i < getSize(); i++){
     			mChunks[i].draw( di, mChunkBatch );
+    		}
+    	}
         const float wavePixelLen =  ( mNumChunks * ( 2 + Chunk::kWidth ) );
         /* scale the x-axis for the wave to fit the window precisely */
         gl::scale( ((float)di.getWindowWidth() ) / wavePixelLen , 1.0f);
         /* draw the chunks */
         if (mSelection.isNull()){
             /* no selection: all chunks the same color */
             gl::color(mColor);
             for (size_t i = 0; i < getSize(); i++){
                 mChunks[i].draw( di, mChunkBatch );
+            }
+        }
         else{
             // Selection not null
     		gl::color(this->mColor);
             gl::color(this->mColor);
             // update the array with cursor positions
             mCursorsPos.clear();
-...
                 mCursorsPos.push_back( cursor.second.pos );
+            }
     		gl::enableAlphaBlending();
             gl::enableAlphaBlending();
     		const float selectionAlpha = 0.5f + mFilterCoeff * 0.5f;
             const float selectionAlpha = 0.5f + mFilterCoeff * 0.5f;
     		for (size_t i = 0; i < getSize(); i++){
     			/* when in selection use selection color */
     			if (i == mSelection.getStart()){
     				/* draw the selection bar with a transparent selection color */
     				gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, 0.5f);
             for (size_t i = 0; i < getSize(); i++){
                 /* when in selection use selection color */
                 if (i == mSelection.getStart()){
                     /* draw the selection bar with a transparent selection color */
                     gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, 0.5f);
                     mChunks[i].drawBar( di, mChunkBatch );
     				/* set the color to the selection */
     				gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, selectionAlpha);
+    			}
                     /* set the color to the selection */
                     gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, selectionAlpha);
+                }
                 // check if one of the cursors is positioned in this chunk
     			if (std::find(mCursorsPos.begin(), mCursorsPos.end(),i) != mCursorsPos.end() ){
     				gl::color(CURSOR_CLR);
     				mChunks[i].draw( di, mChunkBatch );
     				gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, selectionAlpha);
+    			}
     			else{
     				/* just draw with current color */
     				mChunks[i].draw( di, mChunkBatch );
+    			}
     			/* exit selection: go back to wave color */
     			if (i == mSelection.getEnd()){
     				/* draw the selection bar with a transparent selection color */
     				gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, 0.5f);
                 if (std::find(mCursorsPos.begin(), mCursorsPos.end(),i) != mCursorsPos.end() ){
                     gl::color(CURSOR_CLR);
                     mChunks[i].draw( di, mChunkBatch );
                     gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, selectionAlpha);
+                }
                 else{
                     /* just draw with current color */
                     mChunks[i].draw( di, mChunkBatch );
+                }
                 /* exit selection: go back to wave color */
                 if (i == mSelection.getEnd()){
                     /* draw the selection bar with a transparent selection color */
                     gl::color(mSelection.getColor().r, mSelection.getColor().g, mSelection.getColor().b, 0.5f);
                     mChunks[i].drawBar( di, mChunkBatch );
     				/* set the colo to the wave */
     				gl::color(this->mColor);
+    			}
+    		}
     		gl::disableAlphaBlending();
+    	}
                     /* set the colo to the wave */
                     gl::color(this->mColor);
+                }
+            }
             gl::disableAlphaBlending();
+        }
     	gl::popModelView();
         gl::popModelView();
+    }
-...
     void Wave::Selection::setStart(size_t start)  {
     	/* deselect the previous */
         /* deselect the previous */
         mWave->mChunks[mSelectionStart].setAsSelectionStart( false );
     	/* select the next */
         /* select the next */
         mWave->mChunks[start].setAsSelectionStart( true );
     	mNull = false;
         mNull = false;
         size_t size = getSize();
     	mSelectionStart = start;
         mSelectionStart = start;
         mSelectionEnd = start + size - 1;
         if ( mSelectionEnd > mWave->getSize() - 1 )
             mSelectionEnd = mWave->getSize() - 1;
-...
             size = mWave->mNumChunks - mSelectionStart - 1;
+        }
     	/* deselect the previous */
         /* deselect the previous */
         mWave->mChunks[mSelectionEnd].setAsSelectionEnd( false );
         mSelectionEnd = mSelectionStart + size;
     	/* select the next */
         /* select the next */
         mWave->mChunks[mSelectionEnd].setAsSelectionEnd( true );
     	mNull = false;
         mNull = false;
+    }

Collidoscope

Revision 5:75b744078d66 CollidoscopeApp/src