cleanup_build_scripts
Kirill Vainer 9 years ago
parent ec9f8100c3
commit a8aabac1c9
  1. 22
      jme3-desktop/src/main/java/com/jme3/system/JmeDesktopSystem.java
  2. 1
      jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java
  3. 1
      jme3-jogl/src/main/java/com/jme3/system/jogl/JoglOffscreenBuffer.java
  4. 3
      jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java
  5. 11
      jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglContext.java
  6. 2
      jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java

@ -341,27 +341,13 @@ public class JmeDesktopSystem extends JmeSystemDelegate {
if (initialized) { if (initialized) {
return; return;
} }
initialized = true; initialized = true;
try { logger.log(Level.INFO, getBuildInfo());
if (!lowPermissions) { if (!lowPermissions) {
// can only modify logging settings if (NativeLibraryLoader.isUsingNativeBullet()) {
// if permissions are available NativeLibraryLoader.loadNativeLibrary("bulletjme", true);
// JmeFormatter formatter = new JmeFormatter(); }
// Handler fileHandler = new FileHandler("jme.log");
// fileHandler.setFormatter(formatter);
// Logger.getLogger("").addHandler(fileHandler);
// Handler consoleHandler = new ConsoleHandler();
// consoleHandler.setFormatter(formatter);
// Logger.getLogger("").removeHandler(Logger.getLogger("").getHandlers()[0]);
// Logger.getLogger("").addHandler(consoleHandler);
}
// } catch (IOException ex){
// logger.log(Level.SEVERE, "I/O Error while creating log file", ex);
} catch (SecurityException ex) {
logger.log(Level.SEVERE, "Security error in creating log file", ex);
} }
logger.log(Level.INFO, getBuildInfo());
} }
@Override @Override

@ -73,7 +73,6 @@ public abstract class JoglNewtAbstractDisplay extends JoglContext implements GLE
protected boolean wasAnimating = false; protected boolean wasAnimating = false;
protected void initGLCanvas() { protected void initGLCanvas() {
loadNatives();
GLCapabilities caps; GLCapabilities caps;
if (settings.getRenderer().equals(AppSettings.JOGL_OPENGL_FORWARD_COMPATIBLE)) { if (settings.getRenderer().equals(AppSettings.JOGL_OPENGL_FORWARD_COMPATIBLE)) {
caps = new GLCapabilities(GLProfile.getMaxProgrammable(true)); caps = new GLCapabilities(GLProfile.getMaxProgrammable(true));

@ -124,7 +124,6 @@ public class JoglOffscreenBuffer extends JoglContext implements Runnable {
@Override @Override
public void run() { public void run() {
loadNatives();
logger.log(Level.FINE, "Using JOGL {0}", JoglVersion.getInstance().getImplementationVersion()); logger.log(Level.FINE, "Using JOGL {0}", JoglVersion.getInstance().getImplementationVersion());
initInThread(); initInThread();
while (!needClose.get()){ while (!needClose.get()){

@ -170,9 +170,6 @@ public abstract class LwjglContext implements JmeContext {
NativeLibraryLoader.loadNativeLibrary("jinput", true); NativeLibraryLoader.loadNativeLibrary("jinput", true);
NativeLibraryLoader.loadNativeLibrary("jinput-dx8", true); NativeLibraryLoader.loadNativeLibrary("jinput-dx8", true);
} }
if (NativeLibraryLoader.isUsingNativeBullet()) {
NativeLibraryLoader.loadNativeLibrary("bulletjme", true);
}
NativeLibraryLoader.loadNativeLibrary("lwjgl", true); NativeLibraryLoader.loadNativeLibrary("lwjgl", true);
} }
protected int getNumSamplesToUse() { protected int getNumSamplesToUse() {

@ -116,17 +116,6 @@ public abstract class LwjglContext implements JmeContext {
return samples; return samples;
} }
protected void loadNatives() {
if (JmeSystem.isLowPermissions()) {
return;
}
if (NativeLibraryLoader.isUsingNativeBullet()) {
NativeLibraryLoader.loadNativeLibrary("bulletjme", true);
}
}
protected void initContextFirstTime() { protected void initContextFirstTime() {
final GLCapabilities capabilities = createCapabilities(settings.getRenderer().equals(AppSettings.LWJGL_OPENGL3)); final GLCapabilities capabilities = createCapabilities(settings.getRenderer().equals(AppSettings.LWJGL_OPENGL3));

@ -315,8 +315,6 @@ public abstract class LwjglWindow extends LwjglContext implements Runnable {
}); });
} }
loadNatives();
timer = new NanoTimer(); timer = new NanoTimer();
// For canvas, this will create a pbuffer, // For canvas, this will create a pbuffer,

Loading…
Cancel
Save