← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to source/gameengine/Physics/common/PHY_IPhysicsController.h

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Physics/common/PHY_IPhysicsController.h
1
1
/**
2
 
 * $Id: PHY_IPhysicsController.h 14444 2008-04-16 22:40:48Z hos $
 
2
 * $Id: PHY_IPhysicsController.h 16862 2008-10-01 07:55:02Z ben2610 $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
90
90
                virtual void    calcXform() =0;
91
91
                virtual void SetMargin(float margin) =0;
92
92
                virtual float GetMargin() const=0;
93
 
                virtual float GetRadius() const { return 0.f;}
 
93
                virtual float GetRadius() const=0;
 
94
                virtual void  SetRadius(float margin) = 0;
94
95
                PHY__Vector3    GetWorldPosition(PHY__Vector3& localpos);
95
96
 
96
97
};