Merge pull request #422 from tonihele/bugfix/issue-421

Bugfix/issue 421
jMonkeyEngine · Nov 5, 2022 · f462a93 · f462a93
2 parents f43b88f + 2fe0561
commit f462a93
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/jme3-angelfont/src/com/jme3/gde/angelfont/Bundle.properties b/jme3-angelfont/src/com/jme3/gde/angelfont/Bundle.properties
@@ -15,7 +15,7 @@ AngelFontVisualPanel2.jPanel3.border.title=Font
 AngelFontVisualPanel2.jButton1.text=jButton1
 AngelFontVisualPanel2.jLabel6.text=Font style:
 AngelFontVisualPanel2.jPanel2.border.title=Image
-AngelFontVisualPanel2.jLabel7.text=file name:
+AngelFontVisualPanel2.jLabel7.text=File name:
 AngelFontVisualPanel2.jTextField1.text=jTextField1
 AngelFontVisualPanel2.jLabel8.text=.fnt / .png
 AngelFontVisualPanel2.jLabel9.text=Font name:
@@ -27,8 +27,8 @@ AngelFontVisualPanel2.jSpinner1.toolTipText=The size of the font
 AngelFontVisualPanel2.jComboBox1.toolTipText=The style of the font
 AngelFontVisualPanel2.jTextField1.toolTipText=The name of the generated files
 AngelFontVisualPanel2.jSpinner2.toolTipText=The resulting png image size will be Image Size x Image Size
-AngelFontVisualPanel2.jSpinner5.toolTipText=Defines the vertical padding used for each letter cell
+AngelFontVisualPanel2.jSpinner5.toolTipText=Defines how far apart the letters are rendered from each other
 AngelFontVisualPanel2.jLabel12.text=Char Range:
-AngelFontVisualPanel2.jSpinner6.toolTipText=Defines the vertical padding used for each letter cell
+AngelFontVisualPanel2.jSpinner6.toolTipText=Defines the index of the first letter generated
 AngelFontVisualPanel2.jLabel13.text=to
-AngelFontVisualPanel2.jSpinner7.toolTipText=Defines the vertical padding used for each letter cell
+AngelFontVisualPanel2.jSpinner7.toolTipText=Defines the index of the last letter generated
diff --git a/jme3-core/src/com/jme3/gde/core/scene/state/NormalViewState.java b/jme3-core/src/com/jme3/gde/core/scene/state/NormalViewState.java
@@ -38,6 +38,7 @@
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
+import com.jme3.scene.VertexBuffer.Type;
 import com.jme3.util.TangentBinormalGenerator;
 import java.util.ArrayList;
 import java.util.List;
