diff options
| -rwxr-xr-x | make/scripts/tests-linux-aarch64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/tests-rpi4b-aarch64.sh | 2 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 12 | ||||
| -rw-r--r-- | src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java | 5 | ||||
| -rw-r--r-- | src/newt/classes/com/jogamp/newt/MonitorDevice.java | 15 | ||||
| -rw-r--r-- | src/newt/classes/com/jogamp/newt/Window.java | 1 |
6 files changed, 24 insertions, 13 deletions
diff --git a/make/scripts/tests-linux-aarch64.sh b/make/scripts/tests-linux-aarch64.sh index 1e8947d06..d7fd74fe1 100755 --- a/make/scripts/tests-linux-aarch64.sh +++ b/make/scripts/tests-linux-aarch64.sh @@ -6,7 +6,7 @@ SDIR=`dirname $0` #JAVA_CMD=/usr/lib/jvm/java-11-openjdk-arm64/bin/java JAVA_CMD=`which java` -# D_ARGS="-Dnewt.ws.mmwidth=150 -Dnewt.ws.mmheight=90" +# D2_ARGS="-Dnewt.ws.mmwidth=150 -Dnewt.ws.mmheight=90" . $SDIR/tests.sh $JAVA_CMD -DummyArg ../build-linux-aarch64 $* diff --git a/make/scripts/tests-rpi4b-aarch64.sh b/make/scripts/tests-rpi4b-aarch64.sh index 101d6e445..957929fa2 100755 --- a/make/scripts/tests-rpi4b-aarch64.sh +++ b/make/scripts/tests-rpi4b-aarch64.sh @@ -6,7 +6,7 @@ SDIR=`dirname $0` #JAVA_CMD=/usr/lib/jvm/java-11-openjdk-arm64/bin/java JAVA_CMD=`which java` -D_ARGS="-Dnewt.ws.mmwidth=150 -Dnewt.ws.mmheight=90" +D2_ARGS="-Dnewt.ws.mmwidth=150 -Dnewt.ws.mmheight=90" . $SDIR/tests.sh $JAVA_CMD -DummyArg ../build-linux-aarch64 $* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 3e696e928..dbb8ccb27 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -432,10 +432,10 @@ function jrun() { # export __GL_THREADED_OPTIMIZATIONS=1 echo __GL_THREADED_OPTIMIZATIONS $__GL_THREADED_OPTIMIZATIONS echo - echo "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $* - #gdb --args "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $* - "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $* - #strace $javaexe $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D_ARGS $C_ARG $* + echo "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D2_ARGS $D_ARGS $C_ARG $* + #gdb --args "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D2_ARGS $D_ARGS $C_ARG $* + "$javaexe" $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D2_ARGS $D_ARGS $C_ARG $* + #strace $javaexe $javaxargs $MODULE_ARGS $X_ARGS -cp $USE_CLASSPATH $D2_ARGS $D_ARGS $C_ARG $* echo echo "Test End: $*" echo @@ -960,7 +960,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $* -testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $* +#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.UIShapeDemo01 $* @@ -999,7 +999,7 @@ testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $* #testnoawt com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 $* #testmobile com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $* #testmobile com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $* -#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $* +testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $* #testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* #testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* #testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java index 1014553d3..6f419704b 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java @@ -136,7 +136,7 @@ public class RegionRenderer { * </p> * @param rs the used {@link RenderState} * @param enableCallback optional {@link GLCallback}, if not <code>null</code> will be issued at - * {@link #init(GL2ES2, int) init(gl)} and {@link #enable(GL2ES2, boolean) enable(gl, true)}. + * {@link #init(GL2ES2) init(gl)} and {@link #enable(GL2ES2, boolean) enable(gl, true)}. * @param disableCallback optional {@link GLCallback}, if not <code>null</code> will be issued at * {@link #enable(GL2ES2, boolean) enable(gl, false)}. * @return an instance of Region Renderer @@ -194,10 +194,9 @@ public class RegionRenderer { * <p>Shall be called by a {@code draw()} method, e.g. {@link RegionRenderer#draw(GL2ES2, Region, int)}</p> * * @param gl referencing the current GLContext to which the ShaderState is bound to - * @param renderModes * @throws GLException if initialization failed */ - public final void init(final GL2ES2 gl, final int renderModes) throws GLException { + public final void init(final GL2ES2 gl) throws GLException { if(initialized){ return; } diff --git a/src/newt/classes/com/jogamp/newt/MonitorDevice.java b/src/newt/classes/com/jogamp/newt/MonitorDevice.java index 9ad194ce8..f7d08686e 100644 --- a/src/newt/classes/com/jogamp/newt/MonitorDevice.java +++ b/src/newt/classes/com/jogamp/newt/MonitorDevice.java @@ -230,10 +230,12 @@ public abstract class MonitorDevice { * Returns the <i>pixels per millimeter</i> value according to the <i>current</i> {@link MonitorMode mode}'s * {@link SurfaceSize#getResolution() surface resolution}. * <p> - * To convert the result to <i>dpi</i>, i.e. dots-per-inch, multiply both components with <code>25.4f</code>. + * To convert the result to <i>dpi</i>, i.e. dots-per-inch, multiply both components with <code>25.4f</code>, + * see {@link #perMMToPerInch(float[])}. * </p> * @param ppmmStore float[2] storage for the ppmm result * @return the passed storage containing the ppmm for chaining + * @see #perMMToPerInch(float[]) */ public final float[] getPixelsPerMM(final float[] ppmmStore) { return getPixelsPerMM(getCurrentMode(), ppmmStore); @@ -258,6 +260,17 @@ public abstract class MonitorDevice { } /** + * Converts [1/mm] to [1/inch] in place + * @param ppmm float[2] [1/mm] value + * @return return [1/inch] value + */ + public static float[/*2*/] perMMToPerInch(final float[/*2*/] ppmm) { + ppmm[0] *= 25.4f; + ppmm[1] *= 25.4f; + return ppmm; + } + + /** * Returns the immutable original {@link com.jogamp.newt.MonitorMode}, as used at NEWT initialization. * <p> * The returned {@link MonitorMode} is element of the lists {@link #getSupportedModes()} and {@link Screen#getMonitorModes()}. diff --git a/src/newt/classes/com/jogamp/newt/Window.java b/src/newt/classes/com/jogamp/newt/Window.java index 5134708c4..3a84bd79c 100644 --- a/src/newt/classes/com/jogamp/newt/Window.java +++ b/src/newt/classes/com/jogamp/newt/Window.java @@ -47,7 +47,6 @@ import com.jogamp.nativewindow.CapabilitiesImmutable; import com.jogamp.nativewindow.NativeWindow; import com.jogamp.nativewindow.ScalableSurface; import com.jogamp.nativewindow.WindowClosingProtocol; -import com.jogamp.nativewindow.util.Rectangle; import com.jogamp.nativewindow.util.RectangleImmutable; import com.jogamp.nativewindow.util.SurfaceSize; |