From 7ab1f6d10cae83db950224b3ee796cb6bcde3f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Sun, 12 Jun 2016 20:47:16 +0200 Subject: [PATCH] Using 'a big triangle' rather than '2 triangles' see https://github.com/ProjectSeptemberInc/gl-react/issues/60 --- .../main/java/com/projectseptember/RNGL/GLCanvas.java | 2 +- .../main/java/com/projectseptember/RNGL/GLShader.java | 9 +++------ ios/GLCanvas.m | 2 +- ios/GLShader.m | 7 ++----- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/android/src/main/java/com/projectseptember/RNGL/GLCanvas.java b/android/src/main/java/com/projectseptember/RNGL/GLCanvas.java index ae36001..7016a1a 100644 --- a/android/src/main/java/com/projectseptember/RNGL/GLCanvas.java +++ b/android/src/main/java/com/projectseptember/RNGL/GLCanvas.java @@ -723,7 +723,7 @@ public class GLCanvas extends GLSurfaceView glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glClear(GL_COLOR_BUFFER_BIT); - glDrawArrays(GL_TRIANGLES, 0, 6); + glDrawArrays(GL_TRIANGLES, 0, 3); } private void render () { diff --git a/android/src/main/java/com/projectseptember/RNGL/GLShader.java b/android/src/main/java/com/projectseptember/RNGL/GLShader.java index 15f95f6..90435eb 100644 --- a/android/src/main/java/com/projectseptember/RNGL/GLShader.java +++ b/android/src/main/java/com/projectseptember/RNGL/GLShader.java @@ -189,12 +189,9 @@ public class GLShader { glBindBuffer(GL_ARRAY_BUFFER, buffer[0]); float buf[] = { - -1.0f, -1.0f, - 1.0f, -1.0f, - -1.0f, 1.0f, - -1.0f, 1.0f, - 1.0f, -1.0f, - 1.0f, 1.0f + -1.0f, -1.0f, + -1.0f, 4.0f, + 4.0f, -1.0f }; FloatBuffer bufferData = ByteBuffer.allocateDirect(buf.length * 4) .order(ByteOrder.nativeOrder()) diff --git a/ios/GLCanvas.m b/ios/GLCanvas.m index e6eb4b2..affe1a2 100644 --- a/ios/GLCanvas.m +++ b/ios/GLCanvas.m @@ -520,7 +520,7 @@ RCT_NOT_IMPLEMENTED(-init) RCT_PROFILE_BEGIN_EVENT(0, @"draw", nil); glClearColor(0.0, 0.0, 0.0, 0.0); glClear(GL_COLOR_BUFFER_BIT); - glDrawArrays(GL_TRIANGLES, 0, 6); + glDrawArrays(GL_TRIANGLES, 0, 3); RCT_PROFILE_END_EVENT(0, @"gl", nil); RCT_PROFILE_END_EVENT(0, @"gl", nil); diff --git a/ios/GLShader.m b/ios/GLShader.m index 5f0ac9d..5780018 100644 --- a/ios/GLShader.m +++ b/ios/GLShader.m @@ -389,11 +389,8 @@ GLuint compileShader (NSString* shaderName, NSString* shaderString, GLenum shade glBindBuffer(GL_ARRAY_BUFFER, buffer); GLfloat buf[] = { -1.0, -1.0, - 1.0, -1.0, - -1.0, 1.0, - -1.0, 1.0, - 1.0, -1.0, - 1.0, 1.0 + -1.0, 4.0, + 4.0, -1.0 }; glBufferData(GL_ARRAY_BUFFER, sizeof(buf), buf, GL_STATIC_DRAW); -- 2.26.2