Changeset 2851 in orxonox.OLD for orxonox/trunk

Timestamp:

Nov 14, 2004, 6:19:50 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/importer: extended the draw function. Now you can draw one of the objects with the call to its name, or its number.

Location:

orxonox/trunk/importer

Files:

• object.cc (modified) (4 diffs)
• object.h (modified) (1 diff)

orxonox/trunk/importer/object.cc

@@ -131 +131 @@
 
 /**
-   \brief Draws the Object
-   It does this by just calling the List that must have been created earlier.
+   \brief Draws the Objects of all Groups.
+   It does this by just calling the Lists that must have been created earlier.
 */
 void Object::draw (void)
 {
-  if (verbose >=3)
-    printf("drawing the 3D-Object\n"); 
+  if (verbose >=2)
+    printf("drawing the 3D-Objects\n"); 
   Group* walker = firstGroup;
   while (walker != NULL)
     {
+      if (verbose >= 3)
+        printf ("Drawing object %s\n", walker->name);
       glCallList (walker->listNumber);
       walker = walker->nextGroup;
     }
 }
+
+/**
+   \brief Draws the Object number groupNumber
+   It does this by just calling the List that must have been created earlier.
+   \param groupNumber The number of the Group that will be displayed.
+*/
+void Object::draw (int groupNumber)
+{
+  if (verbose >=2)
+    printf("drawing the requested 3D-Objects if found.\n"); 
+  Group* walker = firstGroup;
+  int counter = 0;
+  while (walker != NULL)
+    {
+      if (counter == groupNumber)
+        {
+          if (verbose >= 2)
+            printf ("Drawing object number %s named %s\n", counter, walker->name);
+          glCallList (walker->listNumber);
+          return;
+        }
+      ++counter;
+      walker = walker->nextGroup;
+    }
+  if (verbose >= 2)
+    printf("Object number %i in %s not Found.\n", groupNumber, objFileName);
+  return;
+
+}
+void Object::draw (char* groupName)
+{
+  if (verbose >=2)
+    printf("drawing the requested 3D-Objects if found.\n"); 
+  Group* walker = firstGroup;
+  while (walker != NULL)
+    {
+      if (!strcmp(walker->name, groupName))
+        {
+          if (verbose >= 2)
+            printf ("Drawing object %s\n", walker->name);
+          glCallList (walker->listNumber);
+          return;
+        }
+      walker = walker->nextGroup;
+    }
+  if (verbose >= 2)
+    printf("Object Named %s in %s not Found.\n", groupName, objFileName);
+  return;
+}
+
 
 /**
@@ -154 +206 @@
     printf("Adding new Group\n");
   group->faceMode = -1;
+  group->name = "";
   if ((group->listNumber = glGenLists(1)) == 0 )
     {
@@ -159 +212 @@
       return false;
     }
-
+  
   if (groupCount == 0)
     {
@@ -429 +482 @@
   else
     {
-      currentGroup->name = groupString;
+      
+      currentGroup->name = new char [strlen(groupString)];      
+      strcpy(currentGroup->name, groupString);
     }
 }

orxonox/trunk/importer/object.h

@@ -32 +32 @@
   bool finalize(void);
   void draw (void);
-
-
+  void draw (int groupNumber);
+  void draw (char* groupName);
 
  private: