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

Added AddPreCompiledScript method to ScriptManager. 

Done some work on lbsa71's simpleApp(hope he doesn't mind):
now have the avatar showing up and the terrain and his pulsating box (well except its not a box, as there seems to be something wrong with our PrimitiveBaseShape..DefaultBox() settings). 
Also noticed a few other problems that I had to work around, so these need looking into.
afrisby
MW 2007-07-14 13:18:02 +00:00
parent d879c6e8fc
commit a04602d9c1
9 changed files with 126 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
View File

@ -100,6 +100,8 @@ namespace OpenSim.Framework.Types
primShape.PathTaperY = 0;
primShape.PathTwist = 0;
primShape.PathTwistBegin = 0;
LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
primShape.TextureEntry = ntex.ToBytes();
return primShape;
}

1
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@ -146,6 +146,7 @@ namespace OpenSim.Region.Environment.Scenes
avatar = this.Avatars[fromAgentID];
fromPos = avatar.Pos;
fromName = avatar.firstname + " " + avatar.lastname;
avatar = null;
}
m_clientManager.ForEachClient(delegate(IClientAPI client)

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -487,7 +487,7 @@ namespace OpenSim.Region.Environment.Scenes
}
protected void CreateAndAddScenePresence(IClientAPI client)
protected ScenePresence CreateAndAddScenePresence(IClientAPI client)
{
ScenePresence newAvatar = null;
@ -524,6 +524,8 @@ namespace OpenSim.Region.Environment.Scenes
this.Avatars.Add(client.AgentId, newAvatar);
}
}
newAvatar.OnSignificantClientMovement += parcelManager.handleSignificantClientMovement;
return newAvatar;
}

5
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -40,9 +40,6 @@ namespace OpenSim.Region.Environment.Scenes
{
public partial class ScenePresence : Entity
{
public static bool PhysicsEngineFlying = false;
public static AvatarAnimations Animations;
public static byte[] DefaultTexture;
@ -151,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes
// ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
// ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
//ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
OnSignificantClientMovement += new SignificantClientMovement(m_world.parcelManager.handleSignificantClientMovement);
Dir_Vectors[0] = new Vector3(1, 0, 0); //FOWARD
Dir_Vectors[1] = new Vector3(-1, 0, 0); //BACK
Dir_Vectors[2] = new Vector3(0, 1, 0); //LEFT

8
OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
View File

@ -89,6 +89,14 @@ namespace OpenSim.Region.Scripting
break;
}
}
public void AddPreCompiledScript(IScript script)
{
MainLog.Instance.Verbose("Loading script " + script.getName());
ScriptInfo scriptInfo = new ScriptInfo(scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
script.Initialise(scriptInfo);
scripts.Add(script);
}
}
interface IScriptCompiler

