minor tweak (remove shared ptr typedef for solver)

Author: LRitesh

src/CinderFlex.cpp

@@ -36,7 +36,7 @@ namespace cinder
 			solverDesc.maxParticles = particleCount;
 			solverDesc.maxDiffuseParticles = 0;
 
-			mSolver = std::shared_ptr<NvFlexSolver>( NvFlexCreateSolver( mLibrary, &solverDesc ) );
+			mSolver = NvFlexCreateSolver( mLibrary, &solverDesc );
 
 			// setup some decent default params
 			float particleSize = 0.1f;
@@ -87,7 +87,7 @@ namespace cinder
 		void CinderFlex::update( float elapsed )
 		{
 			// tick solver
-			NvFlexUpdateSolver( mSolver.get(), elapsed, 1, NULL ); // &mTimers);
+			NvFlexUpdateSolver( mSolver, elapsed, 1, NULL ); // &mTimers);
 		}
 
 		void CinderFlex::setParticles( NvFlexBuffer* positions, NvFlexBuffer* velocities, NvFlexBuffer* phases, unsigned int particleCount, bool fluid )
@@ -107,21 +107,21 @@ namespace cinder
 
 			NvFlexUnmap( activeBuffer );
 
-			NvFlexSetActive( mSolver.get(), activeBuffer, NULL );
-			NvFlexSetActiveCount( mSolver.get(), particleCount );
+			NvFlexSetActive( mSolver, activeBuffer, NULL );
+			NvFlexSetActiveCount( mSolver, particleCount );
 
 			// write to device (async)
-			NvFlexSetParticles( mSolver.get(), positions, NULL );
-			NvFlexSetVelocities( mSolver.get(), velocities, NULL );
-			NvFlexSetPhases( mSolver.get(), phases, NULL );
+			NvFlexSetParticles( mSolver, positions, NULL );
+			NvFlexSetVelocities( mSolver, velocities, NULL );
+			NvFlexSetPhases( mSolver, phases, NULL );
 		}
 
 		void CinderFlex::getParticles( NvFlexBuffer* positions, NvFlexBuffer* velocities, NvFlexBuffer* phases, unsigned int particleCount )
 		{
 			// kick off async memory reads from device
-			NvFlexGetParticles( mSolver.get(), positions, NULL );
-			NvFlexGetVelocities( mSolver.get(), velocities, NULL );
-			NvFlexGetPhases( mSolver.get(), phases, NULL );
+			NvFlexGetParticles( mSolver, positions, NULL );
+			NvFlexGetVelocities( mSolver, velocities, NULL );
+			NvFlexGetPhases( mSolver, phases, NULL );
 		}
 
 	}

src/CinderFlex.h

@@ -11,9 +11,6 @@
 #include "cinder/app/App.h"
 #include <NvFlex.h>
 
-typedef std::shared_ptr<NvFlexLibrary> NvFlexLibraryRef;
-typedef std::shared_ptr<NvFlexSolver> NvFlexSolverRef;
-
 namespace cinder
 {
 	namespace flex
@@ -22,7 +19,7 @@ namespace cinder
 		class CinderFlex
 		{
 				NvFlexLibrary* mLibrary;
-				NvFlexSolverRef mSolver;
+				NvFlexSolver* mSolver;
 				NvFlexTimers mTimers;
 				NvFlexParams mParams;
 
@@ -42,7 +39,7 @@ namespace cinder
 				const NvFlexParams& getParams() const { return mParams; }
 
 				// set the flex params (for some reason this has strange results if you call it multiple times per solver instance)
-				void setParams( NvFlexParams& params ) { mParams = params; NvFlexSetParams( mSolver.get(), &mParams ); }
+				void setParams( NvFlexParams& params ) { mParams = params; NvFlexSetParams( mSolver, &mParams ); }
 
 				// set the particles positions and velocities (memory should be flexAlloced)
 				void setParticles( NvFlexBuffer* positions, NvFlexBuffer* velocities, NvFlexBuffer* phases, unsigned int particleCount, bool fluid );