From f6e7977c4e0a19b6f5de7f22d96561bc72b02ba4 Mon Sep 17 00:00:00 2001 From: "chappuis.daniel" Date: Sun, 29 Nov 2009 10:58:13 +0000 Subject: [PATCH] git-svn-id: https://reactphysics3d.googlecode.com/svn/trunk@221 92aac97c-a6ce-11dd-a772-7fcde58d38e6 --- sources/reactphysics3d/constraint/Contact.h | 4 ++-- sources/reactphysics3d/constraint/FaceEdgeContact.cpp | 2 +- sources/reactphysics3d/constraint/FaceEdgeContact.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/reactphysics3d/constraint/Contact.h b/sources/reactphysics3d/constraint/Contact.h index aec85cff..584ada46 100644 --- a/sources/reactphysics3d/constraint/Contact.h +++ b/sources/reactphysics3d/constraint/Contact.h @@ -38,8 +38,8 @@ namespace reactphysics3d { */ class Contact : public Constraint { private : - Vector3D normalVector; // Normal vector of the contact - Time time; // Time of contact + Vector3D normal; // Normal vector of the contact + std::vector points; public : Contact(Body* const body1, Body* const body2, const Vector3D& normalVector, const Time& time); // Constructor diff --git a/sources/reactphysics3d/constraint/FaceEdgeContact.cpp b/sources/reactphysics3d/constraint/FaceEdgeContact.cpp index ae9f67f7..084045a7 100644 --- a/sources/reactphysics3d/constraint/FaceEdgeContact.cpp +++ b/sources/reactphysics3d/constraint/FaceEdgeContact.cpp @@ -24,7 +24,7 @@ using namespace reactphysics3d; // Constructor -FaceEdgeContact::FaceEdgeContact(Body* const body1, Body* const body2, const Vector3D& normalVector, const Time& time, Segment3D& contactSegment) +FaceEdgeContact::FaceEdgeContact(Body* const body1, Body* const body2, const Vector3D& normalVector, const Time& time, const Segment3D& contactSegment) :Contact(body1, body2, normalVector, time), contactSegment(contactSegment) { } diff --git a/sources/reactphysics3d/constraint/FaceEdgeContact.h b/sources/reactphysics3d/constraint/FaceEdgeContact.h index f258b366..3c29edbf 100644 --- a/sources/reactphysics3d/constraint/FaceEdgeContact.h +++ b/sources/reactphysics3d/constraint/FaceEdgeContact.h @@ -38,7 +38,7 @@ class FaceEdgeContact : public Contact { Segment3D contactSegment; public : - FaceEdgeContact(Body* const body1, Body* const body2, const Vector3D& normalVector, const Time& time, Segment3D& contactSegment); // Constructor + FaceEdgeContact(Body* const body1, Body* const body2, const Vector3D& normalVector, const Time& time, const Segment3D& contactSegment); // Constructor virtual ~FaceEdgeContact(); // Destructor Segment3D getContactSegment() const; // Return the contact segment