Merge remote-tracking branch 'refs/remotes/origin/master'

jme3-core/src/main/java/com/jme3/input/KeyInput.java

@@ -445,6 +445,16 @@ public interface KeyInput extends Input {
      * (J3100).
      */
     public static final int KEY_UNLABELED = 0x97;
+    /**
+     * PrtScr key.
+     * Note: for use on keyboards with a PrtScr key that is
+     * separate from the SysRq key. Most keyboards combine
+     * SysRq and PrtScr so if the intent is to actually
+     * capture the user's desire to capture the screen
+     * then SysRq is the most likely scan code.
+     * Use PrtScr to catch the rest (laptops, mini-keyboards, etc.)
+     */
+    public static final int KEY_PRTSCR = 0x9A;
     /**
      * Enter key (num pad).
      */

jme3-core/src/main/java/com/jme3/opencl/OpenCLObjectManager.java

@@ -43,8 +43,8 @@ import java.util.logging.Logger;
  */
 public class OpenCLObjectManager {
     private static final Logger LOG = Logger.getLogger(OpenCLObjectManager.class.getName());
-    private static final Level LOG_LEVEL1 = Level.FINER;
+    private static final Level LOG_LEVEL1 = Level.FINEST;
-    private static final Level LOG_LEVEL2 = Level.FINE;
+    private static final Level LOG_LEVEL2 = Level.FINER;
     
     private static final OpenCLObjectManager INSTANCE = new OpenCLObjectManager();
     private OpenCLObjectManager() {}

jme3-core/src/main/java/com/jme3/shadow/AbstractShadowFilter.java

@@ -62,6 +62,12 @@ public abstract class AbstractShadowFilter<T extends AbstractShadowRenderer> ext
     protected T shadowRenderer;
     protected ViewPort viewPort;
 
+    /**
+     * used for serialization
+     */
+    protected AbstractShadowFilter(){
+    }
+    
     /**
      * Abstract class constructor
      *

jme3-core/src/main/java/com/jme3/shadow/DirectionalLightShadowFilter.java

@@ -56,6 +56,16 @@ import java.io.IOException;
  */
 public class DirectionalLightShadowFilter extends AbstractShadowFilter<DirectionalLightShadowRenderer> {
 
+    /**
+     * Used for serialzation.
+     * Use DirectionalLightShadowFilter#DirectionalLightShadowFilter
+     * (AssetManager assetManager, int shadowMapSize, int nbSplits)
+     * instead.
+     */
+    public DirectionalLightShadowFilter() {
+        super();
+    }
+    
     /**
      * Creates a DirectionalLightShadowFilter Shadow Filter More info on the
      * technique at <a

jme3-core/src/main/java/com/jme3/shadow/PointLightShadowFilter.java

@@ -56,6 +56,16 @@ import java.io.IOException;
  */
 public class PointLightShadowFilter extends AbstractShadowFilter<PointLightShadowRenderer> {
 
+    /**
+     * Used for serialization.
+     * Use PointLightShadowFilter#PointLightShadowFilter(AssetManager
+     * assetManager, int shadowMapSize)
+     * instead.
+     */
+    public PointLightShadowFilter() {
+        super();
+    }
+
     /**
      * Creates a PointLightShadowFilter
      *

jme3-core/src/main/java/com/jme3/shadow/PointLightShadowRenderer.java

@@ -63,9 +63,10 @@ public class PointLightShadowRenderer extends AbstractShadowRenderer {
     private Geometry[] frustums = null;
 
     /**
-     * Used for serialization use
+     * Used for serialization.
-     * PointLightShadowRenderer"PointLightShadowRenderer(AssetManager
+     * Use PointLightShadowRenderer#PointLightShadowRenderer(AssetManager
      * assetManager, int shadowMapSize)
+     * instead.
      */
     public PointLightShadowRenderer() {
         super();

jme3-core/src/main/java/com/jme3/shadow/PssmShadowFilter.java

@@ -69,6 +69,16 @@ public class PssmShadowFilter extends Filter {
     private PssmShadowRenderer pssmRenderer;
     private ViewPort viewPort;
 
+    /**
+     * Used for serialization.
+     * Use PssmShadowFilter#PssmShadowFilter(AssetManager
+     * assetManager, int size, int nbSplits)
+     * instead.
+     */
+    public PssmShadowFilter() {
+        super();
+    }
+    
     /**
      * Creates a PSSM Shadow Filter 
      * More info on the technique at <a href="http://http.developer.nvidia.com/GPUGems3/gpugems3_ch10.html">http://http.developer.nvidia.com/GPUGems3/gpugems3_ch10.html</a>

jme3-core/src/main/java/com/jme3/shadow/SpotLightShadowFilter.java

@@ -56,6 +56,16 @@ import java.io.IOException;
  */
 public class SpotLightShadowFilter extends AbstractShadowFilter<SpotLightShadowRenderer> {
 
+    /**
+     * Used for serialization.
+     * Use SpotLightShadowFilter#SpotLightShadowFilter(AssetManager assetManager,
+     * int shadowMapSize)
+     * instead.
+     */
+    public SpotLightShadowFilter() {
+        super();
+    }
+    
     /**
      * Creates a SpotLight Shadow Filter
      *

jme3-desktop/src/main/java/com/jme3/input/awt/AwtKeyInput.java

@@ -371,6 +371,8 @@ public class AwtKeyInput implements KeyInput, KeyListener {
                 return KeyEvent.VK_ALT; //todo: location left
             case KEY_RMENU:
                 return KeyEvent.VK_ALT; //todo: location right
+            case KEY_PRTSCR:
+                return KeyEvent.VK_PRINTSCREEN;
         }
         logger.log(Level.WARNING, "unsupported key:{0}", key);
         return 0x10000 + key;
@@ -600,6 +602,8 @@ public class AwtKeyInput implements KeyInput, KeyListener {
                 return KEY_LMENU; //Left vs. Right need to improve
             case KeyEvent.VK_META:
             	return KEY_RCONTROL;
+            case KeyEvent.VK_PRINTSCREEN:
+                return KEY_PRTSCR;
 
         }
         logger.log( Level.WARNING, "unsupported key:{0}", key);