Line endings?

1 files changed, 142 insertions, 142 deletions

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index d6dfb5c7a9..244c4574e1 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2003,145 +2003,145 @@ BOOL LLVolume::generate()
 	return FALSE;
 }
 
-void LLVolumeFace::VertexData::init()

-{

-	if (!mData)

-	{

-		mData = (LLVector4a*) malloc(sizeof(LLVector4a)*2);

-	}

-}

-

-LLVolumeFace::VertexData::VertexData()

-{

-	mData = NULL;

-	init();

-}

-	

-LLVolumeFace::VertexData::VertexData(const VertexData& rhs)

-{

-	mData = NULL;

-	*this = rhs;

-}

-

-const LLVolumeFace::VertexData& LLVolumeFace::VertexData::operator=(const LLVolumeFace::VertexData& rhs)

-{

-	if (this != &rhs)

-	{

-		init();

-		LLVector4a::memcpyNonAliased16((F32*) mData, (F32*) rhs.mData, 2*sizeof(LLVector4a));

-		mTexCoord = rhs.mTexCoord;

-	}

-	return *this;

-}

-

-LLVolumeFace::VertexData::~VertexData()

-{

-	free(mData);

-	mData = NULL;

-}

-

-LLVector4a& LLVolumeFace::VertexData::getPosition()

-{

-	return mData[POSITION];

-}

-

-LLVector4a& LLVolumeFace::VertexData::getNormal()

-{

-	return mData[NORMAL];

-}

-

-const LLVector4a& LLVolumeFace::VertexData::getPosition() const

-{

-	return mData[POSITION];

-}

-

-const LLVector4a& LLVolumeFace::VertexData::getNormal() const

-{

-	return mData[NORMAL];

-}

-

-

-void LLVolumeFace::VertexData::setPosition(const LLVector4a& pos)

-{

-	mData[POSITION] = pos;

-}

-

-void LLVolumeFace::VertexData::setNormal(const LLVector4a& norm)

-{

-	mData[NORMAL] = norm;

-}

-

-bool LLVolumeFace::VertexData::operator<(const LLVolumeFace::VertexData& rhs)const

-{

-	const F32* lp = this->getPosition().getF32ptr();

-	const F32* rp = rhs.getPosition().getF32ptr();

-

-	if (lp[0] != rp[0])

-	{

-		return lp[0] < rp[0];

-	}

-

-	if (rp[1] != lp[1])

-	{

-		return lp[1] < rp[1];

-	}

-

-	if (rp[2] != lp[2])

-	{

-		return lp[2] < rp[2];

-	}

-

-	lp = getNormal().getF32ptr();

-	rp = rhs.getNormal().getF32ptr();

-

-	if (lp[0] != rp[0])

-	{

-		return lp[0] < rp[0];

-	}

-

-	if (rp[1] != lp[1])

-	{

-		return lp[1] < rp[1];

-	}

-

-	if (rp[2] != lp[2])

-	{

-		return lp[2] < rp[2];

-	}

-

-	if (mTexCoord.mV[0] != rhs.mTexCoord.mV[0])

-	{

-		return mTexCoord.mV[0] < rhs.mTexCoord.mV[0];

-	}

-

-	return mTexCoord.mV[1] < rhs.mTexCoord.mV[1];

-}

-

-bool LLVolumeFace::VertexData::operator==(const LLVolumeFace::VertexData& rhs)const

-{

-	return mData[POSITION].equals3(rhs.getPosition()) &&

-			mData[NORMAL].equals3(rhs.getNormal()) &&

-			mTexCoord == rhs.mTexCoord;

-}

-

-bool LLVolumeFace::VertexData::compareNormal(const LLVolumeFace::VertexData& rhs, F32 angle_cutoff) const

-{

-	bool retval = false;

-	if (rhs.mData[POSITION].equals3(mData[POSITION]) && rhs.mTexCoord == mTexCoord)

-	{

-		if (angle_cutoff > 1.f)

-		{

-			retval = (mData[NORMAL].equals3(rhs.mData[NORMAL]));

-		}

-		else

-		{

-			F32 cur_angle = rhs.mData[NORMAL].dot3(mData[NORMAL]).getF32();

-			retval = cur_angle > angle_cutoff;

-		}

-	}

-

-	return retval;

-}

