Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

1 files changed, 101 insertions, 5 deletions

diff --git a/source/gameengine/PyDoc/KX_ObjectActuator.py b/source/gameengine/PyDoc/KX_ObjectActuator.py
index 532c18eea5c..b7b76473292 100644
--- a/source/gameengine/PyDoc/KX_ObjectActuator.py
+++ b/source/gameengine/PyDoc/KX_ObjectActuator.py
@@ -6,6 +6,7 @@ class KX_ObjectActuator(SCA_IActuator):
 	"""
 	The object actuator ("Motion Actuator") applies force, torque, displacement, angular displacement,
 	velocity, or angular velocity to an object.
+	Servo control allows to regulate force to achieve a certain speed target.
 	"""
 	def getForce():
 		"""
@@ -107,15 +108,15 @@ class KX_ObjectActuator(SCA_IActuator):
 	def getLinearVelocity():
 		"""
 		Returns the linear velocity applied by the actuator.
+		For the servo control actuator, this is the target speed.
 		
 		@rtype: list [vx, vy, vz, local]
-		@return: A four item list, containing the vector velocity, and whether
-		         the velocity is applied in local coordinates (True) or world
-			 coordinates (False)
+		@return: A four item list, containing the vector velocity, and whether the velocity is applied in local coordinates (True) or world coordinates (False)
 		"""
 	def setLinearVelocity(vx, vy, vz, local):
 		"""
 		Sets the linear velocity applied by the actuator.
+		For the servo control actuator, sets the target speed.
 		
 		@type vx: float
 		@param vx: the x component of the velocity vector.
@@ -124,8 +125,8 @@ class KX_ObjectActuator(SCA_IActuator):
 		@type vz: float
 		@param vz: the z component of the velocity vector.
 		@type local: boolean
-		@param local: - False: the velocity vector is applied in world coordinates.
-		              - True: the velocity vector is applied in local coordinates.
+		@param local: - False: the velocity vector is in world coordinates.
+		              - True: the velocity vector is in local coordinates.
 		"""
 	def getAngularVelocity():
 		"""
@@ -150,5 +151,100 @@ class KX_ObjectActuator(SCA_IActuator):
 		@param local: - False: the velocity vector is applied in world coordinates.
 		              - True: the velocity vector is applied in local coordinates.
 		"""
+	def getDamping():
+		"""
+		Returns the damping parameter of the servo controller.
+		
+		@rtype: integer
+		@return: the time constant of the servo controller in frame unit.
+		"""
+	def setDamping(damp):
+		"""
+		Sets the damping parameter of the servo controller.
+		
+		@type damp: integer
+		@param damp: the damping parameter in frame unit.
+		"""
+	def getForceLimitX():
+		"""
+		Returns the min/max force limit along the X axis used by the servo controller.
+		
+		@rtype: list [min, max, enabled]
+		@return: A three item list, containing the min and max limits of the force as float
+		         and whether the limits are active(true) or inactive(true)
+		"""
+	def setForceLimitX(min, max, enable):
+		"""
+		Sets the min/max force limit along the X axis and activates or deactivates the limits in the servo controller.
+		
+		@type min: float
+		@param min: the minimum value of the force along the X axis.
+		@type max: float
+		@param max: the maximum value of the force along the X axis.
+		@type enable: boolean
+		@param enable: - True: the force will be limited to the min/max
+		               - False: the force will not be limited		               
+		"""
+	def getForceLimitY():
+		"""
+		Returns the min/max force limit along the Y axis used by the servo controller.
+		
+		@rtype: list [min, max, enabled]
+		@return: A three item list, containing the min and max limits of the force as float
+		         and whether the limits are active(true) or inactive(true)
+		"""
+	def setForceLimitY(min, max, enable):
+		"""
+		Sets the min/max force limit along the Y axis and activates or deactivates the limits in the servo controller.
+		
+		@type min: float
+		@param min: the minimum value of the force along the Y axis.
+		@type max: float
+		@param max: the maximum value of the force along the Y axis.
+		@type enable: boolean
+		@param enable: - True: the force will be limited to the min/max
+		               - False: the force will not be limited		               
+		"""
+	def getForceLimitZ():
+		"""
+		Returns the min/max force limit along the Z axis used by the servo controller.
+		
+		@rtype: list [min, max, enabled]
+		@return: A three item list, containing the min and max limits of the force as float
+		         and whether the limits are active(true) or inactive(true)
+		"""
+	def setForceLimitZ(min, max, enable):
+		"""
+		Sets the min/max force limit along the Z axis and activates or deactivates the limits in the servo controller.
+		
+		@type min: float
+		@param min: the minimum value of the force along the Z axis.
+		@type max: float
+		@param max: the maximum value of the force along the Z axis.
+		@type enable: boolean
+		@param enable: - True: the force will be limited to the min/max
+		               - False: the force will not be limited		               
+		"""
+	def getPID():
+		"""
+		Returns the PID coefficient of the servo controller.
+		
+		@rtype: list [P, I, D]
+		@return: A three item list, containing the PID coefficient as floats:
+		         P : proportional coefficient
+		         I : Integral coefficient
+		         D : Derivate coefficient
+		"""
+	def setPID(P, I, D):
+		"""
+		Sets the PID coefficients of the servo controller.
+		
+		@type P: flat
+		@param P: proportional coefficient
+		@type I: float
+		@param I: Integral coefficient
+		@type D: float
+		@param D: Derivate coefficient
+		"""