[EDIT] stuff

src/computervision/ObjectDetection.cpp

@@ -8,10 +8,10 @@
 #include "SkinDetector.h"
 #include "FaceDetector.h"
 #include "FingerCount.h"
+#include "async/StaticCameraInstance.h"
 
 namespace computervision
 {
-	cv::VideoCapture cap(0);
 
 	cv::Mat img, imgGray, img2, img2Gray, img3, img4;
 
@@ -24,6 +24,8 @@ namespace computervision
 	FaceDetector faceDetector;
 	FingerCount fingerCount;
 
+	cv::VideoCapture cap = static_camera::getCap();
+
 	ObjectDetection::ObjectDetection()
 	{
 	}

src/computervision/ObjectDetection.h

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

src/computervision/OpenPoseVideo.cpp

@@ -42,9 +42,11 @@ namespace computervision
 
 	void OpenPoseVideo::setup() {
 		net = readNetFromCaffe(protoFile, weightsFile);
+
+		net.setPreferableBackend(DNN_TARGET_CPU);
 	}
 
-	void OpenPoseVideo::movementSkeleton(Mat inputImage, std::function<void(std::vector<Point>)> f) {
+	void OpenPoseVideo::movementSkeleton(Mat& inputImage, std::function<void(std::vector<Point>&, cv::Mat& poinst_on_image)> f) {
 		std::cout << "movement skeleton start" << std::endl;
 
 		int inWidth = 368;
@@ -67,6 +69,7 @@ namespace computervision
 
 		std::cout << "done setting input to net" << std::endl;
 		Mat output = net.forward();
+		std::cout << "time took to set input and forward: " << t << std::endl;
 
 		int H = output.size[2];
 		int W = output.size[3];
@@ -96,9 +99,10 @@ namespace computervision
 		}
 
 		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", frameCopy);
+		std::cout << "time taken: " << t << std::endl;
-		imshow("Output-Skeleton", frame);
+		//imshow("Output-Keypoints", frame);
+		//imshow("Output-Skeleton", frame);
 		std::cout << "about to call points receiving method" << std::endl;
-		f(points);
+		f(points,frame);
 	}
 }

src/computervision/OpenPoseVideo.h

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

src/computervision/async/StaticCameraInstance.h

@@ -0,0 +1,12 @@
+#pragma once
+#include <opencv2/videoio.hpp>
+
+namespace static_camera
+{
+
+	static cv::VideoCapture getCap()
+	{
+		static cv::VideoCapture cap(0);
+		return cap;
+	}
+};

src/computervision/async/async_arm_detection.cpp

@@ -2,6 +2,7 @@
 #include "async_arm_detection.h"
 #include "../OpenPoseVideo.h"
 #include <thread>
+#include "StaticCameraInstance.h"
 
 
 namespace computervision
@@ -11,33 +12,35 @@ namespace computervision
 
 	}
 
-	void AsyncArmDetection::run_arm_detection()
+	void AsyncArmDetection::run_arm_detection(std::function<void(std::vector<Point>, cv::Mat poinst_on_image)> points_ready_func, OpenPoseVideo op)
 	{
+		VideoCapture cap = static_camera::getCap();
 		
+		std::cout << "STARTING THREAD LAMBDA" << std::endl;
+		/*cv::VideoCapture cap = static_camera::getCap();*/
+
+		if (!cap.isOpened())
+		{
+			std::cout << "capture was closed, opening..." << std::endl;
+			cap.open(0);
+		}
+
+		while (true)
+		{
+			Mat img;
+			cap.read(img);
+			op.movementSkeleton(img, points_ready_func);
+		}
 	}
 
-	void AsyncArmDetection::start(std::function<void(std::vector<Point>)> points_ready_func, cv::VideoCapture cap, OpenPoseVideo op)
+	void AsyncArmDetection::start(std::function<void(std::vector<Point>, cv::Mat poinst_on_image)> points_ready_func, OpenPoseVideo op)
 	{
 
-		auto lambda = [](std::function<void(std::vector<Point>)> f, cv::VideoCapture c, OpenPoseVideo op) {
-			std::cout << "STARTING THREAD LAMBDA" << std::endl;
-			cv::VideoCapture cap(0);
-
-			if (!cap.isOpened())
-			{
-				std::cout << "error opening video" << std::endl;
-				return;
-			}
-
-			while (true)
-			{
-				Mat img;
-				cap.read(img);
-				op.movementSkeleton(img, f);
-			}
-		};
-
 		std::cout << "starting function" << std::endl;
-		std::thread async_arm_detect_thread(lambda, points_ready_func, cap, op);
+
+
+		std::thread async_arm_detect_thread(&AsyncArmDetection::run_arm_detection,this, points_ready_func, op);
+
+		async_arm_detect_thread.detach(); // makes sure the thread is detached from the variable.
 	}
 }

