diff --git a/sdk/jme3-core/nbproject/project.xml b/sdk/jme3-core/nbproject/project.xml index d640317f2..7538930a1 100644 --- a/sdk/jme3-core/nbproject/project.xml +++ b/sdk/jme3-core/nbproject/project.xml @@ -1,272 +1,281 @@ - - - org.netbeans.modules.apisupport.project - - - com.jme3.gde.core - - - - com.jme3.gde.core.baselibs - - - - 1 - 0.6 - - - - com.jme3.gde.core.libraries - - - - 1 - 0.5 - - - - com.jme3.gde.core.updatecenters - - 0.6 - - - - org.netbeans.api.progress - - - - 1 - 1.16.1.1 - - - - org.netbeans.libs.javacapi - - - - 0.11.1.1 - - - - org.netbeans.modules.autoupdate.services - - 1.16.1 - - - - org.netbeans.modules.editor.lib2 - - - - 1 - 1.18.1.2 - - - - org.netbeans.modules.java.j2seproject - - - - 1 - - - - - org.netbeans.modules.java.source - - - - 0.52.2.8.8.2 - - - - org.netbeans.modules.project.ant - - - - 1 - 1.37 - - - - org.netbeans.modules.project.libraries - - - - 1 - 1.25.1 - - - - org.netbeans.modules.projectapi - - - - 1 - 1.28.1 - - - - org.netbeans.modules.projectuiapi - - - - 1 - 1.40.1.6 - - - - org.netbeans.modules.settings - - - - 1 - 1.22.1.1 - - - - org.netbeans.spi.palette - - - - 1 - 1.20.1 - - - - org.openide.actions - - - - 6.12.1.1 - - - - org.openide.awt - - - - 7.19.1.1 - - - - org.openide.dialogs - - - - 7.13.1 - - - - org.openide.explorer - - - - 6.22.2.1 - - - - org.openide.filesystems - - - - 7.32.1.1.1 - - - - org.openide.io - - - - 1.20.1 - - - - org.openide.loaders - - - - 7.10.1 - - - - org.openide.modules - - - - 7.13.1 - - - - org.openide.nodes - - - - 7.12.1.1 - - - - org.openide.text - - - - 6.27.1 - - - - org.openide.util - - - - 7.31.1.1 - - - - org.openide.util.lookup - - - - 8.3.1 - - - - org.openide.windows - - - - 6.30.1 - - - - - com.jme3.gde.core - com.jme3.gde.core.assets - com.jme3.gde.core.assets.actions - com.jme3.gde.core.assets.nodes - com.jme3.gde.core.codeless - com.jme3.gde.core.filters - com.jme3.gde.core.filters.actions - com.jme3.gde.core.filters.impl - com.jme3.gde.core.j2seproject - com.jme3.gde.core.nodes - com.jme3.gde.core.properties - com.jme3.gde.core.scene - com.jme3.gde.core.scene.actions - com.jme3.gde.core.scene.controller - com.jme3.gde.core.scene.processors - com.jme3.gde.core.sceneexplorer - com.jme3.gde.core.sceneexplorer.nodes - com.jme3.gde.core.sceneexplorer.nodes.actions - com.jme3.gde.core.sceneexplorer.nodes.actions.impl - com.jme3.gde.core.sceneexplorer.nodes.properties - com.jme3.gde.core.sceneviewer - com.jme3.gde.core.undoredo - com.jme3.gde.core.util - - - ext/DDSUtils.jar - release/modules/ext/DDSUtils.jar - - - - + + + org.netbeans.modules.apisupport.project + + + com.jme3.gde.core + + + + com.jme3.gde.core.baselibs + + + + 1 + 0.6 + + + + com.jme3.gde.core.libraries + + + + 1 + 0.5 + + + + com.jme3.gde.core.updatecenters + + 0.6 + + + + org.jdesktop.layout + + + + 1 + 1.18 + + + + org.netbeans.api.progress + + + + 1 + 1.16.1.1 + + + + org.netbeans.libs.javacapi + + + + 0.11.1.1 + + + + org.netbeans.modules.autoupdate.services + + 1.16.1 + + + + org.netbeans.modules.editor.lib2 + + + + 1 + 1.18.1.2 + + + + org.netbeans.modules.java.j2seproject + + + + 1 + + + + + org.netbeans.modules.java.source + + + + 0.52.2.8.8.2 + + + + org.netbeans.modules.project.ant + + + + 1 + 1.37 + + + + org.netbeans.modules.project.libraries + + + + 1 + 1.25.1 + + + + org.netbeans.modules.projectapi + + + + 1 + 1.28.1 + + + + org.netbeans.modules.projectuiapi + + + + 1 + 1.40.1.6 + + + + org.netbeans.modules.settings + + + + 1 + 1.22.1.1 + + + + org.netbeans.spi.palette + + + + 1 + 1.20.1 + + + + org.openide.actions + + + + 6.12.1.1 + + + + org.openide.awt + + + + 7.19.1.1 + + + + org.openide.dialogs + + + + 7.13.1 + + + + org.openide.explorer + + + + 6.22.2.1 + + + + org.openide.filesystems + + + + 7.32.1.1.1 + + + + org.openide.io + + + + 1.20.1 + + + + org.openide.loaders + + + + 7.10.1 + + + + org.openide.modules + + + + 7.13.1 + + + + org.openide.nodes + + + + 7.12.1.1 + + + + org.openide.text + + + + 6.27.1 + + + + org.openide.util + + + + 7.31.1.1 + + + + org.openide.util.lookup + + + + 8.3.1 + + + + org.openide.windows + + + + 6.30.1 + + + + + com.jme3.gde.core + com.jme3.gde.core.assets + com.jme3.gde.core.assets.actions + com.jme3.gde.core.assets.nodes + com.jme3.gde.core.codeless + com.jme3.gde.core.filters + com.jme3.gde.core.filters.actions + com.jme3.gde.core.filters.impl + com.jme3.gde.core.j2seproject + com.jme3.gde.core.nodes + com.jme3.gde.core.properties + com.jme3.gde.core.scene + com.jme3.gde.core.scene.actions + com.jme3.gde.core.scene.controller + com.jme3.gde.core.scene.processors + com.jme3.gde.core.sceneexplorer + com.jme3.gde.core.sceneexplorer.nodes + com.jme3.gde.core.sceneexplorer.nodes.actions + com.jme3.gde.core.sceneexplorer.nodes.actions.impl + com.jme3.gde.core.sceneexplorer.nodes.properties + com.jme3.gde.core.sceneviewer + com.jme3.gde.core.undoredo + com.jme3.gde.core.util + + + ext/DDSUtils.jar + release/modules/ext/DDSUtils.jar + + + + diff --git a/sdk/jme3-core/src/com/jme3/gde/core/layer.xml b/sdk/jme3-core/src/com/jme3/gde/core/layer.xml index 76ebc2ae6..fe9569bea 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/layer.xml +++ b/sdk/jme3-core/src/com/jme3/gde/core/layer.xml @@ -11,6 +11,14 @@ + + + + + + + + diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java index 92bdc51f4..3002b7794 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java @@ -470,10 +470,6 @@ public class SceneApplication extends Application implements LookupProvider, Loo }); } - public boolean toggleOrthoPerspMode() { - return camController.toggleOrthoPerspMode(); - } - public void enableWireFrame(final boolean selected) { enqueue(new Callable() { diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java index 40a44f7d1..b003aee2a 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java @@ -28,6 +28,7 @@ import com.jme3.app.Application; import com.jme3.app.state.AbstractAppState; import com.jme3.app.state.AppStateManager; import com.jme3.gde.core.scene.SceneApplication; +import com.jme3.gde.core.scene.controller.toolbars.CameraToolbar; import com.jme3.gde.core.sceneviewer.SceneViewerTopComponent; import com.jme3.input.InputManager; import com.jme3.input.RawInputListener; @@ -79,10 +80,24 @@ public abstract class AbstractCameraController extends AbstractAppState implemen protected boolean checkDraggedR = false; protected boolean checkReleaseLeft = false; protected boolean checkReleaseRight = false; + protected CameraToolbar camToolbar = new CameraToolbar(); public AbstractCameraController(Camera cam, InputManager inputManager) { this.cam = cam; this.inputManager = inputManager; + + java.awt.EventQueue.invokeLater(new Runnable() { + + public void run() { + + SceneViewerTopComponent svtc = SceneViewerTopComponent.findInstance(); + if (svtc != null) { + svtc.addAdditionnalToolbar(camToolbar); + } + + } + }); + } public void setMaster(Object component) { @@ -166,21 +181,19 @@ public abstract class AbstractCameraController extends AbstractAppState implemen } - public boolean toggleOrthoPerspMode() { + public void toggleOrthoPerspMode() { try { - return SceneApplication.getApplication().enqueue(new Callable() { + camToolbar.toggleOrthoMode(SceneApplication.getApplication().enqueue(new Callable() { public Boolean call() throws Exception { return doToggleOrthoPerspMode(); } - }).get(); + }).get()); } catch (InterruptedException ex) { Exceptions.printStackTrace(ex); } catch (ExecutionException ex) { Exceptions.printStackTrace(ex); } - return false; - } protected boolean doToggleOrthoPerspMode() { diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/Bundle.properties b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/Bundle.properties new file mode 100644 index 000000000..94cfd58da --- /dev/null +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/Bundle.properties @@ -0,0 +1,11 @@ +CameraToolbar.frontMenuItem.text=Front +CameraToolbar.rightMenuItem.text=Right +CameraToolbar.topMenuItem.text=Top +CameraToolbar.backMenuItem.text=Back +CameraToolbar.bottomMenuItem.text=Bottom +CameraToolbar.viewButton.label=User +CameraToolbar.leftMenuItem.text=Left +CameraToolbar.enableOrtho.text=Persp. +CameraToolbar.enableOrtho.textO=Ortho. +CameraToolbar.enableOrtho.toolTipText=Toggle Orthographic / Perspective view +CameraToolbar.viewButton.text=User diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/CameraToolbar.form b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/CameraToolbar.form new file mode 100644 index 000000000..fa2149423 --- /dev/null +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/CameraToolbar.form @@ -0,0 +1,181 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/CameraToolbar.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/CameraToolbar.java new file mode 100644 index 000000000..81c848235 --- /dev/null +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/CameraToolbar.java @@ -0,0 +1,232 @@ + +/* + * NewJPanel.java

Created on 20 juil. 2011, 14:50:22 + */ +package com.jme3.gde.core.scene.controller.toolbars; + +import com.jme3.gde.core.sceneviewer.actions.ToggleOrthoPerspAction; +import javax.swing.ImageIcon; +import org.openide.util.NbBundle; + +/** + * + * @author Nehon + */ +public class CameraToolbar extends javax.swing.JToolBar { + + ImageIcon userIcon = new ImageIcon(getClass().getResource("/com/jme3/gde/core/scene/controller/toolbars/user.png")); + //toolbar actions + private ToggleOrthoPerspAction toggleOrthoPerspAction; + + /** + * Creates new form NewJPanel + */ + public CameraToolbar() { + toggleOrthoPerspAction = new ToggleOrthoPerspAction(); + initComponents(); + } + + /** This method is called from within the constructor to + * initialize the form. + * WARNING: Do NOT modify this code. The content of this method is + * always regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + viewMenu = new javax.swing.JPopupMenu(); + frontMenuItem = new javax.swing.JMenuItem(); + leftMenuItem = new javax.swing.JMenuItem(); + rightMenuItem = new javax.swing.JMenuItem(); + topMenuItem = new javax.swing.JMenuItem(); + backMenuItem = new javax.swing.JMenuItem(); + bottomMenuItem = new javax.swing.JMenuItem(); + viewButton = new javax.swing.JButton(); + enableOrtho = new javax.swing.JToggleButton(); + + frontMenuItem.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/core/scene/controller/toolbars/front.png"))); // NOI18N + frontMenuItem.setText(org.openide.util.NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.frontMenuItem.text")); // NOI18N + frontMenuItem.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + frontMenuItemActionPerformed(evt); + } + }); + viewMenu.add(frontMenuItem); + + leftMenuItem.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/core/scene/controller/toolbars/left.png"))); // NOI18N + leftMenuItem.setText(org.openide.util.NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.leftMenuItem.text")); // NOI18N + leftMenuItem.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + leftMenuItemActionPerformed(evt); + } + }); + viewMenu.add(leftMenuItem); + + rightMenuItem.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/core/scene/controller/toolbars/right.png"))); // NOI18N + rightMenuItem.setText(org.openide.util.NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.rightMenuItem.text")); // NOI18N + rightMenuItem.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + rightMenuItemActionPerformed(evt); + } + }); + viewMenu.add(rightMenuItem); + + topMenuItem.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/core/scene/controller/toolbars/top.png"))); // NOI18N + topMenuItem.setText(org.openide.util.NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.topMenuItem.text")); // NOI18N + topMenuItem.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + topMenuItemActionPerformed(evt); + } + }); + viewMenu.add(topMenuItem); + + backMenuItem.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/core/scene/controller/toolbars/back.png"))); // NOI18N + backMenuItem.setText(org.openide.util.NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.backMenuItem.text")); // NOI18N + backMenuItem.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + backMenuItemActionPerformed(evt); + } + }); + viewMenu.add(backMenuItem); + + bottomMenuItem.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/core/scene/controller/toolbars/bottom.png"))); // NOI18N + bottomMenuItem.setText(org.openide.util.NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.bottomMenuItem.text")); // NOI18N + bottomMenuItem.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + bottomMenuItemActionPerformed(evt); + } + }); + viewMenu.add(bottomMenuItem); + + viewButton.setFont(new java.awt.Font("Tahoma", 0, 8)); // NOI18N + viewButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/core/scene/controller/toolbars/user.png"))); // NOI18N + viewButton.setText(org.openide.util.NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.viewButton.text")); // NOI18N + viewButton.setFocusable(false); + viewButton.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); + viewButton.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT); + viewButton.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + viewButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + viewButtonActionPerformed(evt); + } + }); + + enableOrtho.setFont(new java.awt.Font("Tahoma", 0, 8)); // NOI18N + enableOrtho.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/core/sceneviewer/icons/persp.png"))); // NOI18N + enableOrtho.setText(org.openide.util.NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.enableOrtho.text")); // NOI18N + enableOrtho.setToolTipText(org.openide.util.NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.enableOrtho.toolTipText")); // NOI18N + enableOrtho.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); + enableOrtho.setFocusable(false); + enableOrtho.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT); + enableOrtho.setMaximumSize(new java.awt.Dimension(27, 23)); + enableOrtho.setMinimumSize(new java.awt.Dimension(27, 23)); + enableOrtho.setPreferredSize(new java.awt.Dimension(50, 23)); + enableOrtho.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/core/sceneviewer/icons/ortho.png"))); // NOI18N + enableOrtho.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + enableOrtho.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + enableOrthoActionPerformed(evt); + } + }); + + org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(layout.createSequentialGroup() + .add(viewButton) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(enableOrtho, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addContainerGap(96, Short.MAX_VALUE)) + ); + layout.setVerticalGroup( + layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(viewButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(enableOrtho, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + ); + }// //GEN-END:initComponents + +private void viewButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_viewButtonActionPerformed + viewMenu.show(viewButton, viewButton.getX(), viewButton.getY() + viewButton.getHeight()); +}//GEN-LAST:event_viewButtonActionPerformed + +private void frontMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_frontMenuItemActionPerformed + toggleFrontView(); +}//GEN-LAST:event_frontMenuItemActionPerformed + +private void leftMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_leftMenuItemActionPerformed + toggleLeftView(); +}//GEN-LAST:event_leftMenuItemActionPerformed + +private void rightMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rightMenuItemActionPerformed + toggleRightView(); +}//GEN-LAST:event_rightMenuItemActionPerformed + +private void topMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_topMenuItemActionPerformed + toggleTopView(); +}//GEN-LAST:event_topMenuItemActionPerformed + +private void backMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_backMenuItemActionPerformed + toggleBackView(); +}//GEN-LAST:event_backMenuItemActionPerformed + +private void bottomMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bottomMenuItemActionPerformed + toggleBottomView(); +}//GEN-LAST:event_bottomMenuItemActionPerformed + +private void enableOrthoActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_enableOrthoActionPerformed + toggleOrthoPerspAction.actionPerformed(evt); +}//GEN-LAST:event_enableOrthoActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JMenuItem backMenuItem; + private javax.swing.JMenuItem bottomMenuItem; + private javax.swing.JToggleButton enableOrtho; + private javax.swing.JMenuItem frontMenuItem; + private javax.swing.JMenuItem leftMenuItem; + private javax.swing.JMenuItem rightMenuItem; + private javax.swing.JMenuItem topMenuItem; + private javax.swing.JButton viewButton; + private javax.swing.JPopupMenu viewMenu; + // End of variables declaration//GEN-END:variables + + public void toggleFrontView() { + viewButton.setIcon(frontMenuItem.getIcon()); + viewButton.setText(frontMenuItem.getText()); + } + + public void toggleUserView() { + viewButton.setIcon(userIcon); + viewButton.setText(NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.viewButton.label")); + } + + public void toggleLeftView() { + viewButton.setIcon(leftMenuItem.getIcon()); + viewButton.setText(leftMenuItem.getText()); + } + + public void toggleRightView() { + viewButton.setIcon(rightMenuItem.getIcon()); + viewButton.setText(rightMenuItem.getText()); + } + + public void toggleBackView() { + viewButton.setIcon(backMenuItem.getIcon()); + viewButton.setText(backMenuItem.getText()); + } + + public void toggleTopView() { + viewButton.setIcon(topMenuItem.getIcon()); + viewButton.setText(topMenuItem.getText()); + } + + public void toggleBottomView() { + viewButton.setIcon(bottomMenuItem.getIcon()); + viewButton.setText(bottomMenuItem.getText()); + } + + public void toggleOrthoMode(boolean enabled) { + enableOrtho.setText(NbBundle.getMessage(CameraToolbar.class, "CameraToolbar.enableOrtho.text" + (enabled ? "O" : ""))); + enableOrtho.setSelected(enabled); + } +} diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/back.png b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/back.png new file mode 100644 index 000000000..3b9058080 Binary files /dev/null and b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/back.png differ diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/bottom.png b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/bottom.png new file mode 100644 index 000000000..0ac5c2f35 Binary files /dev/null and b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/bottom.png differ diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/front.png b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/front.png new file mode 100644 index 000000000..4aa8b97d1 Binary files /dev/null and b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/front.png differ diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/left.png b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/left.png new file mode 100644 index 000000000..24c8fbecf Binary files /dev/null and b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/left.png differ diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/right.png b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/right.png new file mode 100644 index 000000000..1159c4c80 Binary files /dev/null and b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/right.png differ diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/top.png b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/top.png new file mode 100644 index 000000000..043041f7b Binary files /dev/null and b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/top.png differ diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/user.png b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/user.png new file mode 100644 index 000000000..bb0f2c316 Binary files /dev/null and b/sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/user.png differ diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/SceneExplorerTopComponent.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/SceneExplorerTopComponent.java index b0f13252e..afb1613d9 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/SceneExplorerTopComponent.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/SceneExplorerTopComponent.java @@ -95,7 +95,7 @@ public final class SceneExplorerTopComponent extends TopComponent implements Exp CopyAction copy = SystemAction.get(CopyAction.class); getActionMap().put(copy.getActionMapKey(), ExplorerUtils.actionCopy(explorerManager)); PasteAction paste = SystemAction.get(PasteAction.class); - getActionMap().put(paste.getActionMapKey(), ExplorerUtils.actionPaste(explorerManager)); + getActionMap().put(paste.getActionMapKey(), ExplorerUtils.actionPaste(explorerManager)); DeleteAction delete = SystemAction.get(DeleteAction.class); getActionMap().put(delete.getActionMapKey(), ExplorerUtils.actionDelete(explorerManager, true)); } diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/Bundle.properties b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/Bundle.properties index 7e94c2681..5657de269 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/Bundle.properties +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/Bundle.properties @@ -10,6 +10,4 @@ SceneViewerTopComponent.enableStats.text= SceneViewerTopComponent.jToggleButton2.AccessibleContext.accessibleName=Ortho / Persp SceneViewerTopComponent.jToggleButton1.toolTipText=show post filter effects SceneViewerTopComponent.jToggleButton1.text= -SceneViewerTopComponent.enableOrtho.text=Persp. SceneViewerTopComponent.enableOrtho.textO=Ortho. -SceneViewerTopComponent.enableOrtho.toolTipText=Toggle Orthographic / Perspective view diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.form b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.form index 2969cc62c..feb107e93 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.form +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.form @@ -93,49 +93,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.java index 355eecce1..cd17f75d3 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.java @@ -324,8 +324,10 @@ public final class SceneViewerTopComponent extends TopComponent { public UndoRedo getUndoRedo() { return Lookup.getDefault().lookup(UndoRedo.class); } + public void addAdditionnalToolbar(JToolBar tb){ - jToolBar1.add(tb,4); + // jToolBar1.add(tb,4); } + }