Merge pull request #45 from LabyMod/develop

Release 1.3 support, version 0.4.0

Author: jan-br

VERSION

@@ -1 +1 @@
-0.3.6
+0.4.0

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

@@ -26,10 +26,11 @@
 import com.labymedia.ultralight.bitmap.UltralightBitmapSurface;
 import com.labymedia.ultralight.config.FontHinting;
 import com.labymedia.ultralight.config.UltralightConfig;
+import com.labymedia.ultralight.config.UltralightViewConfig;
 import com.labymedia.ultralight.javascript.JavascriptContextLock;
+import com.labymedia.ultralight.lwjgl3.opengl.input.ClipboardAdapter;
 import com.labymedia.ultralight.lwjgl3.opengl.input.CursorAdapter;
 import com.labymedia.ultralight.lwjgl3.opengl.input.InputAdapter;
-import com.labymedia.ultralight.lwjgl3.opengl.input.ClipboardAdapter;
 import com.labymedia.ultralight.lwjgl3.opengl.listener.ExampleLoadListener;
 import com.labymedia.ultralight.lwjgl3.opengl.listener.ExampleViewListener;
 import com.labymedia.ultralight.math.IntRect;
@@ -64,7 +65,6 @@ public WebController(CursorAdapter cursorManager) {
                 new UltralightConfig()
                         .resourcePath("./resources/")
                         .fontHinting(FontHinting.NORMAL)
-                        .deviceScale(1.0)
         );
         this.platform.usePlatformFontLoader();
         this.platform.setFileSystem(new ExampleFileSystem());
