Skip to content

Commit 32107f4

Browse files
mikebarkminmikebarkmin
committed
update dependencies
1 parent c17bb63 commit 32107f4

4 files changed

Lines changed: 46 additions & 35 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ name: Changelog
33
index: 4
44
---
55

6+
## 3.4.0
7+
8+
- 🧹 Chore: Update Processing core to version 4.2
9+
- 💻 OS: Added MacOS aarch64 version
10+
611
## 3.3.0
712

813
- 🚀 Feat: Added `isSoundPlaying` and `stopSound` to the Sprite and Stage Class.

‎resources/build.xml‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
<mkdir dir="${project.bin}" />
8989
<mkdir dir="${project.libs}" />
9090
<mkdir dir="${project.libs}/windows-amd64" />
91-
<mkdir dir="${project.libs}/macosx-universal" />
91+
<mkdir dir="${project.libs}/macos-x86_64" />
92+
<mkdir dir="${project.libs}/macos-aarch64" />
9293
<mkdir dir="${project.libs}/linux-amd64" />
9394
</target>
9495

@@ -98,59 +99,48 @@
9899

99100
<echo message="download dependencies ..." />
100101

102+
103+
<property name="jogl.url"
104+
value="https://download.processing.org/jogl/v2.4.0-rc-20210111y" />
105+
101106
<get dest="${project.libs}" skipexisting="true" ignoreerrors="true">
102107
<url
103-
url="https://github.com/micycle1/processing-core-4/releases/download/4.0.1/original-core-4.0.1.jar" />
104-
<url
105-
url="https://jogamp.org/deployment/archive/master/gluegen_951-joal_669-jogl_1517-jocl_1157/jar/jogl-all.jar" />
106-
<url
107-
url="https://jogamp.org/deployment/archive/master/gluegen_951-joal_669-jogl_1517-jocl_1157/jar/gluegen-rt.jar" />
108+
url="https://github.com/micycle1/processing-core-4/releases/download/4.2/core-4.2.jar" />
109+
<url url="${jogl.url}/gluegen-rt.jar" />
110+
<url url="${jogl.url}/jogl-all.jar" />
108111
<url
109112
url="https://github.com/processing/processing-sound/releases/download/v2.3.1/sound.zip" />
110113
<url url="https://github.com/java-native/jssc/releases/download/v2.9.4/jssc-2.9.4.jar" />
111114
<url url="https://repo1.maven.org/maven2/org/processing/serial/3.3.7/serial-3.3.7.jar" />
112115
<url url="https://repo1.maven.org/maven2/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar" />
113-
<url
114-
url="https://jogamp.org/deployment/archive/master/gluegen_951-joal_669-jogl_1517-jocl_1157/jar/gluegen.jar" />
115116
</get>
116117

117118
<get dest="${project.libs}/linux-amd64" skipexisting="true" ignoreerrors="true">
118119
<url
119-
url="https://jogamp.org/deployment/archive/master/gluegen_951-joal_669-jogl_1517-jocl_1157/jar/jogl-all-natives-linux-amd64.jar" />
120-
<url
121-
url="https://maven.scijava.org/content/repositories/public/org/jogamp/gluegen/gluegen-rt-natives-linux-amd64/2.1.5/gluegen-rt-natives-linux-amd64-2.1.5.jar" />
120+
url="https://download.processing.org/jogl/v2.4.0-rc-20210111y/gluegen-rt-natives-linux-amd64.jar" />
122121
<url
123-
url="https://jogamp.org/deployment/archive/master/gluegen_951-joal_669-jogl_1517-jocl_1157/jar/gluegen-rt-natives-linux-amd64.jar" />
124-
<url
125-
url="https://repo1.maven.org/maven2/org/openjfx/javafx-graphics/18.0.2/javafx-graphics-18.0.2-linux.jar" />
126-
<url
127-
url="https://repo1.maven.org/maven2/org/openjfx/javafx-base/18.0.2/javafx-base-18.0.2-linux.jar" />
122+
url="https://download.processing.org/jogl/v2.4.0-rc-20210111y/jogl-all-natives-linux-amd64.jar" />
128123
</get>
129124

130125
<get dest="${project.libs}/windows-amd64" skipexisting="true" ignoreerrors="true">
131126
<url
132-
url="https://jogamp.org/deployment/archive/master/gluegen_951-joal_669-jogl_1517-jocl_1157/jar/jogl-all-natives-windows-amd64.jar" />
133-
<url
134-
url="https://jogamp.org/deployment/archive/master/gluegen_951-joal_669-jogl_1517-jocl_1157/jar/gluegen-rt-natives-windows-amd64.jar" />
127+
url="https://download.processing.org/jogl/v2.4.0-rc-20210111y/gluegen-rt-natives-windows-amd64.jar" />
135128
<url
136-
url="https://repo1.maven.org/maven2/org/openjfx/javafx-controls/18.0.2/javafx-controls-18.0.2-win.jar" />
137-
<url
138-
url="https://repo1.maven.org/maven2/org/openjfx/javafx-graphics/18.0.2/javafx-graphics-18.0.2-win.jar" />
139-
<url
140-
url="https://repo1.maven.org/maven2/org/openjfx/javafx-base/18.0.2/javafx-base-18.0.2-win.jar" />
129+
url="https://download.processing.org/jogl/v2.4.0-rc-20210111y/jogl-all-natives-windows-amd64.jar" />
141130
</get>
142131

143-
<get dest="${project.libs}/macosx-universal" skipexisting="true" ignoreerrors="true">
144-
<url
145-
url="https://jogamp.org/deployment/archive/master/gluegen_951-joal_669-jogl_1517-jocl_1157/jar/jogl-all-natives-macosx-universal.jar" />
132+
<get dest="${project.libs}/macos-x86_64" skipexisting="true" ignoreerrors="true">
146133
<url
147-
url="https://jogamp.org/deployment/archive/master/gluegen_951-joal_669-jogl_1517-jocl_1157/jar/gluegen-rt-natives-macosx-universal.jar" />
134+
url="https://download.processing.org/jogl/v2.4.0-rc-20210111y/gluegen-rt-natives-macos-x86_64.jar" />
148135
<url
149-
url="https://repo1.maven.org/maven2/org/openjfx/javafx-controls/18.0.2/javafx-controls-18.0.2-mac.jar" />
136+
url="https://download.processing.org/jogl/v2.4.0-rc-20210111y/jogl-all-natives-macos-x86_64.jar" />
137+
</get>
138+
139+
<get dest="${project.libs}/macos-aarch64" skipexisting="true" ignoreerrors="true">
150140
<url
151-
url="https://repo1.maven.org/maven2/org/openjfx/javafx-graphics/18.0.2/javafx-graphics-18.0.2-mac.jar" />
141+
url="https://download.processing.org/jogl/v2.4.0-rc-20210111y/gluegen-rt-natives-macos-aarch64.jar" />
152142
<url
153-
url="https://repo1.maven.org/maven2/org/openjfx/javafx-base/18.0.2/javafx-base-18.0.2-mac.jar" />
143+
url="https://download.processing.org/jogl/v2.4.0-rc-20210111y/jogl-all-natives-macos-aarch64.jar" />
154144
</get>
155145

156146
<if>
@@ -248,10 +238,20 @@
248238
</jar>
249239

250240
<jar
251-
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-macosx-universal.jar"
241+
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-macos-x86_64.jar"
242+
basedir="${project.bin}">
243+
<zipgroupfileset dir="${project.libs}" includes="*.jar" />
244+
<zipgroupfileset dir="${project.libs}/macos-x86_64" includes="*.jar" />
245+
<manifest>
246+
<attribute name="Class-Path" value="${project.libs}" />
247+
</manifest>
248+
</jar>
249+
250+
<jar
251+
jarfile="${project.tmp}/${project.name}/${folder}/${project.jar.name}-macos-aarch64.jar"
252252
basedir="${project.bin}">
253253
<zipgroupfileset dir="${project.libs}" includes="*.jar" />
254-
<zipgroupfileset dir="${project.libs}/macosx-universal" includes="*.jar" />
254+
<zipgroupfileset dir="${project.libs}/macos-aarch64" includes="*.jar" />
255255
<manifest>
256256
<attribute name="Class-Path" value="${project.libs}" />
257257
</manifest>
@@ -297,7 +297,10 @@
297297
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-linux-amd64.jar"
298298
todir="${project.dist}" />
299299
<move
300-
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-macosx-universal.jar"
300+
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-macos-x86_64.jar"
301+
todir="${project.dist}" />
302+
<move
303+
file="${project.dist.version}/tmp/${project.name}/library/${project.jar.name}-macos-aarch64.jar"
301304
todir="${project.dist}" />
302305

303306
<copy file="resources/index.html" todir="${project.dist}" />

‎src/org/openpatch/scratch/Applet.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import processing.event.MouseEvent;
1515
import processing.sound.SoundFile;
1616

17+
import java.awt.Toolkit;
18+
1719
public class Applet extends PApplet {
1820
private final int INITIAL_HEIGHT;
1921
private boolean debug;
@@ -42,6 +44,7 @@ public Applet(int width, int height, String assets) {
4244
this.INITIAL_HEIGHT = height;
4345
this.INITIAL_WIDTH = width;
4446
this.assets = assets;
47+
4548
this.registerMethod("pre", this);
4649
this.registerMethod("mouseEvent", this);
4750
this.registerMethod("keyEvent", this);

‎src/org/openpatch/scratch/Stage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public Stage(int width, int height, boolean debug) {
5353
* Smooth does currently not work on Apple Silicon
5454
* https://github.com/processing/processing4/issues/694
5555
*/
56-
// this.penBuffer.smooth(8);
56+
this.penBuffer.smooth(8);
5757

5858
this.timer = new ConcurrentHashMap<>();
5959
this.timer.put("default", new Timer());

0 commit comments

Comments
 (0)