diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-10-10 17:17:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-10 17:17:25 -0400 |
| commit | 2cdcd336ba63702cbf9919bebb279292edf9ba0e (patch) | |
| tree | 9ea43c81fd431397648d9a1292f94519a41b797a /indra/newview/llfloatermodelpreview.cpp | |
| parent | 6efde0ba83b6ce2f2735f0c4a532cc405b8a3a8d (diff) | |
| parent | b277cc6a8fd2a48ed3ba6498734d9fae209d181e (diff) | |
Merge pull request #4783 from RyeMutt/rye/convexdecomp
Introduce initial VHACD based llconvexdecomposition library
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index f76f39222b..ef29be8200 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1035,8 +1035,13 @@ void LLFloaterModelPreview::onPhysicsStageExecute(LLUICtrl* ctrl, void* data) gMeshRepo.mDecompThread->submitRequest(request); } } - - if (stage == "Decompose") + if (stage == "Analyze") + { + sInstance->setStatusMessage(sInstance->getString("decomposing")); + sInstance->childSetVisible("Analyze", false); + sInstance->childSetVisible("analyze_cancel", true); + } + else if (stage == "Decompose") { sInstance->setStatusMessage(sInstance->getString("decomposing")); sInstance->childSetVisible("Decompose", false); @@ -1137,6 +1142,7 @@ void LLFloaterModelPreview::initDecompControls() childSetCommitCallback("simplify_cancel", onPhysicsStageCancel, NULL); childSetCommitCallback("decompose_cancel", onPhysicsStageCancel, NULL); + childSetCommitCallback("analyze_cancel", onPhysicsStageCancel, NULL); childSetCommitCallback("physics_lod_combo", onPhysicsUseLOD, NULL); childSetCommitCallback("physics_browse", onPhysicsBrowse, NULL); @@ -2018,7 +2024,7 @@ void LLFloaterModelPreview::DecompRequest::completed() { //called from the main thread if (mContinue) { - mModel->setConvexHullDecomposition(mHull); + mModel->setConvexHullDecomposition(mHull, mHullMesh); if (sInstance) { |