Revert "Basic shadow implement"

This reverts commit 84a81a7.

Author: gabriel

res/raw/core_native_view.frag

@@ -1,14 +1,34 @@
 package br.nullexcept.mux.core.texel;
 
-import br.nullexcept.mux.utils.BufferUtils;
-
 class GLProgramView extends GLProgram {
     private final String fragment;
     private final String vertex;
 
     GLProgramView(){
-        fragment = BufferUtils.utfFromStream(getClass().getResourceAsStream("/res/raw/core_native_view.frag"));
-        vertex = BufferUtils.utfFromStream(getClass().getResourceAsStream("/res/raw/core_native_view.vert"));
+        fragment =
+                "precision mediump float;\n" +
+                "\n" +
+                "uniform float alpha;\n" +
+                "uniform float time;\n" +
+                "uniform sampler2D __texture__;\n" +
+                "varying vec2 xuv;\n" +
+                "\n" +
+                "void main(){\n" +
+                "    vec4 pixel = texture2D(__texture__, xuv);\n" +
+                "    pixel.a *= alpha;\n" +
+                "    if(pixel.a < 0.001) discard; " +
+                "    gl_FragColor = pixel;\n" +
+                "}";
+        vertex =
+                "attribute vec4 __position__;\n" +
+                "attribute vec2 __uv__;\n" +
+                "\n" +
+                "varying vec2 xuv;\n" +
+                "\n" +
+                "void main(){\n" +
+                "    gl_Position = vec4(__position__.xy,0.0, 1.0);\n" +
+                "    xuv = __uv__ ;\n" +
+                "}";
     }
 
     @Override

res/raw/core_native_view.vert

@@ -1,13 +1,9 @@
 package br.nullexcept.mux.core.texel;
 
 import br.nullexcept.mux.graphics.Color;
-import br.nullexcept.mux.lang.Function;
-import br.nullexcept.mux.lang.Function2;
-import br.nullexcept.mux.view.View;
 import org.lwjgl.BufferUtils;
 
 import java.nio.FloatBuffer;
-import java.util.List;
 
 import static br.nullexcept.mux.hardware.GLES.*;
 
@@ -56,9 +52,9 @@ public static void drawTexture(float x, float y, float width, float height, GLTe
         drawTexture(x, y, width, height, GLShaderList.TEXTURE, texture.getTexture());
     }
 
-    public static void drawViewLayers(float[][] vertices, int[] textures, View[] views){
+    public static void drawViewLayers(float[][] vertices, int[] textures, float[] alphas){
         glEnable(GL_BLEND);
-        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+        glBlendFuncSeparate(GL_ONE, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
         GLProgram program = GLShaderList.VIEW;
 
         program.bind();
@@ -68,15 +64,11 @@ public static void drawViewLayers(float[][] vertices, int[] textures, View[] vie
         int uTexture = program.uniform(GLProgram.UNIFORM_TEXTURE);
         int uAlpha = program.uniform("alpha");
         int uTime = program.uniform("time");
-        int uMode = program.uniform("mode");
-        int uSize = program.uniform("size");
-        int uElevation = program.uniform("elevation");
-        int uShadowColor = program.uniform("shadowColor");
 
         glEnableVertexAttribArray(vPosition);
         glEnableVertexAttribArray(vTextureCoords);
 
-        Function2<Integer, Integer> draw = (i, mode) -> {
+        for (int i = 0; i < vertices.length; i++) {
             bufferRect.put(vertices[i]);
             bufferRect.position(0);
 
@@ -85,27 +77,10 @@ public static void drawViewLayers(float[][] vertices, int[] textures, View[] vie
             glVertexAttribPointer(vTextureCoords, 2, GL_FLOAT, false, 0, bufferUV);
 
             glUniform1i(uTexture, GL_TEXTURE_2D);
-            glUniform1i(uMode, mode);
-            glUniform1f(uElevation, views[i].getElevation());
-            glUniform1f(uAlpha, views[i].getAlpha());
-            glUniform4f(uShadowColor,
-                    Color.red(views[i].getShadowColor()) / 255.0f,
-                    Color.green(views[i].getShadowColor()) / 255.0f,
-                    Color.blue(views[i].getShadowColor()) / 255.0f,
-                    Color.alpha(views[i].getShadowColor()) / 255.0f
-            );
-
-            glUniform2f(uSize, views[i].getWidth(), views[i].getHeight());
+            glUniform1f(uAlpha, alphas[i]);
             glUniform1f(uTime, (System.currentTimeMillis() & 1000)/1000.0f);
             glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
             glDisable(GL_DEPTH_TEST);
-        };
-
-        for (int i = 0; i < views.length; i++) {
-            if (views[i].getElevation() > 0.001f) {
-                draw.run(i, 1); // Draw shadow
-            }
-            draw.run(i, 0);
         }
 
         program.unbind();

src/br/nullexcept/mux/core/texel/GLProgramView.java

@@ -40,20 +40,20 @@ public void drawInternal(CanvasTexel canvas, View view){
                 }
             }
             float[][] borders = new float[drawables][2*4];
-            View[] list = new View[drawables];
+            float[] alphas = new float[drawables];
             int[] textures = new int[drawables];
             int index = 0;
             for (View child: children){
                 if (child.isVisible()){
                     CanvasTexel texel = registry.get(child.hashCode()).canvas;
                     borders[index] = createMesh(canvas, child);
-                    list[index] = child;
+                    alphas[index] = child.getAlpha();
                     textures[index] = texel.getFramebuffer().getTexture().getTexture();
                     index++;
                 }
             }
             canvas.getFramebuffer().bind();
-            GLTexel.drawViewLayers(borders,textures, list);
+            GLTexel.drawViewLayers(borders,textures, alphas);
             canvas.getFramebuffer().unbind();
             canvas.begin();
         }

src/br/nullexcept/mux/core/texel/GLTexel.java

@@ -530,14 +530,6 @@ public Object getTag() {
         return tag;
     }
 
-    public int getShadowColor() {
-        return Color.argb(20,1,0,0);
-    }
-
-    public float getElevation() {
-        return 0.0f;
-    }
-
     public interface OnClickListener {
         void onClick(View view);
     }