projects
/
MicroTrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
code for assignment 2
[MicroTrace.git]
/
Triangle.cxx
diff --git
a/Triangle.cxx
b/Triangle.cxx
index
ffddbc8
..
761abcb
100644
(file)
--- a/
Triangle.cxx
+++ b/
Triangle.cxx
@@
-2,8
+2,10
@@
Triangle::Triangle(const Vec3f& a,
const Vec3f& b,
- const Vec3f& c)
- : m_a(a),
+ const Vec3f& c,
+ Shader* shader)
+ : Primitive(shader),
+ m_a(a),
m_b(b),
m_c(c)
{
@@
-49,3
+51,9
@@
Triangle::Intersect(Ray& ray)
return true;
}
+
+Vec3f
+Triangle::GetNormal(Ray& ray)
+{
+ return Vec3f();
+}
This page took
0.026804 seconds
and
4
git commands to generate.