* 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 dcb37b6..da98a23 100644 (file)
--- 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 {
 \r
     public void handleError(String errMsg, Throwable t){\r
         logger.log(Level.SEVERE, errMsg, t);\r
+        // user should add additional code to handle the error.\r
+        stop(); // stop the application\r
     }\r
 \r
     public void gainFocus(){\r

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 b9cb26d..6204230 100644 (file)
--- 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;\r
         }\r
 \r
+        ALCdevice device = AL.getDevice();\r
+        String deviceName = ALC10.alcGetString(device, ALC10.ALC_DEVICE_SPECIFIER);\r
+\r
+        logger.log(Level.FINER, "Audio Device: {0}", deviceName);\r
         logger.log(Level.FINER, "Audio Vendor: {0}", alGetString(AL_VENDOR));\r
         logger.log(Level.FINER, "Audio Renderer: {0}", alGetString(AL_RENDERER));\r
         logger.log(Level.FINER, "Audio Version: {0}", alGetString(AL_VERSION));\r
@@ -192,7 +196,6 @@ public class LwjglAudioRenderer implements AudioRenderer, Runnable {
 \r
         logger.log(Level.INFO, "AudioRenderer supports {0} channels", channels.length);\r
 \r
-        ALCdevice device = AL.getDevice();\r
         supportEfx = ALC10.alcIsExtensionPresent(device, "ALC_EXT_EFX");\r
         logger.log(Level.FINER, "Audio EFX support: {0}", supportEfx);\r
 \r

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 cea518a..dd703f1 100644 (file)
--- 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 2673a44..a46dcd7 100644 (file)
--- 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 {
                 }\r
             }\r
         } catch (LWJGLException ex) {\r
-            logger.log(Level.SEVERE, "Failed to acquire fullscreen display mode!", ex);\r
+            listener.handleError("Failed to acquire fullscreen display mode!", ex);\r
         }\r
         return null;\r
     }\r

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 10378f2..514061c 100644 (file)
--- a/engine/src/test-data/Models/HoverTank/Tank2.mesh.xml
+++ b/engine/src/test-data/Models/HoverTank/Tank2.mesh.xml
@@ -1,6 +1,6 @@
 <mesh>\r
     <submeshes>\r
-        <submesh material="Models/HoverTank/tank_highRes.j3m" usesharedvertices="false" use32bitindexes="false" operationtype="triangle_list">\r
+        <submesh material="Models/HoverTank/tank.j3m" usesharedvertices="false" use32bitindexes="false" operationtype="triangle_list">\r
             <faces count="9692">\r
                 <face v1="0" v2="1" v3="3" />\r
                 <face v1="1" v2="2" v3="3" />\r

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 baee843..5621dbe 100644 (file)
--- 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 {\r
+     MaterialParameters {\r
+        SpecularMap : Models/HoverTank/tank_specular.jpg\r
+        Shininess : 8\r
+        NormalMap : Models/HoverTank/tank_normals.png\r
+        DiffuseMap : Models/HoverTank/tank_diffuse.jpg\r
+          GlowMap : Models/HoverTank/tank_glow_map.jpg\r
+        UseMaterialColors : true\r
+        Ambient  : 0.0 0.0 0.0 1.0\r
+        Diffuse  : 1.0 1.0 1.0 1.0\r
+        Specular : 1.0 1.0 1.0 1.0\r
+     }\r
+}\r

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 (file)
index 0000000..0820ac5
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 (file)
index cc19ff7..0000000
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 (file)
index 0d53745..0000000
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 (file)
index 0000000..a0d15fd
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 (file)
index 7512495..0000000
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 (file)
index 9cacf27..0000000
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 (file)
index 3219159..0000000
--- 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 1304588..7942187 100644 (file)
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 (file)
index 7942187..0000000
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 (file)
index 0000000..66aad2b
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 (file)
index eb165ea..0000000
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 (file)
index c868eca..0000000
Binary files a/engine/src/test-data/Models/HoverTank/tank_specular_lowRes.png and /dev/null differ