Merge branch 'master' of github.com:LabyMod/ultralight-java into fix-gpu-driver

Author: jan-br

README.md

@@ -38,7 +38,7 @@ Using the library with maven:
   <groupId>com.labymedia</groupId>
   <artifactId>ultralight-java-base</artifactId>
   <!-- Replace with latest version from https://search.maven.org/artifact/com.labymedia/ultralight-java-base !-->
-  <version>0.3.4</version>
+  <version>0.4.1</version>
 </dependency>
 ```
 
@@ -48,19 +48,19 @@ If you need Javascript interop:
   <groupId>com.labymedia</groupId>
   <artifactId>ultralight-java-databind</artifactId>
   <!-- Replace with latest version from https://search.maven.org/artifact/com.labymedia/ultralight-java-databind !-->
-  <version>0.3.4</version>
+  <version>0.4.1</version>
 </dependency>
 ```
 
 ### Gradle
 ```kotlin
 dependencies {
   // Replace with latest version from https://search.maven.org/artifact/com.labymedia/ultralight-java-base
-  implementation("com.labymedia", "ultralight-java-base", "0.3.4")
+  implementation("com.labymedia", "ultralight-java-base", "0.4.1")
 
   // // Replace with latest version from https://search.maven.org/artifact/com.labymedia/ultralight-java-databind
   // Remove the comments if you need Javascript interop
-  // implementation("com.labymedia", "ultralight-java-databind", "0.3.4")
+  // implementation("com.labymedia", "ultralight-java-databind", "0.4.1")
 }
 ```
 

VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

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);

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

@@ -28,7 +28,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.util.concurrent.CountDownLatch;
 
 /**
  * Entry pointer for the example application.
@@ -59,11 +58,6 @@ public static void main(String[] args) throws UltralightLoadException {
         // This only extracts the native library for ultralight-java-base, but not the other Ultralight libraries.
         // It is your task to get them into the run directory, possibly by extracting them on your own.
         UltralightJava.extractNativeLibrary(nativesDir);
-        /*try {
-            GPUDriverUtil.extractNativeLibrary(nativesDir);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }*/
 
         // Load the native libraries from the given directory. This method makes sure everything is loaded in the
         // correct order. If you want to manually load all natives, either don't use this function or pass 'false' as

…a/ultralight/lwjgl3/opengl/FBOEntry.java …tralight/lwjgl3/opengl/gpu/FBOEntry.javaexample/lwjgl3-opengl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/FBOEntry.java renamed to example/lwjgl3-opengl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/gpu/FBOEntry.java example/lwjgl3-opengl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/FBOEntry.java renamed to example/lwjgl3-opengl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/gpu/FBOEntry.java

@@ -17,7 +17,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.labymedia.ultralight.lwjgl3.opengl;
+package com.labymedia.ultralight.lwjgl3.opengl.gpu;
 
 public class FBOEntry {
     long fboId;

…tralight/lwjgl3/opengl/GPUContextGL.java …ight/lwjgl3/opengl/gpu/GPUContextGL.javaexample/lwjgl3-opengl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/GPUContextGL.java renamed to example/lwjgl3-opengl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/gpu/GPUContextGL.java example/lwjgl3-opengl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/GPUContextGL.java renamed to example/lwjgl3-opengl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/gpu/GPUContextGL.java

@@ -17,24 +17,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.labymedia.ultralight.lwjgl3.opengl;/*
- * Ultralight Java - Java wrapper for the Ultralight web engine
- * Copyright (C) 2020 - 2021 LabyMedia and contributors
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+package com.labymedia.ultralight.lwjgl3.opengl.gpu;
 
 public class GPUContextGL {
     private long window;