Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply hollow size patch by Zauber Paracelsus

Browse Source
This commit is contained in:
Siana Gearz
2011-06-05 19:09:43 +02:00
parent 37f8a6e00b
commit 1473486f23
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llmath/llvolume.cpp
View File

@@ -56,7 +56,7 @@ const F32 CUT_MAX = 1.f;
const F32 MIN_CUT_DELTA = 0.02f; const F32 MIN_CUT_DELTA = 0.02f;
const F32 HOLLOW_MIN = 0.f; 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 HOLLOW_MAX_SQUARE = 0.7f;
const F32 TWIST_MIN = -1.f; 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_MIN = 0.f;
const F32 RATIO_MAX = 2.f; // Tom Y: Inverted sense here: 0 = top taper, 2 = bottom taper 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_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 HOLE_Y_MAX= 0.5f;
const F32 SHEAR_MIN = -0.5f; const F32 SHEAR_MIN = -0.5f;

12
indra/newview/llpanelobject.cpp
View File

@@ -75,7 +75,7 @@
#include "llfirstuse.h" #include "llfirstuse.h"
#include "lldrawpool.h" #include "lldrawpool.h"
#include "hippolimits.h"
@@ -1224,9 +1224,9 @@ void LLPanelObject::getState( )
mSpinScaleY->set( scale_y ); mSpinScaleY->set( scale_y );
calcp->setVar(LLCalc::X_HOLE, scale_x); calcp->setVar(LLCalc::X_HOLE, scale_x);
calcp->setVar(LLCalc::Y_HOLE, scale_y); calcp->setVar(LLCalc::Y_HOLE, scale_y);
mSpinScaleX->setMinValue(OBJECT_MIN_HOLE_SIZE); mSpinScaleX->setMinValue(gHippoLimits->getMinHoleSize());
mSpinScaleX->setMaxValue(OBJECT_MAX_HOLE_SIZE_X); mSpinScaleX->setMaxValue(OBJECT_MAX_HOLE_SIZE_X);
mSpinScaleY->setMinValue(OBJECT_MIN_HOLE_SIZE); mSpinScaleY->setMinValue(gHippoLimits->getMinHoleSize());
mSpinScaleY->setMaxValue(OBJECT_MAX_HOLE_SIZE_Y); mSpinScaleY->setMaxValue(OBJECT_MAX_HOLE_SIZE_Y);
break; break;
default: default:
@@ -1270,7 +1270,7 @@ void LLPanelObject::getState( )
*/ */
{ {
mSpinHollow->setMinValue(0.f); mSpinHollow->setMinValue(0.f);
mSpinHollow->setMaxValue(95.f); //Not that nuts. -HgB mSpinHollow->setMaxValue(gHippoLimits->getMaxHollow() * 100.0f);
} }
// Update field enablement // Update field enablement
@@ -1987,11 +1987,11 @@ void LLPanelObject::getVolumeParams(LLVolumeParams& volume_params)
{ {
scale_x = llclamp( scale_x = llclamp(
scale_x, scale_x,
OBJECT_MIN_HOLE_SIZE, gHippoLimits->getMinHoleSize(),
OBJECT_MAX_HOLE_SIZE_X); OBJECT_MAX_HOLE_SIZE_X);
scale_y = llclamp( scale_y = llclamp(
scale_y, scale_y,
OBJECT_MIN_HOLE_SIZE, gHippoLimits->getMinHoleSize(),
OBJECT_MAX_HOLE_SIZE_Y); OBJECT_MAX_HOLE_SIZE_Y);
// Limit radius offset, based on taper and hole size y. // Limit radius offset, based on taper and hole size y.

4
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -941,10 +941,10 @@
Taper Taper
</text> </text>
<spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16" <spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
increment="0.05" initial_val="0" label="X" label_width="10" left="121" increment="0.01" initial_val="0" label="X" label_width="10" left="121"
max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" /> max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16" <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73" increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="73"
max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" /> max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-12" drop_shadow_visible="true" follows="left|top" bottom_delta="-12" drop_shadow_visible="true" follows="left|top"