diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/layer.xml b/sdk/jme3-gui/src/com/jme3/gde/gui/layer.xml index 4b3fbf107..8f6de41b0 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/layer.xml +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/layer.xml @@ -88,4 +88,11 @@ + + + + + + + diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/multiview/MouseInputEvent.java b/sdk/jme3-gui/src/com/jme3/gde/gui/multiview/MouseInputEvent.java new file mode 100644 index 000000000..71a37d433 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/multiview/MouseInputEvent.java @@ -0,0 +1,27 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package com.jme3.gde.gui.multiview; + +/** + * + * @author normenhansen + */ +public class MouseInputEvent { + int x; + int y; + int button; + int huh; + boolean pressed; + + public MouseInputEvent(int x, int y, int button, int huh, boolean pressed) { + this.x = x; + this.y = y; + this.button = button; + this.huh = huh; + this.pressed = pressed; + } + +} diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/multiview/NiftyPreviewInputHandler.java b/sdk/jme3-gui/src/com/jme3/gde/gui/multiview/NiftyPreviewInputHandler.java index 86bfc7355..ada3544dc 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/multiview/NiftyPreviewInputHandler.java +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/multiview/NiftyPreviewInputHandler.java @@ -6,7 +6,6 @@ package com.jme3.gde.gui.multiview; import de.lessvoid.nifty.NiftyInputConsumer; import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent; -import de.lessvoid.nifty.input.mouse.MouseInputEvent; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -23,7 +22,7 @@ public class NiftyPreviewInputHandler implements de.lessvoid.nifty.spi.input.Inp public synchronized void forwardEvents(NiftyInputConsumer nic) { for (Iterator it = mouseEvents.iterator(); it.hasNext();) { MouseInputEvent mouseInputEvent = it.next(); - nic.processMouseEvent(mouseInputEvent); + nic.processMouseEvent(mouseInputEvent.x, mouseInputEvent.y, mouseInputEvent.button, mouseInputEvent.huh, mouseInputEvent.pressed); it.remove(); } for (Iterator it = keyEvents.iterator(); it.hasNext();) { @@ -34,9 +33,10 @@ public class NiftyPreviewInputHandler implements de.lessvoid.nifty.spi.input.Inp } public synchronized void addMouseEvent(int newMouseX, int newMouseY, boolean mouseDown) { - MouseInputEvent event = new MouseInputEvent(newMouseX, newMouseY, mouseDown); + MouseInputEvent event = new MouseInputEvent(newMouseX, newMouseY, 0, 0, mouseDown); mouseEvents.add(event); } + public synchronized void addKeyEvent(int newKey, char newCharacter, boolean newKeyDown, boolean newShiftDown, boolean newControlDown) { KeyboardInputEvent event = new KeyboardInputEvent(newKey, newCharacter, newKeyDown, newShiftDown, newControlDown); keyEvents.add(event); diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/GuiXMLPaletteFactory.java b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java similarity index 80% rename from sdk/jme3-gui/src/com/jme3/gde/gui/palette/GuiXMLPaletteFactory.java rename to sdk/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java index c79e7e114..9a8d5f170 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/GuiXMLPaletteFactory.java +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/NiftyGUIPaletteFactory.java @@ -21,18 +21,21 @@ import org.openide.util.Lookup; * * @author gw152771 */ -public class GuiXMLPaletteFactory { +public class NiftyGUIPaletteFactory { + //TODO: Create TopComponent for layout and use Palette: + //http://blogs.sun.com/geertjan/entry/convert_your_topcomponent_to_a + //http://www.javanb.com/netbeans/1/19785.html - public static final String JAVA_PALETTE_FOLDER = "JavaPalette"; + public static final String PALETTE_FOLDER = "NiftyGUIPalette"; private static PaletteController palette = null; - public GuiXMLPaletteFactory() { + public NiftyGUIPaletteFactory() { } public static PaletteController createPalette() { try { if (null == palette) - palette = PaletteFactory.createPalette(JAVA_PALETTE_FOLDER, new MyActions()); + palette = PaletteFactory.createPalette(PALETTE_FOLDER, new MyActions()); return palette; } catch (IOException ex) { Exceptions.printStackTrace(ex); diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.java b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.java new file mode 100644 index 000000000..5a442cf62 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.java @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2009-2010 jMonkeyEngine + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'jMonkeyEngine' nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package com.jme3.gde.gui.palette; +import javax.swing.text.BadLocationException; +import javax.swing.text.JTextComponent; +import org.openide.text.ActiveEditorDrop; + +/** + * + * @author normenhansen, zathras + */ +public class Screen implements ActiveEditorDrop { + + public Screen() { + } + + private String createBody() { + + String body = ""; + return body; + } + + public boolean handleTransfer(JTextComponent targetComponent) { + String body = createBody(); + try { + JmePaletteUtilities.insert(body, targetComponent); + } catch (BadLocationException ble) { + return false; + } + return true; + } + +} diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml new file mode 100644 index 000000000..842a60646 --- /dev/null +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + Screen + light source (ambient) + + + \ No newline at end of file