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:
@@ -17,28 +17,28 @@ subject to the following restrictions:
|
||||
#ifndef CONVEX_CAST_H
|
||||
#define CONVEX_CAST_H
|
||||
|
||||
#include <LinearMath/SimdTransform.h>
|
||||
#include <LinearMath/SimdVector3.h>
|
||||
#include <LinearMath/SimdScalar.h>
|
||||
class MinkowskiSumShape;
|
||||
#include "LinearMath/GenIDebugDraw.h"
|
||||
#include <LinearMath/btTransform.h>
|
||||
#include <LinearMath/btVector3.h>
|
||||
#include <LinearMath/btScalar.h>
|
||||
class btMinkowskiSumShape;
|
||||
#include "LinearMath/btIDebugDraw.h"
|
||||
|
||||
/// ConvexCast is an interface for Casting
|
||||
class ConvexCast
|
||||
/// btConvexCast is an interface for Casting
|
||||
class btConvexCast
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
virtual ~ConvexCast();
|
||||
virtual ~btConvexCast();
|
||||
|
||||
///RayResult stores the closest result
|
||||
/// alternatively, add a callback method to decide about closest/all results
|
||||
struct CastResult
|
||||
{
|
||||
//virtual bool addRayResult(const SimdVector3& normal,SimdScalar fraction) = 0;
|
||||
//virtual bool addRayResult(const btVector3& normal,btScalar fraction) = 0;
|
||||
|
||||
virtual void DebugDraw(SimdScalar fraction) {}
|
||||
virtual void DrawCoordSystem(const SimdTransform& trans) {}
|
||||
virtual void DebugDraw(btScalar fraction) {}
|
||||
virtual void DrawCoordSystem(const btTransform& trans) {}
|
||||
|
||||
CastResult()
|
||||
:m_fraction(1e30f),
|
||||
@@ -49,22 +49,22 @@ public:
|
||||
|
||||
virtual ~CastResult() {};
|
||||
|
||||
SimdVector3 m_normal;
|
||||
SimdScalar m_fraction;
|
||||
SimdTransform m_hitTransformA;
|
||||
SimdTransform m_hitTransformB;
|
||||
btVector3 m_normal;
|
||||
btScalar m_fraction;
|
||||
btTransform m_hitTransformA;
|
||||
btTransform m_hitTransformB;
|
||||
|
||||
IDebugDraw* m_debugDrawer;
|
||||
btIDebugDraw* m_debugDrawer;
|
||||
|
||||
};
|
||||
|
||||
|
||||
/// cast a convex against another convex object
|
||||
virtual bool calcTimeOfImpact(
|
||||
const SimdTransform& fromA,
|
||||
const SimdTransform& toA,
|
||||
const SimdTransform& fromB,
|
||||
const SimdTransform& toB,
|
||||
const btTransform& fromA,
|
||||
const btTransform& toA,
|
||||
const btTransform& fromB,
|
||||
const btTransform& toB,
|
||||
CastResult& result) = 0;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user