From: shadowislord Date: Wed, 6 Apr 2011 19:58:16 +0000 (+0000) Subject: * More errors sent to Application.handleError() X-Git-Tag: v0.8.0~1299 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e60e7fb30c754a7e227ca3e1f7d56134265da3e9;p=mikumikustudio%2FMikuMikuStudio.git * More errors sent to Application.handleError() * Application.handleError now stops by default to prevent process from lingering on * Made sleeps in LwjglCanvas slightly longer to prevent hogging 100% cpu * Renamed elephant skeletonxml to skeleton.xml * Compressed HoverTank textures and removed high-res versions * Compressed Tree textures git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@7203 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- diff --git a/engine/src/core/com/jme3/app/Application.java b/engine/src/core/com/jme3/app/Application.java index dcb37b6c2..da98a237d 100644 --- a/engine/src/core/com/jme3/app/Application.java +++ b/engine/src/core/com/jme3/app/Application.java @@ -405,6 +405,8 @@ public class Application implements SystemListener { public void handleError(String errMsg, Throwable t){ logger.log(Level.SEVERE, errMsg, t); + // user should add additional code to handle the error. + stop(); // stop the application } public void gainFocus(){ diff --git a/engine/src/lwjgl-oal/com/jme3/audio/lwjgl/LwjglAudioRenderer.java b/engine/src/lwjgl-oal/com/jme3/audio/lwjgl/LwjglAudioRenderer.java index b9cb26d86..6204230f5 100644 --- a/engine/src/lwjgl-oal/com/jme3/audio/lwjgl/LwjglAudioRenderer.java +++ b/engine/src/lwjgl-oal/com/jme3/audio/lwjgl/LwjglAudioRenderer.java @@ -167,6 +167,10 @@ public class LwjglAudioRenderer implements AudioRenderer, Runnable { return; } + ALCdevice device = AL.getDevice(); + String deviceName = ALC10.alcGetString(device, ALC10.ALC_DEVICE_SPECIFIER); + + logger.log(Level.FINER, "Audio Device: {0}", deviceName); logger.log(Level.FINER, "Audio Vendor: {0}", alGetString(AL_VENDOR)); logger.log(Level.FINER, "Audio Renderer: {0}", alGetString(AL_RENDERER)); logger.log(Level.FINER, "Audio Version: {0}", alGetString(AL_VERSION)); @@ -192,7 +196,6 @@ public class LwjglAudioRenderer implements AudioRenderer, Runnable { logger.log(Level.INFO, "AudioRenderer supports {0} channels", channels.length); - ALCdevice device = AL.getDevice(); supportEfx = ALC10.alcIsExtensionPresent(device, "ALC_EXT_EFX"); logger.log(Level.FINER, "Audio EFX support: {0}", supportEfx); diff --git a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java index cea518adb..dd703f117 100644 --- a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java +++ b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java @@ -221,7 +221,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex logger.log(Level.INFO, "OGL: Waiting for canvas to become displayable.."); while (!canvas.isDisplayable()){ try { - Thread.sleep(1); + Thread.sleep(10); } catch (InterruptedException ex) { logger.log(Level.SEVERE, "OGL: Interrupted! ", ex); } @@ -237,7 +237,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex logger.log(Level.INFO, "OGL: Waiting for display to become active.."); while (!Display.isCreated()){ try { - Thread.sleep(1); + Thread.sleep(10); } catch (InterruptedException ex) { logger.log(Level.SEVERE, "OGL: Interrupted! ", ex); } @@ -257,7 +257,7 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex } logger.log(Level.INFO, "OGL: Input has been reinitialized"); } catch (LWJGLException ex) { - logger.log(Level.SEVERE, "Failed to re-init input", ex); + listener.handleError("Failed to re-init input", ex); } SwingUtilities.invokeLater(new Runnable(){ diff --git a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglDisplay.java b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglDisplay.java index 2673a44cb..a46dcd7e3 100644 --- a/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglDisplay.java +++ b/engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglDisplay.java @@ -69,7 +69,7 @@ public class LwjglDisplay extends LwjglAbstractDisplay { } } } catch (LWJGLException ex) { - logger.log(Level.SEVERE, "Failed to acquire fullscreen display mode!", ex); + listener.handleError("Failed to acquire fullscreen display mode!", ex); } return null; } diff --git a/engine/src/test-data/Models/Elephant/Elephant.skeletonxml b/engine/src/test-data/Models/Elephant/Elephant.skeleton.xml similarity index 100% rename from engine/src/test-data/Models/Elephant/Elephant.skeletonxml rename to engine/src/test-data/Models/Elephant/Elephant.skeleton.xml diff --git a/engine/src/test-data/Models/HoverTank/Tank2.mesh.xml b/engine/src/test-data/Models/HoverTank/Tank2.mesh.xml index 10378f20d..514061cb9 100644 --- a/engine/src/test-data/Models/HoverTank/Tank2.mesh.xml +++ b/engine/src/test-data/Models/HoverTank/Tank2.mesh.xml @@ -1,6 +1,6 @@ - + diff --git a/engine/src/test-data/Models/HoverTank/tank_highRes.j3m b/engine/src/test-data/Models/HoverTank/tank.j3m similarity index 63% rename from engine/src/test-data/Models/HoverTank/tank_highRes.j3m rename to engine/src/test-data/Models/HoverTank/tank.j3m index baee843ad..5621dbeee 100644 --- a/engine/src/test-data/Models/HoverTank/tank_highRes.j3m +++ b/engine/src/test-data/Models/HoverTank/tank.j3m @@ -1,13 +1,13 @@ -Material My Material : Common/MatDefs/Light/Lighting.j3md { - MaterialParameters { - SpecularMap : Models/HoverTank/tank_specular.png - Shininess : 8 - NormalMap : Models/HoverTank/tank_normals.png - DiffuseMap : Models/HoverTank/tank_diffuse.png - GlowMap : Models/HoverTank/tank_glow_map_highres.png - UseMaterialColors : true - Ambient : 0.0 0.0 0.0 1.0 - Diffuse : 1.0 1.0 1.0 1.0 - Specular : 1.0 1.0 1.0 1.0 - } -} +Material My Material : Common/MatDefs/Light/Lighting.j3md { + MaterialParameters { + SpecularMap : Models/HoverTank/tank_specular.jpg + Shininess : 8 + NormalMap : Models/HoverTank/tank_normals.png + DiffuseMap : Models/HoverTank/tank_diffuse.jpg + GlowMap : Models/HoverTank/tank_glow_map.jpg + UseMaterialColors : true + Ambient : 0.0 0.0 0.0 1.0 + Diffuse : 1.0 1.0 1.0 1.0 + Specular : 1.0 1.0 1.0 1.0 + } +} diff --git a/engine/src/test-data/Models/HoverTank/tank_diffuse.jpg b/engine/src/test-data/Models/HoverTank/tank_diffuse.jpg new file mode 100644 index 000000000..0820ac593 Binary files /dev/null and b/engine/src/test-data/Models/HoverTank/tank_diffuse.jpg differ diff --git a/engine/src/test-data/Models/HoverTank/tank_diffuse.png b/engine/src/test-data/Models/HoverTank/tank_diffuse.png deleted file mode 100644 index cc19ff757..000000000 Binary files a/engine/src/test-data/Models/HoverTank/tank_diffuse.png and /dev/null differ diff --git a/engine/src/test-data/Models/HoverTank/tank_diffuse_LowRes.png b/engine/src/test-data/Models/HoverTank/tank_diffuse_LowRes.png deleted file mode 100644 index 0d5374528..000000000 Binary files a/engine/src/test-data/Models/HoverTank/tank_diffuse_LowRes.png and /dev/null differ diff --git a/engine/src/test-data/Models/HoverTank/tank_glow_map.jpg b/engine/src/test-data/Models/HoverTank/tank_glow_map.jpg new file mode 100644 index 000000000..a0d15fd0f Binary files /dev/null and b/engine/src/test-data/Models/HoverTank/tank_glow_map.jpg differ diff --git a/engine/src/test-data/Models/HoverTank/tank_glow_map.png b/engine/src/test-data/Models/HoverTank/tank_glow_map.png deleted file mode 100644 index 75124950e..000000000 Binary files a/engine/src/test-data/Models/HoverTank/tank_glow_map.png and /dev/null differ diff --git a/engine/src/test-data/Models/HoverTank/tank_glow_map_highres.png b/engine/src/test-data/Models/HoverTank/tank_glow_map_highres.png deleted file mode 100644 index 9cacf2777..000000000 Binary files a/engine/src/test-data/Models/HoverTank/tank_glow_map_highres.png and /dev/null differ diff --git a/engine/src/test-data/Models/HoverTank/tank_lowRes.j3m b/engine/src/test-data/Models/HoverTank/tank_lowRes.j3m deleted file mode 100644 index 3219159f6..000000000 --- a/engine/src/test-data/Models/HoverTank/tank_lowRes.j3m +++ /dev/null @@ -1,9 +0,0 @@ -Material My Material : Common/MatDefs/Light/Lighting.j3md { - MaterialParameters { - SpecularMap : Models/HoverTank/tank_specular_lowRes.png - Shininess : 255 - NormalMap : Models/HoverTank/tank_normals_lowRes.png - DiffuseMap : Models/HoverTank/tank_diffuse_LowRes.png - GlowMap : Models/HoverTank/tank_glow_map.png - } -} diff --git a/engine/src/test-data/Models/HoverTank/tank_normals.png b/engine/src/test-data/Models/HoverTank/tank_normals.png index 130458838..794218793 100644 Binary files a/engine/src/test-data/Models/HoverTank/tank_normals.png and b/engine/src/test-data/Models/HoverTank/tank_normals.png differ diff --git a/engine/src/test-data/Models/HoverTank/tank_normals_lowRes.png b/engine/src/test-data/Models/HoverTank/tank_normals_lowRes.png deleted file mode 100644 index 794218793..000000000 Binary files a/engine/src/test-data/Models/HoverTank/tank_normals_lowRes.png and /dev/null differ diff --git a/engine/src/test-data/Models/HoverTank/tank_specular.jpg b/engine/src/test-data/Models/HoverTank/tank_specular.jpg new file mode 100644 index 000000000..66aad2bc6 Binary files /dev/null and b/engine/src/test-data/Models/HoverTank/tank_specular.jpg differ diff --git a/engine/src/test-data/Models/HoverTank/tank_specular.png b/engine/src/test-data/Models/HoverTank/tank_specular.png deleted file mode 100644 index eb165ea09..000000000 Binary files a/engine/src/test-data/Models/HoverTank/tank_specular.png and /dev/null differ diff --git a/engine/src/test-data/Models/HoverTank/tank_specular_lowRes.png b/engine/src/test-data/Models/HoverTank/tank_specular_lowRes.png deleted file mode 100644 index c868ecac9..000000000 Binary files a/engine/src/test-data/Models/HoverTank/tank_specular_lowRes.png and /dev/null differ