From 32152741cc9ce412118d4302e13374124afcad9a Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Sun, 12 Aug 2012 19:06:45 +0000 Subject: [PATCH] SDK : - Made toggle buttons instead of check boxes for Snap to grid/scene, select terrain - Added a Select Geometries toggle git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9648 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../jme3/gde/scenecomposer/Bundle.properties | 14 +- .../SceneComposerToolController.java | 11 ++ .../SceneComposerTopComponent.form | 155 ++++++++++-------- .../SceneComposerTopComponent.java | 147 ++++++++++------- .../jme3/gde/scenecomposer/selectGeometry.png | Bin 0 -> 483 bytes .../jme3/gde/scenecomposer/selectTerrain.png | Bin 0 -> 732 bytes .../com/jme3/gde/scenecomposer/snapGrid.png | Bin 0 -> 435 bytes .../com/jme3/gde/scenecomposer/snapScene.png | Bin 0 -> 786 bytes .../gde/scenecomposer/tools/SelectTool.java | 16 +- 9 files changed, 198 insertions(+), 145 deletions(-) create mode 100644 sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/selectGeometry.png create mode 100644 sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/selectTerrain.png create mode 100644 sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/snapGrid.png create mode 100644 sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/snapScene.png 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 f5ce936e9..e20ece999 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties @@ -55,9 +55,11 @@ SceneComposerTopComponent.jButton2.text= SceneComposerTopComponent.jButton3.text= SceneComposerTopComponent.jButton2.toolTipText=start the physics simulation and add all objects to the physics space SceneComposerTopComponent.jButton3.toolTipText=stop the physics simulation and remove all objects from the physics space -SceneComposerTopComponent.snapToSceneCheckbox.text=Snap to Scene -SceneComposerTopComponent.snapToGridCheckbox.text=Snap to Grid -SceneComposerTopComponent.snapToGridCheckbox.toolTipText=Moving an object will snap to the unit grid coordinates -SceneComposerTopComponent.snapToSceneCheckbox.toolTipText=When moving an object, it will snap to whatever is under the mouse -SceneComposerTopComponent.selectTerrainCheckbox.text=Select Terrain -SceneComposerTopComponent.selectTerrainCheckbox.toolTipText=If selected, terrain can be selected, otherwise it will be ignored by the mouse +SceneComposerTopComponent.jToggleScene.text= +SceneComposerTopComponent.jToggleGrid.text= +SceneComposerTopComponent.jToggleSelectGeom.text= +SceneComposerTopComponent.jToggleSelectTerrain.text= +SceneComposerTopComponent.jToggleScene.toolTipText=Snap to Scene +SceneComposerTopComponent.jToggleGrid.toolTipText=Snap to Grid +SceneComposerTopComponent.jToggleSelectGeom.toolTipText=Select Geometries +SceneComposerTopComponent.jToggleSelectTerrain.toolTipText=Select Terrain diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java index 5b4036f54..c0ab719ee 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerToolController.java @@ -50,6 +50,7 @@ public class SceneComposerToolController extends SceneToolController { private boolean snapToGrid = false; private boolean snapToScene = false; private boolean selectTerrain = false; + private boolean selectGeometries = false; public SceneComposerToolController(final Node toolsNode, AssetManager manager, JmeNode rootNode) { super(toolsNode, manager); @@ -325,6 +326,16 @@ public class SceneComposerToolController extends SceneToolController { public void setSelectTerrain(boolean selectTerrain) { this.selectTerrain = selectTerrain; } + + public boolean isSelectGeometries() { + return selectGeometries; + } + + public void setSelectGeometries(boolean selectGeometries) { + this.selectGeometries = selectGeometries; + } + + /** * A marker on the screen that shows where a point light or 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 859e0c471..a858ceb7c 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form @@ -399,6 +399,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -409,7 +489,7 @@ - + @@ -446,20 +526,9 @@ - - - - - - - - - - - - - - + + + @@ -479,13 +548,7 @@ - - - - - - - + @@ -618,54 +681,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 e07afdfa9..71ab7765f 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java @@ -117,6 +117,12 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jLabel6 = new javax.swing.JLabel(); jButton2 = new javax.swing.JButton(); jButton3 = new javax.swing.JButton(); + jSeparator7 = new javax.swing.JToolBar.Separator(); + jToggleScene = new javax.swing.JToggleButton(); + jToggleGrid = new javax.swing.JToggleButton(); + jSeparator8 = new javax.swing.JToolBar.Separator(); + jToggleSelectGeom = new javax.swing.JToggleButton(); + jToggleSelectTerrain = new javax.swing.JToggleButton(); jPanel3 = new javax.swing.JPanel(); jPanel4 = new javax.swing.JPanel(); jToolBar2 = new javax.swing.JToolBar(); @@ -132,9 +138,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jSeparator6 = new javax.swing.JSeparator(); jLabel5 = new javax.swing.JLabel(); emitButton = new javax.swing.JButton(); - snapToSceneCheckbox = new javax.swing.JCheckBox(); - snapToGridCheckbox = new javax.swing.JCheckBox(); - selectTerrainCheckbox = new javax.swing.JCheckBox(); setBackground(new java.awt.Color(204, 204, 204)); @@ -346,6 +349,60 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce } }); jToolBar1.add(jButton3); + jToolBar1.add(jSeparator7); + + jToggleScene.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/scenecomposer/snapScene.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jToggleScene, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jToggleScene.text")); // NOI18N + jToggleScene.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jToggleScene.toolTipText")); // NOI18N + jToggleScene.setFocusable(false); + jToggleScene.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + jToggleScene.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + jToggleScene.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jToggleSceneActionPerformed(evt); + } + }); + jToolBar1.add(jToggleScene); + + jToggleGrid.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/scenecomposer/snapGrid.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jToggleGrid, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jToggleGrid.text")); // NOI18N + jToggleGrid.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jToggleGrid.toolTipText")); // NOI18N + jToggleGrid.setFocusable(false); + jToggleGrid.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + jToggleGrid.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + jToggleGrid.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jToggleGridActionPerformed(evt); + } + }); + jToolBar1.add(jToggleGrid); + jToolBar1.add(jSeparator8); + + jToggleSelectGeom.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/scenecomposer/selectGeometry.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jToggleSelectGeom, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jToggleSelectGeom.text")); // NOI18N + jToggleSelectGeom.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jToggleSelectGeom.toolTipText")); // NOI18N + jToggleSelectGeom.setFocusable(false); + jToggleSelectGeom.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + jToggleSelectGeom.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + jToggleSelectGeom.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jToggleSelectGeomActionPerformed(evt); + } + }); + jToolBar1.add(jToggleSelectGeom); + + jToggleSelectTerrain.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/scenecomposer/selectTerrain.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(jToggleSelectTerrain, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jToggleSelectTerrain.text")); // NOI18N + jToggleSelectTerrain.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jToggleSelectTerrain.toolTipText")); // NOI18N + jToggleSelectTerrain.setFocusable(false); + jToggleSelectTerrain.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); + jToggleSelectTerrain.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM); + jToggleSelectTerrain.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jToggleSelectTerrainActionPerformed(evt); + } + }); + jToolBar1.add(jToggleSelectTerrain); jPanel3.setBackground(new java.awt.Color(204, 204, 204)); @@ -353,7 +410,7 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce jPanel3.setLayout(jPanel3Layout); jPanel3Layout.setHorizontalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 272, Short.MAX_VALUE) + .addGap(0, 168, Short.MAX_VALUE) ); jPanel3Layout.setVerticalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -424,33 +481,6 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce } }); - snapToSceneCheckbox.setBackground(new java.awt.Color(204, 204, 204)); - org.openide.awt.Mnemonics.setLocalizedText(snapToSceneCheckbox, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.snapToSceneCheckbox.text")); // NOI18N - snapToSceneCheckbox.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.snapToSceneCheckbox.toolTipText")); // NOI18N - snapToSceneCheckbox.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - snapToSceneCheckboxActionPerformed(evt); - } - }); - - snapToGridCheckbox.setBackground(new java.awt.Color(204, 204, 204)); - org.openide.awt.Mnemonics.setLocalizedText(snapToGridCheckbox, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.snapToGridCheckbox.text")); // NOI18N - snapToGridCheckbox.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.snapToGridCheckbox.toolTipText")); // NOI18N - snapToGridCheckbox.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - snapToGridCheckboxActionPerformed(evt); - } - }); - - selectTerrainCheckbox.setBackground(new java.awt.Color(204, 204, 204)); - org.openide.awt.Mnemonics.setLocalizedText(selectTerrainCheckbox, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.selectTerrainCheckbox.text")); // NOI18N - selectTerrainCheckbox.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.selectTerrainCheckbox.toolTipText")); // NOI18N - selectTerrainCheckbox.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - selectTerrainCheckboxActionPerformed(evt); - } - }); - javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4); jPanel4.setLayout(jPanel4Layout); jPanel4Layout.setHorizontalGroup( @@ -463,17 +493,9 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce .addComponent(jSeparator6, javax.swing.GroupLayout.DEFAULT_SIZE, 357, Short.MAX_VALUE) .addGroup(jPanel4Layout.createSequentialGroup() .addGap(10, 10, 10) - .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel4Layout.createSequentialGroup() - .addComponent(snapToSceneCheckbox) - .addGap(18, 18, 18) - .addComponent(snapToGridCheckbox) - .addGap(18, 18, 18) - .addComponent(selectTerrainCheckbox)) - .addGroup(jPanel4Layout.createSequentialGroup() - .addComponent(jLabel5) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(emitButton, javax.swing.GroupLayout.DEFAULT_SIZE, 302, Short.MAX_VALUE))))) + .addComponent(jLabel5) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(emitButton, javax.swing.GroupLayout.DEFAULT_SIZE, 302, Short.MAX_VALUE))) .addContainerGap()) ); jPanel4Layout.setVerticalGroup( @@ -488,12 +510,7 @@ public final class SceneComposerTopComponent extends TopComponent implements Sce .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(jLabel5) .addComponent(emitButton)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(snapToSceneCheckbox) - .addComponent(snapToGridCheckbox) - .addComponent(selectTerrainCheckbox)) - .addContainerGap(15, Short.MAX_VALUE)) + .addContainerGap(40, Short.MAX_VALUE)) ); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); @@ -615,18 +632,21 @@ private void scaleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F toolController.showEditTool(tool); }//GEN-LAST:event_rotateButtonActionPerformed - private void snapToSceneCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_snapToSceneCheckboxActionPerformed - toolController.setSnapToScene(snapToSceneCheckbox.isSelected()); - }//GEN-LAST:event_snapToSceneCheckboxActionPerformed +private void jToggleSceneActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleSceneActionPerformed + toolController.setSnapToScene(jToggleScene.isSelected()); +}//GEN-LAST:event_jToggleSceneActionPerformed - private void snapToGridCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_snapToGridCheckboxActionPerformed - toolController.setSnapToGrid(snapToGridCheckbox.isSelected()); - }//GEN-LAST:event_snapToGridCheckboxActionPerformed +private void jToggleGridActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleGridActionPerformed + toolController.setSnapToGrid(jToggleGrid.isSelected()); +}//GEN-LAST:event_jToggleGridActionPerformed - private void selectTerrainCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectTerrainCheckboxActionPerformed - toolController.setSelectTerrain(selectTerrainCheckbox.isSelected()); - }//GEN-LAST:event_selectTerrainCheckboxActionPerformed +private void jToggleSelectTerrainActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleSelectTerrainActionPerformed + toolController.setSelectTerrain(jToggleSelectTerrain.isSelected()); +}//GEN-LAST:event_jToggleSelectTerrainActionPerformed +private void jToggleSelectGeomActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jToggleSelectGeomActionPerformed + toolController.setSelectGeometries(jToggleSelectGeom.isSelected()); +}//GEN-LAST:event_jToggleSelectGeomActionPerformed // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton camToCursorSelectionButton; private javax.swing.JButton createPhysicsMeshButton; @@ -652,7 +672,13 @@ private void scaleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F private javax.swing.JToolBar.Separator jSeparator4; private javax.swing.JToolBar.Separator jSeparator5; private javax.swing.JSeparator jSeparator6; + private javax.swing.JToolBar.Separator jSeparator7; + private javax.swing.JToolBar.Separator jSeparator8; private javax.swing.JTextField jTextField1; + private javax.swing.JToggleButton jToggleGrid; + private javax.swing.JToggleButton jToggleScene; + private javax.swing.JToggleButton jToggleSelectGeom; + private javax.swing.JToggleButton jToggleSelectTerrain; private javax.swing.JToolBar jToolBar1; private javax.swing.JToolBar jToolBar2; private javax.swing.JToolBar jToolBar3; @@ -666,11 +692,8 @@ private void scaleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F private javax.swing.JLabel sceneInfoLabel2; private javax.swing.JPanel sceneInfoPanel; private javax.swing.JToggleButton selectButton; - private javax.swing.JCheckBox selectTerrainCheckbox; private javax.swing.JToggleButton showGridToggleButton; private javax.swing.JToggleButton showSelectionToggleButton; - private javax.swing.JCheckBox snapToGridCheckbox; - private javax.swing.JCheckBox snapToSceneCheckbox; private javax.swing.ButtonGroup spatialModButtonGroup; // End of variables declaration//GEN-END:variables @@ -906,11 +929,11 @@ private void scaleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F } Collection items = (Collection) result.allInstances(); for (JmeSpatial spatial : items) { - selectSpatial(spatial); + selectSpatial(spatial); return; } } - + private void selectSpatial(JmeSpatial spatial) { if (editorController != null) { editorController.setSelectedSpat(spatial); diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/selectGeometry.png b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/selectGeometry.png new file mode 100644 index 0000000000000000000000000000000000000000..7b26b8ed1542bce2c5a5025af2964747c72af491 GIT binary patch literal 483 zcmV<90UZ8`P)@FR@Kk13Y`n>6$A7&pq{X~K$i4DRXTql90 zhznV`kO=HyzrBW+_j_P@og57OqQ5gRZ5O?v2bzBkU6e{C?5nwsCfP zgiI!55#>OhcEG*jhvx^#uq+FOLIH+hpjNA0bvm6_3NbEEJCL2p4N%AX2(EV?&Ywf)a93Y#iJS5(=se$_7^a^4cavKvyvnGyteb0feR04W!>ay~`jV zA_*4vOsjSkmXfaq%CQ1*C{_c25&|r&Y*%>%MXw1;DRQ%O@-VQlv4iCV#H4t3K4Y(a z`GaLMGc(IFpjtjgMn(n@h8rLxCEuiEWXI)}P{PS0B*wrmAInlgD?0 z1^}JJ!6zyu!@CC{*!NzdoFC+L0X$e9A@)eSLilFJHc7`1)tG?J z*8ut*h*^YAGnm1l$z7h(xx+B zzI+)d_j>~{fV9QL#LfZ}$19-5oj^PrsQEXtiC3;%;nLC3`Gzb85MTg9VbVYoI6H#? O0000K1BC$W1uHA7Z(qND<>ck%Wl&I1 z082c0@POg-=g$ntVmQ4ZA|g_J_UzUFKssAdQ4#D^n3#=?4PGy>fQ%6p6=eb0CMG8K zOG!zI0a=WPhlj8iT7`uEL>lQb&pdyH;i;!5SVDUHc7}9A9fsvVvFlJVoL-p9z;Nbr zc+mecAYBX;1v#}0D%L3^L^u}M7#O~C2n+mWW=xiAxMOjg9epVJQQH@@gKgy*J`QUw&+^{PVuK z@;`_T5=-^>Cmaim3=DVwe)*Pmanb7Riwq3LZ^gvygkQZ{3e2Zdzwz+g!RrScNtvGz d8-@V_3;_5YA6;t#>vI4A002ovPDHLkV1i}$v#$dX91p!`Dyy^u&O2wzn%dJ)naUqrpCAfiDOh?x+DNRbvS z9UBTxf*Bzp)pA+4VZWUOj&ZdBqF3hRp3yNLUO=@Rl!@1}?!2xwgdjh@nd3Df>eXa=71u9O^)E**@vdW{|i7xwv2eE-?F?o4?2Tc@|({LH0pU_0A&iKw!Z)* zNp@38#o&h|F{@$N2*VesCniHMbn_MjgF(=7yr!zEW`J(30JiAIm*U%d$Wk>{YKw7^u|}KqU9)mU5jTEy;c%Gp`FzQZ-fsa0062u_yL^~k Q761SM07*qoM6N<$f*;{yxc~qF literal 0 HcmV?d00001 diff --git a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java index 70add3c09..f9752dfb3 100644 --- a/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java +++ b/sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java @@ -454,11 +454,13 @@ public class SelectTool extends SceneEditTool { } else { // climb up and find the Model Node (parent) and select that, don't select the geom - Spatial linkNodeParent = findModelNodeParent(s); - if (linkNodeParent != null) { - s = linkNodeParent; - } else { - return; + if (!toolController.isSelectGeometries()) { + Spatial linkNodeParent = findModelNodeParent(s); + if (linkNodeParent != null) { + s = linkNodeParent; + } else { + return; + } } final Spatial selec = s; selected = selec; @@ -474,8 +476,8 @@ public class SelectTool extends SceneEditTool { private void doSelect() { //in case of linked assets the selected nod ein the viewer is not necessarily in the explorer. JmeSpatial n = rootNode.getChild(selec); - if(n!= null){ - SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{n}); + if (n != null) { + SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{n}); SceneExplorerTopComponent.findInstance().setSelectedNode(n); } }