Changeset 4595 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Jun 10, 2005, 11:22:00 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better output

Location:

orxonox/trunk/src/lib/lang

Files:

• base_object.cc (modified) (3 diffs)
• base_object.h (modified) (1 diff)

orxonox/trunk/src/lib/lang/base_object.cc

@@ -19 +19 @@
 #include "base_object.h"
 #include "load_param.h"
+#include "compiler.h"
 
 using namespace std;
@@ -113 +114 @@
    \returns true if it is, false otherwise
 */
-bool BaseObject::isA (ClassID classID)
+bool BaseObject::isA (ClassID classID) const
 {
   // if classID is a derivable object
-  if (classID & CL_MASK_SUPER_CLASS || classID & CL_MASK_SUBSUPER_CLASS)
+  if (likely(classID & CL_MASK_SUPER_CLASS || classID & CL_MASK_SUBSUPER_CLASS))
   {
     if( this->classID & classID)
@@ -135 +136 @@
 void BaseObject::whatIs(void) const
 {
-  PRINT(0)("object %s: ", this->getName() );
+  PRINT(0)("object %s of class %s: ", this->getName(), this->getClassName());
   if (this->classID & CL_MASK_SUPER_CLASS)
   {
-    PRINT(0)("is a derived Class from: \n");
-    if (this->classID & CL_BASE_OBJECT)
-      PRINT(0)("BaseObject, ");
-    if (this->classID & CL_PARENT_NODE)
-      PRINT(0)("ParentNode, ");
-    if (this->classID & CL_WORLD_ENTITY)
-      PRINT(0)("WorldEntity, ");
-    if (this->classID & CL_PHYSICS_INTERFACE)
-      PRINT(0)("PhysicsInterface, ");
-    if (this->classID & CL_EVENT_LISTENER)
-      PRINT(0)("EventListener, ");
-    if (this->classID & CL_STORY_ENTITY)
-      PRINT(0)("StoryEntity, ");
+    PRINT(0)("is a derived from the following superclasses:");
+    if (this->isA(CL_BASE_OBJECT))
+      PRINT(0)(" =BaseObject=");
+    if (this->isA(CL_PARENT_NODE))
+      PRINT(0)(" =PNode=");
+    if (this->isA(CL_WORLD_ENTITY))
+      PRINT(0)(" =WorldEntity=");
+    if (this->isA(CL_PHYSICS_INTERFACE))
+      PRINT(0)(" =PhysicsInterface=");
+    if (this->isA(CL_EVENT_LISTENER))
+      PRINT(0)(" =EventListener=");
+    if (this->isA(CL_STORY_ENTITY))
+      PRINT(0)(" =StoryEntity=");
+    PRINT(0)("\n");
   }
-  printf("\n");
+  // subsuper-classes
+  if (this->classID & CL_MASK_SUBSUPER_CLASS)
+  {
+    PRINT(0)(" ->further derivations: ");
+    if (this->isA(CL_PLAYER))
+      PRINT(0)(" -Player-");
+    if (this->isA(CL_NPC))
+      PRINT(0)(" -NPC-");
+    if (this->isA(CL_POWER_UP))
+      PRINT(0)(" -PowerUp-");
+    if (this->isA(CL_FIELD))
+      PRINT(0)(" -Field-");
+    if (this->isA(CL_PROJECTILE))
+      PRINT(0)(" -Projectile-");
+    if (this->isA(CL_WEAPON))
+      PRINT(0)(" -Weapon-");
+    PRINT(0)("\n");
+  }
 }

orxonox/trunk/src/lib/lang/base_object.h

@@ -37 +37 @@
   inline int getClassID(void) const { return this->classID; }
 
-  bool isA (ClassID classID);
+  bool isA (ClassID classID) const;
   void whatIs(void) const;