Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player/src/lib/graphics/importer/framework.cc

Timestamp:

May 18, 2005, 11:27:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

File:

• orxonox/branches/movie_player/src/lib/graphics/importer/framework.cc (modified) (1 diff)

orxonox/branches/movie_player/src/lib/graphics/importer/framework.cc

@@ -79 +79 @@
     obj = new OBJModel(argv[1]);
   else 
-    obj = new PrimitiveModel(SPHERE);
+    obj = new PrimitiveModel(CYLINDER);
 
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0);