Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/importer

Timestamp:

Mar 1, 2005, 9:50:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/importer/Makefile.am (modified) (1 diff)
• src/importer/Makefile.in (modified) (8 diffs)
• src/importer/array.h (modified) (1 diff)
• src/importer/framework.cc (modified) (4 diffs)
• src/importer/framework.h (modified) (2 diffs)
• src/importer/material.cc (modified) (2 diffs)
• src/importer/material.h (modified) (1 diff)
• src/importer/model.cc (modified) (24 diffs)
• src/importer/model.h (modified) (6 diffs)
• src/importer/objModel.cc (copied) (copied from orxonox/trunk/src/importer/objModel.cc)
• src/importer/objModel.h (copied) (copied from orxonox/trunk/src/importer/objModel.h)
• src/importer/vector.cc (deleted)
• src/importer/vector.h (deleted)

orxonox/branches/trackManager/src/importer/Makefile.am

@@ -9 +9 @@
                   windowHandler.cc \
                   model.cc \
+                  objModel.cc \
                   array.cc \
                   material.cc \
                   texture.cc \
-                  vector.cc 
+                  ../vector.cc
 
 noinst_HEADERS= framework.h \
                 windowHandler.h \
                 model.h \
+                objModel.h \
                 array.h \
                 material.h \

orxonox/branches/trackManager/src/importer/Makefile.in

@@ -54 +54 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        model.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
-        texture.$(OBJEXT) vector.$(OBJEXT)
+        model.$(OBJEXT) objModel.$(OBJEXT) array.$(OBJEXT) \
+        material.$(OBJEXT) texture.$(OBJEXT) vector.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -63 +63 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po ./$(DEPDIR)/vector.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/texture.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -89 +89 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
@@ -104 +106 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK2_CFLAGS = @GTK2_CFLAGS@
 GTK2_LIBS = @GTK2_LIBS@
+HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
+HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
+HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
+HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
 HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
 HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
@@ -129 +137 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
+SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
@@ -178 +188 @@
                   windowHandler.cc \
                   model.cc \
+                  objModel.cc \
                   array.cc \
                   material.cc \
                   texture.cc \
-                  vector.cc 
+                  ../vector.cc
 
 noinst_HEADERS = framework.h \
                 windowHandler.h \
                 model.h \
+                objModel.h \
                 array.h \
                 material.h \
@@ -260 +272 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
@@ -279 +292 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+vector.o: ../vector.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f '../vector.cc' || echo '$(srcdir)/'`../vector.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f '../vector.cc' || echo '$(srcdir)/'`../vector.cc
+
+vector.obj: ../vector.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.obj -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.obj `if test -f '../vector.cc'; then $(CYGPATH_W) '../vector.cc'; else $(CYGPATH_W) '$(srcdir)/../vector.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='../vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f '../vector.cc'; then $(CYGPATH_W) '../vector.cc'; else $(CYGPATH_W) '$(srcdir)/../vector.cc'; fi`
 uninstall-info-am:
 

orxonox/branches/trackManager/src/importer/array.h

@@ -12 +12 @@
 
 #include "../stdincl.h"
-#include <fstream>
-
 
 //! Array Class that handles dynamic-float arrays.

orxonox/branches/trackManager/src/importer/framework.cc

@@ -16 +16 @@
 #include "framework.h"
 
