diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs index c66c148..770ae45 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs | |||
@@ -20,11 +20,8 @@ namespace OpenSim.Scripting.EmbeddedJVM | |||
20 | { | 20 | { |
21 | case 184: | 21 | case 184: |
22 | short refIndex = (short) ((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC+1]); | 22 | short refIndex = (short) ((GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC] << 8) + GlobalMemory.MethodArea.MethodBuffer[this._mThread.PC+1]); |
23 | //Console.WriteLine("call to method : "+refIndex); | ||
24 | if (this._mThread.currentClass._constantsPool[refIndex - 1] is ClassRecord.PoolMethodRef) | 23 | if (this._mThread.currentClass._constantsPool[refIndex - 1] is ClassRecord.PoolMethodRef) |
25 | { | 24 | { |
26 | // Console.WriteLine("which is " + ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mClass.Name.Value + "." + ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Name.Value); | ||
27 | // Console.WriteLine("of type " + ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Type.Value); | ||
28 | string typ = ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Type.Value; | 25 | string typ = ((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mNameType.Type.Value; |
29 | string typeparam = ""; | 26 | string typeparam = ""; |
30 | string typereturn = ""; | 27 | string typereturn = ""; |
@@ -34,7 +31,6 @@ namespace OpenSim.Scripting.EmbeddedJVM | |||
34 | secondbrak = typ.LastIndexOf(')'); | 31 | secondbrak = typ.LastIndexOf(')'); |
35 | typeparam = typ.Substring(firstbrak + 1, secondbrak - firstbrak - 1); | 32 | typeparam = typ.Substring(firstbrak + 1, secondbrak - firstbrak - 1); |
36 | typereturn = typ.Substring(secondbrak + 1, typ.Length - secondbrak - 1); | 33 | typereturn = typ.Substring(secondbrak + 1, typ.Length - secondbrak - 1); |
37 | //Console.WriteLine("split is " + typeparam + " which is length " + typeparam.Length + " , " + typereturn); | ||
38 | if (((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mClass.Name.Value == this._mThread.currentClass.mClass.Name.Value) | 34 | if (((ClassRecord.PoolMethodRef)this._mThread.currentClass._constantsPool[refIndex - 1]).mClass.Name.Value == this._mThread.currentClass.mClass.Name.Value) |
39 | { | 35 | { |
40 | //calling a method in this class | 36 | //calling a method in this class |
@@ -72,12 +68,10 @@ namespace OpenSim.Scripting.EmbeddedJVM | |||
72 | BaseType bs1 = this._mThread.currentFrame.OpStack.Pop(); | 68 | BaseType bs1 = this._mThread.currentFrame.OpStack.Pop(); |
73 | if (bs1 is Int) | 69 | if (bs1 is Int) |
74 | { | 70 | { |
75 | //Console.WriteLine("get entity pos for " + ((Int)bs1).mValue); | ||
76 | //should get the position of the entity from the IScriptAPI | 71 | //should get the position of the entity from the IScriptAPI |
77 | OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); | 72 | OSVector3 vec3 = Thread.OpenSimScriptAPI.GetEntityPosition((uint)((Int)bs1).mValue); |
78 | Float pos = new Float(); | 73 | Float pos = new Float(); |
79 | pos.mValue = vec3.X; | 74 | pos.mValue = vec3.X; |
80 | // Console.WriteLine("returned x value " + vec3.X.ToString()); | ||
81 | this._mThread.currentFrame.OpStack.Push(pos); | 75 | this._mThread.currentFrame.OpStack.Push(pos); |
82 | } | 76 | } |
83 | this._mThread.PC += 2; | 77 | this._mThread.PC += 2; |
@@ -116,7 +110,6 @@ namespace OpenSim.Scripting.EmbeddedJVM | |||
116 | { | 110 | { |
117 | if(in1 is Int) | 111 | if(in1 is Int) |
118 | { | 112 | { |
119 | //Console.WriteLine("set: " + ((Int)in1).mValue + " , " + ((Float)ft1).mValue + " , " + ((Float)ft2).mValue + " , " + ((Float)ft3).mValue); | ||
120 | Thread.OpenSimScriptAPI.SetEntityPosition((uint)((Int) in1).mValue, ((Float)ft1).mValue, ((Float)ft2).mValue, ((Float)ft3).mValue); | 113 | Thread.OpenSimScriptAPI.SetEntityPosition((uint)((Int) in1).mValue, ((Float)ft1).mValue, ((Float)ft2).mValue, ((Float)ft3).mValue); |
121 | } | 114 | } |
122 | } | 115 | } |