From 11295915dbe05a6237ca84b5a07c82459dd4f9e0 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 18 Apr 2010 12:38:22 -0700 Subject: Use opensim limits for hollow (99) and hole (0.01). Need to add option to enable in the ui --- linden/indra/llmath/llvolume.cpp | 6 +++--- linden/indra/llmath/xform.h | 2 +- linden/indra/llprimitive/llprimitive.cpp | 1 - linden/indra/llprimitive/llprimitive.h | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'linden') 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; const F32 MIN_CUT_DELTA = 0.02f; const F32 HOLLOW_MIN = 0.f; -const F32 HOLLOW_MAX = 0.95f; +const F32 HOLLOW_MAX = 0.99f; const F32 HOLLOW_MAX_SQUARE = 0.7f; const F32 TWIST_MIN = -1.f; @@ -65,10 +65,10 @@ const F32 TWIST_MAX = 1.f; const F32 RATIO_MIN = 0.f; const F32 RATIO_MAX = 2.f; // Tom Y: Inverted sense here: 0 = top taper, 2 = bottom taper -const F32 HOLE_X_MIN= 0.05f; +const F32 HOLE_X_MIN= 0.01f; const F32 HOLE_X_MAX= 1.0f; -const F32 HOLE_Y_MIN= 0.05f; +const F32 HOLE_Y_MIN= 0.01f; const F32 HOLE_Y_MAX= 0.5f; const 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 @@ const F32 MAX_OBJECT_Z = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f const F32 MIN_OBJECT_Z = -256.f; -//const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; set in llmanipscale.cpp now +//const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; set via the Hippo Grid manager now const F32 MIN_PRIM_SCALE = 0.01f; const F32 MAX_PRIM_SCALE = 65536.f; // something very high but not near FLT_MAX 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; const F32 OBJECT_TWIST_LINEAR_MAX = 180.f; const F32 OBJECT_TWIST_LINEAR_INC = 9.f; -const F32 OBJECT_MIN_HOLE_SIZE = 0.05f; const F32 OBJECT_MAX_HOLE_SIZE_X = 1.0f; const F32 OBJECT_MAX_HOLE_SIZE_Y = 0.5f; 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; extern const F32 OBJECT_TWIST_LINEAR_MAX; extern const F32 OBJECT_TWIST_LINEAR_INC; -extern const F32 OBJECT_MIN_HOLE_SIZE; extern const F32 OBJECT_MAX_HOLE_SIZE_X; extern const F32 OBJECT_MAX_HOLE_SIZE_Y; -- cgit v1.1