From eada244b343bea8d4a79d49c7892ca0adeb9f54c Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Wed, 2 Mar 2016 16:36:12 -0500 Subject: [PATCH] lwjgl3: re-enable native loading for native bullet --- .../main/java/com/jme3/system/lwjgl/LwjglContext.java | 11 +++++++++++ .../main/java/com/jme3/system/lwjgl/LwjglWindow.java | 2 ++ 2 files changed, 13 insertions(+) diff --git a/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglContext.java b/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglContext.java index 20532df36..0fe8a7b23 100644 --- a/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglContext.java +++ b/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglContext.java @@ -116,6 +116,17 @@ public abstract class LwjglContext implements JmeContext { return samples; } + protected void loadNatives() { + if (JmeSystem.isLowPermissions()) { + return; + } + + if (NativeLibraryLoader.isUsingNativeBullet()) { + NativeLibraryLoader.loadNativeLibrary("bulletjme", true); + } + } + + protected void initContextFirstTime() { final GLCapabilities capabilities = createCapabilities(settings.getRenderer().equals(AppSettings.LWJGL_OPENGL3)); diff --git a/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java b/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java index cac8ecdd1..aaa24ce42 100644 --- a/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java +++ b/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java @@ -315,6 +315,8 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable { }); } + loadNatives(); + timer = new NanoTimer(); // For canvas, this will create a pbuffer,