Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/model/triangle.cc')
-rw-r--r--src/model/triangle.cc31
1 files changed, 5 insertions, 26 deletions
diff --git a/src/model/triangle.cc b/src/model/triangle.cc
index 429c1d9..90d52b7 100644
--- a/src/model/triangle.cc
+++ b/src/model/triangle.cc
@@ -9,14 +9,15 @@
namespace model
{
-Triangle::Triangle()
+Triangle::Triangle(const math::Vector3f &v0, const math::Vector3f &v1, const math::Vector3f &v2) :
+ triangle_v0(v0),
+ triangle_v1(v1),
+ triangle_v2(v2)
{
triangle_detail = false;
}
-Triangle::Triangle(
- math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2,
- math::Vector3f const &normal, bool detail) :
+Triangle::Triangle(const math::Vector3f &v0,const math::Vector3f &v1, const math::Vector3f &v2, const math::Vector3f &normal, const bool detail) :
triangle_v0(v0),
triangle_n0(normal),
triangle_v1(v1),
@@ -28,30 +29,8 @@ Triangle::Triangle(
triangle_detail = detail;
}
-Triangle::Triangle(math::Vector3f const &v0, math::Vector3f const &v1, math::Vector3f const &v2) :
- triangle_v0(v0),
- triangle_v1(v1),
- triangle_v2(v2)
-{
- triangle_detail = false;
-}
-
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;
}
}