ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/math/Triangle.cpp

Comparing trunk/src/math/Triangle.cpp (file contents):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 2008 The University of Notre Dame. All Rights Reserved.
1	>	/* Copyright (c) 2008, 2010 The University of Notre Dame. All Rights Reserved.
2		*
3		* The University of Notre Dame grants you ("Licensee") a
4		* non-exclusive, royalty free, license to use, modify and
#	Line 44 | Line 44
44		*
45		*  Created by Charles F. Vardeman II on 29 July 2008.
46		*  @author  Charles F. Vardeman II
47	<	*  @version $Id: Triangle.cpp,v 1.4 2009-11-25 20:02:01 gezelter Exp $
47	>	*  @version $Id$
48		*
49		*/
50
#	Line 53 | Line 53 | using namespace OpenMD;
53		using namespace OpenMD;
54
55
56	<	Triangle::Triangle() : HaveNormal_(false), HaveCentroid_(false),
56	>	Triangle::Triangle() : HaveNormal_(false), HaveUnitNormal_(false), HaveCentroid_(false),
57		HaveArea_(false), area_(0.0), normal_(V3Zero),
58		centroid_(V3Zero), facetVelocity_(V3Zero), mass_(0.0),
59		a_(V3Zero), b_(V3Zero), c_(V3Zero){
#	Line 76 | Line 76 | RealType Triangle::computeArea(){
76		area_ = getNormal().length() * 0.5;
77		return area_;
78		}
79	<
79	>	// This should return the normal for our calculations.
80		Vector3d Triangle::computeNormal(){
81		HaveNormal_ = true;
82		normal_ = cross(a_,b_);
83		return normal_;
84		}
85	+	// This should return the normal for our calculations.
86	+	Vector3d Triangle::computeUnitNormal(){
87	+	HaveUnitNormal_ = true;
88	+	unitnormal_ = cross(a_,b_);
89	+	unitnormal_.normalize();
90	+	return unitnormal_;
91	+	}
92
93		Vector3d Triangle::computeCentroid(){
94		HaveCentroid_ = true;

Comparing trunk/src/math/Triangle.cpp (property svn:keywords):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines