diff options
| author | Jean-Luc Peurière <jlp@nerim.net> | 2007-07-22 18:09:01 +0400 |
|---|---|---|
| committer | Jean-Luc Peurière <jlp@nerim.net> | 2007-07-22 18:09:01 +0400 |
| commit | 288e07b649ac700f04d2a54d83301235a0b3c04e (patch) | |
| tree | 0ebd50ef9862e02416c70d8c167f074990b21ce8 /source/blender/src/ghostwinlay.c | |
| parent | 256de79f51889067626514d974423a07a50dfdf3 (diff) | |
commiting new viewmovendof code from sfgoros
as this is not working code for me,
and i've not investigated yet why,
i protected it with a define in view.c
line 566 USE_NEW_NDOFMOVE
comment this line to use old code
Diffstat (limited to 'source/blender/src/ghostwinlay.c')
| -rw-r--r-- | source/blender/src/ghostwinlay.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c index 60cbc4d89ba..f960356d7b5 100644 --- a/source/blender/src/ghostwinlay.c +++ b/source/blender/src/ghostwinlay.c @@ -559,15 +559,14 @@ static int event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private) GHOST_TEventNDOFData *sb= data; - // the multipliers are arbitrary values - // they could be ajustable in the future - win->ndof[0] = sb->tx * (1.0f/1024.0f); - win->ndof[1] = sb->ty * (1.0f/1024.0f); - win->ndof[2] = sb->tz * (1.0f/1024.0f); - win->ndof[3] = sb->rx * 0.00003f; - win->ndof[4] = sb->ry * 0.00003f; - win->ndof[5] = sb->rz * 0.00003f; - win->ndof[6] = sb->delta / 1000000.0f; + // no scaling per sfgoros patch + win->ndof[0] = sb->tx; + win->ndof[1] = sb->ty; + win->ndof[2] = sb->tz; + win->ndof[3] = sb->rx; + win->ndof[4] = sb->ry; + win->ndof[5] = sb->rz; + win->ndof[6] = sb->delta; // printf(" motion capted %f %f %f %f %f %f %f \n", win->ndof[0], win->ndof[1], win->ndof[2], // win->ndof[3], win->ndof[4], win->ndof[5], win->ndof[6]); |