Changeset 3602 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 18, 2005, 10:07:40 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: A Presentation, that the light-class can be handled as PNode, see the second level (push x) to see the effect

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• light.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (6 diffs)

orxonox/trunk/src/defs/debug.h

@@ -59 +59 @@
 #define DEBUG_MODULE_ORXONOX            0
 #define DEBUG_MODULE_WORLD              0
-#define DEBUG_MODULE_PNODE              0
+#define DEBUG_MODULE_PNODE              2
 #define DEBUG_MODULE_WORLD_ENTITY       0
 #define DEBUG_MODULE_COMMAND_NODE       0
 
 #define DEBUG_MODULE_IMPORTER           0
-#define DEBUG_MODULE_TRACK_MANAGER      3
-#define DEBUG_MODULE_LIGHT              0
+#define DEBUG_MODULE_TRACK_MANAGER      0
+#define DEBUG_MODULE_LIGHT              3
 #define DEBUG_MODULE_PLAYER             0
 #define DEBUG_MODULE_MATH               0

orxonox/trunk/src/light.cc

@@ -33 +33 @@
 Light::Light(int lightNumber)
 {
+  this->setClassName("Light");
+  char tmpName[7];
+  sprintf(tmpName, "Light%d", lightNumber);
+  this->setName(tmpName);
+
   PRINTF(4)("initializing Light number %d.\n", lightNumber);
   // enable The light
@@ -165 +170 @@
 void Light::draw()
 {
-  float pos[3] = {this->getAbsCoor ().x, this->getAbsCoor().y, this->getAbsCoor().z};
+  float pos[4] = {this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z, 1.0};
+  PRINTF(4)("Drawing The Lights new Position at %f %f %f\n", pos[0], pos[1], pos[2]);
   glLightfv(lightsV[this->lightNumber], GL_POSITION, pos);
 }
@@ -331 +337 @@
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
-  for (int i; i < NUMBEROFLIGHTS; i++)
+  PRINTF(4)("Drawing the Lights\n");
+  for (int i = 0; i < NUMBEROFLIGHTS; i++)
     if (this->lights[i])
-        lights[i]->draw();
+      lights[i]->draw();
 }
 

orxonox/trunk/src/story_entities/world.cc

@@ -167 +167 @@
       this->glmis->step();
 
+      // LIGHT initialisation
+      lightMan = LightManager::getInstance();
+      lightMan->setAmbientColor(.1,.1,.1);
+      lightMan->addLight();
+      //      lightMan->setAttenuation(1.0, 2, 5);
+      //      lightMan->setDiffuseColor(1,1,1);
+      //  lightMan->addLight(1);
+      //  lightMan->setPosition(20, 10, -20);
+      //  lightMan->setDiffuseColor(0,0,0);
+      lightMan->debug();
+
       switch(this->debugWorldNr)
         {
@@ -177 +188 @@
         case DEBUG_WORLD_0:
           {
+            lightMan->setPosition(-5.0, 10.0, -40.0);
             this->nullParent = NullParent::getInstance ();
             this->nullParent->setName ("NullParent");
@@ -245 +257 @@
         case DEBUG_WORLD_1:
           {
+            lightMan->setPosition(.0, .0, .0);
             this->nullParent = NullParent::getInstance ();
             this->nullParent->setName ("NullParent");
@@ -274 +287 @@
             this->spawn(pr, this->localPlayer, es, qs, PNODE_ROTATE_AND_MOVE);
 
+            lightMan->getLight(0)->setParent(trackManager->getTrackNode());
             break;
           }
@@ -296 +310 @@
   terrain->setRelCoor(new Vector(0,-10,0));
   this->spawn(terrain);
-  // LIGHT initialisation
-  lightMan = LightManager::getInstance();
-  lightMan->setAmbientColor(.1,.1,.1);
-  lightMan->addLight();
-  lightMan->setPosition(-5.0, 10.0, -40.0);
-  lightMan->setAttenuation(1.0, 2, 5);
-  lightMan->setDiffuseColor(1,1,1);
-  //  lightMan->addLight(1);
-  //  lightMan->setPosition(20, 10, -20);
-  //  lightMan->setDiffuseColor(0,0,0);
-  lightMan->debug();
-
 
 }
@@ -465 +467 @@
   testFont->printText(0, 0, 1, "orxonox_" PACKAGE_VERSION);
 
-  lightMan->draw();
+  lightMan->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //
 }