improve pen and fix null pointer in isTouchingSprite

Author: mikebarkmin

CHANGELOG.md

@@ -3,6 +3,13 @@ name: Changelog
 index: 4
 ---
 
+## 3.2.2
+
+- 🎨 Visual: Improve Pen rendering
+- 🐎 Perf: Pen does not draw everything again, but only the last additions.
+- 🐛 Fix: isTouchingSprite threw an error, if a sprite did not have a costume.
+- 🐛 Fix: exit method not found for Window class.
+
 ## 3.2.1
 
 -  🐛 Fix: Pen only drawing dots

docs/en/archives/Halloween/HalloweenStage.java

@@ -7,7 +7,7 @@ public class HalloweenStage extends Stage
     GhostSprite ghost;
 
     public HalloweenStage() {
-        super(400, 400, Renderer.P2D);
+        super(400, 400);
         this.addBackdrop("bg", "sprites/background.jpg");
         this.addSound("bg", "sounds/background.wav");
 
@@ -25,4 +25,8 @@ public HalloweenStage() {
     public void run() {
         this.playSound("bg");
     }
+
+    public static void main(String[] args) {
+        new HalloweenStage();
+    }
 }

examples/reference/AnimatedSpritePlayAnimation.gif

@@ -673,9 +673,11 @@ public boolean isTouchingMousePointer() {
       int relativeMouseX = Math.round(mouse[0] - topLeftCornerX);
       int relativeMouseY = Math.round(mouse[1] - topLeftCornerY);
 
-      int color = this.costumes.get(this.getCurrentCostumeIndex())
-          .getPixel(relativeMouseX, relativeMouseY);
-      return Applet.getInstance().alpha(color) != 0;
+      if (this.costumes.size() > this.getCurrentCostumeIndex()) {
+        int color = this.costumes.get(this.getCurrentCostumeIndex())
+            .getPixel(relativeMouseX, relativeMouseY);
+        return Applet.getInstance().alpha(color) != 0;
+      }
     }
 
     return false;
@@ -688,7 +690,10 @@ public boolean isTouchingMousePointer() {
    * @return true if outside
    */
   public boolean isTouchingEdge() {
-    Image currentCostume = this.costumes.get(this.getCurrentCostumeIndex());
+    Image currentCostume = null;
+    if (this.costumes.size() > this.getCurrentCostumeIndex()) {
+      currentCostume = this.costumes.get(this.getCurrentCostumeIndex());
+    }
     PApplet parent = Applet.getInstance();
     float costumeWidth = currentCostume != null
         ? currentCostume.getWidth()

examples/reference/StageDebug.gif

@@ -1,5 +1,6 @@
 package org.openpatch.scratch;
 
+import processing.core.PConstants;
 import processing.core.PGraphics;
 import processing.event.KeyEvent;
 import processing.event.MouseEvent;
@@ -48,6 +49,7 @@ public Stage(int width, int height, boolean debug) {
         }
         Applet applet = Applet.getInstance();
         this.penBuffer = applet.createGraphics(applet.width, applet.height, applet.sketchRenderer());
+        this.penBuffer.smooth(8);
         this.timer = new ConcurrentHashMap<>();
         this.timer.put("default", new Timer());
         this.display = new Text(null, 0, applet.height, true, TextStyle.BOX);

src/org/openpatch/scratch/Sprite.java

@@ -63,4 +63,8 @@ public void switchStage(String name) {
     Applet.getInstance().switchStage(name);
   }
 
+  public void exit() {
+    Applet.getInstance().exit();
+  }
+
 }

src/org/openpatch/scratch/Stage.java

@@ -5,9 +5,10 @@
 import org.openpatch.scratch.Stage;
 import processing.core.PGraphics;
 
-import java.util.Stack;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 public class Pen implements Drawable {
     class Point {
@@ -29,8 +30,9 @@ class Point {
     private Color color = new Color(0);
     private float transparency = 255;
     private float size = 1;
-    private Stack<CopyOnWriteArrayList<Point>> pointsBuffer = new Stack<>();
+    private List<CopyOnWriteArrayList<Point>> pointsBuffer = new ArrayList<>();
     private boolean down = false;
+    private Point previousPoint = null;
     private Stage stage;
 
     public Pen() {
@@ -45,7 +47,7 @@ public Pen(Pen p) {
         this.color = new Color(p.color);
         this.size = p.size;
         this.transparency = p.transparency;
-        this.pointsBuffer = new Stack<>();
+        this.pointsBuffer = new ArrayList<>();
         this.pointsBuffer.add(new CopyOnWriteArrayList<>());
         this.down = p.down;
     }
@@ -145,7 +147,7 @@ public void changeTransparency(float step) {
      */
     public void setPosition(float x, float y) {
         if (this.down) {
-            if (this.pointsBuffer.empty()) {
+            if (this.pointsBuffer.isEmpty()) {
                 this.pointsBuffer.add(new CopyOnWriteArrayList<>());
             }
             this.pointsBuffer.get(this.pointsBuffer.size() - 1)
@@ -181,7 +183,8 @@ public void eraseAll() {
      * Draw the line which the pen has drawn.
      */
     public void draw() {
-        if (stage == null) return;
+        if (stage == null)
+            return;
         PGraphics buffer = stage.getPenBuffer();
         int pointsBufferSize = this.pointsBuffer.size();
         if (pointsBufferSize <= 0)
@@ -195,24 +198,25 @@ public void draw() {
             CopyOnWriteArrayList<Point> points = pointsBufferIter.next();
             Iterator<Point> pointsIter = points.iterator();
 
-            Point previousPoint = null;
-            int pointsSize = points.size();
             while (pointsIter.hasNext()) {
                 Point point = pointsIter.next();
-                if (pointsSize > 1 && previousPoint != null) {
+                if (previousPoint != null) {
                     buffer.stroke(point.color.getRed(), point.color.getGreen(), point.color.getBlue(), point.opacity);
                     buffer.strokeWeight(point.size);
                     buffer.line(previousPoint.x, previousPoint.y, point.x, point.y);
-                } else if (pointsSize == 1) {
+                } else if (previousPoint == null && !this.down) {
                     buffer.stroke(point.color.getRed(), point.color.getGreen(), point.color.getBlue(), point.opacity);
                     buffer.fill(point.color.getRed(), point.color.getGreen(), point.color.getBlue(), point.opacity);
                     buffer.strokeWeight(point.size);
                     buffer.circle(point.x, point.y, point.size);
                 }
                 previousPoint = point;
             }
-            if (!this.down) {
+            if (!this.down || pointsBufferIter.hasNext()) {
+                previousPoint = null;
                 pointsBufferIter.remove();
+            } else {
+                points.clear();
             }
         }
         buffer.endDraw();