Skip to content

Commit 0f87518

Browse files
JavaSaBrJavaSaBr
committed
Added detail information about meshes.
1 parent cbf47a8 commit 0f87518

36 files changed

+605
-151
lines changed

‎resources/credits/icons.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ ui/icons/actions/svg/horse-in-running-motion-silhouette.svg icon made by http://
1919
ui/icons/actions/svg/road-perspective.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
2020
ui/icons/actions/svg/map-location.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
2121
ui/icons/actions/svg/placeholder.svg icon made by http://www.flaticon.com/authors/madebyoliver from www.flaticon.com
22+
ui/icons/actions/svg/graphene.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
23+
ui/icons/actions/svg/database.svg icon made by http://www.flaticon.com/authors/designmodo from www.flaticon.com
2224

‎resources/messages/messages.properties‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ ModelFileEditorNodeWheel=Wheel
153153
ModelFileEditorNodeMotionControl=Motion control
154154
ModelFileEditorNodeMotionPath=Motion path
155155
ModelFileEditorNodeWayPoint=Way point
156+
ModelFileEditorNodeVertexBuffer=Vertex buffer
156157
157158
SceneFileEditorName=Scene editor
158159
SceneFileEditorToolObjects=Objects
@@ -254,6 +255,22 @@ ModelPropertyTriangleCount=Triangles
254255
ModelPropertyLevel=Level
255256
ModelPropertyLayer=Layer
256257
ModelPropertyValue=Value
258+
ModelPropertyId=Id
259+
ModelPropertyInstanceCount=Instances
260+
ModelPropertyVertexCount=Vertexes
261+
ModelPropertyNumLodLevels=Lod levels
262+
ModelPropertyMode=Mode
263+
ModelPropertyType=Type
264+
ModelPropertyFormat=Format
265+
ModelPropertyUsage=Usage
266+
ModelPropertyUniqId=Uniq ID
267+
ModelPropertyBaseInstanceCount=Base instances
268+
ModelPropertyInstanceSpan=Instance span
269+
ModelPropertyNumComponents=Components
270+
ModelPropertyNumElements=Elements
271+
ModelPropertyOffset=Offset
272+
ModelPropertyStride=Stride
273+
ModelPropertyCapacity=Capacity
257274
258275
ControlPropertyEnabled=Enabled
259276
ControlPropertyHardwareSkinningPreferred=Hardware skinning

‎resources/messages/messages_ru.properties‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ ModelFileEditorNodeWheel=Колесо
153153
ModelFileEditorNodeMotionControl=Контроллер движения
154154
ModelFileEditorNodeMotionPath=Путь движения
155155
ModelFileEditorNodeWayPoint=Точка пути
156+
ModelFileEditorNodeVertexBuffer=Буффер вертексов
156157
157158
SceneFileEditorName=Редактор сцены
158159
SceneFileEditorToolObjects=Объекты
@@ -254,6 +255,22 @@ ModelPropertyTriangleCount=Треугольник(ов)
254255
ModelPropertyLevel=Уровень
255256
ModelPropertyLayer=Слой
256257
ModelPropertyValue=Значение
258+
ModelPropertyId=Ид
259+
ModelPropertyInstanceCount=Экземпляр(ов)
260+
ModelPropertyVertexCount=Вертекс(ов)
261+
ModelPropertyNumLodLevels=Уровней детализации
262+
ModelPropertyMode=Режим
263+
ModelPropertyType=Тип
264+
ModelPropertyFormat=Формат
265+
ModelPropertyUsage=Использование
266+
ModelPropertyUniqId=Уник. Ид
267+
ModelPropertyBaseInstanceCount=Баз. экземпляр(ов)
268+
ModelPropertyInstanceSpan=Промежуток между экземп.
269+
ModelPropertyNumComponents=Компонент(ов)
270+
ModelPropertyNumElements=Элемент(ов)
271+
ModelPropertyOffset=Отступ
272+
ModelPropertyStride=Шаг
273+
ModelPropertyCapacity=Емкость
257274
258275
ControlPropertyEnabled=Включен
259276
ControlPropertyHardwareSkinningPreferred=Аппаратный скиннинг

