diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2019-11-04 20:35:34 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2019-11-04 20:35:34 +0200 |
| commit | c75d443c8359f0bceee2df2adc0a67b2890922ea (patch) | |
| tree | 03814e15ba8c31a82ab43a050f6cdbec02cbf437 /indra/newview/app_settings/camera | |
| parent | b371c5a35d5a4324deb21aafe25f48fd4560e29d (diff) | |
SL-12186 WIP Updating UI for camera controls, including presets
Diffstat (limited to 'indra/newview/app_settings/camera')
| -rw-r--r-- | indra/newview/app_settings/camera/Front.xml | 8 | ||||
| -rw-r--r-- | indra/newview/app_settings/camera/Pennys_Gamer.xml | 115 | ||||
| -rw-r--r-- | indra/newview/app_settings/camera/Side.xml | 8 |
3 files changed, 8 insertions, 123 deletions
diff --git a/indra/newview/app_settings/camera/Front.xml b/indra/newview/app_settings/camera/Front.xml index d5ead526b7..a4b5ace33c 100644 --- a/indra/newview/app_settings/camera/Front.xml +++ b/indra/newview/app_settings/camera/Front.xml @@ -37,10 +37,10 @@ <real>6</real> </array> </map> - <key>CameraOffsetRearView</key> + <key>CameraOffsetFrontView</key> <map> <key>Comment</key> - <string>Initial camera offset from avatar in Rear View</string> + <string>Initial camera offset from avatar in Front View</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -74,10 +74,10 @@ <key>Value</key> <integer>0</integer> </map> - <key>FocusOffsetRearView</key> + <key>FocusOffsetFrontView</key> <map> <key>Comment</key> - <string>Initial focus point offset relative to avatar for the camera preset Rear View (x-axis is forward)</string> + <string>Initial focus point offset relative to avatar for the camera preset Front View (x-axis is forward)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> diff --git a/indra/newview/app_settings/camera/Pennys_Gamer.xml b/indra/newview/app_settings/camera/Pennys_Gamer.xml deleted file mode 100644 index 5d249153a0..0000000000 --- a/indra/newview/app_settings/camera/Pennys_Gamer.xml +++ /dev/null @@ -1,115 +0,0 @@ -<llsd> - <map> - <key>AppearanceCameraMovement</key> - <map> - <key>Comment</key> - <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>CameraAngle</key> - <map> - <key>Comment</key> - <string>Camera field of view angle (Radians)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>1.047197551</real> - </map> - <key>CameraOffsetBuild</key> - <map> - <key>Comment</key> - <string>Default camera position relative to focus point when entering build mode</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Vector3</string> - <key>Value</key> - <array> - <real>-6</real> - <real>0</real> - <real>6</real> - </array> - </map> - <key>CameraOffsetRearView</key> - <map> - <key>Comment</key> - <string>Initial camera offset from avatar in Rear View</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Vector3</string> - <key>Value</key> - <array> - <real>-3.0</real> - <real>0.0</real> - <real>-0.2</real> - </array> - </map> - <key>CameraOffsetScale</key> - <map> - <key>Comment</key> - <string>Scales the default offset</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>1</real> - </map> - <key>EditCameraMovement</key> - <map> - <key>Comment</key> - <string>When entering build mode, camera moves up above avatar</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>FocusOffsetRearView</key> - <map> - <key>Comment</key> - <string>Initial focus point offset relative to avatar for the camera preset Rear View (x-axis is forward)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Vector3D</string> - <key>Value</key> - <array> - <real>0.9</real> - <real>0.0</real> - <real>0.2</real> - </array> - </map> - <key>PresetCameraActive</key> - <map> - <key>Comment</key> - <string>Name of currently selected preference</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>Default</string> - </map> - <key>TrackFocusObject</key> - <map> - <key>Comment</key> - <string>Camera tracks last object zoomed on</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - </map> -</llsd> diff --git a/indra/newview/app_settings/camera/Side.xml b/indra/newview/app_settings/camera/Side.xml index 4cd5f2f5a4..677fd47e20 100644 --- a/indra/newview/app_settings/camera/Side.xml +++ b/indra/newview/app_settings/camera/Side.xml @@ -37,10 +37,10 @@ <real>6</real> </array> </map> - <key>CameraOffsetRearView</key> + <key>CameraOffsetGroupView</key> <map> <key>Comment</key> - <string>Initial camera offset from avatar in Rear View</string> + <string>Initial camera offset from avatar in Side View</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -74,10 +74,10 @@ <key>Value</key> <integer>0</integer> </map> - <key>FocusOffsetRearView</key> + <key>FocusOffsetGroupView</key> <map> <key>Comment</key> - <string>Initial focus point offset relative to avatar for the camera preset Rear View (x-axis is forward)</string> + <string>Initial focus point offset relative to avatar for the camera preset Side View (x-axis is forward)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |