Changeset 3208 in orxonox.OLD

Timestamp:

Dec 17, 2004, 9:58:32 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: forgot some printf's, fixed now

Location:

orxonox/trunk/src/importer

Files:

• framework.cc (modified) (6 diffs)
• material.cc (modified) (2 diffs)

orxonox/trunk/src/importer/framework.cc

@@ -136 +136 @@
             int wW = wHandler.screen->w;
             Vector tmpV (mX, mY, sqrt ( (float) abs(wH * wH/4 - (wW/2-mX) * (wW/2-mX) - (wH/2-mY) * (wH/2-mY)) ));
-            //      printf ("tmpV: %f, %f, %f\n", tmpV.x, tmpV.y, tmpV.z);
+            //      PRINTF(0)("tmpV: %f, %f, %f\n", tmpV.x, tmpV.y, tmpV.z);
             p2 = tmpV-M;
             p2.y = -p2.y;
             rotAxis = p1.cross(p2);
-            //  printf ("rotAxis: %f, %f, %f\n", rotAxis.x, rotAxis.y, rotAxis.z);
+            //  PRINTF(0)("rotAxis: %f, %f, %f\n", rotAxis.x, rotAxis.y, rotAxis.z);
 
             // in case that there is no rotation-axis defined
@@ -146 +146 @@
               {
                 rotAxis.normalize();
-                //              printf ("rotAxis: %f, %f, %f\n", rotAxis.x, rotAxis.y, rotAxis.z, rotAngle);
+                //              PRINTF(0)("rotAxis: %f, %f, %f\n", rotAxis.x, rotAxis.y, rotAxis.z, rotAngle);
                                 
                 rotAngle = angle_rad (p1, p2);
@@ -154 +154 @@
                 //      dir = rotQ.apply(dir);
                 //      dir.normalize();
-                //      printf ("rotAxis: %f, %f, %f, %f\n", dir.x, dir.y, dir.z, rotAngle);
+                //      PRINTF(0)("rotAxis: %f, %f, %f, %f\n", dir.x, dir.y, dir.z, rotAngle);
               }
             rotQlast = rotQ;
@@ -164 +164 @@
         if (event.button.button == 4)
           {
-            printf("MouseWheel up\n");
+            PRINTF(0)("MouseWheel up\n");
             zoomTo *= .5;
           }
         else if (event.button.button == 5)
           {
-            printf("MouseWheel down\n");
+            PRINTF(2)("MouseWheel down\n");
             zoomTo *= 2.0;
           }
@@ -186 +186 @@
         else
           {
-            printf("MouseButton %d pressed at (%d,%d).\n",
+            PRINTF(0)("MouseButton %d pressed at (%d,%d).\n",
                    event.button.button, event.button.x, event.button.y);
             rotatorV = ( (float)wHandler.screen->w/2 -event.button.x) / (float)wHandler.screen->w / 100.0;
@@ -199 +199 @@
         else 
             {
-        printf("MouseButton %d released at (%d,%d).\n",
-               event.button.button, event.button.x, event.button.y);
+              PRINTF(2)("MouseButton %d released at (%d,%d).\n",
+                        event.button.button, event.button.x, event.button.y);
             }
         break;

orxonox/trunk/src/importer/material.cc

@@ -83 +83 @@
   strncpy(tmpPName, pName, strlen(pName)-1);
   tmpPName[strlen(pName)-1] = '\0';
-  printf ("%s\n",tmpPName);
   if (access (tmpPName, F_OK) == 0)
     {
@@ -268 +267 @@
   PRINTF(3)("setting illumModel of Material %s to %i\n", this->name, illum);
   this->illumModel = illum;
-  //  printf ("setting illumModel to: %i\n", illumModel);
+  //  PRINTF(3)("setting illumModel to: %i\n", illumModel);
 }
 /**