From e5de2a1ac3d8e34afde43fdd3f916e85e9b65c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Sat, 21 Nov 2015 15:39:37 +0100 Subject: [PATCH] clean --- .../java/com/projectseptember/RNGL/GLCanvas.java | 13 ++----------- .../com/projectseptember/RNGL/GLCanvasManager.java | 1 - .../java/com/projectseptember/RNGL/GLTexture.java | 2 -- .../java/com/projectseptember/RNGL/RNGLContext.java | 9 --------- .../com/projectseptember/RNGL/RunInGLThread.java | 2 +- .../com/projectseptember/RNGL/UniformValue.java | 7 ------- 6 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 android/src/main/java/com/projectseptember/RNGL/UniformValue.java diff --git a/android/src/main/java/com/projectseptember/RNGL/GLCanvas.java b/android/src/main/java/com/projectseptember/RNGL/GLCanvas.java index 76e374c..958fb54 100644 --- a/android/src/main/java/com/projectseptember/RNGL/GLCanvas.java +++ b/android/src/main/java/com/projectseptember/RNGL/GLCanvas.java @@ -6,10 +6,7 @@ import android.graphics.Bitmap; import android.graphics.PixelFormat; import android.net.Uri; import android.opengl.GLSurfaceView; -import android.support.annotation.Nullable; import android.util.DisplayMetrics; -import android.util.Log; -import android.view.MotionEvent; import android.view.ViewGroup; import com.facebook.react.bridge.Arguments; @@ -18,10 +15,6 @@ import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableMapKeySetIterator; import com.facebook.react.bridge.WritableMap; -import com.facebook.react.touch.CatalystInterceptingViewGroup; -import com.facebook.react.touch.OnInterceptTouchEventListener; -import com.facebook.react.uimanager.PointerEvents; -import com.facebook.react.uimanager.ReactPointerEventsView; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.events.RCTEventEmitter; @@ -639,10 +632,8 @@ public class GLCanvas } public void syncEventsThrough () { - // TODO: figure out how to do this (Obj C code below) - // FIXME: probably we should just define {style} on JS side. check if there is support for touchEvents:"none" - //self.userInteractionEnabled = !(_eventsThrough); - //self.superview.userInteractionEnabled = !(_eventsThrough && !_visibleContent); + // TODO: figure out how to do this... + // For some reason, the click through is half working } diff --git a/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java b/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java index 6065e94..341a9d7 100644 --- a/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java +++ b/android/src/main/java/com/projectseptember/RNGL/GLCanvasManager.java @@ -4,7 +4,6 @@ import android.support.annotation.Nullable; import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableMap; -import com.facebook.react.uimanager.PointerEvents; import com.facebook.react.uimanager.SimpleViewManager; import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.ReactProp; diff --git a/android/src/main/java/com/projectseptember/RNGL/GLTexture.java b/android/src/main/java/com/projectseptember/RNGL/GLTexture.java index 626d325..93da52f 100644 --- a/android/src/main/java/com/projectseptember/RNGL/GLTexture.java +++ b/android/src/main/java/com/projectseptember/RNGL/GLTexture.java @@ -1,11 +1,9 @@ package com.projectseptember.RNGL; import android.graphics.Bitmap; -import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Matrix; import android.opengl.GLUtils; -import android.util.Log; import android.view.View; import static android.opengl.GLES20.*; diff --git a/android/src/main/java/com/projectseptember/RNGL/RNGLContext.java b/android/src/main/java/com/projectseptember/RNGL/RNGLContext.java index 7e29e19..4c78d98 100644 --- a/android/src/main/java/com/projectseptember/RNGL/RNGLContext.java +++ b/android/src/main/java/com/projectseptember/RNGL/RNGLContext.java @@ -1,7 +1,5 @@ package com.projectseptember.RNGL; -import android.opengl.GLES20; - import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactMethod; @@ -10,15 +8,8 @@ import com.facebook.react.bridge.ReadableMap; import java.util.HashMap; import java.util.Map; -import javax.microedition.khronos.egl.EGLContext; - public class RNGLContext extends ReactContextBaseJavaModule { - // Share GL Context ? - // http://developer.android.com/training/graphics/opengl/environment.html - // http://stackoverflow.com/questions/8845491/sharing-the-egl2-0-context-between-2-glsurfaceviews-caused-egl-bad-access-on-and - // http://stackoverflow.com/questions/5675355/sharing-the-gles20-context-and-textures-between-different-glsurfaceviews - private static String STATIC_VERT = "attribute vec2 position;"+ "varying vec2 uv;"+ diff --git a/android/src/main/java/com/projectseptember/RNGL/RunInGLThread.java b/android/src/main/java/com/projectseptember/RNGL/RunInGLThread.java index 426eb03..7cadfa8 100644 --- a/android/src/main/java/com/projectseptember/RNGL/RunInGLThread.java +++ b/android/src/main/java/com/projectseptember/RNGL/RunInGLThread.java @@ -1,5 +1,5 @@ package com.projectseptember.RNGL; public interface RunInGLThread { - public void runInGLThread(final Runnable runnable); + void runInGLThread(final Runnable runnable); } diff --git a/android/src/main/java/com/projectseptember/RNGL/UniformValue.java b/android/src/main/java/com/projectseptember/RNGL/UniformValue.java deleted file mode 100644 index 98fb479..0000000 --- a/android/src/main/java/com/projectseptember/RNGL/UniformValue.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.projectseptember.RNGL; - -import com.facebook.react.bridge.ReadableMap; - -public class UniformValue { - -} -- 2.26.2