diff --git a/audio.cpp b/audio.cpp index 5e8e57ff88..81ceef826a 100644 --- a/audio.cpp +++ b/audio.cpp @@ -145,10 +145,10 @@ bool Audio::init() if (err != paNoError) goto error; err = Pa_OpenDefaultStream(&stream, - 2, // input channels - 2, // output channels + 1, // input channels + 1, // output channels paFloat32, // sample format - 44100, // sample rate (hz) + 22050, // sample rate (hz) 512, // frames per buffer audioCallback, // callback function (void*)data); // user data to be passed to callback diff --git a/interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate b/interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate index 9a297636f2..2afb097581 100644 Binary files a/interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate and b/interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/main.cpp b/main.cpp index 5aa33a44ab..a4af7856cc 100644 --- a/main.cpp +++ b/main.cpp @@ -89,7 +89,7 @@ Hand myHand(HAND_RADIUS, glm::vec3(0,1,1)); // My hand (used to manipulate things in world) glm::vec3 box(WORLD_SIZE,WORLD_SIZE,WORLD_SIZE); -ParticleSystem balls(500, +ParticleSystem balls(10, box, false, // Wrap? 0.0, // Noise @@ -112,7 +112,7 @@ ParticleSystem balls(500, #define RENDER_FRAME_MSECS 10 #define SLEEP 0 -#define NUM_TRIS 100 // 20000 //000 +#define NUM_TRIS 50000 // 20000 //000 struct { float vertices[NUM_TRIS * 9]; float normals [NUM_TRIS * 3];