Skip to content

Commit d7bec0d

Browse files
committed
Added Snowfield sprite to standalone effect factory
1 parent 0da9979 commit d7bec0d

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

src/main/java/com/chrisnewland/demofx/effect/effectfactory/ChristmasFXScriptFactory.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2017 Chris Newland.
2+
* Copyright (c) 2017 Chris Newland.
33
* Licensed under https://github.com/chriswhocodes/demofx/blob/master/LICENSE-BSD
44
*/
55
package com.chrisnewland.demofx.effect.effectfactory;
@@ -10,7 +10,7 @@
1010
import com.chrisnewland.demofx.DemoConfig;
1111
import com.chrisnewland.demofx.effect.IEffect;
1212
import com.chrisnewland.demofx.effect.fade.FadeOutEffect;
13-
import com.chrisnewland.demofx.effect.fake3d.SnowField;
13+
import com.chrisnewland.demofx.effect.fake3d.SnowfieldSprite;
1414
import com.chrisnewland.demofx.effect.ray.RayTrace;
1515
import com.chrisnewland.demofx.effect.real3d.TexturedCube;
1616
import com.chrisnewland.demofx.effect.text.TextWaveSprite;
@@ -38,7 +38,7 @@ public List<IEffect> getEffects(DemoConfig config)
3838
long length = 48_000;
3939

4040
addEffect(0, length, new RayTrace(config));
41-
addEffect(0, length, new SnowField(config, 8000, snowflake));
41+
addEffect(0, length, new SnowfieldSprite(config, 8000, snowflake));
4242

4343
addEffect(0, length, new TexturedCube(config, paper, 240, 1, 1, 240, 480, 32, 32));
4444

@@ -60,4 +60,4 @@ private void addEffect(long start, long duration, IEffect effect)
6060

6161
System.out.println("Adding " + start + " to " + (start + duration) + " " + effect.getClass().getName());
6262
}
63-
}
63+
}

src/main/java/com/chrisnewland/demofx/effect/effectfactory/SimpleEffectFactory.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.chrisnewland.demofx.effect.fake3d.Sheet;
1717
import com.chrisnewland.demofx.effect.fake3d.Sprite3D;
1818
import com.chrisnewland.demofx.effect.fake3d.Starfield;
19+
import com.chrisnewland.demofx.effect.fake3d.SnowfieldSprite;
1920
import com.chrisnewland.demofx.effect.fake3d.StarfieldSprite;
2021
import com.chrisnewland.demofx.effect.fake3d.Tunnel;
2122
import com.chrisnewland.demofx.effect.fractal.ChristmasTrees;
@@ -162,6 +163,7 @@ public List<IEffect> getEffects(DemoConfig config)
162163
availableEffectNames.add("squares");
163164
availableEffectNames.add("stars");
164165
availableEffectNames.add("starfield");
166+
availableEffectNames.add("snowfieldsprite");
165167
availableEffectNames.add("starfieldsprite");
166168
availableEffectNames.add("textbounce");
167169
availableEffectNames.add("texcube");
@@ -202,7 +204,7 @@ private IEffect getEffect(String name, DemoConfig config)
202204

203205
case "binarybackground":
204206
return new BinaryBackground(config);
205-
207+
206208
case "blur":
207209
return new Blur(config);
208210

@@ -220,7 +222,7 @@ private IEffect getEffect(String name, DemoConfig config)
220222

221223
case "chord":
222224
return new Chord(config);
223-
225+
224226
case "christmastrees":
225227
return new ChristmasTrees(config);
226228

@@ -271,7 +273,7 @@ private IEffect getEffect(String name, DemoConfig config)
271273

272274
case "gc":
273275
return new GCVisualiser(config);
274-
276+
275277
case "glowboard":
276278
return new Glowboard(config);
277279

@@ -353,6 +355,9 @@ private IEffect getEffect(String name, DemoConfig config)
353355
case "sierpinski":
354356
return new Sierpinski(config);
355357

358+
case "snowfieldsprite":
359+
return new SnowfieldSprite(config);
360+
356361
case "spin":
357362
return new Spin(config);
358363

src/main/java/com/chrisnewland/demofx/effect/fake3d/SnowField.java renamed to src/main/java/com/chrisnewland/demofx/effect/fake3d/SnowfieldSprite.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2016 Chris Newland.
2+
* Copyright (c) 2017 Chris Newland.
33
* Licensed under https://github.com/chriswhocodes/demofx/blob/master/LICENSE-BSD
44
*/
55
package com.chrisnewland.demofx.effect.fake3d;
@@ -10,7 +10,7 @@
1010

1111
import javafx.scene.image.Image;
1212

13-
public class SnowField extends AbstractEffect
13+
public class SnowfieldSprite extends AbstractEffect
1414
{
1515
private double[] starX;
1616
private double[] starY;
@@ -23,14 +23,11 @@ public class SnowField extends AbstractEffect
2323

2424
private double sine = 0;
2525

26-
// private static final double SPEED = 0.01;
27-
// private static final double MAX_DEPTH = 5;
28-
2926
private boolean spin = true;
3027

31-
private Image sprite = ImageUtil.loadImageFromResources("starshine.png");
28+
private Image sprite = ImageUtil.loadImageFromResources("flake.png");
3229

33-
public SnowField(DemoConfig config)
30+
public SnowfieldSprite(DemoConfig config)
3431
{
3532
super(config);
3633

@@ -42,7 +39,7 @@ public SnowField(DemoConfig config)
4239
init();
4340
}
4441

45-
public SnowField(DemoConfig config, int starCount, Image sprite)
42+
public SnowfieldSprite(DemoConfig config, int starCount, Image sprite)
4643
{
4744
super(config);
4845

@@ -53,7 +50,7 @@ public SnowField(DemoConfig config, int starCount, Image sprite)
5350
init();
5451
}
5552

56-
public SnowField(DemoConfig config, int starCount, long startMillis, long stopMillis)
53+
public SnowfieldSprite(DemoConfig config, int starCount, long startMillis, long stopMillis)
5754
{
5855
super(config);
5956

@@ -165,4 +162,4 @@ else if (x > width)
165162
gc.drawImage(sprite, x, y, size, size);
166163
}
167164
}
168-
}
165+
}

0 commit comments

Comments
 (0)