Changeset 947 for code/branches/core2/src/util

Timestamp:

Mar 28, 2008, 10:13:58 PM (17 years ago)

Author:

landauf

Message:

• added CommandExecutor
• added ConsoleCommand macros
• added getTypename to all MultiTypes
• added 2 static maps to Identifier that contain all existing Identifiers with their names and lowercase names respectively.
• added 2 maps to each Identifier that contain all console commands of the Identifier with their names and lowercase names respectively
• using tolower(.) and toupper(.) instead of selfmade hacks in String.h
• added AccessLevel enum
• added some test-console-commands to OutputHandler, Ambient and SpaceShip

Location:

code/branches/core2/src/util

Files:

• MultiTypeMath.cc (modified) (1 diff)
• MultiTypeMath.h (modified) (1 diff)
• MultiTypePrimitive.cc (modified) (1 diff)
• MultiTypePrimitive.h (modified) (1 diff)
• MultiTypeString.cc (modified) (1 diff)
• MultiTypeString.h (modified) (1 diff)
• String.cc (modified) (3 diffs)

code/branches/core2/src/util/MultiTypeMath.cc

@@ -144 +144 @@
 }
 
+std::string MultiTypeMath::getTypename() const
+{
+    if (this->type_ == MT_vector2)
+        return "Vector2";
+    else if (this->type_ == MT_vector3)
+        return "Vector3";
+    else if (this->type_ == MT_colourvalue)
+        return "ColourValue";
+    else if (this->type_ == MT_quaternion)
+        return "Quaternion";
+    else if (this->type_ == MT_radian)
+        return "Radian";
+    else if (this->type_ == MT_degree)
+        return "Degree";
+    else
+        return MultiTypeString::getTypename();
+}
+
 std::string MultiTypeMath::toString() const
 {

code/branches/core2/src/util/MultiTypeMath.h

@@ -145 +145 @@
         inline void getValue(orxonox::Degree*      variable) const { (*variable) = orxonox::Degree      (this->degree_);      }
 
+        virtual std::string getTypename() const;
+
         virtual std::string toString() const;
         virtual bool fromString(const std::string value);

code/branches/core2/src/util/MultiTypePrimitive.cc

@@ -167 +167 @@
 }
 
+std::string MultiTypePrimitive::getTypename() const
+{
+    if (this->type_ == MT_void)
+        return "pointer";
+    else if (this->type_ == MT_int)
+        return "int";
+    else if (this->type_ == MT_uint)
+        return "unsigned int";
+    else if (this->type_ == MT_char)
+        return "char";
+    else if (this->type_ == MT_uchar)
+        return "unsigned char";
+    else if (this->type_ == MT_short)
+        return "short";
+    else if (this->type_ == MT_ushort)
+        return "unsigned short";
+    else if (this->type_ == MT_long)
+        return "long";
+    else if (this->type_ == MT_ulong)
+        return "unsigned long";
+    else if (this->type_ == MT_float)
+        return "float";
+    else if (this->type_ == MT_double)
+        return "double";
+    else if (this->type_ == MT_longdouble)
+        return "long double";
+    else if (this->type_ == MT_bool)
+        return "bool";
+    else
+        return "unknown";
+}
+
 std::string MultiTypePrimitive::toString() const
 {

code/branches/core2/src/util/MultiTypePrimitive.h

@@ -181 +181 @@
         inline bool      isA(MultiType type) const { return (this->type_ == type); }
 
+        virtual std::string getTypename() const;
+
         virtual std::string toString() const;
         virtual bool fromString(const std::string value);

code/branches/core2/src/util/MultiTypeString.cc

@@ -104 +104 @@
 }
 
+std::string MultiTypeString::getTypename() const
+{
+    if (this->type_ == MT_constchar)
+        return "string";
+    else if (this->type_ == MT_string)
+        return "string";
+    else if (this->type_ == MT_xmlelement)
+        return "XML-element";
+    else
+        return MultiTypePrimitive::getTypename();
+}
+
 std::string MultiTypeString::toString() const
 {

code/branches/core2/src/util/MultiTypeString.h

@@ -115 +115 @@
         inline void getValue(orxonox::Element* variable) const { (*variable) = this->xmlelement_;     }
 
+        virtual std::string getTypename() const;
+
         virtual std::string toString() const;
         virtual bool fromString(const std::string value);

code/branches/core2/src/util/String.cc

@@ -25 +25 @@
  *
  */
+
+#include <cctype>
 
 #include "String.h"
@@ -116 +118 @@
 void lowercase(std::string* str)
 {
-    static unsigned const char difference_between_A_and_a = 'A' - 'a';
-
-    for (std::string::iterator it = (*str).begin(); it != (*str).end(); ++it)
-        if ((*it) >= 'A' && (*it) <= 'Z')
-            (*it) -= difference_between_A_and_a;
+    for (unsigned int i = 0; i < str->size(); ++i)
+    {
+        (*str)[i] = tolower((*str)[i]);
+    }
 }
 
@@ -141 +142 @@
 void uppercase(std::string* str)
 {
-    static unsigned const char difference_between_A_and_a = 'A' - 'a';
-
-    for (std::string::iterator it = (*str).begin(); it != (*str).end(); ++it)
-        if ((*it) >= 'a' && (*it) <= 'z')
-            (*it) += difference_between_A_and_a;
+    for (unsigned int i = 0; i < str->size(); ++i)
+    {
+        (*str)[i] = toupper((*str)[i]);
+    }
 }