merge

3 files changed, 62 insertions, 97 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 0b7c011861..d8088e2f51 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1330,17 +1330,19 @@ bool LLModelLoader::doLoadModel()
 						{ //get bind shape matrix

 							domFloat4x4& dom_value = bind_mat->getValue();

 							

+							LLMeshSkinInfo& skin_info = model->mSkinInfo;

+

 							for (int i = 0; i < 4; i++)

 							{

 								for(int j = 0; j < 4; j++)

 								{

-									model->mBindShapeMatrix.mMatrix[i][j] = dom_value[i + j*4];

+									skin_info.mBindShapeMatrix.mMatrix[i][j] = dom_value[i + j*4];

 								}

 							}

 							

 							LLMatrix4 trans = normalized_transformation;

-							trans *= model->mBindShapeMatrix;

-							model->mBindShapeMatrix = trans;

+							trans *= skin_info.mBindShapeMatrix;

+							skin_info.mBindShapeMatrix = trans;

 							

 						}

 						

@@ -1479,7 +1481,7 @@ bool LLModelLoader::doLoadModel()
 							xsNMTOKEN semantic = input->getSemantic();

 							

 							if (strcmp(semantic, COMMON_PROFILE_INPUT_JOINT) == 0)

-							{ //found joint source, fill model->mJointMap and model->mJointList

+							{ //found joint source, fill model->mJointMap and model->mSkinInfo.mJointNames

 								daeElement* elem = input->getSource().getElement();

 								

 								domSource* source = daeSafeCast<domSource>(elem);

@@ -1500,8 +1502,8 @@ bool LLModelLoader::doLoadModel()
 											{

 												name = mJointMap[name];

 											}

-											model->mJointList.push_back(name);

-											model->mJointMap[name] = j;

+											model->mSkinInfo.mJointNames.push_back(name);

+											model->mSkinInfo.mJointMap[name] = j;

 										}

 									}

 									else

@@ -1518,8 +1520,8 @@ bool LLModelLoader::doLoadModel()
 												{

 													name = mJointMap[name];

 												}

-												model->mJointList.push_back(name);

-												model->mJointMap[name] = j;

+												model->mSkinInfo.mJointNames.push_back(name);

+												model->mSkinInfo.mJointMap[name] = j;

 											}

 										}

 									}

@@ -1548,7 +1550,7 @@ bool LLModelLoader::doLoadModel()
 												}

 											}

 											

-											model->mInvBindMatrix.push_back(mat);

+											model->mSkinInfo.mInvBindMatrix.push_back(mat);

 										}

 									}

 								}

@@ -1559,8 +1561,8 @@ bool LLModelLoader::doLoadModel()
 						//(which means we have all the joints that are required for an avatar versus

 						//a skinned asset attached to a node in a file that contains an entire skeleton,

 						//but does not use the skeleton).

-						mPreview->setRigValid( doesJointArrayContainACompleteRig( model->mJointList ) );

-						if ( !skeletonWithNoRootNode && !model->mJointList.empty() && mPreview->isRigValid() ) 

+						mPreview->setRigValid( doesJointArrayContainACompleteRig( model->mSkinInfo.mJointNames ) );

+						if ( !skeletonWithNoRootNode && !model->mSkinInfo.mJointNames.empty() && mPreview->isRigValid() ) 

 						{

 							mResetJoints = true;

 						}

@@ -1600,8 +1602,8 @@ bool LLModelLoader::doLoadModel()
 						//in the same order as they were stored in the joint buffer. The joints associated

 						//with the skeleton are not stored in the same order as they are in the exported joint buffer.

 						//This remaps the skeletal joints to be in the same order as the joints stored in the model.

-						std::vector<std::string> :: const_iterator jointIt  = model->mJointList.begin();

-						const int jointCnt = model->mJointList.size();

+						std::vector<std::string> :: const_iterator jointIt  = model->mSkinInfo.mJointNames.begin();

