[Opal-commits] opal/src AccelerationSensorData.h,1.1,1.2 AttractorMotorData.h,1.4,1.5 Blueprint.cpp,

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/opal/opal/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4923/src

Modified Files:
	AccelerationSensorData.h AttractorMotorData.h Blueprint.cpp 
	BlueprintManager.cpp GearedMotorData.h JointData.h 
	RaycastSensorData.h SensorData.h ServoMotorData.h 
	SpringMotorData.h ThrusterMotorData.h VolumeSensorData.h 
Log Message:
renamed an "internal_" variable to make it not internal; specifically, renamed the reference string names used within Blueprints; these should be usable by the users, so they shouldn't be named "internal_"

Index: SensorData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/SensorData.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SensorData.h	23 Mar 2005 20:24:47 -0000	1.9
--- SensorData.h	28 Mar 2005 22:33:07 -0000	1.10
***************
*** 55,59 ****
  			solid = NULL;
  			internal_solidIndex = 0;
! 			internal_solidName = "";
  			// "transform" is initialized in its own constructor.
  		}
--- 55,59 ----
  			solid = NULL;
  			internal_solidIndex = 0;
! 			solidBlueprintRefName = "";
  			// "transform" is initialized in its own constructor.
  		}
***************
*** 83,88 ****
  		int internal_solidIndex;

! 		/// Internal data used for Blueprint instantiation.
! 		std::string internal_solidName;

  		/// If the Sensor is attached to a Solid, this transform is the global 
--- 83,88 ----
  		int internal_solidIndex;

! 		/// String used for for intra-Blueprint references.
! 		std::string solidBlueprintRefName;

  		/// If the Sensor is attached to a Solid, this transform is the global 

Index: Blueprint.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/Blueprint.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Blueprint.cpp	23 Mar 2005 07:54:33 -0000	1.19
--- Blueprint.cpp	28 Mar 2005 22:33:07 -0000	1.20
***************
*** 83,88 ****

  			// Find the indices of the references.
! 			int solid0Index = getSolidIndex(data->internal_solid0Name);
! 			int solid1Index = getSolidIndex(data->internal_solid1Name);

  			if (-1 == solid0Index || -1 == solid1Index)
--- 83,88 ----

  			// Find the indices of the references.
! 			int solid0Index = getSolidIndex(data->solid0BlueprintRefName);
! 			int solid1Index = getSolidIndex(data->solid1BlueprintRefName);

  			if (-1 == solid0Index || -1 == solid1Index)
***************
*** 118,124 ****
  						(AttractorMotorData*)mMotorList.at(i);
  					int solid0Index = 
! 						getSolidIndex(data->internal_solid0Name);
  					int solid1Index = 
! 						getSolidIndex(data->internal_solid1Name);
  					if (-1 == solid0Index || -1 == solid1Index)
  					{
--- 118,124 ----
  						(AttractorMotorData*)mMotorList.at(i);
  					int solid0Index = 
! 						getSolidIndex(data->solid0BlueprintRefName);
  					int solid1Index = 
! 						getSolidIndex(data->solid1BlueprintRefName);
  					if (-1 == solid0Index || -1 == solid1Index)
  					{
***************
*** 136,140 ****
  					GearedMotorData* data = 
  						(GearedMotorData*)mMotorList.at(i);
! 					int jointIndex = getJointIndex(data->internal_jointName);
  					if (-1 == jointIndex)
  					{
--- 136,140 ----
  					GearedMotorData* data = 
  						(GearedMotorData*)mMotorList.at(i);
! 					int jointIndex = getJointIndex(data->jointBlueprintRefName);
  					if (-1 == jointIndex)
  					{
***************
*** 150,154 ****
  				{
  					ServoMotorData* data = (ServoMotorData*)mMotorList.at(i);
! 					int jointIndex = getJointIndex(data->internal_jointName);
  					if (-1 == jointIndex)
  					{
--- 150,154 ----
  				{
  					ServoMotorData* data = (ServoMotorData*)mMotorList.at(i);
! 					int jointIndex = getJointIndex(data->jointBlueprintRefName);
  					if (-1 == jointIndex)
  					{
***************
*** 165,169 ****
  					SpringMotorData* data = 
  						(SpringMotorData*)mMotorList.at(i);
! 					int solidIndex = getSolidIndex(data->internal_solidName);
  					if (-1 == solidIndex)
  					{
--- 165,169 ----
  					SpringMotorData* data = 
  						(SpringMotorData*)mMotorList.at(i);
! 					int solidIndex = getSolidIndex(data->solidBlueprintRefName);
  					if (-1 == solidIndex)
  					{
***************
*** 180,184 ****
  					ThrusterMotorData* data = 
  						(ThrusterMotorData*)mMotorList.at(i);
! 					int solidIndex = getSolidIndex(data->internal_solidName);
  					if (-1 == solidIndex)
  					{
--- 180,184 ----
  					ThrusterMotorData* data = 
  						(ThrusterMotorData*)mMotorList.at(i);
! 					int solidIndex = getSolidIndex(data->solidBlueprintRefName);
  					if (-1 == solidIndex)
  					{
***************
*** 225,229 ****
  			// the index is -1, the Sensor must not be attached to any 
  			// Solid.
! 			int solidIndex = getSolidIndex(data->internal_solidName);
  			data->internal_solidIndex = solidIndex;
  		}
--- 225,229 ----
  			// the index is -1, the Sensor must not be attached to any 
  			// Solid.
! 			int solidIndex = getSolidIndex(data->solidBlueprintRefName);
  			data->internal_solidIndex = solidIndex;
  		}

Index: AccelerationSensorData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/AccelerationSensorData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AccelerationSensorData.h	14 Mar 2005 05:18:27 -0000	1.1
--- AccelerationSensorData.h	28 Mar 2005 22:33:07 -0000	1.2
***************
*** 63,67 ****
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			internal_solidName = data.internal_solidName;
  			transform = data.transform;
  		}
--- 63,67 ----
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			solidBlueprintRefName = data.solidBlueprintRefName;
  			transform = data.transform;
  		}

Index: RaycastSensorData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/RaycastSensorData.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RaycastSensorData.h	25 Mar 2005 02:44:19 -0000	1.5
--- RaycastSensorData.h	28 Mar 2005 22:33:07 -0000	1.6
***************
*** 65,69 ****
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			internal_solidName = data.internal_solidName;
  			transform = data.transform;
  			ray = data.ray;
--- 65,69 ----
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			solidBlueprintRefName = data.solidBlueprintRefName;
  			transform = data.transform;
  			ray = data.ray;

Index: GearedMotorData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/GearedMotorData.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GearedMotorData.h	11 Mar 2005 05:31:56 -0000	1.4
--- GearedMotorData.h	28 Mar 2005 22:33:07 -0000	1.5
***************
*** 44,48 ****
  			joint = NULL;
  			internal_jointIndex = 0;
! 			internal_jointName = "";
  			jointAxisNum = 0;
  			maxTorque = defaults::motor::geared::maxTorque;
--- 44,48 ----
  			joint = NULL;
  			internal_jointIndex = 0;
! 			jointBlueprintRefName = "";
  			jointAxisNum = 0;
  			maxTorque = defaults::motor::geared::maxTorque;
***************
*** 70,74 ****
  			joint = data.joint;
  			internal_jointIndex = data.internal_jointIndex;
! 			internal_jointName = data.internal_jointName;
  			jointAxisNum = data.jointAxisNum;
  			maxTorque = data.maxTorque;
--- 70,74 ----
  			joint = data.joint;
  			internal_jointIndex = data.internal_jointIndex;
! 			jointBlueprintRefName = data.jointBlueprintRefName;
  			jointAxisNum = data.jointAxisNum;
  			maxTorque = data.maxTorque;
***************
*** 83,88 ****
  		int internal_jointIndex;

! 		/// Internal data used for Blueprint instantiation.
! 		std::string internal_jointName;

  		/// The index of the specific Joint axis affected by this Motor.
--- 83,88 ----
  		int internal_jointIndex;

! 		/// String used for for intra-Blueprint references.
! 		std::string jointBlueprintRefName;

  		/// The index of the specific Joint axis affected by this Motor.

Index: AttractorMotorData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/AttractorMotorData.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AttractorMotorData.h	11 Mar 2005 05:31:56 -0000	1.4
--- AttractorMotorData.h	28 Mar 2005 22:33:07 -0000	1.5
***************
*** 46,51 ****
  			internal_solid0Index = 0;
  			internal_solid1Index = 0;
! 			internal_solid0Name = "";
! 			internal_solid1Name = "";
  			strength = defaults::motor::attractor::strength;
  			exponent = defaults::motor::attractor::exponent;
--- 46,51 ----
  			internal_solid0Index = 0;
  			internal_solid1Index = 0;
! 			solid0BlueprintRefName = "";
! 			solid1BlueprintRefName = "";
  			strength = defaults::motor::attractor::strength;
  			exponent = defaults::motor::attractor::exponent;
***************
*** 73,78 ****
  			internal_solid0Index = data.internal_solid0Index;
  			internal_solid1Index = data.internal_solid1Index;
! 			internal_solid0Name = data.internal_solid0Name;
! 			internal_solid1Name = data.internal_solid1Name;
  			strength = data.strength;
  			exponent = data.exponent;
--- 73,78 ----
  			internal_solid0Index = data.internal_solid0Index;
  			internal_solid1Index = data.internal_solid1Index;
! 			solid0BlueprintRefName = data.solid0BlueprintRefName;
! 			solid1BlueprintRefName = data.solid1BlueprintRefName;
  			strength = data.strength;
  			exponent = data.exponent;
***************
*** 91,99 ****
  		int internal_solid1Index;

! 		/// Internal data used for Blueprint instantiation.
! 		std::string internal_solid0Name;

! 		/// Internal data used for Blueprint instantiation.
! 		std::string internal_solid1Name;

  		/// Constant used to scale attraction (repulsion if strength < 0).  
--- 91,99 ----
  		int internal_solid1Index;

! 		/// String used for for intra-Blueprint references.
! 		std::string solid0BlueprintRefName;

! 		/// String used for for intra-Blueprint references.
! 		std::string solid1BlueprintRefName;

  		/// Constant used to scale attraction (repulsion if strength < 0).  

Index: BlueprintManager.cpp
===================================================================
RCS file: /cvsroot/opal/opal/src/BlueprintManager.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** BlueprintManager.cpp	25 Mar 2005 02:44:19 -0000	1.37
--- BlueprintManager.cpp	28 Mar 2005 22:33:07 -0000	1.38
***************
*** 389,395 ****
  			{
  				// Get the Solids' names.
! 				data->internal_solid0Name = getAttributeString(paramNodePtr, 
  					"solid0");
! 				data->internal_solid1Name = getAttributeString(paramNodePtr, 
  					"solid1");
  			}
--- 389,395 ----
  			{
  				// Get the Solids' names.
! 				data->solid0BlueprintRefName = getAttributeString(paramNodePtr, 
  					"solid0");
! 				data->solid1BlueprintRefName = getAttributeString(paramNodePtr, 
  					"solid1");
  			}
***************
*** 735,741 ****
  			{
  				// Get the Solids' names.
! 				data->internal_solid0Name = getAttributeString(paramNodePtr, 
  					"solid0");
! 				data->internal_solid1Name = getAttributeString(paramNodePtr, 
  					"solid1");
  			}
--- 735,741 ----
  			{
  				// Get the Solids' names.
! 				data->solid0BlueprintRefName = getAttributeString(paramNodePtr, 
  					"solid0");
! 				data->solid1BlueprintRefName = getAttributeString(paramNodePtr, 
  					"solid1");
  			}
***************
*** 815,819 ****
  			{
  				// Get the Joint's name.
! 				data->internal_jointName = getAttributeString(paramNodePtr, 
  					"joint");
  			}
--- 815,819 ----
  			{
  				// Get the Joint's name.
! 				data->jointBlueprintRefName = getAttributeString(paramNodePtr, 
  					"joint");
  			}
***************
*** 926,930 ****
  			{
  				// Get the Joint's name.
! 				data->internal_jointName = getAttributeString(paramNodePtr, 
  					"joint");
  			}
--- 926,930 ----
  			{
  				// Get the Joint's name.
! 				data->jointBlueprintRefName = getAttributeString(paramNodePtr, 
  					"joint");
  			}
***************
*** 1072,1076 ****
  			{
  				// Get the Solid's name.
! 				data->internal_solidName = getAttributeString(paramNodePtr, 
  					"solid");
  			}
--- 1072,1076 ----
  			{
  				// Get the Solid's name.
! 				data->solidBlueprintRefName = getAttributeString(paramNodePtr, 
  					"solid");
  			}
***************
*** 1176,1180 ****
  			{
  				// Get the Solid's name.
! 				data->internal_solidName = getAttributeString(paramNodePtr, 
  					"solid");
  			}
--- 1176,1180 ----
  			{
  				// Get the Solid's name.
! 				data->solidBlueprintRefName = getAttributeString(paramNodePtr, 
  					"solid");
  			}
***************
*** 1280,1289 ****
  			{
  				// Get the Solids' names.
! 				data->internal_solidName = getAttributeString(paramNodePtr, 
  					"solid");
  			}
  			else
  			{
! 				data->internal_solidName = "";
  			}
  #endif
--- 1280,1289 ----
  			{
  				// Get the Solids' names.
! 				data->solidBlueprintRefName = getAttributeString(paramNodePtr, 
  					"solid");
  			}
  			else
  			{
! 				data->solidBlueprintRefName = "";
  			}
  #endif

Index: SpringMotorData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/SpringMotorData.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SpringMotorData.h	23 Mar 2005 04:52:36 -0000	1.5
--- SpringMotorData.h	28 Mar 2005 22:33:07 -0000	1.6
***************
*** 58,62 ****
  			solid = NULL;
  			internal_solidIndex = 0;
! 			internal_solidName = "";
  			mode = LINEAR_MODE;
  			// "attachOffset" is initialized in its own constructor.
--- 58,62 ----
  			solid = NULL;
  			internal_solidIndex = 0;
! 			solidBlueprintRefName = "";
  			mode = LINEAR_MODE;
  			// "attachOffset" is initialized in its own constructor.
***************
*** 90,94 ****
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			internal_solidName = data.internal_solidName;
  			mode = data.mode;
  			attachOffset = data.attachOffset;
--- 90,94 ----
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			solidBlueprintRefName = data.solidBlueprintRefName;
  			mode = data.mode;
  			attachOffset = data.attachOffset;
***************
*** 109,114 ****
  		int internal_solidIndex;

! 		/// Internal data used for Blueprint instantiation.
! 		std::string internal_solidName;

  		/// The Motor's mode of operation.  
--- 109,114 ----
  		int internal_solidIndex;

! 		/// String used for for intra-Blueprint references.
! 		std::string solidBlueprintRefName;

  		/// The Motor's mode of operation.  

Index: ThrusterMotorData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/ThrusterMotorData.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ThrusterMotorData.h	11 Mar 2005 05:31:56 -0000	1.4
--- ThrusterMotorData.h	28 Mar 2005 22:33:07 -0000	1.5
***************
*** 44,48 ****
  			solid = NULL;
  			internal_solidIndex = 0;
! 			internal_solidName = "";
  			force.singleStep = true;
  		}
--- 44,48 ----
  			solid = NULL;
  			internal_solidIndex = 0;
! 			solidBlueprintRefName = "";
  			force.singleStep = true;
  		}
***************
*** 67,71 ****
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			internal_solidName = data.internal_solidName;
  			force = data.force;
  		}
--- 67,71 ----
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			solidBlueprintRefName = data.solidBlueprintRefName;
  			force = data.force;
  		}
***************
*** 77,82 ****
  		int internal_solidIndex;

! 		/// Internal data used for Blueprint instantiation.
! 		std::string internal_solidName;

  		/// The Force that gets applied to the Solid every time step.  
--- 77,82 ----
  		int internal_solidIndex;

! 		/// String used for for intra-Blueprint references.
! 		std::string solidBlueprintRefName;

  		/// The Force that gets applied to the Solid every time step.  

Index: ServoMotorData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/ServoMotorData.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ServoMotorData.h	11 Mar 2005 05:31:56 -0000	1.4
--- ServoMotorData.h	28 Mar 2005 22:33:07 -0000	1.5
***************
*** 56,60 ****
  			joint = NULL;
  			internal_jointIndex = 0;
! 			internal_jointName = "";
  			mode = DESIRED_ANGLE_MODE;
  			jointAxisNum = 0;
--- 56,60 ----
  			joint = NULL;
  			internal_jointIndex = 0;
! 			jointBlueprintRefName = "";
  			mode = DESIRED_ANGLE_MODE;
  			jointAxisNum = 0;
***************
*** 83,87 ****
  			joint = data.joint;
  			internal_jointIndex = data.internal_jointIndex;
! 			internal_jointName = data.internal_jointName;
  			mode = data.mode;
  			jointAxisNum = data.jointAxisNum;
--- 83,87 ----
  			joint = data.joint;
  			internal_jointIndex = data.internal_jointIndex;
! 			jointBlueprintRefName = data.jointBlueprintRefName;
  			mode = data.mode;
  			jointAxisNum = data.jointAxisNum;
***************
*** 98,103 ****
  		int internal_jointIndex;

! 		/// Internal data used for Blueprint instantiation.
! 		std::string internal_jointName;

  		/// The Motor's mode of operation.
--- 98,103 ----
  		int internal_jointIndex;

! 		/// String used for for intra-Blueprint references.
! 		std::string jointBlueprintRefName;

  		/// The Motor's mode of operation.

Index: VolumeSensorData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/VolumeSensorData.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VolumeSensorData.h	13 Mar 2005 23:07:11 -0000	1.2
--- VolumeSensorData.h	28 Mar 2005 22:33:07 -0000	1.3
***************
*** 63,67 ****
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			internal_solidName = data.internal_solidName;
  			transform = data.transform;
  		}
--- 63,67 ----
  			solid = data.solid;
  			internal_solidIndex = data.internal_solidIndex;
! 			solidBlueprintRefName = data.solidBlueprintRefName;
  			transform = data.transform;
  		}

Index: JointData.h
===================================================================
RCS file: /cvsroot/opal/opal/src/JointData.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JointData.h	11 Mar 2005 05:31:56 -0000	1.6
--- JointData.h	28 Mar 2005 22:33:07 -0000	1.7
***************
*** 91,96 ****
  			internal_solid0Index = 0;
  			internal_solid1Index = 0;
! 			internal_solid0Name = "";
! 			internal_solid1Name = "";
  			anchor = defaults::joint::anchor;
  			axis[0].direction = defaults::joint::axis0Direction;
--- 91,96 ----
  			internal_solid0Index = 0;
  			internal_solid1Index = 0;
! 			solid0BlueprintRefName = "";
! 			solid1BlueprintRefName = "";
  			anchor = defaults::joint::anchor;
  			axis[0].direction = defaults::joint::axis0Direction;
***************
*** 126,131 ****
  			internal_solid0Index = data.internal_solid0Index;
  			internal_solid1Index = data.internal_solid1Index;
! 			internal_solid0Name = data.internal_solid0Name;
! 			internal_solid1Name = data.internal_solid1Name;
  			anchor = data.anchor;

--- 126,131 ----
  			internal_solid0Index = data.internal_solid0Index;
  			internal_solid1Index = data.internal_solid1Index;
! 			solid0BlueprintRefName = data.solid0BlueprintRefName;
! 			solid1BlueprintRefName = data.solid1BlueprintRefName;
  			anchor = data.anchor;

***************
*** 172,180 ****
  		int internal_solid1Index;

! 		/// Internal data used for Blueprint instantiation.
! 		std::string internal_solid0Name;

! 		/// Internal data used for Blueprint instantiation.
! 		std::string internal_solid1Name;

  		/// The anchor point for this Joint.  This is not used for every 
--- 172,180 ----
  		int internal_solid1Index;

! 		/// String used for for intra-Blueprint references.
! 		std::string solid0BlueprintRefName;

! 		/// String used for for intra-Blueprint references.
! 		std::string solid1BlueprintRefName;

  		/// The anchor point for this Joint.  This is not used for every 