Skip to content
Snippets Groups Projects
Commit fcbad172 authored by Erica's avatar Erica
Browse files

Added camera preset art and attached to camera controls

parent ce60f82b
No related branches found
No related tags found
No related merge requests found
Showing
with 33 additions and 28 deletions
indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png

700 B

indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png

754 B

indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png

914 B

indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png

959 B

indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png

1.06 KiB

indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png

945 B

indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png

1.02 KiB

indra/newview/skins/default/textures/icons/Inv_Alpha.png

253 B | W: | H:

indra/newview/skins/default/textures/icons/Inv_Alpha.png

319 B | W: | H:

indra/newview/skins/default/textures/icons/Inv_Alpha.png
indra/newview/skins/default/textures/icons/Inv_Alpha.png
indra/newview/skins/default/textures/icons/Inv_Alpha.png
indra/newview/skins/default/textures/icons/Inv_Alpha.png
  • 2-up
  • Swipe
  • Onion skin
indra/newview/skins/default/textures/icons/Inv_Tattoo.png

253 B | W: | H:

indra/newview/skins/default/textures/icons/Inv_Tattoo.png

416 B | W: | H:

indra/newview/skins/default/textures/icons/Inv_Tattoo.png
indra/newview/skins/default/textures/icons/Inv_Tattoo.png
indra/newview/skins/default/textures/icons/Inv_Tattoo.png
indra/newview/skins/default/textures/icons/Inv_Tattoo.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -28,7 +28,7 @@
<texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />
<texture name="Blank" file_name="Blank.png" preload="false" />
<texture name="BottomTray_BG" file_name="bottomtray/BottomTray_BG.png" preload="false" />
<texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
......@@ -51,6 +51,16 @@
<texture name="Cam_Pan_Off" file_name="bottomtray/Cam_Pan_Off.png" preload="false" />
<texture name="Cam_Pan_Over" file_name="bottomtray/CCam_Pan_Over.png" preload="false" />
<texture name="Cam_Pan_Press" file_name="bottomtray/Cam_Pan_Press.png" preload="false" />
<texture name="Cam_Preset_Back_Off" file_name="bottomtray/Cam_Preset_Back_Off.png" preload="false" />
<texture name="Cam_Preset_Back_On" file_name="bottomtray/Cam_Preset_Back_On.png" preload="false" />
<texture name="Cam_Preset_Eye_Off" file_name="bottomtray/Cam_Preset_Eye_Off.png" preload="false" />
<texture name="Cam_Preset_Eye_On" file_name="bottomtray/Cam_Preset_Eye_On.png" preload="false" />
<texture name="Cam_Preset_Front_Off" file_name="bottomtray/Cam_Preset_Front_Off.png" preload="false" />
<texture name="Cam_Preset_Front_On" file_name="bottomtray/Cam_Preset_Front_On.png" preload="false" />
<texture name="Cam_Preset_Side_Off" file_name="bottomtray/Cam_Preset_Side_Off.png" preload="false" />
<texture name="Cam_Preset_Side_On" file_name="bottomtray/Cam_Preset_Side_On.png" preload="false" />
<texture name="Cam_Rotate_In" file_name="bottomtray/Cam_Rotate_In.png" preload="false" />
<texture name="Cam_Rotate_Out" file_name="bottomtray/Cam_Rotate_Out.png" preload="false" />
<texture name="Cam_Tracking_In" file_name="bottomtray/Cam_Tracking_In.png" preload="false" />
......@@ -499,9 +509,6 @@
<!--WARNING OLD ART *do not use*-->
<texture name="Banner_ForSale" file_name="Banner_ForSale.png" preload="false" />
<texture name="Banner_YouAreHere" file_name="Banner_YouAreHere.png" preload="false" />
<texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
<texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" />
......
......@@ -34,7 +34,7 @@
mouse_opaque="false"
name="controls"
width="148">
<joystick_track
<joystick_track
follows="top|left"
height="78"
image_selected="Cam_Tracking_In"
......@@ -50,7 +50,7 @@
visible="false"
width="78" />
<!--TODO: replace with slider, + - images -->
<joystick_zoom
<joystick_zoom
follows="top|left"
height="78"
image_unselected="ScrollThumb_Vert"
......@@ -80,66 +80,65 @@
tool_tip="Orbit camera around focus"
top="22"
width="78" />
<panel
<panel
height="78"
layout="topleft"
left="36"
name="camera_presets"
top="30"
top="20"
visible="false"
width="78">
<button
height="30"
image_selected="CameraPreset_Rear"
image_unselected="CameraPreset_Rear"
height="40"
image_selected="Cam_Preset_Back_On"
image_unselected="Cam_Preset_Back_Off"
layout="topleft"
left="5"
left="0"
name="rear_view"
tool_tip="Rear View"
top="2"
width="30">
width="40">
<click_callback
function="CameraPresets.ChangeView"
parameter="rear_view" />
</button>
<button
height="30"
image_selected="CameraPreset_3_4"
image_unselected="CameraPreset_3_4"
height="40"
image_selected="Cam_Preset_Side_On"
image_unselected="Cam_Preset_Side_Off"
layout="topleft"
left_pad="5"
name="group_view"
tool_tip="Group View"
top="2"
width="30">
width="40">
<click_callback
function="CameraPresets.ChangeView"
parameter="group_view" />
</button>
<button
height="30"
image_selected="CameraPreset_Front"
image_unselected="CameraPreset_Front"
height="40"
image_selected="Cam_Preset_Front_On"
image_unselected="Cam_Preset_Front_Off"
layout="topleft"
left="5"
left="0"
name="front_view"
tool_tip="Front View"
top_pad="5"
width="30">
width="40">
<click_callback
function="CameraPresets.ChangeView"
parameter="front_view" />
</button>
<button
height="30"
image_selected="CameraPreset_Mouselook"
image_unselected="CameraPreset_Mouselook"
height="40"
image_selected="Cam_Preset_Eye_Off"
image_unselected="Cam_Preset_Eye_Off"
layout="topleft"
left_pad="5"
name="mouselook_view"
tool_tip="Mouselook View"
top_pad="-30"
width="30">
width="40">
<click_callback
function="CameraPresets.ChangeView"
parameter="mouselook_view" />
......@@ -165,7 +164,6 @@
name="orbit_btn"
tab_stop="false"
tool_tip="Orbit camera"
value="true"
width="25">
</button>
<button
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment