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

map...

httptests
UbitUmarov 2018-05-18 05:31:45 +01:00
parent c7f3f3586d
commit 631308a1d1
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
private IRendering m_primMesher; private IRendering m_primMesher;
internal IJ2KDecoder m_imgDecoder; internal IJ2KDecoder m_imgDecoder;
// caches per rendering // caches per rendering
private Dictionary<string, warp_Texture> m_warpTextures = new Dictionary<string, warp_Texture>(); private Dictionary<string, warp_Texture> m_warpTextures = new Dictionary<string, warp_Texture>();
private Dictionary<UUID, int> m_colors = new Dictionary<UUID, int>(); private Dictionary<UUID, int> m_colors = new Dictionary<UUID, int>();
@ -239,7 +239,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
renderer.Scene.defaultCamera.setOrthographic(true, viewWitdh, viewHeigth); renderer.Scene.defaultCamera.setOrthographic(true, viewWitdh, viewHeigth);
else else
renderer.Scene.defaultCamera.setFov(fov); renderer.Scene.defaultCamera.setFov(fov);
renderer.Scene.defaultCamera.setPos(pos); renderer.Scene.defaultCamera.setPos(pos);
renderer.Scene.defaultCamera.lookAt(lookat); renderer.Scene.defaultCamera.lookAt(lookat);
#endregion Camera #endregion Camera
@ -442,7 +442,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
} }
); );
} }
private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim) private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim)
{ {
if ((PCode)prim.Shape.PCode != PCode.Prim) if ((PCode)prim.Shape.PCode != PCode.Prim)
@ -456,17 +456,15 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
if(screenFactor < 0) if(screenFactor < 0)
return; return;
int p2 = (int)( -(float)Math.Log(screenFactor) * 1.442695f * 0.5 - 1); int p2 = (int)(-(float)Math.Log(screenFactor) * 1.442695f * 0.5 - 1);
if(p2 < 0) if(p2 < 0)
p2 = 0; p2 = 0;
else if(p2>3) else if(p2 > 3)
p2 = 3; p2 = 3;
DetailLevel lod = (DetailLevel)(3 - p2); DetailLevel lod = (DetailLevel)(3 - p2);
// DetailLevel lod = DetailLevel.High;
FacetedMesh renderMesh = null; FacetedMesh renderMesh = null;
Primitive omvPrim = prim.Shape.ToOmvPrimitive(prim.OffsetPosition, prim.RotationOffset); Primitive omvPrim = prim.Shape.ToOmvPrimitive(prim.OffsetPosition, prim.RotationOffset);
@ -557,7 +555,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
warp_Vertex vert = new warp_Vertex(pos, v.TexCoord.X, v.TexCoord.Y); warp_Vertex vert = new warp_Vertex(pos, v.TexCoord.X, v.TexCoord.Y);
faceObj.addVertex(vert); faceObj.addVertex(vert);
} }
} }
else else
{ {
float tu; float tu;
@ -601,10 +599,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
tv += offsetv; tv += offsetv;
vert = new warp_Vertex(pos, tu, tv); vert = new warp_Vertex(pos, tu, tv);
} }
faceObj.addVertex(vert); faceObj.addVertex(vert);
} }
} }
for (int j = 0; j < face.Indices.Count; j += 3) for (int j = 0; j < face.Indices.Count; j += 3)
{ {
@ -719,7 +717,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
} }
else else
color = warp_Color.multiply(color, warp_Color.Grey); color = warp_Color.multiply(color, warp_Color.Grey);
mat.setColor(color); mat.setColor(color);
renderer.Scene.addMaterial(materialName, mat); renderer.Scene.addMaterial(materialName, mat);
@ -738,7 +736,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
byte[] asset = m_scene.AssetService.GetData(id.ToString()); byte[] asset = m_scene.AssetService.GetData(id.ToString());
if (asset != null) if (asset != null)
{ {
IJ2KDecoder imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>(); IJ2KDecoder imgDecoder = m_scene.RequestModuleInterface<IJ2KDecoder>();
try try
{ {

BIN
bin/Warp3D.dll
View File

Binary file not shown.