← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp

  • 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/NarrowPhaseCollision/btGjkEpa.cpp
26
26
 
27
27
#include "btGjkEpa.h"
28
28
#include <string.h> //for memset
29
 
#include <LinearMath/btStackAlloc.h>
 
29
#include "LinearMath/btStackAlloc.h"
30
30
 
31
31
#if defined(DEBUG) || defined (_DEBUG)
32
32
#include <stdio.h> //for debug printf
580
580
 
581
581
 
582
582
//
583
 
bool    btGjkEpaSolver::Collide(btConvexShape *shape0,const btTransform &wtrs0,
584
 
                                                                btConvexShape *shape1,const btTransform &wtrs1,
 
583
bool    btGjkEpaSolver::Collide(const btConvexShape *shape0,const btTransform &wtrs0,
 
584
                                                                const btConvexShape *shape1,const btTransform &wtrs1,
585
585
                                                                btScalar        radialmargin,
586
586
                                                                btStackAlloc* stackAlloc,
587
587
                                                                sResults&       results)
602
602
                                wtrs1.getBasis(),wtrs1.getOrigin(),shape1,
603
603
                                radialmargin+EPA_accuracy);
604
604
const Z         collide(gjk.SearchOrigin());
605
 
results.gjk_iterations  =       gjk.iterations+1;
 
605
results.gjk_iterations  =       static_cast<int>(gjk.iterations+1);
606
606
if(collide)
607
607
        {
608
608
        /* Then EPA for penetration depth       */
609
609
        EPA                     epa(&gjk);
610
610
        const F         pd(epa.EvaluatePD());
611
 
        results.epa_iterations  =       epa.iterations+1;
 
611
        results.epa_iterations  =       static_cast<int>(epa.iterations+1);
612
612
        if(pd>0)
613
613
                {
614
614
                results.status                  =       sResults::Penetrating;