Changeset 3438 in orxonox.OLD for orxonox

Timestamp:

Mar 1, 2005, 8:24:04 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: light: comments, errormessages, light up again

Location:

orxonox/trunk/src

Files:

• light.cc (modified) (10 diffs)
• world.cc (modified) (1 diff)

orxonox/trunk/src/light.cc

@@ -38 +38 @@
   for (int i = 0; i < NUMBEROFLIGHTS; i++)
     lights[i] = NULL;
-  this->currentLight = new LightValue;
+  this->currentLight = NULL;
 }
 
@@ -56 +56 @@
 }
 
+/**
+   \brief singleton-Reference to the Light-class
+*/
 Light* Light::singletonRef = NULL;
 
@@ -125 +128 @@
 void Light::editLightNumber(int lightNumber)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(1)("no Light defined yet\n");
+      return;
+    }
+
   this->currentLight = lights[lightNumber];
 }
@@ -133 +142 @@
 void Light::deleteLight(void)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(1)("no Light defined yet\n");
+      return;
+    }
+
   this->deleteLight(this->currentLight->lightNumber);
 }
@@ -151 +166 @@
 }
 
-
-
 // set Attributes
 /**
@@ -161 +174 @@
 void Light::setPosition(Vector position)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(1)("no Light defined yet\n");
+      return;
+    }
   this->currentLight->lightPosition[0] = position.x;
   this->currentLight->lightPosition[1] = position.y;
@@ -171 +189 @@
 void Light::setPosition(GLfloat x, GLfloat y, GLfloat z)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(1)("no Light defined yet\n");
+      return;
+    }
+
   this->currentLight->lightPosition[0] = x;
   this->currentLight->lightPosition[1] = y;
@@ -187 +211 @@
 void Light::setDiffuseColor(GLfloat r, GLfloat g, GLfloat b)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(1)("no Light defined yet\n");
+      return;
+    }
+
   this->currentLight->diffuseColor[0] = r;
   this->currentLight->diffuseColor[1] = g;
@@ -204 +234 @@
 void Light::setSpecularColor(GLfloat r, GLfloat g, GLfloat b)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(1)("no Light defined yet\n");
+      return;
+    }
+
   this->currentLight->specularColor[0] = r;
   this->currentLight->specularColor[1] = g;
@@ -219 +255 @@
 Vector Light::getPosition(void)
 {
-  Vector tmpPosition(this->currentLight->lightPosition[0], this->currentLight->lightPosition[1], this->currentLight->lightPosition[2]);
-  return tmpPosition;
-}
+  if (!this->currentLight)
+    { 
+      PRINTF(1)("no Light defined yet\n");
+      return Vector(.0, .0, .0);
+    }
+  else
+    return Vector(this->currentLight->lightPosition[0], this->currentLight->lightPosition[1], this->currentLight->lightPosition[2]);
+}

orxonox/trunk/src/world.cc

@@ -173 +173 @@
 {
   light = Light::getInstance();
-  light->addLight(1);
+  light->addLight(0);
   light->setPosition(10.0, 10.0, 19.0);