sdk : complete commit due to prior mistake in commit

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7897 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
rem..om 14 years ago
parent 3cd94d776f
commit b1b389be57
  1. 9
      sdk/jme3-core/nbproject/project.xml
  2. 8
      sdk/jme3-core/src/com/jme3/gde/core/layer.xml
  3. 4
      sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java
  4. 23
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/AbstractCameraController.java
  5. 11
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/Bundle.properties
  6. 181
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/CameraToolbar.form
  7. 232
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/CameraToolbar.java
  8. BIN
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/back.png
  9. BIN
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/bottom.png
  10. BIN
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/front.png
  11. BIN
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/left.png
  12. BIN
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/right.png
  13. BIN
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/top.png
  14. BIN
      sdk/jme3-core/src/com/jme3/gde/core/scene/controller/toolbars/user.png
  15. 2
      sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/Bundle.properties
  16. 43
      sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.form
  17. 4
      sdk/jme3-core/src/com/jme3/gde/core/sceneviewer/SceneViewerTopComponent.java

@ -30,6 +30,15 @@
<specification-version>0.6</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.jdesktop.layout</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.18</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.progress</code-name-base>
<build-prerequisite/>

@ -11,6 +11,14 @@
<attr name="noIconInMenu" boolvalue="false"/>
</file>
</folder>
<folder name="SceneComposer">
<file name="com-jme3-gde-core-sceneviewer-actions-SwitchFrontViewAcction.instance_hidden"/>
<file name="com-jme3-gde-core-sceneviewer-actions-SwitchFrontViewAction.instance">
<attr name="iconBase" stringvalue="com/jme3/gde/core/sceneviewer/actions/32_bit.png"/>
<attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
<attr name="noIconInMenu" boolvalue="false"/>
</file>
</folder>
<folder name="jMonkeyPlatform">
<file name="com-jme3-gde-core-assets-actions-OpenModel.instance">
<attr name="delegate" methodvalue="org.openide.awt.Actions.inject"/>

@ -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() {

@ -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<Boolean>() {
camToolbar.toggleOrthoMode(SceneApplication.getApplication().enqueue(new Callable<Boolean>() {
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() {

@ -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

@ -0,0 +1,181 @@
<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.8">
<NonVisualComponents>
<Container class="javax.swing.JPopupMenu" name="viewMenu">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
<Property name="useNullLayout" type="boolean" value="true"/>
</Layout>
<SubComponents>
<MenuItem class="javax.swing.JMenuItem" name="frontMenuItem">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/scene/controller/toolbars/front.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/scene/controller/toolbars/Bundle.properties" key="CameraToolbar.frontMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="frontMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="leftMenuItem">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/scene/controller/toolbars/left.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/scene/controller/toolbars/Bundle.properties" key="CameraToolbar.leftMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="leftMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="rightMenuItem">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/scene/controller/toolbars/right.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/scene/controller/toolbars/Bundle.properties" key="CameraToolbar.rightMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="rightMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="topMenuItem">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/scene/controller/toolbars/top.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/scene/controller/toolbars/Bundle.properties" key="CameraToolbar.topMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="topMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="backMenuItem">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/scene/controller/toolbars/back.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/scene/controller/toolbars/Bundle.properties" key="CameraToolbar.backMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="backMenuItemActionPerformed"/>
</Events>
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="bottomMenuItem">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/scene/controller/toolbars/bottom.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/scene/controller/toolbars/Bundle.properties" key="CameraToolbar.bottomMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="bottomMenuItemActionPerformed"/>
</Events>
</MenuItem>
</SubComponents>
</Container>
</NonVisualComponents>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
</AuxValues>
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="viewButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="enableOrtho" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="96" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="viewButton" min="-2" pref="23" max="-2" attributes="1"/>
<Component id="enableOrtho" alignment="0" min="-2" max="-2" attributes="1"/>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JButton" name="viewButton">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="8" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/scene/controller/toolbars/user.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/scene/controller/toolbars/Bundle.properties" key="CameraToolbar.viewButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalAlignment" type="int" value="2"/>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="viewButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JToggleButton" name="enableOrtho">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="8" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/sceneviewer/icons/persp.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/scene/controller/toolbars/Bundle.properties" key="CameraToolbar.enableOrtho.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/scene/controller/toolbars/Bundle.properties" key="CameraToolbar.enableOrtho.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Pointeur par d&#xe9;faut"/>
</Property>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[27, 23]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[27, 23]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[50, 23]"/>
</Property>
<Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/sceneviewer/icons/ortho.png"/>
</Property>
<Property name="verticalTextPosition" type="int" value="3"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="enableOrthoActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Form>

@ -0,0 +1,232 @@
/*
* NewJPanel.java <p/> 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")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//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)
);
}// </editor-fold>//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);
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 777 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 760 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 834 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 858 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 850 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 765 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 935 B

@ -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

@ -93,49 +93,6 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="enableWireframeActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JToolBar$Separator" name="jSeparator2">
</Component>
<Component class="javax.swing.JToggleButton" name="enableOrtho">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Tahoma" size="8" style="0"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/sceneviewer/icons/persp.png"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/sceneviewer/Bundle.properties" key="SceneViewerTopComponent.enableOrtho.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/sceneviewer/Bundle.properties" key="SceneViewerTopComponent.enableOrtho.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
<Color id="Pointeur par d&#xe9;faut"/>
</Property>
<Property name="focusable" type="boolean" value="false"/>
<Property name="horizontalTextPosition" type="int" value="4"/>
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[27, 23]"/>
</Property>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[27, 23]"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[50, 23]"/>
</Property>
<Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/com/jme3/gde/core/sceneviewer/icons/ortho.png"/>
</Property>
</Properties>
<AccessibilityProperties>
<Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="com/jme3/gde/core/sceneviewer/Bundle.properties" key="SceneViewerTopComponent.jToggleButton2.AccessibleContext.accessibleName" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</AccessibilityProperties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="enableOrthoActionPerformed"/>
</Events>
</Component>
<Container class="javax.swing.JPanel" name="jPanel1">
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>

@ -325,7 +325,9 @@ public final class SceneViewerTopComponent extends TopComponent {
return Lookup.getDefault().lookup(UndoRedo.class);
}
public void addAdditionnalToolbar(JToolBar tb){
jToolBar1.add(tb,4);
// jToolBar1.add(tb,4);
}
}

Loading…
Cancel
Save