[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2587] trunk/LWJGL/src/java/org/lwjgl/test/ opengl/awt

[<eli...@us...>]

Revision: 2587
          http://svn.sourceforge.net/java-game-lib/?rev=2587&view=rev
Author:   elias_naur
Date:     2006-10-20 05:32:33 -0700 (Fri, 20 Oct 2006)

Log Message:
-----------
Added nicer resizing to AWT tests

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTTest.java

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java	2006-10-20 11:51:34 UTC (rev 2586)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTGears.java	2006-10-20 12:32:33 UTC (rev 2587)
@@ -76,10 +76,11 @@
 	public AWTGears() throws LWJGLException {
 		setTitle("Gears");
 		setSize(300, 300);
-		setLayout(null);
 		add(canvas0 = new AWTGLCanvas() {
 			long startTime = 0;
-			long fps = 0;			
+			long fps = 0;
+			int current_width;
+			int current_height;
 			public void paintGL() {
 				
 				if(startTime == 0) {
@@ -89,6 +90,11 @@
 				
 				try {
 					angle += 2.0f;
+					if (getWidth() != current_width || getHeight() != current_height) {
+						current_width = getWidth();
+						current_height = getHeight();
+						GL11.glViewport(0, 0, current_width, current_height);
+					}
 					GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
 
 					GL11.glPushMatrix();

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTTest.java	2006-10-20 11:51:34 UTC (rev 2586)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTTest.java	2006-10-20 12:32:33 UTC (rev 2587)
@@ -32,6 +32,7 @@
 package org.lwjgl.test.opengl.awt;
 
 import java.awt.Frame;
+import java.awt.GridLayout;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
@@ -61,11 +62,17 @@
 	public AWTTest() throws LWJGLException {
 		setTitle("LWJGL AWT Canvas Test");
 		setSize(640, 320);
-		setLayout(null);
+		setLayout(new GridLayout(1, 2));
 		add(canvas0 = new AWTGLCanvas() {
+			int current_height;
+			int current_width;
 			public void paintGL() {
 				try {
-					makeCurrent();
+					if (getWidth() != current_width || getHeight() != current_height) {
+						current_width = getWidth();
+						current_height = getHeight();
+						GL11.glViewport(0, 0, current_width, current_height);
+					}
 					GL11.glViewport(0, 0, getWidth(), getHeight());
 					GL11.glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
 					GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
@@ -88,10 +95,16 @@
 		});
 		canvas0.setBounds(0, 0, 320, 320);
 		add(canvas1 = new AWTGLCanvas() {
+			int current_height;
+			int current_width;
 			public void paintGL() {
 				try {
 					angle += 1.0f;
-					makeCurrent();
+					if (getWidth() != current_width || getHeight() != current_height) {
+						current_width = getWidth();
+						current_height = getHeight();
+						GL11.glViewport(0, 0, current_width, current_height);
+					}
 					GL11.glViewport(0, 0, getWidth(), getHeight());
 					GL11.glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
 					GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.