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

Add the parameter plumbing and image generation

viewer-2-initial-appearance
Melanie 2010-10-06 03:32:01 +01:00
parent 17316170a5
commit abfcd168fc
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
View File

@ -100,8 +100,15 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
{
}
public byte[] GenerateWorldView(Vector3 pos, Vector3 rot)
public byte[] GenerateWorldView(Vector3 pos, Vector3 rot, float fov,
int width, int height)
{
if (!m_Enabled)
return new Byte[0];
Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width,
height);
return new Byte[0];
}
}

15
OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
View File

@ -89,6 +89,9 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
float rotX;
float rotY;
float rotZ;
float fov;
int width;
int height;
if (!request.ContainsKey("posX"))
return new Byte[0];
@ -102,6 +105,12 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
return new Byte[0];
if (!request.ContainsKey("rotZ"))
return new Byte[0];
if (!request.ContainsKey("fov"))
return new Byte[0];
if (!request.ContainsKey("width"))
return new Byte[0];
if (!request.ContainsKey("height"))
return new Byte[0];
try
{
@ -111,6 +120,9 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
rotX = Convert.ToSingle(request["rotX"]);
rotY = Convert.ToSingle(request["rotY"]);
rotZ = Convert.ToSingle(request["rotZ"]);
fov = Convert.ToSingle(request["fov"]);
width = Convert.ToInt32(request["width"]);
height = Convert.ToInt32(request["height"]);
}
catch
{
@ -120,7 +132,8 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
Vector3 pos = new Vector3(posX, posY, posZ);
Vector3 rot = new Vector3(rotX, rotY, rotZ);
return m_WorldViewModule.GenerateWorldView(pos, rot);
return m_WorldViewModule.GenerateWorldView(pos, rot, fov, width,
height);
}
}
}