Browse Source

Fixed some documentation links

Toni Helenius 5 years ago
parent
commit
cda80e54c5

+ 1 - 1
branding/modules/org-netbeans-modules-autoupdate-ui.jar/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties

@@ -1 +1 @@
-OperationDescriptionStep_BrokenPackageDepInit=<h3>jMonkeyEngine SDK requires the JDK</h3>Currently, jMonkeyEngine SDK appears to be running with the JRE instead of the full JDK.<br><br>To use the SDK, edit the <code>--jdkhome</code> command line option in jmonkeyplatform/etc/jmonkeyplatform.conf to the location of a JDK installation. See <a href="http://jmonkeyengine.org/wiki/doku.php/sdk:troubleshooting">the jME wiki</a> for more information.<br><br>
+OperationDescriptionStep_BrokenPackageDepInit=<h3>jMonkeyEngine SDK requires the JDK</h3>Currently, jMonkeyEngine SDK appears to be running with the JRE instead of the full JDK.<br><br>To use the SDK, edit the <code>--jdkhome</code> command line option in jmonkeyplatform/etc/jmonkeyplatform.conf to the location of a JDK installation. See <a href="https://wiki.jmonkeyengine.org/sdk/troubleshooting.html#troubleshooting-jmonkeyengine3-sdk">the jME wiki</a> for more information.<br><br>

+ 16 - 19
jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java

@@ -2,7 +2,7 @@
  * Copyright (c) 2009-2010 jMonkeyEngine All rights reserved. <p/>
  * Copyright (c) 2009-2010 jMonkeyEngine All rights reserved. <p/>
  * Redistribution and use in source and binary forms, with or without
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * * Redistributions of source code must retain the above copyright notice,
  * * Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer. <p/> * Redistributions
  * this list of conditions and the following disclaimer. <p/> * Redistributions
  * in binary form must reproduce the above copyright notice, this list of
  * in binary form must reproduce the above copyright notice, this list of
@@ -29,7 +29,6 @@ import com.jme3.app.StatsView;
 import com.jme3.asset.AssetManager;
 import com.jme3.asset.AssetManager;
 import com.jme3.bullet.BulletAppState;
 import com.jme3.bullet.BulletAppState;
 import com.jme3.environment.EnvironmentCamera;
 import com.jme3.environment.EnvironmentCamera;
-import com.jme3.environment.util.LightsDebugState;
 import com.jme3.font.BitmapFont;
 import com.jme3.font.BitmapFont;
 import com.jme3.font.BitmapText;
 import com.jme3.font.BitmapText;
 import com.jme3.gde.core.Installer;
 import com.jme3.gde.core.Installer;
@@ -53,7 +52,6 @@ import com.jme3.math.Vector3f;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.renderer.ViewPort;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
-import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.Spatial.CullHint;
 import com.jme3.scene.Spatial.CullHint;
@@ -69,7 +67,6 @@ import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URL;
-import java.util.Iterator;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.logging.Level;
 import java.util.logging.Level;
@@ -225,11 +222,11 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
                 super.initialize();
                 super.initialize();
                 thread = Thread.currentThread();
                 thread = Thread.currentThread();
                 fakeApp.setAudioRenderer(audioRenderer);
                 fakeApp.setAudioRenderer(audioRenderer);
-                fakeApp.startFakeApp();                
+                fakeApp.startFakeApp();
                 {
                 {
                     overlayView = getRenderManager().createMainView("Overlay", cam);
                     overlayView = getRenderManager().createMainView("Overlay", cam);
                     overlayView.setClearFlags(false, true, false);
                     overlayView.setClearFlags(false, true, false);
-                    guiViewPort.setClearFlags(false, false, false);                    
+                    guiViewPort.setClearFlags(false, false, false);
                 }
                 }
                 ColorRGBA color = new ColorRGBA();
                 ColorRGBA color = new ColorRGBA();
                 color.setAsSrgb(0.25f, 0.25f, 0.25f, 1.0f);
                 color.setAsSrgb(0.25f, 0.25f, 0.25f, 1.0f);
@@ -253,7 +250,7 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
                 guiViewPort.attachScene(guiNode);
                 guiViewPort.attachScene(guiNode);
                 cam.setLocation(new Vector3f(0, 0, 10));
                 cam.setLocation(new Vector3f(0, 0, 10));
                 getStateManager().attach(new EnvironmentCamera());
                 getStateManager().attach(new EnvironmentCamera());
-                
+
                 wireProcessor = new WireProcessor(assetManager);
                 wireProcessor = new WireProcessor(assetManager);
 
 
                 inputManager.addMapping("MouseAxisX", new MouseAxisTrigger(MouseInput.AXIS_X, false));
                 inputManager.addMapping("MouseAxisX", new MouseAxisTrigger(MouseInput.AXIS_X, false));
@@ -284,7 +281,7 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
         super.destroy();
         super.destroy();
     }
     }
 
 
-    @Override    
+    @Override
     public void update() {
     public void update() {
         if (!started) {
         if (!started) {
             try {
             try {
@@ -308,7 +305,7 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
                     fpsText.setText("Frames per second: " + fps);
                     fpsText.setText("Frames per second: " + fps);
                     secondCounter = 0.0f;
                     secondCounter = 0.0f;
                 }
                 }
-                getStateManager().update(tpf);                
+                getStateManager().update(tpf);
                 toolsNode.updateLogicalState(tpf);
                 toolsNode.updateLogicalState(tpf);
                 if (fakap != null) {
                 if (fakap != null) {
                     fakap.updateFake(tpf);
                     fakap.updateFake(tpf);
@@ -597,7 +594,7 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
             }
             }
         });
         });
     }
     }
