Started vector math helper functions

Author: sami-hatna66

include/Actor.cpp

@@ -2,10 +2,11 @@
 #include <iostream>
 #include <array>
 
-Actor::Actor(std::array<float, 2> pPos, std::array<float, 2> pVelocity, std::array<float, 2> pDesiredVelocity, float pMass, float pRadius) {
+Actor::Actor(std::array<float, 2> pPos, std::array<float, 2> pVelocity, std::array<float, 2> pDesiredVelocity, std::array<float, 2> pDestination, float pMass, float pRadius) {
     pos = pPos;
     velocity = pVelocity;
     desiredVelocity = pDesiredVelocity;
+    destination = pDestination;
     mass = pMass;
     radius = pRadius;
 }
@@ -22,6 +23,10 @@ std::array<float, 2> Actor::getDesiredVelocity() {
     return desiredVelocity;
 }
 
+std::array<float, 2> Actor::getDestination() {
+    return destination;
+}
+
 float Actor::getMass() {
     return mass;
 }
@@ -40,4 +45,8 @@ void Actor::setVelocity(std::array<float, 2> newVelocity) {
 
 void Actor::setDesiredVelocity(std::array<float, 2> newDesiredVelocity) {
     desiredVelocity = newDesiredVelocity;
+}
+
+void Actor::setDestination(std::array<float, 2> newDestination) {
+    destination = newDestination;
 }

include/Actor.hpp

@@ -1,28 +1,31 @@
 #ifndef Actor_hpp
 #define Actor_hpp
 
-#include<iostream>
+#include <iostream>
 #include <array>
 
 class Actor {
 private:
     std::array<float, 2> pos;
     std::array<float, 2> velocity;
     std::array<float, 2> desiredVelocity;
+    std::array<float, 2> destination;
     float mass;
     float radius;
 public:    
-    Actor(std::array<float, 2> pPos, std::array<float, 2> pVelocity, std::array<float, 2> pDesiredVelocity, float pMass, float pRadius);
+    Actor(std::array<float, 2> pPos, std::array<float, 2> pVelocity, std::array<float, 2> pDesiredVelocity, std::array<float, 2> pDestination, float pMass, float pRadius);
 
     std::array<float, 2> getPos();
     std::array<float, 2> getVelocity();
     std::array<float, 2> getDesiredVelocity();
+    std::array<float, 2> getDestination();
     float getMass();
     float getRadius();
 
     void setPos(std::array<float, 2> newPos);
     void setVelocity(std::array<float, 2> newVelocity);
     void setDesiredVelocity(std::array<float, 2> newDesiredVelocity);
+    void setDestination(std::array<float, 2> newDestination);
 };
 
 #endif

include/CMakeLists.txt

@@ -1 +1 @@
-add_library(include Actor.cpp Room.cpp)
+add_library(include Actor.cpp Room.cpp MathHelper.cpp)

include/MathHelper.cpp

@@ -0,0 +1,21 @@
+#include "MathHelper.hpp"
+#include <iostream>
+#include <vector>
+#include <array>
+#include <cmath>
+
+std::array<float, 2> getDirectionVector(std::array<float, 2> a, std::array<float, 2> b) {
+    return {float(b[0] - a[0]), float(b[1] - a[1])};
+}
+
+std::array<float, 2> velFromSpeedAndDir(float s, std::array<float, 2> d) {
+    return {(s / magnitude(d)) * d[0], (s / magnitude(d)) * d[1]};
+}
+
+std::array<float, 2> velToPoint(float s, std::array<float, 2> pos, std::array<float, 2> destination) {
+    return velFromSpeedAndDir(s, getDirectionVector(pos, destination));
+}
+
+float magnitude(std::array<float, 2> inp) {
+    return std::sqrt((inp[0] * inp[0]) + (inp[1] * inp[1]));
+}

include/MathHelper.hpp

@@ -0,0 +1,16 @@
+#ifndef MathHelper_hpp
+#define MathHelper_hpp
+
+#include <iostream>
+#include <vector>
+#include <array>
+
+std::array<float, 2> getDirectionVector(std::array<float, 2> a, std::array<float, 2> b);
+
+std::array<float, 2> velFromSpeedAndDir(float s, std::array<float, 2> d);
+
+std::array<float, 2> velToPoint(float s, std::array<float, 2> pos, std::array<float, 2> destination);
+
+float magnitude(std::array<float, 2> inp);
+
+#endif

include/Room.cpp

@@ -3,15 +3,10 @@
 #include <vector>
 #include <array>
 
-Room::Room(std::vector<std::array<float, 4>> pWalls, std::vector<std::array<float, 2>> pDestinations) {
+Room::Room(std::vector<std::array<float, 4>> pWalls) {
     walls = pWalls;
-    destinations = pDestinations;
 }
 
 std::vector<std::array<float, 4>> Room::getWalls() {
     return walls;
-}
-
-std::vector<std::array<float, 2>> Room::getDestinations() {
-    return destinations;
 }

include/Room.hpp

@@ -1,19 +1,17 @@
 #ifndef Room_hpp
 #define Room_hpp
 
-#include<iostream>
+#include <iostream>
 #include <vector>
 #include <array>
 
 class Room {
 private:
     std::vector<std::array<float, 4>> walls;
-    std::vector<std::array<float, 2>> destinations;
 public:    
-    Room(std::vector<std::array<float, 4>> pWalls, std::vector<std::array<float, 2>> pDestinations);
+    Room(std::vector<std::array<float, 4>> pWalls);
 
     std::vector<std::array<float, 4>> getWalls();
-    std::vector<std::array<float, 2>> getDestinations();
 };
 
 #endif

src/main.cpp

@@ -4,6 +4,7 @@
 
 #include "Actor.hpp"
 #include "Room.hpp"
+#include "MathHelper.hpp"
 
 const int WIDTH = 8; // metres
 const int HEIGHT = 6; // metres
@@ -15,7 +16,8 @@ void init(SDL_Window* &win, SDL_Renderer* &render, std::vector<Actor> &actors) {
     win = SDL_CreateWindow("SYCL Crowd Simulation", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIDTH * SCALE, HEIGHT * SCALE, SDL_WINDOW_SHOWN);
     render = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED);
 
-    actors.push_back(Actor{{1, 2}, {0.01, 0.01}, {0.02, 0.02}, 50, 0.05});
+    actors.push_back(Actor{{4, 0}, {0.01, 0.01}, {0.02, 0.02}, {1, 2}, 50, 0.05});
+    actors.push_back(Actor{{8, 6}, {-0.02, -0.02}, {-0.03, -0.03}, {1, 2}, 60, 0.08});
 }
 
 void drawCircle(SDL_Renderer* &render, SDL_Point center, int radius, SDL_Color color) {
@@ -53,6 +55,9 @@ void draw(SDL_Renderer* &render, std::vector<Actor> actors, Room room) {
         SDL_RenderDrawLine(render, wall[0] * SCALE, wall[1] * SCALE, wall[2] * SCALE, wall[3] * SCALE);
     }
 
+    SDL_SetRenderDrawColor(render, 0, 255, 0, 255);
+    SDL_RenderDrawPoint(render, 100, 200);
+
     SDL_RenderPresent(render);
 }
 
@@ -67,10 +72,13 @@ int main() {
     SDL_Renderer* render = NULL;
 
     std::vector<Actor> actors;
-    Room room = Room({{0.5, 0.5, 0.5, 1.5}, {0.5, 2.5, 0.5, 5.5}, {0.5, 5.5, 7.5, 5.5}, {7.5, 5.5, 7.5, 0.5}, {7.5, 0.5, 0.5, 0.5}}, {});
+    Room room = Room({{0.5, 0.5, 0.5, 1.5}, {0.5, 2.5, 0.5, 5.5}, {0.5, 5.5, 7.5, 5.5}, {7.5, 5.5, 7.5, 0.5}, {7.5, 0.5, 0.5, 0.5}});
 
     init(win, render, actors);
 
+    // Make actor move towards destination
+    actors[0].setVelocity(velToPoint(0.01, actors[0].getPos(), actors[0].getDestination()));
+
     draw(render, actors, room);
 
     int delayCounter = 0;