From a5becc1adc8329b021f1b42cef1baab38d23b71d Mon Sep 17 00:00:00 2001
From: ponchio <federico.ponchio@isti.cnr.it>
Date: Mon, 4 Apr 2005 14:27:54 +0000
Subject: [PATCH] *** empty log message ***

---
 apps/nexus/nexusview.cpp  | 15 +++++++++++++--
 apps/nexus/nxsbuilder.cpp | 10 ++++++++--
 apps/nexus/patch.cpp      |  5 ++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/apps/nexus/nexusview.cpp b/apps/nexus/nexusview.cpp
index e7c50ee8..422323ad 100644
--- a/apps/nexus/nexusview.cpp
+++ b/apps/nexus/nexusview.cpp
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.45  2005/03/02 10:40:17  ponchio
+Extraction rewrittten (to fix recusive problems).
+
 Revision 1.44  2005/03/01 11:20:22  ponchio
 nothing really
 
@@ -296,6 +299,7 @@ int main(int argc, char *argv[]) {
   bool extract = true;
   bool realtime = true;
   bool preload = true;
+  Point4f light(1, -1, 1, 0);
 
   bool output_stats = false;
   char output_filename[100];
@@ -335,7 +339,8 @@ int main(int argc, char *argv[]) {
     " page down  : increase disk space\n"
     " 0          : decrease extraction size\n"
     " 1          : increase extraction size\n"
-    " s: toggle preload\n"
+    " s          : toggle preload\n"
+    " l          : change light\n"
     
 
     " d: debug mode (show patches colored)\n"
@@ -427,6 +432,12 @@ int main(int argc, char *argv[]) {
                   contest.attrs |=DrawContest::SPHERES;
                 break;
 	    
+  case SDLK_l: 
+    light[0] = rand();
+    light[1] = rand();
+    light[2] = rand();
+    light.Normalize();
+    break;
 	case SDLK_o: realtime = !realtime; break;
 	case SDLK_s: preload = !preload; nexus.SetPreload(preload); break;
 	case SDLK_t: show_statistics = !show_statistics; break;
@@ -504,7 +515,7 @@ int main(int argc, char *argv[]) {
     track.GetView();
     track.Apply();
 
-    Point4f light(1, -1, 1, 0);
+  
     glLightfv(GL_LIGHT0, GL_POSITION, &light[0]);
 
 
diff --git a/apps/nexus/nxsbuilder.cpp b/apps/nexus/nxsbuilder.cpp
index 6c564d39..89dc1694 100644
--- a/apps/nexus/nxsbuilder.cpp
+++ b/apps/nexus/nxsbuilder.cpp
@@ -24,6 +24,10 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.22  2005/02/22 14:20:44  ponchio
+debug and mostly vertex unifying across borders
+(still not perfect... :P)
+
 Revision 1.21  2005/02/22 10:38:11  ponchio
 Debug, cleaning and optimization.
 
@@ -390,10 +394,12 @@ void ThirdStep(const string &crudefile, const string &output,
 	continue;
       }
       norm /= len;
+#ifndef WIN32
       if(isnan(norm[0]) || isnan(norm[1]) || isnan(norm[2])) {
 	cerr << "Invalid normal computation. Strange.\n";
 	continue;
       }
+#endif
       normals.push_back(norm);
     }
     ANCone3f cone;
@@ -681,7 +687,7 @@ int main(int argc, char *argv[]) {
 
   unsigned int ram_buffer = 128000000; //step 2, 3, 4
   unsigned int chunk_size = 1024;      //step 2, 3, 4
-  int step = -1; //means all of them.
+  int step = -1; //means all of them.  
   
   int option;
   while((option = getopt(argc, argv, "f:t:l:s:d:o:b:c:p:")) != EOF) {
@@ -744,7 +750,7 @@ int main(int argc, char *argv[]) {
     return -1;
   }
   string crudefile = argv[optind];
-  string output = argv[optind+1];
+  string output = argv[optind+1];  
 
   if(step < 0 || step == 0)
     FirstStep(crudefile, output, patch_size, patch_threshold,
diff --git a/apps/nexus/patch.cpp b/apps/nexus/patch.cpp
index 27600838..5320b688 100644
--- a/apps/nexus/patch.cpp
+++ b/apps/nexus/patch.cpp
@@ -24,6 +24,9 @@
   History
 
 $Log: not supported by cvs2svn $
+Revision 1.13  2005/02/22 10:38:15  ponchio
+Debug, cleaning and optimization.
+
 Revision 1.12  2005/02/21 19:05:58  ponchio
 i already fixed this bug. I hate you cvs.
 
@@ -59,7 +62,7 @@ static double wrkmem[LZO1X_999_MEM_COMPRESS/sizeof(double) +1];
 Encodings Patch::encodings;
 
 Encodings::Encodings() {
-  for(unsigned int i = 0; i < 256; i++) {
+  for(unsigned int i = 0; i < 17; i++) {
     e[i].bytes = 0;
     e[i].comps = 0;
     e[i].pack = NULL;