Fixed layered spaces

TheJoCraftNET · Apr 4, 2023 · 0d010b6 · 0d010b6
1 parent 3969637
commit 0d010b6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/api/src/main/java/de/pianoman911/mapengine/api/drawing/ILayeredDrawingSpace.java b/api/src/main/java/de/pianoman911/mapengine/api/drawing/ILayeredDrawingSpace.java
@@ -1,11 +1,12 @@
 package de.pianoman911.mapengine.api.drawing;
 
 import de.pianoman911.mapengine.api.pipeline.IPipelineContext;
+import de.pianoman911.mapengine.api.pipeline.IPipelineInput;
 import de.pianoman911.mapengine.api.util.FullSpacedColorBuffer;
 
 import java.util.List;
 
-public interface ILayeredDrawingSpace {
+public interface ILayeredDrawingSpace extends IPipelineInput {
 
     /**
      * Returns all layers of this drawing space

diff --git a/plugin/src/main/java/de/pianoman911/mapengine/core/drawing/LayeredDrawingSpace.java b/plugin/src/main/java/de/pianoman911/mapengine/core/drawing/LayeredDrawingSpace.java
@@ -5,6 +5,7 @@
 import de.pianoman911.mapengine.api.pipeline.IPipelineContext;
 import de.pianoman911.mapengine.api.util.FullSpacedColorBuffer;
 import de.pianoman911.mapengine.core.pipeline.PipelineContext;
+import it.unimi.dsi.fastutil.Pair;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,8 +16,8 @@ public class LayeredDrawingSpace implements ILayeredDrawingSpace {
     private final FullSpacedColorBuffer resultBuffer;
     private final PipelineContext context;
 
-    public LayeredDrawingSpace(FullSpacedColorBuffer resultSpace, PipelineContext context) {
-        this.resultBuffer = resultSpace;
+    public LayeredDrawingSpace(FullSpacedColorBuffer initialBuffer, PipelineContext context) {
+        this.resultBuffer = initialBuffer;
         this.context = context;
     }
 
@@ -30,6 +31,24 @@ public FullSpacedColorBuffer resultBuffer() {
         return resultBuffer;
     }
 
+    @Override
+    public Pair<FullSpacedColorBuffer, IPipelineContext> combined() {
+        return Pair.of(resultBuffer, context);
+    }
+
+    @Override
+    public FullSpacedColorBuffer buffer() {
+        if (layers.isEmpty()) {
+            return resultBuffer;
+        } else {
+            FullSpacedColorBuffer result = resultBuffer.copy();
+            for (IDrawingSpace layer : layers) {
+                result.buffer(layer.buffer(), 0, 0);
+            }
+            return result;
+        }
+    }
+
     @Override
     public IPipelineContext ctx() {
         return context;
@@ -42,7 +61,7 @@ public IDrawingSpace layer(int index) {
 
     @Override
     public IDrawingSpace newLayer() {
-        DrawingSpace drawingSpace = new DrawingSpace(resultBuffer, context);
+        DrawingSpace drawingSpace = new DrawingSpace(resultBuffer.copy(), context);
         layers.add(drawingSpace);
         return drawingSpace;
     }