🔖 version 0.6.36, closes #225

Author: bitbrain

Diff for: CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 0.6.36
+
+* [[#225](https://github.com/bitbrain/braingdx/issues/225)] fix wrong insertion order of render layers
+* remove `ParticleEffectLoader` since it [now comes with libgdx](https://libgdx.badlogicgames.com/ci/nightlies/docs/api/com/badlogic/gdx/assets/loaders/ParticleEffectLoader.html)
+
 # Version 0.6.35
 
 * fix various bugs

Diff for: core/src/main/java/de/bitbrain/braingdx/assets/loader/ParticleLoader.java

@@ -70,6 +70,11 @@ public boolean hasEffects() {
       return batchPostProcessor.hasEffects();
    }
 
+   @Override
+   public RenderLayer<?> getLayer() {
+      return layer;
+   }
+
    @Override
    public void beforeRender() {
       layer.beforeRender();

Diff for: core/src/main/java/de/bitbrain/braingdx/graphics/pipeline/CombinedRenderPipe.java

@@ -45,7 +45,7 @@
  * @author Miguel Gonzalez Sanchez
  * @version 1.0.0
  */
-public class CombinedRenderPipeline implements RenderPipeline {
+public class CombinedRenderPipeline implements InternalRenderPipeline {
 
    private static final boolean isDesktop = (Gdx.app.getType() == Application.ApplicationType.Desktop);
 
@@ -156,7 +156,7 @@ public void putBefore(String existing, String id, RenderLayer layer, PostProcess
          Gdx.app.error("FATAL", "Unable add layer '" + id + "'!");
          return;
       }
-      orderedPipes.put(index > 0 ? index - 1 : index, id, new CombinedRenderPipe(layer, processor, internalBatch, batchResolverMap, effects));
+      orderedPipes.put(index, id, new CombinedRenderPipe(layer, processor, internalBatch, batchResolverMap, effects));
       this.hasEffects = hasEffects || effects.length > 0;
       pipes.clear();
       pipes.addAll(orderedPipes.valueList());
@@ -171,7 +171,7 @@ public void remove(String existingSourceId) {
       }
       orderedPipes.remove(existingSourceId);
       for (Object o : orderedPipes.valueList()) {
-         CombinedRenderPipe pipe = (CombinedRenderPipe)o;
+         CombinedRenderPipe pipe = (CombinedRenderPipe) o;
          if (pipe.hasEffects()) {
             return;
          }
@@ -247,6 +247,11 @@ public Collection<String> getPipeIds() {
       return orderedPipes.keySet();
    }
 
+   @Override
+   public Collection<RenderPipe> getPipes() {
+      return new ArrayList<RenderPipe>(pipes);
+   }
+
    @SuppressWarnings("unchecked")
    @Override
    public void render(float delta) {

Diff for: core/src/main/java/de/bitbrain/braingdx/graphics/pipeline/CombinedRenderPipeline.java

@@ -0,0 +1,30 @@
+/* Copyright 2017 Miguel Gonzalez Sanchez
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.bitbrain.braingdx.graphics.pipeline;
+
+import java.util.Collection;
+
+/**
+ * Handles the complete pipeline of rendering internally. The pipeline consists of render pipes.
+ *
+ * @author Miguel Gonzalez Sanchez
+ * @version 1.0.0
+ */
+public interface InternalRenderPipeline extends RenderPipeline {
+
+   Collection<String> getPipeIds();
+
+   Collection<RenderPipe> getPipes();
+}

Diff for: core/src/main/java/de/bitbrain/braingdx/graphics/pipeline/InternalRenderPipeline.java

@@ -25,6 +25,8 @@
  */
 public interface RenderPipe {
 
+   RenderLayer getLayer();
+
    void beforeRender();
 
    void render(float delta, FrameBuffer buffer);

Diff for: core/src/main/java/de/bitbrain/braingdx/graphics/pipeline/RenderPipe.java

@@ -96,12 +96,5 @@ public interface RenderPipeline extends Disposable, Resizeable {
     */
    void addEffects(String existingSourceId, PostProcessorEffect... effects);
 
-   /**
-    * Returns an ordered collection of all registered layers
-    *
-    * @return an ordered collection of Strings
-    */
-   Collection<String> getPipeIds();
-
    void render(float delta);
 }

Diff for: core/src/main/java/de/bitbrain/braingdx/graphics/pipeline/RenderPipeline.java

@@ -16,7 +16,7 @@
 public class MockedCombinedRenderPipelineFactory implements RenderPipelineFactory {
 
    @Override
-   public RenderPipeline create() {
+   public InternalRenderPipeline create() {
       ShaderConfig config = mock(ShaderConfig.class);
       PostProcessor processorMock = mock(PostProcessor.class);
       FrameBufferFactory factory = mock(FrameBufferFactory.class);

Diff for: core/src/test/java/de/bitbrain/braingdx/assets/loader/ParticleLoaderTest.java

@@ -4,6 +4,7 @@
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
 import de.bitbrain.braingdx.util.GdxUtils;
+import org.assertj.core.api.iterable.Extractor;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,17 +29,17 @@
 public class RenderPipelineTest {
 
    @Parameter
-   public RenderPipelineFactory pipelineFactory;
+   public MockedCombinedRenderPipelineFactory pipelineFactory;
 
-   private RenderPipeline pipeline;
+   private InternalRenderPipeline pipeline;
 
    @Parameters
-   public static Collection<RenderPipelineFactory[]> getParams() {
-      List<RenderPipelineFactory[]> params = new ArrayList<RenderPipelineFactory[]>();
+   public static Collection<MockedCombinedRenderPipelineFactory[]> getParams() {
+      List<MockedCombinedRenderPipelineFactory[]> params = new ArrayList<MockedCombinedRenderPipelineFactory[]>();
       GdxUtils.mockApplicationContext();
       Gdx.gl = mock(GL20.class);
       when(Gdx.app.getType()).thenReturn(ApplicationType.Desktop);
-      params.add(new RenderPipelineFactory[]{new MockedCombinedRenderPipelineFactory()});
+      params.add(new MockedCombinedRenderPipelineFactory[]{new MockedCombinedRenderPipelineFactory()});
       return params;
    }
 
@@ -155,4 +156,25 @@ public void testRemove_Existing() {
       assertThat(pipeline.getPipeIds()).containsExactly("c");
    }
 
+   @Test
+   public void testReplace_Existing() {
+      RenderLayer<?> expectedLayerA = mock(RenderLayer.class);
+      RenderLayer<?> expectedLayerB = mock(RenderLayer.class);
+      RenderLayer<?> expectedLayerC = mock(RenderLayer.class);
+      RenderLayer<?> expectedLayerD = mock(RenderLayer.class);
+      RenderLayer<?> expectedLayerANew = mock(RenderLayer.class);
+      pipeline.put("a", expectedLayerA);
+      pipeline.put("b", expectedLayerB);
+      pipeline.putAfter("a", "c", expectedLayerC);
+      pipeline.put("a", expectedLayerANew);
+      pipeline.putBefore("c", "d", expectedLayerD);
+      assertThat(pipeline.getPipeIds()).containsExactly("a", "d", "c", "b");
+      assertThat(pipeline.getPipes()).extracting(new Extractor<RenderPipe, RenderLayer<?>>() {
+         @Override
+         public RenderLayer<?> extract(RenderPipe input) {
+            return input.getLayer();
+         }
+      }).containsExactly(expectedLayerANew, expectedLayerD, expectedLayerC, expectedLayerB);
+   }
+
 }