admin/OnLook
1
0
Fork 0
mirror of https://github.com/diva/OnLook.git synced 2026-08-14 09:02:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'OnLook' of github.com:diva/OnLook into OnLook

Browse Source
This commit is contained in:
Diva Canto
2014-11-18 18:21:51 -08:00
parent 47f41660e1 8b752afe74
commit bc77ffe09d
6 changed files with 95 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/app_settings/keysCamOnly.ini
+43 -40
View File
@@ -16,66 +16,69 @@
# 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 HOME NONE reset_camera
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 F NONE reset_camera
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
THIRD_PERSON PAD_HOME NONE reset_camera
# 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 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 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 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 UP ALT move_forward
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 W ALT move_forward
THIRD_PERSON S ALT move_backward
THIRD_PERSON E ALT spin_over
THIRD_PERSON C ALT spin_under
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
indra/newview/app_settings/keysCamOnlyZQSD.ini
+44 -41
View File
@@ -16,66 +16,69 @@
# 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 HOME NONE reset_camera
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 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 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 F NONE reset_camera
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
THIRD_PERSON PAD_HOME NONE reset_camera
# 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 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 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 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 UP ALT move_forward
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 Z ALT move_forward
THIRD_PERSON S ALT move_backward
THIRD_PERSON E ALT spin_over
THIRD_PERSON C ALT spin_under
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
indra/newview/lldrawpoolavatar.cpp
+5
View File
@@ -464,6 +464,11 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
return;
}
if (avatarp->isSelf() && LFSimFeatureHandler::instance().getOnLookMask() & 1)
{
return;
}
BOOL impostor = avatarp->isImpostor();
if (impostor)
{
indra/newview/llstartup.cpp
-1
View File
@@ -331,7 +331,6 @@ void onlook_mask_changed(const U8& mask)
// Now hide the UI, if needed
bool visible(~mask & 2);
gMenuBarView->setVisible(visible);
gStatusBar->setVisible(visible);
gStatusBar->setEnabled(visible);
// Cameras get no floaters in the way, but don't interrupt mouselook, otherwise.
bool ml(gAgentCamera.cameraMouselook());
indra/newview/llviewerkeyboard.cpp
+3
View File
@@ -46,6 +46,8 @@
#include "llviewerwindow.h"
#include "llvoavatarself.h"
void handle_reset_view();
//
// Constants
//
@@ -592,6 +594,7 @@ REGISTER_KEYBOARD_ACTION("edit_avatar_move_backward", edit_avatar_move_backward)
REGISTER_KEYBOARD_ACTION("stop_moving", stop_moving);
REGISTER_KEYBOARD_ACTION("start_chat", start_chat);
REGISTER_KEYBOARD_ACTION("start_gesture", start_gesture);
REGISTER_KEYBOARD_ACTION("reset_camera", boost::bind(handle_reset_view));
#undef REGISTER_KEYBOARD_ACTION
LLViewerKeyboard::LLViewerKeyboard()
indra/newview/res/onlook_icon.icns
BIN
View File
Binary file not shown.