@@ -74,7 +74,10 @@ public WebController(CursorAdapter cursorManager) {
         this.renderer = UltralightRenderer.create();
         this.renderer.logMemoryUsage();
 
-        this.view = renderer.createView(300, 300, true);
+        this.view = renderer.createView(300, 300,
+                new UltralightViewConfig()
+                        .initialDeviceScale(1.0)
+                        .isTransparent(true));
         this.viewListener = new ExampleViewListener(cursorManager);
         this.view.setViewListener(viewListener);
         this.loadListener = new ExampleLoadListener(view);
@@ -111,11 +114,11 @@ public void update() {
         this.renderer.update();
         this.renderer.render();
 
-        if(lastJavascriptGarbageCollections == 0) {
+        if (lastJavascriptGarbageCollections == 0) {
             lastJavascriptGarbageCollections = System.currentTimeMillis();
-        } else if(System.currentTimeMillis() - lastJavascriptGarbageCollections > 1000) {
+        } else if (System.currentTimeMillis() - lastJavascriptGarbageCollections > 1000) {
             System.out.println("Garbage collecting Javascript...");
-            try(JavascriptContextLock lock = this.view.lockJavascriptContext()) {
+            try (JavascriptContextLock lock = this.view.lockJavascriptContext()) {
                 lock.getContext().garbageCollect();
             }
             lastJavascriptGarbageCollections = System.currentTimeMillis();
@@ -136,7 +139,7 @@ public void resize(int width, int height) {
      * Render the current image using OpenGL
      */
     public void render() {
-        if(glTexture == -1) {
+        if (glTexture == -1) {
             createGLTexture();
         }
 
@@ -153,11 +156,11 @@ public void render() {
 
         IntRect dirtyBounds = surface.dirtyBounds();
 
-        if(dirtyBounds.isValid()) {
+        if (dirtyBounds.isValid()) {
             ByteBuffer imageData = bitmap.lockPixels();
 
             glPixelStorei(GL_UNPACK_ROW_LENGTH, (int) bitmap.rowBytes() / 4);
-            if(dirtyBounds.width() == width && dirtyBounds.height() == height) {
+            if (dirtyBounds.width() == width && dirtyBounds.height() == height) {
                 // Update full image
                 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, imageData);
                 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);

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

@@ -22,6 +22,7 @@
 import com.labymedia.ultralight.annotation.NativeCall;
 import com.labymedia.ultralight.annotation.NativeType;
 import com.labymedia.ultralight.annotation.Unsigned;
+import com.labymedia.ultralight.config.UltralightViewConfig;
 import com.labymedia.ultralight.ffi.ObjectWithHandle;
 import com.labymedia.ultralight.ffi.RefPtr;
 
@@ -71,34 +72,16 @@ private UltralightRenderer(RefPtr<UltralightRenderer> ptr) {
     /**
      * Create a new View.
      *
-     * @param width       The initial width, in pixels.
-     * @param height      The initial height, in pixels.
-     * @param transparent Whether or not the view background is transparent.
-     * @return The created view
-     */
-    public UltralightView createView(
-            @NativeType("uint32_t") @Unsigned long width,
-            @NativeType("uint32_t") @Unsigned long height,
-            boolean transparent
-    ) {
-        return createView(width, height, transparent, false);
-    }
-
-    /**
-     * Create a new View.
-     *
-     * @param width            The initial width, in pixels.
-     * @param height           The initial height, in pixels.
-     * @param transparent      Whether or not the view background is transparent.
-     * @param forceCpuRenderer Whether or not the view should always use the CPU renderer.
+     * @param width   The initial width, in pixels.
+     * @param height  The initial height, in pixels.
+     * @param config  Configuration details for the View.
      *
      * @return The created view
      */
     public native UltralightView createView(
             @NativeType("uint32_t") @Unsigned long width,
             @NativeType("uint32_t") @Unsigned long height,
-            boolean transparent,
-            boolean forceCpuRenderer
+            UltralightViewConfig config
     );
 
     /**

ultralight-java-base/src/main/java/com/labymedia/ultralight/config/UltralightConfig.java

@@ -50,27 +50,6 @@ public class UltralightConfig {
     @Native
     private String cachePath;
 
-    /**
-     * When enabled, each View will be rendered to an offscreen GPU texture
-     * using the GPU driver set in Platform::set_gpu_driver. You can fetch
-     * details for the texture via View::render_target.
-     * <p>
-     * When disabled (the default), each View will be rendered to an offscreen
-     * pixel buffer. This pixel buffer can optionally be provided by the user--
-     * for more info see <Ultralight/platform/Surface.h> and View::surface.
-     */
-    @Native
-    private boolean useGpuRenderer = false;
-
-    /**
-     * The amount that the application DPI has been scaled (200% = 2.0).
-     * This should match the device scale set for the current monitor.
-     * <p>
-     * Note: Device scales are rounded to nearest 1/8th (eg, 0.125).
-     */
-    @Native
-    private double deviceScale = 1.0;
-
     /**
      * The winding order for front-facing triangles. @see FaceWinding
      * <p>
@@ -79,18 +58,6 @@ public class UltralightConfig {
     @Native
     private FaceWinding faceWinding = FaceWinding.COUNTER_CLOCKWISE;
 
-    /**
-     * Whether or not images should be enabled.
-     */
-    @Native
-    private boolean enableImages = true;
-
-    /**
-     * Whether or not JavaScript should be enabled.
-     */
-    @Native
-    private boolean enableJavascript = true;
-
     /**
      * The hinting algorithm to use when rendering fonts.
      *
@@ -106,43 +73,6 @@ public class UltralightConfig {
     @Native
     private double fontGamma = 1.8;
 
-    /**
-     * Default font-family to use.
-     */
-    @NativeType("ultralight::String16")
-    @Native
-    private String fontFamilyStandard = "Times New Roman";
-
-    /**
-     * Default font-family to use for fixed fonts. (pre/code)
-     */
-    @NativeType("ultralight::String16")
-    @Native
-    private String fontFamilyFixed = "Courier New";
-
-    /**
-     * Default font-family to use for serif fonts.
-     */
-    @NativeType("ultralight::String16")
-    @Native
-    private String fontFamilySerif = "Times New Roman";
-
-    /**
-     * Default font-family to use for sans-serif fonts.
-     */
-    @NativeType("ultralight::String16")
-    @Native
-    private String fontFamilySansSerif = "Arial";
-
-    /**
-     * Default user-agent string.
-     */
-    @NativeType("ultralight::String16")
-    @Native
-    private String userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
-            "AppleWebKit/608.3.10 (KHTML, like Gecko) " +
-            "Ultralight/1.2.0 Safari/608.3.10";
-
     /**
      * Default user stylesheet. You should set this to your own custom CSS
      * string to define default styles for various DOM elements, scrollbars,
@@ -259,30 +189,6 @@ public UltralightConfig cachePath(String cachePath) {
         return this;
     }
 
-    /**
-     * Sets the useGpuRenderer field of this instance.
-     *
-     * @param useGpuRenderer The new value of the field
-     * @return this
-     * @see #useGpuRenderer
-     */
-    public UltralightConfig useGpuRenderer(boolean useGpuRenderer) {
-        this.useGpuRenderer = useGpuRenderer;
-        return this;
-    }
-
-    /**
-     * Sets the deviceScale field of this instance.
-     *
-     * @param deviceScale The new value of the field
-     * @return this
-     * @see #deviceScale
-     */
-    public UltralightConfig deviceScale(double deviceScale) {
-        this.deviceScale = deviceScale;
-        return this;
-    }
-
     /**
      * Sets the faceWinding field of this instance.
      *
@@ -295,30 +201,6 @@ public UltralightConfig faceWinding(FaceWinding faceWinding) {
         return this;
     }
 
-    /**
-     * Sets the enableImages field of this instance.
-     *
-     * @param enableImages The new value of the field
-     * @return this
-     * @see #enableImages
-     */
-    public UltralightConfig enableImages(boolean enableImages) {
-        this.enableImages = enableImages;
-        return this;
-    }
-
-    /**
-     * Sets the enableJavascript field of this instance.
-     *
-     * @param enableJavascript The new value of the field
-     * @return this
-     * @see #enableJavascript
-     */
-    public UltralightConfig enableJavascript(boolean enableJavascript) {
-        this.enableJavascript = enableJavascript;
-        return this;
-    }
-
     /**
      * Sets the fontHinting field of this instance.
      *
@@ -343,66 +225,6 @@ public UltralightConfig fontGamma(double fontGamma) {
         return this;
     }
 
-    /**
-     * Sets the fontFamilyStandard field of this instance.
-     *
-     * @param fontFamilyStandard The new value of the field
-     * @return this
-     * @see #fontFamilyStandard
-     */
-    public UltralightConfig fontFamilyStandard(String fontFamilyStandard) {
-        this.fontFamilyStandard = fontFamilyStandard;
-        return this;
-    }
-
-    /**
-     * Sets the fontFamilyFixed field of this instance.
-     *
-     * @param fontFamilyFixed The new value of the field
-     * @return this
-     * @see #fontFamilyFixed
-     */
-    public UltralightConfig fontFamilyFixed(String fontFamilyFixed) {
-        this.fontFamilyFixed = fontFamilyFixed;
-        return this;
-    }
-
-    /**
-     * Sets the fontFamilySerif field of this instance.
-     *
-     * @param fontFamilySerif The new value of the field
-     * @return this
-     * @see #fontFamilySerif
-     */
-    public UltralightConfig fontFamilySerif(String fontFamilySerif) {
-        this.fontFamilySerif = fontFamilySerif;
-        return this;
-    }
-
-    /**
-     * Sets the fontFamilySansSerif field of this instance.
-     *
-     * @param fontFamilySansSerif The new value of the field
-     * @return this
-     * @see #fontFamilySansSerif
-     */
-    public UltralightConfig fontFamilySansSerif(String fontFamilySansSerif) {
-        this.fontFamilySansSerif = fontFamilySansSerif;
-        return this;
-    }
-
-    /**
-     * Sets the userAgent field of this instance.
-     *
-     * @param userAgent The new value of the field
-     * @return this
-     * @see #userAgent
-     */
-    public UltralightConfig userAgent(String userAgent) {
-        this.userAgent = userAgent;
-        return this;
-    }
-
     /**
      * Sets the userStylesheet field of this instance.
      *