ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add and plumb the usetex URL parameter to worldview. Required but not yet

Browse Source 
functional
This commit is contained in:
Melanie
2010-10-06 05:44:19 +01:00
parent 9a1c8db443
commit d45276b3f6
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -96,6 +96,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
float fov;
int width;
int height;
bool usetex;
if (!request.ContainsKey("posX"))
return new Byte[0];
@@ -115,6 +116,8 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
return new Byte[0];
if (!request.ContainsKey("height"))
return new Byte[0];
if (!request.ContainsKey("usetex"))
return new Byte[0];
try
{
@@ -127,6 +130,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
fov = Convert.ToSingle(request["fov"]);
width = Convert.ToInt32(request["width"]);
height = Convert.ToInt32(request["height"]);
usetex = Convert.ToBoolean(request["usetex"]);
}
catch
{
@@ -137,7 +141,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
Vector3 rot = new Vector3(rotX, rotY, rotZ);
return m_WorldViewModule.GenerateWorldView(pos, rot, fov, width,
height);
height, usetex);
}
}
}