Commit e5de2a1a authored by Gaëtan Renaudeau's avatar Gaëtan Renaudeau

clean

parent e43409fc
...@@ -6,10 +6,7 @@ import android.graphics.Bitmap; ...@@ -6,10 +6,7 @@ import android.graphics.Bitmap;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.net.Uri; import android.net.Uri;
import android.opengl.GLSurfaceView; import android.opengl.GLSurfaceView;
import android.support.annotation.Nullable;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log;
import android.view.MotionEvent;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.facebook.react.bridge.Arguments; import com.facebook.react.bridge.Arguments;
...@@ -18,10 +15,6 @@ import com.facebook.react.bridge.ReadableArray; ...@@ -18,10 +15,6 @@ import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.ReadableMapKeySetIterator; import com.facebook.react.bridge.ReadableMapKeySetIterator;
import com.facebook.react.bridge.WritableMap; 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.ThemedReactContext;
import com.facebook.react.uimanager.events.RCTEventEmitter; import com.facebook.react.uimanager.events.RCTEventEmitter;
...@@ -639,10 +632,8 @@ public class GLCanvas ...@@ -639,10 +632,8 @@ public class GLCanvas
} }
public void syncEventsThrough () { public void syncEventsThrough () {
// TODO: figure out how to do this (Obj C code below) // TODO: figure out how to do this...
// FIXME: probably we should just define {style} on JS side. check if there is support for touchEvents:"none" // For some reason, the click through is half working
//self.userInteractionEnabled = !(_eventsThrough);
//self.superview.userInteractionEnabled = !(_eventsThrough && !_visibleContent);
} }
......
...@@ -4,7 +4,6 @@ import android.support.annotation.Nullable; ...@@ -4,7 +4,6 @@ import android.support.annotation.Nullable;
import com.facebook.react.bridge.ReadableArray; import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap; import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.uimanager.PointerEvents;
import com.facebook.react.uimanager.SimpleViewManager; import com.facebook.react.uimanager.SimpleViewManager;
import com.facebook.react.uimanager.ThemedReactContext; import com.facebook.react.uimanager.ThemedReactContext;
import com.facebook.react.uimanager.ReactProp; import com.facebook.react.uimanager.ReactProp;
......
package com.projectseptember.RNGL; package com.projectseptember.RNGL;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.opengl.GLUtils; import android.opengl.GLUtils;
import android.util.Log;
import android.view.View; import android.view.View;
import static android.opengl.GLES20.*; import static android.opengl.GLES20.*;
......
package com.projectseptember.RNGL; package com.projectseptember.RNGL;
import android.opengl.GLES20;
import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReactMethod;
...@@ -10,15 +8,8 @@ import com.facebook.react.bridge.ReadableMap; ...@@ -10,15 +8,8 @@ import com.facebook.react.bridge.ReadableMap;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.microedition.khronos.egl.EGLContext;
public class RNGLContext extends ReactContextBaseJavaModule { 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 = private static String STATIC_VERT =
"attribute vec2 position;"+ "attribute vec2 position;"+
"varying vec2 uv;"+ "varying vec2 uv;"+
......
package com.projectseptember.RNGL; package com.projectseptember.RNGL;
public interface RunInGLThread { public interface RunInGLThread {
public void runInGLThread(final Runnable runnable); void runInGLThread(final Runnable runnable);
} }
package com.projectseptember.RNGL;
import com.facebook.react.bridge.ReadableMap;
public class UniformValue {
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment