diff options
author | Teravus Ovares | 2008-04-07 22:11:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-07 22:11:41 +0000 |
commit | e409892a9c3beec3400b2c25e7f0c6053bc5955a (patch) | |
tree | 54a19b27d7b873c169d7c3de47672602db641689 /OpenSim | |
parent | * Objects which have their name or description changed while within inventory... (diff) | |
download | opensim-SC-e409892a9c3beec3400b2c25e7f0c6053bc5955a.zip opensim-SC-e409892a9c3beec3400b2c25e7f0c6053bc5955a.tar.gz opensim-SC-e409892a9c3beec3400b2c25e7f0c6053bc5955a.tar.bz2 opensim-SC-e409892a9c3beec3400b2c25e7f0c6053bc5955a.tar.xz |
* Updated ODE.NET bindings to the ODE library.
* Fixed some Tapers with Cylinders in the Meshmerizer
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index ce46dae..6fb4606 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
57 | // Setting baseDir to a path will enable the dumping of raw files | 57 | // Setting baseDir to a path will enable the dumping of raw files |
58 | // raw files can be imported by blender so a visual inspection of the results can be done | 58 | // raw files can be imported by blender so a visual inspection of the results can be done |
59 | // const string baseDir = "rawFiles"; | 59 | // const string baseDir = "rawFiles"; |
60 | private const string baseDir = null; //"rawFiles"; | 60 | private const string baseDir = null; // "rawFiles"; |
61 | 61 | ||
62 | // TODO: unused | 62 | // TODO: unused |
63 | // private static void IntersectionParameterPD(PhysicsVector p1, PhysicsVector r1, PhysicsVector p2, | 63 | // private static void IntersectionParameterPD(PhysicsVector p1, PhysicsVector r1, PhysicsVector p2, |
@@ -734,17 +734,21 @@ namespace OpenSim.Region.Physics.Meshing | |||
734 | Extruder extr = new Extruder(); | 734 | Extruder extr = new Extruder(); |
735 | 735 | ||
736 | extr.size = size; | 736 | extr.size = size; |
737 | |||
738 | //System.Console.WriteLine("taperFactorX: " + taperX.ToString()); | ||
739 | //System.Console.WriteLine("taperFactorY: " + taperY.ToString()); | ||
740 | |||
737 | if (taperX != 100) | 741 | if (taperX != 100) |
738 | { | 742 | { |
739 | if (taperX > 100) | 743 | if (taperX > 100) |
740 | { | 744 | { |
741 | extr.taperTopFactorX = 1.0f - ((float)taperX / 200); | 745 | extr.taperTopFactorX = 1.0f - ((float)(taperX - 100) / 100); |
742 | //m_log.Warn("taperTopFactorX: " + extr.taperTopFactorX.ToString()); | 746 | //System.Console.WriteLine("taperTopFactorX: " + extr.taperTopFactorX.ToString()); |
743 | } | 747 | } |
744 | else | 748 | else |
745 | { | 749 | { |
746 | extr.taperBotFactorX = 1.0f - ((100 - (float)taperX) / 100); | 750 | extr.taperBotFactorX = 1.0f - ((100 - (float)taperX) / 100); |
747 | //m_log.Warn("taperBotFactorX: " + extr.taperBotFactorX.ToString()); | 751 | //System.Console.WriteLine("taperBotFactorX: " + extr.taperBotFactorX.ToString()); |
748 | } | 752 | } |
749 | 753 | ||
750 | } | 754 | } |
@@ -753,13 +757,13 @@ namespace OpenSim.Region.Physics.Meshing | |||
753 | { | 757 | { |
754 | if (taperY > 100) | 758 | if (taperY > 100) |
755 | { | 759 | { |
756 | extr.taperTopFactorY = 1.0f - ((float)taperY / 200); | 760 | extr.taperTopFactorY = 1.0f - ((float)(taperY - 100) / 200); |
757 | //m_log.Warn("taperTopFactorY: " + extr.taperTopFactorY.ToString()); | 761 | // System.Console.WriteLine("taperTopFactorY: " + extr.taperTopFactorY.ToString()); |
758 | } | 762 | } |
759 | else | 763 | else |
760 | { | 764 | { |
761 | extr.taperBotFactorY = 1.0f - ((100 - (float)taperY) / 100); | 765 | extr.taperBotFactorY = 1.0f - ((100 - (float)taperY) / 100); |
762 | //m_log.Warn("taperBotFactorY: " + extr.taperBotFactorY.ToString()); | 766 | //System.Console.WriteLine("taperBotFactorY: " + extr.taperBotFactorY.ToString()); |
763 | } | 767 | } |
764 | } | 768 | } |
765 | 769 | ||
@@ -925,12 +929,12 @@ namespace OpenSim.Region.Physics.Meshing | |||
925 | if (taperX > 100) | 929 | if (taperX > 100) |
926 | { | 930 | { |
927 | extr.taperTopFactorX = 1.0f - ((float)taperX / 200); | 931 | extr.taperTopFactorX = 1.0f - ((float)taperX / 200); |
928 | //m_log.Warn("taperTopFactorX: " + extr.taperTopFactorX.ToString()); | 932 | //System.Console.WriteLine("taperTopFactorX: " + extr.taperTopFactorX.ToString()); |
929 | } | 933 | } |
930 | else | 934 | else |
931 | { | 935 | { |
932 | extr.taperBotFactorX = 1.0f - ((100 - (float)taperX) / 100); | 936 | extr.taperBotFactorX = 1.0f - ((100 - (float)taperX) / 100); |
933 | //m_log.Warn("taperBotFactorX: " + extr.taperBotFactorX.ToString()); | 937 | //System.Console.WriteLine("taperBotFactorX: " + extr.taperBotFactorX.ToString()); |
934 | } | 938 | } |
935 | } | 939 | } |
936 | 940 | ||
@@ -939,12 +943,12 @@ namespace OpenSim.Region.Physics.Meshing | |||
939 | if (taperY > 100) | 943 | if (taperY > 100) |
940 | { | 944 | { |
941 | extr.taperTopFactorY = 1.0f - ((float)taperY / 200); | 945 | extr.taperTopFactorY = 1.0f - ((float)taperY / 200); |
942 | //m_log.Warn("taperTopFactorY: " + extr.taperTopFactorY.ToString()); | 946 | //System.Console.WriteLine("taperTopFactorY: " + extr.taperTopFactorY.ToString()); |
943 | } | 947 | } |
944 | else | 948 | else |
945 | { | 949 | { |
946 | extr.taperBotFactorY = 1.0f - ((100 - (float)taperY) / 100); | 950 | extr.taperBotFactorY = 1.0f - ((100 - (float)taperY) / 100); |
947 | //m_log.Warn("taperBotFactorY: " + extr.taperBotFactorY.ToString()); | 951 | //System.Console.WriteLine("taperBotFactorY: " + extr.taperBotFactorY.ToString()); |
948 | } | 952 | } |
949 | } | 953 | } |
950 | 954 | ||