Moved SDL elements out of global scope

Author: sami-hatna66

include/Actor.cpp

@@ -1,9 +1,8 @@
 #include "Actor.hpp"
 #include <iostream>
 #include <array>
-using namespace std;
 
-Actor::Actor(array<float, 2> pPos, array<float, 2> pVelocity, 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, float pMass, float pRadius) {
     pos = pPos;
     velocity = pVelocity;
     desiredVelocity = pDesiredVelocity;

include/Actor.hpp

@@ -3,17 +3,16 @@
 
 #include<iostream>
 #include <array>
-using namespace std;
 
 class Actor {
 private:
-    array<float, 2> pos;
-    array<float, 2> velocity;
-    array<float, 2> desiredVelocity;
+    std::array<float, 2> pos;
+    std::array<float, 2> velocity;
+    std::array<float, 2> desiredVelocity;
     float mass;
     float radius;
 public:    
-    Actor(array<float, 2> pPos, array<float, 2> pVelocity, array<float, 2> pDesiredVelocity, float pMass, float pRadius);
+    Actor(std::array<float, 2> pPos, std::array<float, 2> pVelocity, std::array<float, 2> pDesiredVelocity, float pMass, float pRadius);
 };
 
 #endif

src/main.cpp

@@ -2,37 +2,56 @@
 #include <SDL2/SDL.h>
 #include "Actor.hpp"
 #include <iostream>
-using namespace std;
 
-SDL_Window* win = NULL;
-SDL_Surface* surface = NULL;
-SDL_Renderer* render = NULL;
+const int WIDTH = 8; // metres
+const int HEIGHT = 6; // metres
+const int SCALE = 100;
 
-const int WIDTH = 800;
-const int HEIGHT = 600;
-
-void init() {
+void init(SDL_Window* win, SDL_Renderer* render, std::vector<Actor> &actors) {
     SDL_Init(SDL_INIT_VIDEO);
-    win = SDL_CreateWindow("SYCL Crowd Simulation", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIDTH, HEIGHT, SDL_WINDOW_SHOWN);
+    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}, {3,4}, {5,6}, 3, 4});
 }
 
-void draw() {
+void drawCircle(SDL_Renderer* render, SDL_Point center, int radius, SDL_Color color) {
+    SDL_SetRenderDrawColor(render, color.r, color.g, color.b, color.a);
+    for (int w = 0; w < radius * 2; w++) {
+        for (int h = 0; h < radius * 2; h++) {
+            int dx = radius - w;
+            int dy = radius - h;
+            if ((dx*dx + dy*dy) <= (radius * radius)) {
+                SDL_RenderDrawPoint(render, center.x + dx, center.y + dy);
+            }
+        }
+    }
+}
+
+void draw(SDL_Renderer* render, std::vector<Actor> &actors) {
     SDL_SetRenderDrawColor(render, 255, 255, 255, 255);
     SDL_RenderClear(render);
 
+
+
     SDL_RenderPresent(render);
 }
 
-void close() {
+void close(SDL_Window* win) {
     SDL_DestroyWindow(win);
     SDL_Quit();
 }
 
 int main() {
-    init();
+    SDL_Window* win = NULL;
+    SDL_Surface* surface = NULL;
+    SDL_Renderer* render = NULL;
+
+    std::vector<Actor> actors;
+
+    init(win, render, actors);
 
-    draw();
+    draw(render, actors);
 
     Actor test = Actor({0, 2}, {3, 4}, {5,6}, 12, 3);
 
@@ -46,9 +65,9 @@ int main() {
             }
         }
 
-        draw();
+        draw(render, actors);
     }
 
-    close();
+    close(win);
     return 0;
 }