[simspark-cvs] simspark/spark/plugin/rosimporter roselements.cpp, 1.5.8.1, 1.5.8.2 roselements.h, 1.5.8.1, 1.5.8.2

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/rosimporter
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25507

Modified Files:
      Tag: ROSIMPORTER_XLAB
	roselements.cpp roselements.h 
Log Message:
- define 'canCollide', 'min', 'max', 'slider' 'deflection', 'color' and 'interactivebutton'

Index: roselements.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/rosimporter/roselements.h,v
retrieving revision 1.5.8.1
retrieving revision 1.5.8.2
diff -C2 -d -r1.5.8.1 -r1.5.8.2
*** roselements.h	20 May 2007 16:31:53 -0000	1.5.8.1
--- roselements.h	13 Jun 2007 13:23:15 -0000	1.5.8.2
***************
*** 61,64 ****
--- 61,65 ----
  // PhysicalAttributes
  #define RA_VALUE "value"
+ #define RA_CANCOLLIDE "canCollide"
  
  // Use
***************
*** 69,72 ****
--- 70,77 ----
  #define RA_VERTEXLIST "vertexList"
  
+ // Axis Deflection
+ #define RA_MIN "min"
+ #define RA_MAX "max"
+ 
  class RosElements
  {
***************
*** 109,116 ****
--- 114,123 ----
              RE_HINGE,
              RE_UNIVERSAL,
+             RE_SLIDER,
              RE_ANCHORPOINT,
              RE_AXIS,
              RE_AXIS1,
              RE_AXIS2,
+             RE_DEFLECTION,
  
              RE_GLOBALPHYSICALPARAMETERS,
***************
*** 123,127 ****
              RE_DEFAULTAPPEARANCE,
              RE_AMBIENTLIGHTCOLOR,
!             RE_COLOR
          };
  
--- 130,136 ----
              RE_DEFAULTAPPEARANCE,
              RE_AMBIENTLIGHTCOLOR,
!             RE_COLOR,
! 
!             RE_INTERACTIVEBUTTON
          };
  

Index: roselements.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/rosimporter/roselements.cpp,v
retrieving revision 1.5.8.1
retrieving revision 1.5.8.2
diff -C2 -d -r1.5.8.1 -r1.5.8.2
*** roselements.cpp	20 May 2007 16:31:53 -0000	1.5.8.1
--- roselements.cpp	13 Jun 2007 13:23:06 -0000	1.5.8.2
***************
*** 80,83 ****
--- 80,84 ----
  
      ROS_DEFINE_ELEMENT(RE_HINGE,"Hinge");
+     ROS_DEFINE_ELEMENT(RE_SLIDER,"Slider");
      ROS_DEFINE_ELEMENT(RE_UNIVERSAL,"UniversalJoint");
      ROS_DEFINE_ELEMENT(RE_ANCHORPOINT,"AnchorPoint");
***************
*** 85,88 ****
--- 86,90 ----
      ROS_DEFINE_ELEMENT(RE_AXIS1,"Axis1");
      ROS_DEFINE_ELEMENT(RE_AXIS2,"Axis2");
+     ROS_DEFINE_ELEMENT(RE_DEFLECTION,"Deflection");
  
      ROS_DEFINE_ELEMENT(RE_GLOBALPHYSICALPARAMETERS,"GlobalPhysicalParameters");
***************
*** 97,100 ****
--- 99,103 ----
  
      ROS_DEFINE_ELEMENT(RE_COLOR, "Color");
+     ROS_DEFINE_ELEMENT(RE_INTERACTIVEBUTTON,"InteractiveButton");
  }