aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing/Extruder.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Physics/Meshing/Extruder.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Extruder.cs')
-rw-r--r--OpenSim/Region/Physics/Meshing/Extruder.cs13
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Extruder.cs b/OpenSim/Region/Physics/Meshing/Extruder.cs
index a47b6ae..1fc65e3 100644
--- a/OpenSim/Region/Physics/Meshing/Extruder.cs
+++ b/OpenSim/Region/Physics/Meshing/Extruder.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27//#define SPAM 27//#define SPAM
28 28
29using OpenMetaverse;
29using OpenSim.Region.Physics.Manager; 30using OpenSim.Region.Physics.Manager;
30 31
31namespace OpenSim.Region.Physics.Meshing 32namespace OpenSim.Region.Physics.Meshing
@@ -72,9 +73,6 @@ namespace OpenSim.Region.Physics.Meshing
72 { 73 {
73 Mesh result = new Mesh(); 74 Mesh result = new Mesh();
74 75
75 // Quaternion tt = new Quaternion();
76 // Vertex v2 = new Vertex(0, 0, 0);
77
78 Mesh newLayer; 76 Mesh newLayer;
79 Mesh lastLayer = null; 77 Mesh lastLayer = null;
80 78
@@ -163,7 +161,7 @@ namespace OpenSim.Region.Physics.Meshing
163 161
164 // apply twist rotation to the profile layer and position the layer in the prim 162 // apply twist rotation to the profile layer and position the layer in the prim
165 163
166 Quaternion profileRot = new Quaternion(new Vertex(0.0f, 0.0f, 1.0f), twist); 164 Quaternion profileRot = Quaternion.CreateFromAxisAngle(new Vector3(0.0f, 0.0f, 1.0f), twist);
167 foreach (Vertex v in newLayer.vertices) 165 foreach (Vertex v in newLayer.vertices)
168 { 166 {
169 if (v != null) 167 if (v != null)
@@ -259,9 +257,6 @@ namespace OpenSim.Region.Physics.Meshing
259 { 257 {
260 Mesh result = new Mesh(); 258 Mesh result = new Mesh();
261 259
262 // Quaternion tt = new Quaternion();
263 // Vertex v2 = new Vertex(0, 0, 0);
264
265 Mesh newLayer; 260 Mesh newLayer;
266 Mesh lastLayer = null; 261 Mesh lastLayer = null;
267 262
@@ -377,7 +372,7 @@ namespace OpenSim.Region.Physics.Meshing
377 // next apply twist rotation to the profile layer 372 // next apply twist rotation to the profile layer
378 if (twistTotal != 0.0f || twistBot != 0.0f) 373 if (twistTotal != 0.0f || twistBot != 0.0f)
379 { 374 {
380 Quaternion profileRot = new Quaternion(new Vertex(0.0f, 0.0f, 1.0f), twist); 375 Quaternion profileRot = new Quaternion(new Vector3(0.0f, 0.0f, 1.0f), twist);
381 foreach (Vertex v in newLayer.vertices) 376 foreach (Vertex v in newLayer.vertices)
382 { 377 {
383 if (v != null) 378 if (v != null)
@@ -392,7 +387,7 @@ namespace OpenSim.Region.Physics.Meshing
392 387
393 // now orient the rotation of the profile layer relative to it's position on the path 388 // now orient the rotation of the profile layer relative to it's position on the path
394 // adding pushY to the angle used to generate the quat appears to approximate the viewer 389 // adding pushY to the angle used to generate the quat appears to approximate the viewer
395 Quaternion layerRot = new Quaternion(new Vertex(1.0f, 0.0f, 0.0f), (float)angle + pushY * 0.9f); 390 Quaternion layerRot = Quaternion.CreateFromAxisAngle(new Vector3(1.0f, 0.0f, 0.0f), (float)angle + pushY * 0.9f);
396 foreach (Vertex v in newLayer.vertices) 391 foreach (Vertex v in newLayer.vertices)
397 { 392 {
398 if (v != null) 393 if (v != null)