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

* Updated ODE.NET bindings to the ODE library. 

* Fixed some Tapers with Cylinders in the Meshmerizer
0.6.0-stable
Teravus Ovares 2008-04-07 22:11:41 +00:00
parent da9eeffc9e
commit e409892a9c
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -57,7 +57,7 @@ namespace OpenSim.Region.Physics.Meshing
// Setting baseDir to a path will enable the dumping of raw files // Setting baseDir to a path will enable the dumping of raw files
// raw files can be imported by blender so a visual inspection of the results can be done // raw files can be imported by blender so a visual inspection of the results can be done
// const string baseDir = "rawFiles"; // const string baseDir = "rawFiles";
private const string baseDir = null; //"rawFiles"; private const string baseDir = null; // "rawFiles";
// TODO: unused // TODO: unused
// private static void IntersectionParameterPD(PhysicsVector p1, PhysicsVector r1, PhysicsVector p2, // private static void IntersectionParameterPD(PhysicsVector p1, PhysicsVector r1, PhysicsVector p2,
@ -734,17 +734,21 @@ namespace OpenSim.Region.Physics.Meshing
Extruder extr = new Extruder(); Extruder extr = new Extruder();
extr.size = size; extr.size = size;
//System.Console.WriteLine("taperFactorX: " + taperX.ToString());
//System.Console.WriteLine("taperFactorY: " + taperY.ToString());
if (taperX != 100) if (taperX != 100)
{ {
if (taperX > 100) if (taperX > 100)
{ {
extr.taperTopFactorX = 1.0f - ((float)taperX / 200); extr.taperTopFactorX = 1.0f - ((float)(taperX - 100) / 100);
//m_log.Warn("taperTopFactorX: " + extr.taperTopFactorX.ToString()); //System.Console.WriteLine("taperTopFactorX: " + extr.taperTopFactorX.ToString());
} }
else else
{ {
extr.taperBotFactorX = 1.0f - ((100 - (float)taperX) / 100); extr.taperBotFactorX = 1.0f - ((100 - (float)taperX) / 100);
//m_log.Warn("taperBotFactorX: " + extr.taperBotFactorX.ToString()); //System.Console.WriteLine("taperBotFactorX: " + extr.taperBotFactorX.ToString());
} }
} }
@ -753,13 +757,13 @@ namespace OpenSim.Region.Physics.Meshing
{ {
if (taperY > 100) if (taperY > 100)
{ {
extr.taperTopFactorY = 1.0f - ((float)taperY / 200); extr.taperTopFactorY = 1.0f - ((float)(taperY - 100) / 200);
//m_log.Warn("taperTopFactorY: " + extr.taperTopFactorY.ToString()); // System.Console.WriteLine("taperTopFactorY: " + extr.taperTopFactorY.ToString());
} }
else else
{ {
extr.taperBotFactorY = 1.0f - ((100 - (float)taperY) / 100); extr.taperBotFactorY = 1.0f - ((100 - (float)taperY) / 100);
//m_log.Warn("taperBotFactorY: " + extr.taperBotFactorY.ToString()); //System.Console.WriteLine("taperBotFactorY: " + extr.taperBotFactorY.ToString());
} }
} }
@ -925,12 +929,12 @@ namespace OpenSim.Region.Physics.Meshing
if (taperX > 100) if (taperX > 100)
{ {
extr.taperTopFactorX = 1.0f - ((float)taperX / 200); extr.taperTopFactorX = 1.0f - ((float)taperX / 200);
//m_log.Warn("taperTopFactorX: " + extr.taperTopFactorX.ToString()); //System.Console.WriteLine("taperTopFactorX: " + extr.taperTopFactorX.ToString());
} }
else else
{ {
extr.taperBotFactorX = 1.0f - ((100 - (float)taperX) / 100); extr.taperBotFactorX = 1.0f - ((100 - (float)taperX) / 100);
//m_log.Warn("taperBotFactorX: " + extr.taperBotFactorX.ToString()); //System.Console.WriteLine("taperBotFactorX: " + extr.taperBotFactorX.ToString());
} }
} }
@ -939,12 +943,12 @@ namespace OpenSim.Region.Physics.Meshing
if (taperY > 100) if (taperY > 100)
{ {
extr.taperTopFactorY = 1.0f - ((float)taperY / 200); extr.taperTopFactorY = 1.0f - ((float)taperY / 200);
//m_log.Warn("taperTopFactorY: " + extr.taperTopFactorY.ToString()); //System.Console.WriteLine("taperTopFactorY: " + extr.taperTopFactorY.ToString());
} }
else else
{ {
extr.taperBotFactorY = 1.0f - ((100 - (float)taperY) / 100); extr.taperBotFactorY = 1.0f - ((100 - (float)taperY) / 100);
//m_log.Warn("taperBotFactorY: " + extr.taperBotFactorY.ToString()); //System.Console.WriteLine("taperBotFactorY: " + extr.taperBotFactorY.ToString());
} }
} }

BIN
bin/Ode.NET.dll
View File

Binary file not shown.