Revision: 8807
http://playerstage.svn.sourceforge.net/playerstage/?rev=8807&view=rev
Author: natepak
Date: 2010-06-28 21:02:18 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
A few very minor changes
Modified Paths:
--------------
code/gazebo/branches/wx/TODO
code/gazebo/branches/wx/benchmarks/pioneer_circle_benchmark.cc
code/gazebo/branches/wx/server/Global.hh
code/gazebo/branches/wx/server/Simulator.cc
code/gazebo/branches/wx/server/XMLConfig.cc
code/gazebo/branches/wx/server/physics/Joint.cc
code/gazebo/branches/wx/server/physics/bullet/BulletHinge2Joint.cc
code/gazebo/branches/wx/server/physics/bullet/BulletHingeJoint.cc
Modified: code/gazebo/branches/wx/TODO
===================================================================
--- code/gazebo/branches/wx/TODO 2010-06-28 20:31:24 UTC (rev 8806)
+++ code/gazebo/branches/wx/TODO 2010-06-28 21:02:18 UTC (rev 8807)
@@ -3,25 +3,18 @@
///////////////////////////////////////
GUI
-- Hand of god
- - Select models and get info
- - Move models
- -Implement in CameraSensor class.
-- Allow person to display and change XML parameters through the GUI.
-- Better fonts
-- Better camera movement. Translate is too slow over long distances
+-Set pose of object numerically
+-Model importer
+-Set joints
+-Set physics params, and other global params
+-Set Object parameters
+ - Apply materials, set friction, set visual & collision models, numerically
set forces and torques
+- Orbit camera movement
Rendering
-- FSAA: See OgreCreator::CreateWindow
-- Shadows draw on multiple surfaces(seem to pass through walls).
-- Removing the sky results in a black screen
- Paging heightmaps.
- Positioning the current heightmap is a big hack
- BSP loader and worlds
-- Fog
-- Anti Aliasing
-- Better lights
- - GLSL per pixel lighting. Make this user selectable.
- Dynamic textures
Modified: code/gazebo/branches/wx/benchmarks/pioneer_circle_benchmark.cc
===================================================================
--- code/gazebo/branches/wx/benchmarks/pioneer_circle_benchmark.cc
2010-06-28 20:31:24 UTC (rev 8806)
+++ code/gazebo/branches/wx/benchmarks/pioneer_circle_benchmark.cc
2010-06-28 21:02:18 UTC (rev 8807)
@@ -278,9 +278,11 @@
for (iter = step_types.begin(); iter != step_types.end(); iter++)
{
std::string path =
std::string("/home/nate/work/simpar/data/pioneer_circle/") + *iter + "/";
- system((std::string("mkdir -p ")+path).c_str());
+ if (system((std::string("mkdir -p ")+path).c_str()) == -1)
+ std::cerr << "Error\n";
+
FILE *out = fopen(std::string(path+"index.txt").c_str(), "w");
fprintf(out,"# index step_time iterations\n");
@@ -303,7 +305,8 @@
RunSim(step);
std::string mv_cmd = std::string("mv /tmp/pioneer.log ") + path +
"pioneer_circle_benchmark_" + *iter + "_" + boost::lexical_cast<std::string>(i)
+ ".data";
- system(mv_cmd.c_str());
+ if (system(mv_cmd.c_str()) == -1)
+ std::cerr << "Error\n";
}
}
Modified: code/gazebo/branches/wx/server/Global.hh
===================================================================
--- code/gazebo/branches/wx/server/Global.hh 2010-06-28 20:31:24 UTC (rev
8806)
+++ code/gazebo/branches/wx/server/Global.hh 2010-06-28 21:02:18 UTC (rev
8807)
@@ -28,16 +28,6 @@
#define GZGLOBAL_HH
/////////////////////////////////////////////////////////////////////////////
-// Includes
-/////////////////////////////////////////////////////////////////////////////
-
-#include <math.h>
-
-#include "GazeboError.hh"
-#include "GazeboMessage.hh"
-
-
-/////////////////////////////////////////////////////////////////////////////
// Defines
/////////////////////////////////////////////////////////////////////////////
#ifndef NULL
@@ -65,6 +55,17 @@
// Macros
/////////////////////////////////////////////////////////////////////////////
+#if defined(__GNUC__)
+#define GAZEBO_DEPRECATED __attribute__((deprecated))
+#define GAZEBO_FORCEINLINE __attribute__((always_inline))
+#elif defined(MSVC)
+#define GAZEBO_DEPRECATED
+#define GAZEBO_FORCEINLINE __forceinline
+#else
+#define GAZEBO_DEPRECATED
+#define GAZEBO_FORCEINLINE
+#endif
+
// Convert radians to degrees
#define RTOD(r) ((r) * 180 / M_PI)
Modified: code/gazebo/branches/wx/server/Simulator.cc
===================================================================
--- code/gazebo/branches/wx/server/Simulator.cc 2010-06-28 20:31:24 UTC (rev
8806)
+++ code/gazebo/branches/wx/server/Simulator.cc 2010-06-28 21:02:18 UTC (rev
8807)
@@ -46,6 +46,7 @@
#include "PhysicsEngine.hh"
#include "OgreAdaptor.hh"
#include "GazeboMessage.hh"
+#include "GazeboError.hh"
#include "Global.hh"
#include "Simulator.hh"
Modified: code/gazebo/branches/wx/server/XMLConfig.cc
===================================================================
--- code/gazebo/branches/wx/server/XMLConfig.cc 2010-06-28 20:31:24 UTC (rev
8806)
+++ code/gazebo/branches/wx/server/XMLConfig.cc 2010-06-28 21:02:18 UTC (rev
8807)
@@ -36,8 +36,10 @@
#include <libxml/xpointer.h>
#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
#include "GazeboError.hh"
+#include "GazeboMessage.hh"
#include "Global.hh"
#include "XMLConfig.hh"
Modified: code/gazebo/branches/wx/server/physics/Joint.cc
===================================================================
--- code/gazebo/branches/wx/server/physics/Joint.cc 2010-06-28 20:31:24 UTC
(rev 8806)
+++ code/gazebo/branches/wx/server/physics/Joint.cc 2010-06-28 21:02:18 UTC
(rev 8807)
@@ -28,6 +28,8 @@
#include "OgreVisual.hh"
#include "OgreCreator.hh"
#include "OgreDynamicLines.hh"
+#include "GazeboError.hh"
+#include "GazeboMessage.hh"
#include "Global.hh"
#include "Body.hh"
#include "Model.hh"
Modified: code/gazebo/branches/wx/server/physics/bullet/BulletHinge2Joint.cc
===================================================================
--- code/gazebo/branches/wx/server/physics/bullet/BulletHinge2Joint.cc
2010-06-28 20:31:24 UTC (rev 8806)
+++ code/gazebo/branches/wx/server/physics/bullet/BulletHinge2Joint.cc
2010-06-28 21:02:18 UTC (rev 8807)
@@ -25,6 +25,8 @@
*/
#include "Global.hh"
+#include "GazeboError.hh"
+#include "GazeboMessage.hh"
#include "BulletBody.hh"
#include "XMLConfig.hh"
#include "BulletPhysics.hh"
Modified: code/gazebo/branches/wx/server/physics/bullet/BulletHingeJoint.cc
===================================================================
--- code/gazebo/branches/wx/server/physics/bullet/BulletHingeJoint.cc
2010-06-28 20:31:24 UTC (rev 8806)
+++ code/gazebo/branches/wx/server/physics/bullet/BulletHingeJoint.cc
2010-06-28 21:02:18 UTC (rev 8807)
@@ -26,6 +26,7 @@
#include "Model.hh"
#include "GazeboMessage.hh"
+#include "GazeboError.hh"
#include "World.hh"
#include "BulletBody.hh"
#include "BulletPhysics.hh"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
