Changeset 3657 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

Mar 27, 2005, 12:22:09 AM (20 years ago)

Author:

bensch

Message:

orxonox.trunk: importer now with subclass PrimitiveModel, taht supports working CONE/CUBE/PLANE/SPHERE/CYLINDER

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• framework.cc (modified) (2 diffs)
• framework.h (modified) (1 diff)
• model.cc (modified) (3 diffs)
• model.h (modified) (3 diffs)
• primitive_model.cc (copied) (copied from orxonox/trunk/src/proto/proto_class.cc) (4 diffs)
• primitive_model.h (copied) (copied from orxonox/trunk/src/proto/proto_class.h) (1 diff)

orxonox/trunk/src/lib/graphics/importer/Makefile.am

@@ -27 +27 @@
                   model.cc \
                   objModel.cc \
+                  primitive_model.cc \
                   array.cc \
                   material.cc \
@@ -38 +39 @@
                 model.h \
                 objModel.h \
+                primitive_model.h \
                 array.h \
                 material.h \

orxonox/trunk/src/lib/graphics/importer/Makefile.in

@@ -54 +54 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        model.$(OBJEXT) objModel.$(OBJEXT) array.$(OBJEXT) \
-        material.$(OBJEXT) texture.$(OBJEXT) graphics_engine.$(OBJEXT) \
-        base_object.$(OBJEXT) vector.$(OBJEXT)
+        model.$(OBJEXT) objModel.$(OBJEXT) primitive_model.$(OBJEXT) \
+        array.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
+        graphics_engine.$(OBJEXT) base_object.$(OBJEXT) \
+        vector.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -67 +68 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/texture.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po ./$(DEPDIR)/vector.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -195 +198 @@
                   model.cc \
                   objModel.cc \
+                  primitive_model.cc \
                   array.cc \
                   material.cc \
@@ -206 +210 @@
                 model.h \
                 objModel.h \
+                primitive_model.h \
                 array.h \
                 material.h \
@@ -283 +288 @@
 @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)/primitive_model.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@

orxonox/trunk/src/lib/graphics/importer/framework.cc

@@ -17 +17 @@
 
 #include "vector.h"
+
+#include "primitive_model.h"
+
 
 int verbose;
@@ -76 +79 @@
     obj = new OBJModel(argv[1]);
   else 
-    obj = (OBJModel*) new Model(SPHERE);
+    obj = new PrimitiveModel(SPHERE);
 
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 

orxonox/trunk/src/lib/graphics/importer/framework.h

