livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-12241 Separated 'flexible' paramenters

master
andreykproductengine 2019-11-08 21:11:48 +02:00
parent 3992875627
commit aec6caf5eb
3 changed files with 92 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
indra/newview/llpanelobject.cpp
View File

@ -321,6 +321,7 @@ LLPanelObject::LLPanelObject()
mHasSizeClipboard(FALSE),
mHasRotClipboard(FALSE),
mPasteParametric(TRUE),
mPasteFlexible(TRUE),
mPastePhysics(TRUE),
mPasteLight(TRUE)
{
@ -2330,6 +2331,75 @@ void LLPanelObject::onPasteParams()
}
}
if (mPasteFlexible)
{
bool is_flexible = mParamsClipboard.has("flex");
if (is_flexible)
{
LLVOVolume *volobjp = (LLVOVolume *)objectp;
BOOL update_shape = FALSE;
if (!mPasteParametric)
{
// do before setParameterEntry or it will think that it is already flexi
update_shape = volobjp->setIsFlexible(is_flexible);
}
if (objectp->getClickAction() == CLICK_ACTION_SIT)
{
objectp->setClickAction(CLICK_ACTION_NONE);
}
LLFlexibleObjectData *attributes = (LLFlexibleObjectData *)objectp->getParameterEntry(LLNetworkData::PARAMS_FLEXIBLE);
if (attributes)
{
LLFlexibleObjectData new_attributes;
new_attributes = *attributes;
new_attributes.setSimulateLOD(mParamsClipboard["flex"]["lod"].asInteger());
new_attributes.setGravity(mParamsClipboard["flex"]["gav"].asReal());
new_attributes.setTension(mParamsClipboard["flex"]["ten"].asReal());
new_attributes.setAirFriction(mParamsClipboard["flex"]["fri"].asReal());
new_attributes.setWindSensitivity(mParamsClipboard["flex"]["sen"].asReal());
F32 fx = (F32)mParamsClipboard["flex"]["forx"].asReal();
F32 fy = (F32)mParamsClipboard["flex"]["fory"].asReal();
F32 fz = (F32)mParamsClipboard["flex"]["forz"].asReal();
LLVector3 force(fx, fy, fz);
new_attributes.setUserForce(force);
objectp->setParameterEntry(LLNetworkData::PARAMS_FLEXIBLE, new_attributes, true);
}
if (!mPasteParametric && update_shape)
{
mObject->sendShapeUpdate();
LLSelectMgr::getInstance()->selectionUpdatePhantom(volobjp->flagPhantom());
}
}
else if (!mPasteParametric)
{
LLVOVolume *volobjp = (LLVOVolume *)objectp;
if (volobjp->setIsFlexible(is_flexible))
{
mObject->sendShapeUpdate();
LLSelectMgr::getInstance()->selectionUpdatePhantom(volobjp->flagPhantom());
}
}
}
// Parametric does updateVolume(), make sure we won't affect flexible
else if (mPasteParametric)
{
LLVOVolume *volobjp = (LLVOVolume *)objectp;
if (volobjp->isFlexible())
{
if (mClipboardVolumeParams.getPathParams().getCurveType() == LL_PCODE_PATH_LINE)
{
mClipboardVolumeParams.getPathParams().setCurveType(LL_PCODE_PATH_FLEXIBLE);
}
}
else if (mClipboardVolumeParams.getPathParams().getCurveType() == LL_PCODE_PATH_FLEXIBLE)
{
mClipboardVolumeParams.getPathParams().setCurveType(LL_PCODE_PATH_LINE);
}
}
// Parametrics
if(mPasteParametric)
{
@ -2351,33 +2421,6 @@ void LLPanelObject::onPasteParams()
}
}
// Flexi Params
if (mParamsClipboard.has("flex"))
{
if (objectp->getClickAction() == CLICK_ACTION_SIT)
{
objectp->setClickAction(CLICK_ACTION_NONE);
}
LLFlexibleObjectData *attributes = (LLFlexibleObjectData *)objectp->getParameterEntry(LLNetworkData::PARAMS_FLEXIBLE);
if (attributes)
{
LLFlexibleObjectData new_attributes;
new_attributes = *attributes;
new_attributes.setSimulateLOD(mParamsClipboard["flex"]["lod"].asInteger());
new_attributes.setGravity(mParamsClipboard["flex"]["gav"].asReal());
new_attributes.setTension(mParamsClipboard["flex"]["ten"].asReal());
new_attributes.setAirFriction(mParamsClipboard["flex"]["fri"].asReal());
new_attributes.setWindSensitivity(mParamsClipboard["flex"]["sen"].asReal());
F32 fx = (F32)mParamsClipboard["flex"]["forx"].asReal();
F32 fy = (F32)mParamsClipboard["flex"]["fory"].asReal();
F32 fz = (F32)mParamsClipboard["flex"]["forz"].asReal();
LLVector3 force(fx,fy,fz);
new_attributes.setUserForce(force);
objectp->setParameterEntry(LLNetworkData::PARAMS_FLEXIBLE, new_attributes, true);
}
}
objectp->updateVolume(mClipboardVolumeParams);
}
}
@ -2390,6 +2433,10 @@ bool LLPanelObject::pasteCheckMenuItem(const LLSD& userdata)
{
return mPasteParametric;
}
if ("Flexible" == command)
{
return mPasteFlexible;
}
if ("Physics" == command)
{
return mPastePhysics;
@ -2410,6 +2457,10 @@ void LLPanelObject::pasteDoMenuItem(const LLSD& userdata)
{
mPasteParametric = !mPasteParametric;
}
if ("Flexible" == command)
{
mPasteFlexible = !mPasteFlexible;
}
if ("Physics" == command)
{
mPastePhysics = !mPastePhysics;
@ -2425,12 +2476,16 @@ bool LLPanelObject::pasteEnabletMenuItem(const LLSD& userdata)
std::string command = userdata.asString();
// Keep at least one option enabled
if (mPasteParametric + mPastePhysics + mPasteLight == 1)
if (mPasteParametric + mPasteFlexible + mPastePhysics + mPasteLight == 1)
{
if ("Parametric" == command && mPasteParametric)
{
return false;
}
if ("Flexible" == command && mPasteFlexible)
{
return false;
}
if ("Physics" == command && mPastePhysics)
{
return false;

1
indra/newview/llpanelobject.h
View File

@ -205,6 +205,7 @@ protected:
BOOL mHasParamsClipboard;
BOOL mPasteParametric;
BOOL mPasteFlexible;
BOOL mPastePhysics;
BOOL mPasteLight;

8
indra/newview/skins/default/xui/en/menu_build_paste.xml
View File

@ -10,6 +10,14 @@
<on_click function="BuildObject.PasteDoToSelected" parameter="Parametric" />
<on_enable function="BuildObject.PasteEnable" parameter="Parametric" />
</menu_item_check>
<menu_item_check
label="Flexible"
layout="topleft"
name="Flexible">
<on_check function="BuildObject.PasteCheckItem" parameter="Flexible" />
<on_click function="BuildObject.PasteDoToSelected" parameter="Flexible" />
<on_enable function="BuildObject.PasteEnable" parameter="Flexible" />
</menu_item_check>
<menu_item_check
label="Physics"
layout="topleft"