+void LLVolumeFace::VertexData::init()
+{
+	if (!mData)
+	{
+		mData = (LLVector4a*) malloc(sizeof(LLVector4a)*2);
+	}
+}
+
+LLVolumeFace::VertexData::VertexData()
+{
+	mData = NULL;
+	init();
+}
+	
+LLVolumeFace::VertexData::VertexData(const VertexData& rhs)
+{
+	mData = NULL;
+	*this = rhs;
+}
+
+const LLVolumeFace::VertexData& LLVolumeFace::VertexData::operator=(const LLVolumeFace::VertexData& rhs)
+{
+	if (this != &rhs)
+	{
+		init();
+		LLVector4a::memcpyNonAliased16((F32*) mData, (F32*) rhs.mData, 2*sizeof(LLVector4a));
+		mTexCoord = rhs.mTexCoord;
+	}
+	return *this;
+}
+
+LLVolumeFace::VertexData::~VertexData()
+{
+	free(mData);
+	mData = NULL;
+}
+
+LLVector4a& LLVolumeFace::VertexData::getPosition()
+{
+	return mData[POSITION];
+}
+
+LLVector4a& LLVolumeFace::VertexData::getNormal()
+{
+	return mData[NORMAL];
+}
+
+const LLVector4a& LLVolumeFace::VertexData::getPosition() const
+{
+	return mData[POSITION];
+}
+
+const LLVector4a& LLVolumeFace::VertexData::getNormal() const
+{
+	return mData[NORMAL];
+}
+
+
+void LLVolumeFace::VertexData::setPosition(const LLVector4a& pos)
+{
+	mData[POSITION] = pos;
+}
+
+void LLVolumeFace::VertexData::setNormal(const LLVector4a& norm)
+{
+	mData[NORMAL] = norm;
+}
+
+bool LLVolumeFace::VertexData::operator<(const LLVolumeFace::VertexData& rhs)const
+{
+	const F32* lp = this->getPosition().getF32ptr();
+	const F32* rp = rhs.getPosition().getF32ptr();
+
+	if (lp[0] != rp[0])
+	{
+		return lp[0] < rp[0];
+	}
+
+	if (rp[1] != lp[1])
+	{
+		return lp[1] < rp[1];
+	}
+
+	if (rp[2] != lp[2])
+	{
+		return lp[2] < rp[2];
+	}
+
+	lp = getNormal().getF32ptr();
+	rp = rhs.getNormal().getF32ptr();
+
+	if (lp[0] != rp[0])
+	{
+		return lp[0] < rp[0];
+	}
+
+	if (rp[1] != lp[1])
+	{
+		return lp[1] < rp[1];
+	}
+
+	if (rp[2] != lp[2])
+	{
+		return lp[2] < rp[2];
+	}
+
+	if (mTexCoord.mV[0] != rhs.mTexCoord.mV[0])
+	{
+		return mTexCoord.mV[0] < rhs.mTexCoord.mV[0];
+	}
+
+	return mTexCoord.mV[1] < rhs.mTexCoord.mV[1];
+}
+
+bool LLVolumeFace::VertexData::operator==(const LLVolumeFace::VertexData& rhs)const
+{
+	return mData[POSITION].equals3(rhs.getPosition()) &&
+			mData[NORMAL].equals3(rhs.getNormal()) &&
+			mTexCoord == rhs.mTexCoord;
+}
+
+bool LLVolumeFace::VertexData::compareNormal(const LLVolumeFace::VertexData& rhs, F32 angle_cutoff) const
+{
+	bool retval = false;
+	if (rhs.mData[POSITION].equals3(mData[POSITION]) && rhs.mTexCoord == mTexCoord)
+	{
+		if (angle_cutoff > 1.f)
+		{
+			retval = (mData[NORMAL].equals3(rhs.mData[NORMAL]));
+		}
+		else
+		{
+			F32 cur_angle = rhs.mData[NORMAL].dot3(mData[NORMAL]).getF32();
+			retval = cur_angle > angle_cutoff;
+		}
+	}
+
+	return retval;
+}
 
 BOOL LLVolume::createVolumeFacesFromFile(const std::string& file_name)
 {
@@ -5546,9 +5546,9 @@ public:
 	}
 };
 
-const F32 FindVertexScore_CacheDecayPower = 1.5f;

-const F32 FindVertexScore_LastTriScore = 0.75f;

-const F32 FindVertexScore_ValenceBoostScale = 2.0f;

+const F32 FindVertexScore_CacheDecayPower = 1.5f;
+const F32 FindVertexScore_LastTriScore = 0.75f;
+const F32 FindVertexScore_ValenceBoostScale = 2.0f;
 const F32 FindVertexScore_ValenceBoostPower = 0.5f;
 const U32 MaxSizeVertexCache = 32;