WebSVN – gelsvn – Diff – /trunk/src/Geometry/BSPTree.cpp

       BBox left_bbox = bbox;
       BBox right_bbox = bbox;
       double size = bbox.max_corner[node.axis_leaf]- bbox.min_corner[node.axis_leaf];
       double center = size*(double)new_pos/(double)TESTS + bbox.min_corner[node.axis_leaf];
-      double diff = f_eps < size/8.0 ? f_eps : size/8.0;
+      double diff = f_eps < size/8.0 ? size/8.0 : f_eps;
       if (left_zero)
+      {
         // Find min position of all triangle vertices and place the center there
         center = bbox.max_corner[node.axis_leaf];
 /*__declspec(align(16))*/ static const unsigned int modulo[] = {0,1,2,0,1};
   inline bool intersect2(Ray &ray, const TriAccel &acc, double t_max)
+  {
-//  cout << "Acc: " << (int)&acc << " ";
 //inline bool Intersect(TriAccel &acc,Ray &ray)
 #define ku modulo[acc.k+1]
 #define kv modulo[acc.k+2]
     // dont prefetch here, assume data has already been prefetched
     // start high-latency division as early as possible
     return true;
+  }
   bool BSPTree::intersect_node(Ray &ray, const BSPNode &node, double t_min, double t_max) const
+  {
-//    cout << node.plane << endl;
     node_calls++;
     if (node.axis_leaf==4)
+    {
       bool found = false;
       for(int i=0; i < node.count; ++i)
+      {
-//        const TriAccel* tri2 = all_triaccel[node.id+i];
         const ISectTri* tri = all_objects[node.id+i];
-//        if (intersect2(ray, *tri2, t_max))
-//          found=true;
         if (intersect(ray, *tri, t_max))
           found=true;
+        //const TriAccel* tri2 = all_triaccel[node.id+i];
+        //if (intersect2(ray, *tri2, t_max))
+        //  found=true;
+      }
       if (found)
         return true;
       else
         return false;
     double t_min, t_max;
     bbox.intersect_min_max(ray, t_min, t_max);
     if (t_min>t_max)
       return false;
-//    printf("%.2f %.2f %.2f\n", ray.dist, t_min, t_max);
     if (!intersect_node(ray, *root, t_min, t_max))
       return false;
-//  cout << "____" << endl;
-//  ray.reset();
-//  cout << "Here " << endl;
-//    intersect_fast_node(ray, &fast_tree[0], t_min, t_max);
+    //intersect_fast_node(ray, &fast_tree[0], t_min, t_max);
-    //  if (!ray.has_hit)
+    //if (!ray.has_hit)
-    //return false;
+    //  return false;
     else
+    {
-      //printf("HIT\n");
       // Calculate the normal at the intersection
       ray.id = reinterpret_cast<int>(ray.hit_object);
       ray.hit_object = trimesh[ray.id];
       Vec3i face = ray.hit_object->normals.face(ray.hit_face_id);
 #define ABSP_ISLEAF(n)       (n->inner.flagAndOffset & (unsigned int)1<<31)
 #define ABSP_DIMENSION(n)    (n->inner.flagAndOffset & 0x3)
 #define ABSP_OFFSET(n)       (n->inner.flagAndOffset & (0x7FFFFFFC))
 #define ABSP_NEARNODE(n)     (FastBSPNode*)(ray.direction[dimension]>=0?ABSP_OFFSET(node):ABSP_OFFSET(node)+sizeof(*node))
 #define ABSP_FARNODE(n)      (FastBSPNode*)(ray.direction[dimension]>=0?ABSP_OFFSET(node)+sizeof(*node):ABSP_OFFSET(node))
-#define ABSP_TRIANGLENODE(n) (vector<TriAccel*>::iterator)(n->flagAndOffset & (0x7FFFFFFF))
   struct Stack
+  {
     FastBSPNode *node;
     double t_min;
   };
   inline void IntersectAlltrianglesInLeaf(const BSPLeaf* leaf, Ray &ray, double t_max) {
     TriAccel** tri_acc_ptr = reinterpret_cast<TriAccel**>(leaf->flagAndOffset & (0x7FFFFFFF));
     vector<TriAccel*>::iterator acc = vector<TriAccel*>::iterator(tri_acc_ptr);
-//  vector<TriAccel*>::iterator acc = ABSP_TRIANGLENODE(leaf);
     for(unsigned int i=0;i<leaf->count;++i)
       intersect2(ray, *(*acc++), t_max);
+  }
   void BSPTree::intersect_fast_node(Ray &ray, const FastBSPNode *node, double t_min, double t_max) const

Subversion Repositories gelsvn

(root)/trunk/src/Geometry/BSPTree.cpp – Rev 430 → 438