Skip to content

Commit

Permalink
accidently compiled against ppa version, now it should work with the …
Browse files Browse the repository at this point in the history 
…latest code
  • Loading branch information
Michael Nischt committed Nov 29, 2010
1 parent 68a0c5d commit defd5e0
Show file tree
Hide file tree
Showing 25 changed files with 30 additions and 29 deletions.
10 changes: 6 additions & 4 deletions wrappers/java/OpenKinectJNI/org_openkinect_Context.cpp
View file
Expand Up @@ -25,7 +25,6 @@
*/

#include <libfreenect.h>
#include <libfreenect/libfreenect.h>
#include <map>
#include <list>
#include <string>
Expand All @@ -36,7 +35,7 @@
struct Data
{
freenect_pixel *rgb;
freenect_depth *depth;
void *depth;

Data() : rgb(0), depth(0) {}
};
Expand All @@ -61,7 +60,7 @@ void rgb_cb(freenect_device *dev, freenect_pixel *rgb, uint32_t timestamp)
data[dev].rgb = rgb;
}

void depth_cb(freenect_device *dev, freenect_depth *v_depth, uint32_t timestamp)
void depth_cb(freenect_device *dev, void *v_depth, uint32_t timestamp)
{
data[dev].depth = v_depth;
}
Expand Down Expand Up @@ -147,8 +146,11 @@ JNIEXPORT jboolean JNICALL Java_org_openkinect_Context_jniProcessEvents
}

{
freenect_update_device_state(f_dev);
freenect_raw_device_state* f_dev_raw = freenect_get_device_state(f_dev);

double x, y, z;
freenect_get_mks_accel(f_dev, &x, &y, &z);
freenect_get_mks_accel(f_dev_raw, &x, &y, &z);

jobject device = jDevice(env, jContext, f_dev);
jclass clazz = env->GetObjectClass(device);
Expand Down
3 changes: 1 addition & 2 deletions wrappers/java/OpenKinectJNI/org_openkinect_Device.cpp
View file
Expand Up @@ -25,7 +25,6 @@
*/

#include <libfreenect.h>
#include <libfreenect/libfreenect.h>

#include "org_openkinect_Device.h"

Expand Down Expand Up @@ -100,4 +99,4 @@ JNIEXPORT void JNICALL Java_org_openkinect_Device_jniStopCaptureDepth
{
freenect_device *f_dev = device(env, obj);
freenect_stop_depth(f_dev);
}
}
4 changes: 2 additions & 2 deletions wrappers/java/build.sh
View file
Expand Up @@ -3,14 +3,14 @@
LIBUSB_INCLUDE=/usr/include/libusb-1.0/
LIBUSB_LIBRARY=/usr/lib/libusb-1.0.a

LIBFREENET_INCLUDE=../../include/libfreenect
LIBFREENET_INCLUDE=../../include/
LIBFREENET_LIBRARY=../../lib/libfreenect.a

# -- try to use installed as fallback
if [ -z ${LIBFREENET_INCLUDE} ]; then LIBFREENET_INCLUDE="/usr/include/libfreenect/"; fi
if [ -z ${LIBFREENET_LIBRARY} ]; then LIBFREENET_LIBRARY="/usr/lib/libfreenect.a"; fi



#-- if jdk home is not set try ubuntu default
if [ -z ${JDK_HOME} ]; then JDK_HOME="/usr/lib/jvm/java-6-openjdk"; fi

Expand Down
Binary file modified wrappers/java/dist/OpenKinect.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/allclasses-frame.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
All Classes
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/allclasses-noframe.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
All Classes
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/constant-values.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
Constant Field Values
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/deprecated-list.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
Deprecated List
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/help-doc.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
API Help
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/index-all.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
Index
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/index.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc on Mon Nov 29 09:53:04 CET 2010-->
<!-- Generated by javadoc on Mon Nov 29 11:39:15 CET 2010-->
<TITLE>
Generated Documentation (Untitled)
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/Acceleration.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
Acceleration
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/ColorFormat.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
ColorFormat
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/Context.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
Context
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/DepthFormat.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
DepthFormat
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/Device.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
Device
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/Image.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
Image
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/LEDStatus.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
LEDStatus
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/LogLevel.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
LogLevel
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/Logger.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
Logger
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/package-frame.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
org.openkinect
</TITLE>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/org/openkinect/package-summary.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
org.openkinect
</TITLE>
Expand Down
4 changes: 2 additions & 2 deletions wrappers/java/dist/javadoc/org/openkinect/package-tree.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
org.openkinect Class Hierarchy
</TITLE>
Expand Down Expand Up @@ -101,7 +101,7 @@ <H2>
<LI TYPE="circle">java.lang.Object<UL>
<LI TYPE="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
<UL>
<LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/LEDStatus.html" title="enum in org.openkinect"><B>LEDStatus</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/LogLevel.html" title="enum in org.openkinect"><B>LogLevel</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/ColorFormat.html" title="enum in org.openkinect"><B>ColorFormat</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/DepthFormat.html" title="enum in org.openkinect"><B>DepthFormat</B></A></UL>
<LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/ColorFormat.html" title="enum in org.openkinect"><B>ColorFormat</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/LEDStatus.html" title="enum in org.openkinect"><B>LEDStatus</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/DepthFormat.html" title="enum in org.openkinect"><B>DepthFormat</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/LogLevel.html" title="enum in org.openkinect"><B>LogLevel</B></A></UL>
</UL>
</UL>
<HR>
Expand Down
2 changes: 1 addition & 1 deletion wrappers/java/dist/javadoc/overview-tree.html
View file
Expand Up @@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 09:53:04 CET 2010 -->
<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
<TITLE>
Class Hierarchy
</TITLE>
Expand Down
Binary file modified wrappers/java/dist/libOpenKinect.so
View file
Binary file not shown.

0 comments on commit defd5e0

Please sign in to comment.