-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
18 changed files
with
250 additions
and
30 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package macbury.forge.psychics; | ||
|
|
||
| /** | ||
| * Created by macbury on 08.04.15. | ||
| */ | ||
| public class VoxelWorldPsychics { | ||
| } |
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 |
|---|---|---|
|
|
@@ -41,5 +41,6 @@ public LevelEntityEngine(Level level) { | |
| public void dispose() { | ||
| debug.dispose(); | ||
| removeAllEntities(); | ||
|
|
||
| } | ||
| } | ||
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
162 changes: 162 additions & 0 deletions
162
editor/src/macbury/forge/editor/controllers/tools/inspector/editors/ColorEditor.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,162 @@ | ||
| package macbury.forge.editor.controllers.tools.inspector.editors; | ||
|
|
||
| import java.awt.BorderLayout; | ||
| import java.awt.Dimension; | ||
| import java.awt.Image; | ||
| import java.awt.event.ActionEvent; | ||
| import java.awt.event.MouseEvent; | ||
| import java.awt.event.MouseListener; | ||
| import java.io.IOException; | ||
|
|
||
| import javax.imageio.ImageIO; | ||
| import javax.swing.AbstractAction; | ||
| import javax.swing.BorderFactory; | ||
| import javax.swing.BoxLayout; | ||
| import javax.swing.ImageIcon; | ||
| import javax.swing.JButton; | ||
| import javax.swing.JColorChooser; | ||
| import javax.swing.JPanel; | ||
| import javax.swing.JTextField; | ||
| import javax.swing.UIManager; | ||
|
|
||
| import com.badlogic.gdx.graphics.Color; | ||
| import com.l2fprod.common.beans.editor.AbstractPropertyEditor; | ||
| import com.l2fprod.common.swing.renderer.ColorCellRenderer; | ||
|
|
||
|
|
||
| /** | ||
| * Color editor. | ||
| * | ||
| * @author Bartosz Firyn (SarXos) | ||
| */ | ||
| public class ColorEditor extends AbstractPropertyEditor { | ||
|
|
||
| protected class ColorEditorComponent extends JPanel { | ||
|
|
||
| private static final long serialVersionUID = 411604969565728959L; | ||
|
|
||
| private ColorCellRenderer label = null; | ||
| private JButton button = null; | ||
|
|
||
| public ColorEditorComponent() { | ||
|
|
||
| setLayout(new BoxLayout(this, BoxLayout.X_AXIS)); | ||
|
|
||
| label = new ColorCellRenderer(); | ||
| label.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0)); | ||
| label.setAlignmentX(JTextField.LEFT_ALIGNMENT); | ||
| label.setBackground(UIManager.getColor("Table.selectionBackground")); | ||
| label.setForeground(UIManager.getColor("Table.selectionForeground")); | ||
|
|
||
| Dimension size = new Dimension(24, 15); | ||
|
|
||
| Image pencil = null; | ||
| try { | ||
| pencil = ImageIO.read(getClass().getClassLoader().getResourceAsStream("icons/edit.png")); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException("Cannot load resource", e); | ||
| } | ||
|
|
||
| button = new JButton(); | ||
| button.setPreferredSize(size); | ||
| button.setSize(size); | ||
| button.setMaximumSize(size); | ||
| button.setMinimumSize(size); | ||
| button.setAction(new AbstractAction("", new ImageIcon(pencil)) { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Override | ||
| public void actionPerformed(ActionEvent e) { | ||
| selectColor(); | ||
| } | ||
| }); | ||
|
|
||
| label.addMouseListener(new MouseListener() { | ||
| @Override | ||
| public void mouseClicked(MouseEvent e) { | ||
| selectColor(); | ||
| } | ||
|
|
||
| @Override | ||
| public void mousePressed(MouseEvent e) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void mouseReleased(MouseEvent e) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void mouseEntered(MouseEvent e) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void mouseExited(MouseEvent e) { | ||
|
|
||
| } | ||
| }); | ||
|
|
||
|
|
||
| JPanel left = new JPanel(); | ||
| left.setLayout(new BorderLayout(0, 0)); | ||
| left.add(label); | ||
| left.setAlignmentX(JPanel.LEFT_ALIGNMENT); | ||
|
|
||
| JPanel right = new JPanel(); | ||
| right.setLayout(new BoxLayout(right, BoxLayout.X_AXIS)); | ||
| right.add(button); | ||
| right.setPreferredSize(new Dimension(size.width, 25)); | ||
| right.setAlignmentX(JPanel.RIGHT_ALIGNMENT); | ||
|
|
||
| add(left, BorderLayout.WEST); | ||
| add(right, BorderLayout.CENTER); | ||
| } | ||
|
|
||
| public void setColor(Color color) { | ||
| label.setValue(new java.awt.Color(color.toIntBits())); | ||
| ColorEditor.this.color = color; | ||
| } | ||
| } | ||
|
|
||
| private ColorEditorComponent colorEditor = null; | ||
| private Color color; | ||
|
|
||
| public ColorEditor() { | ||
| editor = colorEditor = new ColorEditorComponent(); | ||
| } | ||
|
|
||
| @Override | ||
| public Object getValue() { | ||
| return color; | ||
| } | ||
|
|
||
| @Override | ||
| public void setValue(Object value) { | ||
| colorEditor.setColor((Color) value); | ||
| } | ||
|
|
||
| protected void selectColor() { | ||
| java.awt.Color oldColor = new java.awt.Color(color.toIntBits()); | ||
| String title = "Select color"; | ||
| java.awt.Color selectedColor = JColorChooser.showDialog(editor, title, oldColor); | ||
|
|
||
| if (selectedColor != null) { | ||
|
|
||
| selectedColor.toString(); | ||
| Color newColor = new Color(selectedColor.getRed()); | ||
|
|
||
| //colorEditor.setColor(newColor); | ||
|
|
||
| //firePropertyChange(oldColor, newColor); | ||
| } | ||
| } | ||
|
|
||
| protected void selectNull() { | ||
| //Color oldColor = color; | ||
| //colorEditor.setColor(null); | ||
| //firePropertyChange(oldColor, null); | ||
| } | ||
| } |
5 changes: 1 addition & 4 deletions
5
...spector/properties/DefaultBeanBinder.java → ...spector/properties/DefaultBeanBinder.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
Oops, something went wrong.