From d1e93326880434962009cb94e1a50cb8c9295020 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Thu, 10 Jan 2013 13:56:47 +0100 Subject: [PATCH] fixed issue 1177, WeldJoint#getReferenceAngle() --- .../gdx/physics/box2d/joints/WeldJoint.java | 4 +++ gdx/jni/Android.mk | 1 + gdx/jni/build-linux32.xml | 35 ++++++++++++---------- gdx/jni/build-linux64.xml | 35 ++++++++++++---------- gdx/jni/build-macosx32.xml | 35 ++++++++++++---------- gdx/jni/build-windows32.xml | 35 ++++++++++++---------- gdx/jni/build-windows32home.xml | 35 ++++++++++++---------- gdx/jni/build-windows64.xml | 35 ++++++++++++---------- .../com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.cpp | 10 +++++-- .../com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.h | 10 +++---- ...badlogic.gdx.physics.box2d.joints.WeldJoint.cpp | 12 ++++++++ ...m.badlogic.gdx.physics.box2d.joints.WeldJoint.h | 21 +++++++++++++ .../gdx/physics/box2d/joints/WeldJoint.java | 9 ++++++ 13 files changed, 179 insertions(+), 98 deletions(-) create mode 100755 gdx/jni/com.badlogic.gdx.physics.box2d.joints.WeldJoint.cpp create mode 100755 gdx/jni/com.badlogic.gdx.physics.box2d.joints.WeldJoint.h diff --git a/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/emu/com/badlogic/gdx/physics/box2d/joints/WeldJoint.java b/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/emu/com/badlogic/gdx/physics/box2d/joints/WeldJoint.java index 9c4179ce5..bb8cbc06c 100644 --- a/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/emu/com/badlogic/gdx/physics/box2d/joints/WeldJoint.java +++ b/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/emu/com/badlogic/gdx/physics/box2d/joints/WeldJoint.java @@ -27,4 +27,8 @@ public class WeldJoint extends Joint { public WeldJoint (World world, org.jbox2d.dynamics.joints.WeldJoint joint) { super(world, joint); } + + public float getReferenceAngle () { + return 0; + } } diff --git a/gdx/jni/Android.mk b/gdx/jni/Android.mk index 3c7a860a3..6d6666d9b 100644 --- a/gdx/jni/Android.mk +++ b/gdx/jni/Android.mk @@ -74,6 +74,7 @@ LOCAL_SRC_FILES := Box2D/Collision/b2BroadPhase.cpp\ com.badlogic.gdx.physics.box2d.joints.PulleyJoint.cpp\ com.badlogic.gdx.physics.box2d.joints.RevoluteJoint.cpp\ com.badlogic.gdx.physics.box2d.joints.RopeJoint.cpp\ + com.badlogic.gdx.physics.box2d.joints.WeldJoint.cpp\ com.badlogic.gdx.physics.box2d.joints.WheelJoint.cpp\ com.badlogic.gdx.physics.box2d.Manifold.cpp\ com.badlogic.gdx.physics.box2d.PolygonShape.cpp\ diff --git a/gdx/jni/build-linux32.xml b/gdx/jni/build-linux32.xml index 41e4651ee..3408d3262 100644 --- a/gdx/jni/build-linux32.xml +++ b/gdx/jni/build-linux32.xml @@ -36,6 +36,7 @@ + @@ -93,9 +94,10 @@ - + - + + @@ -107,25 +109,28 @@ - + - + - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/gdx/jni/build-linux64.xml b/gdx/jni/build-linux64.xml index 556429fa6..f7165082b 100644 --- a/gdx/jni/build-linux64.xml +++ b/gdx/jni/build-linux64.xml @@ -36,6 +36,7 @@ + @@ -93,9 +94,10 @@ - + - + + @@ -107,25 +109,28 @@ - + - + - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/gdx/jni/build-macosx32.xml b/gdx/jni/build-macosx32.xml index 5b282692e..d3148db48 100644 --- a/gdx/jni/build-macosx32.xml +++ b/gdx/jni/build-macosx32.xml @@ -36,6 +36,7 @@ + @@ -93,9 +94,10 @@ - + - + + @@ -107,25 +109,28 @@ - + - + - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/gdx/jni/build-windows32.xml b/gdx/jni/build-windows32.xml index 7155187e8..6597e1a4c 100644 --- a/gdx/jni/build-windows32.xml +++ b/gdx/jni/build-windows32.xml @@ -36,6 +36,7 @@ + @@ -93,9 +94,10 @@ - + - + + @@ -107,25 +109,28 @@ - + - + - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/gdx/jni/build-windows32home.xml b/gdx/jni/build-windows32home.xml index 64489e85d..2ba586164 100644 --- a/gdx/jni/build-windows32home.xml +++ b/gdx/jni/build-windows32home.xml @@ -36,6 +36,7 @@ + @@ -93,9 +94,10 @@ - + - + + @@ -107,25 +109,28 @@ - + - + - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/gdx/jni/build-windows64.xml b/gdx/jni/build-windows64.xml index a5dfec3a2..3cc899cc2 100644 --- a/gdx/jni/build-windows64.xml +++ b/gdx/jni/build-windows64.xml @@ -36,6 +36,7 @@ + @@ -93,9 +94,10 @@ - + - + + @@ -107,25 +109,28 @@ - + - + - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/gdx/jni/com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.cpp b/gdx/jni/com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.cpp index 18d016f46..c9c11601f 100644 --- a/gdx/jni/com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.cpp +++ b/gdx/jni/com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.cpp @@ -169,7 +169,11 @@ JNIEXPORT void JNICALL Java_com_badlogic_gdx_graphics_g2d_Gdx2DPixmap_setScale(J JNIEXPORT jstring JNICALL Java_com_badlogic_gdx_graphics_g2d_Gdx2DPixmap_getFailureReason(JNIEnv* env, jclass clazz) { - //@line:325 - - return env->NewStringUTF(gdx2d_get_failure_reason()); + +//@line:325 + + gdx2d_get_failure_reason(void); + + } + diff --git a/gdx/jni/com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.h b/gdx/jni/com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.h index 7f1fcad96..9d6adefc0 100644 --- a/gdx/jni/com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.h +++ b/gdx/jni/com.badlogic.gdx.graphics.g2d.Gdx2DPixmap.h @@ -139,11 +139,11 @@ JNIEXPORT void JNICALL Java_com_badlogic_gdx_graphics_g2d_Gdx2DPixmap_setBlend JNIEXPORT void JNICALL Java_com_badlogic_gdx_graphics_g2d_Gdx2DPixmap_setScale (JNIEnv *, jclass, jint); - /* - * Class: com_badlogic_gdx_graphics_g2d_Gdx2DPixmap - * Method: getFailureReason - * Signature: (V)S - */ +/* + * Class: com_badlogic_gdx_graphics_g2d_Gdx2DPixmap + * Method: getFailureReason + * Signature: ()Ljava/lang/String; + */ JNIEXPORT jstring JNICALL Java_com_badlogic_gdx_graphics_g2d_Gdx2DPixmap_getFailureReason (JNIEnv *, jclass); diff --git a/gdx/jni/com.badlogic.gdx.physics.box2d.joints.WeldJoint.cpp b/gdx/jni/com.badlogic.gdx.physics.box2d.joints.WeldJoint.cpp new file mode 100755 index 000000000..e37fb027e --- /dev/null +++ b/gdx/jni/com.badlogic.gdx.physics.box2d.joints.WeldJoint.cpp @@ -0,0 +1,12 @@ +#include +JNIEXPORT jfloat JNICALL Java_com_badlogic_gdx_physics_box2d_joints_WeldJoint_jniGetReferenceAngle(JNIEnv* env, jobject object, jlong addr) { + + +//@line:33 + + b2WeldJoint* joint = (b2WeldJoint*)addr; + return joint->GetReferenceAngle(); + + +} + diff --git a/gdx/jni/com.badlogic.gdx.physics.box2d.joints.WeldJoint.h b/gdx/jni/com.badlogic.gdx.physics.box2d.joints.WeldJoint.h new file mode 100755 index 000000000..f7e47991b --- /dev/null +++ b/gdx/jni/com.badlogic.gdx.physics.box2d.joints.WeldJoint.h @@ -0,0 +1,21 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_badlogic_gdx_physics_box2d_joints_WeldJoint */ + +#ifndef _Included_com_badlogic_gdx_physics_box2d_joints_WeldJoint +#define _Included_com_badlogic_gdx_physics_box2d_joints_WeldJoint +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_badlogic_gdx_physics_box2d_joints_WeldJoint + * Method: jniGetReferenceAngle + * Signature: (J)F + */ +JNIEXPORT jfloat JNICALL Java_com_badlogic_gdx_physics_box2d_joints_WeldJoint_jniGetReferenceAngle + (JNIEnv *, jobject, jlong); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/gdx/src/com/badlogic/gdx/physics/box2d/joints/WeldJoint.java b/gdx/src/com/badlogic/gdx/physics/box2d/joints/WeldJoint.java index 75bd0e47d..b4c6adcb3 100644 --- a/gdx/src/com/badlogic/gdx/physics/box2d/joints/WeldJoint.java +++ b/gdx/src/com/badlogic/gdx/physics/box2d/joints/WeldJoint.java @@ -25,4 +25,13 @@ public class WeldJoint extends Joint { public WeldJoint (World world, long addr) { super(world, addr); } + + public float getReferenceAngle () { + return jniGetReferenceAngle(addr); + } + + private native float jniGetReferenceAngle (long addr); /* + b2WeldJoint* joint = (b2WeldJoint*)addr; + return joint->GetReferenceAngle(); + */ } -- 2.11.0