Changeset 4255 in orxonox.OLD

Timestamp:

May 22, 2005, 2:15:45 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader: description works

Location:

orxonox/branches/levelLoader/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/loading/load_param.cc (modified) (7 diffs)
• util/loading/load_param.h (modified) (3 diffs)
• world_entities/skybox.cc (modified) (1 diff)

orxonox/branches/levelLoader/src/story_entities/world.cc

@@ -176 +176 @@
   //delete garbagecollecor
   //delete animator
+
+  LoadClassDescription::printAll();
 
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);

orxonox/branches/levelLoader/src/util/loading/load_param.cc

@@ -24 +24 @@
 BaseLoadParam::BaseLoadParam(BaseObject* object, const char* paramName, int paramCount, ...)
 {
+  this->paramDesc = NULL;
   if (LoadClassDescription::parametersDescription)
     {
@@ -50 +51 @@
 void BaseLoadParam::describe(const char* descriptionText)
 {
-  if (this->paramDesc)
+  if (LoadClassDescription::parametersDescription && this->paramDesc && !this->paramDesc->getDescription())
     {
-      
+      this->paramDesc->setDescription(descriptionText);
     }
-
 }
-
 
 LoadParamDescription::LoadParamDescription(const char* paramName)
 {
   this->types = NULL;
+  this->description = NULL;
   this->paramName = new char[strlen(paramName)+1];
   strcpy(this->paramName, paramName);
 }
+
 
 LoadParamDescription::~LoadParamDescription(void)
@@ -73 +74 @@
   delete []this->types;
   delete []this->paramName;
+}
+
+void LoadParamDescription::setDescription(const char* descriptionText)
+{
+  this->description = descriptionText;
+}
+
+void LoadParamDescription::print(void) const
+{
+  PRINT(3)(" <%s>", this->paramName);
+  for (int i = 0; i < this->paramCount; i++)
+    {
+      if (i > 0)
+        PRINT(3)(",");
+      PRINT(3)("%s", this->types[i]);
+    }
+  PRINT(3)("</%s>", this->paramName);
+  if (this->description)
+    PRINT(3)(" -- %s", this->description);
+  PRINT(3)("\n");
 }
 
@@ -93 +114 @@
 }
 
+
 LoadClassDescription::~LoadClassDescription(void)
 {
@@ -105 +127 @@
     }
   delete iterator;
-
 }
 
@@ -137 +158 @@
         {
           delete iterator;
-          this->paramList->add(enumParamDesc);
           return enumParamDesc;
         }
@@ -147 +167 @@
   return paramList->lastElement();
 }
+
+void LoadClassDescription::printAll(void) 
+{
+  PRINT(3)("==============================================================\n");
+  PRINT(3)(" Listing all the Loadable Options (loaded since Game started.\n\n");
+  tIterator<LoadClassDescription>* classIT = LoadClassDescription::classList->getIterator();
+  LoadClassDescription* enumClassDesc = classIT->nextElement();
+  while (enumClassDesc)
+    {
+      PRINT(3)("<%s>\n", enumClassDesc->className);
+      tIterator<LoadParamDescription>* paramIT = enumClassDesc->paramList->getIterator();
+      LoadParamDescription* enumParamDesc = paramIT->nextElement();
+      while (enumParamDesc)
+        {
+          enumParamDesc->print();
+          enumParamDesc = paramIT->nextElement();
+        }
+      delete paramIT;
+
+      PRINT(3)("</%s>\n\n", enumClassDesc->className);
+      enumClassDesc = classIT->nextElement();
+    }
+  delete classIT;
+
+}

orxonox/branches/levelLoader/src/util/loading/load_param.h

@@ -162 +162 @@
   LoadParamDescription(const char* paramName);
   ~LoadParamDescription(void);
+
+  void setDescription(const char* descriptionText);
+  /** \returns the descriptionString */
+  const char* getDescription(void) { return this->description;};
+
+  void print(void) const;
  private:
   char* paramName;
   int paramCount;
   char** types;
+  const char* description;
 };
 
@@ -178 +185 @@
   LoadParamDescription* addParam(const char* paramName);
 
-  static bool parametersDescription;
-  
+  static void printAll(void);
+
+  static bool parametersDescription;  
   static tList<LoadClassDescription>* classList;
  private:
@@ -189 +197 @@
 class BaseLoadParam
 {
+ public:
+  void describe(const char* descriptionText);
+
  protected:
   BaseLoadParam(BaseObject* object, const char* paramName, int paramCount, ...);
-  void describe(const char* descriptionText);
 
  protected:

orxonox/branches/levelLoader/src/world_entities/skybox.cc

@@ -56 +56 @@
 void SkyBox::loadParams(const TiXmlElement* root)
 {
-  LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture);
+  LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture).describe("Sets the material on the skysphere. The string must be the path relative to the data-dir, and without a trailing .jpg");
 }