From f218e7e090156622a0acf2603dd644e239240571 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 27 Feb 2008 15:57:00 +0000
Subject: Update svn properties.
---
.../Modules/Terrain/FileLoaders/RAW32.cs | 86 +++++-----
.../Modules/Terrain/FileLoaders/Terragen.cs | 178 ++++++++++-----------
2 files changed, 132 insertions(+), 132 deletions(-)
(limited to 'OpenSim/Region/Environment/Modules')
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs
index d0f5d07..bf716c5 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs
@@ -1,43 +1,43 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using OpenSim.Region.Environment.Modules.Terrain;
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
-{
- public class RAW32 : ITerrainLoader
- {
- #region ITerrainLoader Members
-
- public ITerrainChannel LoadFile(string filename)
- {
- TerrainChannel retval = new TerrainChannel();
-
- FileInfo file = new FileInfo(filename);
- FileStream s = file.Open(FileMode.Open, FileAccess.Read);
- BinaryReader bs = new BinaryReader(s);
- int x, y;
- for (y = 0; y < retval.Height; y++)
- {
- for (x = 0; x < retval.Width; x++)
- {
- retval[x, y] = bs.ReadSingle();
- }
- }
-
- bs.Close();
- s.Close();
-
- return retval;
- }
-
- public void SaveFile(string filename)
- {
- throw new NotImplementedException();
- }
-
- #endregion
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using OpenSim.Region.Environment.Modules.Terrain;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
+{
+ public class RAW32 : ITerrainLoader
+ {
+ #region ITerrainLoader Members
+
+ public ITerrainChannel LoadFile(string filename)
+ {
+ TerrainChannel retval = new TerrainChannel();
+
+ FileInfo file = new FileInfo(filename);
+ FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+ BinaryReader bs = new BinaryReader(s);
+ int x, y;
+ for (y = 0; y < retval.Height; y++)
+ {
+ for (x = 0; x < retval.Width; x++)
+ {
+ retval[x, y] = bs.ReadSingle();
+ }
+ }
+
+ bs.Close();
+ s.Close();
+
+ return retval;
+ }
+
+ public void SaveFile(string filename)
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
+ }
+}
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs
index 2443173..b12d99f 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs
@@ -1,89 +1,89 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using OpenSim.Region.Environment.Modules.Terrain;
-using OpenSim.Region.Environment.Interfaces;
-
-namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
-{
- ///
- /// Terragen File Format Loader
- /// Built from specification at
- /// http://www.planetside.co.uk/terragen/dev/tgterrain.html
- ///
- class Terragen : ITerrainLoader
- {
- private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-
- #region ITerrainLoader Members
-
- public ITerrainChannel LoadFile(string filename)
- {
- TerrainChannel retval = new TerrainChannel();
-
- FileInfo file = new FileInfo(filename);
- FileStream s = file.Open(FileMode.Open, FileAccess.Read);
- BinaryReader bs = new BinaryReader(s);
-
- bool eof = false;
-
- if (ASCIIEncoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN")
- {
- // Terragen file
- while (eof == false)
- {
- int w = 256;
- int h = 256;
- string tmp = ASCIIEncoding.ASCII.GetString(bs.ReadBytes(4));
- switch (tmp)
- {
- case "SIZE":
- int sztmp = bs.ReadInt16() + 1;
- w = sztmp;
- h = sztmp;
- bs.ReadInt16();
- break;
- case "XPTS":
- w = bs.ReadInt16();
- bs.ReadInt16();
- break;
- case "YPTS":
- h = bs.ReadInt16();
- bs.ReadInt16();
- break;
- case "ALTW":
- eof = true;
- Int16 heightScale = bs.ReadInt16();
- Int16 baseHeight = bs.ReadInt16();
- retval = new TerrainChannel(w, h);
- int x, y;
- for (x = 0; x < w; x++)
- {
- for (y = 0; y < h; y++)
- {
- retval[x, y] = (double)baseHeight + (double)bs.ReadInt16() * (double)heightScale / 65536.0;
- }
- }
- break;
- default:
- bs.ReadInt32();
- break;
- }
- }
- }
-
- bs.Close();
- s.Close();
-
- return retval;
- }
-
- public void SaveFile(string filename)
- {
- throw new NotImplementedException();
- }
-
- #endregion
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using OpenSim.Region.Environment.Modules.Terrain;
+using OpenSim.Region.Environment.Interfaces;
+
+namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders
+{
+ ///
+ /// Terragen File Format Loader
+ /// Built from specification at
+ /// http://www.planetside.co.uk/terragen/dev/tgterrain.html
+ ///
+ class Terragen : ITerrainLoader
+ {
+ private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+ #region ITerrainLoader Members
+
+ public ITerrainChannel LoadFile(string filename)
+ {
+ TerrainChannel retval = new TerrainChannel();
+
+ FileInfo file = new FileInfo(filename);
+ FileStream s = file.Open(FileMode.Open, FileAccess.Read);
+ BinaryReader bs = new BinaryReader(s);
+
+ bool eof = false;
+
+ if (ASCIIEncoding.ASCII.GetString(bs.ReadBytes(16)) == "TERRAGENTERRAIN")
+ {
+ // Terragen file
+ while (eof == false)
+ {
+ int w = 256;
+ int h = 256;
+ string tmp = ASCIIEncoding.ASCII.GetString(bs.ReadBytes(4));
+ switch (tmp)
+ {
+ case "SIZE":
+ int sztmp = bs.ReadInt16() + 1;
+ w = sztmp;
+ h = sztmp;
+ bs.ReadInt16();
+ break;
+ case "XPTS":
+ w = bs.ReadInt16();
+ bs.ReadInt16();
+ break;
+ case "YPTS":
+ h = bs.ReadInt16();
+ bs.ReadInt16();
+ break;
+ case "ALTW":
+ eof = true;
+ Int16 heightScale = bs.ReadInt16();
+ Int16 baseHeight = bs.ReadInt16();
+ retval = new TerrainChannel(w, h);
+ int x, y;
+ for (x = 0; x < w; x++)
+ {
+ for (y = 0; y < h; y++)
+ {
+ retval[x, y] = (double)baseHeight + (double)bs.ReadInt16() * (double)heightScale / 65536.0;
+ }
+ }
+ break;
+ default:
+ bs.ReadInt32();
+ break;
+ }
+ }
+ }
+
+ bs.Close();
+ s.Close();
+
+ return retval;
+ }
+
+ public void SaveFile(string filename)
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
+ }
+}
--
cgit v1.1