corrade-lsl-templates – Diff between revs 29 and 37

Subversion Repositories:

?pathlinks?

Rev 29 – Details – Blame – Last modification – View Log

 ///////////////////////////////////////////////////////////////////////////
-//  Copyright (C) Wizardry and Steamworks 2014 - License: CC BY 2.0      //
+//  Copyright (C) Wizardry and Steamworks 2014 - License: GNU GPLv3      //
 ///////////////////////////////////////////////////////////////////////////
 //
 // This is a puppeteer script for the Corrade Second Life / OpenSim bot
 // that, given a set of local coordinates, will make the bot traverse a
 // path while also minding collisions with object. You can find more
 // details about the Corrade bot and how to get it to work on your machine
-// by following the URL: http://grimore.org/secondlife/scripted_agents/corrade
+// by following the URL: http://was.fm/secondlife/scripted_agents/corrade
 //
 // This script works together with a "configuration" notecard that must
 // be placed in the same primitive as this script. The purpose of this
 // script is to demonstrate how Corrade can be made to walk on a path and
-// you are free to use, change, and commercialize it under the CC BY 2.0
+// you are free to use, change, and commercialize it under the GNU/GPLv3
-// license at: https://creativecommons.org/licenses/by/2.0
+// license at: http://www.gnu.org/licenses/gpl.html
 //
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2014 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
+string wasKeyValueGet(string var, string kvp) {
+    list dVars = llParseString2List(kvp, ["&"], []);
+    do {
-string wasKeyValueGet(string k, string data) {
+        list data = llParseString2List(llList2String(dVars, 0), ["="], []);
-    if(llStringLength(data) == 0) return "";
+        string k = llList2String(data, 0);
-    if(llStringLength(k) == 0) return "";
+        if(k != var) jump continue;
+        return llList2String(data, 1);
-    list a = llParseString2List(data, ["&", "="], []);
+@continue;
-    integer i = llListFindList(a, [ k ]);
+        dVars = llDeleteSubList(dVars, 0, 0);
-    if(i != -1) return llList2String(a, i+1);
+    } while(llGetListLength(dVars));
     return "";
 }
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2013 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
-string wasKeyValueEncode(list data) {
+string wasKeyValueEncode(list kvp) {
-    list k = llList2ListStrided(data, 0, -1, 2);
+    if(llGetListLength(kvp) < 2) return "";
-    list v = llList2ListStrided(llDeleteSubList(data, 0, 0), 0, -1, 2);
-    data = [];
-    do {
+    string k = llList2String(kvp, 0);
-        data += llList2String(k, 0) + "=" + llList2String(v, 0);
+    kvp = llDeleteSubList(kvp, 0, 0);
-        k = llDeleteSubList(k, 0, 0);
+    string v = llList2String(kvp, 0);
-        v = llDeleteSubList(v, 0, 0);
+    kvp = llDeleteSubList(kvp, 0, 0);
-    } while(llGetListLength(k) != 0);
+    if(llGetListLength(kvp) < 2) return k + "=" + v;
-    return llDumpList2String(data, "&");
+    return k + "=" + v + "&" + wasKeyValueEncode(kvp);
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 // escapes a string in conformance with RFC1738
 string wasURLEscape(string i) {
     } while(i != "");
     return o;
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 // unescapes a string in conformance with RFC1738
 string wasURLUnescape(string i) {
     return llUnescapeURL(
             ),
             "\n"
+        )
     );
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 list wasCSVToList(string csv) {
     list l = [];
     list s = [];
     string m = "";
 state notify {
     state_entry() {
         // DEBUG
         llOwnerSay("Binding to the collision notification...");
         llInstantMessage(
-            (key)CORRADE,
+            CORRADE,
             wasKeyValueEncode(
+                [
                     "command", "notify",
                     "group", wasURLEscape(GROUP),
                     "password", wasURLEscape(PASSWORD),
         // extract next destination and permute the set
         vector next = (vector)llList2String(PATH, 0);
         PATH = llDeleteSubList(PATH, 0, 0);
         PATH += next;
-        llInstantMessage(CORRADE,
-            wasKeyValueEncode(
-                [
-                    "command", "autopilot",
-                    "group", wasURLEscape(GROUP),
-                    "password", wasURLEscape(PASSWORD),
-                    "position", next,
-                    "action", "start"
-                ]
-            )
         );
         // We now determine the waiting time for Corrade to reach
         // its next destination by extracting time as a function
         // of the distance it has to walk and the speed of travel:
         // t = s / v
         // This, of course, is prone to error since the distance
         // is calculated on the shortest direct path. Nevertheless,
         // it is a pretty good appoximation for terrain that is
         // mostly flat and without too many curvatures.
+        // NB. 3.20 m/s is the walking speed of an avatar.
+        llInstantMessage(CORRADE,
+            wasKeyValueEncode(
+                [
+                    "command", "walkto",
+                    "group", wasURLEscape(GROUP),
+                    "password", wasURLEscape(PASSWORD),
+                    "position", next,
+                    "vicinity", "1",
+                    "timeout", llVecDist(origin, next)/3.20
+                ]
+            )
+        );
         // NB. 3.20 m/s is the walking speed of an avatar.
         llSetTimerEvent(llVecDist(origin, next)/3.20);
+    }
     http_request(key id, string method, string body) {
         // since we have bound to the collision notification,
         // DEBUG
         llOwnerSay("Collided...");
-        llHTTPResponse(id, 200, "OK");
-        llInstantMessage(CORRADE,
-            wasKeyValueEncode(
-                [
-                    "command", "autopilot",
-                    "group", wasURLEscape(GROUP),
-                    "password", wasURLEscape(PASSWORD),
-                    "action", "stop"
-                ]
         llHTTPResponse(id, 200, "OK");
         );
         // We did not reach our destination since we collided with
         // something on our path, so switch directly to waiting and
         // attempt to reach the next destination on our path.