time defined tasks and pre paint tasks

chompa111 · Apr 24, 2023 · f889508 · f889508
1 parent a0793a2
commit f889508
Show file tree

Hide file tree

Showing 12 changed files with 103 additions and 101 deletions.
diff --git a/src/main/java/graphical/basics/behavior/Behavior.java b/src/main/java/graphical/basics/behavior/Behavior.java
diff --git a/src/main/java/graphical/basics/behavior/FollowBehavior.java b/src/main/java/graphical/basics/behavior/FollowBehavior.java
diff --git a/src/main/java/graphical/basics/gobject/AnimPart.java b/src/main/java/graphical/basics/gobject/AnimPart.java
@@ -1,7 +1,6 @@
 package graphical.basics.gobject;
 
 import graphical.basics.BackGround;
-import graphical.basics.behavior.Behavior;
 import graphical.basics.gobject.struct.Gobject;
 import graphical.basics.presentation.Presentation;
 import graphical.basics.presentation.PresentationConfig;
@@ -22,10 +21,6 @@ public void addBefore(Gobject referential, Gobject gobject) {
         Presentation.staticReference.addBefore(referential, gobject);
     }
 
-    public void add(Behavior behavior) {
-        Presentation.staticReference.add(behavior);
-    }
-
     public void remove(Gobject gobject) {
         Presentation.staticReference.remove(gobject);
     }

diff --git a/src/main/java/graphical/basics/gobject/struct/Gobject.java b/src/main/java/graphical/basics/gobject/struct/Gobject.java
@@ -1,16 +1,15 @@
 package graphical.basics.gobject.struct;
 
 
-import graphical.basics.gobject.Group;
-import graphical.basics.presentation.Positioning;
-import graphical.basics.presentation.Presentation;
 import graphical.basics.ColorHolder;
-import graphical.basics.behavior.Behavior;
-import graphical.basics.behavior.FollowBehavior;
+import graphical.basics.gobject.Group;
 import graphical.basics.location.Location;
 import graphical.basics.location.LocationPair;
 import graphical.basics.location.SupplierPoint;
+import graphical.basics.presentation.Positioning;
+import graphical.basics.presentation.Presentation;
 import graphical.basics.task.Task;
+import graphical.basics.task.TimeDefinedTask;
 import graphical.basics.task.transformation.gobject.ColorTranform;
 import graphical.basics.task.transformation.gobject.MorfTransform;
 import graphical.basics.task.transformation.gobject.PositionTransform;
@@ -22,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
 
 import static graphical.basics.presentation.Positioning.Reference.*;
 
