[DELETE] deleted unnecessary functions

src/computervision/ObjectDetection.cpp

@@ -1,15 +1,17 @@
+
+#include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
+#include <opencv2/video.hpp>
 
 #include "ObjectDetection.h"
 #include "BackgroundRemover.h"
 #include "SkinDetector.h"
 #include "FaceDetector.h"
 #include "FingerCount.h"
-#include "VideoCapture.h"
 
-using namespace videocapture;
 namespace computervision
 {
+	cv::VideoCapture cap(1);
 
 	cv::Mat img, imgGray, img2, img2Gray, img3, img4;
 
@@ -27,12 +29,7 @@ namespace computervision
 	}
 
 	cv::Mat ObjectDetection::readCamera() {
-		/*videocapture::getMutex()->lock();
+		cap.read(img);
-
-		videocapture::getCap().read(img);
-
-		videocapture::getMutex()->unlock();*/
-		img = videocapture::readFrame();
 		return img;
 	}
 
@@ -79,13 +76,8 @@ namespace computervision
 
 	void ObjectDetection::calculateDifference()
 	{
-		//videocapture::getMutex()->lock();
+		cap.read(img);
-		//videocapture::getCap().read(img);
+		cap.read(img2);
-		//videocapture::getCap().read(img2);
-		//videocapture::getMutex()->unlock()
-
-		img = videocapture::readFrame();
-		img2 = videocapture::readFrame();
 
 		cv::cvtColor(img, imgGray, cv::COLOR_RGBA2GRAY);
 		cv::cvtColor(img2, img2Gray, cv::COLOR_RGBA2GRAY);

src/computervision/ObjectDetection.h

@@ -65,8 +65,6 @@ namespace computervision
 		 */
 		bool drawHandMaskRect(cv::Mat *input);
 
-		cv::VideoCapture getCap();
-
 	};
 
 

src/computervision/OpenPoseVideo.cpp

@@ -39,46 +39,33 @@ namespace computervision
 	int nPoints = 18;
 #endif
 	Net net;
-	int inWidth = 368;
-	int inHeight = 368;
-	float thresh = 0.01;
 
 	void OpenPoseVideo::setup() {
 		net = readNetFromCaffe(protoFile, weightsFile);
 	}
 
-	cv::Mat OpenPoseVideo::getBlobFromImage(cv::Mat inputImage)
+	void OpenPoseVideo::movementSkeleton(Mat inputImage) {
-	{
+
+		int inWidth = 368;
+		int inHeight = 368;
+		float thresh = 0.01;
+
 		Mat frame;
 		int frameWidth = inputImage.size().width;
 		int frameHeight = inputImage.size().height;
 
 		double t = (double)cv::getTickCount();
-		std::cout << "reading input image and blob" << std::endl;
 
-		frame = inputImage.clone();
+		frame = inputImage;
 		Mat inpBlob = blobFromImage(frame, 1.0 / 255, Size(inWidth, inHeight), Scalar(0, 0, 0), false, false);
-		return inpBlob;
-	}
-
-	void OpenPoseVideo::movementSkeleton(Mat inputImage, Mat inpBlob, std::function<void(std::vector<Point>)> f) {
-		std::cout << "movement skeleton start" << std::endl;
-		
-		int frameWidth = inputImage.size().width;
-		int frameHeight = inputImage.size().height;
-
-		std::cout << "done reading image and blob" << std::endl;
 
 		net.setInput(inpBlob);
 
-		std::cout << "done setting input to net" << std::endl;
 		Mat output = net.forward();
 
-
 		int H = output.size[2];
 		int W = output.size[3];
 
-		std::cout << "about to find position of boxy parts" << std::endl;
 		// find the position of the body parts
 		vector<Point> points(nPoints);
 		for (int n = 0; n < nPoints; n++)
@@ -96,16 +83,13 @@ namespace computervision
 				p.x *= (float)frameWidth / W;
 				p.y *= (float)frameHeight / H;
 
-				/*circle(frame, cv::Point((int)p.x, (int)p.y), 8, Scalar(0, 255, 255), -1);
+				circle(frame, cv::Point((int)p.x, (int)p.y), 8, Scalar(0, 255, 255), -1);
-				cv::putText(frame, cv::format("%d", n), cv::Point((int)p.x, (int)p.y), cv::FONT_HERSHEY_COMPLEX, 1.1, cv::Scalar(0, 0, 255), 2);*/
+				cv::putText(frame, cv::format("%d", n), cv::Point((int)p.x, (int)p.y), cv::FONT_HERSHEY_COMPLEX, 1.1, cv::Scalar(0, 0, 255), 2);
 			}
 			points[n] = p;
 		}
 
