atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

GLSurfaceView: call SurfaceHolderCallback.surfaceCreated in case the app expects that; compensate for mismatch between touch input and the rendering area

Browse Source
This commit is contained in:
Mis012
2022-12-27 17:11:09 +01:00
parent 8d4c22e2a3
commit 63d7427d0e
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/api-impl-jni/widgets/android_opengl_GLSurfaceView.c
View File

@@ -319,6 +319,11 @@ static void on_realize(GtkGLArea *gl_area, struct jni_gl_callback_data *d)
render_priv->egl_image = eglCreateImage(eglDisplay, render_priv->eglContext, EGL_GL_TEXTURE_2D, (EGLClientBuffer)(intptr_t)render_priv->renderedTexture, NULL);
check_egl_error();
// the GLSurfaceView implements SurfaceHolder.Callback, and the app may expect that we call the `surfaceCreated` method
(*env)->CallVoidMethod(env, d->this, handle_cache.surface_holder_callback.surfaceCreated, NULL);
if((*env)->ExceptionCheck(env))
(*env)->ExceptionDescribe(env);
// Here we call the app's onSurfaceCreated callback. This is the android API's equivalent of the `realize` callback that we are currently in.
___GL_TRACE___("---- calling onSurfaceCreated");
(*env)->CallVoidMethod(env, d->renderer, handle_cache.renderer.onSurfaceCreated, _GET_OBJ_FIELD(d->this, "java_gl_wrapper", "Ljavax/microedition/khronos/opengles/GL10;"), NULL); // FIXME passing NULL only works if the app doesn't use these parameters
@@ -425,12 +430,28 @@ check_gl_error();
struct jni_callback_data { JavaVM *jvm; jobject this; jclass this_class; };
static void call_ontouch_callback(int action, float x, float y, struct jni_callback_data *d)
static void call_ontouch_callback(GtkEventControllerLegacy* event_controller, int action, double x, double y, struct jni_callback_data *d)
{
JNIEnv *env;
(*d->jvm)->GetEnv(d->jvm, (void**)&env, JNI_VERSION_1_6);
jobject motion_event = (*env)->NewObject(env, handle_cache.motion_event.class, handle_cache.motion_event.constructor, action, x, y);
// translate to the GLSurfaceArea widget's coordinates, since that's what the app expects
double off_x;
double off_y;
GtkWidget *gl_area = gtk_event_controller_get_widget(event_controller);
GtkWidget *window = GTK_WIDGET(gtk_widget_get_native(gl_area));
// compensate for offset between the widget coordinates and the surface coordinates
gtk_native_get_surface_transform(GTK_NATIVE(window), &off_x, &off_y);
x -= off_x;
y -= off_y;
gtk_widget_translate_coordinates(window, gl_area, x, y, &x, &y);
// execute the Java callback function
jobject motion_event = (*env)->NewObject(env, handle_cache.motion_event.class, handle_cache.motion_event.constructor, action, (float)x, (float)y);
(*env)->CallBooleanMethod(env, d->this, handle_cache.gl_surface_view.onTouchEvent, motion_event);
@@ -449,15 +470,15 @@ static gboolean on_event(GtkEventControllerLegacy* self, GdkEvent* event, struct
switch(gdk_event_get_event_type(event)) {
case GDK_BUTTON_PRESS:
gdk_event_get_position(event, &x, &y);
call_ontouch_callback(MOTION_EVENT_ACTION_DOWN, (float)x, (float)y, d);
call_ontouch_callback(self, MOTION_EVENT_ACTION_DOWN, x, y, d);
break;
case GDK_BUTTON_RELEASE:
gdk_event_get_position(event, &x, &y);
call_ontouch_callback(MOTION_EVENT_ACTION_UP, (float)x, (float)y, d);
call_ontouch_callback(self, MOTION_EVENT_ACTION_UP, x, y, d);
break;
case GDK_MOTION_NOTIFY:
gdk_event_get_position(event, &x, &y);
call_ontouch_callback(MOTION_EVENT_ACTION_MOVE, (float)x, (float)y, d);
call_ontouch_callback(self, MOTION_EVENT_ACTION_MOVE, x, y, d);
break;
}
}

9
src/api-impl/android/opengl/GLSurfaceView.java
View File

@@ -15,13 +15,20 @@ import android.view.View;
import android.view.MotionEvent;
public class GLSurfaceView extends View { // TODO: have this extend SurfaceView once that one is implemented?
import android.view.SurfaceHolder;
public class GLSurfaceView extends View implements SurfaceHolder.Callback { // TODO: have this extend SurfaceView once that one is implemented?
EGLContextFactory context_factory = new default_ContextFactory();
EGLConfigChooser config_chooser = new boolean_ConfigChooser(true);
EGL10 java_egl_wrapper;
GL10 java_gl_wrapper;
int opengl_version = 1;
// from SurfaceHolder.Callback
public void surfaceCreated(SurfaceHolder surfaceHolder) {}
public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
public void surfaceDestroyed(SurfaceHolder holder) {}
public GLSurfaceView(AttributeSet attrs) {
super(attrs);