Changeset 6778 in orxonox.OLD

Timestamp:

Jan 26, 2006, 5:49:58 PM (18 years ago)

Author:

bensch

Message:

trunk: ModelView work…

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (4 diffs)
• lib/graphics/light.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (2 diffs)
• world_entities/camera.cc (modified) (2 diffs)
• world_entities/skysphere.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (1 diff)
• world_entities/weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -321 +321 @@
       //    return -1;
     }
-    glMatrixMode(GL_PROJECTION_MATRIX);
-    glLoadIdentity();
     glViewport(0, 0, width, height);                     // Reset The Current Viewport
 
@@ -451 +449 @@
   glDisable(GL_LIGHTING);  // will be set back when leaving 2D-mode
 
-  glViewport(0, 0, screen->w, screen->h);
-
   glMatrixMode(GL_PROJECTION);
   glPushMatrix();
   glLoadIdentity();
-
   glOrtho(0.0, (GLdouble)screen->w, (GLdouble)screen->h, 0.0, 0.0, 1.0);
 
@@ -462 +457 @@
   glPushMatrix();
   glLoadIdentity();
-
-  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 }
 
@@ -585 +578 @@
 void GraphicsEngine::draw() const
 {
+  GraphicsEngine::storeMatrices();
+
   LightManager::getInstance()->draw();
-  GraphicsEngine::storeMatrices();
+
   Shader::suspendShader();
 

trunk/src/lib/graphics/light.cc

@@ -342 +342 @@
 void LightManager::draw() const
 {
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  PRINTF(4)("Drawing the Lights\n");
+ PRINTF(4)("Drawing the Lights\n");
   for (int i = 0; i < NUMBEROFLIGHTS; i++)
     if (this->lights[i])

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -820 +820 @@
     else if (unlikely(this->bindNode != NULL))
     {
-      GLdouble projectPos[3] = {0, 0, 0};
+      GLdouble projectPos[3] = {0.0, 0.0, 0.0};
       gluProject(this->bindNode->getAbsCoor().x,
                  this->bindNode->getAbsCoor().y,
@@ -830 +830 @@
                  projectPos+1,
                  projectPos+2);
+//       printf("%s::%s  == %f %f %f :: %f %f\n", this->getClassName(), this->getName(),
+//              this->bindNode->getAbsCoor().x,
+//              this->bindNode->getAbsCoor().y,
+//              this->bindNode->getAbsCoor().z,
+//              projectPos[0],
+//              projectPos[1]);
+
       this->prevRelCoordinate.x = this->absCoordinate.x = projectPos[0] /* /(float)GraphicsEngine::getInstance()->getResolutionX() */ + this->relCoordinate.x;
       this->prevRelCoordinate.y = this->absCoordinate.y = (float)GraphicsEngine::getInstance()->getResolutionY() -  projectPos[1] + this->relCoordinate.y;

trunk/src/world_entities/camera.cc

@@ -188 +188 @@
   glLoadIdentity ();
 
-  // setting up the perspective
   gluPerspective(this->fovy,
                  this->aspectRatio,
                  this->nearClip,
                  this->farClip);
+
+
+    // setting up the perspective
   // speed-up feature
   Vector cameraPosition = this->getAbsCoor();
@@ -205 +207 @@
             up.x, up.y, up.z);
 
+
   glMatrixMode (GL_MODELVIEW);
   glLoadIdentity();
+
+
+
 }
 

trunk/src/world_entities/skysphere.cc

@@ -97 +97 @@
 void Skysphere::draw() const
 {
+  glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  glMatrixMode(GL_MODELVIEW);
+
   Vector r = this->getAbsCoor();
   glTranslatef(r.x, r.y, r.z);

trunk/src/world_entities/weapons/test_gun.cc

@@ -219 +219 @@
 
   /* draw objectComponent1: gun coil - animated stuff */
-  glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
   glTranslatef (this->objectComponent1->getAbsCoor ().x,

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -417 +417 @@
         this->currentSlotConfig[i].position.activateNode();
         tickWeapon->setParent(&this->currentSlotConfig[i].position);
-        printf("ACTIVATE\n");
       }
       else