@@ -35 +35 @@
 
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
-OBJModel* obj;
+Model* obj;
 
 

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -34 +34 @@
 {
   this->initialize();
-}
-
-/**
-   \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 ();
-
-  this->cleanup();
 }
 
@@ -492 +462 @@
 
       tmpElem->vertexNumber = va_arg (itemlist, int) -1;
-      if (type >= 2)
+      if (type & TEXCOORD)
         tmpElem->texCoordNumber = va_arg (itemlist, int) -1;
-      if (type == 1 || type ==3)
+      if (type & NORMAL)
         tmpElem->normalNumber = va_arg(itemlist, int) -1;
       this->currentGroup->currentFace->vertexCount++;
@@ -863 +833 @@
 
 }
-
-/**
-   \brief Builds a Sphere into the Model.
-   \param size The radius of the Sphere.
-   \param detail The detail of the Sphere.
-*/
-void Model::sphereModel(float size, unsigned int detail)
-{
-  int vertexCount = 0;
-  if (detail <= 0) 
-    detail = 1;
-  //  detail = 2; // make it even
-  float df = (float)detail;
-  
-  // defining the Vertices
-  for (float i = 0; i < df *2.0; i+=1.0)
-    {
-      float vi = i/df *PI;
-      for (float j = -df / 2.0 +1.0; j < df / 2.0; j+=1.0 *df/(df+1.0))
-        {
-          float vj = j/df *PI;
-          this->addVertex(size * cos(vi) * cos(vj),
-                          size * sin(vj),
-                          size * sin(vi) * cos(vj));
-          this->addVertexTexture(i / (df *2.0), (j-1.0)/(df)+.5);
-          vertexCount++;
-        }
-    }
-  this->addVertex(0, -size, 0);
-  this->addVertex(0, size, 0);
-
-  // defining the binding Faces.
-  unsigned int v1, v2, v3, v4;
-  for (int i = 0; i <= detail * 2 -1; i++)
-    {
-      for (int j = 0; j <= detail; j++)
-        {
-          
-          v1 = i*detail + j;
-          v4 = i*detail + (j+1);
-          
-          if (i == detail*2 -1)
-            {
-              v2 = j;
-              v3 = j+1;
-            }
-          else
-            {
-              v2 = (i+1)*detail + j;
-              v3 = (i+1)*detail + (j+1);
-            }
-          
-          if (j == 0)
-            {
-              v1 = vertexCount+1;
-              this->addFace(3, 2, v1, v1, v3, v3, v4, v4);
-            }
-          else if (j == detail)
-            {
-              v3 = vertexCount+2;
-              this->addFace(3, 2, v1, v1, v2, v2, v3, v3);
-            }
-          else
-            this->addFace(4, 2, v1, v1, v2, v2, v3, v3, v4, 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)
-    PRINTF(1)("calculation error, count should be %d but is %d.\n", detail, count);
-  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;
-      // something is wrong here
-      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);
-
-}
-
-
-void Model::coneModel(float size, unsigned int detail)
-{
-
-  
-}

orxonox/trunk/src/lib/graphics/importer/model.h

@@ -15 +15 @@
 using namespace std;
 
-//! Specification of different primitives the Model knows
-enum PRIMITIVE {PLANE, CUBE, SPHERE, CYLINDER};
+// definition of different modes for setting up Faces
+#define VERTEX 0       //!< If Faces are created WITH Vertex-Coordinate
+#define NORMAL 1       //!< If Faces are created WITH Normals (otherwise autocalculate)
+#define TEXCOORD 2     //!< If Faces are created WITH TextureCoordinate
 
 //! Class that handles 3D-Models. it can also read them in and display them.
@@ -23 +25 @@
  public:
   Model(void);
-  Model(PRIMITIVE type);
   Model(char* modelName);
   virtual ~Model(void);
@@ -114 +115 @@
 
   void cubeModel(void);
-  void sphereModel(float size = 1.0, unsigned int detail = 10);
-  void cylinderModel(void);
-  void coneModel(float size = 1.0, unsigned int detail = 10);
 };
 

orxonox/trunk/src/lib/graphics/importer/primitive_model.cc

@@ -1 @@
-
-
 /* 
    orxonox - the future of 3D-vertical-scrollers
@@ -12 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
-
-#include "proto_class.h"
-
-#include "stdincl.h" // maybe
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_MODEL
+
+#include "primitive_model.h"
+
+#include <math.h>
+#include "vector.h"
+#include "debug.h"
 
 using namespace std;
@@ -29 +29 @@
    \todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass () 
-{
-   this->setClassName ("ProtoClass");
+PrimitiveModel::PrimitiveModel () 
+{
+  this->initialize();
+
+  this->cubeModel();
+
+  this->importToGL ();
+
+  this->cleanup();
+}
+
+/**
+   \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/...
+*/
+PrimitiveModel::PrimitiveModel(PRIMITIVE type, float size, unsigned int detail)
+{
+  this->initialize();
+
+  switch (type)
+    {
+    default:
+    case CUBE:
+      this->cubeModel();
+      break;
+    case SPHERE:
+      this->sphereModel(size, detail);
+      break;
+    case CYLINDER:
+      this->cylinderModel();
+      break;
+    case CONE:
+      this->coneModel(size, detail);
+      break;
+    case PLANE:
+      this->planeModel(size, detail);
+      break;
+    }
+  this->importToGL ();
+
+  this->cleanup();
 }
 
