Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[MANTA] r1004 - in trunk/Model: Groups Readers


Chronological Thread 
  • From: bigler@sci.utah.edu
  • To: manta@sci.utah.edu
  • Subject: [MANTA] r1004 - in trunk/Model: Groups Readers
  • Date: Fri, 7 Apr 2006 14:26:46 -0600 (MDT)

Author: bigler
Date: Fri Apr  7 14:26:46 2006
New Revision: 1004

Modified:
   trunk/Model/Groups/KDTree2.cc
   trunk/Model/Readers/IW.cc
Log:

Model/Groups/KDTree2.cc

  Minor tweaks.

Model/Readers/IW.cc

  Copy over the num_empty_nodes to the tree before returning.


Modified: trunk/Model/Groups/KDTree2.cc
==============================================================================
--- trunk/Model/Groups/KDTree2.cc       (original)
+++ trunk/Model/Groups/KDTree2.cc       Fri Apr  7 14:26:46 2006
@@ -116,8 +116,8 @@
       top->right->index = current_node_index++;
 
       // Push the children on the stack
-      nodestack.push(top->left);
       nodestack.push(top->right);
+      nodestack.push(top->left);
       
     } else {
       // Leaf
@@ -126,8 +126,7 @@
       node.listBegin = current_tri_index;
       unsigned int* tri_ids_p = tri_indices + current_tri_index;
       for(unsigned int i = 0; i < node.listLen; ++i) {
-        *tri_ids_p = top->tri_ids[i];
-        ++tri_ids_p;
+        tri_ids_p[i] = top->tri_ids[i];
       }
       current_tri_index += node.listLen;
     }

Modified: trunk/Model/Readers/IW.cc
==============================================================================
--- trunk/Model/Readers/IW.cc   (original)
+++ trunk/Model/Readers/IW.cc   Fri Apr  7 14:26:46 2006
@@ -327,6 +327,7 @@
   IWTree* tree = new IWTree();
   tree->head = head;
   tree->num_nodes = num_nodes;
+  tree->num_empty_nodes = num_empty_nodes;
   tree->num_tri_indices = num_tri_indices;
 
   return tree;




  • [MANTA] r1004 - in trunk/Model: Groups Readers, bigler, 04/07/2006

Archive powered by MHonArc 2.6.16.

Top of page