‎resources/ui/icons/actions/svg/database.svg‎

Lines changed: 42 additions & 0 deletions
Loading

‎resources/ui/icons/actions/svg/graphene.svg‎

Lines changed: 39 additions & 0 deletions
Loading

‎src/com/ss/editor/Messages.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ public class Messages {
171171
public static final String MODEL_FILE_EDITOR_NODE_MOTION_CONTROL;
172172
public static final String MODEL_FILE_EDITOR_NODE_MOTION_PATH;
173173
public static final String MODEL_FILE_EDITOR_NODE_WAY_POINT;
174+
public static final String MODEL_FILE_EDITOR_NODE_VERTEX_BUFFER;
174175

175176
public static final String SCENE_FILE_EDITOR_NAME;
176177
public static final String SCENE_FILE_EDITOR_TOOL_OBJECTS;
@@ -272,6 +273,22 @@ public class Messages {
272273
public static final String MODEL_PROPERTY_LEVEL;
273274
public static final String MODEL_PROPERTY_LAYER;
274275
public static final String MODEL_PROPERTY_VALUE;
276+
public static final String MODEL_PROPERTY_ID;
277+
public static final String MODEL_PROPERTY_INSTANCE_COUNT;
278+
public static final String MODEL_PROPERTY_VERTEX_COUNT;
279+
public static final String MODEL_PROPERTY_NUM_LOD_LEVELS;
280+
public static final String MODEL_PROPERTY_MODE;
281+
public static final String MODEL_PROPERTY_TYPE;
282+
public static final String MODEL_PROPERTY_FORMAT;
283+
public static final String MODEL_PROPERTY_USAGE;
284+
public static final String MODEL_PROPERTY_UNIQ_ID;
285+
public static final String MODEL_PROPERTY_BASE_INSTANCE_COUNT;
286+
public static final String MODEL_PROPERTY_INSTANCE_SPAN;
287+
public static final String MODEL_PROPERTY_NUM_COMPONENTS;
288+
public static final String MODEL_PROPERTY_NUM_ELEMENTS;
289+
public static final String MODEL_PROPERTY_OFFSET;
290+
public static final String MODEL_PROPERTY_STRIDE;
291+
public static final String MODEL_PROPERTY_CAPACITY;
275292

276293
public static final String CONTROL_PROPERTY_ENABLED;
277294
public static final String CONTROL_PROPERTY_HARDWARE_SKINNING_PREFERRED;
@@ -720,6 +737,7 @@ public class Messages {
720737
MODEL_FILE_EDITOR_NODE_MOTION_CONTROL = bundle.getString("ModelFileEditorNodeMotionControl");
721738
MODEL_FILE_EDITOR_NODE_MOTION_PATH = bundle.getString("ModelFileEditorNodeMotionPath");
722739
MODEL_FILE_EDITOR_NODE_WAY_POINT = bundle.getString("ModelFileEditorNodeWayPoint");
740+
MODEL_FILE_EDITOR_NODE_VERTEX_BUFFER = bundle.getString("ModelFileEditorNodeVertexBuffer");
723741

724742
SCENE_FILE_EDITOR_NAME = bundle.getString("SceneFileEditorName");
725743
SCENE_FILE_EDITOR_TOOL_OBJECTS = bundle.getString("SceneFileEditorToolObjects");
@@ -821,6 +839,22 @@ public class Messages {
821839
MODEL_PROPERTY_LEVEL = bundle.getString("ModelPropertyLevel");
822840
MODEL_PROPERTY_LAYER = bundle.getString("ModelPropertyLayer");
823841
MODEL_PROPERTY_VALUE = bundle.getString("ModelPropertyValue");
842+
MODEL_PROPERTY_ID = bundle.getString("ModelPropertyId");
843+
MODEL_PROPERTY_INSTANCE_COUNT = bundle.getString("ModelPropertyInstanceCount");
844+
MODEL_PROPERTY_VERTEX_COUNT = bundle.getString("ModelPropertyVertexCount");
845+
MODEL_PROPERTY_NUM_LOD_LEVELS = bundle.getString("ModelPropertyNumLodLevels");
846+
MODEL_PROPERTY_MODE = bundle.getString("ModelPropertyMode");
847+
MODEL_PROPERTY_TYPE = bundle.getString("ModelPropertyType");
848+
MODEL_PROPERTY_FORMAT = bundle.getString("ModelPropertyFormat");
849+
MODEL_PROPERTY_USAGE = bundle.getString("ModelPropertyUsage");
850+
MODEL_PROPERTY_UNIQ_ID = bundle.getString("ModelPropertyUniqId");
851+
MODEL_PROPERTY_BASE_INSTANCE_COUNT = bundle.getString("ModelPropertyBaseInstanceCount");
852+
MODEL_PROPERTY_INSTANCE_SPAN = bundle.getString("ModelPropertyInstanceSpan");
853+
MODEL_PROPERTY_NUM_COMPONENTS = bundle.getString("ModelPropertyNumComponents");
854+
MODEL_PROPERTY_NUM_ELEMENTS = bundle.getString("ModelPropertyNumElements");
855+
MODEL_PROPERTY_OFFSET = bundle.getString("ModelPropertyOffset");
856+
MODEL_PROPERTY_STRIDE = bundle.getString("ModelPropertyStride");
857+
MODEL_PROPERTY_CAPACITY = bundle.getString("ModelPropertyCapacity");
824858

825859
CONTROL_PROPERTY_ENABLED = bundle.getString("ControlPropertyEnabled");
826860
CONTROL_PROPERTY_HARDWARE_SKINNING_PREFERRED = bundle.getString("ControlPropertyHardwareSkinningPreferred");

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ public interface Icons {
8686
Image MOTION_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/horse-in-running-motion-silhouette.svg", 16, false);
8787
Image PATH_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/map-location.svg", 16, false);
8888
Image WAY_POINT_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/placeholder.svg", 16, false);
89+
Image VERTEX_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/graphene.svg", 16, false);
90+
Image DATA_16 = ICON_MANAGER.getImage("/ui/icons/actions/svg/database.svg", 16, false);
8991

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

‎src/com/ss/editor/ui/builder/EditorFXSceneBuilder.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ private static void updateLayout(@NotNull final StackPane container,
124124

125125
StackPane.setMargin(leftSplitContainer, new Insets(newValue.doubleValue(), 0, 0, 0));
126126
FXUtils.bindFixedHeight(leftSplitContainer, container.heightProperty().subtract(newValue.doubleValue()).add(2));
127-
Platform.runLater(container::requestLayout);
127+
128+
Platform.runLater(() -> {
129+
container.requestLayout();
130+
Platform.runLater(container::requestLayout);
131+
});
128132
}
129133
}

‎src/com/ss/editor/ui/control/app/state/property/builder/impl/AppStatePropertyBuilder.java‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,32 @@
44
import com.jme3.math.Vector2f;
55
import com.jme3.math.Vector3f;
66
import com.ss.editor.model.undo.editor.SceneChangeConsumer;
7-
import com.ss.editor.ui.control.app.state.property.control.BooleanAppStatePropertyControl;
8-
import com.ss.editor.ui.control.app.state.property.control.ColorAppStatePropertyControl;
9-
import com.ss.editor.ui.control.app.state.property.control.EnumAppStatePropertyControl;
10-
import com.ss.editor.ui.control.app.state.property.control.FloatAppStatePropertyControl;
11-
import com.ss.editor.ui.control.app.state.property.control.IntegerAppStatePropertyControl;
12-
import com.ss.editor.ui.control.app.state.property.control.StringAppStatePropertyControl;
13-
import com.ss.editor.ui.control.app.state.property.control.Vector2fAppStatePropertyControl;
14-
import com.ss.editor.ui.control.app.state.property.control.Vector3fAppStatePropertyControl;
7+
import com.ss.editor.ui.control.app.state.property.control.*;
158
import com.ss.editor.ui.control.property.AbstractPropertyControl;
169
import com.ss.editor.ui.control.property.builder.impl.AbstractPropertyBuilder;
1710
import com.ss.extension.property.EditableProperty;
1811
import com.ss.extension.property.EditablePropertyType;
1912
import com.ss.extension.scene.app.state.EditableSceneAppState;
20-
13+
import javafx.scene.layout.VBox;
2114
import org.jetbrains.annotations.NotNull;
2215
import org.jetbrains.annotations.Nullable;
23-
24-
import java.util.Objects;
25-
26-
import javafx.scene.layout.VBox;
2716
import rlib.ui.util.FXUtils;
2817
import rlib.util.ClassUtils;
2918
import rlib.util.array.Array;
3019

20+
import java.util.Objects;
21+
3122
/**
3223
* The property builder to build property controls of editable scene app states.
3324
*
3425
* @author JavaSaBr
3526
*/
3627
public class AppStatePropertyBuilder extends AbstractPropertyBuilder<SceneChangeConsumer> {
3728

29+
@NotNull
3830
private static final AppStatePropertyBuilder INSTANCE = new AppStatePropertyBuilder();
3931

32+
@NotNull
4033
public static AppStatePropertyBuilder getInstance() {
4134
return INSTANCE;
4235
}

‎src/com/ss/editor/ui/control/filter/property/builder/impl/FilterPropertyBuilder.java‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,32 @@
66
import com.jme3.math.Vector2f;
77
import com.jme3.math.Vector3f;
88
import com.ss.editor.model.undo.editor.SceneChangeConsumer;
9-
import com.ss.editor.ui.control.filter.property.control.BooleanFilterPropertyControl;
10-
import com.ss.editor.ui.control.filter.property.control.ColorFilterPropertyControl;
11-
import com.ss.editor.ui.control.filter.property.control.DirectionLightElementFilterPropertyControl;
12-
import com.ss.editor.ui.control.filter.property.control.EnumFilterPropertyControl;
13-
import com.ss.editor.ui.control.filter.property.control.FloatFilterPropertyControl;
14-
import com.ss.editor.ui.control.filter.property.control.IntegerFilterPropertyControl;
15-
import com.ss.editor.ui.control.filter.property.control.PointLightElementFilterPropertyControl;
16-
import com.ss.editor.ui.control.filter.property.control.StringFilterPropertyControl;
17-
import com.ss.editor.ui.control.filter.property.control.Vector2fFilterPropertyControl;
18-
import com.ss.editor.ui.control.filter.property.control.Vector3fFilterPropertyControl;
9+
import com.ss.editor.ui.control.filter.property.control.*;
1910
import com.ss.editor.ui.control.property.AbstractPropertyControl;
2011
import com.ss.editor.ui.control.property.builder.impl.AbstractPropertyBuilder;
2112
import com.ss.extension.property.EditableProperty;
2213
import com.ss.extension.property.EditablePropertyType;
2314
import com.ss.extension.scene.filter.EditableSceneFilter;
24-
15+
import javafx.scene.layout.VBox;
2516
import org.jetbrains.annotations.NotNull;
2617
import org.jetbrains.annotations.Nullable;
27-
28-
import java.util.Objects;
29-
30-
import javafx.scene.layout.VBox;
3118
import rlib.ui.util.FXUtils;
3219
import rlib.util.ClassUtils;
3320
import rlib.util.array.Array;
3421

22+
import java.util.Objects;
23+
3524
/**
3625
* The iproperty builder to build property controls of editable scene app states.
3726
*
3827
* @author JavaSaBr
3928
*/
4029
public class FilterPropertyBuilder extends AbstractPropertyBuilder<SceneChangeConsumer> {
4130

31+
@NotNull
4232
private static final FilterPropertyBuilder INSTANCE = new FilterPropertyBuilder();
4333

34+
@NotNull
4435
public static FilterPropertyBuilder getInstance() {
4536
return INSTANCE;
4637
}

0 commit comments

Comments
 (0)