Skip to content

Commit 9855cca

Browse files
committed
small updated for motion control
1 parent e503d65 commit 9855cca

File tree

19 files changed

+458
-45
lines changed

19 files changed

+458
-45
lines changed

resources/credits/icons.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,9 @@ ui/icons/actions/svg/grid.svg icon made by http://www.flaticon.com/authors/vaadi
1414
ui/icons/actions/svg/cube-divisions.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
1515
ui/icons/actions/svg/because-mathematical-symbol.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
1616
ui/icons/actions/svg/plus.svg icon made by http://www.flaticon.com/authors/icomoon from www.flaticon.com
17-
ui/icons/actions/svg/basic-square.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
17+
ui/icons/actions/svg/basic-square.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
18+
ui/icons/actions/svg/horse-in-running-motion-silhouette.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
19+
ui/icons/actions/svg/road-perspective.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
20+
ui/icons/actions/svg/map-location.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
21+
ui/icons/actions/svg/placeholder.svg icon made by http://www.flaticon.com/authors/madebyoliver from www.flaticon.com
22+

resources/messages/messages.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ ModelFileEditorNodeMeshCollisionShape=Mesh collision shape
150150
ModelFileEditorNodePlaneCollisionShape=Plane collision shape
151151
ModelFileEditorNodeSphereCollisionShape=Sphere collision shape
152152
ModelFileEditorNodeWheel=Wheel
153+
ModelFileEditorNodeMotionControl=Motion control
154+
ModelFileEditorNodeMotionPath=Motion path
155+
ModelFileEditorNodeWayPoint=Way point
153156
154157
SceneFileEditorName=Scene editor
155158
SceneFileEditorToolObjects=Objects
@@ -250,6 +253,7 @@ ModelPropertyLoD=Levels of details
250253
ModelPropertyTriangleCount=Triangles
251254
ModelPropertyLevel=Level
252255
ModelPropertyLayer=Layer
256+
ModelPropertyValue=Value
253257
254258
ControlPropertyEnabled=Enabled
255259
ControlPropertyHardwareSkinningPreferred=Hardware skinning

resources/messages/messages_ru.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ ModelFileEditorNodeMeshCollisionShape=Сеточная форма столкно
150150
ModelFileEditorNodePlaneCollisionShape=Плоская форма столкновения
151151
ModelFileEditorNodeSphereCollisionShape=Сфеерическая форма столкновения
152152
ModelFileEditorNodeWheel=Колесо
153+
ModelFileEditorNodeMotionControl=Контроллер движения
154+
ModelFileEditorNodeMotionPath=Путь движения
155+
ModelFileEditorNodeWayPoint=Точка пути
153156
154157
SceneFileEditorName=Редактор сцены
155158
SceneFileEditorToolObjects=Объекты
@@ -250,6 +253,7 @@ ModelPropertyLoD=Уровни детализаций
250253
ModelPropertyTriangleCount=Треугольник(ов)
251254
ModelPropertyLevel=Уровень
252255
ModelPropertyLayer=Слой
256+
ModelPropertyValue=Значение
253257
254258
ControlPropertyEnabled=Включен
255259
ControlPropertyHardwareSkinningPreferred=Аппаратный скиннинг
Lines changed: 40 additions & 0 deletions
Loading
Lines changed: 44 additions & 0 deletions
Loading
Lines changed: 38 additions & 0 deletions
Loading
Lines changed: 38 additions & 0 deletions
Loading

src/com/ss/editor/JFXApplication.java

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static com.jme3x.jfx.injfx.JmeToJFXIntegrator.bind;
44
import static java.nio.file.Files.newOutputStream;
55
import static java.util.Objects.requireNonNull;
6-
76
import com.jme3x.jfx.injfx.JmeToJFXApplication;
87
import com.jme3x.jfx.injfx.processor.FrameTransferSceneProcessor;
98
import com.ss.editor.analytics.google.GAEvent;
@@ -19,24 +18,20 @@
1918
import com.ss.editor.ui.component.log.LogView;
2019
import com.ss.editor.ui.dialog.ConfirmDialog;
2120
import com.ss.editor.ui.scene.EditorFXScene;
22-
2321
import de.codecentric.centerdevice.javafxsvg.SvgImageLoaderFactory;
24-
25-
import org.jetbrains.annotations.NotNull;
26-
import org.jetbrains.annotations.Nullable;
27-
28-
import java.io.IOException;
29-
import java.io.PrintStream;
30-
import java.nio.file.Paths;
31-
32-
import javax.imageio.ImageIO;
33-
3422
import javafx.application.Application;
3523
import javafx.application.Platform;
3624
import javafx.collections.ObservableList;
3725
import javafx.scene.image.Image;
3826
import javafx.stage.Stage;
3927
import javafx.stage.StageStyle;
28+
import org.jetbrains.annotations.NotNull;
29+
import org.jetbrains.annotations.Nullable;
30+
31+
import javax.imageio.ImageIO;
32+
import java.io.IOException;
33+
import java.io.PrintStream;
34+
import java.nio.file.Paths;
4035