48
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@ -7,12 +7,14 @@ using OpenSim.Framework.Servers;
using OpenSim.Framework.Types;
using OpenSim.Region.Caches;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Terrain;
using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
namespace SimpleApp
{
public class MyWorld : Scene
{
private bool firstlogin = true;
private List<ScenePresence> m_avatars;
public MyWorld(ClientManager clientManager, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
@ -21,6 +23,7 @@ namespace SimpleApp
m_avatars = new List<Avatar>();
}
/*
public override void SendLayerData(IClientAPI remoteClient)
{
float[] map = new float[65536];
@ -34,6 +37,22 @@ namespace SimpleApp
}
remoteClient.SendLayerData(map);
}*/
public override void LoadWorldMap()
{
float[] map = new float[65536];
for (int i = 0; i < 65536; i++)
{
int x = i % 256;
int y = i / 256;
map[i] = 25f;
}
this.Terrain.setHeights1D(map);
this.CreateTerrainTexture();
}
#region IWorld Members
@ -41,6 +60,8 @@ namespace SimpleApp
override public void AddNewClient(IClientAPI client, bool child)
{
NewLoggin();
LLVector3 pos = new LLVector3(128, 128, 128);
client.OnRegionHandShakeReply += SendLayerData;
@ -66,8 +87,33 @@ namespace SimpleApp
client.SendRegionHandshake(m_regInfo);
CreateAndAddScenePresence(client);
ScenePresence avatar =CreateAndAddScenePresence(client);
avatar.Pos = new LLVector3(128, 128, 26);
}
public void NewLoggin()
{
if (firstlogin)
{
this.StartTimer();
scriptManager.AddPreCompiledScript(new PulseScript());
PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
LLVector3 pos1 = new LLVector3(129, 129, 27);
AddNewPrim(LLUUID.Random(), pos1, shape);
firstlogin = false;
}
}
public override void Update()
{
foreach (LLUUID UUID in Entities.Keys)
{
Entities[UUID].update();
}
eventManager.TriggerOnFrame();
}
#endregion

14
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -21,6 +21,7 @@ namespace SimpleApp
private LogBase m_log;
AuthenticateSessionsBase m_circuitManager;
uint m_localId;
public MyWorld world;
private void Run()
{
@ -57,8 +58,9 @@ namespace SimpleApp
RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "127.0.0.1" );
MyWorld world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
world = new MyWorld(packetServer.ClientManager, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
world.PhysScene = physManager.GetPhysicsScene("basicphysics"); //PhysicsScene.Null;
world.LoadWorldMap();
udpServer.LocalWorld = world;
httpServer.Start();
@ -66,13 +68,16 @@ namespace SimpleApp
m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
m_log.ReadLine();
/*
PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
shape.Scale = new LLVector3(10, 10, 10);
shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
LLVector3 pos = new LLVector3(128,128,72);
LLVector3 pos = new LLVector3(129,130,25);
world.AddNewPrim( LLUUID.Zero, pos, shape );
world.AddNewPrim( LLUUID.Random(), pos, shape );
*/
}
@ -129,6 +134,7 @@ namespace SimpleApp
Program app = new Program();
app.Run();
}
}
}

52
OpenSim/Region/Examples/SimpleApp/PulseScript.cs Normal file
View File

@ -0,0 +1,52 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Region.Scripting;
using OpenSim.Region.Environment.Scenes;
namespace SimpleApp
{
public class PulseScript :IScript
{
ScriptInfo script;
private libsecondlife.LLVector3 pulse = new libsecondlife.LLVector3(0.1f, 0.1f, 0.1f);
public string getName()
{
return "pulseScript 0.1";
}
public void Initialise(ScriptInfo scriptInfo)
{
script = scriptInfo;
script.events.OnFrame += new EventManager.OnFrameDelegate(events_OnFrame);
script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);
}
void events_OnNewPresence(ScenePresence presence)
{
script.logger.Verbose("Hello " + presence.firstname.ToString() + "!");
}
void events_OnFrame()
{
foreach(EntityBase ent in this.script.world.Entities.Values)
{
if (ent is SceneObject)
{
SceneObject prim = (SceneObject)ent;
if ((prim.rootPrimitive.Scale.X > 1) && (prim.rootPrimitive.Scale.Y > 1) && (prim.rootPrimitive.Scale.Z > 1))
{
this.pulse = new libsecondlife.LLVector3(-0.1f, -0.1f, -0.1f);
}
else if ((prim.rootPrimitive.Scale.X < 0.2f) && (prim.rootPrimitive.Scale.Y < 0.2f) && (prim.rootPrimitive.Scale.Z < 0.2f))
{
pulse = new libsecondlife.LLVector3(0.1f, 0.1f, 0.1f);
}
prim.rootPrimitive.ResizeGoup( prim.rootPrimitive.Scale + pulse);
}
}
}
}
}

1
prebuild.xml
View File

@ -726,6 +726,7 @@
<Reference name="OpenSim.Region.Caches"/>
<Reference name="OpenSim.Region.ClientStack"/>
<Reference name="OpenSim.Region.Environment"/>
<Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
<Files>