@@ -39 +80 @@
 
 */
-ProtoClass::~ProtoClass () 
+PrimitiveModel::~PrimitiveModel () 
 {
   // delete what has to be deleted here
 }
 
-/**
-   \brief nonsense - delete this method
-   \param realy nothing to give
-   \returns true or false - probably nothing?
-
-   this is just to show the doxygen abilities (this for example is an extension for a long comment)
-*/
-bool ProtoClass::doNonSense (int nothing) {}
+
+
+
+/**
+   \brief Includes a default model
+
+   This will inject a Cube, because this is the most basic model.
+*/
+void PrimitiveModel::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->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->addFace (4, 3, 1,1,1, 2,2,2, 4,4,3, 3,3,4);
+  this->addFace (4, 3, 3,3,5, 4,4,6, 6,6,7, 5,5,8);
+  this->addFace (4, 3, 5,5,9, 6,6,10, 8,8,11, 7,7,12);
+  this->addFace (4, 3, 7,7,13, 8,8,14, 2,10,15, 1,9,16);
+  this->addFace (4, 3, 2,2,17, 8,11,18, 6,12,19, 4,4,20);
+  this->addFace (4, 3, 7,13,21, 1,1,22, 3,3,23, 5,14,24);
+
+}
+
+/**
+   \brief Builds a Sphere into the Model.
+   \param size The radius of the Sphere.
+   \param detail The detail of the Sphere.
+*/
+void PrimitiveModel::sphereModel(float size, unsigned int detail)
+{
+  int vertexCount = 0;
+  if (detail <= 0) 
+    detail = 1;
+  //  detail = 2; // make it even
+  float df = (float)detail;
+  
+  // defining the Vertices
+  for (float i = 0; i < df *2.0; i+=1.0)
+    {
+      float vi = i/df *PI;
+      for (float j = -df / 2.0 +1.0; j < df / 2.0; j+=1.0 *df/(df+1.0))
+        {
+          float vj = j/df *PI;
+          this->addVertex(size * cos(vi) * cos(vj),
+                          size * sin(vj),
+                          size * sin(vi) * cos(vj));
+          this->addVertexTexture(i / (df *2.0), (j-1.0)/(df)+.5);
+          vertexCount++;
+        }
+    }
+  this->addVertex(0, -size, 0);
+  this->addVertex(0, size, 0);
+
+  // defining the binding Faces.
+  unsigned int v1, v2, v3, v4;
+  for (int i = 0; i <= detail * 2 -1; i++)
+    {
+      for (int j = 0; j <= detail; j++)
+        {
+          
+          v1 = i*detail + j;
+          v4 = i*detail + (j+1);
+          
+          if (i == detail*2 -1)
+            {
+              v2 = j;
+              v3 = j+1;
+            }
+          else
+            {
+              v2 = (i+1)*detail + j;
+              v3 = (i+1)*detail + (j+1);
+            }
+          
+          if (j == 0)
+            {
+              v1 = vertexCount+1;
+              this->addFace(3, TEXCOORD, v1, v1, v3, v3, v4, v4);
+            }
+          else if (j == detail)
+            {
+              v3 = vertexCount+2;
+              this->addFace(3, TEXCOORD, v1, v1, v2, v2, v3, v3);
+            }
+          else
+            this->addFace(4, TEXCOORD, v1, v1, v2, v2, v3, v3, v4, v4);
+        }
+    }
+}
+/**
+   \brief Creates a Cylinder.
+*/
+void PrimitiveModel::cylinderModel(float size, unsigned int detail)
+{
+  // 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)
+    PRINTF(1)("calculation error, count should be %d but is %d.\n", detail, count);
+
+  // 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;
+      // something is wrong here
+      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, VERTEX, 1, 2*detail-1, 2*detail+1);
+  this->addFace(3, VERTEX, 2*detail, 2, 2*detail+2);
+}
+
+/**
+   \brief creates a cone inside of this Model
+   \param size The size of the cone
+   \param detail the Detail-level of this cone
+*/
+void PrimitiveModel::coneModel(float size, unsigned int detail)
+{
+  this->addVertex(0,-size,0);
+  this->addVertex(0,size,0);
+  if (detail <= 0) 
+    detail = 1;
+  float df = (float)detail;
+  
+  // defining the Vertices
+  for (float i = 0; i < df; i+=1.0)
+    {
+      float vi = i/df *2.0*PI;
+      this->addVertex(size* sin(vi),
+                      -size,
+                      size* cos(vi));
+    }
+
+  //defining Faces
+  for (int i = 0; i < detail; i++)
+    {
+      unsigned int v1, v2;
+      v1 = i+3;
+      if (i == detail -1)
+        v2 = 3;
+      else
+        v2 = i+4;
+      this->addFace(3, VERTEX, 1, v1, v2);
+      this->addFace(3, VERTEX, 2, v1, v2); 
+    }
+}
+
+/**
+   \brief creates a Plane inside of this Model
+   \param size The size of this plane
+   \param detail the Detail-level of this plane.
+*/
+void PrimitiveModel::planeModel(float size, unsigned int detail)
+{
+  //defining vertices
+  for (int i = 0; i < detail; i++)
+    for (int j = 0; j < detail; j++)
+      {
+        this->addVertex(((float)i/(float)(detail-1) -.5)*size,
+                        0,
+                        ((float)j/(float)(detail-1) -.5)*size);
+        this->addVertexTexture((float)i/(float)(detail-1),
+                               (float)j/(float)(detail-1));
+      }
+  //defining Faces
+  unsigned int v1, v2, v3, v4;
+  for (int i = 0; i < detail-1; i++)
+    for (int j = 1; j < detail; j++)
+      {
+        v1 = i*detail + j;
+        v2 = (i+1)*detail + j;
+        v3 = (i+1)*detail + (j+1);
+        v4 = i*detail + (j+1);
+        this->addFace(4, TEXCOORD, v1, v1, v2, v2, v3, v3, v4, v4);
+      }
+}

