-
-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Set mesh or texture to nothing (#232)
Work on #225 # New mesh selection process 1. `Add` a MeshInstance. 2. Click the MeshInstance. 3. Click the `...` selection button 4. Click `Load Mesh` and locate a mesh in your file system. Mesh Chooser Dialog is same as before. 5. Click to select your newly loaded mesh. Note all loaded meshes will appear in this list. 6. Click `Clear` to set the selection to nothing. 7. Click `OK` to confirm your selection. 8. If you have selected a mesh, it will appear at the world origin. - If you have moved the MeshInstance it may be somewhere else. - If you have `3D View > Render > Meshes` turned off it may not be visible. 
- Loading branch information
Showing
34 changed files
with
436 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletions
154
src/main/java/com/marginallyclever/ro3/apps/dialogs/MeshChooserDialog.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| package com.marginallyclever.ro3.apps.dialogs; | ||
|
|
||
| import javax.swing.*; | ||
| import java.awt.*; | ||
| import java.awt.event.ActionEvent; | ||
| import java.util.Objects; | ||
|
|
||
| import com.marginallyclever.ro3.Registry; | ||
| import com.marginallyclever.ro3.listwithevents.ItemAddedListener; | ||
| import com.marginallyclever.ro3.listwithevents.ItemRemovedListener; | ||
| import com.marginallyclever.ro3.mesh.Mesh; | ||
| import com.marginallyclever.ro3.mesh.MeshFactory; | ||
|
|
||
| /** | ||
| * <p>The {@link MeshChooserDialog} class allows for selecting a {@link com.marginallyclever.ro3.mesh.Mesh} | ||
| * that has been previously loaded by the {@link MeshFactory}. | ||
| * This class also provides access to the {@link MeshFactoryDialog} for loading additional meshes.</p> | ||
| * <p>TODO In the future it would be nice to count references and unload it when no longer needed.</p> | ||
| */ | ||
| public class MeshChooserDialog extends JPanel implements ItemAddedListener<Mesh>, ItemRemovedListener<Mesh> { | ||
| private final DefaultListModel<Mesh> model = new DefaultListModel<>(); | ||
| private final JList<Mesh> list = new JList<>(); | ||
| private final JToolBar toolBar = new JToolBar(); | ||
| private Mesh selectedItem; | ||
| private String viewType; | ||
|
|
||
| public MeshChooserDialog() { | ||
| super(new BorderLayout()); | ||
|
|
||
| setupToolbar(); | ||
| setupMeshList(); | ||
|
|
||
| var clearButton = new JButton("Clear"); | ||
| clearButton.addActionListener(e -> setSelectedItem(null)); | ||
|
|
||
| add(toolBar, BorderLayout.NORTH); | ||
| add(new JScrollPane(list), BorderLayout.CENTER); | ||
| add(clearButton, BorderLayout.SOUTH); | ||
| } | ||
|
|
||
| public void setSelectedItem(Mesh mesh) { | ||
| selectedItem = mesh; | ||
| if(mesh==null) { | ||
| list.clearSelection(); | ||
| } else { | ||
| list.setSelectedValue(mesh, true); | ||
| } | ||
| } | ||
|
|
||
| private void setupToolbar() { | ||
| toolBar.add(new JButton(new AbstractAction() { | ||
| { | ||
| putValue(Action.NAME, "Load Mesh"); | ||
| putValue(Action.SHORT_DESCRIPTION, "Load a mesh from a file."); | ||
| putValue(Action.SMALL_ICON, new ImageIcon(Objects.requireNonNull(getClass().getResource( | ||
| "/com/marginallyclever/ro3/apps/actions/icons8-load-16.png")))); | ||
| } | ||
|
|
||
| @Override | ||
| public void actionPerformed(ActionEvent e) { | ||
| MeshFactoryDialog meshFactoryDialog = new MeshFactoryDialog(); | ||
| int result = meshFactoryDialog.run(); | ||
| if (result == JFileChooser.APPROVE_OPTION) { | ||
| Mesh mesh = meshFactoryDialog.getMesh(); | ||
| setSelectedItem(mesh); | ||
| } | ||
| } | ||
| })); | ||
|
|
||
| /* | ||
| String[] viewTypes = {"List View", "Detail View", "Thumbnail View"}; | ||
| JComboBox<String> viewTypeComboBox = new JComboBox<>(viewTypes); | ||
| viewTypeComboBox.addActionListener(e -> { | ||
| viewType = (String) viewTypeComboBox.getSelectedItem(); | ||
| updateView(); | ||
| }); | ||
| toolbar.add(viewTypeComboBox); | ||
| */ | ||
| } | ||
|
|
||
| private void setupMeshList() { | ||
| list.setCellRenderer(new DefaultListCellRenderer() { | ||
| @Override | ||
| public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) { | ||
| Mesh mesh = (Mesh) value; | ||
| String text = mesh.getSourceName() + " (" + mesh.getNumVertices() + " vertices)"; | ||
| return super.getListCellRendererComponent(list, text, index, isSelected, cellHasFocus); | ||
| } | ||
| }); | ||
|
|
||
| for (Mesh mesh : Registry.meshFactory.getPool().getList()) { | ||
| model.addElement(mesh); | ||
| } | ||
| list.setModel(model); | ||
| list.addListSelectionListener(e -> selectedItem = list.getSelectedValue()); | ||
| } | ||
|
|
||
| @Override | ||
| public void addNotify() { | ||
| super.addNotify(); | ||
| Registry.meshFactory.getPool().addItemAddedListener(this); | ||
| Registry.meshFactory.getPool().addItemRemovedListener(this); | ||
| } | ||
|
|
||
| @Override | ||
| public void removeNotify() { | ||
| super.removeNotify(); | ||
| Registry.meshFactory.getPool().removeItemAddedListener(this); | ||
| Registry.meshFactory.getPool().removeItemRemovedListener(this); | ||
| } | ||
|
|
||
| private void updateView() { | ||
| // Update the list of meshes based on the selected view type | ||
| // This could involve changing the ListCellRenderer of the JList | ||
| // For example, for the "Thumbnail View", you could display a small preview of each mesh | ||
| } | ||
|
|
||
| public Mesh getSelectedItem() { | ||
| return selectedItem; | ||
| } | ||
|
|
||
| @Override | ||
| public void itemAdded(Object source, Mesh item) { | ||
| model.addElement(item); | ||
| } | ||
|
|
||
| @Override | ||
| public void itemRemoved(Object source, Mesh item) { | ||
| model.removeElement(item); | ||
| } | ||
|
|
||
| /** | ||
| * Run the selection as a dialog. | ||
| * @param parent the parent component for the dialog. | ||
| * @return JFileChooser.APPROVE_OPTION or JFileChooser.CANCEL_OPTION. return type is int because this is a | ||
| * JFileChooser replacement. It is consistent with {@link MeshFactoryDialog} and {@link TextureFactoryDialog}. | ||
| */ | ||
| public int run(JComponent parent) { | ||
| int result = JOptionPane.showOptionDialog( | ||
| parent, | ||
| this, | ||
| "Select", | ||
| JOptionPane.OK_CANCEL_OPTION, | ||
| JOptionPane.PLAIN_MESSAGE, | ||
| new ImageIcon(Objects.requireNonNull(getClass().getResource( | ||
| "/com/marginallyclever/ro3/apps/dialogs/icons8-mesh-16.png"))), | ||
| null, | ||
| null); | ||
| if(result == JOptionPane.OK_OPTION) { | ||
| return JFileChooser.APPROVE_OPTION; | ||
| } | ||
| return JFileChooser.CANCEL_OPTION; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.