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 an automatic teleporter, and patrol script for the Corrade
 // Second Life / OpenSim bot. You can find more details about the bot
 // by following the URL: http://was.fm/secondlife/scripted_agents/corrade
 //
 // The purpose of this script is to demonstrate patroling with Corrade 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 which can be found at: https://creativecommons.org/licenses/by/2.0
+// license which can be found at: http://www.gnu.org/licenses/gpl.html
 //
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2014 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2014 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 string wasKeyValueGet(string k, string data) {
     if(llStringLength(data) == 0) return "";
     if(llStringLength(k) == 0) return "";
     if(i != -1) return llList2String(a, i+1);
     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) {
     list k = llList2ListStrided(data, 0, -1, 2);
     list v = llList2ListStrided(llDeleteSubList(data, 0, 0), 0, -1, 2);
     } while(llGetListLength(k) != 0);
     return llDumpList2String(data, "&");
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2013 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 list wasDualQuicksort(list a, list b) {
     if(llGetListLength(a) <= 1) return a+b;
     } while(llGetListLength(a));
     return wasDualQuicksort(less, less_b) + [ pivot_a ] + [ pivot_b ] + wasDualQuicksort(more, more_b);
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2014 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2014 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 // determines whether the segment AB intersects the segment CD
 integer wasSegmentIntersect(vector A, vector B, vector C, vector D) {
     vector s1 = <B.x - A.x, B.y - A.y, B.z - A.z>;
     return (integer)(s >= 0 && s <= 1 && t >= 0 && t <= 1 &&
             A.z + t*(B.z - A.z) == C.z + s*(D.z - C.z));
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2013 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3    //
 //    www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html    //
 ///////////////////////////////////////////////////////////////////////////
 integer wasPointInPolygon(vector p, list polygon) {
     integer inside = FALSE;
     } while(i<nvert);
     return inside;
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2013 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3    //
 //    www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html    //
 ///////////////////////////////////////////////////////////////////////////
 list wasPointToPolygon(list polygon, vector point) {
     integer i = llGetListLength(polygon)-1;
     return [llList2Float(l, 0), llList2Vector(l, 1)];
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2013 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2013 Wizardry and Steamworks - License: GNU GPLv3    //
 //    www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html    //
 ///////////////////////////////////////////////////////////////////////////
 vector wasPolygonCentroid(list polygon, vector start, float tollerance, integer power) {
     if(llVecMag(start-next) < tollerance) return next;
     return wasPolygonCentroid(polygon, next, tollerance, power*power);
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2011 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2011 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 vector wasCirclePoint(float radius) {
     float x = llPow(-1, 1 + (integer) llFrand(2)) * llFrand(radius*2);
     float y = llPow(-1, 1 + (integer) llFrand(2)) * llFrand(radius*2);
     if(llPow(x,2) + llPow(y,2) <= llPow(radius,2))
         return <x, y, 0>;
     return wasCirclePoint(radius);
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2011 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2011 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 vector wasPolygonPoint(list polygon) {
     vector c = wasPolygonCentroid(polygon, llList2Vector(polygon, 0), 0.05, 2);
     } while(wasPointInPolygon(d, polygon) == FALSE);
     return d;
+}
 ///////////////////////////////////////////////////////////////////////////
-//    Copyright (C) 2015 Wizardry and Steamworks - License: CC BY 2.0    //
+//    Copyright (C) 2015 Wizardry and Steamworks - License: GNU GPLv3    //
 ///////////////////////////////////////////////////////////////////////////
 // determines whether the path between the current positon m and the
 // computed next position d will intersect any two sides of the polygon
 vector wasPolygonPath(vector m, list polygon) {
     if(i > 1) return wasPolygonPath(m, polygon);
     return d;
+}
 ///////////////////////////////////////////////////////////////////////////
-//    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) {
     string o = "";
             llOwnerSay("Corrade is not online, sleeping...");
             llResetScript();
             return;
+        }
         // DEBUG
-        //llOwnerSay("Sending stop...");
-        llInstantMessage(CORRADE,
-            wasKeyValueEncode(
-                [
-                    "command", "autopilot",
-                    "group", wasURLEscape(GROUP),
-                    "password", wasURLEscape(PASSWORD),
-                    "action", "stop",
-                    "callback", wasURLEscape(callback)
-                ]
-            )
-        );
-    }
-    http_request(key id, string method, string body) {
-        llHTTPResponse(id, 200, "OK");
-        if(wasKeyValueGet("command", body) != "autopilot" ||
-            wasKeyValueGet("success", body) != "True") {
-            // DEBUG
-            llOwnerSay("Could not get Corrade to stop, restarting script...");
-            llResetScript();
-        }
-        // DEBUG
         llOwnerSay("Sending next move...");
         // get the next location
         location = wasPolygonPath(location, POLYGON);
         vector pos = llGetPos();
         llInstantMessage(CORRADE,
             wasKeyValueEncode(
+                [
-                    "command", "autopilot",
+                    "command", "walkto",
                     "group", wasURLEscape(GROUP),
                     "password", wasURLEscape(PASSWORD),
                     "position", wasURLEscape(
                         (string)(<location.x, location.y, pos.z>)
                     ),
+                    "vicinity", "1",
-                    "action", "start"
+                    "duration", "2500"
+                ]
+            )
         );
         llSetTimerEvent(1 + llFrand(WAIT));
+    }