merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.
Still need to verify to make sure no unwanted renaming is introduced.
This commit is contained in:
@@ -19,27 +19,27 @@ subject to the following restrictions:
|
||||
|
||||
#include "BulletCollision/CollisionShapes/btStridingMeshInterface.h"
|
||||
#include <vector>
|
||||
#include <LinearMath/SimdVector3.h>
|
||||
#include <LinearMath/btVector3.h>
|
||||
|
||||
struct MyTriangle
|
||||
struct btMyTriangle
|
||||
{
|
||||
SimdVector3 m_vert0;
|
||||
SimdVector3 m_vert1;
|
||||
SimdVector3 m_vert2;
|
||||
btVector3 m_vert0;
|
||||
btVector3 m_vert1;
|
||||
btVector3 m_vert2;
|
||||
};
|
||||
|
||||
///TriangleMesh provides storage for a concave triangle mesh. It can be used as data for the TriangleMeshShape.
|
||||
class TriangleMesh : public StridingMeshInterface
|
||||
///TriangleMesh provides storage for a concave triangle mesh. It can be used as data for the btTriangleMeshShape.
|
||||
class btTriangleMesh : public btStridingMeshInterface
|
||||
{
|
||||
std::vector<MyTriangle> m_triangles;
|
||||
std::vector<btMyTriangle> m_triangles;
|
||||
|
||||
|
||||
public:
|
||||
TriangleMesh ();
|
||||
btTriangleMesh ();
|
||||
|
||||
void AddTriangle(const SimdVector3& vertex0,const SimdVector3& vertex1,const SimdVector3& vertex2)
|
||||
void AddTriangle(const btVector3& vertex0,const btVector3& vertex1,const btVector3& vertex2)
|
||||
{
|
||||
MyTriangle tri;
|
||||
btMyTriangle tri;
|
||||
tri.m_vert0 = vertex0;
|
||||
tri.m_vert1 = vertex1;
|
||||
tri.m_vert2 = vertex2;
|
||||
|
||||
Reference in New Issue
Block a user