← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
24
24
*/
25
25
 
26
26
 
27
 
#ifndef GENERIC_6DOF_CONSTRAINT_H
28
 
#define GENERIC_6DOF_CONSTRAINT_H
 
27
#ifndef BT_GENERIC_6DOF_CONSTRAINT_H
 
28
#define BT_GENERIC_6DOF_CONSTRAINT_H
29
29
 
30
30
#include "LinearMath/btVector3.h"
31
31
#include "btJacobianEntry.h"
354
354
    
355
355
        //! Calcs global transform of the offsets
356
356
        /*!
357
 
        Calcs the global transform for the joint offset for body A an B, and also calcs the agle differences between the bodies.
 
357
        Calcs the global transform for the joint offset for body A an B, and also calcs the angle differences between the bodies.
358
358
        \sa btGeneric6DofConstraint.getCalculatedTransformA , btGeneric6DofConstraint.getCalculatedTransformB, btGeneric6DofConstraint.calculateAngleInfo
359
359
        */
360
360
    void calculateTransforms(const btTransform& transA,const btTransform& transB);
611
611
 
612
612
 
613
613
 
614
 
#endif //GENERIC_6DOF_CONSTRAINT_H
 
614
#endif //BT_GENERIC_6DOF_CONSTRAINT_H