Added manager parameters to constants.hpp and more.

DEVANSH-DVJ · DEVANSH-DVJ · commit 374d9ed5c29d · 2020-05-31T23:09:15.000+05:30
diff --git a/bezier.md b/bezier.md
@@ -6,26 +6,28 @@ When the user calls the executable, he/she is at Path 1.
 Each path consists of control points given as input by user, which are converted to an approximated smooth curve. The interpolation is done using nth-order Bezier-curve parameterization. The parameterization of the path is updated and rendered on screen at every input.
 
 ### Controls:
-* ##### Left-click -
-Takes the location of left click by user as the input of control points.
-* ##### Right-click -
-Stops the input of control points until 'R' is pressed.
-* ##### 'R' -
-Resumes the input of control points.
-* ##### 'N' -
-Moves to next path. Input of control stops until 'R' is pressed.
-* ##### 'P' -
-Moves to previous path. Input of control stops until 'R' is pressed.
-* ##### 'D' -
-Deletes the last control point in the current path.
-* ##### 'S' -
-The control points and interpolated points are stored in two raw files, with extension '.min.raw' and '.raw' respectively in models/Bezier-Curve.
-* ##### 'L' -
-The control points stored in the '.min.raw' are loaded and the paths are rendered with the screen displaying from Path 1.
-To start editing the paths, the user must press 'R' to resume.
-* ##### 'ESC' -
-The window is closed and all unsaved work is lost.
+* #### Keyboard:
+  * ##### 'R' -
+  Resumes the input of control points.
+  * ##### 'N' -
+  Moves to next path. Input of control stops until 'R' is pressed.
+  * ##### 'P' -
+  Moves to previous path. Input of control stops until 'R' is pressed.
+  * ##### 'D' -
+  Deletes the last control point in the current path.
+  * ##### 'S' -
+  The control points and interpolated points are stored in two raw files, with extension '.min.raw' and '.raw' respectively in models/Bezier-Curve.
+  * ##### 'L' -
+  The control points stored in the '.min.raw' are loaded and the paths are rendered with the screen displaying from Path 1.
+  To start editing the paths, the user must press 'R' to resume.
+  * ##### 'ESC' -
+  The window is closed and all unsaved work is lost.
+* #### Mouse:
+  * ##### Left-click -
+  Takes the location of left click by user as the input of control points.
+  * ##### Right-click -
+  Stops the input of control points until 'R' is pressed.
 
 ### Code:
-Source directory - /src/Bezier-Curve
+Source directory - /src/Bezier-Curve  
 Include directory - /include/road-network/Bezier-Curve
diff --git a/bin/input b/bin/input
diff --git a/bin/output b/bin/output
diff --git a/include/road_network/Bezier-Curve/path.hpp b/include/road_network/Bezier-Curve/path.hpp
@@ -14,16 +14,14 @@
 #include <glm/vec2.hpp>
 
 #include "road_network/shader_util.hpp"
+#include "road_network/constants.hpp"
 
 #ifdef _WIN32
 #include <Windows.h>
 #else
 #include <unistd.h>
 #endif
 
