fixing BRDF

Author: CharlyF

Makefile

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: raymini
-# Generated by qmake (2.01a) (Qt 4.8.3) on: dim. avr. 27 01:19:13 2014
+# Generated by qmake (2.01a) (Qt 4.8.3) on: mer. avr. 30 11:19:32 2014
 # Project:  raymini.pro
 # Template: app
 # Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile raymini.pro

Mesh.cpp

@@ -23,6 +23,7 @@ void Mesh::clearGeometry () {
     vertices.clear ();
 }
 
+
 void Mesh::clearTopology () {
     triangles.clear ();
 }

Ray.cpp

@@ -62,37 +62,55 @@ bool Ray::intersect (const BoundingBox & bbox, Vec3Df & intersectionPoint) const
     return (true);			
 }
 
-bool Ray::intersectTriangle (const Triangle t, Vec3Df & intersectionPoint, Vec3Df p0, Vec3Df p1, Vec3Df p2) const { //std::vector<Vertex> & Vertices) const {
-    //Vec3Df p0 = Vertices[t.getVertex(0)].getPos();
-    //Vec3Df p1 = Vertices[t.getVertex(1)].getPos();
-    //Vec3Df p2 = Vertices[t.getVertex(2)].getPos();
+float Ray::intersectTriangle (const Triangle t, Vec3Df & intersectionPoint, Vec3Df p0, Vec3Df p1, Vec3Df p2, float diffuse, float specular, Vec3Df n0, Vec3Df n1, Vec3Df n2, Vec3Df lightpos) const { //std::vector<Vertex> & Vertices) const {
+    //Vec3Df p0 = Vertices[t.getVertex(0)].getNormal();
+    //Vec3Df p1 = Vertices[t.getVertex(1)].getNormal();
+  //  Vec3Df p2 = Vertices[t.getVertex(2)].getNormal();
 
     Vec3Df e0 = p1-p0;
     Vec3Df e1 = p2-p0;
     Vec3Df n = Vec3Df::crossProduct(e0,e1);
     n.normalize();
     Vec3Df q = Vec3Df::crossProduct(direction, e1);
-
     float a = Vec3Df::dotProduct(e0, q);
-
     if (Vec3Df::dotProduct(n,direction)>=0 || abs(a)<0.0 ){
-            return false;
+            return 1000;
     }
     Vec3Df s = (origin - p0)/a;
     Vec3Df r = Vec3Df::crossProduct(s, e0);
 
     float b0 = Vec3Df::dotProduct(s,q);
     float b1 =Vec3Df::dotProduct(r,direction);
     float b2 = 1-b0-b1;
-
     if (b0<0 || b1<0 || b2<0){
-        return false;
+        return 1000;
     }
     float k = Vec3Df::dotProduct(r,e1);
     if (k>=0) {
-        intersectionPoint = origin + k*direction;
-        std::cout << s << std::endl;
-        return true;
+        intersectionPoint = b2*p0+b0*p1+b1*p2;
+        //intersectionPoint.normalize();
+        //intersectionPoint = origin + k*direction;
+        Vec3Df norm = b2*n0+b0*n1+b1*n2;
+        //intersectionPoint = origin + k*direction;
+        norm.normalize();
+        Vec3Df wi = lightpos-intersectionPoint;
+        wi.normalize();
+        Vec3Df ri = 2*norm*Vec3Df::dotProduct(wi, norm)-wi;
+        ri.normalize();
+        float f = diffuse*(max(Vec3Df::dotProduct(norm, wi),0.f))+pow(specular*(max(Vec3Df::dotProduct(ri,-direction),0.f)),10);
+        return f;
     }
-    return false;
+    return 1000;
 }
+
+//float Ray::brdfPhong (const Triangle t,Vec3Df & intersectionPoint, Vec3Df p0, Vec3Df p1, Vec3Df p2, float diffuse) const{
+    //Vec3Df n0 = Vertices[t.getVertex(0)].getNormal();
+    //Vec3Df n1 = Vertices[t.getVertex(1)].getNormal();
+    //Vec3Df n2 = Vertices[t.getVertex(2)].getNormal();
+    //float inter= b0*p0+b1*p1+b2*p2;
+ //   Vec3Df norm = b0*n0+b1*n1+b2*n2;
+  //  norm.normalize();
+
+//    float f = diffuse*(Vec3Df::dotProduct(norm*ray));
+ //   return f;
+//}

Ray.h

@@ -29,7 +29,8 @@ class Ray {
     inline Vec3Df & getDirection () { return direction; }
 
     bool intersect (const BoundingBox & bbox, Vec3Df &intersectionPoint) const;
-    bool intersectTriangle (const Triangle t, Vec3Df &intersectionPoint, Vec3Df p0, Vec3Df p1, Vec3Df p2) const ;//std::vector<Vertex> & Vertices) const;
+    float intersectTriangle (const Triangle t, Vec3Df &intersectionPoint, Vec3Df p0, Vec3Df p1, Vec3Df p2, float diffuse, float specular,  Vec3Df n0, Vec3Df n1, Vec3Df n2, Vec3Df lightpos) const ;//std::vector<Vertex> & Vertices) const;
+  /// float brdfPhong (const Triangle t, Vec3Df & intersectionPoint, Vec3Df p0, Vec3Df p1, Vec3Df p2, float diffuse) const;
 private:
     Vec3Df origin;
     Vec3Df direction;

RayTracer.cpp

@@ -49,6 +49,7 @@ QImage RayTracer::render (const Vec3Df & camPos,
     const Vec3Df rangeBb = maxBb - minBb;
     QProgressDialog progressDialog ("Raytracing...", "Cancel", 0, 100);
     progressDialog.show ();
+
     for (unsigned int i = 0; i < screenWidth; i++) {
         progressDialog.setValue ((100*i)/screenWidth);
         for (unsigned int j = 0; j < screenHeight; j++) {
@@ -68,18 +69,30 @@ QImage RayTracer::render (const Vec3Df & camPos,
                 if (ray.intersect(o.getBoundingBox(), intersectionPoint)){
                     std::vector<Vertex> Vertices = o.getMesh().getVertices();
                     std::vector<Triangle> triangles = o.getMesh().getTriangles();
+
                     for (unsigned int l = 0; l< triangles.size();l++){
                         Triangle t = triangles[l];
                         Vec3Df p0 = Vertices[t.getVertex(0)].getPos();
                         Vec3Df p1 = Vertices[t.getVertex(1)].getPos();
                         Vec3Df p2 = Vertices[t.getVertex(2)].getPos();
-                        bool Intersection = ray.intersectTriangle(t , intersectionPoint, p0, p1, p2);//Vertices) ;
-                        if (Intersection) {
-                            float intersectionDistance = Vec3Df::squaredDistance ( intersectionPoint + o.getTrans (),
-                                                                                  camPos);
+                        Vec3Df n0 = Vertices[t.getVertex(0)].getNormal();
+                        Vec3Df n1 = Vertices[t.getVertex(1)].getNormal();
+                        Vec3Df n2 = Vertices[t.getVertex(2)].getNormal();
+                        Vec3Df lightpos = scene->getLights()[0].getPos();
+                        float diffuse = o.getMaterial().getDiffuse();
+                        float specular = o.getMaterial().getSpecular();
+                        float Intersection = ray.intersectTriangle(t , intersectionPoint, p0, p1, p2, diffuse,specular, n0, n1, n2, lightpos);//Vertices) ;
+
+                        if (Intersection!=1000) {
+                            //float f = ray.brdfPhong(t ,intersectionPoint,p0, p1, p2, diffuse);
+                           float intersectionDistance = Vec3Df::squaredDistance ( intersectionPoint + o.getTrans (),
+                                                                           camPos);
                             if (intersectionDistance < smallestIntersectionDistance) {
-                                c = 255.f * (intersectionPoint);
+                                //Vec3Df tmp (1,1,1);
+                                c = Intersection * o.getMaterial().getColor() * 255.f;
+                                //c = Vec3Df(Intersection, Intersection, Intersection);
                                 smallestIntersectionDistance = intersectionDistance;
+                                //std::cout << Intersection << std::endl;
                             }
                         }
                     }
@@ -91,6 +104,7 @@ QImage RayTracer::render (const Vec3Df & camPos,
         }
 
     }
+
     progressDialog.setValue (100);
     return image;
 }

Vertex.cpp

@@ -50,6 +50,11 @@ void Vertex::scaleToUnitBox (vector<Vertex> & vertices,
     for (unsigned int i = 0; i < vertices.size (); i++) 
         vertices[i].setPos (Vec3Df::segment (center, vertices[i].getPos ()) / scaleToUnit);
 }
+//struct KDTree::kdtree (Voxel V, Rayon r){
+   // if (V.feuille){
+     //   return smallestIntersection
+   // }
+//}
 
 void Vertex::normalizeNormals (vector<Vertex> & vertices) {
     for (std::vector<Vertex>::iterator it = vertices.begin ();