fix: pen not behaving like scratch

mikebarkmin · mikebarkmin · commit 126c30f6a291 · 2024-04-14T14:53:12.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ name: Changelog
 index: 4
 ---
 
+## 4.8.0
+
+- 💥 BREAKING CHANGE: Pen behavior was changed to work more similar to the behavior of the scratch pen. 
+    - You should double the size of your pen in your sketches to get the same visuals as in the previous versions. 
+    - You should also put the pen down after you have set the initial position, since the pen now draws an initial point, when it is put down.
+
 ## 4.7.0
 
 - 🚀 Feat: Add methods to the text class to be more consistent with the sprite class in regard to positioning.
diff --git a/examples/java/RainbowVine/RainbowVine.java b/examples/java/RainbowVine/RainbowVine.java
@@ -37,12 +37,12 @@ class LeafSprite extends Sprite {
 
   public LeafSprite(VineSprite vine) {
     this.vine = vine;
-    this.getPen().down();
     this.getPen().setSize(2);
     this.setDirection(vine.getDirection());
     this.getPen().setColor(vine.getPen().getColor());
     vine.getPen().changeColor(2);
     this.setPosition(vine.getX(), vine.getY());
+    this.getPen().down();
   }
 
   public void run() {
diff --git a/examples/java/RainbowVine/package.bluej b/examples/java/RainbowVine/package.bluej
@@ -0,0 +1,27 @@
+#BlueJ package file
+objectbench.height=93
+objectbench.width=776
+package.divider.horizontal=0.6
+package.divider.vertical=0.7995991983967936
+package.editor.height=392
+package.editor.width=654
+package.editor.x=498
+package.editor.y=242
+package.frame.height=600
+package.frame.width=800
+package.numDependencies=0
+package.numTargets=1
+package.showExtends=true
+package.showUses=true
+readme.height=60
+readme.name=@README
+readme.width=49
+readme.x=10
+readme.y=10
+target1.height=70
+target1.name=RainbowVine
+target1.showInterface=false
+target1.type=ClassTarget
+target1.width=120
+target1.x=10
+target1.y=110
diff --git a/examples/java/RandomDot/RandomDot.java b/examples/java/RandomDot/RandomDot.java
@@ -17,11 +17,11 @@ public static void main(String[] args) {
 class RandomDotSprite extends Sprite {
   public void run() {
     if (this.getTimer().everyMillis(100)) {
-      this.getPen().down();
-      this.getPen().setSize(10);
+      this.getPen().up();
+      this.getPen().setSize(20);
       this.goToRandomPosition();
       this.getPen().changeColor(2);
-      this.getPen().up();
+      this.getPen().down();
     }
   }
 }
diff --git a/examples/java/RandomDot/package.bluej b/examples/java/RandomDot/package.bluej
@@ -0,0 +1,27 @@
+#BlueJ package file
+objectbench.height=93
+objectbench.width=776
+package.divider.horizontal=0.6
+package.divider.vertical=0.7995991983967936
+package.editor.height=392
+package.editor.width=654
+package.editor.x=494
+package.editor.y=151
+package.frame.height=600
+package.frame.width=800
+package.numDependencies=0
+package.numTargets=1
+package.showExtends=true
+package.showUses=true
+readme.height=60
+readme.name=@README
+readme.width=49
+readme.x=10
+readme.y=10
+target1.height=70
+target1.name=RandomDot
+target1.showInterface=false
+target1.type=ClassTarget
+target1.width=120
+target1.x=10
+target1.y=110
diff --git a/examples/java/TimedDot/TimedDot.java b/examples/java/TimedDot/TimedDot.java
@@ -24,22 +24,22 @@ public DotSprite() {
     super();
     this.addTimer("timer2");
     this.addTimer("timer1");
-    this.getPen().setSize(20);
+    this.getPen().setSize(40);
     this.setOnEdgeBounce(true);
     this.setDirection(65);
   }
 
   public void run() {
     if (this.getTimer("timer2").everyMillis(600)) {
-      this.getPen().down();
       this.getPen().setColor(200);
       this.move(20);
+      this.getPen().down();
       this.getPen().up();
     }
     if (this.getTimer("timer1").everyMillis(1200)) {
-      this.getPen().down();
       this.getPen().setColor(100);
       this.move(20);
+      this.getPen().down();
       this.getPen().up();
     }
   }
diff --git a/examples/java/Timer/Timer.java b/examples/java/Timer/Timer.java
@@ -19,7 +19,7 @@ class TimerSprite extends Sprite {
 
   public TimerSprite() {
     super();
-    this.getPen().setSize(20);
+    this.getPen().setSize(40);
 
     this.addTimer("every");
     this.addTimer("for");
@@ -34,52 +34,51 @@ public void run() {
     int y = -140;
     this.x += 20;
     if (this.getTimer("every").everyMillis(600)) {
-      this.getPen().down();
       this.getPen().setColor(20);
       this.setPosition(this.x, y);
+      this.getPen().down();
       this.getPen().up();
     }
     y += 40;
     if (this.getTimer("for").forMillis(600)) {
-      this.getPen().down();
       this.getPen().setColor(60);
       this.setPosition(this.x, y);
+      this.getPen().down();
       this.getPen().up();
     }
     y += 40;
     if (this.getTimer("after").afterMillis(600)) {
-      this.getPen().down();
       this.getPen().setColor(100);
       this.setPosition(this.x, y);
+      this.getPen().down();
       this.getPen().up();
     }
     y += 40;
     if (this.getTimer("interval1").intervalMillis(600)) {
-      this.getPen().down();
-
       this.getPen().setColor(140);
       this.setPosition(this.x, y);
+      this.getPen().down();
       this.getPen().up();
     }
     y += 40;
     if (this.getTimer("interval2").intervalMillis(600, true)) {
-      this.getPen().down();
       this.getPen().setColor(180);
       this.setPosition(this.x, y);
+      this.getPen().down();
       this.getPen().up();
     }
     y += 40;
     if (this.getTimer("interval3").intervalMillis(600, 300)) {
-      this.getPen().down();
       this.getPen().setColor(220);
       this.setPosition(this.x, y);
+      this.getPen().down();
       this.getPen().up();
     }
     y += 40;
     if (this.getTimer("interval4").intervalMillis(600, 300, true)) {
-      this.getPen().down();
       this.getPen().setColor(255);
       this.setPosition(this.x, y);
+      this.getPen().down();
       this.getPen().up();
     }
   }
diff --git a/examples/java/package.bluej b/examples/java/package.bluej
@@ -0,0 +1,115 @@
+#BlueJ package file
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
+objectbench.height=93
+objectbench.width=1076
+package.divider.horizontal=0.6
+package.divider.vertical=0.7995991983967936
+package.editor.height=392
+package.editor.width=940
+package.editor.x=472
+package.editor.y=131
+package.frame.height=600
+package.frame.width=1100
+package.numDependencies=0
+package.numTargets=15
+package.showExtends=true
+package.showUses=true
+project.charset=UTF-8
+readme.height=60
+readme.name=@README
+readme.width=49
+readme.x=10
+readme.y=10
+target1.height=82
+target1.name=StressTest
+target1.type=PackageTarget
+target1.width=120
+target1.x=10
+target1.y=210
+target10.height=82
+target10.name=Cat
+target10.type=PackageTarget
+target10.width=120
+target10.x=460
+target10.y=170
+target11.height=82
+target11.name=RandomDot
+target11.type=PackageTarget
+target11.width=120
+target11.x=490
+target11.y=60
+target12.height=82
+target12.name=Pipes
+target12.type=PackageTarget
+target12.width=120
+target12.x=340
+target12.y=200
+target13.height=82
+target13.name=Robot
+target13.type=PackageTarget
+target13.width=120
+target13.x=290
+target13.y=320
+target14.height=82
+target14.name=TimedDot
+target14.type=PackageTarget
+target14.width=120
+target14.x=20
+target14.y=130
+target15.height=82
+target15.name=DonutIO
+target15.type=PackageTarget
+target15.width=120
+target15.x=170
+target15.y=210
+target2.height=82
+target2.name=Shakespeare
+target2.type=PackageTarget
+target2.width=120
+target2.x=570
+target2.y=210
+target3.height=82
+target3.name=Tiled
+target3.type=PackageTarget
+target3.width=120
+target3.x=310
+target3.y=0
+target4.height=82
+target4.name=Sensing
+target4.type=PackageTarget
+target4.width=120
+target4.x=450
+target4.y=290
+target5.height=82
+target5.name=RainbowVine
+target5.type=PackageTarget
+target5.width=120
+target5.x=320
+target5.y=90
+target6.height=82
+target6.name=Saving
+target6.type=PackageTarget
+target6.width=120
+target6.x=10
+target6.y=310
+target7.height=82
+target7.name=Clock
+target7.type=PackageTarget
+target7.width=120
+target7.x=140
+target7.y=310
+target8.height=82
+target8.name=Timer
+target8.type=PackageTarget
+target8.width=120
+target8.x=130
+target8.y=10
+target9.height=82
+target9.name=SmartRocket
+target9.type=PackageTarget
+target9.width=120
+target9.x=170
+target9.y=90
diff --git a/resources/build.properties b/resources/build.properties
@@ -1,6 +1,6 @@
 # Set the java version that should be used to compile your Library.
 
-java.target.version=11
+java.target.version=17
 
 
 # Set the description of the Ant build.xml file.
@@ -40,7 +40,7 @@ author.url=https://openpatch.org
 # This is NOT a direct link to where to download it.
 
 library.url=https://github.com/openpatch/scratch-for-java
-library.version=4.5.0
+library.version=4.8.0
 
 
 # Set the category (or categories) of your Library from the following list:
@@ -73,7 +73,7 @@ source.repository=https://github.com/openpatch/scratch-for-java.git
 
 # Additional information for the generated webpage.
 
-library.copyright=(c) 2023
+library.copyright=(c) 2024
 library.dependencies=processing-sound
 library.keywords=scratch
 
diff --git a/src/org/openpatch/scratch/extensions/pen/Pen.java b/src/org/openpatch/scratch/extensions/pen/Pen.java

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ public static void main(String[] args) {`
`17`	`17`	`class RandomDotSprite extends Sprite {`
`18`	`18`	`public void run() {`
`19`	`19`	`if (this.getTimer().everyMillis(100)) {`
`20`		`- this.getPen().down();`
`21`		`- this.getPen().setSize(10);`
	`20`	`+ this.getPen().up();`
	`21`	`+ this.getPen().setSize(20);`
`22`	`22`	`this.goToRandomPosition();`
`23`	`23`	`this.getPen().changeColor(2);`
`24`		`- this.getPen().up();`
	`24`	`+ this.getPen().down();`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`