- fix Nifty compile
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7126 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
parent
f7f47a13e4
commit
2fc2623e97
@ -88,4 +88,11 @@
|
|||||||
</file>
|
</file>
|
||||||
</folder>
|
</folder>
|
||||||
</folder>
|
</folder>
|
||||||
|
<folder name="NiftyGUIPalette">
|
||||||
|
<folder name="Basic">
|
||||||
|
<file name="Screen.xml" url="nbresloc:/com/jme3/gde/gui/palette/Screen.xml">
|
||||||
|
<attr name="position" intvalue="150"/>
|
||||||
|
</file>
|
||||||
|
</folder>
|
||||||
|
</folder>
|
||||||
</filesystem>
|
</filesystem>
|
||||||
|
@ -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;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -6,7 +6,6 @@ package com.jme3.gde.gui.multiview;
|
|||||||
|
|
||||||
import de.lessvoid.nifty.NiftyInputConsumer;
|
import de.lessvoid.nifty.NiftyInputConsumer;
|
||||||
import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
|
import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
|
||||||
import de.lessvoid.nifty.input.mouse.MouseInputEvent;
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -23,7 +22,7 @@ public class NiftyPreviewInputHandler implements de.lessvoid.nifty.spi.input.Inp
|
|||||||
public synchronized void forwardEvents(NiftyInputConsumer nic) {
|
public synchronized void forwardEvents(NiftyInputConsumer nic) {
|
||||||
for (Iterator<MouseInputEvent> it = mouseEvents.iterator(); it.hasNext();) {
|
for (Iterator<MouseInputEvent> it = mouseEvents.iterator(); it.hasNext();) {
|
||||||
MouseInputEvent mouseInputEvent = it.next();
|
MouseInputEvent mouseInputEvent = it.next();
|
||||||
nic.processMouseEvent(mouseInputEvent);
|
nic.processMouseEvent(mouseInputEvent.x, mouseInputEvent.y, mouseInputEvent.button, mouseInputEvent.huh, mouseInputEvent.pressed);
|
||||||
it.remove();
|
it.remove();
|
||||||
}
|
}
|
||||||
for (Iterator<KeyboardInputEvent> it = keyEvents.iterator(); it.hasNext();) {
|
for (Iterator<KeyboardInputEvent> 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) {
|
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);
|
mouseEvents.add(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized void addKeyEvent(int newKey, char newCharacter, boolean newKeyDown, boolean newShiftDown, boolean newControlDown) {
|
public synchronized void addKeyEvent(int newKey, char newCharacter, boolean newKeyDown, boolean newShiftDown, boolean newControlDown) {
|
||||||
KeyboardInputEvent event = new KeyboardInputEvent(newKey, newCharacter, newKeyDown, newShiftDown, newControlDown);
|
KeyboardInputEvent event = new KeyboardInputEvent(newKey, newCharacter, newKeyDown, newShiftDown, newControlDown);
|
||||||
keyEvents.add(event);
|
keyEvents.add(event);
|
||||||
|
@ -21,18 +21,21 @@ import org.openide.util.Lookup;
|
|||||||
*
|
*
|
||||||
* @author gw152771
|
* @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;
|
private static PaletteController palette = null;
|
||||||
|
|
||||||
public GuiXMLPaletteFactory() {
|
public NiftyGUIPaletteFactory() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PaletteController createPalette() {
|
public static PaletteController createPalette() {
|
||||||
try {
|
try {
|
||||||
if (null == palette)
|
if (null == palette)
|
||||||
palette = PaletteFactory.createPalette(JAVA_PALETTE_FOLDER, new MyActions());
|
palette = PaletteFactory.createPalette(PALETTE_FOLDER, new MyActions());
|
||||||
return palette;
|
return palette;
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
Exceptions.printStackTrace(ex);
|
Exceptions.printStackTrace(ex);
|
63
sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.java
Normal file
63
sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.java
Normal file
@ -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 = "<screen></screen>";
|
||||||
|
return body;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean handleTransfer(JTextComponent targetComponent) {
|
||||||
|
String body = createBody();
|
||||||
|
try {
|
||||||
|
JmePaletteUtilities.insert(body, targetComponent);
|
||||||
|
} catch (BadLocationException ble) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
17
sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml
Normal file
17
sdk/jme3-gui/src/com/jme3/gde/gui/palette/Screen.xml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE editor_palette_item PUBLIC "-//NetBeans//Editor Palette Item 1.1//EN"
|
||||||
|
"http://www.netbeans.org/dtds/editor-palette-item-1_1.dtd">
|
||||||
|
|
||||||
|
<editor_palette_item version="1.0">
|
||||||
|
|
||||||
|
<class name="com.jme3.gde.gui.palette.Screen" />
|
||||||
|
|
||||||
|
<icon16 urlvalue="com/jme3/gde/core/sceneviewer/jme-logo.png" />
|
||||||
|
<icon32 urlvalue="com/jme3/gde/core/sceneviewer/jme-logo.png" />
|
||||||
|
|
||||||
|
<inline-description>
|
||||||
|
<display-name>Screen</display-name>
|
||||||
|
<tooltip>light source (ambient)</tooltip>
|
||||||
|
</inline-description>
|
||||||
|
|
||||||
|
</editor_palette_item>
|
Loading…
x
Reference in New Issue
Block a user