Merge remote-tracking branch 'origin/master'

husker-dev · Dec 4, 2023 · 6239005 · 6239005
2 parents 73f01a8 + 3f0b327
commit 6239005
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/modules/core/src/main/kotlin/com/huskerdev/openglfx/internal/GLFXUtils.kt b/modules/core/src/main/kotlin/com/huskerdev/openglfx/internal/GLFXUtils.kt
@@ -38,11 +38,13 @@ internal class GLFXUtils {
         }
 
         fun getDPI(node: Node) =
-            if(PlatformUtils.os == OS.MacOS) {
+            if(node.scene == null || node.scene.window == null)
+                1.0
+            else if(PlatformUtils.os == OS.MacOS) {
                 val window = node.scene.window
                 IOSurface.nGetDisplayDPI(window.x + window.width / 2, window.y + window.height / 2)
             } else
-                node.scene?.window?.outputScaleY ?: 1.0
+                node.scene.window.outputScaleY
 
         val Texture.D3DTextureResource: Long
             get() = Class.forName("com.sun.prism.d3d.D3DTexture")

diff --git a/modules/core/src/main/resources/com/huskerdev/openglfx/natives/openglfx.dylib b/modules/core/src/main/resources/com/huskerdev/openglfx/natives/openglfx.dylib
diff --git a/modules/lwjgl/src/examples/kotlin/LWJGL.kt b/modules/lwjgl/src/examples/kotlin/LWJGL.kt
@@ -79,7 +79,7 @@ class ExampleApp: Application(){
     }
 
     private fun createGLCanvasInstance(): GLCanvas {
-        val canvas = GLCanvas(LWJGL_MODULE, msaa = 0, fxaa = true, profile = GLProfile.Core, async = true, interopType = GLInteropType.NVDXInterop)
+        val canvas = GLCanvas(LWJGL_MODULE, msaa = 0, fxaa = true, profile = GLProfile.Core, async = true)
         canvas.animator = GLCanvasAnimator(60.0)
 
         val renderExample = ExampleScene()