diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_Interface.cs (renamed from OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Server_API/LSL_BuiltIn_Commands_Interface.cs) | 56 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs (renamed from OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs) | 58 |
2 files changed, 57 insertions, 57 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Server_API/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_Interface.cs index 8a5d4b6..d484a05 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Server_API/LSL_BuiltIn_Commands_Interface.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_Interface.cs | |||
@@ -30,7 +30,7 @@ using System; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | 32 | ||
33 | namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO | 33 | namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler |
34 | { | 34 | { |
35 | public interface LSL_BuiltIn_Commands_Interface | 35 | public interface LSL_BuiltIn_Commands_Interface |
36 | { | 36 | { |
@@ -46,54 +46,54 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO | |||
46 | UInt32 llFloor(float f); | 46 | UInt32 llFloor(float f); |
47 | UInt32 llCeil(float f); | 47 | UInt32 llCeil(float f); |
48 | UInt32 llRound(float f); | 48 | UInt32 llRound(float f); |
49 | float llVecMag(LSO_Enums.Vector v); | 49 | float llVecMag(Axiom.Math.Vector3 v); |
50 | LSO_Enums.Vector llVecNorm(LSO_Enums.Vector v); | 50 | Axiom.Math.Vector3 llVecNorm(Axiom.Math.Vector3 v); |
51 | float llVecDist(LSO_Enums.Vector a, LSO_Enums.Vector b); | 51 | float llVecDist(Axiom.Math.Vector3 a, Axiom.Math.Vector3 b); |
52 | LSO_Enums.Vector llRot2Euler(LSO_Enums.Rotation r); | 52 | Axiom.Math.Vector3 llRot2Euler(Axiom.Math.Quaternion r); |
53 | LSO_Enums.Rotation llEuler2Rot(LSO_Enums.Vector v); | 53 | Axiom.Math.Quaternion llEuler2Rot(Axiom.Math.Vector3 v); |
54 | LSO_Enums.Rotation llAxes2Rot(LSO_Enums.Vector fwd, LSO_Enums.Vector left, LSO_Enums.Vector up); | 54 | Axiom.Math.Quaternion llAxes2Rot(Axiom.Math.Vector3 fwd, Axiom.Math.Vector3 left, Axiom.Math.Vector3 up); |
55 | LSO_Enums.Vector llRot2Fwd(LSO_Enums.Rotation r); | 55 | Axiom.Math.Vector3 llRot2Fwd(Axiom.Math.Quaternion r); |
56 | LSO_Enums.Vector llRot2Left(LSO_Enums.Rotation r); | 56 | Axiom.Math.Vector3 llRot2Left(Axiom.Math.Quaternion r); |
57 | LSO_Enums.Vector llRot2Up(LSO_Enums.Rotation r); | 57 | Axiom.Math.Vector3 llRot2Up(Axiom.Math.Quaternion r); |
58 | LSO_Enums.Rotation llRotBetween(LSO_Enums.Vector start, LSO_Enums.Vector end); | 58 | Axiom.Math.Quaternion llRotBetween(Axiom.Math.Vector3 start, Axiom.Math.Vector3 end); |
59 | void llWhisper(UInt16 channelID, string text); | 59 | void llWhisper(UInt16 channelID, string text); |
60 | //void llSay(UInt32 channelID, string text); | 60 | //void llSay(UInt32 channelID, string text); |
61 | void llSay(object channelID, object text); | 61 | void llSay(object channelID, object text); |
62 | void llShout(UInt16 channelID, string text); | 62 | void llShout(UInt16 channelID, string text); |
63 | UInt32 llListen(UInt16 channelID, string name, LSO_Enums.Key ID, string msg); | 63 | UInt32 llListen(UInt16 channelID, string name, string ID, string msg); |
64 | void llListenControl(UInt32 number, UInt32 active); | 64 | void llListenControl(UInt32 number, UInt32 active); |
65 | void llListenRemove(UInt32 number); | 65 | void llListenRemove(UInt32 number); |
66 | void llSensor(string name, LSO_Enums.Key id, UInt32 type, float range, float arc); | 66 | void llSensor(string name, string id, UInt32 type, float range, float arc); |
67 | void llSensorRepeat(string name, LSO_Enums.Key id, UInt32 type, float range, float arc, float rate); | 67 | void llSensorRepeat(string name, string id, UInt32 type, float range, float arc, float rate); |
68 | void llSensorRemove(); | 68 | void llSensorRemove(); |
69 | string llDetectedName(UInt32 number); | 69 | string llDetectedName(UInt32 number); |
70 | LSO_Enums.Key llDetectedKey(UInt32 number); | 70 | string llDetectedKey(UInt32 number); |
71 | LSO_Enums.Key llDetectedOwner(UInt32 number); | 71 | string llDetectedOwner(UInt32 number); |
72 | UInt32 llDetectedType(UInt32 number); | 72 | UInt32 llDetectedType(UInt32 number); |
73 | LSO_Enums.Vector llDetectedPos(UInt32 number); | 73 | Axiom.Math.Vector3 llDetectedPos(UInt32 number); |
74 | LSO_Enums.Vector llDetectedVel(UInt32 number); | 74 | Axiom.Math.Vector3 llDetectedVel(UInt32 number); |
75 | LSO_Enums.Vector llDetectedGrab(UInt32 number); | 75 | Axiom.Math.Vector3 llDetectedGrab(UInt32 number); |
76 | LSO_Enums.Rotation llDetectedRot(UInt32 number); | 76 | Axiom.Math.Quaternion llDetectedRot(UInt32 number); |
77 | UInt32 llDetectedGroup(UInt32 number); | 77 | UInt32 llDetectedGroup(UInt32 number); |
78 | UInt32 llDetectedLinkNumber(UInt32 number); | 78 | UInt32 llDetectedLinkNumber(UInt32 number); |
79 | void llDie(); | 79 | void llDie(); |
80 | float llGround(LSO_Enums.Vector offset); | 80 | float llGround(Axiom.Math.Vector3 offset); |
81 | float llCloud(LSO_Enums.Vector offset); | 81 | float llCloud(Axiom.Math.Vector3 offset); |
82 | LSO_Enums.Vector llWind(LSO_Enums.Vector offset); | 82 | Axiom.Math.Vector3 llWind(Axiom.Math.Vector3 offset); |
83 | void llSetStatus(UInt32 status, UInt32 value); | 83 | void llSetStatus(UInt32 status, UInt32 value); |
84 | UInt32 llGetStatus(UInt32 status); | 84 | UInt32 llGetStatus(UInt32 status); |
85 | void llSetScale(LSO_Enums.Vector scale); | 85 | void llSetScale(Axiom.Math.Vector3 scale); |
86 | LSO_Enums.Vector llGetScale(); | 86 | Axiom.Math.Vector3 llGetScale(); |
87 | void llSetColor(LSO_Enums.Vector color, UInt32 face); | 87 | void llSetColor(Axiom.Math.Vector3 color, UInt32 face); |
88 | float llGetAlpha(UInt32 face); | 88 | float llGetAlpha(UInt32 face); |
89 | void llSetAlpha(float alpha, UInt32 face); | 89 | void llSetAlpha(float alpha, UInt32 face); |
90 | LSO_Enums.Vector llGetColor(UInt32 face); | 90 | Axiom.Math.Vector3 llGetColor(UInt32 face); |
91 | void llSetTexture(string texture, UInt32 face); | 91 | void llSetTexture(string texture, UInt32 face); |
92 | void llScaleTexture(float u, float v, UInt32 face); | 92 | void llScaleTexture(float u, float v, UInt32 face); |
93 | void llOffsetTexture(float u, float v, UInt32 face); | 93 | void llOffsetTexture(float u, float v, UInt32 face); |
94 | void llRotateTexture(float rotation, UInt32 face); | 94 | void llRotateTexture(float rotation, UInt32 face); |
95 | string llGetTexture(UInt32 face); | 95 | string llGetTexture(UInt32 face); |
96 | void llSetPos(LSO_Enums.Vector pos); | 96 | void llSetPos(Axiom.Math.Vector3 pos); |
97 | 97 | ||
98 | void llGetPos(); | 98 | void llGetPos(); |
99 | void llGetLocalPos(); | 99 | void llGetLocalPos(); |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs index 38adf9f..f107993 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSO/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | 2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -30,7 +30,7 @@ using System; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | 32 | ||
33 | namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO | 33 | namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler |
34 | { | 34 | { |
35 | public class LSL_BuiltIn_Commands_TestImplementation : LSL_BuiltIn_Commands_Interface | 35 | public class LSL_BuiltIn_Commands_TestImplementation : LSL_BuiltIn_Commands_Interface |
36 | { | 36 | { |
@@ -52,16 +52,16 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO | |||
52 | public UInt32 llFloor(float f) { return 0; } | 52 | public UInt32 llFloor(float f) { return 0; } |
53 | public UInt32 llCeil(float f) { return 0; } | 53 | public UInt32 llCeil(float f) { return 0; } |
54 | public UInt32 llRound(float f) { return 0; } | 54 | public UInt32 llRound(float f) { return 0; } |
55 | public float llVecMag(LSO_Enums.Vector v) { return 0; } | 55 | public float llVecMag(Axiom.Math.Vector3 v) { return 0; } |
56 | public LSO_Enums.Vector llVecNorm(LSO_Enums.Vector v) { return new LSO_Enums.Vector(); } | 56 | public Axiom.Math.Vector3 llVecNorm(Axiom.Math.Vector3 v) { return new Axiom.Math.Vector3(); } |
57 | public float llVecDist(LSO_Enums.Vector a, LSO_Enums.Vector b) { return 0; } | 57 | public float llVecDist(Axiom.Math.Vector3 a, Axiom.Math.Vector3 b) { return 0; } |
58 | public LSO_Enums.Vector llRot2Euler(LSO_Enums.Rotation r) { return new LSO_Enums.Vector(); } | 58 | public Axiom.Math.Vector3 llRot2Euler(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); } |
59 | public LSO_Enums.Rotation llEuler2Rot(LSO_Enums.Vector v) { return new LSO_Enums.Rotation(); } | 59 | public Axiom.Math.Quaternion llEuler2Rot(Axiom.Math.Vector3 v) { return new Axiom.Math.Quaternion(); } |
60 | public LSO_Enums.Rotation llAxes2Rot(LSO_Enums.Vector fwd, LSO_Enums.Vector left, LSO_Enums.Vector up) { return new LSO_Enums.Rotation(); } | 60 | public Axiom.Math.Quaternion llAxes2Rot(Axiom.Math.Vector3 fwd, Axiom.Math.Vector3 left, Axiom.Math.Vector3 up) { return new Axiom.Math.Quaternion(); } |
61 | public LSO_Enums.Vector llRot2Fwd(LSO_Enums.Rotation r) { return new LSO_Enums.Vector(); } | 61 | public Axiom.Math.Vector3 llRot2Fwd(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); } |
62 | public LSO_Enums.Vector llRot2Left(LSO_Enums.Rotation r) { return new LSO_Enums.Vector(); } | 62 | public Axiom.Math.Vector3 llRot2Left(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); } |
63 | public LSO_Enums.Vector llRot2Up(LSO_Enums.Rotation r) { return new LSO_Enums.Vector(); } | 63 | public Axiom.Math.Vector3 llRot2Up(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); } |
64 | public LSO_Enums.Rotation llRotBetween(LSO_Enums.Vector start, LSO_Enums.Vector end) { return new LSO_Enums.Rotation(); } | 64 | public Axiom.Math.Quaternion llRotBetween(Axiom.Math.Vector3 start, Axiom.Math.Vector3 end) { return new Axiom.Math.Quaternion(); } |
65 | public void llWhisper(UInt16 channelID, string text) | 65 | public void llWhisper(UInt16 channelID, string text) |
66 | { | 66 | { |
67 | Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");"); | 67 | Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");"); |
@@ -75,40 +75,40 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO | |||
75 | Common.SendToLog("llSay Channel " + (UInt32)channelID + ", Text: \"" + (string)text + "\""); | 75 | Common.SendToLog("llSay Channel " + (UInt32)channelID + ", Text: \"" + (string)text + "\""); |
76 | } | 76 | } |
77 | public void llShout(UInt16 channelID, string text) { return; } | 77 | public void llShout(UInt16 channelID, string text) { return; } |
78 | public UInt32 llListen(UInt16 channelID, string name, LSO_Enums.Key ID, string msg) { return 0; } | 78 | public UInt32 llListen(UInt16 channelID, string name, string ID, string msg) { return 0; } |
79 | public void llListenControl(UInt32 number, UInt32 active) { return; } | 79 | public void llListenControl(UInt32 number, UInt32 active) { return; } |
80 | public void llListenRemove(UInt32 number) { return; } | 80 | public void llListenRemove(UInt32 number) { return; } |
81 | public void llSensor(string name, LSO_Enums.Key id, UInt32 type, float range, float arc) { return; } | 81 | public void llSensor(string name, string id, UInt32 type, float range, float arc) { return; } |
82 | public void llSensorRepeat(string name, LSO_Enums.Key id, UInt32 type, float range, float arc, float rate) { return; } | 82 | public void llSensorRepeat(string name, string id, UInt32 type, float range, float arc, float rate) { return; } |
83 | public void llSensorRemove() { return; } | 83 | public void llSensorRemove() { return; } |
84 | public string llDetectedName(UInt32 number) { return ""; } | 84 | public string llDetectedName(UInt32 number) { return ""; } |
85 | public LSO_Enums.Key llDetectedKey(UInt32 number) { return new LSO_Enums.Key(); } | 85 | public string llDetectedKey(UInt32 number) { return ""; } |
86 | public LSO_Enums.Key llDetectedOwner(UInt32 number) { return new LSO_Enums.Key(); } | 86 | public string llDetectedOwner(UInt32 number) { return ""; } |
87 | public UInt32 llDetectedType(UInt32 number) { return 0; } | 87 | public UInt32 llDetectedType(UInt32 number) { return 0; } |
88 | public LSO_Enums.Vector llDetectedPos(UInt32 number) { return new LSO_Enums.Vector(); } | 88 | public Axiom.Math.Vector3 llDetectedPos(UInt32 number) { return new Axiom.Math.Vector3(); } |
89 | public LSO_Enums.Vector llDetectedVel(UInt32 number) { return new LSO_Enums.Vector(); } | 89 | public Axiom.Math.Vector3 llDetectedVel(UInt32 number) { return new Axiom.Math.Vector3(); } |
90 | public LSO_Enums.Vector llDetectedGrab(UInt32 number) { return new LSO_Enums.Vector(); } | 90 | public Axiom.Math.Vector3 llDetectedGrab(UInt32 number) { return new Axiom.Math.Vector3(); } |
91 | public LSO_Enums.Rotation llDetectedRot(UInt32 number) { return new LSO_Enums.Rotation(); } | 91 | public Axiom.Math.Quaternion llDetectedRot(UInt32 number) { return new Axiom.Math.Quaternion(); } |
92 | public UInt32 llDetectedGroup(UInt32 number) { return 0; } | 92 | public UInt32 llDetectedGroup(UInt32 number) { return 0; } |
93 | public UInt32 llDetectedLinkNumber(UInt32 number) { return 0; } | 93 | public UInt32 llDetectedLinkNumber(UInt32 number) { return 0; } |
94 | public void llDie() { return; } | 94 | public void llDie() { return; } |
95 | public float llGround(LSO_Enums.Vector offset) { return 0; } | 95 | public float llGround(Axiom.Math.Vector3 offset) { return 0; } |
96 | public float llCloud(LSO_Enums.Vector offset) { return 0; } | 96 | public float llCloud(Axiom.Math.Vector3 offset) { return 0; } |
97 | public LSO_Enums.Vector llWind(LSO_Enums.Vector offset) { return new LSO_Enums.Vector(); } | 97 | public Axiom.Math.Vector3 llWind(Axiom.Math.Vector3 offset) { return new Axiom.Math.Vector3(); } |
98 | public void llSetStatus(UInt32 status, UInt32 value) { return; } | 98 | public void llSetStatus(UInt32 status, UInt32 value) { return; } |
99 | public UInt32 llGetStatus(UInt32 status) { return 0; } | 99 | public UInt32 llGetStatus(UInt32 status) { return 0; } |
100 | public void llSetScale(LSO_Enums.Vector scale) { return; } | 100 | public void llSetScale(Axiom.Math.Vector3 scale) { return; } |
101 | public LSO_Enums.Vector llGetScale() { return new LSO_Enums.Vector(); } | 101 | public Axiom.Math.Vector3 llGetScale() { return new Axiom.Math.Vector3(); } |
102 | public void llSetColor(LSO_Enums.Vector color, UInt32 face) { return; } | 102 | public void llSetColor(Axiom.Math.Vector3 color, UInt32 face) { return; } |
103 | public float llGetAlpha(UInt32 face) { return 0; } | 103 | public float llGetAlpha(UInt32 face) { return 0; } |
104 | public void llSetAlpha(float alpha, UInt32 face) { return; } | 104 | public void llSetAlpha(float alpha, UInt32 face) { return; } |
105 | public LSO_Enums.Vector llGetColor(UInt32 face) { return new LSO_Enums.Vector(); } | 105 | public Axiom.Math.Vector3 llGetColor(UInt32 face) { return new Axiom.Math.Vector3(); } |
106 | public void llSetTexture(string texture, UInt32 face) { return; } | 106 | public void llSetTexture(string texture, UInt32 face) { return; } |
107 | public void llScaleTexture(float u, float v, UInt32 face) { return; } | 107 | public void llScaleTexture(float u, float v, UInt32 face) { return; } |
108 | public void llOffsetTexture(float u, float v, UInt32 face) { return; } | 108 | public void llOffsetTexture(float u, float v, UInt32 face) { return; } |
109 | public void llRotateTexture(float rotation, UInt32 face) { return; } | 109 | public void llRotateTexture(float rotation, UInt32 face) { return; } |
110 | public string llGetTexture(UInt32 face) { return ""; } | 110 | public string llGetTexture(UInt32 face) { return ""; } |
111 | public void llSetPos(LSO_Enums.Vector pos) { return; } | 111 | public void llSetPos(Axiom.Math.Vector3 pos) { return; } |
112 | 112 | ||
113 | 113 | ||
114 | public void llGetPos() { } | 114 | public void llGetPos() { } |