diff options
author | UbitUmarov | 2018-05-07 06:08:54 +0100 |
---|---|---|
committer | UbitUmarov | 2018-05-07 06:08:54 +0100 |
commit | fd426354f17f008b6aff3d8094be7a7ec97a6bc5 (patch) | |
tree | def5647fd1f9c38e9fed156597e795d72ce23201 /OpenSim/Region | |
parent | breaking map (warp3d) (diff) | |
download | opensim-SC-fd426354f17f008b6aff3d8094be7a7ec97a6bc5.zip opensim-SC-fd426354f17f008b6aff3d8094be7a7ec97a6bc5.tar.gz opensim-SC-fd426354f17f008b6aff3d8094be7a7ec97a6bc5.tar.bz2 opensim-SC-fd426354f17f008b6aff3d8094be7a7ec97a6bc5.tar.xz |
breaking map (warp3d)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index b69ca9e..b41a27c 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -220,8 +220,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
220 | renderer.Scene.defaultCamera.lookAt(lookat); | 220 | renderer.Scene.defaultCamera.lookAt(lookat); |
221 | #endregion Camera | 221 | #endregion Camera |
222 | 222 | ||
223 | renderer.Scene.addLight("Light1", new warp_Light(new warp_Vector(1.0f, 0.5f, 1f), 0xffffff, 0, 320, 40)); | 223 | renderer.Scene.setAmbient(warp_Color.getColor(192,191,173)); |
224 | renderer.Scene.addLight("Light2", new warp_Light(new warp_Vector(-1f, -1f, 1f), 0xffffff, 0, 100, 40)); | 224 | renderer.Scene.addLight("Light1", new warp_Light(new warp_Vector(0f, 1f, 8f), 0xffffff, 0, 320, 40)); |
225 | 225 | ||
226 | CreateWater(renderer); | 226 | CreateWater(renderer); |
227 | CreateTerrain(renderer); | 227 | CreateTerrain(renderer); |
@@ -310,10 +310,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
310 | { | 310 | { |
311 | for (x = 0; x < regionsx; x += diff) | 311 | for (x = 0; x < regionsx; x += diff) |
312 | { | 312 | { |
313 | if(x == 48 && y == 36) | ||
314 | { | ||
315 | |||
316 | } | ||
317 | pos = ConvertVector(x , y , (float)terrain[(int)x, (int)y]); | 313 | pos = ConvertVector(x , y , (float)terrain[(int)x, (int)y]); |
318 | obj.addVertex(new warp_Vertex(pos, x * invsx, 1.0f - y * invsy)); | 314 | obj.addVertex(new warp_Vertex(pos, x * invsx, 1.0f - y * invsy)); |
319 | } | 315 | } |