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

secondlife/viewer#1418 Mesh Upload - Physics - Bounding Box is not working as expected

master
Alexander Gavriliuk 2024-05-14 19:48:17 +02:00 committed by Guru
parent fb17c00f14
commit a266a4356f
3 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llprimitive/llmodel.cpp
View File

@ -50,7 +50,7 @@ std::string model_names[] =
const int MODEL_NAMES_LENGTH = sizeof(model_names) / sizeof(std::string);
LLModel::LLModel(LLVolumeParams& params, F32 detail)
LLModel::LLModel(const LLVolumeParams& params, F32 detail)
: LLVolume(params, detail),
mNormalizedScale(1,1,1),
mNormalizedTranslation(0, 0, 0),

6
indra/llprimitive/llmodel.h
View File

@ -150,7 +150,7 @@ public:
LLModel::PhysicsMesh mPhysicsShapeMesh;
};
LLModel(LLVolumeParams& params, F32 detail);
LLModel(const LLVolumeParams& params, F32 detail);
~LLModel();
bool loadModel(std::istream& is);
@ -375,7 +375,7 @@ public:
LLMatrix4 mTransform;
material_map mMaterial;
LLModelInstanceBase(LLModel* model, LLMatrix4& transform, material_map& materials)
LLModelInstanceBase(LLModel* model, const LLMatrix4& transform, const material_map& materials)
: mModel(model), mTransform(transform), mMaterial(materials)
{
}
@ -404,7 +404,7 @@ public:
LLUUID mMeshID;
S32 mLocalMeshID;
LLModelInstance(LLModel* model, const std::string& label, LLMatrix4& transform, material_map& materials)
LLModelInstance(LLModel* model, const std::string& label, const LLMatrix4& transform, const material_map& materials)
: LLModelInstanceBase(model, transform, materials), mLabel(label)
{
mLocalMeshID = -1;

36
indra/newview/llmodelpreview.cpp
View File

@ -68,6 +68,8 @@
#include "lltabcontainer.h"
#include "lltextbox.h"
#include <filesystem>
#include <boost/algorithm/string.hpp>
bool LLModelPreview::sIgnoreLoadedCallback = false;
@ -1067,6 +1069,29 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod)
{ //only replace given LoD
mModel[loaded_lod] = mModelLoader->mModelList;
mScene[loaded_lod] = mModelLoader->mScene;
// Duplicate the model if it is an internal bounding box model
if (loaded_lod == LLModel::LOD_PHYSICS &&
mBaseModel.size() > 1 && // This makes sense for multiple models only
mModelLoader->mModelList.size() == 1 && // Just on the off-chance
mModelLoader->mScene.size() == 1 && // Just on the off-chance
std::filesystem::path(mModelLoader->mFilename).filename() == "cube.dae")
{
// Create a copy of the just loaded model for each model in mBaseModel
const LLModel* origin = mModelLoader->mModelList.front();
const LLModelInstance& mi = mModelLoader->mScene.begin()->second.front();
for (U32 i = 1; i < mBaseModel.size(); ++i)
{
LLPointer<LLModel> copy(new LLModel(origin->getParams(), origin->getDetail()));
copy->mLabel = origin->mLabel;
copy->copyVolumeFaces(origin);
copy->mPosition = origin->mPosition;
copy->mMaterialList = origin->mMaterialList;
mModel[loaded_lod].push_back(copy);
mScene[loaded_lod][mi.mTransform].push_back(LLModelInstance(copy, copy->mLabel, mi.mTransform, mi.mMaterial));
}
}
mVertexBuffer[loaded_lod].clear();
setPreviewLOD(loaded_lod);
@ -1163,6 +1188,17 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod)
LLFloaterModelPreview::addStringToLog(out, false);
}
mModel[loaded_lod][idx]->mLabel = name;
// Rename the correspondent instance as well
[&]()
{
for (auto& p : mScene[loaded_lod])
for (auto& i : p.second)
if (i.mModel == mModel[loaded_lod][idx])
{
i.mLabel = name;
return;
}
}();
}
}
}