Changeset 3588 in orxonox.OLD

Timestamp:

Mar 17, 2005, 2:47:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: name-fix for TrackManager and minor fix in Curve.
There has also been a little fix in the light-class: light is a BaseObject not a World-Entity

Location:

orxonox/trunk/src

Files:

• lib/math/curve.cc (modified) (7 diffs)
• lib/math/curve.h (modified) (3 diffs)
• light.h (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)
• track_manager.cc (modified) (6 diffs)
• track_manager.h (modified) (5 diffs)
• world_entities/primitive.cc (modified) (1 diff)

orxonox/trunk/src/lib/math/curve.cc

@@ -28 +28 @@
 #include <math.h>
 #include <stdio.h>
+
+
+/** 
+    \brief default constructor for a Curve
+*/
+Curve::Curve(void)
+{
+  nodeCount = 0;
+  firstNode = new PathNode;
+  currentNode = firstNode;
+
+  firstNode->position = Vector (.0, .0, .0);
+  firstNode->number = 0;
+  firstNode->next = 0; // not sure if this really points to NULL!!
+}
 
 /**
@@ -131 +146 @@
   this->derivation = 0;
   dirCurve = new BezierCurve(1);
-  this->init();
 }
 
@@ -141 +155 @@
   this->derivation = derivation;
   dirCurve=NULL;
-  this->init();
 }
 
@@ -161 +174 @@
   if (dirCurve)
     delete dirCurve;
-}
-
-/**
-   \brief Initializes a BezierCurve
-*/
-void BezierCurve::init(void)
-{
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-
-  return;
 }
 
@@ -297 +294 @@
 {
   this->derivation = 0;
-  this->init();
 }
 
@@ -307 +303 @@
   this->derivation = derivation;
   dirCurve=NULL;
-  this->init();
 }
 
@@ -327 +322 @@
   if (dirCurve)
     delete dirCurve;
-}
-
-/**
-   \brief Initializes a UPointCurve
-*/
-void UPointCurve::init(void)
-{
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-
-  return;
 }
 

orxonox/trunk/src/lib/math/curve.h

@@ -38 +38 @@
   PathNode* currentNode; //!< The node we are working with (the Last node).
 
+
  private:
   virtual void rebuild(void) = 0;
  public:
+  Curve(void);
+
   Curve* dirCurve;       //!< The derivation-curve of this Curve.
   void addNode(const Vector& newNode);
@@ -68 +71 @@
   BezierCurve(void);
   BezierCurve(int derivation);
-  ~BezierCurve(void);
-  void init(void);
+  virtual ~BezierCurve(void);
 
   Vector calcPos(float t);
@@ -106 +108 @@
   UPointCurve(int derivation);
   ~UPointCurve(void);
-  void init(void);
 
   Vector calcPos(float t);

orxonox/trunk/src/light.h

@@ -32 +32 @@
    A Light is a source that emits light rays (photons)
 */
-class Light : public WorldEntity
+class Light : public BaseObject
 {
  private:

orxonox/trunk/src/story_entities/world.cc

@@ -71 +71 @@
   delete this->nullParent;
   delete this->entities;
-
+  delete this->light;
   delete this->trackManager;
 }
@@ -296 +296 @@
   // LIGHT initialisation
   light = Light::getInstance();
-  light->addLight(0);
+  light->setAmbientColor(.1,.1,.1);
+  light->addLight();
   light->setAttenuation(QUADRATIC, 1.0);
   light->setAttenuation(CONSTANT, 2.0);

orxonox/trunk/src/track_manager.cc

@@ -37 +37 @@
   this->mainJoin = false;
   this->ID = -1;
-  this->startingTime = 0; //!< \todo eventually set this to the max time of TrackManager.
-  this->duration = 1;
+  this->startingTime = 0;
+  this->duration = TMAN_DEFAULT_DURATION;
   this->endTime = 1;
   this->jumpTime = 0;
-  this->curveType = BEZIERCURVE;
   this->nodeCount = 0;
   this->childCount = 0;
