From bbd04914749b2e3918796fe331daf649b06163ea Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 9 Aug 2009 21:11:55 +0000
Subject: adds r_normals cvar, read normals from .ase models

---
 src/model/triangle.cc | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'src/model/triangle.cc')

diff --git a/src/model/triangle.cc b/src/model/triangle.cc
index a649fdd..429c1d9 100644
--- a/src/model/triangle.cc
+++ b/src/model/triangle.cc
@@ -9,6 +9,11 @@
 namespace model
 {
 
+Triangle::Triangle()
+{
+	triangle_detail = false;
+}
+
 Triangle::Triangle(
 		math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2,
 		math::Vector3f const &normal, bool detail) :
@@ -23,17 +28,10 @@ Triangle::Triangle(
 	triangle_detail = detail;
 }
 
-Triangle::Triangle(math::Vector3f const &v0, math::Vector3f const &n0,
-		math::Vector3f const &v1, math::Vector3f const &n1,
-		math::Vector3f const &v2, math::Vector3f const &n2,
-	math::Vector3f const &normal) : 
+Triangle::Triangle(math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2) : 
 	triangle_v0(v0),
-	triangle_n0(n0),
 	triangle_v1(v1),
-	triangle_n1(n1),
-	triangle_v2(v2),
-	triangle_n2(n2),
-	triangle_normal(normal)
+	triangle_v2(v2)
 {
 	triangle_detail = false;
 }
@@ -41,4 +39,19 @@ Triangle::Triangle(math::Vector3f const &v0, math::Vector3f const &n0,
 Triangle::~Triangle()
 {}
 
+void Triangle::assign(const Triangle &other)
+{
+	triangle_v0.assign(other.triangle_v0);
+	triangle_n0.assign(other.triangle_n0);
+		
+	triangle_v1.assign(other.triangle_v1);
+	triangle_n1.assign(other.triangle_n1);
+
+	triangle_v2.assign(other.triangle_v2);
+	triangle_n2.assign(other.triangle_n2);
+
+	triangle_normal.assign(other.triangle_normal);
+	triangle_detail = other.triangle_detail;
+}
+
 }
-- 
cgit v1.2.3