+#include "../vector.h"
+
+int verbose;
 void DrawGLScene()
 {
@@ -52 +55 @@
 int main(int argc, char *argv[])
 {
-  verbose = 2;
-
-  PRINTF(2)("This is The big verbose-Test %i, %s\n", 1, "cool");
+  verbose = 3;
 
   Uint8* keys; // This variable will be used in the keyboard routine
@@ -71 +72 @@
   PRINTF(2)("screensize: %i, %i\n", wHandler.screen->w, wHandler.screen->h);
   if (argc>=3)
-    obj = new Model (argv[1], atof(argv[2]));
+    obj = new OBJModel (argv[1], atof(argv[2]));
   else if (argc>=2)
-    obj = new Model(argv[1]);
+    obj = new OBJModel(argv[1]);
   else 
-    obj = new Model();
-  
+    {
+      // This is an example, of how it is possible, to create a new Model, and adding some vertex-information.
+      // This also packs everything into a DisplayList, and can be handled exactly as any other model.
+      // This is an example of a cube with Texture-Coordinates, but without explicite Vertex-Normals. (they are soft-created).
+      /*
+      obj = (OBJModel*) new Model();
+      obj->setName("CUBE");
+      obj->addVertex (-0.5, -0.5, 0.5);
+      obj->addVertex (0.5, -0.5, 0.5);
+      obj->addVertex (-0.5, 0.5, 0.5);
+      obj->addVertex (0.5, 0.5, 0.5);
+      obj->addVertex (-0.5, 0.5, -0.5);
+      obj->addVertex (0.5, 0.5, -0.5);
+      obj->addVertex (-0.5, -0.5, -0.5);
+      obj->addVertex (0.5, -0.5, -0.5);
+      
+      obj->addVertexTexture (0.0, 0.0);
+      obj->addVertexTexture (1.0, 0.0);
+      obj->addVertexTexture (0.0, 1.0);
+      obj->addVertexTexture (1.0, 1.0);
+      obj->addVertexTexture (0.0, 2.0);
+      obj->addVertexTexture (1.0, 2.0);
+      obj->addVertexTexture (0.0, 3.0);
+      obj->addVertexTexture (1.0, 3.0);
+      obj->addVertexTexture (0.0, 4.0);
+      obj->addVertexTexture (1.0, 4.0);
+      obj->addVertexTexture (2.0, 0.0);
+      obj->addVertexTexture (2.0, 1.0);
+      obj->addVertexTexture (-1.0, 0.0);
+      obj->addVertexTexture (-1.0, 1.0);
+
+      obj->addFace ("1 2 4 3");
+      obj->addFace ("3 4 6 5");
+      obj->addFace ("5 6 8 7");
+      obj->addFace ("7 8 2 1");
+      obj->addFace ("2 8 6 4");
+      obj->addFace ("7 1 3 5");
+      obj->finalize();
+      */
+      obj = (OBJModel*) new Model(CYLINDER);
+    }
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
   rotAxis = Vector (0.0,1.0,0.0);
@@ -215 +255 @@
           case SDLK_c:
             if (!obj)
-              obj = new Model(argv[1]);
+              obj = new OBJModel(argv[1]);
             break;
+          case SDLK_a:
+            zoomTo /=2;
+            break;
+          case SDLK_z:
+            zoomTo *=2;
+
           }
         break;

orxonox/branches/trackManager/src/importer/framework.h

@@ -3 +3 @@
  
 #include "windowHandler.h" // Include the Whandler Basecode
-#include "model.h"
-#include "vector.h"
+#include "objModel.h"
+
+class Vector;
 
 float rotatorP;
@@ -33 +34 @@
 
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
-Model* obj;
+OBJModel* obj;
 
 

orxonox/branches/trackManager/src/importer/material.cc

@@ -16 +16 @@
 
 #include "material.h"
+
+#include "texture.h"
+#include <stdlib.h>
+#include <string.h>
 
 using namespace std;
@@ -112 +116 @@
   while (searcher != NULL)
     {
-      PRINTF(2)(".");
+      PRINT(2)(".");
       if (!strcmp (searcher->getName(), mtlName))
         {
-          PRINTF(2)("found.\n");
+          PRINT(2)("found.\n");
           return searcher;
         }
       searcher = searcher->nextMat;
     }
-  PRINTF(2)("not found\n");
+  PRINT(2)("not found\n");
   return NULL;
 }

orxonox/branches/trackManager/src/importer/material.h

@@ -13 +13 @@
 extern int verbose; //!< will be obsolete soon.
 
-#include "../stdincl.h"
-#include "texture.h"
-
 #if HAVE_CONFIG_H 
 #include <config.h> 
 #endif /* HAVE_CONFIG_H */
 
-
+// FORWARD DEFINITIONS //
+class Texture;
 
 

orxonox/branches/trackManager/src/importer/model.cc

@@ -15 +15 @@
 
 #include "model.h"
