From d6af6274d860d9e1b80b4c19a68dba4a3ae24ca9 Mon Sep 17 00:00:00 2001 From: Luke Benstead Date: Sat, 1 Mar 2014 12:07:30 +0000 Subject: [PATCH] Update Java bindings --- java/jni/kazmath.c | 5 ++--- java/kazmath/jkazmath.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/java/jni/kazmath.c b/java/jni/kazmath.c index d12df93..c10e198 100644 --- a/java/jni/kazmath.c +++ b/java/jni/kazmath.c @@ -1424,14 +1424,13 @@ JNIEXPORT jobject JNICALL Java_kazmath_jkazmath_kmRay3FromPointAndDirection } -JNIEXPORT jobject JNICALL Java_kazmath_jkazmath_kmRay3IntersectPlane +JNIEXPORT jboolean JNICALL Java_kazmath_jkazmath_kmRay3IntersectPlane (JNIEnv *env, jclass class, jobject jo, jobject jr, jobject jp) { kmVec3* o = (kmVec3*)(*env)->GetDirectBufferAddress(env, jo); kmRay3* r = (kmRay3*)(*env)->GetDirectBufferAddress(env, jr); kmPlane* p = (kmPlane*)(*env)->GetDirectBufferAddress(env, jp); - kmRay3IntersectPlane(o, r, p); - return jo; + return kmRay3IntersectPlane(o, r, p); } diff --git a/java/kazmath/jkazmath.java b/java/kazmath/jkazmath.java index 4844374..e1b8d19 100644 --- a/java/kazmath/jkazmath.java +++ b/java/kazmath/jkazmath.java @@ -233,7 +233,7 @@ public static native FloatBuffer kmVec4TransformArray(FloatBuffer pOut, int outS public static native float kmQuaternionGetRoll(FloatBuffer q); public static native FloatBuffer kmRay3Fill(FloatBuffer ray, float px, float py, float pz, float vx, float vy, float vz); public static native FloatBuffer kmRay3FromPointAndDirection(FloatBuffer ray, FloatBuffer point, FloatBuffer direction); - public static native FloatBuffer kmRay3IntersectPlane(FloatBuffer pOut, FloatBuffer ray, FloatBuffer plane); + public static native boolean kmRay3IntersectPlane(FloatBuffer pOut, FloatBuffer ray, FloatBuffer plane); public static native FloatBuffer kmVec3MultiplyMat3(FloatBuffer pOut, FloatBuffer pV, FloatBuffer pM); public static native FloatBuffer kmVec3MultiplyMat4(FloatBuffer pOut, FloatBuffer pV, FloatBuffer pM); public static native FloatBuffer kmVec3ProjectOnToPlane(FloatBuffer pOut, FloatBuffer point, FloatBuffer plane);