начальная реализация редактора модели и дерево структуры

Author: JavaSaBr

resources/messages/messages.properties

@@ -15,20 +15,20 @@ FileEditorActionSave=Save
 
 TextFileEditorName=Text editor
 PostFilterEditorName=Post Filter Viewer
-MaterialEditorName=Material Editor
+MaterialFileEditorName=Material Editor
 
 PostFilterEditorMaterialListLabel=Material list
 
 AssetEditorDialogTitle=Choose resource
 AssetEditorDialogButtonOk=Choose
 AssetEditorDialogButtonCancel=Cancel
 
-MaterialEditorMaterialTypeLabel=Material type
+MaterialFileEditorMaterialTypeLabel=Material type
 
-MaterialTexturesComponentTitle=Textures
-MaterialColorsComponentTitle=Colors
-MaterialOtherComponentTitle=Other
-MaterialRenderParamsComponentTitle=Settings of render
+MaterialFileEditorTexturesComponentTitle=Textures
+MaterialFileEditorColorsComponentTitle=Colors
+MaterialFileEditorOtherComponentTitle=Other
+MaterialFileEditorRenderParamsComponentTitle=Settings of render
 
 Texture2DMaterialParamControlRepeat=Repeat
 Texture2DMaterialParamControlFlip=Flip
@@ -69,4 +69,11 @@ GraphicsDialogButtonOk=Apply
 GraphicsDialogButtonCancel=Cancel
 GraphicsDialogMessage=To apply the settings restart required.
 
-BlendToJ3oFileConverterDescription=Convert from .blend to .j3o
+BlendToJ3oFileConverterDescription=Convert from .blend to .j3o
+
+ModelFileEditorName=Model editor
+ModelFileEditorNoSky=No sky
+ModelFileEditorFastSky=Fast sky
+ModelFileEditorNodeTree=Structure
+ModelFileEditorProperties=Properties
+ModelFileEditorNodeMesh=Mesh

resources/messages/messages_ru.properties

@@ -15,20 +15,20 @@ FileEditorActionSave=Сохранить
 
 TextFileEditorName=Текстовый редактор
 PostFilterEditorName=Просмоторщик пост эффектов
-MaterialEditorName=Редактор материалов
+MaterialFileEditorName=Редактор материалов
 
 PostFilterEditorMaterialListLabel=Список материалов
 
 AssetEditorDialogTitle=Выбор ресурса
 AssetEditorDialogButtonOk=Выбрать
 AssetEditorDialogButtonCancel=Отменить
 
-MaterialEditorMaterialTypeLabel=Тип материала
+MaterialFileEditorMaterialTypeLabel=Тип материала
 
-MaterialTexturesComponentTitle=Текстуры
-MaterialColorsComponentTitle=Цвета
-MaterialOtherComponentTitle=Остальные
-MaterialRenderParamsComponentTitle=Надстройки Рендера
+MaterialFileEditorTexturesComponentTitle=Текстуры
+MaterialFileEditorColorsComponentTitle=Цвета
+MaterialFileEditorOtherComponentTitle=Остальные
+MaterialFileEditorRenderParamsComponentTitle=Надстройки Рендера
 
 Texture2DMaterialParamControlRepeat=Repeat
 Texture2DMaterialParamControlFlip=Flip
@@ -69,4 +69,11 @@ GraphicsDialogButtonOk=Применить
 GraphicsDialogButtonCancel=Отменить
 GraphicsDialogMessage=Для применения настроек необходим рестарт.
 
-BlendToJ3oFileConverterDescription=Конверитровать .blend в .j3o
+BlendToJ3oFileConverterDescription=Конверитровать .blend в .j3o
+
+ModelFileEditorName=Редактор модели
+ModelFileEditorNoSky=Без фона
+ModelFileEditorFastSky=Быстрый фон
+ModelFileEditorNodeTree=Структура
+ModelFileEditorProperties=Свойства
+ModelFileEditorNodeMesh=Сетка

resources/ui/css/base.css

@@ -332,33 +332,61 @@
     -fx-background-color: transparent;
 }
 