@@ -74,6 +75,10 @@ protected void onEnable() {
                 "Common/Materials/VertexColor.j3m");
 
         for (final Geometry geometry : geometries) {
+            if(geometry.getMesh().getBuffer(Type.Normal) == null) {
+                continue;
+            }
+
             final Geometry debug = new Geometry(geometry.getName(),
                     TangentBinormalGenerator.genNormalLines(geometry.getMesh(),
                             normalLength));

diff --git a/jme3-core/src/com/jme3/gde/core/sceneviewer/Bundle.properties b/jme3-core/src/com/jme3/gde/core/sceneviewer/Bundle.properties
@@ -8,7 +8,7 @@ SceneViewerTopComponent.enableWireframe.text=
 SceneViewerTopComponent.enableStats.toolTipText=Display Stats
 SceneViewerTopComponent.enableStats.text=
 SceneViewerTopComponent.jToggleButton2.AccessibleContext.accessibleName=Ortho / Persp
-SceneViewerTopComponent.jToggleButton1.toolTipText=show post filter effects
+SceneViewerTopComponent.jToggleButton1.toolTipText=Show post filter effects
 SceneViewerTopComponent.jToggleButton1.text=
 SceneViewerTopComponent.enableOrtho.textO=Ortho.
 SceneViewerTopComponent.enablePBREnv.toolTipText=Toggle a PBR Environment

diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/Bundle.properties
@@ -20,7 +20,7 @@ SceneComposerTopComponent.moveToCursorButton.toolTipText=Move selected item to c
 SceneComposerTopComponent.moveToCursorButton.text=
 SceneComposerTopComponent.resetCursorButton.toolTipText=Snap cursor to zero
 SceneComposerTopComponent.resetCursorButton.text=Zero
-SceneComposerTopComponent.camToCursorSelectionButton.toolTipText=set camera center to cursor center
+SceneComposerTopComponent.camToCursorSelectionButton.toolTipText=Set camera center to cursor center
 SceneComposerTopComponent.camToCursorSelectionButton.text=Cursor
 SceneComposerTopComponent.cursorToSelectionButton.text=Selection
 SceneComposerTopComponent.cursorToSelectionButton.toolTipText=Snap cursor to selection center
@@ -42,12 +42,12 @@ SceneComposerTopComponent.selectButton.toolTipText=Select
 SceneComposerTopComponent.moveButton.toolTipText=Move
 SceneComposerTopComponent.rotateButton.toolTipText=Rotate
 SceneComposerTopComponent.scaleButton.toolTipText=Scale
-SceneComposerTopComponent.jLabel5.text=Effects :
+SceneComposerTopComponent.jLabel5.text=Effects:
 SceneComposerTopComponent.emitButton.toolTipText=Emit all particles of all particle emitters from the selected Node
 SceneComposerTopComponent.emitButton.text=Emit All
 SceneComposerTopComponent.jLabel6.text=Physics:
 SceneComposerTopComponent.jButton3.text=
-SceneComposerTopComponent.jButton3.toolTipText=stop the physics simulation and remove all objects from the physics space
+SceneComposerTopComponent.jButton3.toolTipText=Stop the physics simulation and remove all objects from the physics space
 SceneComposerTopComponent.jToggleScene.text=
 SceneComposerTopComponent.jToggleGrid.text=
 SceneComposerTopComponent.jToggleSelectGeom.text=
@@ -85,4 +85,5 @@ SceneComposerTopComponent.Grid.text=Grid
 SceneComposerTopComponent.Grid.toolTipText=Display grid
 SceneComposerTopComponent.text=Scene Composer
 SceneComposerTopComponent.toolTipText=Scene Composer
-SceneComposerTopComponent.jButton2.label=
+SceneComposerTopComponent.jButton2.text=
+SceneComposerTopComponent.jButton2.toolTipText=Start physics simulation
diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.form
@@ -53,7 +53,7 @@
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="no scene loaded">
+            <TitledBorder title="Camera">
               <ResourceString PropertyName="titleX" bundle="com/jme3/gde/scenecomposer/Bundle.properties" key="SceneComposerTopComponent.cameraPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </TitledBorder>
           </Border>
@@ -1005,10 +1005,10 @@
               <Connection code="Icons.play" type="code"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="com/jme3/gde/scenecomposer/Bundle.properties" key="SceneComposerTopComponent.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/scenecomposer/Bundle.properties" key="SceneComposerTopComponent.jButton2.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/scenecomposer/Bundle.properties" key="SceneComposerTopComponent.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+              <ResourceString bundle="com/jme3/gde/scenecomposer/Bundle.properties" key="SceneComposerTopComponent.jButton2.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
@@ -1065,7 +1065,7 @@
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="no scene loaded">
+            <TitledBorder title="No scene loaded">
               <ResourceString PropertyName="titleX" bundle="com/jme3/gde/scenecomposer/Bundle.properties" key="SceneComposerTopComponent.sceneInfoPanel.border.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </TitledBorder>
           </Border>

diff --git a/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java b/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java
@@ -649,10 +649,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         org.openide.awt.Mnemonics.setLocalizedText(jLabel6, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jLabel6.text")); // NOI18N
 
         jButton2.setIcon(Icons.play);
-        jButton2.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.toolTipText")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(jButton2, org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jButton2.text")); // NOI18N
+        jButton2.setToolTipText(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jButton2.toolTipText")); // NOI18N
         jButton2.setFocusable(false);
         jButton2.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        jButton2.setLabel(org.openide.util.NbBundle.getMessage(SceneComposerTopComponent.class, "SceneComposerTopComponent.jButton2.label")); // NOI18N
         jButton2.setMargin(new java.awt.Insets(2, 2, 2, 2));
         jButton2.setMaximumSize(new java.awt.Dimension(32, 32));
         jButton2.setMinimumSize(new java.awt.Dimension(32, 32));