aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-18 12:38:22 -0700
committerMcCabe Maxsted2010-04-18 12:38:22 -0700
commit11295915dbe05a6237ca84b5a07c82459dd4f9e0 (patch)
treed815f912671c76f36d86e63b87b20d2f443b5284 /linden
parentMerge commit 'armin/beta2-bugfixes' into 1.3-beta2bugfixes (diff)
downloadmeta-impy-11295915dbe05a6237ca84b5a07c82459dd4f9e0.zip
meta-impy-11295915dbe05a6237ca84b5a07c82459dd4f9e0.tar.gz
meta-impy-11295915dbe05a6237ca84b5a07c82459dd4f9e0.tar.bz2
meta-impy-11295915dbe05a6237ca84b5a07c82459dd4f9e0.tar.xz
Use opensim limits for hollow (99) and hole (0.01). Need to add option to enable in the ui
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/llmath/llvolume.cpp6
-rw-r--r--linden/indra/llmath/xform.h2
-rw-r--r--linden/indra/llprimitive/llprimitive.cpp1
-rw-r--r--linden/indra/llprimitive/llprimitive.h1
4 files changed, 4 insertions, 6 deletions
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index a1cfe1d..4c94a52 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -56,7 +56,7 @@ const F32 CUT_MAX = 1.f;
56const F32 MIN_CUT_DELTA = 0.02f; 56const F32 MIN_CUT_DELTA = 0.02f;
57 57
58const F32 HOLLOW_MIN = 0.f; 58const F32 HOLLOW_MIN = 0.f;
59const F32 HOLLOW_MAX = 0.95f; 59const F32 HOLLOW_MAX = 0.99f;
60const F32 HOLLOW_MAX_SQUARE = 0.7f; 60const F32 HOLLOW_MAX_SQUARE = 0.7f;
61 61
62const F32 TWIST_MIN = -1.f; 62const F32 TWIST_MIN = -1.f;
@@ -65,10 +65,10 @@ const F32 TWIST_MAX = 1.f;
65const F32 RATIO_MIN = 0.f; 65const F32 RATIO_MIN = 0.f;
66const F32 RATIO_MAX = 2.f; // Tom Y: Inverted sense here: 0 = top taper, 2 = bottom taper 66const F32 RATIO_MAX = 2.f; // Tom Y: Inverted sense here: 0 = top taper, 2 = bottom taper
67 67
68const F32 HOLE_X_MIN= 0.05f; 68const F32 HOLE_X_MIN= 0.01f;
69const F32 HOLE_X_MAX= 1.0f; 69const F32 HOLE_X_MAX= 1.0f;
70 70
71const F32 HOLE_Y_MIN= 0.05f; 71const F32 HOLE_Y_MIN= 0.01f;
72const F32 HOLE_Y_MAX= 0.5f; 72const F32 HOLE_Y_MAX= 0.5f;
73 73
74const F32 SHEAR_MIN = -0.5f; 74const F32 SHEAR_MIN = -0.5f;
diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h
index 7055a87..9b4d2fc 100644
--- a/linden/indra/llmath/xform.h
+++ b/linden/indra/llmath/xform.h
@@ -38,7 +38,7 @@
38 38
39const F32 MAX_OBJECT_Z = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f 39const F32 MAX_OBJECT_Z = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f
40const F32 MIN_OBJECT_Z = -256.f; 40const F32 MIN_OBJECT_Z = -256.f;
41//const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; set in llmanipscale.cpp now 41//const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; set via the Hippo Grid manager now
42const F32 MIN_PRIM_SCALE = 0.01f; 42const F32 MIN_PRIM_SCALE = 0.01f;
43const F32 MAX_PRIM_SCALE = 65536.f; // something very high but not near FLT_MAX 43const F32 MAX_PRIM_SCALE = 65536.f; // something very high but not near FLT_MAX
44 44
diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp
index f652390..3ad4ad8 100644
--- a/linden/indra/llprimitive/llprimitive.cpp
+++ b/linden/indra/llprimitive/llprimitive.cpp
@@ -65,7 +65,6 @@ const F32 OBJECT_TWIST_LINEAR_MIN = -180.f;
65const F32 OBJECT_TWIST_LINEAR_MAX = 180.f; 65const F32 OBJECT_TWIST_LINEAR_MAX = 180.f;
66const F32 OBJECT_TWIST_LINEAR_INC = 9.f; 66const F32 OBJECT_TWIST_LINEAR_INC = 9.f;
67 67
68const F32 OBJECT_MIN_HOLE_SIZE = 0.05f;
69const F32 OBJECT_MAX_HOLE_SIZE_X = 1.0f; 68const F32 OBJECT_MAX_HOLE_SIZE_X = 1.0f;
70const F32 OBJECT_MAX_HOLE_SIZE_Y = 0.5f; 69const F32 OBJECT_MAX_HOLE_SIZE_Y = 0.5f;
71 70
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index cf9ff0f..27484e5 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -84,7 +84,6 @@ extern const F32 OBJECT_TWIST_LINEAR_MIN;
84extern const F32 OBJECT_TWIST_LINEAR_MAX; 84extern const F32 OBJECT_TWIST_LINEAR_MAX;
85extern const F32 OBJECT_TWIST_LINEAR_INC; 85extern const F32 OBJECT_TWIST_LINEAR_INC;
86 86
87extern const F32 OBJECT_MIN_HOLE_SIZE;
88extern const F32 OBJECT_MAX_HOLE_SIZE_X; 87extern const F32 OBJECT_MAX_HOLE_SIZE_X;
89extern const F32 OBJECT_MAX_HOLE_SIZE_Y; 88extern const F32 OBJECT_MAX_HOLE_SIZE_Y;
90 89