Deprecate display rescale callbacks

Author: riccardobl

jme3-android/src/main/java/com/jme3/app/AndroidHarnessFragment.java

@@ -244,6 +244,7 @@ public void reshape(int logicalWidth, int logicalHeight, int framebufferWidth, i
     }
 
     @Override
+    @Deprecated
     public void rescale(float x, float y) {
         app.rescale(x, y);
     }

jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java

@@ -465,7 +465,6 @@ public void onSurfaceChanged(GL10 gl, int width, int height) {
         if (renderable.get()) {
             logger.log(Level.FINE, "App already initialized, calling reshape");
             listener.reshape(logicalWidth, logicalHeight, getRenderFramebufferWidth(), getRenderFramebufferHeight());
-            listener.rescale(displayScale.x, displayScale.y);
         }
     }
 
@@ -512,7 +511,6 @@ private void applyDisplayScaleModeIfNeeded() {
         updateDisplayScaleMetrics();
         if (renderable.get()) {
             listener.reshape(logicalWidth, logicalHeight, getRenderFramebufferWidth(), getRenderFramebufferHeight());
-            listener.rescale(displayScale.x, displayScale.y);
         }
     }
 
@@ -531,7 +529,6 @@ public void onDrawFrame(GL10 gl) {
                 listener.initialize();
                 if (framebufferWidth > 0 && framebufferHeight > 0) {
                     listener.reshape(logicalWidth, logicalHeight, getRenderFramebufferWidth(), getRenderFramebufferHeight());
-                    listener.rescale(displayScale.x, displayScale.y);
                 }
                 renderable.set(true);
             }

jme3-core/src/main/java/com/jme3/app/LegacyApplication.java

@@ -603,7 +603,13 @@ public void reshape(int logicalWidth, int logicalHeight, int framebufferWidth, i
         }
     }
 
+    /**
+     * @deprecated Display scale changes are reported through
+     * {@link #reshape(int, int, int, int)}. Built-in contexts no longer call
+     * this method.
+     */
     @Override
+    @Deprecated
     public void rescale(float x, float y) {
         if (renderManager != null) {
             renderManager.notifyRescale(x, y);

jme3-core/src/main/java/com/jme3/post/SceneProcessor.java

@@ -65,10 +65,15 @@ public interface SceneProcessor {
     /**
      * Called when the scale of the viewport has been changed.
      *
+     * @deprecated Display scale changes are reported through
+     * {@link #reshape(ViewPort, int, int)} using the viewport render target size.
+     * Built-in contexts no longer call this method.
+     *
      * @param vp the affected ViewPort
      * @param x the new horizontal scale 
      * @param y the new vertical scale 
      */
+    @Deprecated
     public default void rescale(ViewPort vp, float x, float y) {
 
     }

jme3-core/src/main/java/com/jme3/renderer/RenderManager.java

@@ -486,7 +486,8 @@ private void notifyReshape(ViewPort vp, int w, int h) {
         }
     }
 
-    private void notifyRescale(ViewPort vp, float x, float y) {
+    @Deprecated
+    private void notifyRescale(ViewPort vp, float x, float y) {
         List<SceneProcessor> processors = vp.getProcessors();
         for (SceneProcessor proc : processors) {
             if (!proc.isInitialized()) {
@@ -554,11 +555,16 @@ private int getFrameBufferHeight(FrameBuffer frameBuffer, int fallbackHeight) {
     /**
      * Internal use only.
      * Updates the scale of all on-screen ViewPorts
-     *
-     * @param x the new horizontal scale
-     * @param y the new vertical scale
-     */
-    public void notifyRescale(float x, float y) {
+     *
+     * @deprecated Display scale changes are handled by {@link #notifyReshape(int, int, int, int)}
+     * using logical and framebuffer sizes. Built-in contexts no longer call
+     * this method.
+     *
+     * @param x the new horizontal scale
+     * @param y the new vertical scale
+     */
+    @Deprecated
+    public void notifyRescale(float x, float y) {
         for (ViewPort vp : preViewPorts) {
             notifyRescale(vp, x, y);
         }

jme3-core/src/main/java/com/jme3/system/SystemListener.java

@@ -66,9 +66,15 @@ public default void reshape(int logicalWidth, int logicalHeight, int framebuffer
 
     /**
      * Called to notify the application that the scale has changed.
+     *
+     * @deprecated Display scale changes are reported through
+     * {@link #reshape(int, int, int, int)}. Built-in contexts no longer call
+     * this method.
+     *
      * @param x the new horizontal scale of the display 
      * @param y the new vertical scale of the display
      */
+    @Deprecated
     public default void rescale(float x, float y){
 
     }

jme3-desktop/src/main/java/com/jme3/system/awt/AwtPanelsContext.java

@@ -70,6 +70,7 @@ public void reshape(int width, int height) {
         }
 
         @Override
+        @Deprecated
         public void rescale(float x, float y) {
             logger.severe("rescale is not supported.");
         }

jme3-ios/src/main/java/com/jme3/system/ios/IGLESContext.java

@@ -319,7 +319,6 @@ public void resizeFramebuffer(int width, int height) {
                 logger.log(Level.FINE, "iOS framebuffer resized, width: {0} height: {1}",
                         new Object[]{framebufferWidth, framebufferHeight});
                 listener.reshape(logicalWidth, logicalHeight, getRenderFramebufferWidth(), getRenderFramebufferHeight());
-                listener.rescale(displayScale.x, displayScale.y);
             }
         }
     }
@@ -365,7 +364,6 @@ private void applyDisplayScaleModeIfNeeded() {
         linearFrameBufferDirty = true;
         if (renderable.get() && listener != null) {
             listener.reshape(logicalWidth, logicalHeight, getRenderFramebufferWidth(), getRenderFramebufferHeight());
-            listener.rescale(displayScale.x, displayScale.y);
         }
     }
 

jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java

@@ -229,7 +229,6 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
     private int oldFramebufferHeight;
     private int oldLogicalWidth;
     private int oldLogicalHeight;
-    private final Vector2f oldScale = new Vector2f(1, 1);
     private final Vector2f displayScale = new Vector2f(1, 1);
     private Material blitMaterial;
     private Picture blitGeometry;
@@ -586,10 +585,6 @@ private void updateSizes(boolean notifyListener) {
                 oldFramebufferHeight = framebufferHeight;
             }
 
-            if (oldScale.x != displayScale.x || oldScale.y != displayScale.y) {
-                listener.rescale(displayScale.x, displayScale.y);
-                oldScale.set(displayScale);
-            }
         }
     }
 
@@ -681,7 +676,6 @@ protected void destroyContext() {
             oldFramebufferHeight = 0;
             oldLogicalWidth = 0;
             oldLogicalHeight = 0;
-            oldScale.set(1, 1);
         } catch (Exception ex) {
             if (failure == null) {
                 failure = ex;