Merge branch 'release/luau-scripting' into lua-top-menu

3 files changed, 338 insertions, 0 deletions

diff --git a/indra/newview/scripts/lua/luafloater_camera_control.xml b/indra/newview/scripts/lua/luafloater_camera_control.xml
new file mode 100644
index 0000000000..0601a363e5
--- /dev/null
+++ b/indra/newview/scripts/lua/luafloater_camera_control.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="350"
+ layout="topleft"
+ name="camera_demo"
+ title="Follow camera control"
+ width="360">
+    <text
+     type="string"
+     follows="left|top"
+     height="10"
+     width="100"
+     layout="topleft"
+     top="30"
+     left="10"
+     name="camera_lbl">
+    Camera position:
+    </text>
+    <text
+     type="string"
+     follows="left|top"
+     height="10"
+     width="10"
+     layout="topleft"
+     top_pad="12"
+     left="10"
+     value="X"
+     name="cam_x_lbl"/>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|bottom"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     max_length_bytes="50"
+     name="cam_x"
+     top_delta="-2"
+     left_pad="5"
+     width="65" />
+    <button
+     follows="left|bottom"
+     height="20"
+     image_overlay="Icon_Copy"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     tool_tip="Use Agent position"
+     name="agent_cam_btn"
+     left_pad="10"
+     width="20" >
+    </button>
+    <text
+     type="string"
+     follows="left|top"
+     height="10"
+     width="10"
+     layout="topleft"
+     top_pad="7"
+     left="10"
+     value="Y"
+     name="cam_y_lbl"/>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|bottom"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     max_length_bytes="50"
+     name="cam_y"
+     top_delta="-2"
+     left_pad="5"
+     width="65" />
+    <text
+     type="string"
+     follows="left|top"
+     height="10"
+     width="10"
+     layout="topleft"
+     top_pad="7"
+     left="10"
+     value="Z"
+     name="cam_z_lbl"/>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|bottom"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     max_length_bytes="50"
+     name="cam_z"
+     top_delta="-2"
+     left_pad="5"
+     width="65" />
+    <text
+     type="string"
+     follows="left|top"
+     height="10"
+     width="100"
+     layout="topleft"
+     top="30"
+     left="145"
+     name="focus_lbl">
+    Focus position:
+    </text>
+    <text
+     type="string"
+     follows="left|top"
+     height="10"
+     width="10"
+     layout="topleft"
+     top_pad="12"
+     left="145"
+     value="X"
+     name="cam_x_lbl"/>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|bottom"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     max_length_bytes="50"
+     name="focus_x"
+     top_delta="-2"
+     left_pad="5"
+     width="60" />
+    <button
+     follows="left|bottom"
+     height="20"
+     image_overlay="Icon_Copy"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     tool_tip="Use Agent position"
+     name="agent_focus_btn"
+     left_pad="10"
+     width="20" >
+    </button>
+    <text
+     type="string"
+     follows="left|top"
+     height="10"
+     width="10"
+     layout="topleft"
+     top_pad="7"
+     left="145"
+     value="Y"
+     name="cam_y_lbl"/>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|bottom"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     max_length_bytes="50"
+     name="focus_y"
+     top_delta="-2"
+     left_pad="5"
+     width="60" />
+    <text
+     type="string"
+     follows="left|top"
+     height="10"
+     width="10"
+     layout="topleft"
+     top_pad="7"
+     left="145"
+     value="Z"
+     name="cam_z_lbl"/>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|bottom"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     max_length_bytes="50"
+     name="focus_z"
+     top_delta="-2"
+     left_pad="5"
+     width="60" />
+    <text
+     type="string"
+     follows="left|top"
+     height="10"
+     width="100"
+     layout="topleft"
+     top="30"
+     left="270"
+     name="focus_lbl">
+    Lock:
+    </text>
+    <check_box
+     width="80"
+     height="21"
+     layout="topleft"
+     follows="top|left"
+     top_pad="12"
+     label="Camera"
+     name="lock_camera_ctrl"/>
+    <check_box
+     width="80"
+     height="21"
+     layout="topleft"
+     follows="top|left"
+     top_pad="2"
+     label="Focus"
+     name="lock_focus_ctrl"/>
+    <button
+     follows="left|bottom"
+     height="25"
+     label="Update params"
+     layout="topleft"
+     name="update_btn"
+     left="10"
+     top="140"
+     width="120" >
+    </button>
+    <button
+     follows="left|bottom"
+     height="25"
+     label="Reset"
+     layout="topleft"
+     name="reset_btn"
+     left_pad="15"
+     width="90" >
+    </button>
+    <text_editor
+     follows="top|left"
+     font="SansSerif"
+     height="160"
+     left="5"
+     enabled="false"
+     name="events_editor"
+     top_pad="15"
+     word_wrap="true"
+     max_length="65536"
+     width="350"/>
+</floater>
diff --git a/indra/newview/scripts/lua/require/LLAgent.lua b/indra/newview/scripts/lua/require/LLAgent.lua
new file mode 100644
index 0000000000..bc9a6b23a0
--- /dev/null
+++ b/indra/newview/scripts/lua/require/LLAgent.lua
@@ -0,0 +1,45 @@
+local leap = require 'leap'
+local mapargs = require 'mapargs'
+
+local LLAgent = {}
+
+function LLAgent.getRegionPosition()
+    return leap.request('LLAgent', {op = 'getPosition'}).region
+end
+
+function LLAgent.getGlobalPosition()
+    return leap.request('LLAgent', {op = 'getPosition'}).global
+end
+
+-- Use LL.leaphelp('LLAgent') and see 'setCameraParams' to get more info about params
+--                                          -- TYPE               -- DEFAULT      -- RANGE
+-- LLAgent.setCamera{ [, camera_pos]        -- vector3
+--                    [, focus_pos]         -- vector3
+--                    [, focus_offset]      -- vector3            -- {1,0,0}      -- {-10,-10,-10} to {10,10,10}
+--                    [, distance]          -- float (meters)     -- 3            -- 0.5 to 50
+--                    [, focus_threshold]   -- float (meters)     -- 1            -- 0 to 4
+--                    [, camera_threshold]  -- float (meters)     -- 1            -- 0 to 4
+--                    [, focus_lag]         -- float (seconds)    -- 0.1          -- 0 to 3
+--                    [, camera_lag]        -- float (seconds)    -- 0.1          -- 0 to 3
+--                    [, camera_pitch]      -- float (degrees)    -- 0            -- -45 to 80
+--                    [, behindness_angle]  -- float (degrees)    -- 10           -- 0 to 180
+--                    [, behindness_lag]    -- float (seconds)    -- 0            -- 0 to 3
+--                    [, camera_locked]     -- bool               -- false
+--                    [, focus_locked]}     -- bool               -- false
+function LLAgent.setCamera(...)
+    local args = mapargs('camera_pos,focus_pos,focus_offset,focus_lag,camera_lag,' ..
+                         'distance,focus_threshold,camera_threshold,camera_pitch,' ..
+                         'camera_locked,focus_locked,behindness_angle,behindness_lag', ...)
+    args.op = 'setCameraParams'
+    leap.send('LLAgent', args)
+end
+
+function LLAgent.setFollowCamActive(active)
+    leap.send('LLAgent', {op = 'setFollowCamActive', active = active})
+end
+
+function LLAgent.removeCamParams()
+    leap.send('LLAgent', {op = 'removeCameraParams'})
+end
+
+return LLAgent
diff --git a/indra/newview/scripts/lua/test_camera_control.lua b/indra/newview/scripts/lua/test_camera_control.lua
new file mode 100644
index 0000000000..9b35cdf8cd
--- /dev/null
+++ b/indra/newview/scripts/lua/test_camera_control.lua
@@ -0,0 +1,49 @@
+local Floater = require 'Floater'
+local LLAgent = require 'LLAgent'
+local startup = require 'startup'
+
+local flt = Floater('luafloater_camera_control.xml')
+
+function getValue(ctrl_name)
+    return flt:request({action="get_value", ctrl_name=ctrl_name}).value
+end
+
+function setValue(ctrl_name, value)
+    flt:post({action="set_value", ctrl_name=ctrl_name, value=value})
+end
+
+function flt:commit_update_btn(event_data)
+    lock_focus = getValue('lock_focus_ctrl')
+    lock_camera = getValue('lock_camera_ctrl')
+    local camera_pos = {getValue('cam_x'), getValue('cam_y'), getValue('cam_z')}
+    local focus_pos = {getValue('focus_x'), getValue('focus_y'), getValue('focus_z')}
+
+    LLAgent.setCamera{camera_pos=camera_pos, focus_pos=focus_pos,
+                      focus_locked=lock_focus, camera_locked=lock_camera}
+
+    self:post({action="add_text", ctrl_name="events_editor",
+                value = {'Updating FollowCam params', 'camera_pos:', camera_pos, 'focus_pos:', focus_pos,
+                          'lock_focus:', lock_focus, 'lock_camera:', lock_camera}})
+end
+
+function flt:commit_agent_cam_btn(event_data)
+    agent_pos = LLAgent.getRegionPosition()
+    setValue('cam_x', math.floor(agent_pos[1]))
+    setValue('cam_y', math.floor(agent_pos[2]))
+    setValue('cam_z', math.floor(agent_pos[3]))
+end
+
+function flt:commit_agent_focus_btn(event_data)
+    agent_pos = LLAgent.getRegionPosition()
+    setValue('focus_x', math.floor(agent_pos[1]))
+    setValue('focus_y', math.floor(agent_pos[2]))
+    setValue('focus_z', math.floor(agent_pos[3]))
+end
+
+function flt:commit_reset_btn(event_data)
+    LLAgent.removeCamParams()
+    LLAgent.setFollowCamActive(false)
+end
+
+startup.wait('STATE_STARTED')
+flt:show()