Ready for release

Author: Janrupf

example/lwjgl3-opengl/build.gradle

@@ -1,7 +1,6 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 import groovy.json.JsonOutput
 
-
 plugins {
     id 'application'
 }
@@ -22,7 +21,6 @@ def lwjglClassifier = {
 
 repositories {
     mavenCentral()
-    mavenLocal()
 }
 
 dependencies {

example/lwjgl3-opengl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/ExampleApplication.java

@@ -42,7 +42,6 @@
  */
 public class ExampleApplication {
     private final long window;
-    private InputAdapter inputAdapter;
     private final CursorAdapter cursorManager;
     private final WebController webController;
 
@@ -160,7 +159,7 @@ public void run() {
 
         webController.initGPUDriver();
 
-        this.inputAdapter = webController.getInputAdapter();
+        InputAdapter inputAdapter = webController.getInputAdapter();
 
         // Register all the GLFW callbacks required by this application
         setCallback(GLFW::glfwSetWindowContentScaleCallback, inputAdapter::windowContentScaleCallback);

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ultralight-java-base/src/main/java/com/labymedia/ultralight/UltralightPlatform.java

@@ -82,14 +82,14 @@ private UltralightPlatform(long handle) {
     public native void setFileSystem(UltralightFileSystem fileSystem);
 
     /**
-     * Set the GPU driver implementation
+     * Set the GPU driver implementation.
      *
      * @param gpuDriver The GPU driver implementation to use
      */
     public native void setGPUDriver(UltralightGPUDriver gpuDriver);
 
     /**
-     * Set the GPU driver implementation
+     * Set the GPU driver implementation.
      *
      * @param handle The pointer to the GPU driver
      */

ultralight-java-base/src/main/java/com/labymedia/ultralight/UltralightView.java

@@ -37,8 +37,8 @@
 import java.util.Objects;
 
 /**
- * A View is similar to a tab in a browser-- you load web content into
- * it and display it however you want. @see Renderer::CreateView
+ * A View is similar to a tab in a browser-- you load web content into it and display it however you want. @see
+ * Renderer::CreateView
  * <p>
  * <b>The API is currently not thread-safe, all calls must be made on the
  * main thread.</b>
@@ -49,8 +49,7 @@ public class UltralightView implements ObjectWithHandle {
     private final RefPtr<UltralightView> ptr;
 
     /**
-     * Constructs a new {@link UltralightView} from the given native
-     * {@link RefPtr}.
+     * Constructs a new {@link UltralightView} from the given native {@link RefPtr}.
      *
      * @param ptr The pointer managing the view instance
      */
@@ -98,7 +97,18 @@ private UltralightView(RefPtr<UltralightView> ptr) {
      */
     public native boolean isLoading();
 
-    // TODO: render_target()
+    /**
+     * Get the offscreen {@link UltralightRenderTarget} for the View.
+     * <p>
+     * Only valid when the {@link com.labymedia.ultralight.config.UltralightViewConfig#isAccelerated(boolean)} is {@code
+     * true}.
+     * <p>
+     * You can use this with your GPUDriver implementation to bind and display the corresponding texture in your
+     * application.
+     *
+     * @return The offscreen render target
+     */
+    public native UltralightRenderTarget renderTarget();
 
     /**
      * Get the Surface for the View (native pixel buffer container).
@@ -124,9 +134,8 @@ public void loadHTML(String html) {
 
     /**
      * @param html The raw HTML string to load.
-     * @param url  An optional URL for this load (to make it appear as if we
-     *             we loaded this HTML from a certain URL). Can be used for
-     *             resolving relative URLs and cross-origin rules.
+     * @param url  An optional URL for this load (to make it appear as if we we loaded this HTML from a certain URL).
+     *             Can be used for resolving relative URLs and cross-origin rules.
      */
     public void loadHTML(String html, String url) {
         loadHTML(html, url, false);
@@ -136,19 +145,17 @@ public void loadHTML(String html, String url) {
      * Load a raw string of HTML, the View will navigate to it as a new page.
      *
      * @param html         The raw HTML string to load.
-     * @param url          An optional URL for this load (to make it appear as if we
-     *                     we loaded this HTML from a certain URL). Can be used for
-     *                     resolving relative URLs and cross-origin rules.
-     * @param addToHistory Whether or not this load should be added to the
-     *                     session's history (back/forward list).
+     * @param url          An optional URL for this load (to make it appear as if we we loaded this HTML from a certain
+     *                     URL). Can be used for resolving relative URLs and cross-origin rules.
+     * @param addToHistory Whether or not this load should be added to the session's history (back/forward list).
      */
     public native void loadHTML(String html, String url, boolean addToHistory);
 
     /**
      * Load a URL, the View will navigate to it as a new page.
      * <p>
-     * you can use File URLs (eg, file:///page.html) but you must define
-     * your own FileSystem implementation if you are not using AppCore.
+     * you can use File URLs (eg, file:///page.html) but you must define your own FileSystem implementation if you are
+     * not using AppCore.
      *
      * @param url The url to load
      * @see UltralightPlatform#usePlatformFileSystem(String)
@@ -161,24 +168,24 @@ public void loadHTML(String html, String url) {
      * @param width  The initial width, in pixels.
      * @param height The initial height, in pixels.
      */
-    public native void resize(@NativeType("uint32_t") @Unsigned long width, @NativeType("uint32_t") @Unsigned long height);
+    public native void resize(@NativeType("uint32_t") @Unsigned long width, @NativeType(
+            "uint32_t") @Unsigned long height);
 
     /**
      * Acquire the page's JSContext for use with the JavaScriptCore API.
      * <p>
      * While the lock is being hold no script will be executed by the web engine.
      * <p>
-     * The context gets reset every time the view navigates, to populate it with
-     * custom values the {@link UltralightLoadListener#onWindowObjectReady(long, boolean, String)}
-     * and {@link UltralightLoadListener#onDOMReady(long, boolean, String)} methods are recommended.
+     * The context gets reset every time the view navigates, to populate it with custom values the {@link
+     * UltralightLoadListener#onWindowObjectReady(long, boolean, String)} and {@link
+     * UltralightLoadListener#onDOMReady(long, boolean, String)} methods are recommended.
      *
      * @return The script context of the view
      */
     public native JavascriptContextLock lockJavascriptContext();
 
     /**
-     * Helper function to evaluate a raw string of JavaScript and return the
-     * result as a String.
+     * Helper function to evaluate a raw string of JavaScript and return the result as a String.
      * <p>
      * You do not need to lock the JS context, it is done automatically.
      *
@@ -232,16 +239,15 @@ public void loadHTML(String html, String url) {
     /**
      * Give focus to the View.
      * <p>
-     * You should call this to give visual indication that the View has input
-     * focus (changes active text selection colors, for example).
+     * You should call this to give visual indication that the View has input focus (changes active text selection
+     * colors, for example).
      */
     public native void focus();
 
     /**
      * Remove focus from the View and unfocus any focused input elements.
      * <p>
-     * You should call this to give visual indication that the View has lost
-     * input focus.
+     * You should call this to give visual indication that the View has lost input focus.
      */
     public native void unfocus();
 
@@ -253,20 +259,18 @@ public void loadHTML(String html, String url) {
     public native boolean hasFocus();
 
     /**
-     * Whether or not the View has an input element with visible keyboard focus
-     * (indicated by a blinking caret).
+     * Whether or not the View has an input element with visible keyboard focus (indicated by a blinking caret).
      * <p>
-     * You can use this to decide whether or not the View should consume
-     * keyboard input events (useful in games with mixed UI and key handling).
+     * You can use this to decide whether or not the View should consume keyboard input events (useful in games with
+     * mixed UI and key handling).
      *
      * @return Whether the view has input focus
      */
     public native boolean hasInputFocus();
 
     /**
-     * Fire a keyboard event.
-     * Only {@link UltralightKeyEventType#CHAR CHAR}
-     * events actually generate text in input fields.
+     * Fire a keyboard event. Only {@link UltralightKeyEventType#CHAR CHAR} events actually generate text in input
+     * fields.
      *
      * @param event The event to fire
      */
@@ -301,50 +305,47 @@ public void loadHTML(String html, String url) {
     public native void setLoadListener(UltralightLoadListener listener);
 
     /**
-     * Set whether or not this View should be repainted during the next
-     * call to {@link UltralightRenderer#render()}.
+     * Set whether or not this View should be repainted during the next call to {@link UltralightRenderer#render()}.
      * <p>
-     * This flag is automatically set whenever the page content changes
-     * but you can set it directly in case you need to force a repaint.
+     * This flag is automatically set whenever the page content changes but you can set it directly in case you need to
+     * force a repaint.
      *
      * @param needsPaint Whether the needs a re paint
      */
     public native void setNeedsPaint(boolean needsPaint);
 
     /**
-     * Whether or not this View should be repainted during the next call to
-     * {@link UltralightRenderer#render()}.
+     * Whether or not this View should be repainted during the next call to {@link UltralightRenderer#render()}.
      *
      * @return Whether the view needs a re paint during the next render
      */
     public native boolean needsPaint();
 
     /**
-     * Get the inspector for this View, this is useful for debugging and
-     * inspecting pages locally. This will only succeed if you have the
-     * inspector assets in your filesystem-- the inspector will look for
+     * Get the inspector for this View, this is useful for debugging and inspecting pages locally. This will only
+     * succeed if you have the inspector assets in your filesystem-- the inspector will look for
      * file:///inspector/Main.html when it first loads.
      * <p>
-     * The inspector View is owned by the View and lazily-created on
-     * first call. The initial dimensions are 10x10, you should call
-     * {@link #resize(long, long)} on the returned View to resize it to your desired
-     * dimensions.
+     * The inspector View is owned by the View and lazily-created on first call. The initial dimensions are 10x10, you
+     * should call {@link #resize(long, long)} on the returned View to resize it to your desired dimensions.
      *
      * @return An inspector view for the current view
      */
     public native UltralightView inspector();
 
-    public native UltralightRenderTarget renderTarget();
-
     @Override
     public long getHandle() {
         return ptr.getHandle();
     }
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof UltralightView)) return false;
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof UltralightView)) {
+            return false;
+        }
         UltralightView that = (UltralightView) o;
         return ptr.getHandle() == that.ptr.getHandle();
     }

ultralight-java-base/src/main/java/com/labymedia/ultralight/math/IntRect.java

@@ -245,35 +245,55 @@ public IntRect intersect(IntRect other) {
         );
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof IntRect)) return false;
-        IntRect intRect = (IntRect) o;
-        return left == intRect.left &&
-                top == intRect.top &&
-                right == intRect.right &&
-                bottom == intRect.bottom;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(left, top, right, bottom);
-    }
-
+    /**
+     * Retrieves the left position of this rect.
+     *
+     * @return The left position
+     */
     public int getLeft() {
         return left;
     }
 
+    /**
+     * Retrieves the top position of this rect.
+     *
+     * @return The top position
+     */
     public int getTop() {
         return top;
     }
 
+    /**
+     * Retrieves the right position of this rect.
+     *
+     * @return The right position
+     */
     public int getRight() {
         return right;
     }
 
+    /**
+     * Retrieves the bottom position of this rect.
+     *
+     * @return The bottom position
+     */
     public int getBottom() {
         return bottom;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof IntRect)) return false;
+        IntRect intRect = (IntRect) o;
+        return left == intRect.left &&
+                top == intRect.top &&
+                right == intRect.right &&
+                bottom == intRect.bottom;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(left, top, right, bottom);
+    }
 }

ultralight-java-native/build.gradle

@@ -61,7 +61,6 @@ task build(type: CMakeBuildTask) {
             println "Building using JDK at ${javaHome.absolutePath}"
             variable "JAVA_HOME", javaHome.absolutePath.replace('\\', '/')
         }
-
     }
 }