Changeset 5513 in orxonox.OLD

Timestamp:

Nov 9, 2005, 12:22:43 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: color adaption in the shell
isA also with String (slow)

Location:

trunk/src/lib

Files:

• lang/base_object.cc (modified) (1 diff)
• lang/base_object.h (modified) (2 diffs)
• lang/class_list.cc (modified) (2 diffs)
• shell/shell.h (modified) (1 diff)

trunk/src/lib/lang/base_object.cc

@@ -126 +126 @@
 
 /**
+ *  checks if the class is a classID
+ * @param classID the Identifier to check for
+ * @returns true if it is, false otherwise
+ */
+bool BaseObject::isA (const char* className) const
+{
+  long classID = ClassList::StringToID(className);
+  if (classID != CL_NULL)
+    return this->isA(classID);
+}
+
+
+/**
  *  displays everything this class is
  */

trunk/src/lib/lang/base_object.h

@@ -26 +26 @@
 
   void loadParams(const TiXmlElement* root);
-
   void setName (const char* newName);
   /** returns the Name of this Object */
@@ -37 +36 @@
 
   bool isA (long classID) const;
+  bool isA (const char* className) const;
   void whatIs() const;
 

trunk/src/lib/lang/class_list.cc

@@ -242 +242 @@
 bool ClassList::exists(const BaseObject* object, long classID)
 {
-  if(unlikely(ClassList::first == NULL))
+  if(unlikely(ClassList::first == NULL) || object == NULL)
     return false;
   else
@@ -252 +252 @@
       {
         tIterator<BaseObject>* iterator = tmp->objectList->getIterator();
-        BaseObject* enumBO = iterator->firstElement();
+        const BaseObject* enumBO = iterator->firstElement();
         while (enumBO != NULL)
         {

trunk/src/lib/shell/shell.h

@@ -17 +17 @@
 #define         SHELL_DEFAULT_FONT              "fonts/dpquake_.ttf"
 #define         SHELL_DEFAULT_TEXT_COLOR        1.0f, 0.0f, 0.0f, 1.0f
-#define         SHELL_DEFAULT_BACKGROUND_COLOR  0.0f, 0.0f, 0.8f, 0.8f
+#define         SHELL_DEFAULT_BACKGROUND_COLOR  0.0f, 0.0f, 0.0f, 1.0f
 
 // FORWARD DECLARATION