-// Average Interpolation Distance
-#define AIPD (1.0 / 30.0)
-
 namespace soc {
 
 std::vector<glm::vec2> bezier_curve_point(std::vector<glm::vec2> &pos,
diff --git a/include/road_network/Bezier-Curve/start_end.hpp b/include/road_network/Bezier-Curve/start_end.hpp
@@ -14,6 +14,7 @@
 #include <glm/vec2.hpp>
 
 #include "road_network/shader_util.hpp"
+#include "road_network/constants.hpp"
 
 #include "road_network/Bezier-Curve/path.hpp"
 
@@ -23,8 +24,6 @@
 #include <unistd.h>
 #endif
 
-#define PI 3.14159
-
 namespace soc {
 
 class Pairs {
diff --git a/include/road_network/Models/car_model.hpp b/include/road_network/Models/car_model.hpp
@@ -14,8 +14,8 @@
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
 
-#include "road_network/output_gl_framework.hpp"
 #include "road_network/shader_util.hpp"
+#include "road_network/constants.hpp"
 
 #include "road_network/Road-Model/road.hpp"
 
diff --git a/include/road_network/Models/traffic_light_model.hpp b/include/road_network/Models/traffic_light_model.hpp
@@ -13,7 +13,7 @@
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
 
-#include "road_network/output_gl_framework.hpp"
+#include "road_network/constants.hpp"
 #include "road_network/shader_util.hpp"
 
 #include "road_network/Road-Model/road.hpp"
diff --git a/include/road_network/Road-Graph/graph.hpp b/include/road_network/Road-Graph/graph.hpp
@@ -8,6 +8,8 @@
 #include <math.h>
 #include <algorithm>
 
+#include "road_network/constants.hpp"
+
 namespace soc {
 
 struct Edge{
diff --git a/include/road_network/Road-Model/intersection.hpp b/include/road_network/Road-Model/intersection.hpp
@@ -15,11 +15,10 @@
 #include <glm/vec4.hpp>
 
 #include "road_network/shader_util.hpp"
+#include "road_network/constants.hpp"
 
 #include "road_network/Road-Model/road.hpp"
 
-#define BZC_COUNT 20
-
 namespace soc {
 
 class Intersection{
diff --git a/include/road_network/Road-Model/road.hpp b/include/road_network/Road-Model/road.hpp
@@ -13,8 +13,8 @@
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
 
-#include "road_network/output_gl_framework.hpp"
 #include "road_network/shader_util.hpp"
+#include "road_network/constants.hpp"
 
 #include "road_network/Road-Model/texture.hpp"
 
diff --git a/include/road_network/Road-Model/road_collection.hpp b/include/road_network/Road-Model/road_collection.hpp
@@ -16,6 +16,7 @@
 #include <glm/vec4.hpp>
 
 #include "road_network/Road-Graph/graph.hpp"
+#include "road_network/constants.hpp"
 
 #include "road_network/Road-Model/road.hpp"
 #include "road_network/Road-Model/road_sep.hpp"
diff --git a/include/road_network/Road-Model/road_sep.hpp b/include/road_network/Road-Model/road_sep.hpp
@@ -13,8 +13,8 @@
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
 
-#include "road_network/output_gl_framework.hpp"
 #include "road_network/shader_util.hpp"
+#include "road_network/constants.hpp"
 
 #include "road_network/Road-Model/road.hpp"
 
diff --git a/include/road_network/Traffic-Manager/car_node.hpp b/include/road_network/Traffic-Manager/car_node.hpp
@@ -10,7 +10,7 @@
 #include "road_network/Road-Graph/graph.hpp"
 #include "road_network/Models/car_model.hpp"
 
-#define PI_MATH 3.14159265
+#include "road_network/constants.hpp"
 
 namespace soc {
 
diff --git a/include/road_network/Traffic-Manager/intersection_lights.hpp b/include/road_network/Traffic-Manager/intersection_lights.hpp
@@ -10,7 +10,7 @@
 #include "road_network/Road-Graph/graph.hpp"
 #include "road_network/Models/traffic_light_model.hpp"
 
-#define PI_MATH 3.14159265
+#include "road_network/constants.hpp"
 
 namespace soc {
 
diff --git a/include/road_network/Traffic-Manager/manager.hpp b/include/road_network/Traffic-Manager/manager.hpp
@@ -8,12 +8,11 @@
 #include <math.h>
 
 #include "road_network/Road-Graph/graph.hpp"
+#include "road_network/constants.hpp"
 
 #include "road_network/Traffic-Manager/car_node.hpp"
 #include "road_network/Traffic-Manager/intersection_lights.hpp"
 
-#define LC 5
-
 namespace soc {
 
 class Manager {
diff --git a/include/road_network/constants.hpp b/include/road_network/constants.hpp
@@ -11,9 +11,6 @@
 
 #define BZC_COUNT 20
 
-// Least count
-#define LC 5
-
 #define SCR_WIDTH 1440
 
 #define SCR_HEIGHT 900
@@ -22,4 +19,14 @@
 
 #define ROAD_WIDTH 0.05
 
+#define INTER_CYLINDER_DISTANCE 0.027
+
+#define FRAMES_PER_CHANGE 40
+
+#define GREEN_LIGHT_TIMEOUT 10
+
+#define YELLOW_LIGHT_TIMEOUT 5
+
+#define CAR_SPAWN_GAP 2
+
 #endif /* constants_hpp */
diff --git a/include/road_network/output_gl_framework.hpp b/include/road_network/output_gl_framework.hpp
@@ -6,10 +6,6 @@
 
 #include <iostream>
 
-#define BUFFER_OFFSET(offset) ((GLvoid *)(offset))
-
-#define PI_MATH 3.14159265
-
 namespace soc {
 
 // Initialize GL State
diff --git a/models/Bezier-Model/1.min.raw b/models/Bezier-Model/1.min.raw
diff --git a/models/Bezier-Model/1.raw b/models/Bezier-Model/1.raw
diff --git a/models/Bezier-Model/points.raw b/models/Bezier-Model/points.raw
diff --git a/models/Intersection-Model/intersection.raw b/models/Intersection-Model/intersection.raw
diff --git a/obj/shader_util.o b/obj/shader_util.o
diff --git a/output.md b/output.md
@@ -31,8 +31,8 @@ Very close intersections are merged into one and after this, road-network graph
   * ##### Mouse cursor movement -
   Direction of the front and consequently right vector of the camera is changed preserving its position.  
   Can be used to look-around the model from one-place. At the start of the program the cursor is snapped to the center of the screen.
-  
-  
+
+
 ### Code:
-Source directory - /src/Road-Model and /src/Road-Graph.  
-Include directory - /include/road-network/Road-Model and /include/road-network/Road-Graph. 
+Source directory - /src/Road-Model and /src/Road-Graph  
+Include directory - /include/road-network/Road-Model and /include/road-network/Road-Graph.
diff --git a/src/Road-Model/road.cpp b/src/Road-Model/road.cpp
@@ -1,7 +1,6 @@
 #include "road_network/Road-Model/road.hpp"
 
 extern std::vector<glm::mat4> matrixStack;
-#define INTER_CYLINDER_DISTANCE 0.027
 
 namespace soc {
 // Constructor that takes coordinates of the four points and depth and dist from
@@ -324,7 +323,7 @@ void Road::fill_border(int a, int b, int c, int d, glm::vec4 *positions) {
 void Road::cylinders(float d) {
   float r = calc_dist(x1, y1, x2, y2) / 50;
   float div = depth / 5;
-  float sec = PI_MATH / 5;
+  float sec = PI / 5;
 
   // Cylinders on the bottom part of the road
   float mpx1 = (x1 + k1[0]) / 2, mpy1 = (y1 + k1[1]) / 2;
@@ -335,7 +334,7 @@ void Road::cylinders(float d) {
     glm::vec2 v = int_div(mpx1, mpy1, mpx2, mpy2, distance / (dist - distance));
 
     for (float i = -depth / 4; i <= 5 * depth / 4; i += div) {
-      for (float j = 0; j <= 2 * PI_MATH; j += sec) {
+      for (float j = 0; j <= 2 * PI; j += sec) {
         v_positions_border[tri_idx] =
             glm::vec4(v[0] + r * sin(j), v[1] + r * cos(j), i, 1.0f);
         v_colors_border[tri_idx] = glm::vec4(1.0f, 1.0f, 1.0f, 1.0f);
@@ -369,7 +368,7 @@ void Road::cylinders(float d) {
   for (distance = start_spacing_a; distance < dist; distance += d) {
     glm::vec2 v = int_div(mpx1, mpy1, mpx2, mpy2, distance / (dist - distance));
     for (float i = -depth / 4; i <= 5 * depth / 4; i += div) {
-      for (float j = 0; j <= 2 * PI_MATH; j += sec) {
+      for (float j = 0; j <= 2 * PI; j += sec) {
         v_positions_border[tri_idx] =
             glm::vec4(v[0] + r * sin(j), v[1] + r * cos(j), i, 1.0f);
         v_colors_border[tri_idx] = glm::vec4(1.0f, 1.0f, 1.0f, 1.0f);
diff --git a/src/Road-Model/road_collection.cpp b/src/Road-Model/road_collection.cpp
@@ -135,7 +135,7 @@ void RoadNetwork::initRoadSeps() {
       RoadSep rs_temp(glm::vec3(0, 0, 0), (d/15));
       rs_temp.change_parameters(bezier_positions[i][j][0],
                                 bezier_positions[i][j][1], road_depth / 2, 0, 0,
-                                180 / PI_MATH * atan(tangent_directions[i][j][1] /
+                                180 / PI * atan(tangent_directions[i][j][1] /
                                                 tangent_directions[i][j][0]));
       rs[i].push_back(rs_temp);
     }
diff --git a/src/Road-Model/road_sep.cpp b/src/Road-Model/road_sep.cpp
@@ -186,11 +186,11 @@ void RoadSep::build_handle() {
   float r = 0.15 * s;
   float R = 1.5 * s - r;
   float div = 4 * s / 20;
-  float sec = PI_MATH / 5;
+  float sec = PI / 5;
 
   // create the cylindrical handle using parameteric equation of the cylinders
   for (float i = s; i <= 5 * s; i += div) {
-    for (float j = 0; j <= 2 * PI_MATH; j += sec) {
+    for (float j = 0; j <= 2 * PI; j += sec) {
       v_positions_handle[tri_idx] =
           glm::vec4(r * sin(j), R - r * cos(j), i, 1.0f);
       v_colors_handle[tri_idx] = glm::vec4(1.0f, 0.0f, 0.0f, 1.0f);
@@ -209,18 +209,18 @@ void RoadSep::build_handle() {
   }
 
   // generate the other handle of the separator
-  float slice = PI_MATH / 50;
-  for (float i = 0.0; i <= PI_MATH; i += slice) {
-    for (float j = 0.0; j <= 2 * PI_MATH; j += sec) {
+  float slice = PI / 50;
+  for (float i = 0.0; i <= PI; i += slice) {
+    for (float j = 0.0; j <= 2 * PI; j += sec) {
       float x = r * sin(j);
       float y = (R - r * cos(j)) * cos(i);
       float z = (R - r * cos(j)) * sin(i) + 5 * s;
       v_colors_handle[tri_idx] = glm::vec4(1.0f, 0.0f, 0.0f, 1.0f);
       v_positions_handle[tri_idx] = glm::vec4(x, y, z, 1.0f);
       tri_idx++;
       float next;
-      if (i + slice > PI_MATH)
-        next = PI_MATH;
+      if (i + slice > PI)
+        next = PI;
       else
         next = i + slice;
       x = r * sin(j);
@@ -235,7 +235,7 @@ void RoadSep::build_handle() {
 
   // generate the middle semicircular disc part
   for (float i = s; i <= 5 * s; i += div) {
-    for (float j = 0; j <= 2 * PI_MATH; j += sec) {
+    for (float j = 0; j <= 2 * PI; j += sec) {
       v_positions_handle[tri_idx] =
           glm::vec4(r * sin(j), -R + r * cos(j), i, 1.0f);
       v_colors_handle[tri_idx] = glm::vec4(1.0f, 0.0f, 0.0f, 1.0f);
diff --git a/src/Traffic-Manager/car_node.cpp b/src/Traffic-Manager/car_node.cpp
@@ -4,8 +4,6 @@
 namespace soc {
 
 CarNode::CarNode(Graph* graph, std::vector<int> in) {
-  road_depth = 0.02;
-  lane_width = 0.05;
   start_vertex_no = in[0];
 
   path_centered.clear(); // Stores the path
@@ -51,7 +49,7 @@ CarNode::CarNode(Graph* graph, std::vector<int> in) {
 
   current = -1;
 
-  mod = new CarModel(0.020);
+  mod = new CarModel(ROAD_WIDTH * 0.25);
   updateCar();
 }
 
@@ -70,16 +68,16 @@ bool CarNode::updateCar() {
 
   float rz;
   if (tangent[0] > 0.0) {
-    rz = atan(tangent[1]/tangent[0])*180.0/PI_MATH;
+    rz = atan(tangent[1]/tangent[0])*180.0/PI;
   }
   else if (tangent[0] == 0.0) {
     rz = 90.0;
   }
   else {
-    rz = 180.0 + (atan(tangent[1]/tangent[0])*180.0/PI_MATH);
+    rz = 180.0 + (atan(tangent[1]/tangent[0])*180.0/PI);
   }
 
-  mod->change_parameters(path[current][0], path[current][1], road_depth, 0, 0, rz);
+  mod->change_parameters(path[current][0], path[current][1], ROAD_DEPTH / 2, 0, 0, rz);
 
   return true;
 }
@@ -127,7 +125,7 @@ void CarNode::assignLane() {
   glm::vec2 normal;
   for (unsigned int i = 0; i < path_centered.size(); i++) {
     if (i + 1 == path_centered.size()) {
-      path[i] = path_centered[i] - normal*(lane_width/2);
+      path[i] = path_centered[i] - normal * float(ROAD_WIDTH / 4);
       continue;
     }
 
@@ -140,10 +138,10 @@ void CarNode::assignLane() {
 
     for (unsigned int j = 0; j < check_loc_centered.size(); j++) {
       if (check_loc_centered[j] == path_centered[i])
-        check_loc[j] = check_loc_centered[j] - normal*(lane_width/2);
+        check_loc[j] = check_loc_centered[j] - normal * float(ROAD_WIDTH / 4);
     }
 
-    path[i] = path_centered[i] - normal*(lane_width/2);
+    path[i] = path_centered[i] - normal * float(ROAD_WIDTH / 4);
   }
 }
 
diff --git a/src/Traffic-Manager/intersection_lights.cpp b/src/Traffic-Manager/intersection_lights.cpp
diff --git a/src/Traffic-Manager/manager.cpp b/src/Traffic-Manager/manager.cpp
