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

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/framework.cc (modified) (4 diffs)

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;