Changeset 3498 in orxonox.OLD for orxonox/branches/trackManager/src/orxonox.cc

Timestamp:

Mar 11, 2005, 11:59:58 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to tracManager R3440:3497 → 3498
merged with command:
svn merge ../trunk/ trackManager/ -r 3430:HEAD
conflicts resolved in favor of the Trunk

File:

• orxonox/branches/trackManager/src/orxonox.cc (modified) (4 diffs)

orxonox/branches/trackManager/src/orxonox.cc

@@ -56 +56 @@
 
 
-/* this is a singleton class to prevent duplicates */
+/** \brief this is a singleton class to prevent duplicates */
 Orxonox* Orxonox::singletonRef = 0;
 
+/**
+   \returns reference or new Object of Orxonox if not existent.
+*/
 Orxonox* Orxonox::getInstance (void)
 {
@@ -173 +176 @@
   glClearColor (0.0, 0.0, 0.0, 0.0);
   glEnable (GL_DEPTH_TEST);
- 
-  // LIGHTING
-  GLfloat lmodelAmbient[] = {.1, .1, .1, 1.0};
-  GLfloat whiteLight[] = {1.0, 1.0, 1.0,1.0};
-  GLfloat lightPosition[] = {10.0, 10, 19.0, 0.0};
-
-  glLightfv (GL_LIGHT0, GL_DIFFUSE, whiteLight);
-  glLightfv (GL_LIGHT0, GL_SPECULAR, whiteLight);
-  glEnable (GL_LIGHTING);
-  glEnable (GL_LIGHT0);
-  glEnable (GL_DEPTH_TEST);
-  glLightfv (GL_LIGHT0, GL_POSITION, lightPosition);
-  glLightfv (GL_LIGHT0, GL_DIFFUSE, whiteLight);
    
-  //glEnable (GL_TEXTURE_2D); 
-  //  glEnable(GL_COLOR);
-  //  glShadeModel(GL_SMOOTH);
-  
-  // create camera
-  //localcamera = new Camera(world); /* \todo camera/input node not used anymore*/
-  
   return 0;
 }
@@ -342 +325 @@
 }
 
-
+/**
+   \return The reference of the SDL-screen of orxonox
+*/
 SDL_Surface* Orxonox::getScreen ()
 {
@@ -348 +333 @@
 }
 
-
+/**
+   \brief main function
+
+   here the journey begins
+*/
 int main(int argc, char** argv) 
 {