-    
+
     public void enablePBRProbe(final boolean selected) {
     public void enablePBRProbe(final boolean selected) {
         if (pbrLightProbe == null) {
         if (pbrLightProbe == null) {
             new Thread() {
             new Thread() {
@@ -606,7 +603,7 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
                     Spatial s = assetManager.loadModel("com/jme3/gde/core/sceneviewer/pbrenv.j3o");
                     Spatial s = assetManager.loadModel("com/jme3/gde/core/sceneviewer/pbrenv.j3o");
                     pbrLightProbe = (LightProbe)s.getLocalLightList().get(0);
                     pbrLightProbe = (LightProbe)s.getLocalLightList().get(0);
                     s.getLocalLightList().clear();
                     s.getLocalLightList().clear();
-                    
+
                     enqueue(new Callable<Void>() {
                     enqueue(new Callable<Void>() {
                         @Override
                         @Override
                         public Void call() throws Exception {
                         public Void call() throws Exception {
@@ -615,7 +612,7 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
                         }
                         }
                     });
                     });
                 }
                 }
-                
+
             }.start();
             }.start();
         } else {
         } else {
             enqueue(new Callable<Void>() {
             enqueue(new Callable<Void>() {
@@ -631,14 +628,14 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
             });
             });
         }
         }
     }
     }
-    
+
     public void enablePBRSkybox(final boolean selected) {
     public void enablePBRSkybox(final boolean selected) {
         if (pbrSky == null) {
         if (pbrSky == null) {
             new Thread() {
             new Thread() {
                 @Override
                 @Override
                 public void run() {
                 public void run() {
                     pbrSky = SkyFactory.createSky(assetManager, "Textures/Sky/Path.hdr", SkyFactory.EnvMapType.EquirectMap);
                     pbrSky = SkyFactory.createSky(assetManager, "Textures/Sky/Path.hdr", SkyFactory.EnvMapType.EquirectMap);
-                    
+
                     enqueue(new Callable<Void>() {
                     enqueue(new Callable<Void>() {
                         @Override
                         @Override
                         public Void call() throws Exception {
                         public Void call() throws Exception {
@@ -647,7 +644,7 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
                         }
                         }
                     });
                     });
                 }
                 }
-                
+
             }.start();
             }.start();
         } else {
         } else {
             enqueue(new Callable<Void>() {
             enqueue(new Callable<Void>() {
@@ -715,12 +712,12 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
         NotifyUtil.show("Error starting OpenGL context!", "Click here to go to troubleshooting web page.", MessageType.EXCEPTION, lst, 0);
         NotifyUtil.show("Error starting OpenGL context!", "Click here to go to troubleshooting web page.", MessageType.EXCEPTION, lst, 0);
         logger.log(Level.INFO, exception.getMessage(), exception);
         logger.log(Level.INFO, exception.getMessage(), exception);
     }
     }
-    
+
     private static final ActionListener lst = new ActionListener() {
     private static final ActionListener lst = new ActionListener() {
         @Override
         @Override
         public void actionPerformed(ActionEvent e) {
         public void actionPerformed(ActionEvent e) {
             try {
             try {
-                HtmlBrowser.URLDisplayer.getDefault().showURL(new URL("http://jmonkeyengine.org/wiki/doku.php/sdk:troubleshooting"));
+                HtmlBrowser.URLDisplayer.getDefault().showURL(new URL("https://wiki.jmonkeyengine.org/sdk/troubleshooting.html#troubleshooting-jmonkeyengine3-sdk"));
             } catch (MalformedURLException ex) {
             } catch (MalformedURLException ex) {
                 Exceptions.printStackTrace(ex);
                 Exceptions.printStackTrace(ex);
             }
             }
@@ -745,13 +742,13 @@ public class SceneApplication extends LegacyApplication implements LookupProvide
     public Node getGuiNode() {
     public Node getGuiNode() {
         return guiNode;
         return guiNode;
     }
     }
-    
+
     /**
     /**
      * Gets the RootNode of this Application.
      * Gets the RootNode of this Application.
      * Warning: With great Power comes great responsibility ;)
      * Warning: With great Power comes great responsibility ;)
      * You shouldn't use this unless you exactly know about it's implications.
      * You shouldn't use this unless you exactly know about it's implications.
      * Adding Spatials here won't make them Serialize into the .j3o file...
      * Adding Spatials here won't make them Serialize into the .j3o file...
-     * @return 
+     * @return
      */
      */
     public Node getRootNode() {
     public Node getRootNode() {
         return rootNode;
         return rootNode;

+ 1 - 1
jme3-ios/src/com/jme3/gde/ios/Bundle.properties

@@ -2,6 +2,6 @@ avian-data=avian-data
 OpenIDE-Module-Display-Category=jME3 - SDK Plugin
 OpenIDE-Module-Display-Category=jME3 - SDK Plugin
 OpenIDE-Module-Long-Description=\
 OpenIDE-Module-Long-Description=\
     This pre-alpha version of iOS deployment requires MacOSX and XCode.\n\n\
     This pre-alpha version of iOS deployment requires MacOSX and XCode.\n\n\
-    See http://jmonkeyengine.org/wiki/doku.php/jme3:ios
+    See https://wiki.jmonkeyengine.org/jme3/ios.html
 OpenIDE-Module-Name=iOS Support
 OpenIDE-Module-Name=iOS Support
 OpenIDE-Module-Short-Description=Support for iOS distribution (pre-alpha)
 OpenIDE-Module-Short-Description=Support for iOS distribution (pre-alpha)