WebSVN – gelsvn – Diff – /branches/cpp11-devel/apps/Raytracer/raytrace.cpp

   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
   // load the texture image
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
-	       TEX_SIZE, TEX_SIZE,
+	             TEX_SIZE, TEX_SIZE,
 , GL_RGB, GL_FLOAT, image[0][0].get());
+}
 void initRaytracer()
+{
   Vec3f c;
   // Initialize track ball
   vctrl = new GLViewController(winx, winy, c, r);
   // Initialize corresponding camera
-  cam = new Camera(c - Vec3f(r),
+  cam = new Camera(c - Vec3f(r), c, Vec3f(0.0f, 1.0f, 0.0f), 1.0f);
-		   c,
-		   Vec3f(0.0f, 1.0f, 0.0f),
-.0f);
 #ifdef USE_BSP
    cout << "Constructing BSP tree..." << endl;
    tree.init(mesh_vector, transforms, MAX_OBJECTS, MAX_LEVEL);
    tree.build();
 	// AABB TREE
 	Manifold m;
 	vector<int> faces(mesh.geometry.no_faces(), 3);
 	cout << "Creating manifold" << endl;
 	build_manifold(m,
-				   mesh.geometry.no_vertices(),
+				         mesh.geometry.no_vertices(),
-				   &mesh.geometry.vertex(0),
+				         &mesh.geometry.vertex(0),
-				   faces.size(), &faces[0],
+				         faces.size(), &faces[0],
-				   reinterpret_cast<const int*>(&mesh.geometry.face(0)));
+				         reinterpret_cast<const int*>(&mesh.geometry.face(0)));
 	cout << "Building tree" << endl;
 	build_AABBTree(m, bb_tree);
 #endif
+}
+}
 double lambertian_shade(Ray& r)
+{
 #ifdef USE_BSP
-		r.compute_normal();
+	r.compute_normal();
 #endif
   return light_pow*dot(r.hit_normal, light_dir);
+}
 double (*shade_ray[2])(Ray&) = { lambertian_shade,
-				 shadow_shade      };
+				                         shadow_shade      };
 //////////////////////////////////////////////////////////////
 //      D R A W   F U N C T I O N S
 //////////////////////////////////////////////////////////////
+  {
     disp_list = glGenLists(1);
     glNewList(disp_list, GL_COMPILE);
     glBegin(GL_TRIANGLES);
-      for(int i = 0; i < mesh.geometry.no_faces(); ++i)
+    for(int i = 0; i < mesh.geometry.no_faces(); ++i)
+    {
+      Vec3i n_face = mesh.normals.face(i);
+      Vec3i g_face = mesh.geometry.face(i);
+      for(int j=0;j<3;j++)
+      {
-	Vec3i n_face = mesh.normals.face(i);
-	Vec3i g_face = mesh.geometry.face(i);
-	for(int j=0;j<3;j++)
-	{
-	  double shade = 0.5;
+        double shade = 0.5;
-	  if(n_face != Geometry::NULL_FACE)
+        if(n_face != Geometry::NULL_FACE)
-	  {
+        {
-	    Vec3f norm = normalize(mesh.normals.vertex(n_face[j]));
+          Vec3f norm = normalize(mesh.normals.vertex(n_face[j]));
-	    glNormal3fv(norm.get());
+          glNormal3fv(norm.get());
-	    shade = light_pow*dot(norm, light_dir);
+          shade = light_pow*dot(norm, light_dir);
-	  }
+        }
-	  glColor3d(shade, shade, shade);
+        glColor3d(shade, shade, shade);
-	  Vec3f vert = mesh.geometry.vertex(g_face[j]);
+        Vec3f vert = mesh.geometry.vertex(g_face[j]);
-	  glVertex3fv(vert.get());
+        glVertex3fv(vert.get());
-	}
+      }
+    }
     glEnd();
     glEndList();
     washere = true;
+  }
     vector<Vec2f> jitter(PIXEL_SUBDIVS*PIXEL_SUBDIVS);
     for(unsigned int i = 0; i < PIXEL_SUBDIVS; ++i)
       for(unsigned int j = 0; j < PIXEL_SUBDIVS; ++j)
