Merge upstream 'v147' into be

Author: BalaM314

arc-core/src/arc/graphics/Cubemap.java

@@ -119,6 +119,9 @@ public enum CubemapSide{
         /** The negative Z and sixth side of the cubemap */
         negativeZ(5, GL20.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z, 0, -1, 0, 0, 0, -1);
 
+        /** Cached {@link CubemapSide#values()} for performance and ergonomics. */
+        public static final CubemapSide[] all = values();
+
         /** The zero based index of the side in the cubemap */
         public final int index;
         /** The OpenGL target (used for glTexImage2D) of the side. */

arc-core/src/arc/graphics/Gl.java

@@ -323,6 +323,7 @@ public class Gl{
     //STATE - optimizes GL calls
 
     private static IntBuffer ibuf = Buffers.newIntBuffer(1);
+    private static FloatBuffer fbuf = Buffers.newFloatBuffer(1);
     //last active texture unit
     private static int lastActiveTexture = -1;
     //last bound texture2ds, mapping from texture unit to texture handle
@@ -498,6 +499,12 @@ public static int getInt(int name){
         return ibuf.get(0);
     }
 
+    public static float getFloat(int name){
+        fbuf.position(0);
+        getFloatv(name, fbuf);
+        return fbuf.get(0);
+    }
+
     public static String getString(int name){
         return Core.gl.glGetString(name);
     }

arc-core/src/arc/graphics/Pixmap.java

@@ -898,10 +898,10 @@ public void update(){
         //RGB images are generally uncommon and the memory savings don't really matter; formats have to be converted to RGBA for drawing anyway
         const unsigned char* pixels = stbi_load_from_memory(p_buffer + offset, len, &width, &height, &format, STBI_rgb_alpha);
 
-        if(pixels == NULL) return NULL;
-
         env->ReleasePrimitiveArrayCritical(buffer, (char*)p_buffer, 0);
 
+        if(pixels == NULL) return NULL;
+
         jobject pixel_buffer = env->NewDirectByteBuffer((void*)pixels, width * height * 4);
         jlong* p_native_data = (jlong*)env->GetPrimitiveArrayCritical(nativeData, 0);
         p_native_data[0] = (jlong)pixels;

arc-core/src/arc/graphics/g2d/DrawRequest.java

@@ -190,6 +190,25 @@ public static void light(float x, float y, int sides, float radius, float rotati
         }
     }
 
+    public static void lightInner(float x, float y, int sides, float innerRadius, float radius, float rotation, Color center, Color edge){
+        float centerf = center.toFloatBits(), edgef = edge.toFloatBits();
+
+        float space = 360f / sides;
+
+        for(int i = 0; i < sides; i ++){
+            float px = Angles.trnsx(space * i + rotation, radius);
+            float py = Angles.trnsy(space * i + rotation, radius);
+            float px2 = Angles.trnsx(space * (i + 1) + rotation, radius);
+            float py2 = Angles.trnsy(space * (i + 1) + rotation, radius);
+            quad(
+                x + Angles.trnsx(space * i + rotation, innerRadius), y + Angles.trnsy(space * i + rotation, innerRadius), centerf,
+                x + px, y + py, edgef,
+                x + px2, y + py2, edgef,
+                x + Angles.trnsx(space * (i+1) + rotation, innerRadius), y + Angles.trnsy(space * (i+1) + rotation, innerRadius), centerf
+            );
+        }
+    }
+
     public static void polyBegin(){
         polyFloats.clear();
     }
@@ -263,7 +282,7 @@ public static void poly(float x, float y, int sides, float radius, float rotatio
             tri(x, y, x + px, y + py, x + px2, y + py2);
         }
     }
-    
+
     public static void arc(float x, float y, float radius, float fraction){
         arc(x, y, radius, fraction, 0f);
     }
@@ -276,7 +295,7 @@ public static void arc(float x, float y, float radius, float fraction, float rot
         int max = Mathf.ceil(sides * fraction);
         polyBegin();
         polyPoint(x, y);
-        
+
         for(int i = 0; i <= max; i++){
             float a = (float)i / max * fraction * 360f + rotation;
             float x1 = Angles.trnsx(a, radius);
@@ -285,7 +304,7 @@ public static void arc(float x, float y, float radius, float fraction, float rot
             polyPoint(x + x1, y + y1);
         }
         polyPoint(x, y);
-        
+
         polyEnd();
     }
 

arc-core/src/arc/graphics/g2d/Fill.java

@@ -139,12 +139,12 @@ protected Texture createTexture(FrameBufferTextureAttachmentSpec attachmentSpec)
     }
 
     @Override
-    protected void disposeColorTexture(Texture colorTexture){
+    protected void disposeTexture(Texture colorTexture){
         colorTexture.dispose();
     }
 
     @Override
-    protected void attachFrameBufferColorTexture(Texture texture){
-        Gl.framebufferTexture2D(Gl.framebuffer, GL20.GL_COLOR_ATTACHMENT0, GL20.GL_TEXTURE_2D, texture.getTextureObjectHandle(), 0);
+    protected void attachTexture(int attachment, Texture texture){
+        Gl.framebufferTexture2D(Gl.framebuffer, attachment, Gl.texture2d, texture.getTextureObjectHandle(), 0);
     }
 }

arc-core/src/arc/graphics/gl/FrameBuffer.java

@@ -1,5 +1,6 @@
 package arc.graphics.gl;
 
+import arc.func.*;
 import arc.graphics.*;
 import arc.graphics.Cubemap.*;
 import arc.graphics.Texture.*;
@@ -40,14 +41,6 @@
  * @author realitix
  */
 public class FrameBufferCubemap extends GLFrameBuffer<Cubemap>{
-    /** cubemap sides cache */
-    private static final Cubemap.CubemapSide[] cubemapSides = Cubemap.CubemapSide.values();
-    /** the zero-based index of the active side **/
-    private int currentSide;
-
-    FrameBufferCubemap(){
-    }
-
     /**
      * Creates a GLFrameBuffer from the specifications provided by bufferBuilder
      **/
@@ -93,55 +86,30 @@ protected Cubemap createTexture(FrameBufferTextureAttachmentSpec attachmentSpec)
     }
 
     @Override
-    protected void disposeColorTexture(Cubemap colorTexture){
+    protected void disposeTexture(Cubemap colorTexture){
         colorTexture.dispose();
     }
 
     @Override
-    protected void attachFrameBufferColorTexture(Cubemap texture){
+    protected void attachTexture(int attachment, Cubemap texture){
         int glHandle = texture.getTextureObjectHandle();
-        CubemapSide[] sides = CubemapSide.values();
-        for(CubemapSide side : sides){
-            Gl.framebufferTexture2D(Gl.framebuffer, GL20.GL_COLOR_ATTACHMENT0, side.glEnum, glHandle, 0);
+        for(CubemapSide side : CubemapSide.all){
+            Gl.framebufferTexture2D(Gl.framebuffer, attachment, side.glEnum, glHandle, 0);
         }
     }
 
-    /**
-     * Makes the frame buffer current so everything gets drawn to it, must be followed by call to either {@link #nextSide()} or
-     * {@link #bindSide(arc.graphics.Cubemap.CubemapSide)} to activate the side to render onto.
-     */
-    @Override
-    public void bind(){
-        currentSide = -1;
-        super.bind();
-    }
-
-    /**
-     * Bind the next side of cubemap and return false if no more side. Should be called in between a call to {@link #begin()} and
-     * #end to cycle to each side of the cubemap to render on.
-     */
-    public boolean nextSide(){
-        if(currentSide > 5){
-            throw new ArcRuntimeException("No remaining sides.");
-        }else if(currentSide == 5){
-            return false;
+    /** Should be called in between a call to {@link #begin()} and {@link #end()}. */
+    public void eachSide(Cons<CubemapSide> cons){
+        for(CubemapSide side : CubemapSide.all){
+            cons.get(side);
         }
-
-        currentSide++;
-        bindSide(getSide());
-        return true;
     }
 
     /**
      * Bind the side, making it active to render on. Should be called in between a call to {@link #begin()} and {@link #end()}.
      * @param side The side to bind
      */
-    protected void bindSide(final Cubemap.CubemapSide side){
-        Gl.framebufferTexture2D(Gl.framebuffer, GL20.GL_COLOR_ATTACHMENT0, side.glEnum, getTexture().getTextureObjectHandle(), 0);
-    }
-
-    /** Get the currently bound side. */
-    public Cubemap.CubemapSide getSide(){
-        return currentSide < 0 ? null : cubemapSides[currentSide];
+    public void bindSide(CubemapSide side){
+        Gl.framebufferTexture2D(Gl.framebuffer, Gl.colorAttachment0, side.glEnum, getTexture().getTextureObjectHandle(), 0);
     }
 }

arc-core/src/arc/graphics/gl/FrameBufferCubemap.java

@@ -28,7 +28,7 @@
 public abstract class GLFrameBuffer<T extends GLTexture> implements Disposable{
     protected final static int GL_DEPTH24_STENCIL8_OES = 0x88F0;
     /** the currently bound framebuffer; null for the default one. */
-    protected static GLFrameBuffer currentBoundFramebuffer;
+    protected static GLFrameBuffer<?> currentBoundFramebuffer;
     /** the default framebuffer handle, a.k.a screen. */
     protected static int defaultFramebufferHandle;
     /** # of nested buffers right now */
@@ -38,7 +38,7 @@ public abstract class GLFrameBuffer<T extends GLTexture> implements Disposable{
     /** the color buffer texture **/
     protected Seq<T> textureAttachments = new Seq<>();
     /** the framebuffer that was bound before this one began (null to indicate that nothing was bound) **/
-    protected GLFrameBuffer lastBoundFramebuffer = null;
+    protected GLFrameBuffer<?> lastBoundFramebuffer = null;
     /** the framebuffer handle **/
     protected int framebufferHandle;
     /** the depthbuffer render object handle **/
@@ -87,13 +87,12 @@ public Seq<T> getTextureAttachments(){
     protected abstract T createTexture(FrameBufferTextureAttachmentSpec attachmentSpec);
 
     /** Override this method in a derived class to dispose the backing texture as you like. */
-    protected abstract void disposeColorTexture(T colorTexture);
+    protected abstract void disposeTexture(T colorTexture);
 
     /** Override this method in a derived class to attach the backing texture to the GL framebuffer object. */
-    protected abstract void attachFrameBufferColorTexture(T texture);
+    protected abstract void attachTexture(int attachment, T texture);
 
     protected void build(){
-
         checkValidBuilder();
 
         // iOS uses a different framebuffer handle! (not necessarily 0)
@@ -143,21 +142,18 @@ protected void build(){
                 T texture = createTexture(attachmentSpec);
                 textureAttachments.add(texture);
                 if(attachmentSpec.isColorTexture()){
-                    Gl.framebufferTexture2D(Gl.framebuffer, GL30.GL_COLOR_ATTACHMENT0 + colorTextureCounter, GL30.GL_TEXTURE_2D,
-                    texture.getTextureObjectHandle(), 0);
+                    attachTexture(Gl.colorAttachment0 + colorTextureCounter, texture);
                     colorTextureCounter++;
                 }else if(attachmentSpec.isDepth){
-                    Gl.framebufferTexture2D(Gl.framebuffer, GL20.GL_DEPTH_ATTACHMENT, GL20.GL_TEXTURE_2D,
-                    texture.getTextureObjectHandle(), 0);
+                    attachTexture(Gl.depthAttachment, texture);
                 }else if(attachmentSpec.isStencil){
-                    Gl.framebufferTexture2D(Gl.framebuffer, GL20.GL_STENCIL_ATTACHMENT, GL20.GL_TEXTURE_2D,
-                    texture.getTextureObjectHandle(), 0);
+                    attachTexture(Gl.stencilAttachment, texture);
                 }
             }
         }else{
             T texture = createTexture(bufferBuilder.textureAttachmentSpecs.first());
             textureAttachments.add(texture);
-            Gl.bindTexture(texture.glTarget, texture.getTextureObjectHandle());
+            attachTexture(Gl.colorAttachment0, texture);
         }
 
         if(isMRT){
@@ -167,8 +163,6 @@ protected void build(){
             }
             buffer.position(0);
             Core.gl30.glDrawBuffers(colorTextureCounter, buffer);
-        }else{
-            attachFrameBufferColorTexture(textureAttachments.first());
         }
 
         if(bufferBuilder.hasDepthRenderBuffer){
@@ -225,7 +219,7 @@ protected void build(){
 
         if(result != Gl.framebufferComplete){
             for(T texture : textureAttachments){
-                disposeColorTexture(texture);
+                disposeTexture(texture);
             }
 
             if(hasDepthStencilPackedBuffer){
@@ -277,7 +271,7 @@ private void checkValidBuilder(){
     @Override
     public void dispose(){
         for(T texture : textureAttachments){
-            disposeColorTexture(texture);
+            disposeTexture(texture);
         }
 
         if(hasDepthStencilPackedBuffer){

arc-core/src/arc/graphics/gl/GLFrameBuffer.java

@@ -71,11 +71,10 @@ public static void circle(int x, int y, int radius, Intc2 cons){
     }
 
     public static void circle(int x, int y, int width, int height, int radius, Intc2 cons){
-        for(int dx = -radius; dx <= radius; dx++){
-            for(int dy = -radius; dy <= radius; dy++){
-                int wx = dx + x, wy = dy + y;
-                if(wx >= 0 && wy >= 0 && wx < width && wy < height && Mathf.within(dx, dy, radius)){
-                    cons.get(wx, wy);
+        for(int dx = Math.max(x - radius, 0); dx <= Math.min(x + radius, width - 1); dx++){
+            for(int dy = Math.max(y - radius, 0); dy <= Math.min(y + radius, height - 1); dy++){
+                if(Mathf.within(dx, dy, x, y, radius)){
+                    cons.get(dx, dy);
                 }
             }
         }

arc-core/src/arc/math/geom/Geometry.java

@@ -194,7 +194,8 @@ public Element hit(float x, float y, boolean touchable){
         Element[] childrenArray = children.items;
         for(int i = children.size - 1; i >= 0; i--){
             Element child = childrenArray[i];
-            if(!child.visible) continue;
+            //TODO: this optimization may be incorrect, needs further testing.
+            if(!child.visible || (child.cullable && cullingArea != null && !cullingArea.overlaps(child.x + child.translation.x, child.y + child.translation.y, child.width, child.height))) continue;
             child.parentToLocalCoordinates(point.set(x, y));
             Element hit = child.hit(point.x, point.y, touchable);
             if(hit != null) return hit;