Changeset 7214 in orxonox.OLD for branches/std/src

Timestamp:

Mar 10, 2006, 7:18:03 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the branche works again, as it did before

Location:

branches/std/src

Files:

• lib/lang/base_object.cc (modified) (7 diffs)
• lib/lang/base_object.h (modified) (2 diffs)
• lib/util/executor/executor.h (modified) (7 diffs)
• lib/util/executor/executor_specials.h (modified) (1 diff)
• lib/util/executor/functor_list.h (modified) (1 diff)
• lib/util/helper_functions.cc (modified) (1 diff)
• lib/util/loading/load_param.cc (modified) (1 diff)
• lib/util/multi_type.cc (modified) (1 diff)
• lib/util/multi_type.h (modified) (1 diff)
• lib/util/substring.cc (modified) (2 diffs)
• lib/util/substring.h (modified) (2 diffs)
• story_entities/story_entity.cc (modified) (3 diffs)
• story_entities/story_entity.h (modified) (3 diffs)
• world_entities/elements/image_entity.cc (modified) (1 diff)
• world_entities/elements/image_entity.h (modified) (1 diff)

branches/std/src/lib/lang/base_object.cc

@@ -37 +37 @@
   this->classID = CL_BASE_OBJECT;
 
-  this->objectName = NULL;
+  this->objectName = "";
   this->classList = NULL;
   this->xmlElem = NULL;
@@ -52 +52 @@
 
   //  delete []this->className;
-  if (this->objectName)
-    delete[] this->objectName;
   if (this->xmlElem != NULL)
     delete this->xmlElem;
@@ -97 +95 @@
 void BaseObject::setName (const std::string& objectName)
 {
-  if (this->objectName)
-    delete[] this->objectName;
-  if (!objectName.empty())
-  {
-    this->objectName = new char[objectName.size()+1];
-    strcpy(this->objectName, objectName.c_str());
-  }
-  else
-    this->objectName = NULL;
+  printf("TEST\n");
+  this->objectName = objectName;
+  printf("TEST2\n");
 }
 
@@ -175 +167 @@
 bool BaseObject::operator==(const char* objectName)
 {
-  if (likely(this->objectName != NULL && objectName != NULL))
-    return (strcmp(this->objectName, objectName)) ? false : true;
+  return (objectName != NULL && this->objectName == objectName);
 }
 
@@ -197 +188 @@
 int BaseObject::writeState( const byte * data, int length, int sender )
 {
-  SYNCHELP_READ_BEGIN();
-
-  if ( objectName )
+  /// FIXME STD
+
+  /*  SYNCHELP_READ_BEGIN();
+
+  if ( !objectName.empty() )
   {
     delete[] objectName;
@@ -211 +204 @@
   }
 
-  return SYNCHELP_READ_N;
+  return SYNCHELP_READ_N;*/
 }
 
@@ -222 +215 @@
 int BaseObject::readState( byte * data, int maxLength )
 {
-  SYNCHELP_WRITE_BEGIN();
+///FIXME STD
+  /*  SYNCHELP_WRITE_BEGIN();
 
   //PRINTF(0)("objectname = %s\n", this->objectName);
   SYNCHELP_WRITE_STRING( this->objectName, NWT_BO_NAME );
 
-  return SYNCHELP_WRITE_N;
-}
+  return SYNCHELP_WRITE_N;*/
+}

branches/std/src/lib/lang/base_object.h

@@ -33 +33 @@
   void setName (const std::string& newName);
   /** returns the Name of this Object */
-  inline const char* getName ()const { return this->objectName; };
+  inline const char* getName ()const { return this->objectName.c_str(); };
   /** @returns the XML-Element with whicht this Object was loaded */
   inline TiXmlNode* getXmlElem() const { return this->xmlElem; };
@@ -60 +60 @@
     const char*        className;        //!< the name of the class
     long               classID;          //!< this is the id from the class_id.h enumeration
-    char*              objectName;       //!< The name of this object
+    std::string        objectName;       //!< The name of this object
 
     ClassList*         classList;        //!< Pointer to the ClassList this Object is inside of

branches/std/src/lib/util/executor/executor.h

@@ -48 +48 @@
 
     /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
