Changeset 3081 in orxonox.OLD

Timestamp:

Dec 4, 2004, 11:05:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: better algoritym for normals-calculation

File:

• orxonox/trunk/importer/object.cc (modified) (8 diffs)

orxonox/trunk/importer/object.cc

@@ -777 +777 @@
 bool Object::buildVertexNormals ()
 {
+  
   if (verbose >=2)
     printf("Normals are being calculated.\n");
@@ -783 +784 @@
   for (int i=0; i<vertices->getCount()/3;i++)
     normArray[i] = Vector(.0,.0,.0);
-
+  
   int firstTouch;
   int secondTouch;
@@ -801 +802 @@
               FaceElement* prevElem = firstElem;
               FaceElement* curElem = prevElem->next;
+              FaceElement* lastElem;
+              // close the Chain. !! IMPORTANT:the last Element of the Chain must point to NULL, or it will resolv into an infinity-loop.
+              while (curElem)
+                {
+                  prevElem = curElem;
+                  curElem = curElem->next;
+                }
+              lastElem = prevElem;
+              prevElem->next = firstElem;
               
-              for (int j=1; j<tmpFace->vertexCount-1; j++)
+              curElem = firstElem;
+              for (int j=0; j<tmpFace->vertexCount; j++)
                 {
                   curElem->normalNumber = curElem->vertexNumber;
@@ -809 +820 @@
                   prevV = Vector (vertices->getArray()[prevElem->vertexNumber*3], vertices->getArray()[prevElem->vertexNumber*3+1], vertices->getArray()[prevElem->vertexNumber*3+2]) - curV;
                   nextV = Vector (vertices->getArray()[curElem->next->vertexNumber*3], vertices->getArray()[curElem->next->vertexNumber*3+1], vertices->getArray()[curElem->next->vertexNumber*3+2]) - curV;
-                  normArray[curElem->vertexNumber] = normArray[curElem->vertexNumber] + *(nextV.cross(prevV).getNormalized());
-
-                  // prevV.x, nextV.cross(prevV).x);
-                  
+                  normArray[curElem->vertexNumber] = normArray[curElem->vertexNumber] + nextV.cross(prevV);
+
+                  if (curElem == firstElem )
+                    printf ("schnitt, %d\n", j);
                   prevElem = curElem;
                   curElem = curElem->next;
                 }
-              firstElem->normalNumber = firstElem->vertexNumber;
-              
-              curV = Vector (vertices->getArray()[firstElem->vertexNumber*3], vertices->getArray()[firstElem->vertexNumber*3+1], vertices->getArray()[firstElem->vertexNumber*3+2]);
-              prevV = Vector (vertices->getArray()[prevElem->vertexNumber*3], vertices->getArray()[prevElem->vertexNumber*3+1], vertices->getArray()[prevElem->vertexNumber*3+2]) - curV;
-              nextV = Vector (vertices->getArray()[firstElem->next->vertexNumber*3], vertices->getArray()[firstElem->next->vertexNumber*3+1], vertices->getArray()[firstElem->next->vertexNumber*3+2]) - curV;
-              normArray[curElem->vertexNumber] = normArray[curElem->vertexNumber] + *(nextV.cross(prevV).getNormalized());
-              
+              // reopening the Chain again.
+              lastElem->next = NULL;
             }
           tmpFace = tmpFace->next;
@@ -839 +845 @@
     }
   delete []normArray; 
+  
 }
 
@@ -871 +878 @@
   readVertexTexture ("-1.000000 0.000000");
   readVertexTexture ("-1.000000 1.000000");
-  
+
+  /*  
   readVertexNormal ("0.000000 0.000000 1.000000");
   readVertexNormal ("0.000000 0.000000 1.000000");
@@ -896 +904 @@
   readVertexNormal ("-1.000000 0.000000 0.000000");
   readVertexNormal ("-1.000000 0.000000 0.000000");
-
+  */
+
+  readFace ("1 2 4 3");
+  readFace ("3 4 6 5");
+  readFace ("5 6 8 7");
+  readFace ("7 8 2 1");
+  readFace ("2 8 6 4");
+  readFace ("7 1 3 5");
+
+  /*
   readFace ("1/1/1 2/2/2 4/4/3 3/3/4");
   readFace ("3/3/5 4/4/6 6/6/7 5/5/8");
@@ -903 +920 @@
   readFace ("2/2/17 8/11/18 6/12/19 4/4/20");
   readFace ("7/13/21 1/1/22 3/3/23 5/14/24");
-}
+  */
+}