← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.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:
extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
16
16
#ifndef SPHERE_TRIANGLE_DETECTOR_H
17
17
#define SPHERE_TRIANGLE_DETECTOR_H
18
18
 
19
 
#include "../NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
20
 
#include "../../LinearMath/btPoint3.h"
 
19
#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
 
20
#include "LinearMath/btPoint3.h"
21
21
 
22
22
 
23
23
class btSphereShape;
28
28
/// sphere-triangle to match the btDiscreteCollisionDetectorInterface
29
29
struct SphereTriangleDetector : public btDiscreteCollisionDetectorInterface
30
30
{
31
 
        virtual void    getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw);
 
31
        virtual void    getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false);
32
32
 
33
33
        SphereTriangleDetector(btSphereShape* sphere,btTriangleShape* triangle);
34
34