diff options
author | dahlia | 2009-08-03 22:59:47 -0700 |
---|---|---|
committer | dahlia | 2009-08-03 22:59:47 -0700 |
commit | 21e62e87c779da839941a1f7e19c519ced7643c8 (patch) | |
tree | c431ede4b9b7a5262ff218b93ac95865927573a6 /OpenSim/Region/Physics | |
parent | Revert the #3899 patch and it's two follow ups (diff) | |
download | opensim-SC-21e62e87c779da839941a1f7e19c519ced7643c8.zip opensim-SC-21e62e87c779da839941a1f7e19c519ced7643c8.tar.gz opensim-SC-21e62e87c779da839941a1f7e19c519ced7643c8.tar.bz2 opensim-SC-21e62e87c779da839941a1f7e19c519ced7643c8.tar.xz |
starting to refactor path generation out of prim extrusion
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/PrimMesher.cs | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs index 8c6bd2b..0d19c01 100644 --- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs +++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs | |||
@@ -1116,7 +1116,7 @@ namespace PrimMesher | |||
1116 | if (path == null) | 1116 | if (path == null) |
1117 | return; | 1117 | return; |
1118 | String fileName = name + "_" + title + ".raw"; | 1118 | String fileName = name + "_" + title + ".raw"; |
1119 | String completePath = Path.Combine(path, fileName); | 1119 | String completePath = System.IO.Path.Combine(path, fileName); |
1120 | StreamWriter sw = new StreamWriter(completePath); | 1120 | StreamWriter sw = new StreamWriter(completePath); |
1121 | 1121 | ||
1122 | for (int i = 0; i < this.faces.Count; i++) | 1122 | for (int i = 0; i < this.faces.Count; i++) |
@@ -1132,6 +1132,22 @@ namespace PrimMesher | |||
1132 | } | 1132 | } |
1133 | } | 1133 | } |
1134 | 1134 | ||
1135 | public struct PathNode | ||
1136 | { | ||
1137 | public float position; | ||
1138 | public Quat rotation; | ||
1139 | public float xScale; | ||
1140 | public float yScale; | ||
1141 | |||
1142 | public PathNode(float position, Quat rotation, float xScale, float yScale) | ||
1143 | { | ||
1144 | this.position = position; | ||
1145 | this.rotation = rotation; | ||
1146 | this.xScale = xScale; | ||
1147 | this.yScale = yScale; | ||
1148 | } | ||
1149 | } | ||
1150 | |||
1135 | public class PrimMesh | 1151 | public class PrimMesh |
1136 | { | 1152 | { |
1137 | public string errorMessage = ""; | 1153 | public string errorMessage = ""; |
@@ -2209,7 +2225,7 @@ namespace PrimMesher | |||
2209 | if (path == null) | 2225 | if (path == null) |
2210 | return; | 2226 | return; |
2211 | String fileName = name + "_" + title + ".raw"; | 2227 | String fileName = name + "_" + title + ".raw"; |
2212 | String completePath = Path.Combine(path, fileName); | 2228 | String completePath = System.IO.Path.Combine(path, fileName); |
2213 | StreamWriter sw = new StreamWriter(completePath); | 2229 | StreamWriter sw = new StreamWriter(completePath); |
2214 | 2230 | ||
2215 | for (int i = 0; i < this.faces.Count; i++) | 2231 | for (int i = 0; i < this.faces.Count; i++) |