Merge branch 'main' of https://github.com/LWJGLX/lwjgl3-awt

SWinxy · Jan 17, 2022 · 8a223f6 · 8a223f6
2 parents b92e55c + 5d82867
commit 8a223f6
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 13 deletions.
diff --git a/src/org/lwjgl/opengl/awt/AWTGLCanvas.java b/src/org/lwjgl/opengl/awt/AWTGLCanvas.java
@@ -5,6 +5,9 @@
 import org.lwjgl.system.Platform;
 
 import java.awt.*;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
 import java.util.concurrent.Callable;
 
 /**
@@ -33,6 +36,16 @@ private static PlatformGLCanvas createPlatformCanvas() {
     protected final GLData data;
     protected final GLData effective = new GLData();
     protected boolean initCalled;
+    private int framebufferWidth, framebufferHeight;
+    private final ComponentListener listener = new ComponentAdapter() {
+        @Override
+        public void componentResized(ComponentEvent e) {
+            java.awt.geom.AffineTransform t = AWTGLCanvas.this.getGraphicsConfiguration().getDefaultTransform();
+            float sx = (float) t.getScaleX(), sy = (float) t.getScaleY();
+            AWTGLCanvas.this.framebufferWidth = (int) (getWidth() * sx);
+            AWTGLCanvas.this.framebufferHeight = (int) (getHeight() * sy);
+        }
+    };
 
     @Override
     public void removeNotify() {
@@ -43,11 +56,17 @@ public void removeNotify() {
         disposeCanvas();
     }
 
+    @Override
+    public synchronized void addComponentListener(ComponentListener l) {
+        super.addComponentListener(l);
+    }
+
     public void disposeCanvas() {
         this.platformCanvas.dispose();
     }
     protected AWTGLCanvas(GLData data) {
         this.data = data;
+        this.addComponentListener(listener);
     }
 
     protected AWTGLCanvas() {
@@ -120,6 +139,14 @@ public void render() {
      */
     public abstract void paintGL();
 
+    public int getFramebufferWidth() {
+        return framebufferWidth;
+    }
+
+    public int getFramebufferHeight() {
+        return framebufferHeight;
+    }
+
     public final void swapBuffers() {
         platformCanvas.swapBuffers();
     }

diff --git a/test/org/lwjgl/opengl/awt/AWTTest.java b/test/org/lwjgl/opengl/awt/AWTTest.java
@@ -16,8 +16,6 @@ public static void main(String[] args) {
         frame.setLayout(new BorderLayout());
         frame.setPreferredSize(new Dimension(600, 600));
         GLData data = new GLData();
-        data.samples = 4;
-        data.swapInterval = 0;
         AWTGLCanvas canvas;
         frame.add(canvas = new AWTGLCanvas(data) {
             private static final long serialVersionUID = 1L;
@@ -27,8 +25,8 @@ public void initGL() {
                 glClearColor(0.3f, 0.4f, 0.5f, 1);
             }
             public void paintGL() {
-                int w = getWidth();
-                int h = getHeight();
+                int w = getFramebufferWidth();
+                int h = getFramebufferHeight();
                 float aspect = (float) w / h;
                 double now = System.currentTimeMillis() * 0.001;
                 float width = (float) Math.abs(Math.sin(now * 0.3));
@@ -47,7 +45,6 @@ public void paintGL() {
         frame.pack();
         frame.setVisible(true);
         frame.transferFocus();
-
         Runnable renderLoop = new Runnable() {
 			public void run() {
 				if (!canvas.isValid())

diff --git a/test/org/lwjgl/opengl/awt/AWTThreadTest.java b/test/org/lwjgl/opengl/awt/AWTThreadTest.java
@@ -56,8 +56,8 @@ public void initGL() {
                 glClearColor(0.3f, 0.4f, 0.5f, 1);
             }
             public void paintGL() {
-                int w = getWidth();
-                int h = getHeight();
+                int w = getFramebufferWidth();
+                int h = getFramebufferHeight();
                 float aspect = (float) w / h;
                 double now = System.currentTimeMillis() * 0.001;
                 float width = (float) Math.abs(Math.sin(now * 0.3));

diff --git a/test/org/lwjgl/opengl/awt/CompareScreenshotTest.java b/test/org/lwjgl/opengl/awt/CompareScreenshotTest.java
@@ -336,8 +336,8 @@ public void initGL() {
         }
 
         public void paintGL() {
-            int w = getWidth();
-            int h = getHeight();
+            int w = getFramebufferWidth();
+            int h = getFramebufferHeight();
             float aspect = (float) w / h;
             double now = 100;
             float width = (float) Math.abs(Math.sin(now * 0.3));

diff --git a/test/org/lwjgl/opengl/awt/Core32Test.java b/test/org/lwjgl/opengl/awt/Core32Test.java
@@ -58,8 +58,8 @@ public void initGL() {
                 aspectUniform = glGetUniformLocation(prog, "aspect");
             }
             public void paintGL() {
-                int w = getWidth();
-                int h = getHeight();
+                int w = getFramebufferWidth();
+                int h = getFramebufferHeight();
                 float aspect = (float) w / h;
                 glClear(GL_COLOR_BUFFER_BIT);
                 glViewport(0, 0, w, h);

diff --git a/test/org/lwjgl/opengl/awt/DrawOnDemandTest.java b/test/org/lwjgl/opengl/awt/DrawOnDemandTest.java
@@ -31,8 +31,8 @@ public void initGL() {
 
 			@Override
 			public void paintGL() {
-				int w = getWidth();
-				int h = getHeight();
+				int w = getFramebufferWidth();
+				int h = getFramebufferHeight();
 				if (w == 0 || h == 0) {
 					return;
 				}