4136
/**
4237
* The starter of the JavaFX application.
@@ -138,9 +133,7 @@ private static void printError(final Throwable throwable) {
138133

139134
@Override
140135
public void start(final Stage stage) throws Exception {
141-
final LogView logView = LogView.getInstance();
142-
System.out.println("Initialized the " + logView);
143-
136+
LogView.getInstance();
144137
JFXApplication.instance = this;
145138
this.stage = stage;
146139

src/com/ss/editor/Messages.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ public class Messages {
168168
public static final String MODEL_FILE_EDITOR_NODE_PLANE_COLLISION_SHAPE;
169169
public static final String MODEL_FILE_EDITOR_NODE_SPHERE_COLLISION_SHAPE;
170170
public static final String MODEL_FILE_EDITOR_NODE_WHEEL;
171+
public static final String MODEL_FILE_EDITOR_NODE_MOTION_CONTROL;
172+
public static final String MODEL_FILE_EDITOR_NODE_MOTION_PATH;
173+
public static final String MODEL_FILE_EDITOR_NODE_WAY_POINT;
171174

172175
public static final String SCENE_FILE_EDITOR_NAME;
173176
public static final String SCENE_FILE_EDITOR_TOOL_OBJECTS;
@@ -268,6 +271,7 @@ public class Messages {
268271
public static final String MODEL_PROPERTY_TRIANGLE_COUNT;
269272
public static final String MODEL_PROPERTY_LEVEL;
270273
public static final String MODEL_PROPERTY_LAYER;
274+
public static final String MODEL_PROPERTY_VALUE;
271275

272276
public static final String CONTROL_PROPERTY_ENABLED;
273277
public static final String CONTROL_PROPERTY_HARDWARE_SKINNING_PREFERRED;
@@ -713,6 +717,9 @@ public class Messages {
713717
MODEL_FILE_EDITOR_NODE_PLANE_COLLISION_SHAPE = bundle.getString("ModelFileEditorNodePlaneCollisionShape");
714718
MODEL_FILE_EDITOR_NODE_SPHERE_COLLISION_SHAPE = bundle.getString("ModelFileEditorNodeSphereCollisionShape");
715719
MODEL_FILE_EDITOR_NODE_WHEEL = bundle.getString("ModelFileEditorNodeWheel");
720+
MODEL_FILE_EDITOR_NODE_MOTION_CONTROL = bundle.getString("ModelFileEditorNodeMotionControl");
721+
MODEL_FILE_EDITOR_NODE_MOTION_PATH = bundle.getString("ModelFileEditorNodeMotionPath");
722+
MODEL_FILE_EDITOR_NODE_WAY_POINT = bundle.getString("ModelFileEditorNodeWayPoint");
716723

717724
SCENE_FILE_EDITOR_NAME = bundle.getString("SceneFileEditorName");
718725
SCENE_FILE_EDITOR_TOOL_OBJECTS = bundle.getString("SceneFileEditorToolObjects");
@@ -813,6 +820,7 @@ public class Messages {
813820
MODEL_PROPERTY_TRIANGLE_COUNT = bundle.getString("ModelPropertyTriangleCount");
814821
MODEL_PROPERTY_LEVEL = bundle.getString("ModelPropertyLevel");
815822
MODEL_PROPERTY_LAYER = bundle.getString("ModelPropertyLayer");
823+
MODEL_PROPERTY_VALUE = bundle.getString("ModelPropertyValue");
816824

817825
CONTROL_PROPERTY_ENABLED = bundle.getString("ControlPropertyEnabled");
818826
CONTROL_PROPERTY_HARDWARE_SKINNING_PREFERRED = bundle.getString("ControlPropertyHardwareSkinningPreferred");

src/com/ss/editor/ui/Icons.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ public interface Icons {
8383
Image IMPOSTOR_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/plus.svg");
8484
Image REMOVE_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/horizontal-line-remove-button.svg", 16, false);
8585
Image ADD_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/add-plus-button.svg", 16, false);
86+
Image MOTION_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/horse-in-running-motion-silhouette.svg", 16, false);
87+
Image PATH_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/map-location.svg", 16, false);
88+
Image WAY_POINT_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/placeholder.svg", 16, false);
8689

8790
Image REFRESH_18 = ICON_MANAGER.getImage("/ui/icons/actions/18/refresh.png", 18);
8891
Image CLOSE_18 = ICON_MANAGER.getImage("/ui/icons/actions/18/close.png", 18);

0 commit comments

Comments
 (0)