src/computervision/async/async_arm_detection.h

@@ -4,6 +4,7 @@
 #include <opencv2/videoio.hpp>
 #include <functional>
 #include "../OpenPoseVideo.h"
+#include "StaticCameraInstance.h"
 
 
 namespace computervision
@@ -14,9 +15,9 @@ namespace computervision
 		AsyncArmDetection(void);
 
 		
-		void start(std::function<void(std::vector<cv::Point>)>, cv::VideoCapture cap, computervision::OpenPoseVideo op);
+		void start(std::function<void(std::vector<cv::Point>, cv::Mat poinst_on_image)>, computervision::OpenPoseVideo op);
 	private:
-		void run_arm_detection();
+		void run_arm_detection(std::function<void(std::vector<Point>, cv::Mat poinst_on_image)> points_ready_func, OpenPoseVideo op);
 	};
 
 }

src/main.cpp

@@ -32,11 +32,16 @@
 static double UpdateDelta();
 
 static GLFWwindow* window;
+bool points_img_available = false;
+cv::Mat points_img;
 
-void retrieve_points(std::vector<Point> arm_points)
+void retrieve_points(std::vector<Point> arm_points, cv::Mat points_on_image)
 {
+
 	std::cout << "got points!!" << std::endl;
 	std::cout << "points: " << arm_points << std::endl;
+	points_img = points_on_image;
+	points_img_available = true;
 }
 
 int main(void)
@@ -82,13 +87,16 @@ int main(void)
 
 	// set up object detection
 	//objDetect.setup();
-	cv::Mat cameraFrame;
+	//cv::VideoCapture cam = objDetect.getCap();
+	cv::Mat img;
+	cv::VideoCapture cap = objDetect.getCap();
+	//cam.read(img);
+	//imshow("camera in main loop", img);
 
 
-	//openPoseVideo.setup();
-
 	computervision::AsyncArmDetection as;
-	as.start(retrieve_points, objDetect.getCap(),openPoseVideo);
+
+	as.start(retrieve_points,openPoseVideo);
 	
 
 	// Main game loop
@@ -107,8 +115,12 @@ int main(void)
 
 		render_engine::renderer::Render(entity, shader);
 
-		cameraFrame = objDetect.readCamera();
 		//objDetect.detectHand(cameraFrame);
+		if (points_img_available)
+		{
+			imshow("points", points_img);
+			points_img_available = false;
+		}
 
 		// Finish up
 		shader.Stop();

wk2_fps.vcxproj

@@ -38,6 +38,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\computervision\async\async_arm_detection.h" />
+    <ClInclude Include="src\computervision\async\StaticCameraInstance.h" />
     <ClInclude Include="src\computervision\FaceDetector.h" />
     <ClInclude Include="src\computervision\FingerCount.h" />
     <ClInclude Include="src\computervision\BackgroundRemover.h" />
@@ -59,6 +60,7 @@
     <Xml Include="res\haarcascade_frontalface_alt.xml" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\Avans Hogeschool\Kim Veldhoen - Proftaak 2.4\pose_iter_160000.caffemodel" />
     <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" />
@@ -129,8 +131,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);;C:\opencv\opencv\build\include</IncludePath>
+    <IncludePath>C:\opencv\build\include\;$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\opencv\opencv\build\include</IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);C:\opencv\opencv\build\x64\vc15\lib</LibraryPath>
+    <LibraryPath>C:\opencv\build\x64\vc15\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);C:\opencv\opencv\build\x64\vc15\lib</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -203,7 +205,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)lib\glfw-3.3.2\$(Platform);$(SolutionDir)lib\glew-2.1.0\lib\Release\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies); opencv_world452.lib</AdditionalDependencies>
+      <AdditionalDependencies>opencv_world452.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

wk2_fps.vcxproj.filters

@@ -116,6 +116,9 @@
     <ClInclude Include="src\computervision\async\async_arm_detection.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\computervision\async\StaticCameraInstance.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="res\haarcascade_frontalface_alt.xml" />
@@ -124,5 +127,6 @@
     <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" />
+    <None Include="..\..\Avans Hogeschool\Kim Veldhoen - Proftaak 2.4\pose_iter_160000.caffemodel" />
   </ItemGroup>
 </Project>