personalrobots-commit

[Personalrobots-commit] SF.net SVN: personalrobots:[23628] pkg/trunk/stacks/simulator_gazebo/gazebo /gazebo_new_patch.diff

[<hsu...@us...>]

Revision: 23628
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23628&view=rev
Author:   hsujohnhsu
Date:     2009-09-02 01:18:20 +0000 (Wed, 02 Sep 2009)

Log Message:
-----------
suppress couts.

Modified Paths:
--------------
    pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff

Modified: pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff
===================================================================
--- pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff	2009-09-02 01:16:43 UTC (rev 23627)
+++ pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff	2009-09-02 01:18:20 UTC (rev 23628)
@@ -11,6 +11,43 @@
    IF (NOT PLAYER_FOUND)
      SET (INCLUDE_PLAYER OFF CACHE BOOL "Build gazebo plugin for player" FORCE)
      MESSAGE (STATUS "Warning: Player not found. The gazebo plugin for player will not be built. See the following website: http://playerstage.sourceforge.net")
+Index: libgazebo/Client.cc
+===================================================================
+--- libgazebo/Client.cc	(revision 8232)
++++ libgazebo/Client.cc	(working copy)
+@@ -128,7 +128,7 @@
+ 
+     this->filename = stream.str();
+ 
+-    std::cout << "opening " << this->filename << "\n";
++    //std::cout << "opening " << this->filename << "\n";
+ 
+     // Connect to gazebo::SimulationIface and check for changing realTime,
+     // if simulationIface->data->realTime is not changing, the server might
+Index: libgazebo/Iface.cc
+===================================================================
+--- libgazebo/Iface.cc	(revision 8232)
++++ libgazebo/Iface.cc	(working copy)
+@@ -313,14 +313,12 @@
+   std::ios_base::fmtflags origFlags = std::cout.flags();
+ 
+   // Print the name, version info
+-  std::cout << "opening " << this->filename.c_str() << " "
++  // std::cout << "opening " << this->filename.c_str() << " "
++  //<< std::setiosflags(std::ios::hex | std::ios::showbase)
++  //<< std::setw(3) << ((GazeboData*) this->mMap)->version << " "
++  //<< std::setiosflags(std::ios::dec | ~std::ios::showbase)
++  //<< ((GazeboData*) this->mMap)->size << "\n";
+ 
+-  << std::setiosflags(std::ios::hex | std::ios::showbase)
+-  << std::setw(3) << ((GazeboData*) this->mMap)->version << " "
+-
+-  << std::setiosflags(std::ios::dec | ~std::ios::showbase)
+-  << ((GazeboData*) this->mMap)->size << "\n";
+-
+   std::cout.setf(origFlags);
+ 
+   this->Lock(1);
 Index: libgazebo/bindings/ruby/CMakeLists.txt
 ===================================================================
 --- libgazebo/bindings/ruby/CMakeLists.txt	(revision 8232)
@@ -24,6 +61,22 @@
  endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
  
    IF(RUBY_FOUND)
+Index: server/rendering/OgreHeightmap.cc
+===================================================================
+--- server/rendering/OgreHeightmap.cc	(revision 8232)
++++ server/rendering/OgreHeightmap.cc	(working copy)
+@@ -108,6 +108,11 @@
+   float nf = (float)(log(terrainVertSize-1)/log(2));
+   int ni = (int)(log(terrainVertSize-1)/log(2));
+ 
++  //std::cout << "debug: imageFilename " << imageFilename << std::endl;
++  //std::cout << "debug: nf " << nf << std::endl;
++  //std::cout << "debug: ni " << ni << std::endl;
++  //std::cout << "debug: terrainVertSize " << terrainVertSize << std::endl;
++
+   // Make sure the heightmap image size is (2^n)+1 in size
+   if ( nf - ni != 0)
+   {
 Index: server/rendering/CMakeLists.txt
 ===================================================================
 --- server/rendering/CMakeLists.txt	(revision 8232)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Personalrobots-commit] SF.net SVN: personalrobots:[23869] pkg/trunk/stacks/simulator_gazebo/gazebo /gazebo_new_patch.diff

