Skip to content

Commit b4d4086

Browse files
JavaSaBrJavaSaBr
committed
updated the toneg0d.emitter library.
1 parent 1f1636e commit b4d4086

9 files changed

Lines changed: 41 additions & 47 deletions

File tree

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ dependencies {
128128
compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.4.2') {
129129
exclude group: 'org.jmonkeyengine'
130130
}
131-
compile ('com.github.JavaSaBr:tonegodemitter:2.2.4') {
131+
compile ('com.github.JavaSaBr:tonegodemitter:2.3.0') {
132132
exclude group: 'org.jmonkeyengine'
133133
}
134134

‎src/main/java/com/ss/editor/model/node/Toneg0dParticleInfluencers.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.ss.editor.model.node;
22

33
import org.jetbrains.annotations.NotNull;
4-
5-
import com.ss.rlib.util.array.Array;
64
import tonegod.emitter.ParticleEmitterNode;
75
import tonegod.emitter.influencers.ParticleInfluencer;
86

7+
import java.util.List;
8+
99
/**
1010
* The type Particle influencers.
1111
*
@@ -44,7 +44,7 @@ public ParticleEmitterNode getEmitterNode() {
4444
* @return the array of influencers.
4545
*/
4646
@NotNull
47-
public Array<ParticleInfluencer> getInfluencers() {
47+
public List<ParticleInfluencer> getInfluencers() {
4848
return emitterNode.getInfluencers();
4949
}
5050

‎src/main/java/com/ss/editor/ui/control/model/node/spatial/particle/emitter/toneg0d/influencer/Toneg0DParticleInfluencersTreeNode.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import tonegod.emitter.influencers.impl.*;
2626

2727
import java.lang.reflect.Constructor;
28+
import java.util.List;
2829

2930
/**
3031
* The implementation of the {@link TreeNode} for representing the {@link Toneg0dParticleInfluencers} in the editor.
@@ -96,8 +97,8 @@ public void fillContextMenu(@NotNull final NodeTree<?> nodeTree, @NotNull final
9697
public Array<TreeNode<?>> getChildren(@NotNull final NodeTree<?> nodeTree) {
9798
final Array<TreeNode<?>> result = ArrayFactory.newArray(TreeNode.class);
9899
final Toneg0dParticleInfluencers element = getElement();
99-
final Array<ParticleInfluencer> influencers = element.getInfluencers();
100-
influencers.forEach(result, (influencer, toStore) -> toStore.add(FACTORY_REGISTRY.createFor(influencer)));
100+
final List<ParticleInfluencer> influencers = element.getInfluencers();
101+
influencers.forEach(influencer -> result.add(FACTORY_REGISTRY.createFor(influencer)));
101102
return result;
102103
}
103104

‎src/main/java/com/ss/editor/ui/control/model/property/control/particle/influencer/interpolation/control/AlphaInfluencerControl.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
import com.ss.editor.Messages;
44
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
55
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.element.AlphaInterpolationElement;
6-
7-
import org.jetbrains.annotations.NotNull;
8-
9-
import javafx.scene.layout.VBox;
106
import com.ss.rlib.ui.util.FXUtils;
11-
import com.ss.rlib.util.array.Array;
7+
import javafx.scene.layout.VBox;
8+
import org.jetbrains.annotations.NotNull;
129
import tonegod.emitter.influencers.impl.AlphaInfluencer;
1310
import tonegod.emitter.interpolation.Interpolation;
1411

12+
import java.util.List;
13+
1514
/**
1615
* The control for editing alphas in the {@link AlphaInfluencer}.
1716
*
@@ -54,7 +53,7 @@ public void requestToChange(@NotNull final Float newValue, final int index) {
5453
@Override
5554
protected void fillControl(@NotNull final AlphaInfluencer influencer, @NotNull final VBox root) {
5655

57-
final Array<Float> alphas = influencer.getAlphas();
56+
final List<Float> alphas = influencer.getAlphas();
5857

5958
for (int i = 0, length = alphas.size(); i < length; i++) {
6059

@@ -80,7 +79,7 @@ protected void processAdd() {
8079
protected void processRemove() {
8180

8281
final AlphaInfluencer influencer = getInfluencer();
83-
final Array<Float> alphas = influencer.getAlphas();
82+
final List<Float> alphas = influencer.getAlphas();
8483

8584
final Float alpha = influencer.getAlpha(alphas.size() - 1);
8685
final Interpolation interpolation = influencer.getInterpolation(alphas.size() - 1);

‎src/main/java/com/ss/editor/ui/control/model/property/control/particle/influencer/interpolation/control/ColorInfluencerControl.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
import com.ss.editor.Messages;
55
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
66
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.element.ColorInterpolationElement;
7-
8-
import org.jetbrains.annotations.NotNull;
9-
10-
import javafx.scene.layout.VBox;
117
import com.ss.rlib.ui.util.FXUtils;
12-
import com.ss.rlib.util.array.Array;
8+
import javafx.scene.layout.VBox;
9+
import org.jetbrains.annotations.NotNull;
1310
import tonegod.emitter.influencers.impl.ColorInfluencer;
1411
import tonegod.emitter.interpolation.Interpolation;
1512

13+
import java.util.List;
14+
1615
/**
1716
* The control for editing colors in the {@link ColorInfluencer}.
1817
*
@@ -40,7 +39,7 @@ protected String getControlTitle() {
4039
@Override
4140
protected void fillControl(@NotNull final ColorInfluencer influencer, @NotNull final VBox root) {
4241

43-
final Array<ColorRGBA> colors = influencer.getColors();
42+
final List<ColorRGBA> colors = influencer.getColors();
4443

4544
for (int i = 0, length = colors.size(); i < length; i++) {
4645

@@ -80,7 +79,7 @@ protected void processAdd() {
8079
protected void processRemove() {
8180

8281
final ColorInfluencer influencer = getInfluencer();
83-
final Array<ColorRGBA> colors = influencer.getColors();
82+
final List<ColorRGBA> colors = influencer.getColors();
8483

8584
final ColorRGBA color = influencer.getColor(colors.size() - 1);
8685
final Interpolation interpolation = influencer.getInterpolation(colors.size() - 1);

‎src/main/java/com/ss/editor/ui/control/model/property/control/particle/influencer/interpolation/control/DestinationInfluencerControl.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
import com.ss.editor.Messages;
55
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
66
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.element.DestinationWeightInterpolationElement;
7-
8-
import org.jetbrains.annotations.NotNull;
9-
10-
import javafx.scene.layout.VBox;
117
import com.ss.rlib.ui.util.FXUtils;
12-
import com.ss.rlib.util.array.Array;
8+
import javafx.scene.layout.VBox;
9+
import org.jetbrains.annotations.NotNull;
1310
import tonegod.emitter.influencers.impl.DestinationInfluencer;
1411
import tonegod.emitter.interpolation.Interpolation;
1512

13+
import java.util.List;
14+
1615
/**
1716
* The control for editing sizes in the {@link DestinationInfluencer}.
1817
*
@@ -74,7 +73,7 @@ public void requestToChange(@NotNull final Float newValue, final int index) {
7473
@Override
7574
protected void fillControl(@NotNull final DestinationInfluencer influencer, @NotNull final VBox root) {
7675

77-
final Array<Vector3f> speeds = influencer.getDestinations();
76+
final List<Vector3f> speeds = influencer.getDestinations();
7877

7978
for (int i = 0, length = speeds.size(); i < length; i++) {
8079

@@ -100,7 +99,7 @@ protected void processAdd() {
10099
protected void processRemove() {
101100

102101
final DestinationInfluencer influencer = getInfluencer();
103-
final Array<Vector3f> destinations = influencer.getDestinations();
102+
final List<Vector3f> destinations = influencer.getDestinations();
104103

105104
final Vector3f destination = influencer.getDestination(destinations.size() - 1);
106105
final Interpolation interpolation = influencer.getInterpolation(destinations.size() - 1);

‎src/main/java/com/ss/editor/ui/control/model/property/control/particle/influencer/interpolation/control/RotationInfluencerControl.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
import com.ss.editor.Messages;
55
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
66
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.element.RotationInterpolationElement;
7-
8-
import org.jetbrains.annotations.NotNull;
9-
10-
import javafx.scene.layout.VBox;
117
import com.ss.rlib.ui.util.FXUtils;
12-
import com.ss.rlib.util.array.Array;
8+
import javafx.scene.layout.VBox;
9+
import org.jetbrains.annotations.NotNull;
1310
import tonegod.emitter.influencers.impl.RotationInfluencer;
1411
import tonegod.emitter.interpolation.Interpolation;
1512

13+
import java.util.List;
14+
1615
/**
1716
* The control for editing sizes in the {@link RotationInfluencer}.
1817
*
@@ -60,7 +59,7 @@ public void requestToChange(@NotNull final Vector3f newValue, final int index) {
6059
@Override
6160
protected void fillControl(@NotNull final RotationInfluencer influencer, @NotNull final VBox root) {
6261

63-
final Array<Vector3f> speeds = influencer.getRotationSpeeds();
62+
final List<Vector3f> speeds = influencer.getRotationSpeeds();
6463

6564
for (int i = 0, length = speeds.size(); i < length; i++) {
6665

@@ -86,7 +85,7 @@ protected void processAdd() {
8685
protected void processRemove() {
8786

8887
final RotationInfluencer influencer = getInfluencer();
89-
final Array<Vector3f> speeds = influencer.getRotationSpeeds();
88+
final List<Vector3f> speeds = influencer.getRotationSpeeds();
9089

9190
final Vector3f speed = influencer.getRotationSpeed(speeds.size() - 1);
9291
final Interpolation interpolation = influencer.getInterpolation(speeds.size() - 1);

‎src/main/java/com/ss/editor/ui/control/model/property/control/particle/influencer/interpolation/control/SizeInfluencerControl.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
import com.ss.editor.Messages;
55
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
66
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.element.SizeInterpolationElement;
7-
8-
import org.jetbrains.annotations.NotNull;
9-
10-
import javafx.scene.layout.VBox;
117
import com.ss.rlib.ui.util.FXUtils;
12-
import com.ss.rlib.util.array.Array;
8+
import javafx.scene.layout.VBox;
9+
import org.jetbrains.annotations.NotNull;
1310
import tonegod.emitter.influencers.impl.SizeInfluencer;
1411
import tonegod.emitter.interpolation.Interpolation;
1512

13+
import java.util.List;
14+
1615
/**
1716
* The control for editing sizes in the {@link SizeInfluencer}.
1817
*
@@ -54,7 +53,7 @@ public void requestToChange(@NotNull final Vector3f newValue, final int index) {
5453
@Override
5554
protected void fillControl(@NotNull final SizeInfluencer influencer, @NotNull final VBox root) {
5655

57-
final Array<Vector3f> sizes = influencer.getSizes();
56+
final List<Vector3f> sizes = influencer.getSizes();
5857

5958
for (int i = 0, length = sizes.size(); i < length; i++) {
6059

@@ -80,7 +79,7 @@ protected void processAdd() {
8079
protected void processRemove() {
8180

8281
final SizeInfluencer influencer = getInfluencer();
83-
final Array<Vector3f> sizes = influencer.getSizes();
82+
final List<Vector3f> sizes = influencer.getSizes();
8483

8584
final Vector3f size = influencer.getSize(sizes.size() - 1);
8685
final Interpolation interpolation = influencer.getInterpolation(sizes.size() - 1);

‎src/main/java/com/ss/editor/ui/control/model/tree/action/particle/emitter/toneg0d/influerencer/RemoveParticleInfluencerAction.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.ss.editor.ui.control.model.tree.action.particle.emitter.toneg0d.influerencer;
22

33
import static java.util.Objects.requireNonNull;
4-
54
import com.ss.editor.Messages;
65
import com.ss.editor.annotation.FXThread;
76
import com.ss.editor.model.node.Toneg0dParticleInfluencers;
@@ -13,15 +12,14 @@
1312
import com.ss.editor.ui.control.model.tree.action.operation.particle.emitter.toneg0d.RemoveParticleInfluencerOperation;
1413
import com.ss.editor.ui.control.tree.NodeTree;
1514
import com.ss.editor.ui.control.tree.node.TreeNode;
16-
15+
import javafx.scene.image.Image;
1716
import org.jetbrains.annotations.NotNull;
1817
import org.jetbrains.annotations.Nullable;
19-
20-
import javafx.scene.image.Image;
21-
import com.ss.rlib.util.array.Array;
2218
import tonegod.emitter.ParticleEmitterNode;
2319
import tonegod.emitter.influencers.ParticleInfluencer;
2420

21+
import java.util.List;
22+
2523
/**
2624
* The action for to remove the {@link ParticleInfluencer} from the {@link ParticleEmitterNode}.
2725
*
@@ -61,7 +59,7 @@ protected void process() {
6159

6260
final ParticleInfluencer influencer = node.getElement();
6361
final ParticleEmitterNode emitterNode = toneg0dParticleInfluencers.getEmitterNode();
64-
final Array<ParticleInfluencer> influencers = emitterNode.getInfluencers();
62+
final List<ParticleInfluencer> influencers = emitterNode.getInfluencers();
6563
final int childIndex = influencers.indexOf(influencer);
6664

6765
final NodeTree<ModelChangeConsumer> nodeTree = getNodeTree();

0 commit comments

Comments
 (0)