aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 2893255..82cc12c 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
167 private Vector3 cameraPos; 167 private Vector3 cameraPos;
168 private Vector3 cameraDir; 168 private Vector3 cameraDir;
169 private int viewWitdh = 256; 169 private int viewWitdh = 256;
170 private int viewHeigtht = 256; 170 private int viewHeight = 256;
171 private float fov; 171 private float fov;
172 private bool orto; 172 private bool orto;
173 173
@@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
186 186
187 cameraDir = -Vector3.UnitZ; 187 cameraDir = -Vector3.UnitZ;
188 viewWitdh = (int)m_scene.RegionInfo.RegionSizeX; 188 viewWitdh = (int)m_scene.RegionInfo.RegionSizeX;
189 viewHeigtht = (int)m_scene.RegionInfo.RegionSizeY; 189 viewHeight = (int)m_scene.RegionInfo.RegionSizeY;
190 orto = true; 190 orto = true;
191 191
192// fov = warp_Math.rad2deg(2f * (float)Math.Atan2(viewWitdh, 4096f)); 192// fov = warp_Math.rad2deg(2f * (float)Math.Atan2(viewWitdh, 4096f));
@@ -211,7 +211,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
211 cameraPos = camPos; 211 cameraPos = camPos;
212 cameraDir = camDir; 212 cameraDir = camDir;
213 viewWitdh = width; 213 viewWitdh = width;
214 viewHeigtht = height; 214 viewHeight = height;
215 fov = pfov; 215 fov = pfov;
216 orto = false; 216 orto = false;
217 217
@@ -227,8 +227,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
227 227
228 WarpRenderer renderer = new WarpRenderer(); 228 WarpRenderer renderer = new WarpRenderer();
229 229
230 if (!renderer.CreateScene(viewWitdh, viewHeigtht)) 230 if (!renderer.CreateScene(viewWitdh, viewHeight))
231 return new Bitmap(viewWitdh, viewHeigtht); 231 return new Bitmap(viewWitdh, viewHeight);
232 232
233 #region Camera 233 #region Camera
234 234
@@ -236,7 +236,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
236 warp_Vector lookat = warp_Vector.add(pos, ConvertVector(cameraDir)); 236 warp_Vector lookat = warp_Vector.add(pos, ConvertVector(cameraDir));
237 237
238 if (orto) 238 if (orto)
239 renderer.Scene.defaultCamera.setOrthographic(true, viewWitdh, viewHeigtht); 239 renderer.Scene.defaultCamera.setOrthographic(true, viewWitdh, viewHeight);
240 else 240 else
241 renderer.Scene.defaultCamera.setFov(fov); 241 renderer.Scene.defaultCamera.setFov(fov);
242 242