Merge pull request #14 from jubby/kirk-fix-rawdepthstream

Kirk fix rawdepthstream
ThomasLengeling · Apr 20, 2015 · aa31ee6 · aa31ee6
2 parents 002cad2 + 2949b18
commit aa31ee6
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 9 deletions.
diff --git a/KinectPV2/Kinect4PV2.jardesc b/KinectPV2/Kinect4PV2.jardesc
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="WINDOWS-1252" standalone="no"?>
+<jardesc>
+    <jar path="Kinect4PV2/library/KinectPV2.jar"/>
+    <options buildIfNeeded="true" compress="true" descriptionLocation="/Kinect4PV2/Kinect4PV2.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
+    <selectedProjects/>
+    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
+        <sealing sealJar="false">
+            <packagesToSeal/>
+            <packagesToUnSeal/>
+        </sealing>
+    </manifest>
+    <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
+        <javaElement handleIdentifier="=Kinect4PV2/src"/>
+    </selectedElements>
+</jardesc>
diff --git a/KinectPV2/library/KinectPV2.dll b/KinectPV2/library/KinectPV2.dll
diff --git a/KinectPV2/library/KinectPV2.exp b/KinectPV2/library/KinectPV2.exp
diff --git a/KinectPV2/library/KinectPV2.jar b/KinectPV2/library/KinectPV2.jar
diff --git a/KinectPV2/library/KinectPV2.lib b/KinectPV2/library/KinectPV2.lib
diff --git a/KinectPV2/library/KinectPV2.pdb b/KinectPV2/library/KinectPV2.pdb
diff --git a/KinectPV2/src/Constants.java → KinectPV2/src/KinectPV2/Constants.java b/KinectPV2/src/Constants.java → KinectPV2/src/KinectPV2/Constants.java
diff --git a/KinectPV2/src/Device.java → KinectPV2/src/KinectPV2/Device.java b/KinectPV2/src/Device.java → KinectPV2/src/KinectPV2/Device.java
@@ -53,6 +53,7 @@ public class Device implements Constants, FaceProperties, SkeletonProperties, Ru
 
 	private  Image colorImg;
 	private  Image depthImg;
+	private  short[] depthDataRaw;
 	private  Image infraredImg;
 	private  Image longExposureImg;
 	private  Image bodyTrackImg;
@@ -72,14 +73,23 @@ public class Device implements Constants, FaceProperties, SkeletonProperties, Ru
 	FloatBuffer pointCloudColorPos;
 	FloatBuffer colorChannelBuffer;
 
-	protected boolean runningKinect;
+	private boolean runningKinect;
+	public boolean isRunningKinect() {
+		return runningKinect;
+	}
+
+	protected void setRunningKinect(boolean runningKinect) {
+		this.runningKinect = runningKinect;
+	}
+
 
 	private PApplet parent;
 	private long ptr;
 
 	private boolean startSensor;
 
 
+
 	/**
 	 * Start device
 	 * @param _p PApplet
@@ -89,6 +99,8 @@ public Device(PApplet _p){
 		colorImg        = new Image(parent, WIDTHColor, HEIGHTColor, PImage.ARGB);
 		coordinateRGBDepthImg =  new Image(parent, WIDTHColor, HEIGHTColor, PImage.ARGB);
 		depthImg        = new Image(parent, WIDTHDepth, HEIGHTDepth, PImage.ALPHA);
+		depthDataRaw = new short[WIDTHDepth*HEIGHTDepth];
+
 		infraredImg     = new Image(parent, WIDTHDepth, HEIGHTDepth, PImage.ALPHA);
 
 		bodyTrackImg    = new Image(parent, WIDTHDepth, HEIGHTDepth, PImage.RGB);
@@ -141,7 +153,7 @@ protected void initDevice(){
 		}
 
 		if(startSensor){
-			runningKinect = true;
+			setRunningKinect(true);
 			(new Thread(this)).start();
 		}
 
@@ -174,6 +186,13 @@ private void copyDepthImg(int [] rawData){
 			PApplet.arrayCopy(rawData, 0, depthImg.rawIntData, 0, depthImg.getImgSize());
 	}
 
+	private void copyDepthRawData(short [] rawData){
+		PApplet.arrayCopy(rawData, 0, depthDataRaw, 0, depthImg.getImgSize());
+//		depthImg.updatePixels();
+//		if(depthImg.isProcessRawData())
+//			PApplet.arrayCopy(rawData, 0, depthImg.rawIntData, 0, depthImg.getImgSize());
+	}
+
 	private void copyDepthMaskImg(int [] rawData){
 		PApplet.arrayCopy(rawData, 0, depthMaskImg.pixels(), 0, depthMaskImg.getImgSize());
 		depthMaskImg.updatePixels();
@@ -413,10 +432,10 @@ public PImage getPointCloudDepthImage() {
 	/**
 	 * Get Raw Depth Data
 	 *  512 x 424
-	 * @return int []
+	 * @return short []
 	 */