+      {
-	    jitter[i*PIXEL_SUBDIVS + j][0] = (my_random() + (j%PIXEL_SUBDIVS))*step;
+	      jitter[i*PIXEL_SUBDIVS + j][0] = (my_random() + (j%PIXEL_SUBDIVS))*step;
-	    jitter[i*PIXEL_SUBDIVS + j][1] = (my_random() + (i%PIXEL_SUBDIVS))*step;
+	      jitter[i*PIXEL_SUBDIVS + j][1] = (my_random() + (i%PIXEL_SUBDIVS))*step;
+      }
-	Util::Timer tim;
+    Util::Timer tim;
-	tim.start();
+    tim.start();
     for(unsigned int i = 0; i < TEX_SIZE; ++i)
+    {
-	  for(unsigned int j = 0; j < TEX_SIZE; ++j)
+	    for(unsigned int j = 0; j < TEX_SIZE; ++j)
-	  {
+	    {
-		Vec3d sum(0.0f);
+		    Vec3d sum(0.0f);
-		Vec2f vp_pos(j*win_to_vp - lowerleft, i*win_to_vp - lowerleft);
+		    Vec2f vp_pos(j*win_to_vp - lowerleft, i*win_to_vp - lowerleft);
-		for(unsigned int ky = 0; ky < PIXEL_SUBDIVS; ++ky)
+		    for(unsigned int ky = 0; ky < PIXEL_SUBDIVS; ++ky)
-		  for(unsigned int kx = 0; kx < PIXEL_SUBDIVS; ++kx)
+		      for(unsigned int kx = 0; kx < PIXEL_SUBDIVS; ++kx)
-		  {
+		      {
-			Ray r = cam->get_ray(vp_pos + jitter[ky*PIXEL_SUBDIVS + kx]);
+			      Ray r = cam->get_ray(vp_pos + jitter[ky*PIXEL_SUBDIVS + kx]);
 #ifdef USE_BSP
-			if(tree.intersect(r))
+			      if(tree.intersect(r))
-			  sum += Vec3d(shade_ray[shadow](r));
+			        sum += Vec3d(shade_ray[shadow](r));
-			else
+			      else
-			  sum += background;
+			        sum += background;
 #else
-			float t = FLT_MAX;
+			      float t = FLT_MAX;
-			bb_tree.intersect(r);
+			      bb_tree.intersect(r);
-			if(r.has_hit)
+			      if(r.has_hit)
-			  sum += Vec3d(shade_ray[0](r));
+			        sum += Vec3d(shade_ray[0](r));
-			else
+			      else
-			  sum += background;
+			        sum += background;
 #endif
-		  }
+		      }
-		  image[i][j] = Vec3f(sum/static_cast<double>(PIXEL_SUBDIVS*PIXEL_SUBDIVS));
+	      image[i][j] = Vec3f(sum/static_cast<double>(PIXEL_SUBDIVS*PIXEL_SUBDIVS));
-	  }
+      }
-	  if(((i + 1) % 50) == 0) cerr << ".";
+      if(((i + 1) % 50) == 0) cerr << ".";
-	}
+    }
-	cout << " - " << tim.get_secs() << " secs " << endl;
+	  cout << " - " << tim.get_secs() << " secs " << endl;
     cout << endl;
     init_texture(image_tex);
     done = true;
     glClearColor(background[0], background[1], background[2], 1.0);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glLoadIdentity();
-	cam->glSetCamera();
+	  cam->glSetCamera();
     glColor3f(0.5, 0.5, 0.5);
     drawOBJ();
     glDisable(GL_DEPTH_TEST);
+  }
   else
+  {
     obj_load("../../data/dolphins.obj", mesh);
-	cout << "Computing normals" << endl;
+  	cout << "Computing normals" << endl;
     mesh.compute_normals();
-	//cout << "Usage: raytrace any_object.obj";
+    //cout << "Usage: raytrace any_object.obj";
     //exit(0);
+  }
   initRaytracer();
   initGL();

Subversion Repositories gelsvn

(root)/branches/cpp11-devel/apps/Raytracer/raytrace.cpp @ 653 – Rev 417 → 418