Changeset 3599 in orxonox.OLD

Timestamp:

Mar 18, 2005, 12:44:13 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: LightManager: preventing seg-fault

Location:

orxonox/trunk/src

Files:

• light.cc (modified) (8 diffs)
• track_manager.cc (modified) (1 diff)

orxonox/trunk/src/light.cc

@@ -372 +372 @@
 void LightManager::setPosition(GLfloat x, GLfloat y, GLfloat z)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(2)("no Light defined yet. Please define at least one light first befor editing.\n");
+      return;
+    }
   this->currentLight->setPosition(x, y, z);
 }
@@ -383 +388 @@
 void LightManager::setDiffuseColor(GLfloat r, GLfloat g, GLfloat b)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(2)("no Light defined yet. Please define at least one light first befor editing.\n");
+      return;
+    }
   this->currentLight->setDiffuseColor(r,g,b);
 }
@@ -394 +404 @@
 void LightManager::setSpecularColor(GLfloat r, GLfloat g, GLfloat b)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(2)("no Light defined yet. Please define at least one light first befor editing.\n");
+      return;
+    }
   this->currentLight->setSpecularColor(r, g, b);
 }
@@ -405 +420 @@
 void LightManager::setAttenuation(float constantAttenuation, float linearAttenuation, float quadraticAttenuation)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(2)("no Light defined yet. Please define at least one light first befor editing.\n");
+      return;
+    }
   this->currentLight->setAttenuation(constantAttenuation, linearAttenuation, quadraticAttenuation);
 }
@@ -415 +435 @@
 void LightManager::setSpotDirection(Vector direction)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(2)("no Light defined yet. Please define at least one light first befor editing.\n");
+      return;
+    }
   this->currentLight->setSpotDirection(direction);
 }
@@ -424 +449 @@
 void LightManager::setSpotCutoff(GLfloat cutoff)
 {
+  if (!this->currentLight)
+    { 
+      PRINTF(2)("no Light defined yet. Please define at least one light first befor editing.\n");
+      return;
+    }
   this->currentLight->setSpotCutoff(cutoff);
 }
@@ -435 +465 @@
   if (!this->currentLight)
     { 
-      PRINTF(1)("no Light defined yet\n");
+      PRINTF(2)("no Light defined yet\n");
       return Vector(.0, .0, .0);
     }
@@ -449 +479 @@
 {
   if (!this->lights[lightNumber])
-    return Vector(.0,.0,.0);
+    {
+      PRINTF(2)("no Light defined yet\n");
+      return Vector(.0,.0,.0);
+    }
   else
     return this->lights[lightNumber]->getPosition();

orxonox/trunk/src/track_manager.cc

@@ -302 +302 @@
 
 
-/////////////////////////////////////
-///// TRACKMANAGER //////////////////
-/////////////////////////////////////
+////////////////////////
+///// TRACKMANAGER /////
+////////////////////////
 /**
    \brief standard constructor