From d5a053528dc1f7e73ba071e18dfd303492477b1f Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 17 Nov 2014 15:47:20 -0800 Subject: [PATCH] [Encitra] Tweak camera controls to be more like Google maps. --- indra/newview/app_settings/keysCamOnly.ini | 60 +++++++++---------- .../newview/app_settings/keysCamOnlyZQSD.ini | 60 +++++++++---------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/indra/newview/app_settings/keysCamOnly.ini b/indra/newview/app_settings/keysCamOnly.ini index b8c4ec72c..a00189f7b 100644 --- a/indra/newview/app_settings/keysCamOnly.ini +++ b/indra/newview/app_settings/keysCamOnly.ini @@ -16,66 +16,66 @@ # function must be a function named in llkeyboard.cpp # Camera works with focus on without anything held -THIRD_PERSON LEFT NONE spin_around_cw -THIRD_PERSON RIGHT NONE spin_around_ccw -THIRD_PERSON UP NONE move_forward -THIRD_PERSON DOWN NONE move_backward -THIRD_PERSON PGUP NONE spin_over -THIRD_PERSON PGDN NONE spin_under +THIRD_PERSON LEFT NONE spin_around_ccw +THIRD_PERSON RIGHT NONE spin_around_cw +THIRD_PERSON UP NONE pan_in +THIRD_PERSON DOWN NONE pan_out +THIRD_PERSON PGUP NONE pan_up +THIRD_PERSON PGDN NONE pan_down -THIRD_PERSON A NONE spin_around_cw -THIRD_PERSON D NONE spin_around_ccw -THIRD_PERSON W NONE move_forward -THIRD_PERSON S NONE move_backward -THIRD_PERSON E NONE spin_over -THIRD_PERSON C NONE spin_under +THIRD_PERSON A NONE spin_around_ccw +THIRD_PERSON D NONE spin_around_cw +THIRD_PERSON W NONE pan_in +THIRD_PERSON S NONE pan_out +THIRD_PERSON E NONE pan_up +THIRD_PERSON C NONE pan_down -THIRD_PERSON PAD_LEFT NONE spin_around_cw -THIRD_PERSON PAD_RIGHT NONE spin_around_ccw -THIRD_PERSON PAD_UP NONE move_forward -THIRD_PERSON PAD_DOWN NONE move_backward -THIRD_PERSON PAD_PGUP NONE spin_over -THIRD_PERSON PAD_PGDN NONE spin_under +THIRD_PERSON PAD_LEFT NONE spin_around_ccw +THIRD_PERSON PAD_RIGHT NONE spin_around_cw +THIRD_PERSON PAD_UP NONE pan_in +THIRD_PERSON PAD_DOWN NONE pan_out +THIRD_PERSON PAD_PGUP NONE pan_up +THIRD_PERSON PAD_PGDN NONE pan_down # Camera pans with shift THIRD_PERSON A SHIFT pan_left THIRD_PERSON D SHIFT pan_right THIRD_PERSON W SHIFT pan_in THIRD_PERSON S SHIFT pan_out -THIRD_PERSON E SHIFT pan_up -THIRD_PERSON C SHIFT pan_down +THIRD_PERSON E SHIFT spin_over +THIRD_PERSON C SHIFT spin_under THIRD_PERSON LEFT SHIFT pan_left THIRD_PERSON RIGHT SHIFT pan_right THIRD_PERSON UP SHIFT pan_in THIRD_PERSON DOWN SHIFT pan_out -THIRD_PERSON PGUP SHIFT pan_up -THIRD_PERSON PGDN SHIFT pan_down +THIRD_PERSON PGUP SHIFT spin_over +THIRD_PERSON PGDN SHIFT spin_under THIRD_PERSON PAD_LEFT SHIFT pan_left THIRD_PERSON PAD_RIGHT SHIFT pan_right THIRD_PERSON PAD_UP SHIFT pan_in THIRD_PERSON PAD_DOWN SHIFT pan_out -THIRD_PERSON PAD_PGUP SHIFT pan_up -THIRD_PERSON PAD_PGDN SHIFT pan_down +THIRD_PERSON PAD_PGUP SHIFT spin_over +THIRD_PERSON PAD_PGDN SHIFT spin_under # Camera works with focus on alt -THIRD_PERSON LEFT ALT spin_around_cw -THIRD_PERSON RIGHT ALT spin_around_ccw +THIRD_PERSON LEFT ALT spin_around_ccw +THIRD_PERSON RIGHT ALT spin_around_cw THIRD_PERSON UP ALT move_forward THIRD_PERSON DOWN ALT move_backward THIRD_PERSON PGUP ALT spin_over THIRD_PERSON PGDN ALT spin_under -THIRD_PERSON A ALT spin_around_cw -THIRD_PERSON D ALT spin_around_ccw +THIRD_PERSON A ALT spin_around_ccw +THIRD_PERSON D ALT spin_around_cw THIRD_PERSON W ALT move_forward THIRD_PERSON S ALT move_backward THIRD_PERSON E ALT spin_over THIRD_PERSON C ALT spin_under -THIRD_PERSON PAD_LEFT ALT spin_around_cw -THIRD_PERSON PAD_RIGHT ALT spin_around_ccw +THIRD_PERSON PAD_LEFT ALT spin_around_ccw +THIRD_PERSON PAD_RIGHT ALT spin_around_cw THIRD_PERSON PAD_UP ALT move_forward THIRD_PERSON PAD_DOWN ALT move_backward THIRD_PERSON PAD_PGUP ALT spin_over diff --git a/indra/newview/app_settings/keysCamOnlyZQSD.ini b/indra/newview/app_settings/keysCamOnlyZQSD.ini index 524a657f8..eb0b7967b 100644 --- a/indra/newview/app_settings/keysCamOnlyZQSD.ini +++ b/indra/newview/app_settings/keysCamOnlyZQSD.ini @@ -16,66 +16,66 @@ # function must be a function named in llkeyboard.cpp # Camera works with focus on without anything held -THIRD_PERSON LEFT NONE spin_around_cw -THIRD_PERSON RIGHT NONE spin_around_ccw -THIRD_PERSON UP NONE move_forward -THIRD_PERSON DOWN NONE move_backward -THIRD_PERSON PGUP NONE spin_over -THIRD_PERSON PGDN NONE spin_under +THIRD_PERSON LEFT NONE spin_around_ccw +THIRD_PERSON RIGHT NONE spin_around_cw +THIRD_PERSON UP NONE pan_in +THIRD_PERSON DOWN NONE pan_out +THIRD_PERSON PGUP NONE pan_up +THIRD_PERSON PGDN NONE pan_down -THIRD_PERSON Q NONE spin_around_cw -THIRD_PERSON D NONE spin_around_ccw -THIRD_PERSON Z NONE move_forward -THIRD_PERSON S NONE move_backward -THIRD_PERSON E NONE spin_over -THIRD_PERSON C NONE spin_under +THIRD_PERSON Q NONE spin_around_ccw +THIRD_PERSON D NONE spin_around_cw +THIRD_PERSON Z NONE pan_in +THIRD_PERSON S NONE pan_out +THIRD_PERSON E NONE pan_up +THIRD_PERSON C NONE pan_down -THIRD_PERSON PAD_LEFT NONE spin_around_cw -THIRD_PERSON PAD_RIGHT NONE spin_around_ccw -THIRD_PERSON PAD_UP NONE move_forward -THIRD_PERSON PAD_DOWN NONE move_backward -THIRD_PERSON PAD_PGUP NONE spin_over -THIRD_PERSON PAD_PGDN NONE spin_under +THIRD_PERSON PAD_LEFT NONE spin_around_ccw +THIRD_PERSON PAD_RIGHT NONE spin_around_cw +THIRD_PERSON PAD_UP NONE pan_in +THIRD_PERSON PAD_DOWN NONE pan_out +THIRD_PERSON PAD_PGUP NONE pan_up +THIRD_PERSON PAD_PGDN NONE pan_down # Camera pans with shift THIRD_PERSON Q SHIFT pan_left THIRD_PERSON D SHIFT pan_right THIRD_PERSON Z SHIFT pan_in THIRD_PERSON S SHIFT pan_out -THIRD_PERSON E SHIFT pan_up -THIRD_PERSON C SHIFT pan_down +THIRD_PERSON E SHIFT spin_over +THIRD_PERSON C SHIFT spin_under THIRD_PERSON LEFT SHIFT pan_left THIRD_PERSON RIGHT SHIFT pan_right THIRD_PERSON UP SHIFT pan_in THIRD_PERSON DOWN SHIFT pan_out -THIRD_PERSON PGUP SHIFT pan_up -THIRD_PERSON PGDN SHIFT pan_down +THIRD_PERSON PGUP SHIFT spin_over +THIRD_PERSON PGDN SHIFT spin_under THIRD_PERSON PAD_LEFT SHIFT pan_left THIRD_PERSON PAD_RIGHT SHIFT pan_right THIRD_PERSON PAD_UP SHIFT pan_in THIRD_PERSON PAD_DOWN SHIFT pan_out -THIRD_PERSON PAD_PGUP SHIFT pan_up -THIRD_PERSON PAD_PGDN SHIFT pan_down +THIRD_PERSON PAD_PGUP SHIFT spin_over +THIRD_PERSON PAD_PGDN SHIFT spin_under # Camera works with focus on alt -THIRD_PERSON LEFT ALT spin_around_cw -THIRD_PERSON RIGHT ALT spin_around_ccw +THIRD_PERSON LEFT ALT spin_around_ccw +THIRD_PERSON RIGHT ALT spin_around_cw THIRD_PERSON UP ALT move_forward THIRD_PERSON DOWN ALT move_backward THIRD_PERSON PGUP ALT spin_over THIRD_PERSON PGDN ALT spin_under -THIRD_PERSON Q ALT spin_around_cw -THIRD_PERSON D ALT spin_around_ccw +THIRD_PERSON Q ALT spin_around_ccw +THIRD_PERSON D ALT spin_around_cw THIRD_PERSON Z ALT move_forward THIRD_PERSON S ALT move_backward THIRD_PERSON E ALT spin_over THIRD_PERSON C ALT spin_under -THIRD_PERSON PAD_LEFT ALT spin_around_cw -THIRD_PERSON PAD_RIGHT ALT spin_around_ccw +THIRD_PERSON PAD_LEFT ALT spin_around_ccw +THIRD_PERSON PAD_RIGHT ALT spin_around_cw THIRD_PERSON PAD_UP ALT move_forward THIRD_PERSON PAD_DOWN ALT move_backward THIRD_PERSON PAD_PGUP ALT spin_over