-    virtual void execute (BaseObject* object, const void* parameters = NULL) = 0;
+    virtual void execute (BaseObject* object, const std::string& parameters = "") = 0;
 
     /** @returns the Type of this Function (either static or objective) */
@@ -192 +192 @@
 #define ExecutorExecute1(t1) \
    else if (this->paramCount == 1 && this->defaultValue[0] == t1##_PARAM) \
-    EXECUTOREXECUTER(_1_##t1)(t1##_FUNC((const char*)parameters, t1##_DEFGRAB(0)))
+    EXECUTOREXECUTER(_1_##t1)(t1##_FUNC(sub[0], t1##_DEFGRAB(0)))
 
 //! execute-macro for functions with two parameters
 #define ExecutorExecute2(t1,t2) \
    else if (this->paramCount == 2 && this->defaultValue[0] == t1##_PARAM && this->defaultValue[1] == t2##_PARAM) \
-    EXECUTOREXECUTER(_2_##t1##_##t2)(t1##_FUNC(sub.getString(0), t1##_DEFGRAB(0)), t2##_FUNC(sub.getString(1), t2##_DEFGRAB(1)))
+    EXECUTOREXECUTER(_2_##t1##_##t2)(t1##_FUNC(sub[0], t1##_DEFGRAB(0)), t2##_FUNC(sub[1], t2##_DEFGRAB(1)))
 
 //! execute-macro for functions with three parameters
 #define ExecutorExecute3(t1,t2,t3) \
    else if (this->paramCount == 3 && this->defaultValue[0] == t1##_PARAM && this->defaultValue[1] == t2##_PARAM && this->defaultValue[2] == t3##_PARAM) \
-    EXECUTOREXECUTER(_3_##t1##_##t2##_##t3)(t1##_FUNC(sub.getString(0), t1##_DEFGRAB(0)), t2##_FUNC(sub.getString(1), t2##_DEFGRAB(1)), t3##_FUNC(sub.getString(2), t3##_DEFGRAB(2)))
+    EXECUTOREXECUTER(_3_##t1##_##t2##_##t3)(t1##_FUNC(sub[0], t1##_DEFGRAB(0)), t2##_FUNC(sub[1], t2##_DEFGRAB(1)), t3##_FUNC(sub[2], t3##_DEFGRAB(2)))
 
 //! execute-macro for functions with four parameters
 #define ExecutorExecute4(t1,t2,t3,t4) \
    else if (this->paramCount == 4 && this->defaultValue[0] == t1##_PARAM && this->defaultValue[1] == t2##_PARAM && this->defaultValue[2] == t3##_PARAM && this->defaultValue[3] == t4##_PARAM) \
-    EXECUTOREXECUTER(_4_##t1##_##t2##_##t3##_##t4)(t1##_FUNC(sub.getString(0), t1##_DEFGRAB(0)), t2##_FUNC(sub.getString(1), t2##_DEFGRAB(1)), t3##_FUNC(sub.getString(2), t3##_DEFGRAB(2)), t4##_FUNC(sub.getString(3), t4##_DEFGRAB(3))) \
+    EXECUTOREXECUTER(_4_##t1##_##t2##_##t3##_##t4)(t1##_FUNC(sub[0], t1##_DEFGRAB(0)), t2##_FUNC(sub[1], t2##_DEFGRAB(1)), t3##_FUNC(sub[2], t3##_DEFGRAB(2)), t4##_FUNC(sub[3], t4##_DEFGRAB(3))) \
 
 
@@ -213 +213 @@
 #define ExecutorExecute5(t1,t2,t3,t4,t5) \
    else if (this->paramCount == 5 && this->defaultValue[0] == t1##_PARAM && this->defaultValue[1] == t2##_PARAM && this->defaultValue[2] == t3##_PARAM && this->defaultValue[3] == t4##_PARAM && this->defaultValue[4] == t5##_PARAM) \
-    EXECUTOREXECUTER(_5_##t1##_##t2##_##t3##_##t4##_##t5)(t1##_FUNC(sub.getString(0), t1##_DEFGRAB(0)), t2##_FUNC(sub.getString(1), t2##_DEFGRAB(1)), t3##_FUNC(sub.getString(2), t3##_DEFGRAB(2)), t4##_FUNC(sub.getString(3), t4##_DEFGRAB(3)), t5##_FUNC(sub.getString(4), t5##_DEFGRAB(4)))
+    EXECUTOREXECUTER(_5_##t1##_##t2##_##t3##_##t4##_##t5)(t1##_FUNC(sub[0], t1##_DEFGRAB(0)), t2##_FUNC(sub[1], t2##_DEFGRAB(1)), t3##_FUNC(sub[2], t3##_DEFGRAB(2)), t4##_FUNC(sub[3], t4##_DEFGRAB(3)), t5##_FUNC(sub[4], t5##_DEFGRAB(4)))
 
 
@@ -242 +242 @@
 #define EXECUTORTYPE                   Executor_Objective
 //! keeps information about a Executor
-template<class T> class ExecutorObjective : public Executor
+template<class T> class EXECUTOR : public Executor
 {
   public:
-    ExecutorObjective() : Executor() { };
+    EXECUTOR() : Executor() { };
     // COPY constuctor (virtual version)
     virtual Executor* clone () const
     {
-      ExecutorObjective<T>* executor = new ExecutorObjective<T>();
+      EXECUTOR<T>* executor = new EXECUTOR<T>();
       this->cloning(executor);
       executor->fp = this->fp;
@@ -268 +268 @@
     } fp;
 
-    virtual void execute (BaseObject* object, const void* parameters = NULL)
+    virtual void execute (BaseObject* object, const std::string& parameters = "")
     {
       SubString sub;
-      printf("===%s\n", (const char*)parameters);
-      if (parameters != NULL)
-        sub.split((const char*)parameters, " \n\t,", '\\');
+      printf("===%s\n", parameters.c_str());
+      sub.split(parameters, " \n\t,", '\\');
+      sub.debug();
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x
@@ -309 +309 @@
 {
   public:
-    ExecutorStatic() : Executor() { };
+    EXECUTOR() : Executor() { };
     // COPY constuctor
     virtual Executor* clone () const
     {
-      ExecutorStatic<T>* executor = new ExecutorStatic<T>();
+      EXECUTOR<T>* executor = new EXECUTOR<T>();
       this->cloning(executor);
       executor->fp = this->fp;
@@ -333 +333 @@
 
 
-    virtual void execute (BaseObject* object, const void* parameters = NULL)
+    virtual void execute (BaseObject* object, const std::string& parameters = "")
     {
       SubString sub;
-      if (parameters != NULL)
-        sub.split((const char*)parameters, " \n\t,", '\\');
+      sub.split(parameters, " \n\t,", '\\');
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x

branches/std/src/lib/util/executor/executor_specials.h

@@ -60 +60 @@
      * @param loadString ignored in this case
      */
-    virtual void execute(BaseObject* object, const void* parameters = NULL)
+    virtual void execute(BaseObject* object, const std::string& = "")
     {
       if (object != NULL && this->element != NULL)

branches/std/src/lib/util/executor/functor_list.h

@@ -74 +74 @@
 //#define l_VECTOR_DEFAULT   Vector(0,0,0)        //!< Default value for a VECTOR
 
-#define l_CSTRING_TYPE     const char*          //!< The type of a STRING
-#define l_CSTRING_FUNC     isCString            //!< The function to parse a STRING
-#define l_CSTRING_NAME     "cstring"            //!< The name of a STRING
-#define l_CSTRING_PARAM    MT_STRING            //!< the type of the parameter STRING
-#define l_CSTRING_DEFAULT  ""                   //!< a default Value for an STRING
+#define l_CSTRING_TYPE     const char*          //!< The type of a CSTRING
+#define l_CSTRING_FUNC     isCString            //!< The function to parse a CSTRING
+#define l_CSTRING_NAME     "cstring"            //!< The name of a CSTRING
+#define l_CSTRING_PARAM    MT_STRING            //!< the type of the parameter CSTRING
+#define l_CSTRING_DEFAULT  ""                   //!< a default Value for an CSTRING
 
 #define l_STRING_TYPE      const std::string&   //!< The type of a STRING
 #define l_STRING_FUNC      isString             //!< The function to parse a STRING
 #define l_STRING_NAME      "string"             //!< The name of a STRING
-#define l_STRING_PARAM     MT_STRING            //!< the type of the parameter STRING
+#define l_STRING_PARAM     MT_CSTRING           //!< the type of the parameter STRING
 #define l_STRING_DEFAULT   ""                   //!< a default Value for an STRING
 

branches/std/src/lib/util/helper_functions.cc

@@ -104 +104 @@
 {
   if (STRING.size() > 0)
+  {
+    printf("DECISION1: %s\n", STRING.c_str());
     return STRING;
+  }
   else
+  {
+    printf("DECISION2: %s\n", defaultValue.c_str());
     return defaultValue;
+  }
 }
 

branches/std/src/lib/util/loading/load_param.cc

@@ -66 +66 @@
           ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
     {
-      PRINTF(0)("Loading '%s' with Parameters '%s' onto: '%s'(%s)\n", this->paramName.c_str(), loadString.c_str(), this->object->getName(), this->object->getClassName());
-      this->executor->execute(this->object, (const void*)loadString.c_str());
+      PRINTF(0)("Loading value '%s' with Parameters '%s' onto: %s::%s\n", this->paramName.c_str(), loadString.c_str(), this->object->getClassName(), this->object->getName());
+      this->executor->execute(this->object, loadString);
     }
     delete this->executor;

branches/std/src/lib/util/multi_type.cc

@@ -55 +55 @@
       break;
     case MT_STRING:
+    case MT_CSTRING:
       this->storedString = "";
       break;

branches/std/src/lib/util/multi_type.h

@@ -24 +24 @@
   MT_EXT1            = 32,                 //!< An external Type.
   MT_EXT2            = 64,                 //!< An external Type.
+
+  MT_CSTRING         = 128,                //!< An entire String.
 } MT_Type;
 

branches/std/src/lib/util/substring.cc

@@ -63 +63 @@
 }
 
+/**
+ * An empty String
+ */
+const std::string SubString::emptyString = "";
+
+
 
 unsigned int SubString::split(const std::string& string, char splitter)
@@ -101 +107 @@
 
 /**
- * splits line into tokens and stores them in ret. Supports delimiters, escape characters,
+ * @brief splits line into tokens and stores them in ret.
+ * @param ret the Array, where the Splitted strings will be stored in
+ * @param offsets an Array of Offsets, here the distance from the inputstring
+ * to the beginning of the current token is stored
+ * @param line the inputLine to split
+ * @param delimiters a String of Delimiters (here the input will be splitted)
+ * @param escape_char: Escape carater (escapes splitters)
+ * @param safemode_char: the beginning of the safemode is marked with this
+ * @param comment_char: the beginning of a comment is marked with this: (until the end of a Line)
+ * @param start_state: the Initial state on how to parse the String.
+ * @returns SPLIT_LINE_STATE the parser was in when returning
+ *
+ * Supports delimiters, escape characters,
  * ignores special  characters between safemode_char and between comment_char and linend '\n'.
  *
- * @returns SPLIT_LINE_STATE the parser was in when returning
  */
 SPLIT_LINE_STATE SubString::splitLine(std::vector<std::string>& ret, std::vector<unsigned int>& offsets,

branches/std/src/lib/util/substring.h

@@ -35 +35 @@
 
   inline unsigned int getCount() { return this->strings.size(); };
-  const std::string& getString(unsigned int i) { return this->strings[i]; };
+  const std::string& getString(unsigned int i) { return (i < this->strings.size()) ? this->strings[i] : emptyString; };
   unsigned int getOffset(unsigned int i);
 
@@ -48 +48 @@
    std::vector<std::string>  strings;                      //!< strings produced from a single string splitted in multiple strings
    std::vector<unsigned int> offsets;                      //!< offsets of the beginning of the input-string to the beginning of each substring.
+
+   static const std::string emptyString;
 };
 

branches/std/src/story_entities/story_entity.cc

@@ -42 +42 @@
   this->loadFile = "";
   this->storyID = -1;
-  this->description = NULL;
-  this->menuItemImage = NULL;
-  this->menuScreenshoot = NULL;
+  this->description = "";
+  this->menuItemImage = "";
+  this->menuScreenshoot = "";
   this->nextStoryID = WORLD_ID_GAMEEND;
   this->bMenuEntry = false;
@@ -117 +117 @@
  * @param name name
  */
-void StoryEntity::setDescription(const char* description)
+void StoryEntity::setDescription(const std::string& description)
 {
-  if (this->description)
-    delete[] this->description;
-  if (description!= NULL)
-  {
-    this->description= new char[strlen(description)+1];
-    strcpy(this->description, description);
-  }
-  else this->description= NULL;
+  this->description = description;
 }
 
@@ -178 +171 @@
  * @param name name
  */
-void StoryEntity::setMenuItemImage(const char* image)
+void StoryEntity::setMenuItemImage(const std::string& image)
 {
-  if (this->menuItemImage)
-    delete[] this->menuItemImage;
-  if (image != NULL)
-  {
-    this->menuItemImage = new char[strlen(image)+1];
-    strcpy(this->menuItemImage, image);
-  }
-  else this->menuItemImage = NULL;
+  this->menuItemImage = image;
 }
 
 
-/** sets the menu screenshoot of this StoryEntity @param name name */
-void StoryEntity::setMenuScreenshoot(const char* image)
+/** sets the menu screenshoot of this StoryEntity
+ * @param name name
+ */
+void StoryEntity::setMenuScreenshoot(const std::string& image)
 {
-  if (this->menuScreenshoot)
-    delete[] this->menuScreenshoot;
-  if (image != NULL)
-  {
-    this->menuScreenshoot = new char[strlen(image)+1];
-    strcpy(this->menuScreenshoot, image);
-  }
-  else this->menuScreenshoot = NULL;
+  this->menuScreenshoot = image;
 }
 

branches/std/src/story_entities/story_entity.h

@@ -68 +68 @@
   /**  gets the story id of the current entity @returns story id */
   inline int getNextStoryID() const { return this->nextStoryID; }
-  inline void setDescription(const char* description);
+  inline void setDescription(const std::string& description);
   /** @returns the description of this StoryEntity */
-  inline const char* getDescription() { return this->description; }
+  inline const std::string& getDescription() { return this->description; }
 
   void grabWorldInfo();
@@ -78 +78 @@
   inline bool isContainedInMenu() { return this->bMenuEntry; }
   /** sets the menu item image of this StoryEntity @param name name */
-  inline void setMenuItemImage(const char* image);
+  inline void setMenuItemImage(const std::string& image);
   /** @returns the menu item image of this StoryEntity */
-  inline const char* getMenuItemImage() { return this->menuItemImage; }
-  inline void setMenuScreenshoot(const char* image);
+  inline const std::string& getMenuItemImage() { return this->menuItemImage; }
+  inline void setMenuScreenshoot(const std::string& image);
   /** @returns the menu screenshoot of this StoryEntity */
-  inline const char* getMenuScreenshoot() { return this->menuScreenshoot; }
+  inline const std::string& getMenuScreenshoot() { return this->menuScreenshoot; }
 
   protected:
@@ -96 +96 @@
     std::string   loadFile;         //!< The file from which this world is loaded
 
-    char*         description;      //!< the description of the StoryEntity
-    char*         menuItemImage;    //!< the item image of the StoryEntity
-    char*         menuScreenshoot;  //!< the screenshoot of the StoryEntity
+    std::string   description;      //!< the description of the StoryEntity
+    std::string   menuItemImage;    //!< the item image of the StoryEntity
+    std::string   menuScreenshoot;  //!< the screenshoot of the StoryEntity
     bool          bMenuEntry;       //!< If true, this GameWorld apears in the SimpleMenu: SimpleMenu specific
 };

branches/std/src/world_entities/elements/image_entity.cc

@@ -106 +106 @@
  * @param textureFile The texture-file to load onto the crosshair
  */
-void ImageEntity::setTexture(const char* textureFile)
+void ImageEntity::setTexture(const std::string& textureFile)
 {
   this->material->setDiffuseMap(textureFile);

branches/std/src/world_entities/elements/image_entity.h

@@ -30 +30 @@
 
   void setSize(float sizeX, float sizeY);
-  void setTexture(const char* textureFile);
+  void setTexture(const std::string& textureFile);
   /** @param rotationSpeed the speed at what the crosshair should rotate */
   void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };