Skip to content

Commit f53935c

Browse files
committed
Fix broken image save
1 parent 4b168d0 commit f53935c

5 files changed

Lines changed: 839 additions & 675 deletions

File tree

lib/picrate/app.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def post_initialize(_args); end
149149
def data_path(dat)
150150
dat_root = File.join(SKETCH_ROOT, 'data')
151151
Dir.mkdir(dat_root) unless File.exist?(dat_root)
152-
File.join(dat_root, dat)
152+
File.join(dat_root, dat).to_java(:string)
153153
end
154154

155155
private

src/main/java/monkstone/noise/NoiseGenerator.java

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,45 @@ public class NoiseGenerator implements Noise {
1616
private Long seed;
1717

1818
public NoiseGenerator() {
19-
seed = System.currentTimeMillis();
19+
seed = System.currentTimeMillis();
2020
this.implementation = new OpenSimplex2F(seed);
2121
this.mode = NoiseMode.DEFAULT;
2222
}
2323

2424
@Override
2525
public void noiseMode(NoiseMode mode) {
26-
if (this.mode != mode && this.mode != NoiseMode.DEFAULT) {
27-
this.implementation = new OpenSimplex2F(seed);
28-
this.mode = NoiseMode.DEFAULT;
29-
}
30-
if (this.mode != mode && this.mode != NoiseMode.OPEN_SMOOTH) {
31-
this.implementation = new OpenSimplex2S(seed);
32-
this.mode = NoiseMode.OPEN_SMOOTH;
33-
}
34-
if (this.mode != mode && this.mode != NoiseMode.FAST_TERRAIN) {
35-
this.implementation = new FastTerrain(seed);
36-
this.mode = NoiseMode.FAST_TERRAIN;
37-
}
38-
39-
if (this.mode != mode && this.mode != NoiseMode.SMOOTH_TERRAIN) {
40-
this.implementation = new SmoothTerrain(seed);
41-
this.mode = NoiseMode.SMOOTH_TERRAIN;
26+
switch (mode) {
27+
case DEFAULT:
28+
if (this.mode != NoiseMode.DEFAULT) {
29+
this.implementation = new OpenSimplex2F(seed);
30+
this.mode = NoiseMode.DEFAULT;
31+
}
32+
break;
33+
case OPEN_SMOOTH:
34+
if (this.mode != NoiseMode.OPEN_SMOOTH) {
35+
this.implementation = new OpenSimplex2S(seed);
36+
this.mode = NoiseMode.OPEN_SMOOTH;
37+
break;
38+
}
39+
case SMOOTH_TERRAIN:
40+
if (this.mode != NoiseMode.SMOOTH_TERRAIN) {
41+
this.implementation = new SmoothTerrain(seed);
42+
this.mode = NoiseMode.SMOOTH_TERRAIN;
43+
}
44+
break;
45+
case FAST_TERRAIN:
46+
if (this.mode != NoiseMode.FAST_TERRAIN) {
47+
this.implementation = new FastTerrain(seed);
48+
this.mode = NoiseMode.FAST_TERRAIN;
49+
}
50+
break;
51+
default:
52+
this.implementation = new OpenSimplex2F(seed);
53+
this.mode = NoiseMode.DEFAULT;
4254
}
4355
}
4456

45-
public NoiseMode noiseMode(){
57+
public NoiseMode noiseMode() {
4658
return this.mode;
4759
}
4860

@@ -60,5 +72,4 @@ public float noise(float x, float y, float z, float w) {
6072
public void noiseSeed(long seed) {
6173
this.seed = seed;
6274
}
63-
6475
}

0 commit comments

Comments
 (0)