Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/lib/graphics/importer/framework.cc

Timestamp:

Apr 7, 2005, 3:54:49 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

File:

• orxonox/branches/levelloader/src/lib/graphics/importer/framework.cc (modified) (5 diffs)

orxonox/branches/levelloader/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 
-    {
-      // 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);
-    }
+    obj = new PrimitiveModel(SPHERE);
+
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
   rotAxis = Vector (0.0,1.0,0.0);
@@ -166 +130 @@
       switch (event.type) {
       case SDL_MOUSEMOTION:
-        PRINTF(3)("Mouse motion about %d,%d Pixels to (%d,%d).\n", 
+        PRINTF(4)("Mouse motion about %d,%d Pixels to (%d,%d).\n", 
                   event.motion.xrel, event.motion.yrel,
                   event.motion.x, event.motion.y);
@@ -205 +169 @@
         if (event.button.button == 4)
           {
-            PRINTF(0)("MouseWheel up\n");
+            PRINTF(4)("MouseWheel up\n");
             zoomTo *= .5;
           }
         else if (event.button.button == 5)
           {
-            PRINTF(2)("MouseWheel down\n");
+            PRINTF(4)("MouseWheel down\n");
             zoomTo *= 2.0;
           }
@@ -240 +204 @@
         else 
             {
-              PRINTF(2)("MouseButton %d released at (%d,%d).\n",
+              PRINTF(4)("MouseButton %d released at (%d,%d).\n",
                         event.button.button, event.button.x, event.button.y);
             }