-	public int [] getRawDepth(){
-		return depthImg.rawIntData;
+	public short [] getRawDepth(){
+		return depthDataRaw;
 	}
 
 	/**
@@ -827,7 +846,7 @@ protected void stopDevice(){
 
 	public void run() {
 		//int fr = PApplet.round(1000.0f / parent.frameRate);
-		while (runningKinect) {
+		while (isRunningKinect()) {
 			boolean result = updateDevice();
 			if(!result){
 				System.out.println("Error updating Kinect EXIT");

diff --git a/KinectPV2/src/FaceData.java → KinectPV2/src/KinectPV2/FaceData.java b/KinectPV2/src/FaceData.java → KinectPV2/src/KinectPV2/FaceData.java
diff --git a/KinectPV2/src/FaceFeatures.java → KinectPV2/src/KinectPV2/FaceFeatures.java b/KinectPV2/src/FaceFeatures.java → KinectPV2/src/KinectPV2/FaceFeatures.java
diff --git a/KinectPV2/src/FaceProperties.java → KinectPV2/src/KinectPV2/FaceProperties.java b/KinectPV2/src/FaceProperties.java → KinectPV2/src/KinectPV2/FaceProperties.java
@@ -25,7 +25,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 /**
  * Commun Face Properties
- * @author Thomas Sanchez Lengeling
+ * @author Thomas Sanchez Lengelinghttp://marketplace.eclipse.org/marketplace-client-intro?mpc_install=27025
  *
  */
 public interface FaceProperties  extends Constants {

diff --git a/KinectPV2/src/HDFaceData.java → KinectPV2/src/KinectPV2/HDFaceData.java b/KinectPV2/src/HDFaceData.java → KinectPV2/src/KinectPV2/HDFaceData.java
diff --git a/KinectPV2/src/Image.java → KinectPV2/src/KinectPV2/Image.java b/KinectPV2/src/Image.java → KinectPV2/src/KinectPV2/Image.java
diff --git a/KinectPV2/src/KJoint.java → KinectPV2/src/KinectPV2/KJoint.java b/KinectPV2/src/KJoint.java → KinectPV2/src/KinectPV2/KJoint.java
diff --git a/KinectPV2/src/KQuartenion.java → KinectPV2/src/KinectPV2/KQuartenion.java b/KinectPV2/src/KQuartenion.java → KinectPV2/src/KinectPV2/KQuartenion.java
diff --git a/KinectPV2/src/KRectangle.java → KinectPV2/src/KinectPV2/KRectangle.java b/KinectPV2/src/KRectangle.java → KinectPV2/src/KinectPV2/KRectangle.java
diff --git a/KinectPV2/src/KinectPV2.java → KinectPV2/src/KinectPV2/KinectPV2.java b/KinectPV2/src/KinectPV2.java → KinectPV2/src/KinectPV2/KinectPV2.java
@@ -43,12 +43,12 @@ public KinectPV2(PApplet _p) {
 
 	public void init(){
 		initDevice();
-		runningKinect = true;
+		setRunningKinect(true);
 	}
 
 	public void dispose() {
 		System.out.println("EXIT");
-		runningKinect = false;
+		setRunningKinect(false);
 		stopDevice();
 	}
 

diff --git a/KinectPV2/src/Skeleton.java → KinectPV2/src/KinectPV2/Skeleton.java b/KinectPV2/src/Skeleton.java → KinectPV2/src/KinectPV2/Skeleton.java
diff --git a/KinectPV2/src/SkeletonProperties.java → ...PV2/src/KinectPV2/SkeletonProperties.java b/KinectPV2/src/SkeletonProperties.java → ...PV2/src/KinectPV2/SkeletonProperties.java