Merge pull request #32 from Im-Rises/staging

Staging

Author: Im-Rises

ParticleEngine/Contact/ContactGenerator/ParticleContactGenerator.h

@@ -0,0 +1,12 @@
+#ifndef PARTICULECONTACTGENERATOR
+#define PARTICULECONTACTGENERATOR
+
+#include "../ParticleContact.h"
+
+class ParticleContactGenerator {
+
+public:
+    virtual int addContact(ParticleContact *particuleContact, unsigned int limit, unsigned int current) = 0;
+};
+
+#endif // !PARTICULECONTACTGENERATOR

ParticleEngine/Contact/ContactGenerator/ParticleLink/ParticleCable.cpp

@@ -0,0 +1,22 @@
+#include "ParticleCable.h"
+
+ParticleCable::ParticleCable(Particle *particle1, Particle *particle2, float max_length, float restitution)
+        : ParticleLink(particle1, particle2) {
+    m_maxLength = max_length;
+    m_restitution = restitution;
+}
+
+int ParticleCable::addContact(ParticleContact *particleContact, unsigned int limit, unsigned int current) {
+    float distance = m_particles[0]->getPosition().distance(m_particles[1]->getPosition());
+    Vector3d normalParticle = m_particles[0]->getPosition() - m_particles[1]->getPosition();
+    if (distance <= m_maxLength) {
+        return current;
+    } else {
+        particleContact[current].SetParticles(m_particles);
+        particleContact[current].setContactNormal(Vector3d(0, 0, 0) - normalParticle);
+        particleContact[current].setPenetration(distance - m_maxLength);
+        particleContact[current].setElasticity(0);
+        return current + 1;
+    }
+
+}

ParticleEngine/Contact/ContactGenerator/ParticleLink/ParticleCable.h

@@ -0,0 +1,19 @@
+#ifndef PARTICLECABLE_H
+#define PARTICLECABLE_H
+
+#include "ParticleLink.h"
+
+class ParticleCable : public ParticleLink {
+
+private:
+    float m_maxLength;
+    float m_restitution;
+
+public:
+
+    ParticleCable(Particle *particle1, Particle *particle2, float max_length, float restitution);
+
+    int addContact(ParticleContact *particleContact, unsigned int limit, unsigned int current) override;
+};
+
+#endif // !PARTICLECABLE

ParticleEngine/Contact/ContactGenerator/ParticleLink/ParticleCollide.cpp

@@ -0,0 +1,31 @@
+#include "ParticleCollide.h"
+
+void ParticleCollide::addCollider(ParticleCollider particleCollider) {
+
+}
+
+int ParticleCollide::addContact(ParticleContact *particleContact, unsigned int limit, unsigned int current) {
+    for (int i = 0; i < m_colliders.size(); i++) {
+        for (int j = i + 1; j < m_colliders.size(); j++) {
+            if (current < limit) {
+                Particle *particle0 = m_colliders[i].getParticle();
+                Particle *particle1 = m_colliders[j].getParticle();
+                float distance = particle0->getPosition().distance(particle1->getPosition());
+                float sumRadius = m_colliders[i].getRadius() + m_colliders[j].getRadius();
+                if (distance < sumRadius) {
+                    particleContact[current].setPenetration(sumRadius - distance);
+                    particleContact[current].setElasticity(elasticity);
+                    Vector3d normalParticle = particle0->getPosition() - particle1->getPosition();
+                    particleContact[current].setContactNormal(normalParticle);
+                    current += 1;
+                }
+            } else {
+                return current;
+            }
+
+        }
+    }
+    return current;
+}
+
+

ParticleEngine/Contact/ContactGenerator/ParticleLink/ParticleCollide.h

@@ -0,0 +1,27 @@
+#ifndef PARTICLECOLLIDE_H
+#define PARTICLECOLLIDE_H
+
+#include "../ParticleContactGenerator.h"
+
+#include "../../ParticleCollider/ParticleCollider.h"
+
+#include <vector>
+
+class ParticleCollide : public ParticleContactGenerator {
+
+private:
+
+    std::vector<ParticleCollider> m_colliders;
+
+    float elasticity;
+
+public:
+
+    void addCollider(ParticleCollider particleCollider);
+
+    int addContact(ParticleContact *particleContact, unsigned int limit, unsigned int current) override;
+
+
+};
+
+#endif // !PARTICLECOLLIDE_H

ParticleEngine/Contact/ContactGenerator/ParticleLink/ParticleLink.cpp

@@ -0,0 +1,11 @@
+#include "ParticleLink.h"
+
+float ParticleLink::currentLength() const {
+    return m_particles[0]->getPosition().distance(m_particles[1]->getPosition());
+
+}
+
+ParticleLink::ParticleLink(Particle *particle1, Particle *particle2) {
+    m_particles[0] = particle1;
+    m_particles[1] = particle2;
+}

ParticleEngine/Contact/ContactGenerator/ParticleLink/ParticleLink.h

@@ -0,0 +1,21 @@
+#ifndef PARTICLELINK_H
+#define PARTICLELINK_H
+
+#include "../ParticleContactGenerator.h"
+
+class ParticleLink : public ParticleContactGenerator {
+
+protected:
+    Particle *m_particles[2];
+
+public:
+    float currentLength() const;
+
+    ParticleLink(Particle *particle1, Particle *particle2);
+
+//    virtual int addContact(ParticleContact *particleContact, unsigned int limit, unsigned int current) = 0;
+
+
+};
+
+#endif // !ParticleLink_H

ParticleEngine/Contact/ContactGenerator/ParticleLink/ParticleRode.cpp

@@ -0,0 +1,25 @@
+#include "ParticleRode.h"
+
+ParticleRode::ParticleRode(Particle *particle1, Particle *particle2, float length) : ParticleLink(particle1,
+                                                                                                  particle2) {
+    m_length = length;
+}
+
+int ParticleRode::addContact(ParticleContact *particleContact, unsigned int limit, unsigned int current) {
+
+    float distance = m_particles[0]->getPosition().distance(m_particles[1]->getPosition());
+    if (distance == m_length) {
+        return current;
+    }
+    Vector3d normalParticle = m_particles[0]->getPosition() - m_particles[1]->getPosition();
+    particleContact[current].SetParticles(m_particles);
+    if (distance > m_length) {
+        particleContact->setContactNormal(Vector3d(0, 0, 0) - normalParticle);
+        particleContact->setPenetration(distance - m_length);
+    } else {
+        particleContact->setContactNormal(normalParticle);
+        particleContact->setPenetration(m_length - distance);
+    }
+    particleContact->setElasticity(0);
+    return current + 1;
+}

ParticleEngine/Contact/ContactGenerator/ParticleLink/ParticleRode.h

@@ -0,0 +1,18 @@
+#ifndef PARTICLERODE_H
+#define PARTICLERODE_H
+
+#include "ParticleLink.h"
+
+class ParticleRode : public ParticleLink {
+
+private:
+    float m_length;
+
+public:
+
+    ParticleRode(Particle *particle1, Particle *particle2, float length);
+
+    int addContact(ParticleContact *particleContact, unsigned int limit, unsigned int current) override;
+};
+
+#endif // !PARTICLELINK_H

ParticleEngine/Contact/ParticleCollider/ParticleCollider.cpp

@@ -0,0 +1,15 @@
+#include "ParticleCollider.h"
+
+
+ParticleCollider::ParticleCollider(Particle *particle, float radius) {
+    m_radius = radius;
+    m_particule = particle;
+}
+
+float ParticleCollider::getRadius() const {
+    return m_radius;
+}
+
+Particle *ParticleCollider::getParticle() {
+    return m_particule;
+}