-int verbose = 1; //! \todo should be GLOBAL
+
+#include <math.h>
+#include <stdarg.h>
+
+#include "array.h"
+#include "../vector.h"
+
 using namespace std;
 
 /**
-   \brief Creates a 3D-Model, but does not load any 3D-models.
-
-   This Constructor is pretty useless, because why load no model in an model-loader??
-*/
-Model::Model ()
-{
-
+   \brief Creates a 3D-Model.
+
+   This only initializes a 3D-Model, but does not cleanup the Faces.
+*/
+Model::Model(void)
+{
   this->initialize();
-
-  this->BoxModel();
-
+}
+
+/**
+   \brief Creates a 3D-Model of Primitive-Type type
+
+   if you want to just display a Cube/Sphere/Cylinder/... without any material.
+   
+   \todo implement Cube/Sphere/Cylinder/...
+*/
+Model::Model(PRIMITIVE type)
+{
+  this->initialize();
+
+  switch (type)
+    {
+    default:
+    case CUBE:
+      this->cubeModel();
+      break;
+    case SPHERE:
+      this->sphereModel();
+      break;
+    case CYLINDER:
+      this->cylinderModel();
+      break;
+
+    }
   this->importToGL ();
 
@@ -36 +65 @@
 
 /**
-   \brief Crates a 3D-Model and loads in a File.
-   \param fileName file to parse and load (must be a .obj file)
-*/
-Model::Model(char* fileName)
+   \brief Creates a 3D-Model. and assigns it a Name.
+*/
+Model::Model(char* modelName)
 {
   this->initialize();
-
-  this->importFile (fileName);
-
-  this->importToGL ();
-
-  this->cleanup();
-}
-
-/**
-   \brief Crates a 3D-Model, loads in a File and scales it.
-   \param fileName file to parse and load (must be a .obj file)
-   \param scaling The factor that the model will be scaled with.
-*/
-Model::Model(char* fileName, float scaling)
-{
-  this->initialize();
-  this->scaleFactor = scaling;
-
-  this->importFile (fileName);
-
-  this->importToGL ();
-
-  this->cleanup();
+  this->setName(modelName);
 }
 
@@ -72 +78 @@
    Looks if any from model allocated space is still in use, and if so deleted it.
 */
-Model::~Model()
-{
-  PRINTF(2)("Deleting display Lists.\n");
+Model::~Model(void)
+{
+  PRINTF(3)("Deleting Model ");
+  if (this->name)
+    {
+      PRINT(3)("%s\n", this->name);
+      delete []this->name;
+    }
+  else
+      PRINT(3)("\n");
+
+  PRINTF(3)("Deleting display Lists.\n");
   Group* walker = this->firstGroup;
   while (walker != NULL)
@@ -84 +99 @@
     }
 
-  if (this->objPath)
-    delete []this->objPath;
-  if (this->objFileName)
-    delete []this->objFileName;
-  if (this->mtlFileName)
-    delete []this->mtlFileName;
-  PRINTF(2)("Deleting Materials.\n");
+  PRINTF(3)("Deleting Materials.\n");
   if (this->material)
     delete this->material;
 }
 
+/**
+   \brief Finalizes an Object. This can be done outside of the Class.
+*/
+void Model::finalize(void)
+{
+  this->importToGL ();
+  
+  this->cleanup();
+
+  this->finalized = true;
+}
 
 /**
@@ -139 +159 @@
       walker = walker->next;
     }
-  PRINTF(1)("Model number %i in %s not Found.\n", groupNumber, this->objFileName);
+  PRINTF(1)("Model number %i in %s not Found.\n", groupNumber, this->name);
   return;
 
@@ -164 +184 @@
       walker = walker->next;
     }
-  PRINTF(1)("Model Named %s in %s not Found.\n", groupName, this->objFileName);
+  PRINTF(1)("Model Named %s in %s not Found.\n", groupName, this->name);
   return;
 }
@@ -186 +206 @@
   PRINTF(2)("new 3D-Model is being created\n"); 
 
+  this->name = NULL;
+  this->finalized = false;
   // setting the start group;
   this->firstGroup = new Group;
@@ -192 +214 @@
   
   this->initGroup (this->currentGroup);
-  this->objPath = NULL;
-  this->objFileName = NULL;
-  this->mtlFileName = NULL;
   this->scaleFactor = 1;
   this->material = new Material();
@@ -205 +224 @@
 }
 
+void Model::setName(const char* name)
+{
+  if (this->name) 
+    delete this->name;
+  this->name = new char[strlen(name)+1];
+  strcpy(this->name, name);
+}
 /**
    \brief initializes a new Group model
@@ -317 +343 @@
 
 /**
-   \brief Imports a obj file and handles the the relative location
-   \param fileName The file to import
-*/
-bool Model::importFile (char* fileName)
-{
-  PRINTF(3)("preparing to read in file: %s\n", fileName);
-
-
-#ifdef __WIN32__
-  // win32 path reading
-  char pathSplitter= '\\';
-#else /* __WIN32__ */
-  // unix path reading
-  char pathSplitter='/';
-#endif /* __WIN32__ */
-  char* tmpName = fileName;
-  if (tmpName[0] == pathSplitter)
-    tmpName++;
-  char* name = tmpName;
-  while (( tmpName = strchr (tmpName+1, pathSplitter)))
-    {
-      name = tmpName+1;
-    }
-  this->objPath = new char[name-fileName];
-  strncpy(this->objPath, fileName, name-fileName);
-  this->objPath[name-fileName] = '\0';
-  if (verbose >=2)
-    if (strlen(objPath)> 0)
-      PRINTF(0)("Resolved file %s to folder: %s.\n", name, objPath);
-    else
-      PRINTF(0)("Resolved file %s.\n", name);
-  
-  if (this->material)
-    this->material->addTexturePath(this->objPath);
-  this->objFileName = new char[strlen(name)+1];
-  strcpy (this->objFileName, name);
-  this->readFromObjFile ();
-  return true;
-}
-
-/**
-   \brief Reads in the .obj File and sets all the Values.
-   This function does read the file, parses it for the occurence of things like vertices, faces and so on, and executes the specific tasks
-*/
-bool Model::readFromObjFile (void)
-{
-  char* fileName = new char [strlen(objPath)+strlen(objFileName)+1];
-  if (this->objFileName != NULL && !strcmp(this->objFileName, ""))
-    return false;
-  strcpy(fileName, this->objPath);
-  strcat(fileName, this->objFileName);
-
-  ifstream* OBJ_FILE = new ifstream(fileName);
-  if (OBJ_FILE->fail())
-    {
-      PRINTF(1)("unable to open .OBJ file: %s\n Loading Box Model instead.\n", fileName);
-      BoxModel();
-      OBJ_FILE->close();
-      delete []fileName;
-      delete OBJ_FILE;
-      return false;
-    }
-  PRINTF(2)("Reading from opened file %s\n", fileName);
-  char Buffer[10000];
-  while(!OBJ_FILE->eof())
-    {
-      OBJ_FILE->getline(Buffer, 10000);
-      PRINTF(3)("Read input line: %s\n", Buffer);
-      
-
-      // case vertice
-      if (!strncmp(Buffer, "v ", 2))
-        {
-          this->readVertex(Buffer+2);
-        }
-
-      // case face
-      else if (!strncmp(Buffer, "f ", 2))
-        {
-          this->readFace (Buffer+2);
-        }
-      
-      else if (!strncmp(Buffer, "mtllib ", 7))
-        {
-          this->readMtlLib (Buffer+7);
-        }
-
-      else if (!strncmp(Buffer, "usemtl ", 7))
-        {
-          this->readUseMtl (Buffer+7);
-        }
-
-      // case VertexNormal
-      else if (!strncmp(Buffer, "vn ", 3))
-        {
-          this->readVertexNormal(Buffer+3);
-        }
-      
-      // case VertexTextureCoordinate
-      else if (!strncmp(Buffer, "vt ", 3))
-        {
-          this->readVertexTexture(Buffer+3);
-        }
-      // case group
-      else if (!strncmp(Buffer, "g ", 2))
-        {
-          this->readGroup (Buffer+2);
-        }
-      else if (!strncmp(Buffer, "s ", 2)) //! \todo smoothing groups have to be implemented
-        {
-          if (verbose >= 2)
-            PRINTF(2)("smoothing groups not supportet yet. line: %s\n", Buffer);
-        }
-    }
-  OBJ_FILE->close();
-  delete OBJ_FILE;
-  delete []fileName;
-  return true;
-
-}
-
-/**
    \brief parses a group String
    \param groupString the new Group to create
@@ -445 +349 @@
    With it you should be able to import .obj-files with more than one Models inside. 
 */
-bool Model::readGroup (char* groupString)
+bool Model::addGroup (char* groupString)
 {
   PRINTF(3)("Read Group: %s.\n", groupString);
@@ -470 +374 @@
    If a vertex line is found this function will inject it into the vertex-Array
 */
-bool Model::readVertex (char* vertexString)
+bool Model::addVertex (char* vertexString)
 {
   float subbuffer1;
@@ -482 +386 @@
 
 /**
+   \brief parses a vertex-String
+   \param x the X-coordinate of the Vertex to add.
+   \param y the Y-coordinate of the Vertex to add.
+   \param z the Z-coordinate of the Vertex to add.
+   
+*/
+bool Model::addVertex(const float x, const float y, const float z)
+{
+  PRINTF(4)("reading in a vertex: %f %f %f\n", x, y, z);
+  this->vertices->addEntry(x*scaleFactor, y*scaleFactor, z*scaleFactor);
+  return true;
+}
+
+/**
    \brief parses a face-string
    \param faceString The String that will be parsed.
 
    If a face line is found this function will add it to the glList.
-   The function makes a difference between QUADS and TRIANGLES, and will if changed re-open, set and re-close the gl-processe.
-*/
-bool Model::readFace (char* faceString)
+*/
+bool Model::addFace (char* faceString)
 {
   if (this->currentGroup->faceCount >0)
@@ -546 +463 @@
 
 /**
+   \brief adds a new Face
+   \param faceElemCount the number of Vertices to add to the Face.
+   \param type 0: vertex only, 1: vertex and normal, 2: vertex and Texture, 3 vertex, normal and texture
+*/
+bool Model::addFace(const float faceElemCount, int type, ...)
+{
+   if (this->currentGroup->faceCount > 0)
+    this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
+  this->initFace (this->currentGroup->currentFace);
+
+  FaceElement* tmpElem = this->currentGroup->currentFace->firstElem = new FaceElement;
+  tmpElem->next = NULL;
+  
+  va_list itemlist;
+  va_start (itemlist, type);
+
+  for (int i = 0; i < faceElemCount; i++)
+    {
+      if (this->currentGroup->currentFace->vertexCount>0)
+          tmpElem = tmpElem->next = new FaceElement;
+      tmpElem->next = NULL;
+
+      tmpElem->vertexNumber = va_arg (itemlist, int) -1;
+      if (type >= 2)
+        tmpElem->texCoordNumber = va_arg (itemlist, int) -1;
+      if (type == 1 || type ==3)
+        tmpElem->normalNumber = va_arg(itemlist, int) -1;
+      this->currentGroup->currentFace->vertexCount++;
+    }
+  va_end(itemlist);
+
+  this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount - 2;
+}
+
+/**
    \brief parses a vertexNormal-String
    \param normalString The String that will be parsed.
@@ -551 +503 @@
    If a vertexNormal line is found this function will inject it into the vertexNormal-Array
 */
-bool Model::readVertexNormal (char* normalString)
+bool Model::addVertexNormal (char* normalString)
 {
   float subbuffer1;
@@ -563 +515 @@
 
 /**
+   \brief adds a VertexNormal.
+   \param x The x coordinate of the Normal.
+   \param y The y coordinate of the Normal.
+   \param z The z coordinate of the Normal.
+
+   If a vertexNormal line is found this function will inject it into the vertexNormal-Array
+*/
+bool Model::addVertexNormal(const float x, const float y, const float z)
+{
+  PRINTF(3)("found vertex-Normal %f, %f, %f\n", x, y, z);
+  this->normals->addEntry(x, y, z);
+}
+
+/**
    \brief parses a vertexTextureCoordinate-String
    \param vTextureString The String that will be parsed.
@@ -569 +535 @@
    this function will inject it into the vertexTexture-Array
 */
-bool Model::readVertexTexture (char* vTextureString)
+bool Model::addVertexTexture (char* vTextureString)
 {
   float subbuffer1;
@@ -580 +546 @@
 }
 
-/** 
-    \brief Function to read in a mtl File.
-    \param mtlFile The .mtl file to read
-
-    This Function parses all Lines of an mtl File.
-    The reason for it not to be in the materials-class is,
-    that a material does not have to be able to read itself in from a File.
-
-*/
-bool Model::readMtlLib (char* mtlFile)
-{
-  this->mtlFileName = new char [strlen(mtlFile)+1];
-  strcpy(this->mtlFileName, mtlFile);
-  char* fileName = new char [strlen(objPath) + strlen(this->mtlFileName)+1];
-  strcpy(fileName, this->objPath);
-  strcat(fileName, this->mtlFileName);
-  
-
-  PRINTF(3)("Opening mtlFile: %s\n", fileName);
-
-  ifstream* MTL_FILE = new ifstream (fileName);
-  if (MTL_FILE->fail())
-    {
-      PRINTF(1)("unable to open file: %s\n", fileName);
-      MTL_FILE->close();
-      delete []fileName;
-      delete MTL_FILE;
-      return false;
-    }
-  char Buffer[500];
-  Material* tmpMat = material;
-  while(!MTL_FILE->eof())
-    {
-      MTL_FILE->getline(Buffer, 500);
-      PRINTF(4)("found line in mtlFile: %s\n", Buffer);
-      
-
-      // create new Material
-      if (!strncmp(Buffer, "newmtl ", 7))
-        {
-          tmpMat = tmpMat->addMaterial(Buffer+7);
-          //      PRINTF(2)("%s, %p\n", tmpMat->getName(), tmpMat);
-        }
-      // setting a illumMode
-      else if (!strncmp(Buffer, "illum ", 6))
-        {
-          tmpMat->setIllum(Buffer+6);
-
-        }
-      // setting Diffuse Color
-      else if (!strncmp(Buffer, "Kd ", 3))
-        {
-          tmpMat->setDiffuse(Buffer+3);
-        }
-      // setting Ambient Color
-      else if (!strncmp(Buffer, "Ka ", 3))
-        {
-          tmpMat->setAmbient(Buffer+3);
-        }
-      // setting Specular Color
-      else if (!strncmp(Buffer, "Ks ", 3))
-        {
-          tmpMat->setSpecular(Buffer+3);
-        }
-      // setting The Specular Shininess
-      else if (!strncmp(Buffer, "Ns ", 3))
-        {
-          tmpMat->setShininess(Buffer+3);
-        }
-      // setting up transparency
-      else if (!strncmp(Buffer, "d ", 2))
-        {
-          tmpMat->setTransparency(Buffer+2);
-        }
-      else if (!strncmp(Buffer, "Tf ", 3))
-        {
-          tmpMat->setTransparency(Buffer+3);
-        }
-      
-      else if (!strncmp(Buffer, "map_Kd ", 7))
-        {
-          tmpMat->setDiffuseMap(Buffer+7);
-        }
-      else if (!strncmp(Buffer, "map_Ka ", 7))
-        {
-          tmpMat->setAmbientMap(Buffer+7);
-        }
-      else if (!strncmp(Buffer, "map_Ks ", 7))
-        {
-          tmpMat->setSpecularMap(Buffer+7);
-        }
-      else if (!strncmp(Buffer, "bump ", 5))
-        {
-          tmpMat->setBump(Buffer+7);
-        }
-     
-
-    }
-  MTL_FILE->close();
-  delete []fileName;
-  delete MTL_FILE;
-  return true;
+/**
+   \brief adds a Texture Coordinate
+   \param u The u coordinate of the TextureCoordinate.
+   \param v The y coordinate of the TextureCoordinate.
+
+   If a TextureCoordinate line is found this function will inject it into the TextureCoordinate-Array
+*/
+bool Model::addVertexTexture(const float u, const float v)
+{
+  PRINTF(3)("found vertex-Texture %f, %f\n", u, v);
+  this->vTexture->addEntry(u);
+  this->vTexture->addEntry(v);
 }
 
@@ -688 +564 @@
    \param matString the Material that will be set.
 */
-bool Model::readUseMtl (char* matString)
-{
+bool Model::addUseMtl (char* matString)
+{
+  /*
   if (!this->mtlFileName)
     {
@@ -695 +572 @@
       return false;
     }
-      
+  */      
   if (this->currentGroup->faceCount >0)
     this->currentGroup->currentFace = this->currentGroup->currentFace->next = new Face;
@@ -717 +594 @@
   this->vertices->finalizeArray();
   this->vTexture->finalizeArray();
-  if (normals->getCount() == 0) // vertices-Array must be uilt for this
+  if (normals->getCount() == 0) // vertices-Array must be built for this
     this->buildVertexNormals();
   this->normals->finalizeArray();
@@ -743 +620 @@
                 glEnd();
               this->currentGroup->faceMode = 0;
-              PRINTF(2)("using material %s for coming Faces.\n", tmpFace->materialString);
               Material* tmpMat;
               if ((tmpMat = material->search(tmpFace->materialString)) != NULL)
-                tmpMat->select();
+                {
+                  tmpMat->select();
+                  PRINTF(2)("using material %s for coming Faces.\n", tmpFace->materialString);
+                }
+              else 
+                PRINTF(1)("material %s not found.\n", tmpFace->materialString);
+
 
             }
@@ -893 +775 @@
       normArray[i].normalize();
       PRINTF(3)("Found Normale number %d: (%f; %f, %f).\n", i, normArray[i].x, normArray[i].y, normArray[i].z);
-
+      
       this->normals->addEntry(normArray[i].x, normArray[i].y, normArray[i].z);
 
@@ -907 +789 @@
    This will inject a Cube, because this is the most basic model.
 */
-void Model::BoxModel(void)
-{
-  this->readVertex ("-0.5 -0.5 0.5");
-  this->readVertex ("0.5 -0.5 0.5");
-  this->readVertex ("-0.5 0.5 0.5");
-  this->readVertex ("0.5 0.5 0.5");
-  this->readVertex ("-0.5 0.5 -0.5");
-  this->readVertex ("0.5 0.5 -0.5");
-  this->readVertex ("-0.5 -0.5 -0.5");
-  this->readVertex ("0.5 -0.5 -0.5");
-
-  this->readVertexTexture ("0.0 0.0");
-  this->readVertexTexture ("1.0 0.0");
-  this->readVertexTexture ("0.0 1.0");
-  this->readVertexTexture ("1.0 1.0");
-  this->readVertexTexture ("0.0 2.0");
-  this->readVertexTexture ("1.0 2.0");
-  this->readVertexTexture ("0.0 3.0");
-  this->readVertexTexture ("1.0 3.0");
-  this->readVertexTexture ("0.0 4.0");
-  this->readVertexTexture ("1.0 4.0");
-  this->readVertexTexture ("2.0 0.0");
-  this->readVertexTexture ("2.0 1.0");
-  this->readVertexTexture ("-1.0 0.0");
-  this->readVertexTexture ("-1.0 1.0");
-
-  this->readVertexNormal ("0.0 0.0 1.0");
-  this->readVertexNormal ("0.0 0.0 1.0");
-  this->readVertexNormal ("0.0 0.0 1.0");
-  this->readVertexNormal ("0.0 0.0 1.0");
-  this->readVertexNormal ("0.0 1.0 0.0");
-  this->readVertexNormal ("0.0 1.0 0.0");
-  this->readVertexNormal ("0.0 1.0 0.0");
-  this->readVertexNormal ("0.0 1.0 0.0");
-  this->readVertexNormal ("0.0 0.0 -1.0");
-  this->readVertexNormal ("0.0 0.0 -1.0");
-  this->readVertexNormal ("0.0 0.0 -1.0");
-  this->readVertexNormal ("0.0 0.0 -1.0");
-  this->readVertexNormal ("0.0 -1.0 0.0");
-  this->readVertexNormal ("0.0 -1.0 0.0");
-  this->readVertexNormal ("0.0 -1.0 0.0");
-  this->readVertexNormal ("0.0 -1.0 0.0");
-  this->readVertexNormal ("1.0 0.0 0.0");
-  this->readVertexNormal ("1.0 0.0 0.0");
-  this->readVertexNormal ("1.0 0.0 0.0");
-  this->readVertexNormal ("1.0 0.0 0.0");
-  this->readVertexNormal ("-1.0 0.0 0.0");
-  this->readVertexNormal ("-1.0 0.0 0.0");
-  this->readVertexNormal ("-1.0 0.0 0.0");
-  this->readVertexNormal ("-1.0 0.0 0.0");
+void Model::cubeModel(void)
+{
+  this->addVertex ("-0.5 -0.5 0.5");
+  this->addVertex ("0.5 -0.5 0.5");
+  this->addVertex ("-0.5 0.5 0.5");
+  this->addVertex ("0.5 0.5 0.5");
+  this->addVertex ("-0.5 0.5 -0.5");
+  this->addVertex ("0.5 0.5 -0.5");
+  this->addVertex ("-0.5 -0.5 -0.5");
+  this->addVertex ("0.5 -0.5 -0.5");
+
+  this->addVertexTexture ("0.0 0.0");
+  this->addVertexTexture ("1.0 0.0");
+  this->addVertexTexture ("0.0 1.0");
+  this->addVertexTexture ("1.0 1.0");
+  this->addVertexTexture ("0.0 2.0");
+  this->addVertexTexture ("1.0 2.0");
+  this->addVertexTexture ("0.0 3.0");
+  this->addVertexTexture ("1.0 3.0");
+  this->addVertexTexture ("0.0 4.0");
+  this->addVertexTexture ("1.0 4.0");
+  this->addVertexTexture ("2.0 0.0");
+  this->addVertexTexture ("2.0 1.0");
+  this->addVertexTexture ("-1.0 0.0");
+  this->addVertexTexture ("-1.0 1.0");
+
+  this->addVertexNormal ("0.0 0.0 1.0");
+  this->addVertexNormal ("0.0 0.0 1.0");
+  this->addVertexNormal ("0.0 0.0 1.0");
+  this->addVertexNormal ("0.0 0.0 1.0");
+  this->addVertexNormal ("0.0 1.0 0.0");
+  this->addVertexNormal ("0.0 1.0 0.0");
+  this->addVertexNormal ("0.0 1.0 0.0");
+  this->addVertexNormal ("0.0 1.0 0.0");
+  this->addVertexNormal ("0.0 0.0 -1.0");
+  this->addVertexNormal ("0.0 0.0 -1.0");
+  this->addVertexNormal ("0.0 0.0 -1.0");
+  this->addVertexNormal ("0.0 0.0 -1.0");
+  this->addVertexNormal ("0.0 -1.0 0.0");
+  this->addVertexNormal ("0.0 -1.0 0.0");
+  this->addVertexNormal ("0.0 -1.0 0.0");
+  this->addVertexNormal ("0.0 -1.0 0.0");
+  this->addVertexNormal ("1.0 0.0 0.0");
+  this->addVertexNormal ("1.0 0.0 0.0");
+  this->addVertexNormal ("1.0 0.0 0.0");
+  this->addVertexNormal ("1.0 0.0 0.0");
+  this->addVertexNormal ("-1.0 0.0 0.0");
+  this->addVertexNormal ("-1.0 0.0 0.0");
+  this->addVertexNormal ("-1.0 0.0 0.0");
+  this->addVertexNormal ("-1.0 0.0 0.0");
 
   /* normaleLess-testingMode
-  this->readFace ("1 2 4 3");
-  this->readFace ("3 4 6 5");
-  this->readFace ("5 6 8 7");
-  this->readFace ("7 8 2 1");
-  this->readFace ("2 8 6 4");
-  this->readFace ("7 1 3 5");
+  this->addFace ("1 2 4 3");
+  this->addFace ("3 4 6 5");
+  this->addFace ("5 6 8 7");
+  this->addFace ("7 8 2 1");
+  this->addFace ("2 8 6 4");
+  this->addFace ("7 1 3 5");
   */
 
-  this->readFace ("1/1/1 2/2/2 4/4/3 3/3/4");
-  this->readFace ("3/3/5 4/4/6 6/6/7 5/5/8");
-  this->readFace ("5/5/9 6/6/10 8/8/11 7/7/12");
-  this->readFace ("7/7/13 8/8/14 2/10/15 1/9/16");
-  this->readFace ("2/2/17 8/11/18 6/12/19 4/4/20");
-  this->readFace ("7/13/21 1/1/22 3/3/23 5/14/24");
-
-}
+  this->addFace ("1/1/1 2/2/2 4/4/3 3/3/4");
+  this->addFace ("3/3/5 4/4/6 6/6/7 5/5/8");
+  this->addFace ("5/5/9 6/6/10 8/8/11 7/7/12");
+  this->addFace ("7/7/13 8/8/14 2/10/15 1/9/16");
+  this->addFace ("2/2/17 8/11/18 6/12/19 4/4/20");
+  this->addFace ("7/13/21 1/1/22 3/3/23 5/14/24");
+
+}
+
+
+void Model::sphereModel()
+{
+  int detail = 30;
+  if (detail <= 0) detail = 1;
+  float df = (float)detail;
+  for (float i = 0.0; i < df/2; i+=1.0)
+    {
+      for (float j = 0.0; j < df; j+=1.0)
+      {
+        float vz = i/df *2.0*PI - PI/2.0;
+        this->addVertex(cos(j/df*2.0*PI) * cos(vz) ,
+                        sin(j/df*2.0*PI) * cos(vz),
+                        sin(vz));
+        //if (j==0.0)
+        //printf ("%f %f\n", vz, sin (vz));
+        if (i==0.0)
+                  printf("%f, %f\n", j/df*2.0*PI, cos(j/df*PI));
+      }
+    }
+  vertices->debug();
+  for (int i = 0; i < detail/2; i++)
+    for (int j = 1; j < detail; j++)
+      {
+        unsigned int v1,v2,v3,v4;
+        v1 = i*detail +j;
+
+        /*      if (j+1 == detail)
+          {
+            v2 = i*detail +1;
+            v3 = i*detail+detail + 1;
+          }
+          else*/
+          {
+            v2 = i*detail +j+1;
+            v3 = i*detail+detail + j+1;
+          }
+        v4 = i*detail+detail + j;
+        //printf("%i %i %i %i\n", v1, v2, v3, v4);
+        this->addFace(4, 0, v1, v2, v3, v4);
+      }
+}
+
+/**
+   \brief Creates a Cylinder.
+*/
+void Model::cylinderModel(void)
+{
+  unsigned int detail = 20;
+  float size = 1.0;
+
+  // check if devision by zero
+  if (detail <= 3)
+    detail = 3;
+  int count = 0;
+  // defining Points of the Cylinder.
+  for (float phi = 0.0; phi < 2.0*PI; phi += 2.0*PI/(float)detail)
+    {
+      this->addVertex(size*cos(phi), size*sin(phi), -size);
+      this->addVertex(size*cos(phi), size*sin(phi), size);
+      count ++;
+    }
+  this->addVertex(0, 0, -size);
+  this->addVertex(0, 0, size);
+
+  
+  if (count != detail)
+    cout << "calculation error, count should be " << detail << " but is " << count << endl;
+  vertices->debug();
+
+  // adding Faces
+  for (int i = 0; i < detail-1; i++)
+    {
+      int p1, p2, p3, p4;
+      p1 = 2*i+1;
+      p2 = 2*i+2;
+      if (i <= detail);
+      p3 = 2*i+4;
+      p4 = 2*i+3;
+      cout <<i+1 <<": "<< p1 <<" "<< p2 <<" "<< p3 <<" "<< p4 <<endl;
+      this->addFace(4, 0, p1, p2, p3, p4);
+      this->addFace(3, 0, p4, p1, 2*detail+1);
+      this->addFace(3, 0, p2, p3, 2*detail+2);
+    }
+  addFace(4,0, 2*detail-1, 2*detail, 2, 1);
+  this->addFace(3, 0, 1, 2*detail-1, 2*detail+1);
+  this->addFace(3, 0, 2*detail, 2, 2*detail+2);
+
+}

orxonox/branches/trackManager/src/importer/model.h

@@ -7 +7 @@
 #define _MODEL_H
 
-#include "../stdincl.h"
+//#include "../stdincl.h"
 
-#include "array.h"
 #include "material.h"
-#include "vector.h"
-#include <fstream>
+
+// FORWARD DEFINITION //
+class Array;
+class Vector;
 
 using namespace std;
 
-
+enum PRIMITIVE {PLANE, CUBE, SPHERE, CYLINDER};
 
 //! Class that handles 3D-Models. it can also read them in and display them.
@@ -22 +23 @@
 {
  public:
-  Model ();
-  Model (char* fileName);
-  Model(char* fileName, float scaling);
-  ~Model ();
+  Model(void);
+  Model(PRIMITIVE type);
+  Model(char* modelName);
+  virtual ~Model(void);
+
+  void setName(const char* name);
   
-  void draw (void) const;
-  void draw (int groupNumber) const;
-  void draw (char* groupName) const;
+  void draw(void) const;
+  void draw(int groupNumber) const;
+  void draw(char* groupName) const;
   int getGroupCount() const;
 
- private:
+ protected:
+  char* name;            //!< This is the name of the Model.
+  bool finalized;        //!< Sets the Object to be finalized.
+  
   //! This is the placeholder of one Vertex beloning to a Face.
-  struct FaceElement 
+  struct FaceElement
   {
     int vertexNumber;    //!< The number of the Vertex out of the Array* vertices, this vertex points to.
@@ -43 +49 @@
 
   //! This is the placeholder of a Face belonging to a Group of Faces.
-  /**
-     \todo take Material to a call for itself.
-
-     This can also be a Material-Change switch. 
-     That means if you want to change a Material inside of a group,
-     you can create an empty face and apply a material to it, and the Importer will cahnge Colors
-  */
-  struct Face 
+  struct Face
   {
     int vertexCount;        //!< The Count of vertices this Face has.
@@ -65 +64 @@
     char* name;         //!< the Name of the Group. this is an identifier, that can be accessed via the draw (char* name) function.
 
-    GLuint listNumber;  //!< The number of the GL-List this Group gets.
+    unsigned int listNumber;//!< The number of the GL-List this Group gets.
     Face* firstFace;    //!< The first Face in this group.
     Face* currentFace;  //!< The current Face in this Group (the one we are currently working with.)
@@ -88 +87 @@
   float scaleFactor;    //!< The Factor with which the Model should be scaled. \todo maybe one wants to scale the Model after Initialisation
 
-  char* objPath;        //!< The Path wher the obj and mtl-file are located.
-  char* objFileName;    //!< The Name of the obj-file.
-  char* mtlFileName;    //!< The Name of the mtl-file (parsed out of the obj-file)
-
-  bool initialize (void);
+  bool initialize(void);
   bool initGroup(Group* group);
   bool initFace (Face* face);
@@ -100 +95 @@
   bool cleanupFaceElement(FaceElement* faceElem);
 
-  ///// readin ///
-  bool importFile (char* fileName);
-  bool readFromObjFile (void);
-  
-  bool readGroup (char* groupString);
-  bool readVertex (char* vertexString);
-  bool readFace (char* faceString);
-  bool readVertexNormal (char* normalString);
-  bool readVertexTexture (char* vTextureString);
-  bool readMtlLib (char* matFile);
-  bool readUseMtl (char* mtlString);
+ public:
+  bool addGroup(char* groupString);
+  bool addVertex(char* vertexString);
+  bool addVertex(const float x, const float y, const float z);
+  bool addFace(char* faceString);
+  bool addFace(const float faceElemCount, int type, ...);
+  bool addVertexNormal(char* normalString);
+  bool addVertexNormal(const float x, const float y, const float z);
+  bool addVertexTexture(char* vTextureString);
+  bool addVertexTexture(const float u, const float v);
+  bool addUseMtl(char* mtlString);
+  void finalize(void);
 
-  bool importToGL (void);
-  bool addGLElement (FaceElement* elem);
+ protected:
+  bool importToGL(void);
+  bool addGLElement(FaceElement* elem);
 
-  bool buildVertexNormals ();
+  bool buildVertexNormals(void);
 
-  void BoxModel (void);
+  void cubeModel(void);
+  void sphereModel(void);
+  void cylinderModel(void);
 };