OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://MyConnection/var/git/opensim

remotes/origin/0.6.7-post-fixes
Teravus Ovares (Dan Olivares) 2009-09-25 16:06:40 -04:00
parent 2bb513329a fb2cabd6b3
commit a7f3d01f8a
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/Physics/Meshing/PrimMesher.cs
View File

@ -345,6 +345,21 @@ namespace PrimMesher
this.v3.Z *= z; this.v3.Z *= z;
} }
public void AddPos(float x, float y, float z)
{
this.v1.X += x;
this.v2.X += x;
this.v3.X += x;
this.v1.Y += y;
this.v2.Y += y;
this.v3.Y += y;
this.v1.Z += z;
this.v2.Z += z;
this.v3.Z += z;
}
public void AddRot(Quat q) public void AddRot(Quat q)
{ {
this.v1 *= q; this.v1 *= q;
@ -2141,6 +2156,18 @@ namespace PrimMesher
vert.Z += z; vert.Z += z;
this.coords[i] = vert; this.coords[i] = vert;
} }
if (this.viewerFaces != null)
{
int numViewerFaces = this.viewerFaces.Count;
for (i = 0; i < numViewerFaces; i++)
{
ViewerFace v = this.viewerFaces[i];
v.AddPos(x, y, z);
this.viewerFaces[i] = v;
}
}
} }
/// <summary> /// <summary>

14
OpenSim/Region/Physics/Meshing/SculptMesh.cs
View File

@ -494,6 +494,18 @@ namespace PrimMesher
vert.Z += z; vert.Z += z;
this.coords[i] = vert; this.coords[i] = vert;
} }
if (this.viewerFaces != null)
{
int numViewerFaces = this.viewerFaces.Count;
for (i = 0; i < numViewerFaces; i++)
{
ViewerFace v = this.viewerFaces[i];
v.AddPos(x, y, z);
this.viewerFaces[i] = v;
}
}
} }
/// <summary> /// <summary>
@ -556,7 +568,7 @@ namespace PrimMesher
if (path == null) if (path == null)
return; return;
String fileName = name + "_" + title + ".raw"; String fileName = name + "_" + title + ".raw";
String completePath = Path.Combine(path, fileName); String completePath = System.IO.Path.Combine(path, fileName);
StreamWriter sw = new StreamWriter(completePath); StreamWriter sw = new StreamWriter(completePath);
for (int i = 0; i < this.faces.Count; i++) for (int i = 0; i < this.faces.Count; i++)