Merge pull request #50 from LabyMod/develop

Release 0.4.3 - GPU driver and inspector fix

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.4.1</version>
+  <version>%VERSION%</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.4.1</version>
+  <version>%VERSION%</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.4.1")
+  implementation("com.labymedia", "ultralight-java-base", "%VERSION%")
 
   // // 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.4.1")
+  // implementation("com.labymedia", "ultralight-java-databind", "%VERSION%")
 }
 ```
 

VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

example/lwjgl3-opengl/build.gradle

@@ -35,7 +35,6 @@ dependencies {
 
     implementation group: 'org.lwjgl', name: 'lwjgl-glfw', version: '3.2.2'
     runtimeOnly group: 'org.lwjgl', name: 'lwjgl-glfw', version: '3.2.2', classifier: lwjglClassifier()
-
 }
 
 def runDir = file("run")

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

@@ -50,13 +50,13 @@ public ExampleApplication() {
         setCallback(GLFW::glfwSetErrorCallback, this::onGLFWError);
 
         // Prepare GLFW for use
-        if(!glfwInit()) {
+        if (!glfwInit()) {
             throw new IllegalStateException("Failed to initialize GLFW");
         }
 
         // Create a GLFW window
         window = glfwCreateWindow(640, 480, "Ultralight GLFW", MemoryUtil.NULL, MemoryUtil.NULL);
-        if(window == MemoryUtil.NULL) {
+        if (window == MemoryUtil.NULL) {
             // Window creation failed
             stop();
             throw new IllegalStateException("Failed to create a GLFW window");
@@ -65,33 +65,34 @@ public ExampleApplication() {
         // Make sure to update the framebuffer size when resizing
         setCallback(GLFW::glfwSetFramebufferSizeCallback, this::updateSize);
 
+        glfwMakeContextCurrent(this.window);
+
         // Set up various internal controllers
         this.cursorManager = new CursorAdapter(window);
         this.webController = new WebController(cursorManager, window);
-
     }
 
     /**
      * Centers the window on screen.
      */
     public void centerWindow() {
         // Create a memory stack so we don't have to worry about free's
-        try(MemoryStack stack = MemoryStack.stackPush()) {
+        try (MemoryStack stack = MemoryStack.stackPush()) {
             // Retrieve current monitor of the window
             long monitor = glfwGetWindowMonitor(window);
-            if(monitor == MemoryUtil.NULL) {
+            if (monitor == MemoryUtil.NULL) {
                 // The window is not on any monitor, get the primary one
                 monitor = glfwGetPrimaryMonitor();
             }
 
             // If there is no monitor, we can't center the window
-            if(monitor == MemoryUtil.NULL) {
+            if (monitor == MemoryUtil.NULL) {
                 return;
             }
 
             // Retrieve the video mode of the monitor
             GLFWVidMode videoMode = glfwGetVideoMode(monitor);
-            if(videoMode == null) {
+            if (videoMode == null) {
                 // The monitor has no video mode?
                 return;
             }
@@ -131,7 +132,7 @@ public void centerWindow() {
      * Stops the application and destroys allocated resources
      */
     public void stop() {
-        if(window != MemoryUtil.NULL) {
+        if (window != MemoryUtil.NULL) {
             // Delete the window if it is not null
             glfwDestroyWindow(window);
         }
@@ -174,7 +175,7 @@ public void run() {
         // Manually update focus for the first time
         inputAdapter.focusCallback(window, glfwGetWindowAttrib(window, GLFW_FOCUSED) != 0);
 
-        try(MemoryStack stack = MemoryStack.stackPush()) {
+        try (MemoryStack stack = MemoryStack.stackPush()) {
             // Update window size for the first time
             IntBuffer sizeBuffer = stack.callocInt(2);
 
@@ -202,18 +203,18 @@ public void run() {
 
             // Retrieve the size into the int buffer
             glfwGetFramebufferSize(window,
-                (IntBuffer) framebufferSizeBuffer.slice().position(0), (IntBuffer) sizeBuffer.slice().position(1));
+                    (IntBuffer) framebufferSizeBuffer.slice().position(0), (IntBuffer) sizeBuffer.slice().position(1));
 
             // Calculate scale
             float xScale = ((float) (framebufferSizeBuffer.get(0))) / ((float) (sizeBuffer.get(0)));
             float yScale = ((float) (framebufferSizeBuffer.get(1))) / ((float) (sizeBuffer.get(1)));
 
             // Fix up scale in case it gets corrupted... somehow
-            if(xScale == 0.0f) {
+            if (xScale == 0.0f) {
                 xScale = 1.0f;
             }
 
-            if(yScale == 0.0f) {
+            if (yScale == 0.0f) {
                 yScale = 1.0f;
             }
 
@@ -236,7 +237,7 @@ public void run() {
         OpenGLDrawer drawer = new OpenGLDrawer();
 
         // Keep running until a window close is requested
-        while(!glfwWindowShouldClose(window)) {
+        while (!glfwWindowShouldClose(window)) {
             // Poll events to keep the window responsive
             glfwPollEvents();
 
@@ -253,7 +254,7 @@ public void run() {
             // Super bad implementation of FPS display...
             double currentTime = glfwGetTime();
             frameCount++;
-            if(currentTime - lastTime >= 1.0) {
+            if (currentTime - lastTime >= 1.0) {
                 double msPerFrame = 1000.0 / ((double) frameCount);
                 glfwSetWindowTitle(window, "Ultralight GLFW (" + msPerFrame + " | " + frameCount + ")");
                 frameCount = 0;
@@ -301,7 +302,7 @@ private void onGLFWError(int error, long message) {
      */
     private <T, C extends Callback> void setCallback(Function<T, C> setter, T newValue) {
         C oldValue = setter.apply(newValue);
-        if(oldValue != null) {
+        if (oldValue != null) {
             oldValue.free();
         }
     }
@@ -316,7 +317,7 @@ private <T, C extends Callback> void setCallback(Function<T, C> setter, T newVal
      */
     private <T, C extends Callback> void setCallback(BiFunction<Long, T, C> setter, T newValue) {
         C oldValue = setter.apply(window, newValue);
-        if(oldValue != null) {
+        if (oldValue != null) {
             oldValue.free();
         }
     }

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

@@ -32,7 +32,9 @@
 import com.labymedia.ultralight.lwjgl3.opengl.input.InputAdapter;
 import com.labymedia.ultralight.lwjgl3.opengl.listener.ExampleLoadListener;
 import com.labymedia.ultralight.lwjgl3.opengl.listener.ExampleViewListener;
+import org.lwjgl.glfw.GLFW;
 
+import static org.lwjgl.glfw.GLFW.glfwMakeContextCurrent;
 import static org.lwjgl.opengl.GL20.*;
 
 /**
@@ -66,15 +68,14 @@ public WebController(CursorAdapter cursorManager, long window) {
 
         this.platform.setConfig(
                 new UltralightConfig()
+                        .forceRepaint(false)
                         .resourcePath("./resources/")
                         .fontHinting(FontHinting.NORMAL)
         );
         this.platform.usePlatformFontLoader();
         this.platform.setFileSystem(new ExampleFileSystem());
         this.platform.setLogger(new ExampleLogger());
         this.platform.setClipboard(new ClipboardAdapter());
-
-
     }
 
     public void initGPUDriver() {
@@ -161,11 +162,18 @@ public void render() {
         }
 
         glPopAttrib();
+       this.renderHtmlTexture(this.view, this.window);
+        glfwMakeContextCurrent(window);
 
-        long text = this.view.renderTarget().getTextureId();
+    }
+
+    private void renderHtmlTexture(UltralightView view, long window) {
+        driver.getContext().setActiveWindow(window);
+        glfwMakeContextCurrent(window);
+        long text = view.renderTarget().getTextureId();
         int width = (int) view.width();
         int height = (int) view.height();
-        glClearColor(0,0,0,1);
+        glClearColor(0, 0, 0, 1);
         glEnable(GL_TEXTURE_2D);
         // Set up the OpenGL state for rendering of a fullscreen quad
         glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TRANSFORM_BIT);
@@ -176,10 +184,9 @@ public void render() {
         glMatrixMode(GL_PROJECTION);
         glPushMatrix();
         glLoadIdentity();
-        glOrtho(0, this.view.width(), this.view.height(), 0, -1, 1);
+        glOrtho(0, view.width(), view.height(), 0, -1, 1);
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
-
         // Disable lighting and scissoring, they could mess up th renderer
         glLoadIdentity();
         glDisable(GL_LIGHTING);

example/lwjgl3-opengl/src/main/resources/shader_v2f_c4f_t2f.vs

@@ -12,7 +12,10 @@ float ScreenWidth() { return State[1]; }
 float ScreenHeight() { return State[2]; }
 float ScreenScale() { return State[3]; }
 float Scalar(uint i) { if (i < 4u) return Scalar4[0][i]; else return Scalar4[1][i - 4u]; }
-vec4 sRGBToLinear(vec4 val) { return vec4(val.xyz * (val.xyz * (val.xyz * 0.305306011 + 0.682171111) + 0.012522878), val.w); }
+vec4 sRGBToLinear(vec4 val) {
+    return val;
+    // return vec4(val.xyz * (val.xyz * (val.xyz * 0.305306011 + 0.682171111) + 0.012522878), val.w);
+}
 // Vertex Attributes
 in vec2 in_Position;
 in vec4 in_Color;

example/lwjgl3-opengl/src/main/resources/shader_v2f_c4f_t2f_t2f_d28f.vs

@@ -12,7 +12,10 @@ float ScreenWidth() { return State[1]; }
 float ScreenHeight() { return State[2]; }
 float ScreenScale() { return State[3]; }
 float Scalar(uint i) { if (i < 4u) return Scalar4[0][i]; else return Scalar4[1][i - 4u]; }
-vec4 sRGBToLinear(vec4 val) { return vec4(val.xyz * (val.xyz * (val.xyz * 0.305306011 + 0.682171111) + 0.012522878), val.w); }
+vec4 sRGBToLinear(vec4 val) {
+    return val;
+    // return vec4(val.xyz * (val.xyz * (val.xyz * 0.305306011 + 0.682171111) + 0.012522878), val.w);
+}
 // Vertex Attributes
 in vec2 in_Position;
 in vec4 in_Color;

ultralight-java-native/src/main/c/src/java_bridges/ultralight_view_jni.cpp

@@ -387,7 +387,8 @@ namespace ultralight_java {
         }
 
         auto inspector = view->inspector();
-        return UltralightRefPtrJNI::create(env, std::move(ultralight::RefPtr<ultralight::View>(std::move(inspector))));
+        auto pointer = UltralightRefPtrJNI::create(env, std::move(ultralight::RefPtr<ultralight::View>(std::move(inspector))));
+        return env->NewObject(runtime.ultralight_view.clazz, runtime.ultralight_view.constructor, pointer);
     }
 
     jobject UltralightViewJNI::render_target(JNIEnv *env, jobject instance) {