+						const int jointCnt = model->mSkinInfo.mJointNames.size();

 						for ( int i=0; i<jointCnt; ++i, ++jointIt )

 						{

 							std::string lookingForJoint = (*jointIt).c_str();

@@ -1610,9 +1612,9 @@ bool LLModelLoader::doLoadModel()
 							if ( jointTransforms.find( lookingForJoint ) != jointTransforms.end() )

 							{

 								LLMatrix4 jointTransform = jointTransforms[lookingForJoint];

-								LLMatrix4 newInverse = model->mInvBindMatrix[i];

+								LLMatrix4 newInverse = model->mSkinInfo.mInvBindMatrix[i];

 								newInverse.setTranslation( jointTransforms[lookingForJoint].getTranslation() );

-								model->mAlternateBindMatrix.push_back( newInverse );

+								model->mSkinInfo.mAlternateBindMatrix.push_back( newInverse );

 							}

 							else

 							{

@@ -1817,10 +1819,15 @@ bool LLModelLoader::loadFromSLM(const std::string& filename)
 		{

 			std::stringstream str(mesh[i].asString());

 			LLPointer<LLModel> loaded_model = new LLModel(volume_params, (F32) lod);

-			if (loaded_model->createVolumeFacesFromStream(str))

+			if (loaded_model->loadModel(str))

 			{

 				loaded_model->mLocalID = i;

 				model[lod].push_back(loaded_model);

+

+				if (lod == LLModel::LOD_HIGH && !loaded_model->mSkinInfo.mJointNames.empty())

+				{ //check to see if rig is valid

+					mPreview->setRigValid( doesJointArrayContainACompleteRig( loaded_model->mSkinInfo.mJointNames ) );

+				}

 			}

 			else

 			{

@@ -1875,7 +1882,7 @@ void LLModelLoader::loadModelCallback()
 {

 	if (mPreview)

 	{

-		mPreview->loadModelCallback(mLod);	

+		mPreview->loadModelCallback(mLod);

 	}

 

 	while (!isStopped())

@@ -2904,6 +2911,9 @@ void LLModelPreview::loadModelCallback(S32 lod)
 		mBaseModel.clear();

 		mBaseScene.clear();

 

+		bool skin_weights = false;

+		bool joint_positions = false;

+

 		for (S32 lod = 0; lod < LLModel::NUM_LODS; ++lod)

 		{ //for each LoD

 

@@ -2936,12 +2946,40 @@ void LLModelPreview::loadModelCallback(S32 lod)
 							mModel[lod].resize(idx+1);

 						}

 

-						mModel[lod][idx] = list_iter->mModel;	

+						mModel[lod][idx] = list_iter->mModel;

+						if (!list_iter->mModel->mSkinWeights.empty())

+						{

+							skin_weights = true;

+

+							if (!list_iter->mModel->mSkinInfo.mAlternateBindMatrix.empty())

+							{

+								joint_positions = true;

+							}

+						}

 					}

 				}

 			}

 		}

 

+		if (mFMP)

+		{

+			LLFloaterModelPreview* fmp = (LLFloaterModelPreview*) mFMP;

+

+			if (skin_weights)

+			{ //enable uploading/previewing of skin weights if present in .slm file

+				fmp->enableViewOption("show_skin_weight");

+				mViewOption["show_skin_weight"] = true;

+				fmp->childSetValue("upload_skin", true);

+			}

+

+			if (joint_positions)

+			{ 

+				fmp->enableViewOption("show_joint_positions");

+				mViewOption["show_joint_positions"] = true;

+				fmp->childSetValue("upload_joints", true);

+			}

+		}

+

 		//copy high lod to base scene for LoD generation

 		mBaseScene = mScene[LLModel::LOD_HIGH];

 		mBaseModel = mModel[LLModel::LOD_HIGH];

@@ -3418,11 +3456,7 @@ void LLModelPreview::genLODs(S32 which_lod, U32 decimation, bool enforce_tri_lim
 			//of an open problem).

 			target_model->mPosition = base->mPosition;

 			target_model->mSkinWeights = base->mSkinWeights;

-			target_model->mJointMap = base->mJointMap;

-			target_model->mJointList = base->mJointList;

-			target_model->mInvBindMatrix = base->mInvBindMatrix;

-			target_model->mBindShapeMatrix = base->mBindShapeMatrix;

-			target_model->mAlternateBindMatrix = base->mAlternateBindMatrix;

+			target_model->mSkinInfo = base->mSkinInfo;

 			//copy material list

 			target_model->mMaterialList = base->mMaterialList;

 

@@ -4394,12 +4428,12 @@ BOOL LLModelPreview::render()
 

 							//build matrix palette

 							LLMatrix4 mat[64];

-							for (U32 j = 0; j < model->mJointList.size(); ++j)

+							for (U32 j = 0; j < model->mSkinInfo.mJointNames.size(); ++j)

 							{

-								LLJoint* joint = avatar->getJoint(model->mJointList[j]);

+								LLJoint* joint = avatar->getJoint(model->mSkinInfo.mJointNames[j]);

 								if (joint)

 								{

-									mat[j] = model->mInvBindMatrix[j];

+									mat[j] = model->mSkinInfo.mInvBindMatrix[j];

 									mat[j] *= joint->getWorldMatrix();

 								}

 							}

@@ -4440,7 +4474,7 @@ BOOL LLModelPreview::render()
 								//VECTORIZE THIS

 								LLVector3 v(face.mPositions[j].getF32ptr());

 

-								v = v * model->mBindShapeMatrix;

+								v = v * model->mSkinInfo.mBindShapeMatrix;

 								v = v * final_mat;

 

 								position[j] = v;

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index a2792bcdc6..f5fc0de0d3 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1111,66 +1111,9 @@ bool LLMeshRepoThread::skinInfoReceived(const LLUUID& mesh_id, U8* data, S32 dat
 	}
 	
 	{
-		LLMeshSkinInfo info;
+		LLMeshSkinInfo info(skin);
 		info.mMeshID = mesh_id;
 
-		if (skin.has("joint_names"))
-		{
-			for (U32 i = 0; i < skin["joint_names"].size(); ++i)
-			{
-				info.mJointNames.push_back(skin["joint_names"][i]);
-			}
-		}
-
-		if (skin.has("inverse_bind_matrix"))
-		{
-			for (U32 i = 0; i < skin["inverse_bind_matrix"].size(); ++i)
-			{
-				LLMatrix4 mat;
-				for (U32 j = 0; j < 4; j++)
-				{
-					for (U32 k = 0; k < 4; k++)
-					{
-						mat.mMatrix[j][k] = skin["inverse_bind_matrix"][i][j*4+k].asReal();
-					}
-				}
-
-				info.mInvBindMatrix.push_back(mat);
-			}
-		}
-
-		if (skin.has("bind_shape_matrix"))
-		{
-			for (U32 j = 0; j < 4; j++)
-			{
-				for (U32 k = 0; k < 4; k++)
-				{
-					info.mBindShapeMatrix.mMatrix[j][k] = skin["bind_shape_matrix"][j*4+k].asReal();
-				}
-			}
-		}
-
-		if (skin.has("alt_inverse_bind_matrix"))
-		{
-			for (U32 i = 0; i < skin["alt_inverse_bind_matrix"].size(); ++i)
-			{
-				LLMatrix4 mat;
-				for (U32 j = 0; j < 4; j++)
-				{
-					for (U32 k = 0; k < 4; k++)
-					{
-						mat.mMatrix[j][k] = skin["alt_inverse_bind_matrix"][i][j*4+k].asReal();
-					}
-				}
-				
-				info.mAlternateBindMatrix.push_back(mat);
-			}
-		}
-
-		if (skin.has("pelvis_offset"))
-		{
-			info.mPelvisOffset = skin["pelvis_offset"].asReal();
-		}
 		//llinfos<<"info pelvis offset"<<info.mPelvisOffset<<llendl;
 		mSkinInfoQ.push(info);
 	}
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 4e349a1270..5960fe2949 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -132,18 +132,6 @@ public:
 	LLSD asLLSD();
 };
 
-class LLMeshSkinInfo 
-{
-public:
-	LLUUID mMeshID;
-	std::vector<std::string> mJointNames;
-	std::vector<LLMatrix4> mInvBindMatrix;
-	std::vector<LLMatrix4> mAlternateBindMatrix;
-	
-	LLMatrix4 mBindShapeMatrix;
-	float mPelvisOffset;
-};
-
 class LLMeshDecomposition
 {
 public: