Skip to content

Commit c865a84

Browse files
committed
get ready for merge
1 parent db0917c commit c865a84

File tree

6 files changed

+18
-21
lines changed

6 files changed

+18
-21
lines changed

README.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ adjust above for your OS/distro setup.
88

99
## Requirements
1010

11-
There may be a linker issue with P2D or P3D sketches with stock openjdk with some linux distros, in which case you might find [Adopt open jdk binaries][adopt] will work for you.
11+
Previously there has been linker issue with P2D or P3D sketches with stock openjdk with some linux distros, but that seems to have gone away. [Adopt open jdk binaries][adopt] have always worked.
1212

1313
- `jdk-11.0.7+`
14-
- `jruby-9.2.14.0`
15-
16-
Currently you can ignore `illegal reflective access` warnings, see [here how to suppress them][warning].
14+
- `jruby-9.2.16.0`
1715

1816
## Building and testing
1917

@@ -27,10 +25,10 @@ rake javadoc
2725

2826
```bash
2927
jgem install propane # from rubygems
30-
jgem install propane-3.6.0-java.gem # local install
28+
jgem install propane-3.8.0-java.gem # local install
3129
# Alternative
3230
jruby -S gem install propane # from rubygems
33-
jruby -S gem install propane-3.6.0-java.gem # local install
31+
jruby -S gem install propane-3.8.0-java.gem # local install
3432
```
3533

3634
## Check Install
@@ -39,11 +37,6 @@ To check version and confirm gem bin files are on your path (also checks JDK ver
3937
```bash
4038
propane --version
4139
```
42-
43-
## Suppressing Reflective Access warnings
44-
45-
Since propane-3.5.0 it is possible to suppress reflective access warnings by setting JAVA_HOME environmental variable jruby does the rest.
46-
4740
## Usage
4841

4942
A propane sketch:-
@@ -100,7 +93,7 @@ See [gh-pages][gh-pages] for more detailed instructions and much more.
10093
```bash
10194
propane --install samples
10295
```
103-
please move existing `propane_samples` if you wish to keep them. The current release features several PixelFlow glsl library examples, including a few shadertoy demos as sketches.
96+
please move existing `propane_samples` if you wish to keep them. The current release features some noise sketches that exploit the new choice of noise implementation.
10497

10598
[adopt]: https://adoptopenjdk.net/
10699
[building]:http://ruby-processing.github.io/building/building/

pom.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
4747
'jruby.api' => 'http://jruby.org/apidocs/')
4848

49-
pom 'org.jruby:jruby:9.2.15.0'
49+
pom 'org.jruby:jruby:9.2.16.0'
5050
jar 'org.processing:video:3.3.7' # only for compiling
5151
jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
5252
jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
1111
<modelVersion>4.0.0</modelVersion>
1212
<groupId>propane</groupId>
1313
<artifactId>propane</artifactId>
14-
<version>3.7.1</version>
14+
<version>3.8.0</version>
1515
<name>propane</name>
1616
<description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
1717
<url>https://github.com/monkstone/propane</url>
@@ -74,7 +74,7 @@ DO NOT MODIFIY - GENERATED CODE
7474
<dependency>
7575
<groupId>org.jruby</groupId>
7676
<artifactId>jruby</artifactId>
77-
<version>9.2.15.0</version>
77+
<version>9.2.16.0</version>
7878
<type>pom</type>
7979
</dependency>
8080
<dependency>

propane.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Gem::Specification.new do |gem|
2121
gem.files << 'lib/jogl-all.jar'
2222
gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'
2323
gem.files << 'lib/gluegen-rt-natives-macosx-universal.jar'
24-
gem.files << 'lib/gluegen-rt-natives-ios-arm64.jar'
24+
# gem.files << 'lib/gluegen-rt-natives-ios-arm64.jar'
2525
gem.files << 'lib/gluegen-rt-natives-windows-amd64.jar'
2626
gem.files << 'lib/jogl-all-natives-linux-amd64.jar'
2727
gem.files << 'lib/jogl-all-natives-macosx-universal.jar'
28-
gem.files << 'lib/jogl-all-natives-ios-arm64.jar'
28+
# gem.files << 'lib/jogl-all-natives-ios-arm64.jar'
2929
gem.files << 'lib/jogl-all-natives-windows-amd64.jar'
3030
gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
3131
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})

src/main/java/processing/core/PApplet.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public class PApplet implements PConstants {
121121
*/
122122
static public boolean useNativeSelect = true;
123123

124-
Noise noiseGenerator = new NoiseGenerator(new ValueNoise());
124+
Noise noiseGenerator = new NoiseGenerator();
125125

126126
/**
127127
* The PGraphics renderer associated with this PApplet
@@ -4911,11 +4911,15 @@ public final void randomSeed(long seed) {
49114911
}
49124912
internalRandom.setSeed(seed);
49134913
}
4914+
4915+
public void simplexNoise(boolean simplex){
4916+
Noise implement = (simplex) ? new SimplexNoise() : new ValueNoise();
4917+
noiseGenerator = new NoiseGenerator(implement);
4918+
}
49144919

49154920
/**
49164921
*/
49174922
public float noise(float x) {
4918-
// is this legit? it's a dumb way to do it (but repair it later)
49194923
return noiseGenerator.noise(x);
49204924
}
49214925

src/main/java/processing/core/PGraphics.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,8 +626,8 @@ public class PGraphics extends PImage implements PConstants {
626626
sinLUT = new float[SINCOS_LENGTH];
627627
cosLUT = new float[SINCOS_LENGTH];
628628
for (int i = 0; i < SINCOS_LENGTH; i++) {
629-
sinLUT[i] = (float) Math.sin(i * DEG_TO_RAD * SINCOS_PRECISION);
630-
cosLUT[i] = (float) Math.cos(i * DEG_TO_RAD * SINCOS_PRECISION);
629+
sinLUT[i] = (float) Math.sin(Math.toRadians(i * SINCOS_PRECISION));
630+
cosLUT[i] = (float) Math.cos(Math.toRadians(i * SINCOS_PRECISION));
631631
}
632632
}
633633

0 commit comments

Comments
 (0)