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

change warp3d terrain rendering, so it does cover all area

httptests
UbitUmarov 2018-05-05 00:49:57 +01:00
parent 09ae675d28
commit a91ef313ef
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@ -166,8 +166,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
} }
Vector3 camPos = new Vector3( Vector3 camPos = new Vector3(
m_scene.RegionInfo.RegionSizeX / 2 - 0.5f, (m_scene.RegionInfo.RegionSizeX - 1) * 0.5f,
m_scene.RegionInfo.RegionSizeY / 2 - 0.5f, (m_scene.RegionInfo.RegionSizeY - 1) * 0.5f,
221.7025033688163f); 221.7025033688163f);
// Viewport viewing down onto the region // Viewport viewing down onto the region
Viewport viewport = new Viewport(camPos, -Vector3.UnitZ, 1024f, 0.1f, Viewport viewport = new Viewport(camPos, -Vector3.UnitZ, 1024f, 0.1f,
@ -284,7 +284,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
} }
// Add a terrain to the renderer. // Add a terrain to the renderer.
// Note that we create a 'low resolution' 256x256 vertex terrain rather than trying for // Note that we create a 'low resolution' 257x257 vertex terrain rather than trying for
// full resolution. This saves a lot of memory especially for very large regions. // full resolution. This saves a lot of memory especially for very large regions.
private void CreateTerrain(WarpRenderer renderer, bool textureTerrain) private void CreateTerrain(WarpRenderer renderer, bool textureTerrain)
{ {
@ -296,37 +296,45 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
// 'diff' is the difference in scale between the real region size and the size of terrain we're buiding // 'diff' is the difference in scale between the real region size and the size of terrain we're buiding
float diff = regionsx / 256f; float diff = regionsx / 256f;
int npointsx =(int)(regionsx / diff); int npointsx = (int)(regionsx / diff) + 1;
int npointsy =(int)(regionsy / diff); int npointsy = (int)(regionsy / diff) + 1;
float invsx = 1.0f / regionsx; float invsx = 1.0f / regionsx;
float invsy = 1.0f / (float)m_scene.RegionInfo.RegionSizeY; float invsy = 1.0f / regionsy;
// Create all the vertices for the terrain // Create all the vertices for the terrain
warp_Object obj = new warp_Object(); warp_Object obj = new warp_Object();
for (float y = 0; y < regionsy; y += diff) warp_Vector pos;
float x, y;
for (y = 0; y < regionsy; y += diff)
{ {
for (float x = 0; x < regionsx; x += diff) for (x = 0; x < regionsx; x += diff)
{ {
warp_Vector pos = ConvertVector(x , y , (float)terrain[(int)x, (int)y]); pos = ConvertVector(x , y , (float)terrain[(int)x, (int)y]);
obj.addVertex(new warp_Vertex(pos, x * invsx, 1.0f - y * invsy)); obj.addVertex(new warp_Vertex(pos, x * invsx, 1.0f - y * invsy));
} }
pos = ConvertVector(x , y , (float)terrain[(int)(x - diff), (int)y]);
obj.addVertex(new warp_Vertex(pos, 1.0f, 1.0f - y * invsy));
} }
int lastY = (int)(y - diff);
for (x = 0; x < regionsx; x += diff)
{
pos = ConvertVector(x , y , (float)terrain[(int)x, lastY]);
obj.addVertex(new warp_Vertex(pos, x * invsx, 1.0f - y * invsy));
}
pos = ConvertVector(x , y , (float)terrain[(int)(x - diff), lastY]);
obj.addVertex(new warp_Vertex(pos, 1.0f, 1.0f));
// Now that we have all the vertices, make another pass and // Now that we have all the vertices, make another pass and
// create the list of triangle indices. // create the list of triangle indices.
float invdiff = 1.0f / diff;
int limx = npointsx - 1; int limx = npointsx - 1;
int limy = npointsy - 1; int limy = npointsy - 1;
for (float y = 0; y < regionsy; y += diff) for (int j = 0; j < limy; j++)
{ {
for (float x = 0; x < regionsx; x += diff) for (int i = 0; i < limx; i++)
{ {
float newX = x * invdiff; int v = j * npointsx + i;
float newY = y * invdiff;
if (newX < limx && newY < limy)
{
int v = (int)newY * npointsx + (int)newX;
// Make two triangles for each of the squares in the grid of vertices // Make two triangles for each of the squares in the grid of vertices
obj.addTriangle( obj.addTriangle(
@ -340,7 +348,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
v + 1); v + 1);
} }
} }
}
renderer.Scene.addObject("Terrain", obj); renderer.Scene.addObject("Terrain", obj);