[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54341] trunk/blender/intern/rigidbody: rigidbody: Code cleanup

[Sergej Reich]

Revision: 54341
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54341
Author:   sergof
Date:     2013-02-05 21:51:18 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
rigidbody: Code cleanup

Stupid oversight, don't use floats for indices.

Modified Paths:
--------------
    trunk/blender/intern/rigidbody/RBI_api.h
    trunk/blender/intern/rigidbody/rb_bullet_api.cpp

Modified: trunk/blender/intern/rigidbody/RBI_api.h
===================================================================
--- trunk/blender/intern/rigidbody/RBI_api.h	2013-02-05 21:51:17 UTC (rev 54340)
+++ trunk/blender/intern/rigidbody/RBI_api.h	2013-02-05 21:51:18 UTC (rev 54341)
@@ -284,12 +284,12 @@
 extern void RB_constraint_set_limits_hinge(rbConstraint *con, float lower, float upper);
 extern void RB_constraint_set_limits_slider(rbConstraint *con, float lower, float upper);
 extern void RB_constraint_set_limits_piston(rbConstraint *con, float lin_lower, float lin_upper, float ang_lower, float ang_upper);
-extern void RB_constraint_set_limits_6dof(rbConstraint *con, float axis, float lower, float upper);
+extern void RB_constraint_set_limits_6dof(rbConstraint *con, int axis, float lower, float upper);
 
 /* 6dof spring specific */
-extern void RB_constraint_set_stiffness_6dof_spring(rbConstraint *con, float axis, float stiffness);
-extern void RB_constraint_set_damping_6dof_spring(rbConstraint *con, float axis, float damping);
-extern void RB_constraint_set_spring_6dof_spring(rbConstraint *con, float axis, int enable);
+extern void RB_constraint_set_stiffness_6dof_spring(rbConstraint *con, int axis, float stiffness);
+extern void RB_constraint_set_damping_6dof_spring(rbConstraint *con, int axis, float damping);
+extern void RB_constraint_set_spring_6dof_spring(rbConstraint *con, int axis, int enable);
 extern void RB_constraint_set_equilibrium_6dof_spring(rbConstraint *con);
 
 /* Set number of constraint solver iterations made per step, this overrided world setting

Modified: trunk/blender/intern/rigidbody/rb_bullet_api.cpp
===================================================================
--- trunk/blender/intern/rigidbody/rb_bullet_api.cpp	2013-02-05 21:51:17 UTC (rev 54340)
+++ trunk/blender/intern/rigidbody/rb_bullet_api.cpp	2013-02-05 21:51:18 UTC (rev 54341)
@@ -897,21 +897,21 @@
 	constraint->setUpperAngLimit(ang_upper);
 }
 
-void RB_constraint_set_limits_6dof(rbConstraint *con, float axis, float lower, float upper)
+void RB_constraint_set_limits_6dof(rbConstraint *con, int axis, float lower, float upper)
 {
 	btGeneric6DofConstraint *constraint = reinterpret_cast<btGeneric6DofConstraint*>(con);
 	
 	constraint->setLimit(axis, lower, upper);
 }
 
-void RB_constraint_set_stiffness_6dof_spring(rbConstraint *con, float axis, float stiffness)
+void RB_constraint_set_stiffness_6dof_spring(rbConstraint *con, int axis, float stiffness)
 {
 	btGeneric6DofSpringConstraint *constraint = reinterpret_cast<btGeneric6DofSpringConstraint*>(con);
 	
 	constraint->setStiffness(axis, stiffness);
 }
 
-void RB_constraint_set_damping_6dof_spring(rbConstraint *con, float axis, float damping)
+void RB_constraint_set_damping_6dof_spring(rbConstraint *con, int axis, float damping)
 {
 	btGeneric6DofSpringConstraint *constraint = reinterpret_cast<btGeneric6DofSpringConstraint*>(con);
 	
@@ -919,7 +919,7 @@
 	constraint->setDamping(axis, 1.0f - damping);
 }
 
-void RB_constraint_set_spring_6dof_spring(rbConstraint *con, float axis, int enable)
+void RB_constraint_set_spring_6dof_spring(rbConstraint *con, int axis, int enable)
 {
 	btGeneric6DofSpringConstraint *constraint = reinterpret_cast<btGeneric6DofSpringConstraint*>(con);