lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

few minor changes on warp3dMap

Browse Source
This commit is contained in:
UbitUmarov
2022-10-02 11:49:06 +01:00
parent 62d56df5b4
commit 3224ab2d80
2 changed files with 79 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
View File

@@ -114,13 +114,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
{
for(int i = 0; i < 4; i++)
{
AssetBase asset = null;
// asset cache indexes are strings
string cacheName ="MAP" + textureIDs[i].ToString();
string cacheName = "MAP" + textureIDs[i].ToString();
// Try to fetch a cached copy of the decoded/resized version of this texture
asset = assetService.GetCached(cacheName);
AssetBase asset = assetService.GetCached(cacheName);
if(asset != null)
{
try
@@ -222,14 +220,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
for(int y = 0; y < ylen; y += bmdata.Stride)
{
byte* ptrc = (byte*)bmdata.Scan0 + y;
for(int x = 0 ; x < bmdata.Width; ++x)
for(int x = 0 ; x < bmdata.Width; ++x, ptrc += 3)
{
cR += *(ptrc++);
cG += *(ptrc++);
cB += *(ptrc++);
cR += ptrc[0];
cG += ptrc[1];
cB += ptrc[2];
}
}
}
detailTexture[t].UnlockBits(bmdata);
detailTexture[t].Dispose();
@@ -264,6 +261,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
detailTexture[i] = Util.ResizeImageSolid(origBitmap, 16, 16);
}
}
//detailTexture[i].Save("terr" + i.ToString()+".png", ImageFormat.Png);
}
}
}
@@ -302,24 +300,24 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
float layer;
float layerDiff;
int l0;
int l1;
uint yglobalpos;
if(usecolors)
{
float a;
float b;
int l1;
unsafe
{
byte* ptrO;
for(int y = 0; y < theight; ++y)
{
pcty = y * invtheightMinus1;
ptrO = (byte*)outputData.Scan0 + y * outputData.Stride;
ptrO = (byte*)outputData.Scan0.ToPointer() + y * outputData.Stride;
ty = (int)(y * yFactor);
yglobalpos = (uint)ty + regionPositionY;
for(int x = 0; x < twidth; ++x)
for(int x = 0; x < twidth; ++x, ptrO +=3)
{
tx = (int)(x * xFactor);
pctx = x * invtwitdthMinus1;
@@ -330,21 +328,23 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
// Select two textures
l0 = (int)layer;
l1 = Math.Min(l0 + 1, 3);
layerDiff = layer - l0;
if (l0 >= 2)
l1 = 3;
else
l1 = l0 + 1;
a = mapColorsRed[l0];
a = mapColorsRed[l0];
b = mapColorsRed[l1];
*(ptrO++) = (byte)(a + layerDiff * (b - a));
ptrO[0] = (byte)(a + layerDiff * (b - a));
a = mapColorsGreen[l0];
b = mapColorsGreen[l1];
*(ptrO++) = (byte)(a + layerDiff * (b - a));
ptrO[1] = (byte)(a + layerDiff * (b - a));
a = mapColorsBlue[l0];
b = mapColorsBlue[l1];
*(ptrO++) = (byte)(a + layerDiff * (b - a));
ptrO[2] = (byte)(a + layerDiff * (b - a));
}
}
}
@@ -371,15 +371,15 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
byte* ptr;
byte* ptrO;
for(int y = 0; y < theight; y++)
for (int y = 0; y < theight; y++)
{
pcty = y * invtheightMinus1;
int ypatch = ((int)(y * yFactor) & 0x0f) * datas[0].Stride;
ptrO = (byte*)outputData.Scan0 + y * outputData.Stride;
ty = (int)(y * yFactor);
int ypatch = (ty & 0x0f) * datas[0].Stride;
yglobalpos = (uint)ty + regionPositionY;
ptrO = (byte*)outputData.Scan0.ToPointer() + y * outputData.Stride;
for(int x = 0; x < twidth; x++)
for (int x = 0; x < twidth; x++, ptrO += 3)
{
tx = (int)(x * xFactor);
pctx = x * invtwitdthMinus1;
@@ -394,26 +394,29 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
int patchOffset = (tx & 0x0f) * 3 + ypatch;
ptr = (byte*)datas[l0].Scan0 + patchOffset;
aB = *(ptr++);
aG = *(ptr++);
aR = *(ptr);
ptr = (byte*)datas[l0].Scan0.ToPointer() + patchOffset;
aB = ptr[0];
aG = ptr[1];
aR = ptr[2];
l1 = Math.Min(l0 + 1, 3);
ptr = (byte*)datas[l1].Scan0 + patchOffset;
bB = *(ptr++);
bG = *(ptr++);
bR = *(ptr);
if(l0 >= 2 )
l0 = 3;
else
l0++;
ptr = (byte*)datas[l0].Scan0.ToPointer() + patchOffset;
bB = ptr[0];
bG = ptr[1];
bR = ptr[2];
// Interpolate between the two selected textures
*(ptrO++) = (byte)(aB + layerDiff * (bB - aB));
*(ptrO++) = (byte)(aG + layerDiff * (bG - aG));
*(ptrO++) = (byte)(aR + layerDiff * (bR - aR));
ptrO[0] = (byte)(aB + layerDiff * (bB - aB));
ptrO[1] = (byte)(aG + layerDiff * (bG - aG));
ptrO[2] = (byte)(aR + layerDiff * (bR - aR));
}
}
for(int i = 0; i < detailTexture.Length; i++)
for (int i = 0; i < detailTexture.Length; i++)
detailTexture[i].UnlockBits(datas[i]);
}
@@ -424,7 +427,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
output.UnlockBits(outputData);
//output.Save("terr.png",ImageFormat.Png);
//output.Save("terr.jpg",ImageFormat.Jpeg);
#endregion Texture Compositing
@@ -437,21 +440,15 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
{
// Use bilinear interpolation between the four corners of start height and
// height range to select the current values at this position
float startHeight = ImageUtils.Bilinear(
startHeights[0], startHeights[2],
startHeights[1], startHeights[3],
pctX, pctY);
float startHeight = ImageUtils.Bilinear(startHeights, pctX, pctY);
if (float.IsNaN(startHeight))
return 0;
startHeight = Utils.Clamp(startHeight, 0f, 255f);
float heightRange = ImageUtils.Bilinear(
heightRanges[0], heightRanges[2],
heightRanges[1], heightRanges[3],
pctX, pctY);
float heightRange = ImageUtils.Bilinear(heightRanges, pctX, pctY);
heightRange = Utils.Clamp(heightRange, 0f, 255f);
if(heightRange == 0f || float.IsNaN(heightRange))
if(heightRange == 0f)
return 0;
// Generate two frequencies of perlin noise based on our global position

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

@@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
private Vector3 cameraPos;
private Vector3 cameraDir;
private int viewWitdh = 256;
private int viewWidth = 256;
private int viewHeight = 256;
private float fov;
private bool orto;
@@ -203,11 +203,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
m_primMesher = RenderingLoader.LoadRenderer(renderers[0]);
}
viewWitdh = (int)m_scene.RegionInfo.RegionSizeX;
viewWidth = (int)m_scene.RegionInfo.RegionSizeX;
viewHeight = (int)m_scene.RegionInfo.RegionSizeY;
cameraPos = new Vector3(
viewWitdh * 0.5f,
viewWidth * 0.5f,
viewHeight * 0.5f,
m_cameraHeight);
@@ -217,7 +217,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
Bitmap tile = GenImage();
// image may be reloaded elsewhere, so no compression format
string filename = "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png";
tile.Save(filename, ImageFormat.Png);
tile.Save(filename,ImageFormat.Png);
m_primMesher = null;
return tile;
}
@@ -232,7 +232,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
cameraPos = camPos;
cameraDir = camDir;
viewWitdh = width;
viewWidth = width;
viewHeight = height;
fov = pfov;
orto = false;
@@ -249,8 +249,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
WarpRenderer renderer = new WarpRenderer();
if (!renderer.CreateScene(viewWitdh, viewHeight))
return new Bitmap(viewWitdh, viewHeight);
if (!renderer.CreateScene(viewWidth, viewHeight))
return new Bitmap(viewWidth, viewHeight);
#region Camera
@@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
warp_Vector lookat = warp_Vector.add(pos, ConvertVector(cameraDir));
if (orto)
renderer.Scene.defaultCamera.setOrthographic(true, viewWitdh, viewHeight);
renderer.Scene.defaultCamera.setOrthographic(true, viewWidth, viewHeight);
else
renderer.Scene.defaultCamera.setFov(fov);
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
m_scene.RegionInfo.WorldLocX, m_scene.RegionInfo.WorldLocY,
m_scene.AssetService, m_imgDecoder, m_textureTerrain, m_textureAverageTerrain,
twidth, twidth))
texture = new warp_Texture(image);
texture = new warp_Texture(image);
warp_Material material = new warp_Material(texture);
renderer.Scene.addMaterial("TerrainMat", material);
@@ -871,56 +871,52 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
height = bitmap.Height;
BitmapData bitmapData = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, bitmap.PixelFormat);
pixelBytes = (bitmap.PixelFormat == PixelFormat.Format24bppRgb) ? 3 : 4;
pixelBytes = (bitmapData.PixelFormat == PixelFormat.Format24bppRgb) ? 3 : 4;
// Sum up the individual channels
unsafe
{
byte* start = (byte*)bitmapData.Scan0;
if (pixelBytes == 4)
{
for (int y = 0; y < height; y++)
{
byte* row = (byte*)bitmapData.Scan0 + (y * bitmapData.Stride);
for (int x = 0; x < width; x++)
byte* end = start + 4 * width;
for(byte* row = start; row < end; row += 4)
{
b += row[x * pixelBytes + 0];
g += row[x * pixelBytes + 1];
r += row[x * pixelBytes + 2];
a += row[x * pixelBytes + 3];
b += row[0];
g += row[1];
r += row[2];
a += row[3];
}
start += bitmapData.Stride;
}
}
else
{
for (int y = 0; y < height; y++)
{
byte* row = (byte*)bitmapData.Scan0 + (y * bitmapData.Stride);
for (int x = 0; x < width; x++)
byte* end = start + 3 * width;
for (byte* row = start; row < end; row += 3)
{
b += row[x * pixelBytes + 0];
g += row[x * pixelBytes + 1];
r += row[x * pixelBytes + 2];
b += row[0];
g += row[1];
r += row[2];
}
start += bitmapData.Stride;
}
}
}
bitmap.UnlockBits(bitmapData);
}
// Get the averages for each channel
const decimal OO_255 = 1m / 255m;
decimal totalPixels = (decimal)(width * height);
decimal rm = ((decimal)r / totalPixels) * OO_255;
decimal gm = ((decimal)g / totalPixels) * OO_255;
decimal bm = ((decimal)b / totalPixels) * OO_255;
decimal am = ((decimal)a / totalPixels) * OO_255;
if (pixelBytes == 3)
am = 1m;
double invtotalPixels = 1.0/(255.0 * width * height);
double rm = r * invtotalPixels;
double gm = g * invtotalPixels;
double bm = b * invtotalPixels;
double am = pixelBytes == 3 ? 1.0 : a * invtotalPixels;
return new Color4((float)rm, (float)gm, (float)bm, (float)am);
}
catch (Exception ex)
{
@@ -953,5 +949,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
{
return Utils.Lerp(Utils.Lerp(v00, v01, xPercent), Utils.Lerp(v10, v11, xPercent), yPercent);
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public static float Bilinear(float[] v, float xPercent, float yPercent)
{
return Utils.Lerp(Utils.Lerp(v[0], v[2], xPercent), Utils.Lerp(v[1], v[3], xPercent), yPercent);
}
}
}