-/* ScrollBar */
-.scroll-bar > .increment-button,
-.scroll-bar > .decrement-button {
+/** ContextMenu */
+.context-menu {
+    -fx-padding: 0.333333em 0.083333em 0.333333em 0.083333em; /* 4 1 8 1 */
+    -fx-background-color: -fx-color-panel-900;
+    -fx-background-insets: 0;
+    -fx-background-radius: 0;
+    -fx-effect: -fx-material-shadow-panel;
+}
+.context-menu .separator:horizontal .line {
+    -fx-border-color: -fx-box-border transparent transparent transparent;
+    -fx-border-insets: 1 0 0 0;
+}
+.context-menu > .scroll-arrow {
+    -fx-padding: 0.416667em 0.416667em 0.416667em 0.416667em; /* 5 */
     -fx-background-color: transparent;
-    -fx-border-color: transparent;
-    -fx-border-width: 0;
-    -fx-padding: 0;
+    -fx-background-radius: 0;
+}
+.context-menu > .scroll-arrow:hover {
+    -fx-background: -fx-selection-bar;
+    -fx-background-color: -fx-background;
+    -fx-background-radius: 0;
+    -fx-text-fill: -fx-text-background-color;
+}
+.context-menu:show-mnemonics > .mnemonic-underline {
+    -fx-stroke: -fx-text-fill;
 }
 
-.scroll-bar > .increment-button:hover,
-.scroll-bar > .decrement-button:hover {
+
+/* ScrollBar */
+
+.scroll-bar:horizontal {
     -fx-background-color: transparent;
-    -fx-border-color: transparent;
-    -fx-border-width: 0;
-    -fx-padding: 0;
+    -fx-background-insets: 0;
 }
-
-.scroll-bar:horizontal > .increment-button,
-.scroll-bar:horizontal > .decrement-button {
+.scroll-bar:vertical {
+    -fx-background-color: transparent;
     -fx-background-insets: 0;
-    -fx-padding: 0 0 4 0;
 }
-
-.scroll-bar:vertical > .increment-button,
-.scroll-bar:vertical > .decrement-button {
+.scroll-bar:focused {
+    -fx-background-color: transparent;
+    -fx-background-insets: 0;
+}
+.scroll-bar:vertical:focused {
+    -fx-background-color: transparent;
+    -fx-background-insets: 0;
+}
+.scroll-bar > .thumb {
+    -fx-background-color: -fx-color-500;
+    -fx-background-insets: 0;
+    -fx-background-radius: 0;
+}
+.scroll-bar:vertical > .thumb {
+    -fx-background-color: -fx-color-500;
     -fx-background-insets: 0;
-    -fx-padding: 0 4 0 0;
+    -fx-background-radius: 0;
 }
 
 .scroll-bar > .increment-button > .increment-arrow,
@@ -378,6 +406,7 @@
     -fx-padding: 0;
 }
 
+
 /* SplitPane */
 
 .split-pane {
@@ -386,7 +415,7 @@
 }
 
 .split-pane > .split-pane-divider {
-    -fx-padding: 0 0.15em 0 0.25em; /* 0 3 0 3 */
+    -fx-padding: 0 0.05em 0 0.05em; /* 0 3 0 3 */
 }
 
 .split-pane:horizontal > .split-pane-divider {
@@ -1075,3 +1104,36 @@
     -fx-background-color: transparent;
     -fx-background-radius: 0;
 }
+
+/* ComboBox Popup */
+
+.combo-box-popup > .list-view {
+    -fx-background-color: -fx-color-panel-900;
+    -fx-background-insets: 0;
+    -fx-background-radius: 0;
+    -fx-effect: -fx-material-shadow-panel;
+}
+.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell {
+    -fx-padding: 4 0 4 5;
+    /* No alternate highlighting */
+    -fx-background: transparent;
+    -fx-background-insets: 0;
+}
+.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:hover {
+    -fx-background: -fx-accent;
+}
+.combo-box-popup  > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
+.combo-box-popup  > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected:hover {
+    -fx-background: -fx-accent;
+}
+.combo-box-popup > .list-view > .placeholder > .label {
+    -fx-text-fill: derive(-fx-control-inner-background,-30%);
+}
+
+/*
+    -fx-color-panel-400-transparent: rgba(71, 71, 71, 0.5);
+    -fx-color-panel-900: #3d3d3d;
+
+    -fx-material-shadow-panel: dropshadow(three-pass-box, #1a1a1a, 10, 0.01, 1, 1);
+    -fx-material-shadow-control: dropshadow(three-pass-box, #1a1a1a, 4, 0.1,
+    */

resources/ui/css/custom_ids.css

@@ -146,13 +146,13 @@
     -fx-max-width: -fx-min-width;
 }
 
-#MaterialEditorToolbarLabel {
+#MaterialFileEditorToolbarLabel {
     -fx-min-height: 28;
     -fx-pref-height: -fx-min-height;
     -fx-max-height: -fx-min-height;
 }
 
-#MaterialEditorToolbarBox {
+#MaterialFileEditorToolbarBox {
     -fx-min-height: 28;
     -fx-pref-height: -fx-min-height;
     -fx-max-height: -fx-min-height;
@@ -161,7 +161,7 @@
     -fx-max-width: -fx-min-width;
 }
 
-#MaterialEditorParameterContainer {
+#MaterialFileEditorParameterContainer {
     -fx-background-color: -fx-color-panel-200;
     -fx-alignment: top-left;
     -fx-min-width: 300;
@@ -281,4 +281,33 @@
     -fx-min-height: 25;
     -fx-pref-height: -fx-min-height;
     -fx-max-height: -fx-min-height;
+}
+
+#ModelFileEditorParameterContainer {
+    -fx-background-color: -fx-color-panel-200;
+    -fx-alignment: top-left;
+    -fx-min-width: 300;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
+}
+
+#ModelNodeTreeCell {
+    -fx-min-height: 25;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-background: transparent;
+}
+
+#ModelNodeTreeCellDragged {
+    -fx-min-height: 25;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-background: -fx-color-A400;
+}
+
+#ModelNodeTreeCellDropAvailable {
+    -fx-min-height: 25;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-background: -fx-color-A200;
 }

resources/ui/icons/actions/16/geometry.png

@@ -229,7 +229,7 @@ public void simpleInitApp() {
         final AudioRenderer audioRenderer = getAudioRenderer();
         audioRenderer.setEnvironment(new Environment(Environment.Garage));
 
-        viewPort.setBackgroundColor(ColorRGBA.Gray);
+        viewPort.setBackgroundColor(new ColorRGBA(50 / 255F, 50 / 255F, 50 / 255F, 1F));
         cam.setFrustumPerspective(55, (float) cam.getWidth() / cam.getHeight(), 1f, 1000);
 
         final Node guiNode = getGuiNode();