[simspark-cvs] simspark/spark/plugin/sparkagent hinge2perceptor.cpp, 1.2.2.1, 1.2.2.2 hingeperceptor.cpp, 1.1.2.1, 1.1.2.2 timeperceptor.cpp, 1.2, 1.2.2.1 universaljointperceptor.cpp, 1.2.2.1, 1.2.2.2

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

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

Modified Files:
      Tag: WIN32
	hinge2perceptor.cpp hingeperceptor.cpp timeperceptor.cpp 
	universaljointperceptor.cpp 
Log Message:
- sync with rcssserver3d cvs

Index: hinge2perceptor.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hinge2perceptor.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** hinge2perceptor.cpp	18 Feb 2007 12:50:58 -0000	1.2.2.1
--- hinge2perceptor.cpp	25 Feb 2007 18:37:28 -0000	1.2.2.2
***************
*** 40,44 ****
  {
      ParameterList& axisElement = predicate.parameter.AddList();
!     axisElement.AddValue(string("axis"));
      axisElement.AddValue(static_cast<int>(idx));
      axisElement.AddValue(mJoint->GetAngle(idx));
--- 40,44 ----
  {
      ParameterList& axisElement = predicate.parameter.AddList();
!     axisElement.AddValue(string("ax"));
      axisElement.AddValue(static_cast<int>(idx));
      axisElement.AddValue(mJoint->GetAngle(idx));
***************
*** 48,52 ****
  {
      ParameterList& axisElement = predicate.parameter.AddList();
!     axisElement.AddValue(string("rate"));
      axisElement.AddValue(static_cast<int>(idx));
      axisElement.AddValue(mJoint->GetAngleRate(idx));
--- 48,52 ----
  {
      ParameterList& axisElement = predicate.parameter.AddList();
!     axisElement.AddValue(string("rt"));
      axisElement.AddValue(static_cast<int>(idx));
      axisElement.AddValue(mJoint->GetAngleRate(idx));
***************
*** 61,65 ****
  
      Predicate& predicate = predList->AddPredicate();
!     predicate.name = "hinge2";
      predicate.parameter.Clear();
  
--- 61,65 ----
  
      Predicate& predicate = predList->AddPredicate();
!     predicate.name = "H2J";
      predicate.parameter.Clear();
  
***************
*** 69,73 ****
  
      InsertAxisAngle(predicate,Joint::AI_FIRST);
!     InsertAxisRate(predicate,Joint::AI_SECOND);
  
      return true;
--- 69,73 ----
  
      InsertAxisAngle(predicate,Joint::AI_FIRST);
! //    InsertAxisRate(predicate,Joint::AI_SECOND);
  
      return true;

Index: hingeperceptor.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/hingeperceptor.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** hingeperceptor.cpp	18 Feb 2007 12:50:58 -0000	1.1.2.1
--- hingeperceptor.cpp	25 Feb 2007 18:37:28 -0000	1.1.2.2
***************
*** 38,42 ****
  {
      ParameterList& axisElement = predicate.parameter.AddList();
!     axisElement.AddValue(string("axis"));
      axisElement.AddValue(mJoint->GetAngle());
  }
--- 38,42 ----
  {
      ParameterList& axisElement = predicate.parameter.AddList();
!     axisElement.AddValue(string("ax"));
      axisElement.AddValue(mJoint->GetAngle());
  }
***************
*** 45,49 ****
  {
      ParameterList& axisElement = predicate.parameter.AddList();
!     axisElement.AddValue(string("rate"));
      axisElement.AddValue(mJoint->GetAngleRate());
  }
--- 45,49 ----
  {
      ParameterList& axisElement = predicate.parameter.AddList();
!     axisElement.AddValue(string("rt"));
      axisElement.AddValue(mJoint->GetAngleRate());
  }
***************
*** 65,69 ****
  
      InsertAxisAngle(predicate);
!     InsertAxisRate(predicate);
  
      return true;
--- 65,69 ----
  
      InsertAxisAngle(predicate);
!     //InsertAxisRate(predicate);
  
      return true;

Index: timeperceptor.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/timeperceptor.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** timeperceptor.cpp	2 Jan 2006 18:11:33 -0000	1.2
--- timeperceptor.cpp	25 Feb 2007 18:37:28 -0000	1.2.2.1
***************
*** 68,74 ****
      nowElement.AddValue(mSimulationServer->GetTime());
  
!     ParameterList& stepElement = predicate.parameter.AddList();
!     stepElement.AddValue(string("step"));
!     stepElement.AddValue(mSimulationServer->GetSimStep());
  
      return true;
--- 68,74 ----
      nowElement.AddValue(mSimulationServer->GetTime());
  
! //     ParameterList& stepElement = predicate.parameter.AddList();
! //     stepElement.AddValue(string("st"));
! //     stepElement.AddValue(mSimulationServer->GetSimStep());
  
      return true;

Index: universaljointperceptor.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/sparkagent/universaljointperceptor.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** universaljointperceptor.cpp	18 Feb 2007 12:50:58 -0000	1.2.2.1
--- universaljointperceptor.cpp	25 Feb 2007 18:37:28 -0000	1.2.2.2
***************
*** 40,49 ****
      if (idx == Joint::AI_FIRST)
      {
!         axisElement.AddValue(string("axis1"));
          axisElement.AddValue(mJoint->GetAngle(Joint::AI_FIRST));
      }
      else
      {
!         axisElement.AddValue(string("axis2"));
          axisElement.AddValue(mJoint->GetAngle(Joint::AI_SECOND));
      }
--- 40,49 ----
      if (idx == Joint::AI_FIRST)
      {
!         axisElement.AddValue(string("ax1"));
          axisElement.AddValue(mJoint->GetAngle(Joint::AI_FIRST));
      }
      else
      {
!         axisElement.AddValue(string("ax2"));
          axisElement.AddValue(mJoint->GetAngle(Joint::AI_SECOND));
      }
***************
*** 55,64 ****
      if (idx == Joint::AI_FIRST)
      {
!         axisElement.AddValue(string("rate1"));
          axisElement.AddValue(mJoint->GetAngleRate(Joint::AI_FIRST));
      }
      else
      {
!         axisElement.AddValue(string("rate2"));
          axisElement.AddValue(mJoint->GetAngleRate(Joint::AI_SECOND));
      }
--- 55,64 ----
      if (idx == Joint::AI_FIRST)
      {
!         axisElement.AddValue(string("rt1"));
          axisElement.AddValue(mJoint->GetAngleRate(Joint::AI_FIRST));
      }
      else
      {
!         axisElement.AddValue(string("rt2"));
          axisElement.AddValue(mJoint->GetAngleRate(Joint::AI_SECOND));
      }
***************
*** 81,87 ****
  
      InsertAxisAngle(predicate, Joint::AI_FIRST);
!     InsertAxisRate(predicate, Joint::AI_FIRST);
      InsertAxisAngle(predicate, Joint::AI_SECOND);
!     InsertAxisRate(predicate, Joint::AI_SECOND);
  
      return true;
--- 81,87 ----
  
      InsertAxisAngle(predicate, Joint::AI_FIRST);
! //    InsertAxisRate(predicate, Joint::AI_FIRST);
      InsertAxisAngle(predicate, Joint::AI_SECOND);
! //    InsertAxisRate(predicate, Joint::AI_SECOND);
  
      return true;