Merge pull request #488 from marynate/PR-godot-java

More callbacks for Godot.SingletonBase (android)

platform/android/java/src/com/android/godot/Godot.java

@@ -62,6 +62,7 @@ import android.widget.FrameLayout;
 import com.android.godot.input.*;
 import java.io.InputStream;
 
+import javax.microedition.khronos.opengles.GL10;
 
 public class Godot extends Activity implements SensorEventListener
 {	
@@ -116,11 +117,13 @@ public class Godot extends Activity implements SensorEventListener
 
 		}
 
-		protected void onMainResume() {
+		protected void onMainPause() {}
-
+		protected void onMainResume() {}
-
+		protected void onMainDestroy() {}
-		}
 
+		protected void onGLDrawFrame(GL10 gl) {}
+		protected void onGLSurfaceChanged(GL10 gl, int width, int height) {} // singletons will always miss first onGLSurfaceChanged call
+		//protected void onGLSurfaceCreated(GL10 gl, EGLConfig config) {} // singletons won't be ready until first GodotLib.step()
 
 		public void registerMethods() {}
 	}
@@ -141,6 +144,7 @@ public class Godot extends Activity implements SensorEventListener
 	private Sensor mAccelerometer;
 
 	public FrameLayout layout;
+	public RelativeLayout adLayout;
 
 
 	static public GodotIO io;
@@ -154,7 +158,6 @@ public class Godot extends Activity implements SensorEventListener
 	static int singleton_count=0;
 
 
-
 	public interface ResultCallback {
 		public void callback(int requestCode, int resultCode, Intent data);
 	};
@@ -197,6 +200,12 @@ public class Godot extends Activity implements SensorEventListener
 		
         edittext.setView(mView);
         io.setEdit(edittext);
+		
+		// Ad layout
+		adLayout = new RelativeLayout(this);
+		adLayout.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,LayoutParams.FILL_PARENT));
+		layout.addView(adLayout);
+		
 	}
 
 	private static Godot _self;
@@ -282,6 +291,9 @@ public class Godot extends Activity implements SensorEventListener
 	@Override protected void onDestroy(){
 		
 		if(mPaymentsManager != null ) mPaymentsManager.destroy();
+		for(int i=0;i<singleton_count;i++) {
+			singletons[i].onMainDestroy();
+		}
 		super.onDestroy();
 	}
 	
@@ -291,6 +303,9 @@ public class Godot extends Activity implements SensorEventListener
 		mSensorManager.unregisterListener(this);
 		GodotLib.focusout();
 
+		for(int i=0;i<singleton_count;i++) {
+			singletons[i].onMainPause();
+		}
 	}
 
 	@Override protected void onResume() {

platform/android/java/src/com/android/godot/GodotView.java

@@ -62,6 +62,7 @@ import javax.microedition.khronos.opengles.GL10;
  *   bit depths). Failure to do so would result in an EGL_BAD_MATCH error.
  */
 public class GodotView extends GLSurfaceView {
+
 	private static String TAG = "GodotView";
 	private static final boolean DEBUG = false;
 	private static Context ctx;
@@ -379,12 +380,18 @@ public class GodotView extends GLSurfaceView {
 
 		public void onDrawFrame(GL10 gl) {
 			GodotLib.step();
+			for(int i=0;i<Godot.singleton_count;i++) {
+				Godot.singletons[i].onGLDrawFrame(gl);
+			}
 		}
 
 		public void onSurfaceChanged(GL10 gl, int width, int height) {
 
 			GodotLib.resize(width, height,!firsttime);
 			firsttime=false;
+			for(int i=0;i<Godot.singleton_count;i++) {
+				Godot.singletons[i].onGLSurfaceChanged(gl, width, height);
+			}
 		}
 
 		public void onSurfaceCreated(GL10 gl, EGLConfig config) {

platform/android/java_glue.cpp

@@ -152,6 +152,14 @@ jvalue _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_ar
 			env->SetIntArrayRegion(arr,0,array.size(),r.ptr());
 			v.l=arr;
 
+		} break;
+		case Variant::RAW_ARRAY: {
+			DVector<uint8_t> array = *p_arg;
+			jbyteArray arr = env->NewByteArray(array.size());
+			DVector<uint8_t>::Read r = array.read();
+			env->SetByteArrayRegion(arr,0,array.size(),reinterpret_cast<const signed char*>(r.ptr()));
+			v.l=arr;
+
 		} break;
 		case Variant::REAL_ARRAY: {
 
@@ -244,6 +252,19 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
 		return sarr;
 	};
 
+	if (name == "[B") {
+
+		jbyteArray arr = (jbyteArray)obj;
+		int fCount = env->GetArrayLength(arr);
+		DVector<uint8_t> sarr;
+		sarr.resize(fCount);
+
+		DVector<uint8_t>::Write w = sarr.write();
+		env->GetByteArrayRegion(arr,0,fCount,reinterpret_cast<signed char*>(w.ptr()));
+		w = DVector<uint8_t>::Write();
+		return sarr;
+	};
+
 	if (name == "java.lang.Float" || name == "java.lang.Double") {
 
 		jclass nclass = env->FindClass("java/lang/Number");
@@ -1346,6 +1367,7 @@ static Variant::Type get_jni_type(const String& p_type) {
 		{"double", Variant::REAL},
 		{"java.lang.String",Variant::STRING},
 		{"[I",Variant::INT_ARRAY},
+		{"[B",Variant::RAW_ARRAY},
 		{"[F",Variant::REAL_ARRAY},
 		{"[java.lang.String",Variant::STRING_ARRAY},
 		{"com.android.godot.Dictionary", Variant::DICTIONARY},
@@ -1381,6 +1403,7 @@ static const char* get_jni_sig(const String& p_type) {
 		{"java.lang.String","Ljava/lang/String;"},
 		{"com.android.godot.Dictionary", "Lcom/android/godot/Dictionary;"},
 		{"[I","[I"},
+		{"[B","[B"},
 		{"[F","[F"},
 		{"[java.lang.String","[Ljava/lang/String;"},
 		{NULL,"V"}