Changeset 3399 in orxonox.OLD for orxonox/branches/nico/src/importer/framework.cc

Timestamp:

Feb 6, 2005, 11:27:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/nico: merged trunk into branches/nico
merged with command:
svn merge ../trunk/ nico/ -r 3238:HEAD
resolved conflict in favor of branches/nico.

Location:

orxonox/branches/nico

Files:

• . (modified) (1 prop)
• src/importer/framework.cc (modified) (4 diffs)

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

@@ -15 +15 @@
 
 #include "framework.h"
-
+int verbose;
 void DrawGLScene()
 {
@@ -52 +52 @@
 int main(int argc, char *argv[])
 {
-  int verbose = 3;
-
-  PRINTF(2)("This is The big verbose-Test %i, %s\n", 1, "cool");
+  verbose = 2;
 
   Uint8* keys; // This variable will be used in the keyboard routine
@@ -71 +69 @@
   PRINTF(2)("screensize: %i, %i\n", wHandler.screen->w, wHandler.screen->h);
   if (argc>=3)
-    obj = new Object (argv[1], atof(argv[2]));
+    obj = new OBJModel (argv[1], atof(argv[2]));
   else if (argc>=2)
-    obj = new Object(argv[1]);
+    obj = new OBJModel(argv[1]);
   else 
-    obj = new Object();
-  
+    {
+      // 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();
+    }
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
   rotAxis = Vector (0.0,1.0,0.0);
@@ -215 +250 @@
           case SDLK_c:
             if (!obj)
-              obj = new Object(argv[1]);
+              obj = new OBJModel(argv[1]);
             break;
           }