diff options
author | MW | 2007-04-11 09:45:48 +0000 |
---|---|---|
committer | MW | 2007-04-11 09:45:48 +0000 |
commit | ffd7a6b8c22cd21e355f77fea20b145424e3d912 (patch) | |
tree | 94deb515b2b7cb5233fc8fc8d9d531e1a789b7c7 /OpenSim.Terrain.BasicTerrain | |
parent | (no commit message) (diff) | |
download | opensim-SC_OLD-ffd7a6b8c22cd21e355f77fea20b145424e3d912.zip opensim-SC_OLD-ffd7a6b8c22cd21e355f77fea20b145424e3d912.tar.gz opensim-SC_OLD-ffd7a6b8c22cd21e355f77fea20b145424e3d912.tar.bz2 opensim-SC_OLD-ffd7a6b8c22cd21e355f77fea20b145424e3d912.tar.xz |
Changed so that a bin\ScriptEngines\ directory will be searched for scripting Engines.
Added the work in progress JVM scripting engine.
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build | 86 | ||||
-rw-r--r-- | OpenSim.Terrain.BasicTerrain/TerrainEngine.cs | 7 |
2 files changed, 48 insertions, 45 deletions
diff --git a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build index 2c43aa0..d2e6c9f 100644 --- a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build +++ b/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Terrain.BasicTerrain" default="build"> | 2 | <project name="OpenSim.Terrain.BasicTerrain" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Terrain.BasicTerrain" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Terrain.BasicTerrain" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="TerrainEngine.cs" /> | 14 | <include name="TerrainEngine.cs" /> |
15 | <include name="Properties/AssemblyInfo.cs" /> | 15 | <include name="Properties/AssemblyInfo.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="../bin/libTerrain-BSD.dll" /> | 22 | <include name="../bin/libTerrain-BSD.dll" /> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
29 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 29 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
30 | <copy todir="${project::get-base-directory()}/../bin/"> | 30 | <copy todir="${project::get-base-directory()}/../bin/"> |
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
32 | <include name="*.dll"/> | 32 | <include name="*.dll"/> |
33 | <include name="*.exe"/> | 33 | <include name="*.exe"/> |
34 | </fileset> | 34 | </fileset> |
35 | </copy> | 35 | </copy> |
36 | </target> | 36 | </target> |
37 | <target name="clean"> | 37 | <target name="clean"> |
38 | <delete dir="${bin.dir}" failonerror="false" /> | 38 | <delete dir="${bin.dir}" failonerror="false" /> |
39 | <delete dir="${obj.dir}" failonerror="false" /> | 39 | <delete dir="${obj.dir}" failonerror="false" /> |
40 | </target> | 40 | </target> |
41 | <target name="doc" description="Creates documentation."> | 41 | <target name="doc" description="Creates documentation."> |
42 | </target> | 42 | </target> |
43 | </project> | 43 | </project> |
diff --git a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs index bd4b85f..65e267a 100644 --- a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs +++ b/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs | |||
@@ -31,11 +31,14 @@ namespace OpenSim.Terrain | |||
31 | /// <returns>A float[65536] array containing the heightmap</returns> | 31 | /// <returns>A float[65536] array containing the heightmap</returns> |
32 | public float[] getHeights1D() | 32 | public float[] getHeights1D() |
33 | { | 33 | { |
34 | float[] heights = new float[w*h]; | 34 | float[] heights = new float[w * h]; |
35 | int i; | 35 | int i; |
36 | for(i=0;i<w*h;i++) { | 36 | |
37 | for (i = 0; i < w * h; i++) | ||
38 | { | ||
37 | heights[i] = (float)heightmap.map[i / w, i % w]; | 39 | heights[i] = (float)heightmap.map[i / w, i % w]; |
38 | } | 40 | } |
41 | |||
39 | return heights; | 42 | return heights; |
40 | } | 43 | } |
41 | 44 | ||