OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed startup logo size to match a Win CMD window. 

Fixed bugs in new OOP commands.
Prim.Rotation.X += 45;
Prim.Position.X += 10;
Now how do I find the prim I asked to += 10 every 1 second???
0.6.0-stable
Tedd Hansen 2008-02-24 17:29:59 +00:00
parent f10d895105
commit 4f4dfa8e82
2 changed files with 163 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -300,9 +300,9 @@ namespace OpenSim
// Called from app startup (OpenSim.Application) // Called from app startup (OpenSim.Application)
// //
m_log.Info("====================================================================="); m_log.Info("====================================================================");
m_log.Info("========================= STARTING OPENSIM =========================="); m_log.Info("========================= STARTING OPENSIM =========================");
m_log.Info("====================================================================="); m_log.Info("====================================================================");
m_console = CreateConsole(); m_console = CreateConsole();
MainConsole.Instance = m_console; MainConsole.Instance = m_console;

178
OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
View File

@ -40,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.Common
: base(scriptEngine, host, localID, itemID) : base(scriptEngine, host, localID, itemID)
{ {
Prim = new OSSLPrim(this); Prim = new OSSLPrim(this);
} }
@ -49,28 +49,39 @@ namespace OpenSim.Region.ScriptEngine.Common
[Serializable] [Serializable]
public class OSSLPrim public class OSSLPrim
{ {
private OSSL_BuilIn_Commands OSSL; internal OSSL_BuilIn_Commands OSSL;
public OSSLPrim(OSSL_BuilIn_Commands bc) public OSSLPrim(OSSL_BuilIn_Commands bc)
{ {
OSSL = bc; OSSL = bc;
Position = new OSSLPrim_Position(this);
Rotation = new OSSLPrim_Rotation(this);
} }
public LSL_Types.Vector3 Position {
get { return OSSL.llGetPos(); } public OSSLPrim_Position Position;
set { OSSL.llSetPos(value); } public OSSLPrim_Rotation Rotation;
} //public LSL_Types.Vector3 Position
public LSL_Types.Quaternion Rotation { //{
get { return OSSL.llGetRot(); } // get { return OSSL.llGetPos(); }
set { OSSL.llSetRot(value); } // set { OSSL.llSetPos(value); }
} //}
//public LSL_Types.Quaternion Rotation
//{
// get { return OSSL.llGetRot(); }
// set { OSSL.llSetRot(value); }
//}
private TextStruct _text; private TextStruct _text;
public TextStruct Text public TextStruct Text
{ {
get { return _text; } get { return _text; }
set { _text = value; set
OSSL.llSetText(_text.Text, _text.color, _text.alpha); } {
_text = value;
OSSL.llSetText(_text.Text, _text.color, _text.alpha);
}
} }
[Serializable]
public struct TextStruct public struct TextStruct
{ {
public string Text; public string Text;
@ -78,12 +89,143 @@ namespace OpenSim.Region.ScriptEngine.Common
public double alpha; public double alpha;
} }
} }
//public struct OSSLPrim_Position
//{ [Serializable]
// public int X; public class OSSLPrim_Position
// public int Y; {
// public int Z; private OSSLPrim prim;
//} private LSL_Types.Vector3 Position;
public OSSLPrim_Position(OSSLPrim _prim)
{
prim = _prim;
}
private void Load()
{
Position = prim.OSSL.llGetPos();
}
private void Save()
{
prim.OSSL.llSetPos(Position);
}
public double x
{
get
{
Load();
return Position.x;
}
set
{
Load();
Position.x += value;
Save();
}
}
public double y
{
get
{
Load();
return Position.y;
}
set
{
Load();
Position.y += value;
Save();
}
}
public double z
{
get
{
Load();
return Position.z;
}
set
{
Load();
Position.z += value;
Save();
}
}
}
[Serializable]
public class OSSLPrim_Rotation
{
private OSSLPrim prim;
private LSL_Types.Quaternion Rotation;
public OSSLPrim_Rotation(OSSLPrim _prim)
{
prim = _prim;
}
private void Load()
{
Rotation = prim.OSSL.llGetRot();
}
private void Save()
{
prim.OSSL.llSetRot(Rotation);
}
public double x
{
get
{
Load();
return Rotation.x;
}
set
{
Load();
Rotation.x += value;
Save();
}
}
public double y
{
get
{
Load();
return Rotation.y;
}
set
{
Load();
Rotation.y += value;
Save();
}
}
public double z
{
get
{
Load();
return Rotation.z;
}
set
{
Load();
Rotation.z += value;
Save();
}
}
public double s
{
get
{
Load();
return Rotation.s;
}
set
{
Load();
Rotation.s += value;
Save();
}
}
}
//public struct OSSLPrim_Rotation //public struct OSSLPrim_Rotation
//{ //{
// public double X; // public double X;