remove sensor stuff acceleration/gyro
This commit is contained in:
parent
21fd354931
commit
1caa7fe8de
1 changed files with 50 additions and 50 deletions
|
@ -30,58 +30,58 @@ float mountainangle;
|
||||||
float mountainoffsetx;
|
float mountainoffsetx;
|
||||||
float mountainoffsety;
|
float mountainoffsety;
|
||||||
|
|
||||||
ASensorManager * sm;
|
//SENSORSTURFF ASensorManager * sm;
|
||||||
const ASensor * as;
|
//SENSORSTURFF const ASensor * as;
|
||||||
bool no_sensor_for_gyro = false;
|
//SENSORSTURFF bool no_sensor_for_gyro = false;
|
||||||
ASensorEventQueue* aeq;
|
//SENSORSTURFF ASensorEventQueue* aeq;
|
||||||
ALooper * l;
|
//SENSORSTURFF ALooper * l;
|
||||||
|
|
||||||
//webview//WebViewNativeActivityObject MyWebView;
|
//webview//WebViewNativeActivityObject MyWebView;
|
||||||
|
|
||||||
const uint32_t SAMPLE_RATE = 44100;
|
//AUDIO const uint32_t SAMPLE_RATE = 44100;
|
||||||
const uint16_t SAMPLE_COUNT = 512;
|
//AUDIO const uint16_t SAMPLE_COUNT = 512;
|
||||||
uint32_t stream_offset = 0;
|
//AUDIO uint32_t stream_offset = 0;
|
||||||
uint16_t audio_frequency;
|
//AUDIO uint16_t audio_frequency;
|
||||||
|
|
||||||
|
|
||||||
// Inertial Measurement Unit (gyroscopes and accelerometer)
|
//SENSORSTURFF // Inertial Measurement Unit (gyroscopes and accelerometer)
|
||||||
void SetupIMU()
|
//SENSORSTURFF void SetupIMU()
|
||||||
{
|
//SENSORSTURFF {
|
||||||
sm = ASensorManager_getInstanceForPackage("gyroscope");
|
//SENSORSTURFF sm = ASensorManager_getInstanceForPackage("gyroscope");
|
||||||
as = ASensorManager_getDefaultSensor( sm, ASENSOR_TYPE_GYROSCOPE );
|
//SENSORSTURFF as = ASensorManager_getDefaultSensor( sm, ASENSOR_TYPE_GYROSCOPE );
|
||||||
no_sensor_for_gyro = as == NULL;
|
//SENSORSTURFF no_sensor_for_gyro = as == NULL;
|
||||||
l = ALooper_prepare( ALOOPER_PREPARE_ALLOW_NON_CALLBACKS );
|
//SENSORSTURFF l = ALooper_prepare( ALOOPER_PREPARE_ALLOW_NON_CALLBACKS );
|
||||||
aeq = ASensorManager_createEventQueue( sm, (ALooper*)&l, 0, 0, 0 ); //XXX??!?! This looks wrong.
|
//SENSORSTURFF aeq = ASensorManager_createEventQueue( sm, (ALooper*)&l, 0, 0, 0 ); //XXX??!?! This looks wrong.
|
||||||
if(!no_sensor_for_gyro) {
|
//SENSORSTURFF if(!no_sensor_for_gyro) {
|
||||||
ASensorEventQueue_enableSensor( aeq, as);
|
//SENSORSTURFF ASensorEventQueue_enableSensor( aeq, as);
|
||||||
printf( "setEvent Rate: %d\n", ASensorEventQueue_setEventRate( aeq, as, 10000 ) );
|
//SENSORSTURFF printf( "setEvent Rate: %d\n", ASensorEventQueue_setEventRate( aeq, as, 10000 ) );
|
||||||
}
|
//SENSORSTURFF }
|
||||||
|
//SENSORSTURFF
|
||||||
|
//SENSORSTURFF }
|
||||||
|
|
||||||
}
|
//SENSORSTURFF float accx, accy, accz;
|
||||||
|
//SENSORSTURFF int accs;
|
||||||
float accx, accy, accz;
|
//SENSORSTURFF
|
||||||
int accs;
|
//SENSORSTURFF void AccCheck()
|
||||||
|
//SENSORSTURFF {
|
||||||
void AccCheck()
|
//SENSORSTURFF if(no_sensor_for_gyro) {
|
||||||
{
|
//SENSORSTURFF return;
|
||||||
if(no_sensor_for_gyro) {
|
//SENSORSTURFF }
|
||||||
return;
|
//SENSORSTURFF
|
||||||
}
|
//SENSORSTURFF ASensorEvent evt;
|
||||||
|
//SENSORSTURFF do
|
||||||
ASensorEvent evt;
|
//SENSORSTURFF {
|
||||||
do
|
//SENSORSTURFF ssize_t s = ASensorEventQueue_getEvents( aeq, &evt, 1 );
|
||||||
{
|
//SENSORSTURFF if( s <= 0 ) break;
|
||||||
ssize_t s = ASensorEventQueue_getEvents( aeq, &evt, 1 );
|
//SENSORSTURFF accx = evt.vector.v[0];
|
||||||
if( s <= 0 ) break;
|
//SENSORSTURFF accy = evt.vector.v[1];
|
||||||
accx = evt.vector.v[0];
|
//SENSORSTURFF accz = evt.vector.v[2];
|
||||||
accy = evt.vector.v[1];
|
//SENSORSTURFF mountainangle /*degrees*/ -= accz;// * 3.1415 / 360.0;// / 100.0;
|
||||||
accz = evt.vector.v[2];
|
//SENSORSTURFF mountainoffsety += accy;
|
||||||
mountainangle /*degrees*/ -= accz;// * 3.1415 / 360.0;// / 100.0;
|
//SENSORSTURFF mountainoffsetx += accx;
|
||||||
mountainoffsety += accy;
|
//SENSORSTURFF accs++;
|
||||||
mountainoffsetx += accx;
|
//SENSORSTURFF } while( 1 );
|
||||||
accs++;
|
//SENSORSTURFF }
|
||||||
} while( 1 );
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned frames = 0;
|
unsigned frames = 0;
|
||||||
unsigned long iframeno = 0;
|
unsigned long iframeno = 0;
|
||||||
|
@ -544,8 +544,8 @@ int main( int argc, char ** argv )
|
||||||
assettext = temp;
|
assettext = temp;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Inertial Measurement Unit (gyroscopes and accelerometer)
|
//SENSORSTURFF // Inertial Measurement Unit (gyroscopes and accelerometer)
|
||||||
SetupIMU();
|
//SENSORSTURFF SetupIMU();
|
||||||
|
|
||||||
//SOUND // Disabled, for now.
|
//SOUND // Disabled, for now.
|
||||||
//SOUND //InitCNFAAndroid( AudioCallback, "A Name", SAMPLE_RATE, 0, 1, 0, SAMPLE_COUNT, 0, 0, 0 );
|
//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();
|
CNFGHandleInput();
|
||||||
AccCheck();
|
//SENSORSTURFF AccCheck();
|
||||||
|
|
||||||
if( suspended ) { usleep(50000); continue; }
|
if( suspended ) { usleep(50000); continue; }
|
||||||
|
|
||||||
|
@ -590,7 +590,7 @@ int main( int argc, char ** argv )
|
||||||
|
|
||||||
CNFGPenX = 0; CNFGPenY = 480;
|
CNFGPenX = 0; CNFGPenY = 480;
|
||||||
char st[50];
|
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 );
|
CNFGDrawText( st, 10 );
|
||||||
CNFGSetLineWidth( 2 );
|
CNFGSetLineWidth( 2 );
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue