Merge

4 files changed, 74 insertions, 25 deletions

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index c4be176353..7a2f06da8f 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2162,7 +2162,7 @@ BOOL LLVolume::createVolumeFacesFromStream(std::istream& is)
 

 	LLSD header;

 	{

-		if (!LLSDSerialize::deserialize(header, is, 1024*1024*1024))

+		if (!LLSDSerialize::fromBinary(header, is, 1024*1024*1024))

 		{

 			llwarns << "Mesh header parse error.  Not a valid mesh asset!" << llendl;

 			return FALSE;

@@ -2174,34 +2174,18 @@ BOOL LLVolume::createVolumeFacesFromStream(std::istream& is)
 		"lowest_lod",

 		"low_lod",

 		"medium_lod",

-		"high_lod"

+		"high_lod",

+		"physics_shape",

 	};

 

-	S32 lod = llclamp((S32) mDetail, 0, 3);

+	const S32 MODEL_LODS = 5;

 

-	while (lod < 4 && 

-		(header[nm[lod]]["offset"].asInteger() == -1 || 

-		header[nm[lod]]["size"].asInteger() == 0 ))

-	{

-		++lod;

-	}

-

-	if (lod >= 4)

-	{

-		lod = llclamp((S32) mDetail, 0, 3);

+	S32 lod = llclamp((S32) mDetail, 0, MODEL_LODS);

 

-		while (lod >= 0 && 

-				(header[nm[lod]]["offset"].asInteger() == -1 ||

-				header[nm[lod]]["size"].asInteger() == 0) )

-		{

-			--lod;

-		}

-

-		if (lod < 0)

-		{

-			llwarns << "Mesh header missing LOD offsets.  Not a valid mesh asset!" << llendl;

-			return FALSE;

-		}

+	if (header[nm[lod]]["offset"].asInteger() == -1 || 

+		header[nm[lod]]["size"].asInteger() == 0 )

+	{ //cannot load requested LOD

+		return FALSE;

 	}

 

 	is.seekg(header[nm[lod]]["offset"].asInteger(), std::ios_base::cur);

diff --git a/indra/llmath/m4math.cpp b/indra/llmath/m4math.cpp
index 8741400e52..bad4deb4de 100644
--- a/indra/llmath/m4math.cpp
+++ b/indra/llmath/m4math.cpp
@@ -829,4 +829,54 @@ std::ostream& operator<<(std::ostream& s, const LLMatrix4 &a)
 	return s;
 }
 
+LLSD LLMatrix4::getValue() const
+{
+	LLSD ret;
+	
+	ret[0] = mMatrix[0][0];
+	ret[1] = mMatrix[0][1];
+	ret[2] = mMatrix[0][2];
+	ret[3] = mMatrix[0][3];
+
+	ret[4] = mMatrix[1][0];
+	ret[5] = mMatrix[1][1];
+	ret[6] = mMatrix[1][2];
+	ret[7] = mMatrix[1][3];
+
+	ret[8] = mMatrix[2][0];
+	ret[9] = mMatrix[2][1];
+	ret[10] = mMatrix[2][2];
+	ret[11] = mMatrix[2][3];
+
+	ret[12] = mMatrix[3][0];
+	ret[13] = mMatrix[3][1];
+	ret[14] = mMatrix[3][2];
+	ret[15] = mMatrix[3][3];
+
+	return ret;
+}
+
+void LLMatrix4::setValue(const LLSD& data) 
+{
+	mMatrix[0][0] = data[0].asReal();
+	mMatrix[0][1] = data[1].asReal();
+	mMatrix[0][2] = data[2].asReal();
+	mMatrix[0][3] = data[3].asReal();
+
+	mMatrix[1][0] = data[4].asReal();
+	mMatrix[1][1] = data[5].asReal();
+	mMatrix[1][2] = data[6].asReal();
+	mMatrix[1][3] = data[7].asReal();
+
+	mMatrix[2][0] = data[8].asReal();
+	mMatrix[2][1] = data[9].asReal();
+	mMatrix[2][2] = data[10].asReal();
+	mMatrix[2][3] = data[11].asReal();
+
+	mMatrix[3][0] = data[12].asReal();
+	mMatrix[3][1] = data[13].asReal();
+	mMatrix[3][2] = data[14].asReal();
+	mMatrix[3][3] = data[15].asReal();
+}
+
 
diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h
index 3588f36758..a7dce10397 100644
--- a/indra/llmath/m4math.h
+++ b/indra/llmath/m4math.h
@@ -119,6 +119,8 @@ public:
 
 	~LLMatrix4(void);										// Destructor
 
+	LLSD getValue() const;
+	void setValue(const LLSD&);
 
 	//////////////////////////////
 	//
diff --git a/indra/llmath/v3math.h b/indra/llmath/v3math.h
index b6425087b3..acb2240075 100644
--- a/indra/llmath/v3math.h
+++ b/indra/llmath/v3math.h
@@ -158,6 +158,8 @@ F32	dist_vec(const LLVector3 &a, const LLVector3 &b);		// Returns distance betwe
 F32	dist_vec_squared(const LLVector3 &a, const LLVector3 &b);// Returns distance squared between a and b
 F32	dist_vec_squared2D(const LLVector3 &a, const LLVector3 &b);// Returns distance squared between a and b ignoring Z component
 LLVector3 projected_vec(const LLVector3 &a, const LLVector3 &b); // Returns vector a projected on vector b
+LLVector3 parallel_component(const LLVector3 &a, const LLVector3 &b); // Returns vector a projected on vector b (same as projected_vec)
+LLVector3 orthogonal_component(const LLVector3 &a, const LLVector3 &b); // Returns component of vector a not parallel to vector b (same as projected_vec)
 LLVector3 lerp(const LLVector3 &a, const LLVector3 &b, F32 u); // Returns a vector that is a linear interpolation between a and b
 
 inline LLVector3::LLVector3(void)
@@ -492,6 +494,17 @@ inline LLVector3 projected_vec(const LLVector3 &a, const LLVector3 &b)
 	return project_axis * (a * project_axis);
 }
 
+inline LLVector3 parallel_component(const LLVector3 &a, const LLVector3 &b)
+{
+	return projected_vec(a, b);
+}
+
+inline LLVector3 orthogonal_component(const LLVector3 &a, const LLVector3 &b)
+{
+	return a - projected_vec(a, b);
+}
+
+
 inline LLVector3 lerp(const LLVector3 &a, const LLVector3 &b, F32 u)
 {
 	return LLVector3(