diff --git a/KinectPV2/Kinect4PV2.jardesc b/KinectPV2/Kinect4PV2.jardesc new file mode 100644 index 0000000..0e5fa31 --- /dev/null +++ b/KinectPV2/Kinect4PV2.jardesc @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/KinectPV2/library/KinectPV2.dll b/KinectPV2/library/KinectPV2.dll index a10d353..7a890eb 100644 Binary files a/KinectPV2/library/KinectPV2.dll and b/KinectPV2/library/KinectPV2.dll differ diff --git a/KinectPV2/library/KinectPV2.exp b/KinectPV2/library/KinectPV2.exp index ca77c5e..54f7c56 100644 Binary files a/KinectPV2/library/KinectPV2.exp and b/KinectPV2/library/KinectPV2.exp differ diff --git a/KinectPV2/library/KinectPV2.jar b/KinectPV2/library/KinectPV2.jar index 908bd49..70541a1 100644 Binary files a/KinectPV2/library/KinectPV2.jar and b/KinectPV2/library/KinectPV2.jar differ diff --git a/KinectPV2/library/KinectPV2.lib b/KinectPV2/library/KinectPV2.lib index 3a77071..275e168 100644 Binary files a/KinectPV2/library/KinectPV2.lib and b/KinectPV2/library/KinectPV2.lib differ diff --git a/KinectPV2/library/KinectPV2.pdb b/KinectPV2/library/KinectPV2.pdb index 37838d0..574f99f 100644 Binary files a/KinectPV2/library/KinectPV2.pdb and b/KinectPV2/library/KinectPV2.pdb differ diff --git a/KinectPV2/src/Constants.java b/KinectPV2/src/KinectPV2/Constants.java similarity index 100% rename from KinectPV2/src/Constants.java rename to KinectPV2/src/KinectPV2/Constants.java diff --git a/KinectPV2/src/Device.java b/KinectPV2/src/KinectPV2/Device.java similarity index 96% rename from KinectPV2/src/Device.java rename to KinectPV2/src/KinectPV2/Device.java index 842a69a..317c712 100644 --- a/KinectPV2/src/Device.java +++ b/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,7 +73,15 @@ 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; @@ -80,6 +89,7 @@ public class Device implements Constants, FaceProperties, SkeletonProperties, Ru 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 b/KinectPV2/src/KinectPV2/FaceData.java similarity index 100% rename from KinectPV2/src/FaceData.java rename to KinectPV2/src/KinectPV2/FaceData.java diff --git a/KinectPV2/src/FaceFeatures.java b/KinectPV2/src/KinectPV2/FaceFeatures.java similarity index 100% rename from KinectPV2/src/FaceFeatures.java rename to KinectPV2/src/KinectPV2/FaceFeatures.java diff --git a/KinectPV2/src/FaceProperties.java b/KinectPV2/src/KinectPV2/FaceProperties.java similarity index 95% rename from KinectPV2/src/FaceProperties.java rename to KinectPV2/src/KinectPV2/FaceProperties.java index e74c9e6..c0e4058 100644 --- a/KinectPV2/src/FaceProperties.java +++ b/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 b/KinectPV2/src/KinectPV2/HDFaceData.java similarity index 100% rename from KinectPV2/src/HDFaceData.java rename to KinectPV2/src/KinectPV2/HDFaceData.java diff --git a/KinectPV2/src/Image.java b/KinectPV2/src/KinectPV2/Image.java similarity index 100% rename from KinectPV2/src/Image.java rename to KinectPV2/src/KinectPV2/Image.java diff --git a/KinectPV2/src/KJoint.java b/KinectPV2/src/KinectPV2/KJoint.java similarity index 100% rename from KinectPV2/src/KJoint.java rename to KinectPV2/src/KinectPV2/KJoint.java diff --git a/KinectPV2/src/KQuartenion.java b/KinectPV2/src/KinectPV2/KQuartenion.java similarity index 100% rename from KinectPV2/src/KQuartenion.java rename to KinectPV2/src/KinectPV2/KQuartenion.java diff --git a/KinectPV2/src/KRectangle.java b/KinectPV2/src/KinectPV2/KRectangle.java similarity index 100% rename from KinectPV2/src/KRectangle.java rename to KinectPV2/src/KinectPV2/KRectangle.java diff --git a/KinectPV2/src/KinectPV2.java b/KinectPV2/src/KinectPV2/KinectPV2.java similarity index 96% rename from KinectPV2/src/KinectPV2.java rename to KinectPV2/src/KinectPV2/KinectPV2.java index 00ff9be..ba8c798 100644 --- a/KinectPV2/src/KinectPV2.java +++ b/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 b/KinectPV2/src/KinectPV2/Skeleton.java similarity index 100% rename from KinectPV2/src/Skeleton.java rename to KinectPV2/src/KinectPV2/Skeleton.java diff --git a/KinectPV2/src/SkeletonProperties.java b/KinectPV2/src/KinectPV2/SkeletonProperties.java similarity index 100% rename from KinectPV2/src/SkeletonProperties.java rename to KinectPV2/src/KinectPV2/SkeletonProperties.java