blafu

3_PointCloud/KinectTutorial3.vcxproj

@@ -54,7 +54,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>D:\Dropbox\Studium\MasterArbeit\3_PointCloud\glm;..\openvr\headers;glew-2.0.0-win32\glew-2.0.0\include;freeglut-MSVC-3.0.0-2.mp\freeglut\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>H:\Repositories\MasterArbeit\3_PointCloud\glm;D:\Dropbox\Studium\MasterArbeit\3_PointCloud\glm;..\openvr\headers;glew-2.0.0-win32\glew-2.0.0\include;freeglut-MSVC-3.0.0-2.mp\freeglut\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -75,7 +75,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>glew-2.0.0-win32\glew-2.0.0\include;SDL-devel-1.2.15-VC\SDL-1.2.15\include;freeglut-MSVC-3.0.0-2.mp\freeglut\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>H:\Repositories\MasterArbeit\3_PointCloud\glm;glew-2.0.0-win32\glew-2.0.0\include;SDL-devel-1.2.15-VC\SDL-1.2.15\include;freeglut-MSVC-3.0.0-2.mp\freeglut\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>

3_PointCloud/main.cpp

@@ -189,13 +189,17 @@ void getKinectData(bool writeFrameInVector) {
 			//get controler pos
 
 			//frame -> global
+			points.clear();
+			colors.clear();
 			points.reserve(points.capacity() + width*height);
-			colors.reserve(colors.capacity() + width*height);
+			colors.reserve(colors.capacity() + width*height*3);
 
-			for(int i = 0; i < width*height; i++) {
+			for(int i = 0; i < snapshotPoints.size(); i++) {
 
-				points.push_back(*currentControlerPos * framePositions[i]);
-				colors.push_back(snapshotColors[i]);
+				points.push_back(*currentControlerPos * snapshotPoints[i]);
+				colors.push_back(snapshotColors[i*3]);
+				colors.push_back(snapshotColors[i*3+1]);
+				colors.push_back(snapshotColors[i*3+2]);
 
 
 			}
@@ -215,7 +219,10 @@ void getKinectData(bool writeFrameInVector) {
 }
 
 void writePointCloud() {
-	if (points.size() == 0) return;
+	if (points.size() == 0) {
+		std::cout << "No points, scipping File write" << std::endl;
+		return;
+	}
 
 	pntsHeader header;
 	size_t pointArrayByteSize = points.size() * sizeof(glm::vec3);
@@ -248,7 +255,7 @@ void rotateCamera() {
 	double x = radius*sin(angle);
 	double z = radius*(1-cos(angle)) - radius/2;
 	
-	//gluLookAt(x,0,z,0,0,radius/2,0,1,0);
+	gluLookAt(x,0,z,0,0,radius/2,0,1,0);
 	angle += 0.002;
 }
 
@@ -298,9 +305,11 @@ void keyPressed(unsigned char key, int x, int y)
 {
 	switch (key) {
 	case 'a':
+		std::cout << "Caturing Frame"<< std::endl;
 		captureFrame = true;
 		break;
 	case 's':
+		std::cout << "writing File"<< std::endl;
 		writeFile = true;
 		break;
 	default: