[Hgengine-cvs] SF.net SVN: hgengine:[564] Mercury2/src/DataTypes/MTriangle.cpp

[<axl...@us...>]

Revision: 564
          http://hgengine.svn.sourceforge.net/hgengine/?rev=564&view=rev
Author:   axlecrusher
Date:     2009-10-12 21:51:29 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
fix LERP on triangle

Modified Paths:
--------------
    Mercury2/src/DataTypes/MTriangle.cpp

Modified: Mercury2/src/DataTypes/MTriangle.cpp
===================================================================
--- Mercury2/src/DataTypes/MTriangle.cpp	2009-10-11 15:44:16 UTC (rev 563)
+++ Mercury2/src/DataTypes/MTriangle.cpp	2009-10-12 21:51:29 UTC (rev 564)
@@ -39,16 +39,14 @@
 {
 	MercuryVertex result( m_verts[0] );
 		
-	barycentric.Print();
+	MercuryVertex tmp( m_verts[1] - m_verts[0] );
+	result += tmp.Normalize()*(barycentric[0] * tmp.Length());
 	
-	result += (m_verts[1] - m_verts[0])*barycentric;
-	result += (m_verts[2] - m_verts[0])*barycentric;
+	tmp = m_verts[2] - m_verts[0];
+	result += tmp.Normalize()*(barycentric[1] * tmp.Length());
 	
-//	result.Print();
-	
 	result[3] = 0;
 	
-	result.Print();
 	return result;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.