summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llagentlistener.cpp29
-rw-r--r--indra/newview/llagentlistener.h2
-rw-r--r--indra/newview/scripts/lua/require/LLAgent.lua13
-rw-r--r--indra/newview/scripts/lua/require/LLChat.lua1
-rw-r--r--indra/newview/scripts/lua/require/LLListener.lua (renamed from indra/newview/scripts/lua/require/LLChatListener.lua)26
-rw-r--r--indra/newview/scripts/lua/test_LLChatListener.lua6
-rw-r--r--indra/newview/scripts/lua/test_autopilot.lua22
7 files changed, 72 insertions, 27 deletions
diff --git a/indra/newview/llagentlistener.cpp b/indra/newview/llagentlistener.cpp
index 120e52402d..10f56c4eb3 100644
--- a/indra/newview/llagentlistener.cpp
+++ b/indra/newview/llagentlistener.cpp
@@ -90,10 +90,9 @@ LLAgentListener::LLAgentListener(LLAgent &agent)
"[\"stop_distance\"]: target maximum distance from target [default: autopilot guess]\n"
"[\"target_rotation\"]: array of [x, y, z, w] quaternion values [default: no target]\n"
"[\"rotation_threshold\"]: target maximum angle from target facing rotation [default: 0.03 radians]\n"
- "[\"behavior_name\"]: name of the autopilot behavior [default: \"\"]"
- "[\"allow_flying\"]: allow flying during autopilot [default: True]",
- //"[\"callback_pump\"]: pump to send success/failure and callback data to [default: none]\n"
- //"[\"callback_data\"]: data to send back during a callback [default: none]",
+ "[\"behavior_name\"]: name of the autopilot behavior [default: \"\"]\n"
+ "[\"allow_flying\"]: allow flying during autopilot [default: True]\n"
+ "event with [\"success\"] flag is sent to 'LLAutopilot' event pump, when auto pilot is terminated",
&LLAgentListener::startAutoPilot,
llsd::map("target_global", LLSD()));
add("getAutoPilot",
@@ -216,7 +215,7 @@ void LLAgentListener::requestSit(LLSD const & event_data) const
else if (event_data.has("position"))
{
LLVector3 target_position = ll_vector3_from_sd(event_data["position"]);
- object = findObjectClosestTo(target_position);
+ object = findObjectClosestTo(target_position, true);
}
else
{
@@ -249,7 +248,7 @@ void LLAgentListener::requestStand(LLSD const & event_data) const
}
-LLViewerObject * LLAgentListener::findObjectClosestTo( const LLVector3 & position ) const
+LLViewerObject * LLAgentListener::findObjectClosestTo(const LLVector3 & position, bool sit_target) const
{
LLViewerObject *object = NULL;
@@ -260,8 +259,13 @@ LLViewerObject * LLAgentListener::findObjectClosestTo( const LLVector3 & positio
while (cur_index < num_objects)
{
LLViewerObject * cur_object = gObjectList.getObject(cur_index++);
- if (cur_object)
- { // Calculate distance from the target position
+ if (cur_object && !cur_object->isAttachment())
+ {
+ if(sit_target && (cur_object->getPCode() != LL_PCODE_VOLUME))
+ {
+ continue;
+ }
+ // Calculate distance from the target position
LLVector3 target_diff = cur_object->getPositionRegion() - position;
F32 distance_to_target = target_diff.length();
if (distance_to_target < min_distance)
@@ -367,7 +371,7 @@ void LLAgentListener::startAutoPilot(LLSD const & event_data)
LLQuaternion target_rotation_value = ll_quaternion_from_sd(event_data["target_rotation"]);
target_rotation = &target_rotation_value;
}
- // *TODO: Use callback_pump and callback_data
+
F32 rotation_threshold = 0.03f;
if (event_data.has("rotation_threshold"))
{
@@ -396,10 +400,15 @@ void LLAgentListener::startAutoPilot(LLSD const & event_data)
// Clear follow target, this is doing a path
mFollowTarget.setNull();
+ auto finish_cb = [](bool success, void*)
+ {
+ LLEventPumps::instance().obtain("LLAutopilot").post(llsd::map("success", success));
+ };
+
mAgent.startAutoPilotGlobal(ll_vector3d_from_sd(event_data["target_global"]),
behavior_name,
target_rotation,
- NULL, NULL,
+ finish_cb, NULL,
stop_distance,
rotation_threshold,
allow_flying);
diff --git a/indra/newview/llagentlistener.h b/indra/newview/llagentlistener.h
index 2765bb5b66..05724ff443 100644
--- a/indra/newview/llagentlistener.h
+++ b/indra/newview/llagentlistener.h
@@ -67,7 +67,7 @@ private:
void stopAnimation(LLSD const &event_data);
void getAnimationInfo(LLSD const &event_data);
- LLViewerObject * findObjectClosestTo( const LLVector3 & position ) const;
+ LLViewerObject * findObjectClosestTo( const LLVector3 & position, bool sit_target = false ) const;
private:
LLAgent & mAgent;
diff --git a/indra/newview/scripts/lua/require/LLAgent.lua b/indra/newview/scripts/lua/require/LLAgent.lua
index 7b12493acc..4a1132fe7e 100644
--- a/indra/newview/scripts/lua/require/LLAgent.lua
+++ b/indra/newview/scripts/lua/require/LLAgent.lua
@@ -80,6 +80,11 @@ function LLAgent.teleport(...)
return leap.request('LLTeleportHandler', args).message
end
+-- Call with no arguments to sit on the ground.
+-- Otherwise specify "obj_uuid" to sit on,
+-- or region "position" {x, y, z} where to find closest object to sit on.
+-- For example: LLAgent.requestSit{position=LLAgent.getRegionPosition()}
+-- Your avatar should be close enough to the object you want to sit on
function LLAgent.requestSit(...)
local args = mapargs('obj_uuid,position', ...)
args.op = 'requestSit'
@@ -90,6 +95,11 @@ function LLAgent.requestStand()
leap.send('LLAgent', {op = 'requestStand'})
end
+-- ***************************************************************************
+-- Autopilot
+-- ***************************************************************************
+LLAgent.autoPilotPump = "LLAutopilot"
+
-- Start the autopilot to move to "target_global" location using specified parameters
-- LLAgent.startAutoPilot{ target_global array of target global {x, y, z} position
-- [, allow_flying] allow flying during autopilot [default: true]
@@ -97,6 +107,7 @@ end
-- [, behavior_name] name of the autopilot behavior [default: (script name)]
-- [, target_rotation] array of [x, y, z, w] quaternion values [default: no target]
-- [, rotation_threshold] target maximum angle from target facing rotation [default: 0.03 radians]
+-- an event with "success" flag is sent to "LLAutopilot" event pump, when auto pilot is terminated
function LLAgent.startAutoPilot(...)
local args = mapargs('target_global,allow_flying,stop_distance,behavior_name,target_rotation,rotation_threshold', ...)
args.op = 'startAutoPilot'
@@ -109,7 +120,7 @@ function LLAgent.setAutoPilotTarget(target_global)
end
-- Start the autopilot to move to the specified target location
--- either "leader_id" (uuid of target) or "avatar_name" (avatar full name) should be specified
+-- either "leader_id" (uuid of target) or "avatar_name" (avatar full name: use just first name for 'Resident') should be specified
-- "allow_flying" [default: true], "stop_distance" [default: autopilot guess]
function LLAgent.startFollowPilot(...)
local args = mapargs('leader_id,avatar_name,allow_flying,stop_distance', ...)
diff --git a/indra/newview/scripts/lua/require/LLChat.lua b/indra/newview/scripts/lua/require/LLChat.lua
index bc0fc86d22..3ac3bab746 100644
--- a/indra/newview/scripts/lua/require/LLChat.lua
+++ b/indra/newview/scripts/lua/require/LLChat.lua
@@ -5,6 +5,7 @@ local LLChat = {}
-- ***************************************************************************
-- Nearby chat
-- ***************************************************************************
+LLChat.nearbyChatPump = "LLNearbyChat"
-- 0 is public nearby channel, other channels are used to communicate with LSL scripts
function LLChat.sendNearby(msg, channel)
diff --git a/indra/newview/scripts/lua/require/LLChatListener.lua b/indra/newview/scripts/lua/require/LLListener.lua
index 82b28966ce..e3bfb6b358 100644
--- a/indra/newview/scripts/lua/require/LLChatListener.lua
+++ b/indra/newview/scripts/lua/require/LLListener.lua
@@ -3,29 +3,31 @@ local inspect = require 'inspect'
local leap = require 'leap'
local util = require 'util'
-local LLChatListener = {}
+local LLListener = {}
local waitfor = {}
local listener_name = {}
+local pump = {}
-function LLChatListener:new()
+function LLListener:new()
local obj = setmetatable({}, self)
self.__index = self
- obj.name = 'Chat_listener'
+ obj.name = 'Listener'
return obj
end
-util.classctor(LLChatListener)
+util.classctor(LLListener)
-function LLChatListener:handleMessages(event_data)
+function LLListener:handleMessages(event_data)
print(inspect(event_data))
return true
end
-function LLChatListener:start()
+function LLListener:start(pump_name)
+ pump = pump_name
waitfor = leap.WaitFor(-1, self.name)
- function waitfor:filter(pump, data)
- if pump == "LLNearbyChat" then
+ function waitfor:filter(pump_, data)
+ if pump == pump_ then
return data
end
end
@@ -37,12 +39,12 @@ function LLChatListener:start()
end
end)
- listener_name = leap.request(leap.cmdpump(), {op='listen', source='LLNearbyChat', listener="ChatListener", tweak=true}).listener
+ listener_name = leap.request(leap.cmdpump(), {op='listen', source=pump, listener="LLListener", tweak=true}).listener
end
-function LLChatListener:stop()
- leap.send(leap.cmdpump(), {op='stoplistening', source='LLNearbyChat', listener=listener_name})
+function LLListener:stop()
+ leap.send(leap.cmdpump(), {op='stoplistening', source=pump, listener=listener_name})
waitfor:close()
end
-return LLChatListener
+return LLListener
diff --git a/indra/newview/scripts/lua/test_LLChatListener.lua b/indra/newview/scripts/lua/test_LLChatListener.lua
index 4a4d40bee5..1df2880f3d 100644
--- a/indra/newview/scripts/lua/test_LLChatListener.lua
+++ b/indra/newview/scripts/lua/test_LLChatListener.lua
@@ -1,4 +1,4 @@
-local LLChatListener = require 'LLChatListener'
+local LLListener = require 'LLListener'
local LLChat = require 'LLChat'
local UI = require 'UI'
@@ -22,7 +22,7 @@ function openOrEcho(message)
end
end
-local listener = LLChatListener()
+local listener = LLListener()
function listener:handleMessages(event_data)
if string.find(event_data.message, '[LUA]') then
@@ -36,4 +36,4 @@ function listener:handleMessages(event_data)
return true
end
-listener:start()
+listener:start(LLChat.nearbyChatPump)
diff --git a/indra/newview/scripts/lua/test_autopilot.lua b/indra/newview/scripts/lua/test_autopilot.lua
new file mode 100644
index 0000000000..0560477d38
--- /dev/null
+++ b/indra/newview/scripts/lua/test_autopilot.lua
@@ -0,0 +1,22 @@
+local LLAgent = require 'LLAgent'
+local LLListener = require 'LLListener'
+
+local pos = LLAgent.getGlobalPosition()
+pos[1]+=10 -- delta x
+pos[2]+=5 -- delta y
+LLAgent.requestStand()
+LLAgent.startAutoPilot{target_global=pos,allow_flying=false,stop_distance=1}
+
+local listener = LLListener()
+
+function listener:handleMessages(event_data)
+ if event_data.success then
+ print('Destination is reached')
+ LLAgent.requestSit()
+ else
+ print('Failed to reach destination')
+ end
+ return false
+end
+
+listener:start(LLAgent.autoPilotPump)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 03:17:42 +0000