[<hsu...@us...>]

Revision: 23869
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23869&view=rev
Author:   hsujohnhsu
Date:     2009-09-04 20:42:44 +0000 (Fri, 04 Sep 2009)

Log Message:
-----------
debugging

Modified Paths:
--------------
    pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff

Modified: pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff
===================================================================
--- pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff	2009-09-04 20:39:24 UTC (rev 23868)
+++ pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff	2009-09-04 20:42:44 UTC (rev 23869)
@@ -61,6 +61,56 @@
  endif (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
  
    IF(RUBY_FOUND)
+Index: server/Global.hh
+===================================================================
+--- server/Global.hh	(revision 8232)
++++ server/Global.hh	(working copy)
+@@ -80,6 +80,6 @@
+ 
+ #define ROUND(x) ( (int)( floor((x)+0.5) ) )
+ 
+-//#define TIMING
++#undef TIMING
+ 
+ #endif
+Index: server/Simulator.cc
+===================================================================
+--- server/Simulator.cc	(revision 8232)
++++ server/Simulator.cc	(working copy)
+@@ -645,6 +645,11 @@
+       world->Update();
+     }
+ 
++#ifdef TIMING
++  double tmpT2 = Simulator::Instance()->GetWallTime();
++  std::cout << " World::Update() DT(" << tmpT2-tmpT1 << ")" << std::endl;
++#endif
++
+     currTime = this->GetRealTime();
+ 
+     // Set a default sleep time
+@@ -678,6 +683,10 @@
+     // Process all incoming messages from simiface
+     world->UpdateSimulationIface();
+ 
++#ifdef TIMING
++  double tmpT3 = Simulator::Instance()->GetWallTime();
++  std::cout << " World::UpdatSimulationIface() DT(" << tmpT3-tmpT2 << ")" << std::endl;
++#endif
+     if (this->timeout > 0 && this->GetRealTime() > this->timeout)
+     {
+       this->userQuit = true;
+@@ -691,8 +700,8 @@
+     }
+ 
+ #ifdef TIMING
+-    double tmpT2 = this->GetWallTime();
+-    std::cout << " Simulator::PhysicsLoop() DT(" << tmpT2-tmpT1 
++    double tmpT4 = this->GetWallTime();
++    std::cout << " Simulator::PhysicsLoop() DT(" << tmpT4-tmpT1 
+       << ")" << std::endl;
+ #endif
+   }
 Index: server/rendering/OgreHeightmap.cc
 ===================================================================
 --- server/rendering/OgreHeightmap.cc	(revision 8232)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Personalrobots-commit] SF.net SVN: personalrobots:[23870] pkg/trunk/stacks/simulator_gazebo/gazebo /gazebo_new_patch.diff

[<hsu...@us...>]

Revision: 23870
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23870&view=rev
Author:   hsujohnhsu
Date:     2009-09-04 20:54:44 +0000 (Fri, 04 Sep 2009)

Log Message:
-----------
remove debug comment

Modified Paths:
--------------
    pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff

Modified: pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff
===================================================================
--- pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff	2009-09-04 20:42:44 UTC (rev 23869)
+++ pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff	2009-09-04 20:54:44 UTC (rev 23870)
@@ -192,7 +192,7 @@
        }
      }
    }
-@@ -614,6 +624,17 @@
+@@ -614,6 +624,16 @@
            this->directionVec.z -= this->moveAmount;
            break;
  
@@ -204,13 +204,12 @@
 +        case XK_Alt_L:
 +        case XK_Alt_R:
 +          this->altKeyPressed = true;
-+          std::cout << "pressing alt" << std::endl;
 +          break;
 +
          default:
            break;
        }
-@@ -641,7 +662,20 @@
+@@ -641,7 +661,20 @@
      case ']':
        CameraManager::Instance()->DecActiveCamera();
        break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.