Changeset 3082 in orxonox.OLD for orxonox

Timestamp:

Dec 4, 2004, 11:24:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: FaceElements-Chain does not have to be changed anymore in the normal-Process

File:

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

orxonox/trunk/importer/object.cc

@@ -800 +800 @@
             {
               FaceElement* firstElem = tmpFace->firstElem;
-              FaceElement* prevElem = firstElem;
-              FaceElement* curElem = prevElem->next;
+              FaceElement* prevElem;
+              FaceElement* curElem = firstElem;
+              FaceElement* nextElem;
               FaceElement* lastElem;
-              // close the Chain. !! IMPORTANT:the last Element of the Chain must point to NULL, or it will resolv into an infinity-loop.
+              // find last Element of the Chain. !! IMPORTANT:the last Element of the Chain must point to NULL, or it will resolv into an infinity-loop.
               while (curElem)
                 {
@@ -810 +811 @@
                 }
               lastElem = prevElem;
-              prevElem->next = firstElem;
               
               curElem = firstElem;
               for (int j=0; j<tmpFace->vertexCount; j++)
                 {
+                  if (!(nextElem = curElem->next))
+                    nextElem = firstElem;
                   curElem->normalNumber = curElem->vertexNumber;
                   
                   curV = Vector (vertices->getArray()[curElem->vertexNumber*3], vertices->getArray()[curElem->vertexNumber*3+1], vertices->getArray()[curElem->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()[curElem->next->vertexNumber*3], vertices->getArray()[curElem->next->vertexNumber*3+1], vertices->getArray()[curElem->next->vertexNumber*3+2]) - curV;
+                  nextV = Vector (vertices->getArray()[nextElem->vertexNumber*3], vertices->getArray()[nextElem->vertexNumber*3+1], vertices->getArray()[nextElem->vertexNumber*3+2]) - curV;
                   normArray[curElem->vertexNumber] = normArray[curElem->vertexNumber] + nextV.cross(prevV);
 
-                  if (curElem == firstElem )
-                    printf ("schnitt, %d\n", j);
                   prevElem = curElem;
                   curElem = curElem->next;
                 }
-              // reopening the Chain again.
-              lastElem->next = NULL;
             }
           tmpFace = tmpFace->next;