Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rigidbody: Code cleanup

Browse Source 
Stupid oversight, don't use floats for indices.
This commit is contained in:
Sergej Reich
2013-02-05 21:51:18 +00:00
parent aa02ca126b
commit 83b8cbeab1
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/rigidbody/RBI_api.h
View File

@@ -284,12 +284,12 @@ extern void RB_constraint_set_enabled(rbConstraint *con, int enabled);
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

8
intern/rigidbody/rb_bullet_api.cpp
View File

@@ -897,21 +897,21 @@ void RB_constraint_set_limits_piston(rbConstraint *con, float lin_lower, float l
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 @@ void RB_constraint_set_damping_6dof_spring(rbConstraint *con, float axis, float
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);