← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/gameengine/Physics/BlOde/OdePhysicsController.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Physics/BlOde/OdePhysicsController.h
1
1
/**
2
 
 * $Id: OdePhysicsController.h 16862 2008-10-01 07:55:02Z ben2610 $
 
2
 * $Id: OdePhysicsController.h 20239 2009-05-17 12:51:51Z ben2610 $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
102
102
 
103
103
        virtual void            WriteDynamicsToMotionState() {};
104
104
        virtual void    WriteMotionStateToDynamics(bool nondynaonly);
 
105
        virtual class PHY_IMotionState* GetMotionState();
105
106
 
106
107
        /** 
107
108
                call from Scene Graph Node to 'update'.
124
125
        float   getFriction() { return m_friction;}
125
126
        float   getRestitution() { return m_restitution;}
126
127
 
 
128
        float GetLinVelocityMin() const { return 0.f; }
 
129
        void  SetLinVelocityMin(float val) { }
 
130
        float GetLinVelocityMax() const { return 0.f; }
 
131
        void  SetLinVelocityMax(float val) { }
127
132
        
128
133
 
129
134
private: