← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-07-23 08:54:18 UTC
  • mfrom: (14.2.16 sid)
  • mto: (14.2.19 sid)
  • mto: This revision was merged to the branch mainline in revision 42.
  • Revision ID: package-import@ubuntu.com-20120723085418-9foz30v6afaf5ffs
Tags: 2.63a-2
http://bugs.debian.org/658075
* debian/: Cycles support added (Closes: #658075)
  For now, this top feature has been enabled only
  on [any-amd64 any-i386] architectures because
  of OpenImageIO failing on all others
* debian/: scripts installation path changed
  from /usr/lib to /usr/share:
  + debian/patches/: patchset re-worked for path changing
  + debian/control: "Breaks" field added on yafaray-exporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
35
35
        
36
36
 
37
37
        btScalar        m_tau;
38
 
        btScalar        m_damping;
 
38
        btScalar        m_damping;//global non-contact constraint damping, can be locally overridden by constraints during 'getInfo2'.
39
39
        btScalar        m_friction;
40
40
        btScalar        m_timeStep;
41
41
        btScalar        m_restitution;
52
52
 
53
53
        int                     m_solverMode;
54
54
        int     m_restingContactRestitutionThreshold;
 
55
        int                     m_minimumSolverBatchSize;
55
56
 
56
57
 
57
58
};
77
78
                m_splitImpulsePenetrationThreshold = -0.02f;
78
79
                m_linearSlop = btScalar(0.0);
79
80
                m_warmstartingFactor=btScalar(0.85);
80
 
                m_solverMode = SOLVER_USE_WARMSTARTING | SOLVER_USE_2_FRICTION_DIRECTIONS |SOLVER_SIMD | SOLVER_RANDMIZE_ORDER;
 
81
                m_solverMode = SOLVER_USE_WARMSTARTING | SOLVER_SIMD;// | SOLVER_RANDMIZE_ORDER;
81
82
                m_restingContactRestitutionThreshold = 2;//resting contact lifetime threshold to disable restitution
 
83
                m_minimumSolverBatchSize = 128; //try to combine islands until the amount of constraints reaches this limit
82
84
        }
83
85
};
84
86