Fixed varargs fail that caused the VM to crash horribly.

nicolasgramlich · Mar 2, 2012 · 6bfb205 · 6bfb205
1 parent f1697de
commit 6bfb205
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 32 deletions.
diff --git a/jni/src/EntityProxy.cpp b/jni/src/EntityProxy.cpp
@@ -27,7 +27,7 @@ EntityProxy::EntityProxy(float pX, float pY) {
 
 	jmethodID constructor = JNI_ENV()->GetMethodID(clazz, "<init>", "(JFF)V");
 
-	this->mUnwrapped = JNI_ENV()->NewObject(clazz, constructor, this, pX, pY);
+	this->mUnwrapped = JNI_ENV()->NewObject(clazz, constructor, (jlong)this, pX, pY);
 }
 
 void EntityProxy::setRotation(float pRotation) {
@@ -47,8 +47,9 @@ void EntityProxy::setScale(float pScale) {
 }
 
 bool EntityProxy::onAttached() {
-	// this->setRotation(45);
-	return false;
+	this->setScale(2);
+
+	return true;
 }
 
 bool EntityProxy::onDetached() {

diff --git a/jni/src/RectangleProxy.cpp b/jni/src/RectangleProxy.cpp
@@ -26,5 +26,5 @@ RectangleProxy::RectangleProxy(float pX, float pY, float pWidth, float pHeight,
 
 	jmethodID constructor = JNI_ENV()->GetMethodID(clazz, "<init>", "(JFFFFLorg/andengine/opengl/vbo/VertexBufferObjectManager;)V");
 
-	this->mUnwrapped = JNI_ENV()->NewObject(clazz, constructor, this, pX, pY, pWidth, pHeight, pVertexBufferObjectManager);
+	this->mUnwrapped = JNI_ENV()->NewObject(clazz, constructor, (jlong)this, pX, pY, pWidth, pHeight, pVertexBufferObjectManager);
 }
diff --git a/jni/src/Test.cpp b/jni/src/Test.cpp
@@ -1,10 +1,7 @@
 #include "ScriptingEnvironment.h"
 #include "Test.h"
 #include "RectangleProxy.h"
-#include <android/log.h>
-
-#define  LOG_TAG    "AndEngine"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
+#include "Util.h"
 
 // ===========================================================
 // org.andengine.extension.scripting.Test
@@ -15,23 +12,9 @@ JNIEXPORT jobject JNICALL Java_org_andengine_extension_scripting_Test_mirror(JNI
 }
 
 JNIEXPORT jobject JNICALL Java_org_andengine_extension_scripting_Test_test(JNIEnv* pJNIEnv, jclass pJClass) {
-	LOGD("test(1)");
-
-	jobject vertexBufferObjectManager = getEngine()->getVertexBufferObjectManager();
-
-	// LOGD(getClassName(vertexBufferObjectManager));
-
-	RectangleProxy* rect = new RectangleProxy(10, 10, 100, 100, vertexBufferObjectManager);
-
-	LOGD("test(2)");
+	RectangleProxy* rect = new RectangleProxy(10, 10, 100, 100, getEngine()->getVertexBufferObjectManager());
 
 	rect->setRotation(45);
 
-	LOGD("test(3)");
-
-	jobject unwrapped = rect->unwrap();
-
-	LOGD("test(4)");
-
-    return unwrapped;
+    return rect->unwrap();
 }
diff --git a/jni/src/Util.h b/jni/src/Util.h
@@ -0,0 +1,11 @@
+#ifndef Util_H
+#define Util_H
+
+#include <android/log.h>
+
+#define  LOG_TAG    "AndEngineScriptingExtension"
+#define  LOG_D(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
+#define  LOG_W(...)  __android_log_print(ANDROID_LOG_WARNING,LOG_TAG,__VA_ARGS__)
+#define  LOG_E(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
+
+#endif
diff --git a/libs/armeabi-v7a/libandenginescriptingextension.so b/libs/armeabi-v7a/libandenginescriptingextension.so
diff --git a/libs/armeabi-v7a/libgnustl_shared.so b/libs/armeabi-v7a/libgnustl_shared.so
diff --git a/libs/armeabi/libandenginescriptingextension.so b/libs/armeabi/libandenginescriptingextension.so
diff --git a/libs/armeabi/libgnustl_shared.so b/libs/armeabi/libgnustl_shared.so
diff --git a/libs/x86/libandenginescriptingextension.so b/libs/x86/libandenginescriptingextension.so
diff --git a/libs/x86/libgnustl_shared.so b/libs/x86/libgnustl_shared.so
diff --git a/src/org/andengine/extension/scripting/entity/EntityProxy.java b/src/org/andengine/extension/scripting/entity/EntityProxy.java
@@ -39,18 +39,18 @@ public EntityProxy(final long pAddress, final float pX, final float pY) {
 
 	@Override
 	public void onAttached() {
-//		if(!this.nativeOnAttached(this.mAddress)) {
+		if(!this.nativeOnAttached(this.mAddress)) {
 			super.onAttached();
-//		}
+		}
 	}
 
 	private native boolean nativeOnAttached(final long pAddress);
 
 	@Override
 	public void onDetached() {
-//		if(!this.nativeOnDetached(this.mAddress)) {
+		if(!this.nativeOnDetached(this.mAddress)) {
 			super.onDetached();
-//		}
+		}
 	}
 
 	private native boolean nativeOnDetached(final long pAddress);

diff --git a/src/org/andengine/extension/scripting/entity/primitive/RectangleProxy.java b/src/org/andengine/extension/scripting/entity/primitive/RectangleProxy.java
@@ -47,18 +47,18 @@ public RectangleProxy(final long pAddress, final float pX, final float pY, final
 
 	@Override
 	public void onAttached() {
-//		if(!this.nativeOnAttached(this.mAddress)) {
+		if(!this.nativeOnAttached(this.mAddress)) {
 			super.onAttached();
-//		}
+		}
 	}
 
 	private native boolean nativeOnAttached(final long pAddress);
 
 	@Override
 	public void onDetached() {
-//		if(!this.nativeOnDetached(this.mAddress)) {
+		if(!this.nativeOnDetached(this.mAddress)) {
 			super.onDetached();
-//		}
+		}
 	}
 
 	private native boolean nativeOnDetached(final long pAddress);