← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-07-23 08:54:18 UTC
  • mfrom: (14.2.16 sid)
  • mto: (14.2.19 sid)
  • mto: This revision was merged to the branch mainline in revision 42.
  • Revision ID: package-import@ubuntu.com-20120723085418-9foz30v6afaf5ffs
Tags: 2.63a-2
http://bugs.debian.org/658075
* debian/: Cycles support added (Closes: #658075)
  For now, this top feature has been enabled only
  on [any-amd64 any-i386] architectures because
  of OpenImageIO failing on all others
* debian/: scripts installation path changed
  from /usr/lib to /usr/share:
  + debian/patches/: patchset re-worked for path changing
  + debian/control: "Breaks" field added on yafaray-exporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
95
95
        ///debug drawing of the overlapping triangles
96
96
        if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && (m_dispatchInfoPtr->m_debugDraw->getDebugMode() &btIDebugDraw::DBG_DrawWireframe ))
97
97
        {
98
 
                btVector3 color(255,255,0);
 
98
                btVector3 color(1,1,0);
99
99
                btTransform& tr = ob->getWorldTransform();
100
100
                m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(triangle[1]),color);
101
101
                m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[1]),tr(triangle[2]),color);
121
121
                ob->internalSetTemporaryCollisionShape( &tm );
122
122
                
123
123
                btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBody,m_triBody,m_manifoldPtr);
124
 
                ///this should use the btDispatcher, so the actual registered algorithm is used
125
 
                //              btConvexConvexAlgorithm cvxcvxalgo(m_manifoldPtr,ci,m_convexBody,m_triBody);
126
124
 
127
 
                m_resultOut->setShapeIdentifiers(-1,-1,partId,triangleIndex);
128
 
        //      cvxcvxalgo.setShapeIdentifiers(-1,-1,partId,triangleIndex);
129
 
//              cvxcvxalgo.processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
 
125
                if (m_resultOut->getBody0Internal() == m_triBody)
 
126
                {
 
127
                        m_resultOut->setShapeIdentifiersA(partId,triangleIndex);
 
128
                }
 
129
                else
 
130
                {
 
131
                        m_resultOut->setShapeIdentifiersB(partId,triangleIndex);
 
132
                }
 
133
        
130
134
                colAlgo->processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
131
135
                colAlgo->~btCollisionAlgorithm();
132
136
                ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);