Merge pull request #47 from SpaceYoshi/dev

First release

Author: SpaceYoshi

.gitignore

@@ -1 +1,58 @@
-# augmented-reality
+<p align="center">
+  <a href="https://github.com/SpaceYoshi/traffic-tactician/" rel="noopener">
+ <img width=400px height=400px src="logo.png" alt="Project logo"></a>
+</p>
+
+<h3 align="center">Traffic Tactician</h3>
+
+<div align="center">
+
+  [![Stars](https://img.shields.io/github/stars/SpaceYoshi/traffic-tactician.svg)](https://github.com/SpaceYoshi/traffic-tactician/stargazers)
+  [![GitHub Issues](https://img.shields.io/github/issues/SpaceYoshi/traffic-tactician.svg)](https://github.com/SpaceYoshi/traffic-tactician/issues)
+  [![GitHub Pull Requests](https://img.shields.io/github/issues-pr/SpaceYoshi/traffic-tactician.svg)](https://github.com/SpaceYoshi/traffic-tactician/pulls)
+  [![License](https://img.shields.io/badge/license-MIT-blue.svg)](/LICENSE)
+
+</div>
+
+---
+
+<p align="center"> A traffic controller training program in C++ using <a href="https://opencv.org/">OpenCV</a> & <a href="https://www.opengl.org/">OpenGL</a>.
+    <br> 
+</p>
+
+## 📝 Table of Contents
+- [About](#about)
+- [Built Using](#built_using)
+- [Authors](#authors)
+
+## 🧐 About <a name = "about"></a>
+Traffic Tactician is a training program made in C++ for a uni assignment. The software uses <a href="https://opencv.org/">OpenCV</a> & <a href="https://www.opengl.org/">OpenGL</a>.
+
+⚠ Note: Ensure that your environment variables are configured correctly for OpenCV. This includes a variable "OPENCV" that leads to your OpenCV build folder (e.g. *C:\opencv*). Your Path variable should also contain the *C:\opencv\build\x64\vc16\bin* directory or equivalent.
+
+⚠ Note: Make sure to download the *pose_iter_440000.caffemodel* from the [CMU School of Computer Science](https://www.cs.cmu.edu/), and put it in *${SolutionDir}\TrafficTactician\pose\coco*.
+
+⚠ Note: In case of getting the "could not find opencv_world490d.lib" error, check that you have installed (the right version of) OpenCV correctly, and have configured it in your environment variables. Alternatively, you can drag the .dll files manually into *${SolutionDir}\TrafficTactician\x64\${ConfigurationName}*.
+
+⚠ Note: Make sure to build the solution when making changes to *settings.json* to ensure having the updated header file.
+
+## ⛏️ Built Using <a name = "built_using"></a>
+- [OpenGL](https://opengl.org/) - The Industry's Foundation for High Performance Graphics
+- [OpenCV](https://opencv.org/) - World's biggest computer vision library
+- [GLFW](https://www.glfw.org/) - Open Source, multi-platform library for OpenGL
+- [GLM](https://github.com/g-truc/glm/) - OpenGL Mathematics (GLM)
+- [GLEW](https://github.com/nigels-com/glew/) - The OpenGL Extension Wrangler Library
+- [Dear ImGui](https://github.com/ocornut/imgui/) - The bloat-free graphical user interface library for C++
+- [Easylogging++](https://github.com/abumq/easyloggingpp/) - Single header efficient logging library for C++ applications
+- [json2hpp](https://github.com/KaixoCode/json2hpp/) - CMake module that converts a json file straight into a C++ header containing a constexpr object
+- [utest.h](https://github.com/sheredom/utest.h) - Single header unit testing framework for C and C++
+
+## ✍️ Authors <a name = "authors"></a>
+- [@OnsPetruske](https://github.com/pkg-dot-zip)
+- [@SpaceYoshi](https://github.com/SpaceYoshi)
+- [@lrstolk](https://github.com/lrstolk)
+- [@Mosu5](https://github.com/Mosu5)
+- [@Sam-D-C](https://github.com/Sam-D-C)
+- [@Yuichi135](https://github.com/Yuichi135)
+
+See also the list of [contributors](https://github.com/SpaceYoshi/traffic-tactician/contributors) who participated in this project.

README.md

@@ -0,0 +1 @@
+!json2hpp.exe

TrafficTactician/.gitignore

@@ -0,0 +1,43 @@
+#include <mutex>
+#include "easylogging++.h"
+#include "poseChecker.h"
+#include "poseRetriever.h"
+#include "SettingsRetriever.h"
+
+Pose currentPose;
+std::mutex mtx;
+
+namespace cameraInputHandler
+{
+	int cameraToUseForInput = GetDNNSettings().cameraToUse;
+
+	int getCameraToUse()
+	{
+		return cameraToUseForInput;
+	}
+
+	void setCameraToUse(int camera)
+	{
+		LOG(INFO) << "Setting camera to initialize the input with to camera " << cameraToUseForInput << "!" << std::endl;
+		cameraToUseForInput = camera;
+	}
+
+	void setInputPose(const Pose& poseToSetTo)
+	{
+		std::lock_guard lck(mtx);
+		currentPose = poseToSetTo;
+	}
+
+	Pose& getInputPose()
+	{
+		std::lock_guard lck(mtx);
+		return currentPose;
+	}
+
+	void initCameraInput(int cameraDevice = -1)
+	{
+		LOG(INFO) << "Launching thread for camera detection." << std::endl;
+		std::thread thread_object(runPoseRetriever, cameraDevice);
+		thread_object.detach();
+	}
+}

TrafficTactician/CameraInputHandler.cpp

@@ -0,0 +1,10 @@
+#pragma once
+#include "poseChecker.h"
+namespace cameraInputHandler
+{
+	int getCameraToUse();
+	void setCameraToUse(int camera);
+	void setInputPose(const Pose& poseToSetTo);
+	Pose& getInputPose();
+	void initCameraInput(int cameraDevice);
+}

TrafficTactician/CameraInputHandler.h

@@ -0,0 +1,61 @@
+#include "ControllerComponent.h"
+#include "GameObject.h"
+#include "CameraInputHandler.h"
+#include <iostream>
+#include <memory>
+
+#include "easylogging++.h"
+#include "Scene.h"
+#include "SoundHandler.h"
+#include "Timer.h"
+
+ControllerComponent::ControllerComponent(Pose pose, Scene* scene) : scene(scene), correctPose(pose)
+{
+	this->timer = std::make_shared<Timer>([this] { timerCallback(); });
+}
+
+bool ControllerComponent::checkPose() const
+{
+	return cameraInputHandler::getInputPose() == correctPose;
+}
+
+void ControllerComponent::changeCarState(RouteComponent::RouteState state) const
+{
+	if (gameObject->getComponent<RouteComponent>().has_value())
+	{
+		gameObject->getComponent<RouteComponent>().value()->crossed = true;
+		gameObject->getComponent<RouteComponent>().value()->state = state;
+	}
+	else
+	{
+		LOG(ERROR) << "Error: Can not update UI when no RouteComponent can be found." << std::endl;
+		throw std::exception("Error: Can not update UI when no RouteComponent can be found.");
+	}
+}
+
+void ControllerComponent::timerCallback() const
+{
+	// If pose was wrong, points --.
+	if (!checkPose())
+	{
+		scene->data.points--;
+		SoundHandler::getInstance().playSoundSnippet("sounds/points_minus.wav");
+		return;
+	}
+
+
+	// If pose was wrong, points ++.
+	changeCarState(RouteComponent::RouteState::Moving);
+	timer->toggleTimer(false);
+	scene->data.points++;
+	SoundHandler::getInstance().playSoundSnippet("sounds/points_plus.wav");
+}
+
+void ControllerComponent::update(float deltaTime)
+{
+	timer->update(deltaTime);
+
+	// Update overlay data
+	scene->data.remainingTime = timer->getTimeRemaining();
+	scene->data.progress = timer->getTimeRemaining() / timer->rolloverTime;
+}

TrafficTactician/ControllerComponent.cpp

@@ -0,0 +1,27 @@
+#pragma once
+#include "Component.h"
+#include <memory>
+#include <string>
+#include "CameraInputHandler.h"
+#include "Scene.h"
+#include "Timer.h"
+#include "RouteComponent.h"
+
+
+class ControllerComponent : public Component
+{
+	Scene* scene;
+public:
+	std::shared_ptr<Timer> timer;
+	Pose correctPose;
+
+	ControllerComponent(Pose pose, Scene* scene);
+	~ControllerComponent() = default;
+
+	bool checkPose() const;
+	void changeCarState(RouteComponent::RouteState state) const;
+	void timerCallback() const;
+
+	virtual void update(float deltaTime) override;
+};
+

TrafficTactician/ControllerComponent.h

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib\glm;$(SolutionDir)lib\glew-2.1.0\include;$(SolutionDir)lib\glfw-3.3.8\include;$(OPENCV)\build\include;$(SolutionDir)lib\imgui-docking;$(OPENGL)\lib\glm;$(OPENGL)\lib\glew-2.1.0\include;$(OPENGL)\lib\glfw-3.3.8\include;$(SolutionDir)components;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(SolutionDir)lib\glfw-3.3.8\$(Platform);$(SolutionDir)lib\glew-2.1.0\lib\Release\$(Platform);$(OPENCV)\build\x64\vc16\lib;$(OPENGL)\lib\glew-2.1.0\lib\Release\$(Platform);$(OPENGL)\lib\glfw-3.3.8\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opencv_world490d.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>NotSet</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

TrafficTactician/GLFW.props

@@ -0,0 +1,59 @@
+#include "KeyboardInputHandler.h"
+
+#include <ostream>
+
+#include "easylogging++.h"
+#include "CameraInputHandler.h"
+
+extern bool drawDebugMenu;
+bool enableWireframe = false;
+
+void initKeyCallback(GLFWwindow* window)
+{
+	glfwSetKeyCallback(window, [](GLFWwindow* window, int key, int scancode, int action, int mods)
+		{
+			if (key == GLFW_KEY_ESCAPE)
+			{
+				glfwSetWindowShouldClose(window, true);
+			}
+
+			if (key == GLFW_KEY_1 && action == GLFW_RELEASE)
+			{
+				cameraInputHandler::setInputPose(POSE_MOVE_FORWARD);
+			}
+
+			if (key == GLFW_KEY_2 && action == GLFW_RELEASE)
+			{
+				cameraInputHandler::setInputPose(POSE_MOVE_LEFT);
+			}
+
+			if (key == GLFW_KEY_3 && action == GLFW_RELEASE)
+			{
+				cameraInputHandler::setInputPose(POSE_MOVE_RIGHT);
+			}
+
+			if (key == GLFW_KEY_4 && action == GLFW_RELEASE)
+			{
+				cameraInputHandler::setInputPose(POSE_STOP);
+			}
+
+			if (key == GLFW_KEY_5 && action == GLFW_RELEASE)
+			{
+				cameraInputHandler::setInputPose(POSE_OTHER);
+			}
+
+			if (key == GLFW_KEY_8 && action == GLFW_RELEASE)
+			{
+				enableWireframe = !enableWireframe;
+				glPolygonMode(GL_FRONT_AND_BACK, enableWireframe ? GL_FILL : GL_LINE);
+			}
+
+			if (key == GLFW_KEY_9 && action == GLFW_RELEASE)
+			{
+				drawDebugMenu = !drawDebugMenu;
+			}
+		});
+
+
+	LOG(INFO) << "Initialized input callback." << std::endl;
+}

TrafficTactician/KeyboardInputHandler.cpp

@@ -0,0 +1,3 @@
+#pragma once
+#include <GLFW/glfw3.h>
+void initKeyCallback(GLFWwindow* window);