Merge pull request #47 from LabyMod/develop

Release 0.4.1

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.1

example/lwjgl3-opengl/build.gradle

@@ -1,4 +1,5 @@
 import org.apache.tools.ant.taskdefs.condition.Os
+import groovy.json.JsonOutput
 
 plugins {
     id 'application'
@@ -34,6 +35,7 @@ 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")
@@ -70,4 +72,97 @@ task copyResources(type: Copy) {
     into runDir
 }
 
+task printRunCmd {
+    doLast {
+        println tasks.run.commandLine.join(" ")
+    }
+}
+
 run.dependsOn copyResources
+
+
+def platformExtension() {
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        return ".exe"
+    } else {
+        return ""
+    }
+}
+
+def findRenderdoc() {
+    def qRenderdoc = "qrenderdoc${platformExtension()}"
+
+    for (String pathEntry : System.getenv("PATH").split(File.pathSeparator)) {
+        def qRenderdocEntryFile = file("${pathEntry}${File.separator}${qRenderdoc}")
+        if (qRenderdocEntryFile.exists()) {
+            return qRenderdocEntryFile.absolutePath
+        }
+    }
+
+    if (Os.isFamily(Os.FAMILY_UNIX)) {
+        def qRenderdocDefaultFile = file("/usr/bin/qrenderdoc")
+        if (qRenderdocDefaultFile.exists()) {
+            return qRenderdocDefaultFile.absolutePath
+        }
+    } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        def qRenderdocDefaultFile = file("C:\\Program Files\\RenderDoc\\qrenderdoc.exe")
+        if (qRenderdocDefaultFile.exists()) {
+            return qRenderdocDefaultFile.absolutePath
+        }
+    }
+
+    throw new IllegalStateException("Failed to find qrenderdoc, searched PATH and, if available, standard locations")
+}
+
+task runWithRenderdoc {
+    dependsOn build
+    doLast {
+        File.createTempFile("temp", ".cap").with { renderdocCaptureFile ->
+            renderdocCaptureFile.deleteOnExit()
+
+            def commandLine = tasks.run.getCommandLine()
+            def executable = commandLine.get(0)
+            def args = commandLine.subList(1, commandLine.size())
+
+            def environmentVars = tasks.run.getEnvironment().collect { key, value ->
+                return [
+                        separator: "Platform style",
+                        type     : "Set",
+                        value    : value,
+                        variable : key
+                ]
+            }
+
+            renderdocCaptureFile.text = JsonOutput.toJson([
+                    rdocCaptureSettings: 1,
+                    settings           : [
+                            autoStart      : true,
+                            commandLine    : "${args.join(" ")}",
+                            environment    : environmentVars,
+                            executable     : "${executable}",
+                            inject         : false,
+                            numQueuedFrames: 0,
+                            options        : [
+                                    allowFullscreen           : true,
+                                    allowVSync                : true,
+                                    apiValidation             : false,
+                                    captureAllCmdLists        : false,
+                                    captureCallstacks         : false,
+                                    captureCallstacksOnlyDraws: false,
+                                    debugOutputMute           : true,
+                                    delayForDebugger          : 0,
+                                    hookIntoChildren          : false,
+                                    refAllResources           : false,
+                                    verifyBufferAccess        : false
+                            ],
+                            queueFrameCap  : 0,
+                            workingDir     : "${tasks.run.getWorkingDir().absolutePath}"
+                    ]
+            ])
+
+            exec {
+                it.commandLine findRenderdoc(), renderdocCaptureFile.absolutePath
+            }
+        }
+    }
+}

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 final InputAdapter inputAdapter;
     private final CursorAdapter cursorManager;
     private final WebController webController;
 
@@ -68,17 +67,8 @@ public ExampleApplication() {
 
         // Set up various internal controllers
         this.cursorManager = new CursorAdapter(window);
-        this.webController = new WebController(cursorManager);
-        this.inputAdapter = webController.getInputAdapter();
+        this.webController = new WebController(cursorManager, window);
 
-        // Register all the GLFW callbacks required by this application
-        setCallback(GLFW::glfwSetWindowContentScaleCallback, inputAdapter::windowContentScaleCallback);
-        setCallback(GLFW::glfwSetKeyCallback, inputAdapter::keyCallback);
-        setCallback(GLFW::glfwSetCharCallback, inputAdapter::charCallback);
-        setCallback(GLFW::glfwSetCursorPosCallback, inputAdapter::cursorPosCallback);
-        setCallback(GLFW::glfwSetMouseButtonCallback, inputAdapter::mouseButtonCallback);
-        setCallback(GLFW::glfwSetScrollCallback, inputAdapter::scrollCallback);
-        setCallback(GLFW::glfwSetWindowFocusCallback, inputAdapter::focusCallback);
     }
 
     /**
@@ -162,11 +152,25 @@ public void stop() {
     public void run() {
         // Make the window's OpenGL context the current one
         glfwMakeContextCurrent(window);
-        glfwSwapInterval(1);
+        glfwSwapInterval(0);
 
         // Initialize OpenGL capabilities
         GL.createCapabilities();
 
+        webController.initGPUDriver();
+
+        InputAdapter inputAdapter = webController.getInputAdapter();
+
+        // Register all the GLFW callbacks required by this application
+        setCallback(GLFW::glfwSetWindowContentScaleCallback, inputAdapter::windowContentScaleCallback);
+        setCallback(GLFW::glfwSetKeyCallback, inputAdapter::keyCallback);
+        setCallback(GLFW::glfwSetCharCallback, inputAdapter::charCallback);
+        setCallback(GLFW::glfwSetCursorPosCallback, inputAdapter::cursorPosCallback);
+        setCallback(GLFW::glfwSetMouseButtonCallback, inputAdapter::mouseButtonCallback);
+        setCallback(GLFW::glfwSetScrollCallback, inputAdapter::scrollCallback);
+        setCallback(GLFW::glfwSetWindowFocusCallback, inputAdapter::focusCallback);
+
+
         // Manually update focus for the first time
         inputAdapter.focusCallback(window, glfwGetWindowAttrib(window, GLFW_FOCUSED) != 0);
 

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.

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

@@ -33,9 +33,10 @@ public class OpenGLDrawer {
     public void draw() {
         glDisable(GL_DEPTH_TEST);
         glEnable(GL_ALPHA_TEST);
-
+        glUseProgram(0);
         glPushMatrix();
-        glRotatef(rotation++, 0, 0, 1);
+        rotation += 0.01;
+        glRotatef(rotation, 0, 0, 1);
         glBegin(GL_TRIANGLES);
 
 

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

@@ -0,0 +1,26 @@
+/*
+ * 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 FBOEntry {
+    long fboId;
+    long msaaFboId;
+    boolean needsResolve;
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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;
+
+    public boolean msaaEnabled() {
+        return false;
+    }
+
+    public boolean isEnableOffscreenGl() {
+        return false;
+    }
+
+    public long getActiveWindow() {
+        return window;
+    }
+
+    public void setActiveWindow(long window){
+        this.window = window;
+    }
+}