diff --git a/app/src/nativecode/test.c b/app/src/nativecode/test.c index b3cd080..04fc704 100644 --- a/app/src/nativecode/test.c +++ b/app/src/nativecode/test.c @@ -30,58 +30,58 @@ float mountainangle; float mountainoffsetx; float mountainoffsety; -ASensorManager * sm; -const ASensor * as; -bool no_sensor_for_gyro = false; -ASensorEventQueue* aeq; -ALooper * l; +//SENSORSTURFF ASensorManager * sm; +//SENSORSTURFF const ASensor * as; +//SENSORSTURFF bool no_sensor_for_gyro = false; +//SENSORSTURFF ASensorEventQueue* aeq; +//SENSORSTURFF ALooper * l; //webview//WebViewNativeActivityObject MyWebView; -const uint32_t SAMPLE_RATE = 44100; -const uint16_t SAMPLE_COUNT = 512; -uint32_t stream_offset = 0; -uint16_t audio_frequency; +//AUDIO const uint32_t SAMPLE_RATE = 44100; +//AUDIO const uint16_t SAMPLE_COUNT = 512; +//AUDIO uint32_t stream_offset = 0; +//AUDIO uint16_t audio_frequency; -// Inertial Measurement Unit (gyroscopes and accelerometer) -void SetupIMU() -{ - sm = ASensorManager_getInstanceForPackage("gyroscope"); - as = ASensorManager_getDefaultSensor( sm, ASENSOR_TYPE_GYROSCOPE ); - no_sensor_for_gyro = as == NULL; - l = ALooper_prepare( ALOOPER_PREPARE_ALLOW_NON_CALLBACKS ); - aeq = ASensorManager_createEventQueue( sm, (ALooper*)&l, 0, 0, 0 ); //XXX??!?! This looks wrong. - if(!no_sensor_for_gyro) { - ASensorEventQueue_enableSensor( aeq, as); - printf( "setEvent Rate: %d\n", ASensorEventQueue_setEventRate( aeq, as, 10000 ) ); - } +//SENSORSTURFF // Inertial Measurement Unit (gyroscopes and accelerometer) +//SENSORSTURFF void SetupIMU() +//SENSORSTURFF { +//SENSORSTURFF sm = ASensorManager_getInstanceForPackage("gyroscope"); +//SENSORSTURFF as = ASensorManager_getDefaultSensor( sm, ASENSOR_TYPE_GYROSCOPE ); +//SENSORSTURFF no_sensor_for_gyro = as == NULL; +//SENSORSTURFF l = ALooper_prepare( ALOOPER_PREPARE_ALLOW_NON_CALLBACKS ); +//SENSORSTURFF aeq = ASensorManager_createEventQueue( sm, (ALooper*)&l, 0, 0, 0 ); //XXX??!?! This looks wrong. +//SENSORSTURFF if(!no_sensor_for_gyro) { +//SENSORSTURFF ASensorEventQueue_enableSensor( aeq, as); +//SENSORSTURFF printf( "setEvent Rate: %d\n", ASensorEventQueue_setEventRate( aeq, as, 10000 ) ); +//SENSORSTURFF } +//SENSORSTURFF +//SENSORSTURFF } -} - -float accx, accy, accz; -int accs; - -void AccCheck() -{ - if(no_sensor_for_gyro) { - return; - } - - ASensorEvent evt; - do - { - ssize_t s = ASensorEventQueue_getEvents( aeq, &evt, 1 ); - if( s <= 0 ) break; - accx = evt.vector.v[0]; - accy = evt.vector.v[1]; - accz = evt.vector.v[2]; - mountainangle /*degrees*/ -= accz;// * 3.1415 / 360.0;// / 100.0; - mountainoffsety += accy; - mountainoffsetx += accx; - accs++; - } while( 1 ); -} +//SENSORSTURFF float accx, accy, accz; +//SENSORSTURFF int accs; +//SENSORSTURFF +//SENSORSTURFF void AccCheck() +//SENSORSTURFF { +//SENSORSTURFF if(no_sensor_for_gyro) { +//SENSORSTURFF return; +//SENSORSTURFF } +//SENSORSTURFF +//SENSORSTURFF ASensorEvent evt; +//SENSORSTURFF do +//SENSORSTURFF { +//SENSORSTURFF ssize_t s = ASensorEventQueue_getEvents( aeq, &evt, 1 ); +//SENSORSTURFF if( s <= 0 ) break; +//SENSORSTURFF accx = evt.vector.v[0]; +//SENSORSTURFF accy = evt.vector.v[1]; +//SENSORSTURFF accz = evt.vector.v[2]; +//SENSORSTURFF mountainangle /*degrees*/ -= accz;// * 3.1415 / 360.0;// / 100.0; +//SENSORSTURFF mountainoffsety += accy; +//SENSORSTURFF mountainoffsetx += accx; +//SENSORSTURFF accs++; +//SENSORSTURFF } while( 1 ); +//SENSORSTURFF } unsigned frames = 0; unsigned long iframeno = 0; @@ -544,8 +544,8 @@ int main( int argc, char ** argv ) assettext = temp; } - // Inertial Measurement Unit (gyroscopes and accelerometer) - SetupIMU(); +//SENSORSTURFF // Inertial Measurement Unit (gyroscopes and accelerometer) +//SENSORSTURFF SetupIMU(); //SOUND // Disabled, for now. //SOUND //InitCNFAAndroid( AudioCallback, "A Name", SAMPLE_RATE, 0, 1, 0, SAMPLE_COUNT, 0, 0, 0 ); @@ -569,7 +569,7 @@ int main( int argc, char ** argv ) } CNFGHandleInput(); - AccCheck(); +//SENSORSTURFF AccCheck(); if( suspended ) { usleep(50000); continue; } @@ -590,7 +590,7 @@ int main( int argc, char ** argv ) CNFGPenX = 0; CNFGPenY = 480; char st[50]; - sprintf( st, "%dx%d %d %d %d %d %d %d\n%d %d\n%5.2f %5.2f %5.2f %d", screenx, screeny, lastbuttonx, lastbuttony, lastmotionx, lastmotiony, lastkey, lastkeydown, lastbid, lastmask, accx, accy, accz, accs ); + sprintf( st, "%dx%d %d %d %d %d %d %d\n%d %d", screenx, screeny, lastbuttonx, lastbuttony, lastmotionx, lastmotiony, lastkey, lastkeydown, lastbid, lastmask); CNFGDrawText( st, 10 ); CNFGSetLineWidth( 2 );