Changeset 3071 in orxonox.OLD

Timestamp:

Dec 3, 2004, 9:14:21 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: now reading in as floats instead of char*

File:

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

orxonox/trunk/importer/object.cc

@@ -323 +323 @@
     printf("preparing to read in file: %s\n", fileName);   
   objFileName = fileName;
-  this->readFromObjFile (objFileName);
+  this->readFromObjFile (fileName);
   return true;
 }
@@ -432 +432 @@
 bool Object::readVertex (char* vertexString)
 {
-  char subbuffer1[20];
-  char subbuffer2[20];
-  char subbuffer3[20];
-  sscanf (vertexString, "%s %s %s", subbuffer1, subbuffer2, subbuffer3);
+  float subbuffer1;
+  float subbuffer2;
+  float subbuffer3;
+  sscanf (vertexString, "%f %f %f", &subbuffer1, &subbuffer2, &subbuffer3);
   if (verbose >= 3)
-    printf ("reading in a vertex: %s %s %s\n", subbuffer1, subbuffer2, subbuffer3);
-  vertices->addEntry(atof(subbuffer1)*scaleFactor, atof(subbuffer2)*scaleFactor, atof(subbuffer3)*scaleFactor);
+    printf ("reading in a vertex: %f %f %f\n", &subbuffer1, &subbuffer2, &subbuffer3);
+  vertices->addEntry(subbuffer1*scaleFactor, subbuffer2*scaleFactor, subbuffer3*scaleFactor);
   return true;
 }
@@ -485 +485 @@
 bool Object::readVertexNormal (char* normalString)
 {
-  char subbuffer1[20];
-  char subbuffer2[20];
-  char subbuffer3[20];
-  sscanf (normalString, "%s %s %s", subbuffer1, subbuffer2, subbuffer3);
+  float subbuffer1;
+  float subbuffer2;
+  float subbuffer3;
+  sscanf (normalString, "%f %f %f", &subbuffer1, &subbuffer2, &subbuffer3);
   if (verbose >=3 )
-    printf("found vertex-Normal %s, %s, %s\n", subbuffer1,subbuffer2,subbuffer3);
-  normals->addEntry(atof(subbuffer1), atof(subbuffer2), atof(subbuffer3));
+    printf("found vertex-Normal %f, %f, %f\n", &subbuffer1,&subbuffer2,&subbuffer3);
+  normals->addEntry(subbuffer1, subbuffer2, subbuffer3);
   return true;
 }
@@ -502 +502 @@
 bool Object::readVertexTexture (char* vTextureString)
 {
-  char subbuffer1[20];
-  char subbuffer2[20];
-  sscanf (vTextureString, "%s %s", subbuffer1, subbuffer2);
+  float subbuffer1;
+  float subbuffer2;
+  sscanf (vTextureString, "%f %f", &subbuffer1, &subbuffer2);
   if (verbose >=3 )
-    printf("found vertex-Texture %s, %s\n", subbuffer1,subbuffer2);
-  vTexture->addEntry(atof(subbuffer1));
-  vTexture->addEntry(atof(subbuffer2));
+    printf("found vertex-Texture %f, %f\n", &subbuffer1, &subbuffer2);
+  vTexture->addEntry(subbuffer1);
+  vTexture->addEntry(subbuffer2);
   return true;
 }