@@ -115 +114 @@
 
 /**
+   \param name the Name to set.
+*/
+void TrackElement::setName(const char* name)
+{
+  //  delete the old name
+  if (this->name)
+    delete []this->name;
+  // if a name was given already.
+  if (name)
+    {
+      this->name = new char[strlen(name)+1];
+      strcpy(this->name, name);
+    }
+  else 
+    this->name = NULL;
+}
+
+/**
+   \returns The name of this TrackElement
+*/
+char* TrackElement::getName(void) const
+{
+  return this->name;
+}
+
+
+/**
    \brief CONDITION that chooses the first child for the decision (static)
    \param nothing Nothing in this function
@@ -266 +292 @@
       this->addPoint(this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount()), this->currentTrackElem->children[i]);
     }
+  if (childCount == 1)
+    this->currentTrackElem->children[0]->setName(this->currentTrackElem->getName());
 }
 
@@ -307 +335 @@
       return;
     }
-  trackElem->curveType = curveType;
+  this->curveType = curveType;
   switch (curveType)
     {
@@ -348 +376 @@
   if (trackElem->isFresh)
     {
-      this->setCurveType(BEZIERCURVE, trackElem);
+      this->setCurveType(TMAN_DEFAULT_CURVETYPE, trackElem);
       trackElem->isFresh = false;
     }
@@ -757 +785 @@
           TrackElement* tmpElem = this->findTrackElementByID(i);
           PRINT(0)("--== TrackElement:%i ==--", tmpElem->ID);
-          if(tmpElem->name)
-            PRINT(0)("Name: %s::", tmpElem->name);
+          if(tmpElem->getName())
+            PRINT(0)("Name: %s::", tmpElem->getName());
           if(tmpElem->isFresh)
             PRINT(0)("  -- has not jet eddited in any way --\n");

orxonox/trunk/src/track_manager.h

@@ -17 +17 @@
 class PNode;
 
+// Static Definitions
+
+//! The Default Curve-Type to set for the whole path (if not chosen otherwise).
+#define TMAN_DEFAULT_CURVETYPE BEZIERCURVE
+#define TMAN_DEFAULT_DURATION 10
+
+
 //! A Graph-Element, that holds the curve-structure of a Level.
 /**
@@ -31 +38 @@
   bool backLoopCheck(TrackElement* trackElem);
 
+  // atributes
   bool isFresh;              //!< If no Points where added until now
   bool isHotPoint;           //!< If the first node is a specialPoint;
@@ -42 +50 @@
   float endTime;             //!< The time at which this Track ends.
   float jumpTime;            //!< The Time this Track has to jump to its preceding Track (only >0 if Track isJoined==true)
-  CurveType curveType;       //!< The CurveType this will have.
   int nodeCount;             //!< The count of points this TrackElement has.
-  char* name;                //!< A name for the Trac.
   Curve* curve;              //!< The Curve of this TrackElement
   int childCount;            //!< The number of Children This TrackElement has.
   TrackElement** children;   //!< A TrackElement can have a Tree of following TrackElements.
+
+  void setName(const char* name);
+  char* getName(void) const;
 
   // runtime
@@ -63 +72 @@
   int nearest(void* node);
   // todo  int enemyKilled(void* entity);
+
+ private:
+  char* name;                //!< A name for the Trac.
+ 
 };
 
@@ -108 +121 @@
   TrackManager(void);
 
-  static TrackManager* singletonRef;  //!< There may only be one TrackManager existing.
+  static TrackManager* singletonRef;  //!< There may only be one TrackManager.
+
   TrackElement* firstTrackElem;       //!< The first TrackElement that exists.
   TrackElement* currentTrackElem;     //!< The TrackElement we are working on.
+  CurveType curveType;                //!< The CurveType the entire TrackSystem will have.
   float localTime;                    //!< The time that has been passed since the traveling the Track.
   float maxTime;                      //!< The maximal time the track has.

orxonox/trunk/src/world_entities/primitive.cc

@@ -41 +41 @@
   this->material->setDiffuseMap("../data/pictures/sky-replace.jpg");
   this->material->setIllum(3);
-  this->material->setAmbient(1.0, 1.0, 1.0);
+  this->material->setSpecular(.3, .3, .3);
 }