diff --git a/sdk/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/sdk/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 5ee096e19..fbd5c5b4e 100644 --- a/sdk/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/sdk/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,7 +1,7 @@ -currentVersion=jMonkeyPlatform Alpha-4 +currentVersion=jMonkeyPlatform Beta LBL_splash_window_title=Starting jMonkeyPlatform SPLASH_HEIGHT=350 SPLASH_WIDTH=500 -SplashProgressBarBounds=0,250,500,6 -SplashRunningTextBounds=0,235,497,12 +SplashProgressBarBounds=0,344,500,6 +SplashRunningTextBounds=0,3,497,12 SplashRunningTextFontSize=12 diff --git a/sdk/branding/core/core.jar/org/netbeans/core/startup/splash.gif b/sdk/branding/core/core.jar/org/netbeans/core/startup/splash.gif index 7be754e5e..c9ef73167 100644 Binary files a/sdk/branding/core/core.jar/org/netbeans/core/startup/splash.gif and b/sdk/branding/core/core.jar/org/netbeans/core/startup/splash.gif differ diff --git a/sdk/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/sdk/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index 760c2931b..8dc3b669c 100644 --- a/sdk/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/sdk/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,2 +1,2 @@ -CTL_MainWindow_Title=jMonkeyPlatform Alpha-4 -CTL_MainWindow_Title_No_Project=jMonkeyPlatform Alpha-4 +CTL_MainWindow_Title=jMonkeyPlatform Beta +CTL_MainWindow_Title_No_Project=jMonkeyPlatform Beta diff --git a/sdk/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties b/sdk/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties index b2a54b4e7..257783955 100644 --- a/sdk/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties +++ b/sdk/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties @@ -1,2 +1,2 @@ -LBL_Copyright=

The \u2018Core Team\u2019

\n

Kirill Vainer \u2018Momoko_Fan\u2019
Lead Programmer, jME3 Architect

\n

Erlend Sogge Heggen \u2018erlend_sh\u2019
Project Manager, Junior Webmaster

\n

Skye Book \u2018sbook\u2019
Project Manager, Senior Webmaster

\n

Normen Hansen \u2018normen\u2019
jMP architect & general integrations

\n

Ruth Kusterer \u2018Zathras\u2019
Head of wiki, Docs expert

\n

Copyright © 2010 jMonkeyEngine.\n
Please visit http://www.jmonkeyengine.com for more information.

+LBL_Copyright=

Copyright © 2010 jMonkeyEngine.\n
Please visit http://www.jmonkeyengine.com for more information.

URL_ON_IMG=http://www.jmonkeyengine.com/ diff --git a/sdk/branding/modules/org-netbeans-modules-autoupdate-ui.jar/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties b/sdk/branding/modules/org-netbeans-modules-autoupdate-ui.jar/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties index 5b73b2f2d..3d0f1e422 100644 --- a/sdk/branding/modules/org-netbeans-modules-autoupdate-ui.jar/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties +++ b/sdk/branding/modules/org-netbeans-modules-autoupdate-ui.jar/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties @@ -1 +1 @@ -OperationDescriptionStep_BrokenPackageDepInit=

jMonkeyEngine3 SDK requires the JDK

Currently, jMonkeyEngine3 SDK appears to be running with the JRE instead of the full JDK.

To use the SDK, edit the --jdkhome command line option in jmonkeyplatform/etc/jmonkeyplatform.conf to the location of a JDK installation. See the jME wiki for more information.

+OperationDescriptionStep_BrokenPackageDepInit=

jMonkeyPlatform requires the JDK

Currently, jMonkeyEngine3 SDK appears to be running with the JRE instead of the full JDK.

To use the SDK, edit the --jdkhome command line option in jmonkeyplatform/etc/jmonkeyplatform.conf to the location of a JDK installation. See the jME wiki for more information.

diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties index 1f24b4d73..45ee49c55 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties @@ -10,16 +10,12 @@ OpenIDE-Module-Long-Description=\ This plugin provides simple scene composing for jMonkeyPlatform. OpenIDE-Module-Name=Simple SceneComposer OpenIDE-Module-Short-Description=Provides Simple Scene Composing for jMP -SceneComposerTopComponent.addObjectButton.text= SceneComposerTopComponent.jLabel1.text= SceneComposerTopComponent.jLabel2.text= SceneComposerTopComponent.sceneInfoLabel3.text=jLabel3 SceneComposerTopComponent.scenInfoLabel4.text=jLabel3 SceneComposerTopComponent.sceneInfoLabel1.text=.. SceneComposerTopComponent.sceneInfoLabel2.text=.. -SceneComposerTopComponent.addObjectButton.toolTipText=add selected item -SceneComposerTopComponent.addCursorButton.toolTipText=add selected item at cursor location -SceneComposerTopComponent.addCursorButton.text=cursor SceneComposerTopComponent.moveToCursorButton.toolTipText=move selected item to cursor SceneComposerTopComponent.moveToCursorButton.text=cursor SceneComposerTopComponent.showSelectionToggleButton.toolTipText=display selection @@ -35,7 +31,6 @@ SceneComposerTopComponent.cursorToSelectionButton.toolTipText=snap cursor to sel SceneComposerTopComponent.createPhysicsMeshButton.text=add collision shape SceneComposerTopComponent.createPhysicsMeshButton.toolTipText=Makes the Spatial physics enabled and generates a CollisionShape SceneComposerTopComponent.jLabel3.text= -SceneComposerTopComponent.palettePanel.border.title=no spatial selected Templates/JME3/Scene.j3o=Empty jME3 Scene SceneComposerTopComponent.jPanel4.border.title=Utilities SceneComposerTopComponent.jCheckBox1.text=dynamic: diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form index 6f9553333..0f80c4e54 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form @@ -29,13 +29,11 @@ - - - + @@ -43,10 +41,9 @@ - - - - + + + @@ -70,8 +67,8 @@ - - + + @@ -80,7 +77,7 @@ - + @@ -102,51 +99,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -245,46 +197,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -445,12 +357,12 @@ - + - + @@ -474,8 +386,8 @@ - - + + @@ -483,9 +395,9 @@ - + - + diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java index 7ed59226c..6c665d0cf 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java @@ -85,17 +85,12 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce sceneInfoPanel = new javax.swing.JPanel(); sceneInfoLabel1 = new javax.swing.JLabel(); sceneInfoLabel2 = new javax.swing.JLabel(); - palettePanel = new javax.swing.JPanel(); - jScrollPane1 = new javax.swing.JScrollPane(); - jList1 = new javax.swing.JList(); jToolBar1 = new javax.swing.JToolBar(); selectButton = new javax.swing.JToggleButton(); moveButton = new javax.swing.JToggleButton(); rotateButton = new javax.swing.JToggleButton(); scaleButton = new javax.swing.JToggleButton(); jSeparator5 = new javax.swing.JToolBar.Separator(); - addObjectButton = new javax.swing.JButton(); - addCursorButton = new javax.swing.JButton(); moveToCursorButton = new javax.swing.JButton(); jSeparator4 = new javax.swing.JToolBar.Separator(); jLabel3 = new javax.swing.JLabel(); @@ -138,8 +133,8 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce sceneInfoPanel.setLayout(sceneInfoPanelLayout); sceneInfoPanelLayout.setHorizontalGroup( sceneInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(sceneInfoLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 126, Short.MAX_VALUE) - .addComponent(sceneInfoLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 126, Short.MAX_VALUE) + .addComponent(sceneInfoLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 365, Short.MAX_VALUE) + .addComponent(sceneInfoLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 365, Short.MAX_VALUE) ); sceneInfoPanelLayout.setVerticalGroup( sceneInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -147,23 +142,7 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce .addComponent(sceneInfoLabel1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(sceneInfoLabel2) - .addContainerGap(105, Short.MAX_VALUE)) - ); - - palettePanel.setBackground(new java.awt.Color(204, 204, 204)); - palettePanel.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.palettePanel.border.title"))); // NOI18N - - jScrollPane1.setViewportView(jList1); - - javax.swing.GroupLayout palettePanelLayout = new javax.swing.GroupLayout(palettePanel); - palettePanel.setLayout(palettePanelLayout); - palettePanelLayout.setHorizontalGroup( - palettePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 211, Short.MAX_VALUE) - ); - palettePanelLayout.setVerticalGroup( - palettePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 139, Short.MAX_VALUE) + .addContainerGap(106, Short.MAX_VALUE)) ); jToolBar1.setBackground(new java.awt.Color(204, 204, 204)); @@ -220,30 +199,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jToolBar1.add(scaleButton); jToolBar1.add(jSeparator5); - addObjectButton.setBackground(new java.awt.Color(204, 204, 204)); - addObjectButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/scenecomposer/add.gif"))); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(addObjectButton, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.addObjectButton.text")); // NOI18N - addObjectButton.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.addObjectButton.toolTipText")); // NOI18N - addObjectButton.setEnabled(false); - addObjectButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - addObjectButtonActionPerformed(evt); - } - }); - jToolBar1.add(addObjectButton); - - addCursorButton.setBackground(new java.awt.Color(204, 204, 204)); - addCursorButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/scenecomposer/add.gif"))); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(addCursorButton, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.addCursorButton.text")); // NOI18N - addCursorButton.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.addCursorButton.toolTipText")); // NOI18N - addCursorButton.setEnabled(false); - addCursorButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - addCursorButtonActionPerformed(evt); - } - }); - jToolBar1.add(addCursorButton); - moveToCursorButton.setBackground(new java.awt.Color(204, 204, 204)); moveToCursorButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/scenecomposer/move.gif"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(moveToCursorButton, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.moveToCursorButton.text")); // NOI18N @@ -344,11 +299,11 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jPanel3.setLayout(jPanel3Layout); jPanel3Layout.setHorizontalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 211, Short.MAX_VALUE) + .addGap(0, 190, Short.MAX_VALUE) ); jPanel3Layout.setVerticalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 23, Short.MAX_VALUE) + .addGap(0, 21, Short.MAX_VALUE) ); jToolBar1.add(jPanel3); @@ -419,8 +374,8 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jPanel4.setLayout(jPanel4Layout); jPanel4Layout.setHorizontalGroup( jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jToolBar2, javax.swing.GroupLayout.DEFAULT_SIZE, 323, Short.MAX_VALUE) - .addComponent(jToolBar3, javax.swing.GroupLayout.DEFAULT_SIZE, 323, Short.MAX_VALUE) + .addComponent(jToolBar2, javax.swing.GroupLayout.DEFAULT_SIZE, 342, Short.MAX_VALUE) + .addComponent(jToolBar3, javax.swing.GroupLayout.DEFAULT_SIZE, 342, Short.MAX_VALUE) .addGroup(jPanel4Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -428,8 +383,8 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce .addGap(10, 10, 10) .addComponent(jLabel5) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(emitButton, javax.swing.GroupLayout.DEFAULT_SIZE, 248, Short.MAX_VALUE)) - .addComponent(jSeparator6, javax.swing.GroupLayout.DEFAULT_SIZE, 303, Short.MAX_VALUE)) + .addComponent(emitButton, javax.swing.GroupLayout.DEFAULT_SIZE, 232, Short.MAX_VALUE)) + .addComponent(jSeparator6, javax.swing.GroupLayout.DEFAULT_SIZE, 302, Short.MAX_VALUE)) .addContainerGap()) ); jPanel4Layout.setVerticalGroup( @@ -452,39 +407,22 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addComponent(palettePanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(sceneInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 708, Short.MAX_VALUE) + .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 731, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addComponent(jToolBar1, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(palettePanel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(sceneInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(sceneInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jPanel4, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) ); }// //GEN-END:initComponents - private void addObjectButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addObjectButtonActionPerformed - if (jList1.getSelectedValue() != null && editorController != null) { - editorController.addSpatial(jList1.getSelectedValue().toString()); - } - - }//GEN-LAST:event_addObjectButtonActionPerformed - - private void addCursorButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addCursorButtonActionPerformed - if (jList1.getSelectedValue() != null && editorController != null) { - editorController.addSpatial(jList1.getSelectedValue().toString(), toolController.getCursorLocation()); - } - - }//GEN-LAST:event_addCursorButtonActionPerformed - private void showSelectionToggleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showSelectionToggleButtonActionPerformed if (toolController != null) { toolController.setShowSelection(showSelectionToggleButton.isSelected()); @@ -565,8 +503,6 @@ private void emitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI }//GEN-LAST:event_emitButtonActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton addCursorButton; - private javax.swing.JButton addObjectButton; private javax.swing.JButton camToCursorSelectionButton; private javax.swing.JButton createPhysicsMeshButton; private javax.swing.JButton cursorToSelectionButton; @@ -580,10 +516,8 @@ private void emitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; - private javax.swing.JList jList1; private javax.swing.JPanel jPanel3; private javax.swing.JPanel jPanel4; - private javax.swing.JScrollPane jScrollPane1; private javax.swing.JToolBar.Separator jSeparator1; private javax.swing.JToolBar.Separator jSeparator2; private javax.swing.JToolBar.Separator jSeparator3; @@ -596,7 +530,6 @@ private void emitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI private javax.swing.JToolBar jToolBar3; private javax.swing.JToggleButton moveButton; private javax.swing.JButton moveToCursorButton; - private javax.swing.JPanel palettePanel; private javax.swing.JSpinner radiusSpinner; private javax.swing.JButton resetCursorButton; private javax.swing.JToggleButton rotateButton; @@ -727,30 +660,9 @@ private void emitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI public void run() { if (text != null) { //XXX: wtf? why do i have to repaint? - ((TitledBorder) palettePanel.getBorder()).setTitle("Palette:" + text); - palettePanel.repaint(); - addObjectButton.setEnabled(true); - addCursorButton.setEnabled(true); - } else { - ((TitledBorder) palettePanel.getBorder()).setTitle("no spatial selected"); - palettePanel.repaint(); - addObjectButton.setEnabled(false); - addCursorButton.setEnabled(false); - } - } - }); - } - - private void setSelectionData(final Boolean node) { - java.awt.EventQueue.invokeLater(new Runnable() { - - public void run() { - if (node == null) { - jList1.setListData(new String[]{}); - } else if (node) { - jList1.setListData(new String[]{"Node", "Particle Emitter", "Audio Node", "Picture", "Point Light", "Spot Light", "Directional Light", "Ambient Light"}); + ((TitledBorder) jPanel4.getBorder()).setTitle("Utilities - " + text); } else { - jList1.setListData(new String[]{"Point Light", "Spot Light", "Directional Light", "Ambient Light"}); + ((TitledBorder) jPanel4.getBorder()).setTitle("Utilities - no spatial selected"); } } }); @@ -775,8 +687,6 @@ private void emitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI if (!active) { result.removeLookupListener(inst); - addObjectButton.setEnabled(false); - addCursorButton.setEnabled(false); showSelectionToggleButton.setSelected(true); showGridToggleButton.setSelected(false); sceneInfoLabel1.setText(""); @@ -870,7 +780,6 @@ private void emitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI if (spatial == null) { setSelectedObjectText(null); - setSelectionData(null); if (editorController != null) { editorController.setSelectedSpat(spatial); } @@ -886,14 +795,11 @@ private void emitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI } editorController.setSelectedSpat(spatial); if (spatial.getLookup().lookup(Node.class) != null) { - setSelectionData(true); setSelectedObjectText(spatial.getLookup().lookup(Node.class).getName()); } else if (spatial.getLookup().lookup(Spatial.class) != null) { - setSelectionData(false); setSelectedObjectText(spatial.getLookup().lookup(Spatial.class).getName()); } else { setSelectedObjectText(null); - setSelectionData(false); } SceneApplication.getApplication().setCurrentFileNode(spatial); setActivatedNodes(new org.openide.nodes.Node[]{spatial}); diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditorController.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditorController.java index 2d466bc82..e77d973be 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditorController.java +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditorController.java @@ -109,175 +109,6 @@ public class SceneEditorController implements PropertyChangeListener, NodeListen return currentFileObject; } - public void addSpatial(final String name) { - addSpatial(name, new Vector3f(0, 0, 0)); - } - - public void addSpatial(final String name, final Vector3f point) { - if (selectedSpat == null) { - return; - } - try { - final Spatial node = selectedSpat.getLookup().lookup(Spatial.class); - if (node != null) { - setNeedsSave(true); - SceneApplication.getApplication().enqueue(new Callable() { - - public Object call() throws Exception { - doAddSpatial(node, name, point); - return null; - - } - }).get(); - } - } catch (InterruptedException ex) { - Exceptions.printStackTrace(ex); - } catch (ExecutionException ex) { - Exceptions.printStackTrace(ex); - } - } - - public void doAddSpatial(Spatial selected, String name, Vector3f point) { - Node undoParent = null; - Light undoLight = null; - Spatial undoSpatial = null; - if (selected instanceof Node) { - if ("Node".equals(name)) { - Node node = new Node("Node"); - ((Node) selected).attachChild(node); - refreshSelected(); - undoSpatial = node; - undoParent = ((Node) selected); - } else if ("Particle Emitter".equals(name)) { - ParticleEmitter emit = new ParticleEmitter("Emitter", ParticleMesh.Type.Triangle, 200); - emit.setShape(new EmitterSphereShape(Vector3f.ZERO, 1f)); - emit.setGravity(0); - emit.setLowLife(5); - emit.setHighLife(10); - emit.setInitialVelocity(new Vector3f(0, 0, 0)); - emit.setImagesX(15); - Material mat = new Material(SceneApplication.getApplication().getAssetManager(), "Common/MatDefs/Misc/Particle.j3md"); - // mat.setTexture("Texture", SceneApplication.getApplication().getAssetManager().loadTexture("Effects/Smoke/Smoke.png")); - emit.setMaterial(mat); - if (point != null) { - Vector3f localVec = new Vector3f(); - selected.worldToLocal(point, localVec); - emit.setLocalTranslation(localVec); - } - ((Node) selected).attachChild(emit); - refreshSelected(); - undoSpatial = emit; - undoParent = ((Node) selected); - } else if ("Audio Node".equals(name)) { - AudioNode node = new AudioNode(); - node.setName("Audio Node"); - if (point != null) { - Vector3f localVec = new Vector3f(); - selected.worldToLocal(point, localVec); - node.setLocalTranslation(localVec); - } - ((Node) selected).attachChild(node); - refreshSelected(); - undoSpatial = node; - undoParent = ((Node) selected); - } else if ("Picture".equals(name)) { - Picture pic = new Picture("Picture"); - Material mat = new Material(SceneApplication.getApplication().getAssetManager(), "Common/MatDefs/Misc/Particle.j3md"); - pic.setMaterial(mat); - if (point != null) { - Vector3f localVec = new Vector3f(); - selected.worldToLocal(point, localVec); - pic.setLocalTranslation(localVec); - } - ((Node) selected).attachChild(pic); - refreshSelected(); - undoSpatial = pic; - undoParent = ((Node) selected); - } else if ("Point Light".equals(name)) { - PointLight light = new PointLight(); - if (point != null) { - Vector3f localVec = new Vector3f(); - selected.worldToLocal(point, localVec); - light.setPosition(localVec); - } - light.setColor(ColorRGBA.White); - ((Node) selected).addLight(light); - refreshSelected(); - undoLight = light; - undoParent = ((Node) selected); - } else if ("Spot Light".equals(name)) { - SpotLight light = new SpotLight(); - if (point != null) { - Vector3f localVec = new Vector3f(); - selected.worldToLocal(point, localVec); - light.setPosition(localVec); - } - light.setColor(ColorRGBA.White); - ((Node) selected).addLight(light); - refreshSelected(); - undoLight = light; - undoParent = ((Node) selected); - } else if ("Directional Light".equals(name)) { - DirectionalLight dl = new DirectionalLight(); - dl.setDirection(new Vector3f(-1, -1, -1).normalizeLocal()); - dl.setColor(ColorRGBA.White); - ((Node) selected).addLight(dl); - refreshSelected(); - undoLight = dl; - undoParent = ((Node) selected); - } else if ("Node".equals(name)) { - Node node = new Node("Node"); - ((Node) selected).attachChild(node); - refreshSelected(); - undoSpatial = node; - undoParent = ((Node) selected); - } - } else if (selected instanceof Geometry) { - if ("Point Light".equals(name)) { - PointLight light = new PointLight(); - if (point != null) { - Vector3f localVec = new Vector3f(); - selected.worldToLocal(point, localVec); - light.setPosition(localVec); - } - light.setColor(ColorRGBA.White); - selected.addLight(light); - refreshSelected(); - undoLight = light; - undoSpatial = ((Geometry) selected); - } else if ("Spot Light".equals(name)) { - SpotLight light = new SpotLight(); - if (point != null) { - Vector3f localVec = new Vector3f(); - selected.worldToLocal(point, localVec); - light.setPosition(localVec); - } - light.setColor(ColorRGBA.White); - selected.addLight(light); - refreshSelected(); - undoLight = light; - undoSpatial = ((Geometry) selected); - } else if ("Directional Light".equals(name)) { - DirectionalLight dl = new DirectionalLight(); - dl.setDirection(new Vector3f(-1, -1, -1).normalizeLocal()); - dl.setColor(ColorRGBA.White); - selected.addLight(dl); - refreshSelected(); - undoLight = dl; - undoSpatial = ((Geometry) selected); - } else if ("Ambient Light".equals(name)) { - AmbientLight dl = new AmbientLight(); - dl.setColor(ColorRGBA.White); - selected.addLight(dl); - refreshSelected(); - undoLight = dl; - undoSpatial = ((Geometry) selected); - } - } - AbstractSceneExplorerNode selectedSpat = this.selectedSpat; - addSpatialUndo(undoParent, undoSpatial, undoLight, selectedSpat); - } - private void addSpatialUndo(final Node undoParent, final Spatial undoSpatial, final Light undoLight, final AbstractSceneExplorerNode parentNode) { //add undo if (undoParent != null && undoSpatial != null) { diff --git a/sdk/nbproject/platform.properties b/sdk/nbproject/platform.properties index a2a03d7c8..a995f1fdf 100644 --- a/sdk/nbproject/platform.properties +++ b/sdk/nbproject/platform.properties @@ -1,78 +1,77 @@ -cluster.path=\ - ${nbplatform.active.dir}/extra:\ - ${nbplatform.active.dir}/harness:\ - ${nbplatform.active.dir}/ide:\ - ${nbplatform.active.dir}/java:\ - ${nbplatform.active.dir}/platform -disabled.modules=\ - org.netbeans.libs.bugtracking,\ - org.netbeans.libs.bugzilla,\ - org.netbeans.libs.jsr223,\ - org.netbeans.libs.smack,\ - org.netbeans.libs.springframework,\ - org.netbeans.libs.swingx,\ - org.netbeans.modules.apisupport.apidocs,\ - org.netbeans.modules.bugtracking,\ - org.netbeans.modules.bugtracking.bridge,\ - org.netbeans.modules.bugzilla,\ - org.netbeans.modules.db,\ - org.netbeans.modules.db.core,\ - org.netbeans.modules.db.dataview,\ - org.netbeans.modules.db.drivers,\ - org.netbeans.modules.db.kit,\ - org.netbeans.modules.db.metadata.model,\ - org.netbeans.modules.db.mysql,\ - org.netbeans.modules.db.sql.editor,\ - org.netbeans.modules.db.sql.visualeditor,\ - org.netbeans.modules.dbapi,\ - org.netbeans.modules.dbschema,\ - org.netbeans.modules.derby,\ - org.netbeans.modules.form,\ - org.netbeans.modules.form.j2ee,\ - org.netbeans.modules.form.kit,\ - org.netbeans.modules.glassfish.common,\ - org.netbeans.modules.hibernate,\ - org.netbeans.modules.hibernatelib,\ - org.netbeans.modules.hudson,\ - org.netbeans.modules.hudson.ant,\ - org.netbeans.modules.hudson.maven,\ - org.netbeans.modules.hudson.mercurial,\ - org.netbeans.modules.hudson.subversion,\ - org.netbeans.modules.i18n.form,\ - org.netbeans.modules.j2ee.core.utilities,\ - org.netbeans.modules.j2ee.jpa.refactoring,\ - org.netbeans.modules.j2ee.jpa.verification,\ - org.netbeans.modules.j2ee.persistence,\ - org.netbeans.modules.j2ee.persistence.kit,\ - org.netbeans.modules.j2ee.toplinklib,\ - org.netbeans.modules.jellytools,\ - org.netbeans.modules.jellytools.ide,\ - org.netbeans.modules.jellytools.java,\ - org.netbeans.modules.jellytools.platform,\ - org.netbeans.modules.jemmy,\ - org.netbeans.modules.languages,\ - org.netbeans.modules.maven.grammar,\ - org.netbeans.modules.maven.graph,\ - org.netbeans.modules.maven.hints,\ - org.netbeans.modules.maven.junit,\ - org.netbeans.modules.maven.kit,\ - org.netbeans.modules.maven.osgi,\ - org.netbeans.modules.maven.persistence,\ - org.netbeans.modules.maven.repository,\ - org.netbeans.modules.maven.search,\ - org.netbeans.modules.maven.spring,\ - org.netbeans.modules.server,\ - org.netbeans.modules.spellchecker,\ - org.netbeans.modules.spellchecker.bindings.htmlxml,\ - org.netbeans.modules.spellchecker.bindings.properties,\ - org.netbeans.modules.spellchecker.dictionary_en,\ - org.netbeans.modules.spellchecker.kit,\ - org.netbeans.modules.spring.beans,\ - org.netbeans.modules.swingapp,\ - org.netbeans.modules.websvc.saas.codegen.java,\ - org.netbeans.modules.xml.wsdl.model,\ - org.openide.compat,\ - org.openide.options,\ - org.openide.util.enumerations -nbjdk.active=default -nbplatform.active=default +cluster.path=\ + ${nbplatform.active.dir}/extra:\ + ${nbplatform.active.dir}/harness:\ + ${nbplatform.active.dir}/ide:\ + ${nbplatform.active.dir}/java:\ + ${nbplatform.active.dir}/platform +disabled.modules=\ + org.netbeans.libs.bugtracking,\ + org.netbeans.libs.bugzilla,\ + org.netbeans.libs.jsr223,\ + org.netbeans.libs.smack,\ + org.netbeans.libs.springframework,\ + org.netbeans.libs.swingx,\ + org.netbeans.modules.apisupport.apidocs,\ + org.netbeans.modules.bugtracking,\ + org.netbeans.modules.bugtracking.bridge,\ + org.netbeans.modules.bugzilla,\ + org.netbeans.modules.db,\ + org.netbeans.modules.db.core,\ + org.netbeans.modules.db.dataview,\ + org.netbeans.modules.db.drivers,\ + org.netbeans.modules.db.kit,\ + org.netbeans.modules.db.metadata.model,\ + org.netbeans.modules.db.mysql,\ + org.netbeans.modules.db.sql.editor,\ + org.netbeans.modules.db.sql.visualeditor,\ + org.netbeans.modules.dbapi,\ + org.netbeans.modules.dbschema,\ + org.netbeans.modules.derby,\ + org.netbeans.modules.form,\ + org.netbeans.modules.form.j2ee,\ + org.netbeans.modules.form.kit,\ + org.netbeans.modules.glassfish.common,\ + org.netbeans.modules.hibernate,\ + org.netbeans.modules.hibernatelib,\ + org.netbeans.modules.hudson,\ + org.netbeans.modules.hudson.ant,\ + org.netbeans.modules.hudson.maven,\ + org.netbeans.modules.hudson.mercurial,\ + org.netbeans.modules.hudson.subversion,\ + org.netbeans.modules.i18n.form,\ + org.netbeans.modules.j2ee.core.utilities,\ + org.netbeans.modules.j2ee.jpa.refactoring,\ + org.netbeans.modules.j2ee.jpa.verification,\ + org.netbeans.modules.j2ee.persistence,\ + org.netbeans.modules.j2ee.persistence.kit,\ + org.netbeans.modules.j2ee.toplinklib,\ + org.netbeans.modules.jellytools,\ + org.netbeans.modules.jellytools.ide,\ + org.netbeans.modules.jellytools.java,\ + org.netbeans.modules.jellytools.platform,\ + org.netbeans.modules.jemmy,\ + org.netbeans.modules.languages,\ + org.netbeans.modules.maven.grammar,\ + org.netbeans.modules.maven.graph,\ + org.netbeans.modules.maven.hints,\ + org.netbeans.modules.maven.junit,\ + org.netbeans.modules.maven.kit,\ + org.netbeans.modules.maven.osgi,\ + org.netbeans.modules.maven.persistence,\ + org.netbeans.modules.maven.repository,\ + org.netbeans.modules.maven.search,\ + org.netbeans.modules.maven.spring,\ + org.netbeans.modules.server,\ + org.netbeans.modules.spellchecker,\ + org.netbeans.modules.spellchecker.bindings.htmlxml,\ + org.netbeans.modules.spellchecker.bindings.properties,\ + org.netbeans.modules.spellchecker.dictionary_en,\ + org.netbeans.modules.spellchecker.kit,\ + org.netbeans.modules.spring.beans,\ + org.netbeans.modules.websvc.saas.codegen.java,\ + org.netbeans.modules.xml.wsdl.model,\ + org.openide.compat,\ + org.openide.options,\ + org.openide.util.enumerations +nbjdk.active=default +nbplatform.active=default diff --git a/sdk/nbproject/project.properties b/sdk/nbproject/project.properties index ef565be82..995e190fa 100644 --- a/sdk/nbproject/project.properties +++ b/sdk/nbproject/project.properties @@ -1,5 +1,5 @@ app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif -app.name=jmonkeyplatform +app.name=jmonkeyplatform_beta app.title=jMonkeyPlatform app.icon.icns=jmonkeyplatform.icns app.version=0.6 Alpha 2