-		//cv::putText(frame, cv::format("time taken = %.2f sec", t), cv::Point(50, 50), cv::FONT_HERSHEY_COMPLEX, .8, cv::Scalar(255, 50, 0), 2);
+		imshow("Output-Keypoints", frame);
-		// imshow("Output-Keypoints", frameCopy);
+
-		/*imshow("Output-Skeleton", frame);*/
-		std::cout << "about to call points receiving method" << std::endl;
-		f(points);
 	}
 }

src/computervision/OpenPoseVideo.h

@@ -13,8 +13,7 @@ namespace computervision
 	private:
 
 	public:
-		cv::Mat getBlobFromImage(cv::Mat inputImage);
+		void movementSkeleton(Mat inputImage);
-		void movementSkeleton(Mat inputImage, Mat inpBlob, std::function<void(std::vector<Point>)> f);
 		void setup();
 	};
 }

src/computervision/VideoCapture.cpp

@@ -1,33 +0,0 @@
-#include "VideoCapture.h"
-#include <mutex>
-#include <iostream>
-
-namespace videocapture{
-	static cv::VideoCapture cap(0);
-	static std::mutex mtx;
-
-	cv::VideoCapture getCap() {
-		cap.release();
-
-		return cap;
-	}
-
-	cv::Mat readFrame()
-	{
-		std::cout << "reading frame" << std::endl;
-		cv::Mat camFrame, videoFrame;
-
-		mtx.lock();
-		bool res = cap.read(camFrame);
-		std::cout << (res ? "reading worked" : "reading failed") << std::endl;
-		videoFrame = camFrame.clone();
-		mtx.unlock();
-
-		return videoFrame;
-	}
-
-	std::mutex* getMutex()
-	{
-		return &mtx;
-	}
-}

src/computervision/VideoCapture.h

@@ -1,12 +0,0 @@
-#pragma once
-#include <opencv2/videoio.hpp>
-#include <opencv2/highgui.hpp>
-#include <opencv2/video.hpp>
-#include <mutex>
-
-namespace videocapture {
-	cv::VideoCapture getCap();
-	std::mutex* getMutex();
-	cv::Mat readFrame();
-
-}

src/computervision/async/async_arm_detection.cpp

@@ -1,41 +0,0 @@
-#include <iostream>
-#include "async_arm_detection.h"
-#include "../OpenPoseVideo.h"
-#include <thread>
-#include "../VideoCapture.h"
-#include <opencv2/dnn.hpp>
-#include <opencv2/imgproc.hpp>
-#include <opencv2/highgui.hpp>
-
-
-namespace computervision
-{
-	AsyncArmDetection::AsyncArmDetection()
-	{
-
-	}
-
-	void AsyncArmDetection::run_arm_detection()
-	{
-
-	}
-
-	void AsyncArmDetection::start(std::function<void(std::vector<Point>)> points_ready_func, OpenPoseVideo op)
-	{
-
-		auto lambda = [](cv::Mat img, std::function<void(std::vector<Point>)> f, OpenPoseVideo op, cv::Mat inpBlob) {
-			std::cout << "STARTING THREAD LAMBDA" << std::endl;
-
-			//imshow("image", img); 255, Size(368, 368), Scalar(0, 0, 0), false, false);
-			op.movementSkeleton(img, inpBlob, f);
-			//}
-		};
-
-		cv::Mat img = videocapture::readFrame();
-		std::cout << "starting function" << std::endl;
-		cv::Mat inpBlob = op.getBlobFromImage(videocapture::readFrame());
-
-
-		std::thread async_arm_detect_thread(lambda, img, points_ready_func, op, inpBlob);
-	}
-}

src/computervision/async/async_arm_detection.h

@@ -1,22 +0,0 @@
-#pragma once
-#include <vector>
-#include <opencv2/core/types.hpp>
-#include <opencv2/videoio.hpp>
-#include <functional>
-#include "../OpenPoseVideo.h"
-
-
-namespace computervision
-{
-	class AsyncArmDetection
-	{
-	public:
-		AsyncArmDetection(void);
-
-		
-		void start(std::function<void(std::vector<cv::Point>)>, computervision::OpenPoseVideo op);
-	private:
-		void run_arm_detection();
-	};
-
-}

src/main.cpp

@@ -1,8 +1,6 @@
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
 #include <glm/gtc/matrix_transform.hpp>
-#include <functional>
-#include <vector>
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb_image.h"
 #include <ostream>
@@ -23,8 +21,6 @@
 //#include "computervision/OpenPoseImage.h"
 #include "computervision/OpenPoseVideo.h"
 
-#include "computervision/async/async_arm_detection.h"
-
 #pragma comment(lib, "glfw3.lib")
 #pragma comment(lib, "glew32s.lib")
 #pragma comment(lib, "opengl32.lib")
@@ -32,15 +28,7 @@
 static double UpdateDelta();
 
 static GLFWwindow* window;
-computervision::AsyncArmDetection as;
-computervision::OpenPoseVideo openPoseVideo;
 
-void retrieve_points(std::vector<Point> arm_points)
-{
-	std::cout << "got points!!" << std::endl;
-	std::cout << "points: " << arm_points << std::endl;
-	as.start(retrieve_points, openPoseVideo);
-}
 
 int main(void)
 {
@@ -79,8 +67,7 @@ int main(void)
 	// create object detection object instance
 	computervision::ObjectDetection objDetect;
 	//computervision::OpenPoseImage openPoseImage;
-	
+	computervision::OpenPoseVideo openPoseVideo;
-	openPoseVideo.setup();
 
 
 	// set up object detection
@@ -88,11 +75,7 @@ int main(void)
 	cv::Mat cameraFrame;
 
 
-	//openPoseVideo.setup();
+	openPoseVideo.setup();
-
-	
-	as.start(retrieve_points, openPoseVideo);
-	
 
 	// Main game loop
 	while (!glfwWindowShouldClose(window))
@@ -112,6 +95,7 @@ int main(void)
 
 		cameraFrame = objDetect.readCamera();
 		//objDetect.detectHand(cameraFrame);
+		openPoseVideo.movementSkeleton(cameraFrame);
 
 		// Finish up
 		shader.Stop();

wk2_fps.vcxproj

@@ -19,14 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\computervision\async\async_arm_detection.cpp" />
     <ClCompile Include="src\computervision\FaceDetector.cpp" />
     <ClCompile Include="src\computervision\ObjectDetection.cpp" />
     <ClCompile Include="src\computervision\OpenPoseVideo.cpp" />
     <ClCompile Include="src\computervision\SkinDetector.cpp" />
     <ClCompile Include="src\computervision\FingerCount.cpp" />
     <ClCompile Include="src\computervision\BackgroundRemover.cpp" />
-    <ClCompile Include="src\computervision\VideoCapture.cpp" />
     <ClCompile Include="src\entities\camera.cpp" />
     <ClCompile Include="src\entities\entity.cpp" />
     <ClCompile Include="src\main.cpp" />
@@ -38,14 +36,12 @@
     <ClCompile Include="src\toolbox\toolbox.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\computervision\async\async_arm_detection.h" />
     <ClInclude Include="src\computervision\FaceDetector.h" />
     <ClInclude Include="src\computervision\FingerCount.h" />
     <ClInclude Include="src\computervision\BackgroundRemover.h" />
     <ClInclude Include="src\computervision\OpenPoseVideo.h" />
     <ClInclude Include="src\computervision\SkinDetector.h" />
     <ClInclude Include="src\computervision\ObjectDetection.h" />
-    <ClInclude Include="src\computervision\VideoCapture.h" />
     <ClInclude Include="src\entities\camera.h" />
     <ClInclude Include="src\entities\entity.h" />
     <ClInclude Include="src\models\model.h" />
@@ -60,11 +56,6 @@
   <ItemGroup>
     <Xml Include="res\haarcascade_frontalface_alt.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="res\pose\coco\pose_deploy_linevec.prototxt" />
-    <None Include="res\pose\mpi\pose_deploy_linevec_faster_4_stages.prototxt" />
-    <None Include="res\pose\mpi\pose_iter_160000.caffemodel" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{A7ECF1BE-DB22-4BF7-BFF6-E3BF72691EE6}</ProjectGuid>

wk2_fps.vcxproj.filters

@@ -60,12 +60,6 @@
     <ClCompile Include="src\computervision\OpenPoseVideo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\computervision\async\async_arm_detection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\computervision\VideoCapture.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\entities\Camera.h">
@@ -116,19 +110,8 @@
     <ClInclude Include="src\computervision\OpenPoseVideo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\computervision\async\async_arm_detection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\computervision\VideoCapture.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="res\haarcascade_frontalface_alt.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="res\pose\coco\pose_deploy_linevec.prototxt" />
-    <None Include="res\pose\mpi\pose_deploy_linevec_faster_4_stages.prototxt" />
-    <None Include="res\pose\mpi\pose_iter_160000.caffemodel" />
-  </ItemGroup>
 </Project>