реализован выбор Queue Bucket у моделей превью материалов

Author: JavaSaBr

resources/messages/messages.properties

@@ -28,6 +28,7 @@ AssetEditorDialogButtonOk=Choose
 AssetEditorDialogButtonCancel=Cancel
 
 MaterialFileEditorMaterialTypeLabel=Material type
+MaterialFileEditorBucketTypeLabel=Queue Bucket
 
 MaterialFileEditorTexturesComponentTitle=Textures
 MaterialFileEditorColorsComponentTitle=Colors

resources/messages/messages_ru.properties

@@ -28,6 +28,7 @@ AssetEditorDialogButtonOk=Выбрать
 AssetEditorDialogButtonCancel=Отменить
 
 MaterialFileEditorMaterialTypeLabel=Тип материала
+MaterialFileEditorBucketTypeLabel=Порядок рендера
 
 MaterialFileEditorTexturesComponentTitle=Текстуры
 MaterialFileEditorColorsComponentTitle=Цвета

resources/ui/css/custom_ids.css

@@ -161,6 +161,15 @@
     -fx-max-width: -fx-min-width;
 }
 
+#MaterialFileEditorToolbarSmallBox {
+    -fx-min-height: 28;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-min-width: 150;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
+}
+
 #MaterialFileEditorParameterContainer {
     -fx-background-color: -fx-color-panel-200;
     -fx-alignment: top-left;

src/com/ss/editor/Messages.java

@@ -39,6 +39,7 @@ public class Messages {
     public static final String ASSET_EDITOR_DIALOG_BUTTON_CANCEL;
 
     public static final String MATERIAL_EDITOR_MATERIAL_TYPE_LABEL;
+    public static final String MATERIAL_FILE_EDITOR_BUCKET_TYPE_LABEL;
 
     public static final String MATERIAL_FILE_EDITOR_TEXTURES_COMPONENT_TITLE;
     public static final String MATERIAL_FILE_EDITOR_COLORS_COMPONENT_TITLE;
@@ -156,6 +157,7 @@ public class Messages {
     public static final String EMPTY_MODEL_CREATOR_TITLE;
 
     public static final String GLSL_FILE_EDITOR_NAME;
+;
 
     static {
 
@@ -184,7 +186,6 @@ public class Messages {
         FILE_EDITOR_ACTION_SAVE = bundle.getString("FileEditorActionSave");
 
         POST_FILTER_EDITOR_MATERIAL_LABEL = bundle.getString("PostFilterEditorMaterialListLabel");
-
         ASSET_EDITOR_DIALOG_TITLE = bundle.getString("AssetEditorDialogTitle");
         ASSET_EDITOR_DIALOG_BUTTON_OK = bundle.getString("AssetEditorDialogButtonOk");
         ASSET_EDITOR_DIALOG_BUTTON_CANCEL = bundle.getString("AssetEditorDialogButtonCancel");
@@ -212,6 +213,7 @@ public class Messages {
         MATERIAL_RENDER_STATE_WIREFRAME = bundle.getString("MaterialRenderStateWireframe");
 
         MATERIAL_EDITOR_MATERIAL_TYPE_LABEL = bundle.getString("MaterialFileEditorMaterialTypeLabel");
+        MATERIAL_FILE_EDITOR_BUCKET_TYPE_LABEL = bundle.getString("MaterialFileEditorBucketTypeLabel");
 
         TEXT_FILE_EDITOR_NAME = bundle.getString("TextFileEditorName");
         POST_FILTER_EDITOR_NAME = bundle.getString("PostFilterEditorName");

src/com/ss/editor/state/editor/impl/material/MaterialEditorState.java

@@ -11,6 +11,7 @@
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 import com.jme3.renderer.Camera;
+import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
@@ -195,6 +196,28 @@ private void changeModeImpl(final ModelType modelType) {
         setCurrentModelType(modelType);
     }
 
+    /**
+     * Смена типа Bucket.
+     */
+    public void changeBucketType(final RenderQueue.Bucket bucket) {
+        EXECUTOR_MANAGER.addEditorThreadTask(() -> changeBucketTypeImpl(bucket));
+    }
+
+    /**
+     * Процесс смены типа Bucket.
+     */
+    private void changeBucketTypeImpl(final RenderQueue.Bucket bucket) {
+
+        final Geometry testQuad = getTestQuad();
+        testQuad.setQueueBucket(bucket);
+
+        final Geometry testSphere = getTestSphere();
+        testSphere.setQueueBucket(bucket);
+
+        final Geometry testBox = getTestBox();
+        testBox.setQueueBucket(bucket);
+    }
+
     @Override
     public void initialize(final AppStateManager stateManager, final Application application) {
         super.initialize(stateManager, application);

src/com/ss/editor/ui/component/editor/impl/material/MaterialFileEditor.java

@@ -3,6 +3,7 @@
 import com.jme3.asset.AssetManager;
 import com.jme3.material.Material;
 import com.jme3.material.MaterialDef;
+import com.jme3.renderer.queue.RenderQueue;
 import com.ss.editor.FileExtensions;
 import com.ss.editor.Messages;
 import com.ss.editor.manager.ResourceManager;
@@ -23,6 +24,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.event.EventHandler;
@@ -62,6 +64,8 @@ public class MaterialFileEditor extends AbstractFileEditor<StackPane> {
 
     private static final ResourceManager RESOURCE_MANAGER = ResourceManager.getInstance();
 
+    private static final RenderQueue.Bucket[] BUCKETS = RenderQueue.Bucket.values();
+
     private static final Insets SMALL_OFFSET = new Insets(0, 0, 0, 3);
     private static final Insets BIG_OFFSET = new Insets(0, 0, 0, 6);
 
@@ -120,6 +124,11 @@ public class MaterialFileEditor extends AbstractFileEditor<StackPane> {
      */
     private ToggleButton lightButton;
 
+    /**
+     * Выпадающий список с выбором RenderQueue.Bucket.
+     */
+    private ComboBox<RenderQueue.Bucket> bucketComboBox;
+
     /**
      * Список доступных типов материалов.
      */
@@ -378,6 +387,13 @@ protected boolean needToolbar() {
         return true;
     }
 
+    /**
+     * @return выпадающий список с выбором RenderQueue.Bucket.
+     */
+    private ComboBox<RenderQueue.Bucket> getBucketComboBox() {
+        return bucketComboBox;
+    }
+
     @Override
     protected void createToolbar(final HBox container) {
 
@@ -405,13 +421,23 @@ protected void createToolbar(final HBox container) {
         materialDefinitionBox.setId(CSSIds.MATERIAL_FILE_EDITOR_TOOLBAR_BOX);
         materialDefinitionBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> changeType(newValue));
 
+        final Label bucketLabel = new Label(Messages.MATERIAL_FILE_EDITOR_BUCKET_TYPE_LABEL + ":");
+        bucketLabel.setId(CSSIds.MATERIAL_FILE_EDITOR_TOOLBAR_LABEL);
+
+        bucketComboBox = new ComboBox<>(FXCollections.observableArrayList(BUCKETS));
+        bucketComboBox.setId(CSSIds.MATERIAL_FILE_EDITOR_TOOLBAR_SMALL_BOX);
+        bucketComboBox.getSelectionModel().select(RenderQueue.Bucket.Inherit);
+        bucketComboBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> changeBucketType(newValue));
+
         FXUtils.addToPane(createSaveAction(), container);
         FXUtils.addToPane(cubeButton, container);
         FXUtils.addToPane(sphereButton, container);
         FXUtils.addToPane(planeButton, container);
         FXUtils.addToPane(lightButton, container);
         FXUtils.addToPane(materialDefinitionLabel, container);
         FXUtils.addToPane(materialDefinitionBox, container);
+        FXUtils.addToPane(bucketLabel, container);
+        FXUtils.addToPane(bucketComboBox, container);
 
         FXUtils.addClassTo(cubeButton, CSSClasses.TOOLBAR_BUTTON);
         FXUtils.addClassTo(cubeButton, CSSClasses.FILE_EDITOR_TOOLBAR_BUTTON);
@@ -423,12 +449,24 @@ protected void createToolbar(final HBox container) {
         FXUtils.addClassTo(lightButton, CSSClasses.FILE_EDITOR_TOOLBAR_BUTTON);
         FXUtils.addClassTo(materialDefinitionLabel, CSSClasses.MAIN_FONT_13);
         FXUtils.addClassTo(materialDefinitionBox, CSSClasses.MAIN_FONT_13);
+        FXUtils.addClassTo(bucketLabel, CSSClasses.MAIN_FONT_13);
+        FXUtils.addClassTo(bucketComboBox, CSSClasses.MAIN_FONT_13);
 
         HBox.setMargin(cubeButton, SMALL_OFFSET);
         HBox.setMargin(sphereButton, SMALL_OFFSET);
         HBox.setMargin(planeButton, SMALL_OFFSET);
         HBox.setMargin(lightButton, BIG_OFFSET);
         HBox.setMargin(materialDefinitionLabel, BIG_OFFSET);
+        HBox.setMargin(bucketLabel, BIG_OFFSET);
+    }
+
+    /**
+     * Обработка смны Bucket типа.
+     */
+    private void changeBucketType(final RenderQueue.Bucket newValue) {
+
+        final MaterialEditorState editorState = getEditorState();
+        editorState.changeBucketType(newValue);
     }
 
     /**

src/com/ss/editor/ui/css/CSSIds.java

@@ -37,6 +37,7 @@ public interface CSSIds {
 
     public static final String MATERIAL_FILE_EDITOR_TOOLBAR_LABEL = "MaterialFileEditorToolbarLabel";
     public static final String MATERIAL_FILE_EDITOR_TOOLBAR_BOX = "MaterialFileEditorToolbarBox";
+    public static final String MATERIAL_FILE_EDITOR_TOOLBAR_SMALL_BOX = "MaterialFileEditorToolbarSmallBox";
     public static final String MATERIAL_FILE_EDITOR_PARAMETER_CONTAINER = "MaterialFileEditorParameterContainer";
 
     public static final String MATERIAL_PARAM_CONTROL_PARAM_NAME = "MaterialParamControlParamName";