mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-02 16:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 'set rotation', use simple mapping from accX to Y rotation

Browse Source
This commit is contained in:
matthias.ringwald 2012-04-26 19:53:07 +00:00
parent c7b1499a5b
commit 534f4788a4
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/WiiMoteOpenGLDemo/Classes/EAGLView.h
View File

@ -12,8 +12,6 @@
#import <OpenGLES/ES1/gl.h> #import <OpenGLES/ES1/gl.h>
#import <OpenGLES/ES1/glext.h> #import <OpenGLES/ES1/glext.h>
#define USE_BLUETOOTH
/* /*
This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass. This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass.
The view content is basically an EAGL surface you render your OpenGL scene into. The view content is basically an EAGL surface you render your OpenGL scene into.

5
example/WiiMoteOpenGLDemo/Classes/EAGLView.m
View File

@ -17,6 +17,8 @@
#define USE_DEPTH_BUFFER 1 #define USE_DEPTH_BUFFER 1
#define DEGREES_TO_RADIANS(__ANGLE) ((__ANGLE) / 180.0 * M_PI) #define DEGREES_TO_RADIANS(__ANGLE) ((__ANGLE) / 180.0 * M_PI)
#define USE_BLUETOOTH
// A class extension to declare private methods // A class extension to declare private methods
@interface EAGLView () @interface EAGLView ()
@ -372,11 +374,12 @@
- (void)setRotationX:(int)x Y:(int)y Z:(int)z{ - (void)setRotationX:(int)x Y:(int)y Z:(int)z{
NSLog(@"BT data: %u %u %u", x , y ,z); // NSLog(@"BT data: %u %u %u", x , y ,z);
rotateX = x; rotateX = x;
rotateY = y; rotateY = y;
rotateZ = z; rotateZ = z;
} }
- (void)dealloc { - (void)dealloc {
[self stopAnimation]; [self stopAnimation];

40
example/WiiMoteOpenGLDemo/Classes/WiiMoteOpenGLDemoAppDelegate.m
View File

@ -52,20 +52,12 @@ float getRotationAngle(float matrix[4][4]);
BTDevice *device; BTDevice *device;
uint16_t wiiMoteConHandle = 0; uint16_t wiiMoteConHandle = 0;
WiiMoteOpenGLDemoAppDelegate * theMainApp;
@implementation WiiMoteOpenGLDemoAppDelegate
@synthesize window;
@synthesize glView;
@synthesize navControl;
@synthesize glViewControl;
#define SIZE 5 #define SIZE 5
int counter; int counter;
// define the rest position // define the rest position
static float restPosition[3] = {0,0,1}; float restPosition[3] = {0,0,1};
// static float restPosition2[3] = {0,0,-1}; // static float restPosition2[3] = {0,0,-1};
#define histSize 5 #define histSize 5
int histX[histSize]; int histX[histSize];
@ -83,24 +75,40 @@ static float addToHistory(int history[histSize], int value){
return sum/histSize; return sum/histSize;
} }
static void bt_data_cb(uint8_t x, uint8_t y, uint8_t z){ @implementation WiiMoteOpenGLDemoAppDelegate
@synthesize window;
@synthesize glView;
@synthesize navControl;
@synthesize glViewControl;
-(void) handleBtDataWithX:(uint8_t) x andY:(uint8_t) y andZ:(uint8_t) z{
// NSLog(@"Data 0x%02x, 0x%02x, 0x%02x", x, y, z);
float accData[3]; float accData[3];
accData[0] = addToHistory( histX, 1 * (x - 128)); accData[0] = addToHistory( histX, 1 * (x - 128));
accData[1] = addToHistory( histY, 1 * (y - 128)); accData[1] = addToHistory( histY, 1 * (y - 128));
accData[2] = addToHistory( histZ, 1 * (z - 128)); accData[2] = addToHistory( histZ, 1 * (z - 128));
[glView setRotationX:0 Y:(accData[0] * 5) Z:0];
// NSLog(@"Set Rotation: %f", accData[0]);
return;
float rotationMatrix[4][4]; float rotationMatrix[4][4];
getRotationMatrixFromVectors(restPosition, accData, rotationMatrix);
#if 0
// fancy stuff to fololow
getRotationMatrixFromVectors(restPosition, accData, rotationMatrix);
float rotationAngle = getRotationAngle(rotationMatrix) * 180/M_PI; float rotationAngle = getRotationAngle(rotationMatrix) * 180/M_PI;
#if 1 #if 1
if (rotationAngle >= 90){ if (rotationAngle >= 90){
getRotationMatrixFromVectors(restPosition, accData, rotationMatrix); getRotationMatrixFromVectors(restPosition, accData, rotationMatrix);
[[theMainApp glView] setRotationX:0 Y:180 Z:0]; [glView setRotationX:0 Y:180 Z:0];
} else { } else {
[[theMainApp glView] setRotationX:0 Y:0 Z:0]; [glView setRotationX:0 Y:0 Z:0];
} }
#endif #endif
#if 0 #if 0
@ -118,7 +126,9 @@ static void bt_data_cb(uint8_t x, uint8_t y, uint8_t z){
// } // }
#endif #endif
[[theMainApp glView] setRotationMatrix:rotationMatrix]; #endif
[glView setRotationMatrix:rotationMatrix];
} }
// direct access // direct access
@ -134,7 +144,7 @@ static void bt_data_cb(uint8_t x, uint8_t y, uint8_t z){
case L2CAP_DATA_PACKET: case L2CAP_DATA_PACKET:
if (packet[0] == 0xa1 && packet[1] == 0x31){ if (packet[0] == 0xa1 && packet[1] == 0x31){
bt_data_cb(packet[4], packet[5], packet[6]); [self handleBtDataWithX:packet[4] andY:packet[5] andZ:packet[6]];
} }
break; break;