Skip to content

Commit f298216

Browse files
committed
started working on updating terratin painting.
1 parent 014f6fa commit f298216

16 files changed

+325
-84
lines changed

src/main/java/com/ss/editor/control/painting/terrain/ChangeHeightTerrainToolControl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.ss.editor.annotation.JmeThread;
1010
import com.ss.editor.model.undo.editor.ChangeConsumer;
1111
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
12-
import com.ss.editor.ui.component.painting.terrain.TerrainEditingComponent;
12+
import com.ss.editor.ui.component.painting.terrain.TerrainPaintingComponent;
1313
import com.ss.editor.ui.control.property.operation.PropertyOperation;
1414
import com.ss.rlib.util.dictionary.DictionaryFactory;
1515
import com.ss.rlib.util.dictionary.ObjectDictionary;
@@ -71,7 +71,7 @@ public int hashCode() {
7171
@Nullable
7272
private Spatial copiedTerrain;
7373

74-
public ChangeHeightTerrainToolControl(@NotNull final TerrainEditingComponent component) {
74+
public ChangeHeightTerrainToolControl(@NotNull final TerrainPaintingComponent component) {
7575
super(component);
7676
this.originalHeight = DictionaryFactory.newObjectDictionary(0.2F, 1000);
7777
}

src/main/java/com/ss/editor/control/painting/terrain/LevelTerrainToolControl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.ss.editor.annotation.FromAnyThread;
1414
import com.ss.editor.annotation.JmeThread;
1515
import com.ss.editor.control.painting.PaintingInput;
16-
import com.ss.editor.ui.component.painting.terrain.TerrainEditingComponent;
16+
import com.ss.editor.ui.component.painting.terrain.TerrainPaintingComponent;
1717
import com.ss.editor.util.LocalObjects;
1818
import org.jetbrains.annotations.NotNull;
1919

@@ -53,7 +53,7 @@ public class LevelTerrainToolControl extends ChangeHeightTerrainToolControl {
5353
*
5454
* @param component the component
5555
*/
56-
public LevelTerrainToolControl(@NotNull final TerrainEditingComponent component) {
56+
public LevelTerrainToolControl(@NotNull final TerrainPaintingComponent component) {
5757
super(component);
5858

5959
this.levelMarker = new Geometry("LevelMarker", new Sphere(8, 8, 1));

src/main/java/com/ss/editor/control/painting/terrain/PaintTerrainToolControl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.ss.editor.control.painting.PaintingInput;
1515
import com.ss.editor.model.undo.editor.ChangeConsumer;
1616
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
17-
import com.ss.editor.ui.component.painting.terrain.TerrainEditingComponent;
17+
import com.ss.editor.ui.component.painting.terrain.TerrainPaintingComponent;
1818
import com.ss.editor.ui.control.property.operation.PropertyOperation;
1919
import com.ss.editor.util.LocalObjects;
2020
import org.jetbrains.annotations.NotNull;
@@ -126,7 +126,7 @@ public int hashCode() {
126126
*/
127127
private int layer;
128128

129-
public PaintTerrainToolControl(@NotNull final TerrainEditingComponent component) {
129+
public PaintTerrainToolControl(@NotNull final TerrainPaintingComponent component) {
130130
super(component);
131131
this.colorPoints = ArrayFactory.newArray(ColorPoint.class);
132132
}

src/main/java/com/ss/editor/control/painting/terrain/RaiseLowerTerrainToolControl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.ss.editor.annotation.FromAnyThread;
1313
import com.ss.editor.annotation.JmeThread;
1414
import com.ss.editor.control.painting.PaintingInput;
15-
import com.ss.editor.ui.component.painting.terrain.TerrainEditingComponent;
15+
import com.ss.editor.ui.component.painting.terrain.TerrainPaintingComponent;
1616
import com.ss.editor.util.LocalObjects;
1717
import org.jetbrains.annotations.NotNull;
1818

@@ -26,7 +26,7 @@
2626
*/
2727
public class RaiseLowerTerrainToolControl extends ChangeHeightTerrainToolControl {
2828

29-
public RaiseLowerTerrainToolControl(@NotNull final TerrainEditingComponent component) {
29+
public RaiseLowerTerrainToolControl(@NotNull final TerrainPaintingComponent component) {
3030
super(component);
3131
}
3232

src/main/java/com/ss/editor/control/painting/terrain/RoughTerrainToolControl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.ss.editor.annotation.FromAnyThread;
2323
import com.ss.editor.annotation.JmeThread;
2424
import com.ss.editor.control.painting.PaintingInput;
25-
import com.ss.editor.ui.component.painting.terrain.TerrainEditingComponent;
25+
import com.ss.editor.ui.component.painting.terrain.TerrainPaintingComponent;
2626
import com.ss.editor.util.LocalObjects;
2727
import org.jetbrains.annotations.NotNull;
2828

@@ -48,7 +48,7 @@ public class RoughTerrainToolControl extends ChangeHeightTerrainToolControl {
4848
*
4949
* @param component the component
5050
*/
51-
public RoughTerrainToolControl(@NotNull final TerrainEditingComponent component) {
51+
public RoughTerrainToolControl(@NotNull final TerrainPaintingComponent component) {
5252
super(component);
5353
}
5454

src/main/java/com/ss/editor/control/painting/terrain/SlopeTerrainToolControl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.ss.editor.annotation.FromAnyThread;
1717
import com.ss.editor.annotation.JmeThread;
1818
import com.ss.editor.control.painting.PaintingInput;
19-
import com.ss.editor.ui.component.painting.terrain.TerrainEditingComponent;
19+
import com.ss.editor.ui.component.painting.terrain.TerrainPaintingComponent;
2020
import com.ss.editor.util.LocalObjects;
2121
import org.jetbrains.annotations.NotNull;
2222

@@ -63,7 +63,7 @@ public class SlopeTerrainToolControl extends ChangeHeightTerrainToolControl {
6363
*
6464
* @param component the component
6565
*/
66-
public SlopeTerrainToolControl(@NotNull final TerrainEditingComponent component) {
66+
public SlopeTerrainToolControl(@NotNull final TerrainPaintingComponent component) {
6767
super(component);
6868

6969
this.baseMarker = new Geometry("BaseMarker", new Sphere(8, 8, 1));

src/main/java/com/ss/editor/control/painting/terrain/SmoothTerrainToolControl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.ss.editor.annotation.FromAnyThread;
1414
import com.ss.editor.annotation.JmeThread;
1515
import com.ss.editor.control.painting.PaintingInput;
16-
import com.ss.editor.ui.component.painting.terrain.TerrainEditingComponent;
16+
import com.ss.editor.ui.component.painting.terrain.TerrainPaintingComponent;
1717
import com.ss.editor.util.LocalObjects;
1818
import org.jetbrains.annotations.NotNull;
1919

@@ -32,7 +32,7 @@ public class SmoothTerrainToolControl extends ChangeHeightTerrainToolControl {
3232
*
3333
* @param component the component
3434
*/
35-
public SmoothTerrainToolControl(@NotNull final TerrainEditingComponent component) {
35+
public SmoothTerrainToolControl(@NotNull final TerrainPaintingComponent component) {
3636
super(component);
3737
}
3838

src/main/java/com/ss/editor/control/painting/terrain/TerrainToolControl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.ss.editor.annotation.JmeThread;
1010
import com.ss.editor.control.painting.impl.AbstractPaintingControl;
1111
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
12-
import com.ss.editor.ui.component.painting.terrain.TerrainEditingComponent;
12+
import com.ss.editor.ui.component.painting.terrain.TerrainPaintingComponent;
1313
import org.jetbrains.annotations.NotNull;
1414
import org.jetbrains.annotations.Nullable;
1515

@@ -24,7 +24,7 @@ public class TerrainToolControl extends AbstractPaintingControl {
2424
* The editing component.
2525
*/
2626
@NotNull
27-
protected final TerrainEditingComponent component;
27+
protected final TerrainPaintingComponent component;
2828

2929
/**
3030
* The brush geometry.
@@ -42,7 +42,7 @@ public class TerrainToolControl extends AbstractPaintingControl {
4242
*/
4343
private float brushPower;
4444

45-
public TerrainToolControl(@NotNull final TerrainEditingComponent component) {
45+
public TerrainToolControl(@NotNull final TerrainPaintingComponent component) {
4646
this.component = component;
4747
this.brush = new Geometry("Brush", new Sphere(8, 8, 1));
4848
this.brush.setMaterial(createWireframeMaterial(getBrushColor()));

src/main/java/com/ss/editor/ui/component/painting/PaintingComponentRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.ss.editor.annotation.FromAnyThread;
44
import com.ss.editor.annotation.FxThread;
5-
import com.ss.editor.ui.component.painting.terrain.TerrainEditingComponent;
5+
import com.ss.editor.ui.component.painting.terrain.TerrainPaintingComponent;
66
import com.ss.rlib.util.array.Array;
77
import com.ss.rlib.util.array.ArrayFactory;
88
import org.jetbrains.annotations.NotNull;
@@ -31,7 +31,7 @@ public class PaintingComponentRegistry {
3131

3232
private PaintingComponentRegistry() {
3333
this.constructors = ArrayFactory.newArray(Function.class);
34-
register(TerrainEditingComponent::new);
34+
register(TerrainPaintingComponent::new);
3535
}
3636

3737
/**

src/main/java/com/ss/editor/ui/component/painting/impl/AbstractPaintingComponent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public void startPainting(@NotNull final Object object) {
9191
/**
9292
* Create components.
9393
*/
94+
@FxThread
9495
protected void createComponents() {
9596
}
9697

0 commit comments

Comments
 (0)