orxonox/trunk/src/lib/graphics/importer/primitive_model.h

@@ -1 +1 @@
 /*! 
-    \file proto_class.h
-    \brief Definition of the proto class template, used quickly start work
-    \todo Example: this shows how to use simply add a Marker that here has to be done something.
+    \file primitive_model.h
 
-    The Protoclass exists, to help you quikly getting the run for how to develop in orxonox.
-    It is an example for the CODING-CONVENTION, and a starting-point for every class.
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _PRIMITIVE_MODEL_H
+#define _PRIMITIVE_MODEL_H
 
-#include "what realy has to be included"
-#include "base_object.h"
+#include "model.h"
+
+//! Specification of different primitives the Model knows
+enum PRIMITIVE {PLANE, CUBE, SPHERE, CYLINDER, CONE};
 
 // FORWARD DEFINITION \\
-class someClassWeNeed;
 
-
-/*class Test;*/ /* forward definition of class Test (without including it here!)*/
-
-//! A default class that aids you to start creating a new class
-/**
-   here can be some longer description of this class
-*/
-class ProtoClass : public BaseObject {
+//! A Class to create some default Models
+class PrimitiveModel : public Model {
 
  public:
-  ProtoClass();
-  virtual ~ProtoClass();
+  PrimitiveModel();
+  PrimitiveModel(PRIMITIVE type, float size = 1.0, unsigned int detail = 10);
 
-  bool doNonSense (int nothing);
+  virtual ~PrimitiveModel();
 
- private:
-  int nonSense;  //!< doxygen tag here like this for all the variables - delete this variable if you use this
-
+ protected:
+  void cubeModel(void);
+  void sphereModel(float size = 1.0, unsigned int detail = 10);
+  void cylinderModel(float size = 1.0, unsigned int detail = 10);
+  void coneModel(float size = 1.0, unsigned int detail = 10);
+  void planeModel(float size = 1.0, unsigned int detail = 1);
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _PRIMITIVE_MODEL_H */