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

Merge branch 'master' of git://opensimulator.org/git/opensim

viewer-2-initial-appearance
Jonathan Freedman 2010-10-05 19:45:37 -04:00
parent 8f1acb890a 5d61323192
commit 593fc5c87a
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
View File

@ -545,5 +545,10 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
return returnpt;
}
public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height)
{
return null;
}
}
}

16
OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
View File

@ -111,6 +111,19 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
#region IMapImageGenerator Members
public Bitmap CreateMapTile()
{
Vector3 camPos = new Vector3(127.5f, 127.5f, 221.7025033688163f);
Viewport viewport = new Viewport(camPos, -Vector3.UnitZ, 1024f, 0.1f, (int)Constants.RegionSize, (int)Constants.RegionSize, (float)Constants.RegionSize, (float)Constants.RegionSize);
return CreateMapTile(viewport);
}
public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height)
{
Viewport viewport = new Viewport(camPos, camDir, fov, (float)Constants.RegionSize, 0.1f, width, height);
return CreateMapTile(viewport);
}
public Bitmap CreateMapTile(Viewport viewport)
{
bool drawPrimVolume = true;
bool textureTerrain = true;
@ -128,9 +141,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
m_colors.Clear();
Vector3 camPos = new Vector3(127.5f, 127.5f, 221.7025033688163f);
Viewport viewport = new Viewport(camPos, -Vector3.UnitZ, 1024f, 0.1f, (int)Constants.RegionSize, (int)Constants.RegionSize, (float)Constants.RegionSize, (float)Constants.RegionSize);
int width = viewport.Width;
int height = viewport.Height;

2
OpenSim/Region/Framework/Interfaces/ITerrain.cs
View File

@ -26,6 +26,7 @@
*/
using OpenSim.Framework;
using OpenMetaverse;
namespace OpenSim.Region.Framework.Interfaces
{
@ -74,6 +75,7 @@ namespace OpenSim.Region.Framework.Interfaces
public interface IMapImageGenerator
{
System.Drawing.Bitmap CreateMapTile();
System.Drawing.Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height);
byte[] WriteJpeg2000Image();
}
}