From 3102dc0db472acac7c4007e7423e405a889d665a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 7 Aug 2024 16:12:23 -0400
Subject: Allow smaller minimum timer intervals.

Add test_flycam.lua to exercise the smaller intervals.
---
 indra/newview/scripts/lua/test_flycam.lua | 38 +++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 indra/newview/scripts/lua/test_flycam.lua

(limited to 'indra/newview/scripts')

diff --git a/indra/newview/scripts/lua/test_flycam.lua b/indra/newview/scripts/lua/test_flycam.lua
new file mode 100644
index 0000000000..4fb5608b33
--- /dev/null
+++ b/indra/newview/scripts/lua/test_flycam.lua
@@ -0,0 +1,38 @@
+-- Make camera fly around the subject avatar for a few seconds.
+
+local LLAgent = require 'LLAgent'
+local startup = require 'startup'
+local timers = require 'timers'
+
+local initial = LLAgent.getRegionPosition()
+local height = 2.0 -- meters
+local radius = 4.0 -- meters
+local speed = 1.0 -- meters/second along circle
+local start = os.clock()
+local stop  = os.clock() + 30 -- seconds
+
+local function cameraPos(t)
+    local radians = speed * t
+    return {
+        initial[1] + radius * math.cos(radians),
+        initial[2] + radius * math.sin(radians),
+        initial[3] + height
+    }
+end
+
+local function moveCamera()
+    if os.clock() < stop then
+        -- usual case
+        LLAgent.setCamera{ camera_pos=cameraPos(os.clock() - start), camera_locked=true }
+        return nil
+    else
+        -- last time
+        LLAgent.removeCamParams()
+        LLAgent.setFollowCamActive(false)
+        return true
+    end
+end
+
+startup.wait('STATE_STARTED')
+-- call moveCamera() repeatedly until it returns true
+local timer = timers.Timer(0.1, moveCamera, true)
-- 
cgit v1.2.3


From b4fe47a5c0abac02d161640e04a9a78afb1c5987 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 8 Aug 2024 09:07:56 -0400
Subject: Ensure that the flycam stays near moving avatar.

---
 indra/newview/scripts/lua/test_flycam.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/scripts')

diff --git a/indra/newview/scripts/lua/test_flycam.lua b/indra/newview/scripts/lua/test_flycam.lua
index 4fb5608b33..05c3c37b93 100644
--- a/indra/newview/scripts/lua/test_flycam.lua
+++ b/indra/newview/scripts/lua/test_flycam.lua
@@ -4,7 +4,6 @@ local LLAgent = require 'LLAgent'
 local startup = require 'startup'
 local timers = require 'timers'
 
-local initial = LLAgent.getRegionPosition()
 local height = 2.0 -- meters
 local radius = 4.0 -- meters
 local speed = 1.0 -- meters/second along circle
@@ -12,11 +11,12 @@ local start = os.clock()
 local stop  = os.clock() + 30 -- seconds
 
 local function cameraPos(t)
+    local agent = LLAgent.getRegionPosition()
     local radians = speed * t
     return {
-        initial[1] + radius * math.cos(radians),
-        initial[2] + radius * math.sin(radians),
-        initial[3] + height
+        agent[1] + radius * math.cos(radians),
+        agent[2] + radius * math.sin(radians),
+        agent[3] + height
     }
 end
 
-- 
cgit v1.2.3