Skip to content

Commit b5a41da

Browse files
committed
updated tonegodemitter library, refactoring.
1 parent 2bbe768 commit b5a41da

5 files changed

Lines changed: 26 additions & 50 deletions

File tree

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ dependencies {
5858
compile 'org.controlsfx:controlsfx:8.40.13'
5959

6060
compile 'com.github.JavaSaBr:RlibFX:4.1.3'
61-
compile 'com.github.JavaSaBr:RLib:6.5.0'
61+
compile 'com.github.JavaSaBr:RLib:6.5.1'
6262
compile 'com.github.JavaSaBr:JME3-JFX:1.6.1'
6363

6464
// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
@@ -128,7 +128,7 @@ dependencies {
128128
compile ('com.github.JavaSaBr:jmonkeybuilder-extension:1.9.3') {
129129
exclude group: 'org.jmonkeyengine'
130130
}
131-
compile ('com.github.JavaSaBr:tonegodemitter:2.4.0') {
131+
compile ('com.github.JavaSaBr:tonegodemitter:2.4.1') {
132132
exclude group: 'org.jmonkeyengine'
133133
}
134134

src/main/java/com/ss/editor/ui/control/model/tree/action/particle/emitter/CreateParticleEmitterAction.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,20 @@ public CreateParticleEmitterAction(@NotNull final NodeTree<?> nodeTree, @NotNull
3434
super(nodeTree, node);
3535
}
3636

37-
@FXThread
38-
@Nullable
3937
@Override
40-
protected Image getIcon() {
38+
@FXThread
39+
protected @Nullable Image getIcon() {
4140
return Icons.EMITTER_16;
4241
}
4342

44-
@FXThread
45-
@NotNull
4643
@Override
47-
protected String getName() {
44+
@FXThread
45+
protected @NotNull String getName() {
4846
return Messages.MODEL_NODE_TREE_ACTION_CREATE_DEFAULT_PARTICLE_EMITTER;
4947
}
5048

51-
@FXThread
5249
@Override
50+
@FXThread
5351
protected void process() {
5452
super.process();
5553

@@ -87,8 +85,8 @@ protected void process() {
8785
changeConsumer.execute(new AddChildOperation(emitter, parent));
8886
}
8987

90-
@NotNull
91-
protected ParticleEmitter createParticleEmitter() {
88+
@FXThread
89+
protected @NotNull ParticleEmitter createParticleEmitter() {
9290
return new ParticleEmitter("Default Emitter", ParticleMesh.Type.Triangle, 30);
9391
}
9492
}

src/main/java/com/ss/editor/ui/control/model/tree/action/particle/emitter/ResetParticleEmittersAction.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,24 @@
2222
*/
2323
public class ResetParticleEmittersAction extends AbstractNodeAction<ModelChangeConsumer> {
2424

25-
/**
26-
* Instantiates a new Reset toneg 0 d particle emitters action.
27-
*
28-
* @param nodeTree the node tree
29-
* @param node the node
30-
*/
3125
public ResetParticleEmittersAction(@NotNull final NodeTree<?> nodeTree, @NotNull final TreeNode<?> node) {
3226
super(nodeTree, node);
3327
}
3428

35-
@FXThread
36-
@Nullable
3729
@Override
38-
protected Image getIcon() {
30+
@FXThread
31+
protected @Nullable Image getIcon() {
3932
return Icons.REPLAY_16;
4033
}
4134

42-
@FXThread
43-
@NotNull
4435
@Override
45-
protected String getName() {
36+
@FXThread
37+
protected @NotNull String getName() {
4638
return Messages.MODEL_NODE_TREE_ACTION_RESET_PARTICLE_EMITTERS;
4739
}
4840

49-
@FXThread
5041
@Override
42+
@FXThread
5143
protected void process() {
5244
super.process();
5345

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,24 @@
2828
*/
2929
public class CreateToneg0dParticleEmitterAction extends AbstractNodeAction<ModelChangeConsumer> {
3030

31-
/**
32-
* Instantiates a new Create toneg 0 d emitter action.
33-
*
34-
* @param nodeTree the node tree
35-
* @param node the node
36-
*/
3731
public CreateToneg0dParticleEmitterAction(@NotNull final NodeTree<?> nodeTree, @NotNull final TreeNode<?> node) {
3832
super(nodeTree, node);
3933
}
4034

41-
@FXThread
42-
@Nullable
4335
@Override
44-
protected Image getIcon() {
36+
@FXThread
37+
protected @Nullable Image getIcon() {
4538
return Icons.EMITTER_16;
4639
}
4740

48-
@FXThread
49-
@NotNull
5041
@Override
51-
protected String getName() {
42+
@FXThread
43+
protected @NotNull String getName() {
5244
return Messages.MODEL_NODE_TREE_ACTION_CREATE_TONEG0D_PARTICLE_EMITTER;
5345
}
5446

55-
@FXThread
5647
@Override
48+
@FXThread
5749
protected void process() {
5850
super.process();
5951

@@ -87,8 +79,8 @@ protected void process() {
8779
*
8880
* @return the particle emitter node
8981
*/
90-
@NotNull
91-
protected ParticleEmitterNode createEmitterNode() {
82+
@FXThread
83+
protected @NotNull ParticleEmitterNode createEmitterNode() {
9284
return new ParticleEmitterNode(EDITOR.getAssetManager());
9385
}
9486
}

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,19 @@
1717
*/
1818
public class CreateToneg0dSoftParticleEmitterAction extends CreateToneg0dParticleEmitterAction {
1919

20-
/**
21-
* Instantiates a new Create toneg 0 d soft emitter action.
22-
*
23-
* @param nodeTree the node tree
24-
* @param node the node
25-
*/
2620
public CreateToneg0dSoftParticleEmitterAction(@NotNull final NodeTree<?> nodeTree, @NotNull final TreeNode<?> node) {
2721
super(nodeTree, node);
2822
}
2923

30-
@FXThread
31-
@NotNull
3224
@Override
33-
protected String getName() {
25+
@FXThread
26+
protected @NotNull String getName() {
3427
return Messages.MODEL_NODE_TREE_ACTION_CREATE_SOFT_TONEG0D_PARTICLE_EMITTER;
3528
}
3629

37-
@NotNull
38-
protected ParticleEmitterNode createEmitterNode() {
30+
@Override
31+
@FXThread
32+
protected @NotNull ParticleEmitterNode createEmitterNode() {
3933
return new SoftParticleEmitterNode(EDITOR.getAssetManager());
4034
}
4135
}

0 commit comments

Comments
 (0)