@@ -32,8 +32,6 @@ public abstract class Gobject {
     public NumberHolder scale = new DoubleHolder(1);
 
     public void paint(Graphics g, boolean b) {
-
-
         var midpoint = getBorders().midPoint();
         var g2d = (Graphics2D) g;
         var oldT = (AffineTransform) g2d.getTransform().clone();
@@ -64,16 +62,16 @@ public void paint(Graphics g, boolean b) {
 
     public abstract List<Location> getReferenceLocations();
 
-    public Task transform(Gobject gobject2, int steps) {
+    public TimeDefinedTask transform(Gobject gobject2, int steps) {
         return new MorfTransform(this, gobject2, steps);
     }
 
-    public Task transform(Gobject gobject2) {
+    public TimeDefinedTask transform(Gobject gobject2) {
         return transform(gobject2, Presentation.staticReference.seconds(1));
     }
 
 
-    public Task changeColor(Color color, int steps) {
+    public TimeDefinedTask changeColor(Color color, int steps) {
         return new ColorTranform(this, color, steps);
     }
 
@@ -83,28 +81,28 @@ public void setColor(Color color) {
         }
     }
 
-    public Task changeColor(Color color) {
+    public TimeDefinedTask changeColor(Color color) {
         return changeColor(color, Presentation.staticReference.seconds(1));
     }
 
 
-    public Task move(double x, double y, int steps) {
+    public TimeDefinedTask move(double x, double y, int steps) {
         return new PositionTransform(this, x, y, steps);
     }
 
-    public Task move(double x, double y) {
+    public TimeDefinedTask move(double x, double y) {
         return move(x, y, Presentation.staticReference.seconds(1));
     }
 
-    public Task moveTo(Location location, int steps) {
+    public TimeDefinedTask moveTo(Location location, int steps) {
         var mylocation = getBorders().midPoint();
         var diffx = location.getX() - mylocation.getX();
         var diffy = location.getY() - mylocation.getY();
 
         return this.move(diffx, diffy, steps);
     }
 
-    public Task moveTo(Location location) {
+    public TimeDefinedTask moveTo(Location location) {
         return this.moveTo(location, Presentation.staticReference.seconds(1));
     }
 
@@ -123,21 +121,6 @@ public void setPositionTo(Location location) {
         changeSetPosition(diffx, diffy);
     }
 
-    public Behavior asSubtitle(Gobject gobject, Positioning.Reference reference) {
-        //por enquanto
-        switch (reference) {
-            case BOTTOM:
-                Positioning.align(gobject, this, BOTTOM);
-                return new FollowBehavior(gobject, new SupplierPoint(() -> Positioning.getPositionX(this, CENTER), () -> Positioning.getPositionY(this, BOTTOM)));
-            case RIGHT:
-                Positioning.align(gobject, this, LEFT);
-                return new FollowBehavior(gobject, new SupplierPoint(() -> Positioning.getPositionX(this, LEFT), () -> Positioning.getPositionY(this, CENTER)));
-        }
-
-        return new FollowBehavior(gobject, new SupplierPoint(() -> this.getBorders().midPoint().getX(), () -> this.getBorders().getL2().getY()));
-
-    }
-
     public AffineTransform getTranformation() {
 
         var midpoint = getBorders().midPoint();
@@ -226,4 +209,15 @@ public Group and(Gobject... gobjects) {
         return new Group(result);
     }
 
+    public Runnable addTask(Runnable task) {
+        return Presentation.staticReference.addTask(task);
+    }
+
+    public <T> Runnable addTask(T metadata, Consumer<T> task) {
+        return Presentation.staticReference.addTask(metadata, task);
+    }
+
+    public void removeTask(Runnable r) {
+        Presentation.staticReference.removeTask(r);
+    }
 }
diff --git a/src/main/java/graphical/basics/presentation/Animation.java b/src/main/java/graphical/basics/presentation/Animation.java
@@ -166,6 +166,12 @@ public static Task wooble(Gobject gobject) {
                         .andThen(gobject.getAngle().change(0.5, presentation.seconds(0.5))));
     }
 
+    public static Task wooble2(Gobject gobject) {
+        return gobject.getAngle().change(0.5).forSeconds(0.5)
+                .andThen(gobject.getAngle().change(-1.0).forSeconds(0.5)
+                        .andThen(gobject.getAngle().change(0.5).forSeconds(0.5)));
+    }
+
 
     public static Task t3b1b(Gobject a, Gobject b, int steps) {
         return T3b1b.t3b1b(a, b, steps);

diff --git a/src/main/java/graphical/basics/presentation/Presentation.java b/src/main/java/graphical/basics/presentation/Presentation.java
@@ -5,7 +5,6 @@
 import codec.engine.JavaGraphicEngine;
 import codec.engine.JavaNativeEngine;
 import graphical.basics.BackGround;
-import graphical.basics.behavior.Behavior;
 import graphical.basics.gobject.Camera;
 import graphical.basics.gobject.struct.Gobject;
 import graphical.basics.location.Location;
@@ -24,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
 
 import static javax.swing.WindowConstants.EXIT_ON_CLOSE;
 
@@ -48,7 +48,7 @@ public abstract class Presentation {
     JavaGraphicEngine graphicEngine;
 
     List<Gobject> gobjects = new ArrayList<>();
-    List<Behavior> behaviors = new ArrayList<>();
+    private final List<Runnable> prePaintTasks = new ArrayList<>();
 
     //FpsControler fpsControler = new FpsControler();
 
@@ -151,13 +151,13 @@ public void paint(Graphics g) {
             frame.setDefaultCloseOperation(EXIT_ON_CLOSE);
             frame.setVisible(true);
             frame.setTitle(" Saturn-preview ");
-
-            try {
-                var icn = ImageIO.read(new File("C:\\Users\\PICHAU\\Desktop\\saticon2.png"));
-                frame.setIconImage(icn);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+//
+//            try {
+//                var icn = ImageIO.read(new File("C:\\Users\\PICHAU\\Desktop\\saticon2.png"));
+//                frame.setIconImage(icn);
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
         } else {
             isDisablePreview = true;
         }
@@ -203,7 +203,7 @@ public void joinBackGroundTasks() {
 
 
     public void processFrame() {
-        runBehaviors();
+        prePaintTasks.forEach(Runnable::run);
         frameCounter++;
         paintComponent(bufferedGraphics);
         if (!isDisablePreview)
@@ -236,11 +236,6 @@ public void paintComponent(Graphics g) {
         g2d.setTransform(oldT);
     }
 
-    public void runBehaviors() {
-        for (Behavior behavior : behaviors) {
-            behavior.update();
-        }
-    }
 
     public void add(Gobject gobject) {
         gobjects.add(gobject);
@@ -254,10 +249,6 @@ public void addBefore(Gobject referential, Gobject gobject) {
         gobjects.add(gobjects.indexOf(referential), gobject);
     }
 
-    public void add(Behavior behavior) {
-        behaviors.add(behavior);
-    }
-
     public void remove(Gobject gobject) {
         gobjects.remove(gobject);
     }
@@ -354,4 +345,18 @@ public PresentationConfig getPresentationConfig() {
     public List<Gobject> getGobjects() {
         return gobjects;
     }
+
+    public Runnable addTask(Runnable task) {
+        prePaintTasks.add(task);
+
+        return task;
+    }
+
+    public <T> Runnable addTask(T metadata, Consumer<T> task) {
+        return addTask(() -> task.accept(metadata));
+    }
+
+    public void removeTask(Runnable r) {
+        prePaintTasks.remove(r);
+    }
 }
diff --git a/src/main/java/graphical/basics/task/TimeDefinedTask.java b/src/main/java/graphical/basics/task/TimeDefinedTask.java
@@ -0,0 +1,11 @@
+package graphical.basics.task;
+
+import graphical.basics.presentation.Presentation;
+
+public interface TimeDefinedTask extends Task{
+    default Task forSeconds(double seconds){
+        return forFrames(Presentation.staticReference.seconds(seconds));
+    }
+
+    Task forFrames(int frames);
+}
diff --git a/src/main/java/graphical/basics/task/transformation/gobject/ColorTranform.java b/src/main/java/graphical/basics/task/transformation/gobject/ColorTranform.java
@@ -3,11 +3,12 @@
 import graphical.basics.ColorHolder;
 import graphical.basics.gobject.struct.Gobject;
 import graphical.basics.task.Task;
+import graphical.basics.task.TimeDefinedTask;
 
 import java.awt.*;
 import java.util.List;
 
-public class ColorTranform implements Task {
+public class ColorTranform implements TimeDefinedTask {
 
     int steps;
     int stepCount;
@@ -85,4 +86,10 @@ public void step() {
     public boolean isDone() {
         return steps == stepCount;
     }
+
+    @Override
+    public Task forFrames(int frames) {
+        steps = frames;
+        return this;
+    }
 }
diff --git a/src/main/java/graphical/basics/task/transformation/gobject/MorfTransform.java b/src/main/java/graphical/basics/task/transformation/gobject/MorfTransform.java
@@ -5,13 +5,14 @@
 import graphical.basics.gobject.struct.Gobject;
 import graphical.basics.gobject.GobjectFrame;
 import graphical.basics.task.Task;
+import graphical.basics.task.TimeDefinedTask;
 
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-public class MorfTransform implements Task {
+public class MorfTransform implements TimeDefinedTask {
     Gobject g1;
     Gobject g2;
 
@@ -50,7 +51,7 @@ public void setup() {
         gf2 = new GobjectFrame(g2);
         refIndex = Presentation.staticReference.getObjectIndex(g1);
         Presentation.staticReference.remove(g1);
-        Presentation.staticReference.add(gf1,refIndex);
+        Presentation.staticReference.add(gf1, refIndex);
         // Presentation.staticReference.add(g2);
 
         colorHolders1 = new ArrayList<>();
@@ -188,7 +189,7 @@ public void step() {
 //            }
 
             Presentation.staticReference.remove(gf1);
-            Presentation.staticReference.add(g2,refIndex);
+            Presentation.staticReference.add(g2, refIndex);
         }
 
 
@@ -227,4 +228,9 @@ public boolean isDone() {
     }
 
 
+    @Override
+    public Task forFrames(int frames) {
+        this.steps = frames;
+        return this;
+    }
 }